From dc4b75a0ee6312e78fedf7049bcd853e5e149e6f Mon Sep 17 00:00:00 2001 From: rahulsasingh Date: Thu, 25 Jun 2026 03:36:07 +0000 Subject: [PATCH] hard-deprecate satisfies for feat_req/comp_req, --- src/extensions/score_metamodel/metamodel.yaml | 8 +------- .../tests/rst/options/test_need_extends.rst | 4 ++-- .../tests/rst/options/test_options_extra_option.rst | 12 ++++++++++++ .../tests/rst/options/test_options_options.rst | 6 +++--- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/src/extensions/score_metamodel/metamodel.yaml b/src/extensions/score_metamodel/metamodel.yaml index aac325206..e734cb870 100644 --- a/src/extensions/score_metamodel/metamodel.yaml +++ b/src/extensions/score_metamodel/metamodel.yaml @@ -294,9 +294,7 @@ needs_types: content: ^[\s\S]+$ optional_links: # req-Id: tool_req__docs_req_link_satisfies_allowed - # TODO: make derived_from mandatory once downstream repos migrate from satisfies derived_from: stkh_req - satisfies: stkh_req # for backward compatibility - remove once downstream repos migrate to derived_from belongs_to: feat # for evaluation satisfied_by: feat # new preferred name for belongs_to # req-Id: tool_req__docs_req_link_covers_aou @@ -331,9 +329,7 @@ needs_types: content: ^[\s\S]+$ optional_links: # req-Id: tool_req__docs_req_link_satisfies_allowed - # TODO: make derived_from mandatory once downstream repos migrate from satisfies derived_from: feat_req - satisfies: feat_req # for backward compatibility - remove once downstream repos migrate to derived_from belongs_to: comp # for backward compatibility satisfied_by: comp # new preferred name for belongs_to # TODO: make satisfied_by mandatory once downstream repos migrate from belongs_to @@ -1014,8 +1010,7 @@ needs_extra_links: incoming: satisfies outgoing: satisfied by - # TODO: hard-deprecate satisfies in a follow-up PR once score + module_template migrate to - # derived_from. Tracked in https://github.com/eclipse-score/docs-as-code/issues/594 + # kept for backward compatibility - still used by tool_req and gd_req satisfies: incoming: satisfied by outgoing: satisfies @@ -1085,7 +1080,6 @@ graph_checks: condition: safety == QM check: derived_from: safety == QM - satisfies: safety == QM explanation: QM requirements cannot be derived from ASIL requirements. # req-Id: tool_req__docs_arch_link_qm_to_safety_req diff --git a/src/extensions/score_metamodel/tests/rst/options/test_need_extends.rst b/src/extensions/score_metamodel/tests/rst/options/test_need_extends.rst index 4cbcb93ee..2bc22385b 100644 --- a/src/extensions/score_metamodel/tests/rst/options/test_need_extends.rst +++ b/src/extensions/score_metamodel/tests/rst/options/test_need_extends.rst @@ -37,7 +37,7 @@ .. feat_req:: Test Linkage Override :id: feat_req__test__linkage_override - :satisfies: stkh_req__test__need_extends_1 + :derived_from: stkh_req__test__need_extends_1 .. Replacing of options that are already set is not allowed. @@ -59,7 +59,7 @@ .. needextend:: feat_req__test__linkage_override - :satisfies: stkh_req__test__need_extends_abc + :derived_from: stkh_req__test__need_extends_abc :expect: Error when extending need: feat_req__test__linkage_override. Replace or Delete action is not allowed via needextends. diff --git a/src/extensions/score_metamodel/tests/rst/options/test_options_extra_option.rst b/src/extensions/score_metamodel/tests/rst/options/test_options_extra_option.rst index 78f779808..a7f1804c1 100644 --- a/src/extensions/score_metamodel/tests/rst/options/test_options_extra_option.rst +++ b/src/extensions/score_metamodel/tests/rst/options/test_options_extra_option.rst @@ -36,3 +36,15 @@ .. std_wp:: This is a test :id: std_wp__test__abce :expect_not: has these extra options + + +.. stkh_req:: Test Stakeholder Requirement + :id: stkh_req__test__abcd + + +.. `satisfies` is hard-deprecated for feat_req (issue #594) — only `derived_from` is allowed now + +.. feat_req:: Hard-deprecated satisfies test + :id: feat_req__test__satisfies_deprecated + :satisfies: stkh_req__test__abcd + :expect: feat_req__test__satisfies_deprecated: has these extra options: `satisfies`. diff --git a/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst b/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst index 14c1bfb01..eb7b7984d 100644 --- a/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst +++ b/src/extensions/score_metamodel/tests/rst/options/test_options_options.rst @@ -39,12 +39,12 @@ -.. Required link `satisfies` refers to wrong requirement type +.. Required link `derived_from` refers to wrong requirement type .. feat_req:: Child requirement :id: feat_req__abce - :satisfies: std_wp__test_options__abce - :expect: feat_req__abce: references 'std_wp__test_options__abce' as 'satisfies', but it must reference Stakeholder Requirement (stkh_req). + :derived_from: std_wp__test_options__abce + :expect: feat_req__abce: references 'std_wp__test_options__abce' as 'derived_from', but it must reference Stakeholder Requirement (stkh_req).