Skip to content

Commit b0a8cd8

Browse files
committed
Revert fulfils to satisfies on arch elements, add satisfied_by for requirements
1 parent 7089dbf commit b0a8cd8

2 files changed

Lines changed: 9 additions & 14 deletions

File tree

src/extensions/score_metamodel/metamodel.yaml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ needs_types:
296296
derived_from: stkh_req
297297
satisfies: stkh_req
298298
belongs_to: feat # for evaluation
299+
satisfied_by: feat # new preferred name for belongs_to
299300
optional_options:
300301
codelink: ^.*$
301302
testlink: ^.*$
@@ -332,6 +333,7 @@ needs_types:
332333
# TODO: make derived_from mandatory once downstream repos migrate from satisfies
333334
derived_from: feat_req
334335
satisfies: feat_req
336+
satisfied_by: comp # new preferred name for belongs_to
335337
optional_options:
336338
codelink: ^.*$
337339
testlink: ^.*$
@@ -441,8 +443,6 @@ needs_types:
441443
includes: ^logic_arc_int(_op)*__.+$
442444
belongs_to: feat # make it mandatory for evaluation
443445
optional_links:
444-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
445-
satisfies: feat_req
446446
fulfils: feat_req
447447
tags:
448448
- architecture_element
@@ -465,8 +465,6 @@ needs_types:
465465
mandatory_links:
466466
belongs_to: feat
467467
optional_links:
468-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
469-
satisfies: feat_req
470468
fulfils: feat_req
471469
tags:
472470
- architecture_view
@@ -489,7 +487,6 @@ needs_types:
489487
status: ^(valid|invalid)$
490488
optional_links:
491489
includes: logic_arc_int_op
492-
satisfies: feat_req
493490
fulfils: feat_req
494491
tags:
495492
- architecture_element
@@ -598,8 +595,6 @@ needs_types:
598595
belongs_to: comp
599596
optional_links:
600597
uses: logic_arc_int, real_arc_int_op
601-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
602-
satisfies: comp_req
603598
fulfils: comp_req
604599
tags:
605600
- architecture_view
@@ -621,8 +616,6 @@ needs_types:
621616
mandatory_links:
622617
belongs_to: comp
623618
optional_links:
624-
# TODO: make satisfies mandatory once downstream repos migrate from fulfils
625-
satisfies: comp_req
626619
fulfils: comp_req
627620
tags:
628621
- architecture_view
@@ -644,7 +637,6 @@ needs_types:
644637
status: ^(valid|invalid)$
645638
language: ^(cpp|rust)$
646639
optional_links:
647-
satisfies: comp_req
648640
fulfils: comp_req
649641
tags:
650642
- architecture_element
@@ -957,6 +949,10 @@ needs_extra_links:
957949
incoming: has
958950
outgoing: belongs to
959951

952+
satisfied_by:
953+
incoming: satisfies
954+
outgoing: satisfied by
955+
960956
satisfies:
961957
incoming: satisfied by
962958
outgoing: satisfies
@@ -1035,7 +1031,6 @@ graph_checks:
10351031
include: feat_arc_sta, logic_arc_int, logic_arc_int_op, comp_arc_sta, real_arc_int, real_arc_int_op
10361032
condition: safety == QM
10371033
check:
1038-
satisfies: safety != QM
10391034
fulfils: safety != QM
10401035
explanation: An QM architecture element cannot implement ASIL requirements.
10411036

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
:security: YES
4646
:safety: ASIL_B
4747
:status: invalid
48-
:satisfies: feat_req__test_feature_1__test_req_1
48+
:fulfils: feat_req__test_feature_1__test_req_1
4949
:includes: logic_arc_int__test_feature_1__test_interface_1
5050

5151
.. needarch
@@ -59,7 +59,7 @@
5959
:security: YES
6060
:safety: ASIL_B
6161
:status: invalid
62-
:satisfies: feat_req__test_feature_1__test_req_1
62+
:fulfils: feat_req__test_feature_1__test_req_1
6363

6464
Put here a sequence diagram
6565

@@ -123,7 +123,7 @@ Component 1
123123
:safety: ASIL_B
124124
:security: YES
125125
:status: invalid
126-
:satisfies: comp_req__test_component_1__requirement_1
126+
:fulfils: comp_req__test_component_1__requirement_1
127127
:implements: logic_arc_int__test_feature_1__test_interface_1
128128
:belongs_to: comp__test_sub_component_1
129129

0 commit comments

Comments
 (0)