Revert fulfils to satisfies on arch elements, add satisfied_by for requirements

Author: RSingh1511

docs/internals/requirements/requirements.rst

@@ -793,6 +793,7 @@ Architecture Attributes
 ..    :derived_from: gd_req__impl_dynamic_diagram
 
 ..    Provide needs type ``dd_dyn`` for dynamic diagrams showing unit interactions as UML.
+
 Testing
 #######
 
@@ -1246,7 +1247,3 @@ Overview of Tool to Process Requirements
 
 .. needextend:: c.this_doc() and type == 'tool_req' and not status
   :status: valid
-
-.. needextend:: "metamodel.yaml" in source_code_link
-  :+derived_from: tool_req__docs_metamodel
-  :+tags: config

src/extensions/score_metamodel/metamodel.yaml

@@ -298,6 +298,9 @@ needs_types:
       derived_from: stkh_req
       satisfies: stkh_req
       belongs_to: feat # for evaluation
+      satisfied_by: feat # new preferred name for belongs_to
+      # req-Id: tool_req__docs_req_link_covers_aou
+      covers: aou_req
     optional_options:
       codelink: ^.*$
       testlink: ^.*$
@@ -309,9 +312,6 @@ needs_types:
       # req-Id: tool_req__docs_req_attr_validity_correctness
       valid_from: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
       valid_until: ^v(0|[1-9]\d*)\.(0|[1-9]\d*)(\.(0|[1-9]\d*))?$
-    optional_links:
-      # req-Id: tool_req__docs_req_link_covers_aou
-      covers: aou_req
     tags:
       - requirement
       - requirement_excl_process
@@ -338,6 +338,9 @@ needs_types:
       # TODO: make derived_from mandatory once downstream repos migrate from satisfies
       derived_from: feat_req
       satisfies: feat_req
+      satisfied_by: comp # new preferred name for belongs_to
+      # req-Id: tool_req__docs_req_link_covers_aou
+      covers: aou_req
     optional_options:
       codelink: ^.*$
       testlink: ^.*$
@@ -346,9 +349,6 @@ needs_types:
       # req-Id: tool_req__docs_req_attr_testcov
       testcovered: ^(YES|NO)$
       hash: ^.*$
-    optional_links:
-      # req-Id: tool_req__docs_req_link_covers_aou
-      covers: aou_req
     tags:
       - requirement
       - requirement_excl_process
@@ -452,8 +452,6 @@ needs_types:
       includes: ^logic_arc_int(_op)*__.+$
       belongs_to: feat # make it mandatory for evaluation
     optional_links:
-      # TODO: make satisfies mandatory once downstream repos migrate from fulfils
-      satisfies: feat_req
       fulfils: feat_req
     tags:
       - architecture_element
@@ -476,8 +474,6 @@ needs_types:
     mandatory_links:
       belongs_to: feat
     optional_links:
-      # TODO: make satisfies mandatory once downstream repos migrate from fulfils
-      satisfies: feat_req
       fulfils: feat_req
     tags:
       - architecture_view
@@ -500,7 +496,6 @@ needs_types:
       status: ^(valid|invalid)$
     optional_links:
       includes: logic_arc_int_op
-      satisfies: feat_req
       fulfils: feat_req
     tags:
       - architecture_element
@@ -609,8 +604,6 @@ needs_types:
       belongs_to: comp
     optional_links:
       uses: logic_arc_int, real_arc_int_op
-      # TODO: make satisfies mandatory once downstream repos migrate from fulfils
-      satisfies: comp_req
       fulfils: comp_req
     tags:
       - architecture_view
@@ -632,8 +625,6 @@ needs_types:
     mandatory_links:
       belongs_to: comp
     optional_links:
-      # TODO: make satisfies mandatory once downstream repos migrate from fulfils
-      satisfies: comp_req
       fulfils: comp_req
     tags:
       - architecture_view
@@ -655,7 +646,6 @@ needs_types:
       status: ^(valid|invalid)$
       language: ^(cpp|rust)$
     optional_links:
-      satisfies: comp_req
       fulfils: comp_req
     tags:
       - architecture_element
@@ -1021,6 +1011,10 @@ needs_extra_links:
     incoming: has
     outgoing: belongs to
 
+  satisfied_by:
+    incoming: satisfies
+    outgoing: satisfied by
+
   satisfies:
     incoming: satisfied by
     outgoing: satisfies
@@ -1099,7 +1093,6 @@ graph_checks:
       include: feat_arc_sta, logic_arc_int, logic_arc_int_op, comp_arc_sta, real_arc_int, real_arc_int_op
       condition: safety == QM
     check:
-      satisfies: safety != QM
       fulfils: safety != QM
     explanation: An QM architecture element cannot implement ASIL requirements.
 

src/extensions/score_metamodel/tests/rst/architecture/architecture_tests.rst

@@ -45,7 +45,7 @@
    :security: YES
    :safety: ASIL_B
    :status: invalid
-   :satisfies: feat_req__test_feature_1__test_req_1
+   :fulfils: feat_req__test_feature_1__test_req_1
    :includes: logic_arc_int__test_feature_1__test_interface_1
 
    .. needarch
@@ -59,7 +59,7 @@
    :security: YES
    :safety: ASIL_B
    :status: invalid
-   :satisfies: feat_req__test_feature_1__test_req_1
+   :fulfils: feat_req__test_feature_1__test_req_1
 
    Put here a sequence diagram
 
@@ -116,7 +116,7 @@ Component 1
    :safety: ASIL_B
    :security: YES
    :status: invalid
-   :satisfies: comp_req__test_component_1__requirement_1
+   :fulfils: comp_req__test_component_1__requirement_1
    :implements: logic_arc_int__test_feature_1__test_interface_1
    :belongs_to: comp__test_sub_component_1
 

src/extensions/score_metamodel/tests/rst/graph/test_metamodel_graph.rst

@@ -52,7 +52,7 @@
 
 
 .. Negative Test: Child requirement QM. Parent requirement is `ASIL_B`. Child cant fulfill the safety level of the parent.
-#EXPECT[+2]: QM requirements cannot satisfy ASIL requirements.
+#EXPECT[+2]: QM requirements cannot be derived from ASIL requirements.
 
 .. comp_req:: Child requirement 3
    :id: feat_req__qm_child_with_asil_parent
@@ -63,13 +63,16 @@
 
 
 .. Parent requirement does not exist
-#EXPECT: unknown outgoing link
+#EXPECT[+2]: unknown outgoing link
 
 .. feat_req:: Child requirement 4
    :id: feat_req__linking_to_unknown_parent
    :safety: ASIL_B
    :status: valid
    :derived_from: feat_req__parent0__abcd
+
+
+
 .. Mitigation of Safety Analysis (FMEA and DFA) shall be checked. Mitigation shall have the same or higher safety level than the analysed item.
 .. Negative Test: Linked to a mitigation that is lower than the safety level of the analysed item.
 #EXPECT[+2]: feat_saf_dfa__child__5: Parent need `feat_req__parent__QM` does not fulfill condition `safety != QM`. Explanation: An ASIL_B safety requirement must link to a ASIL_B requirement. Please ensure that the linked requirements safety level is not QM and it's status is valid.