hotfix and examples

OpenTOSCA · Mar 23, 2024 · bc6081b · bc6081b
1 parent b3f4a8d
commit bc6081b
Show file tree

Hide file tree

Showing 416 changed files with 428 additions and 115 deletions.
diff --git a/docs/cmds/variability/generate.ts b/docs/cmds/variability/generate.ts
@@ -10,6 +10,7 @@ import * as files from '#files'
 import Loader from '#graph/loader'
 import {ServiceTemplate} from '#spec/service-template'
 import {InputAssignmentMap} from '#spec/topology-template'
+import _ from 'lodash'
 import * as path from 'path'
 
 type Test = {
@@ -40,12 +41,21 @@ async function main() {
             const inputs = getDefaultInputs(dir)
                 ? files.loadYAML<InputAssignmentMap>(getDefaultInputs(dir)!)
                 : undefined
+
+            let expected
+            if (!check.isDefined(config.error)) {
+                expected = loadExpected({dir, file: config.expected})
+                if (check.isDefined(config.merge)) {
+                    expected = _.merge(expected, config.merge)
+                }
+            }
+
             tests.push({
                 id,
                 config,
                 inputs,
                 template,
-                expected: check.isDefined(config.error) ? undefined : loadExpected({dir, file: config.expected}),
+                expected,
                 file: `test-${id}.md`,
             })
         })

diff --git a/docs/cmds/variability/test.template.ejs b/docs/cmds/variability/test.template.ejs
@@ -35,6 +35,16 @@ The following variability preset is used.
 ```
 <% } -%>
 
+<% if (test.config.replace) { -%>
+## Replace
+
+The following strings are searched and replaced in the variability-resolved service template.
+
+```yaml linenums="1"
+<%- utils.toYAML(test.config.replace) -%>
+```
+<% } -%>
+
 <% if (test.expected) { -%>
 ## Variability-Resolved Service Template
 

diff --git a/docs/docs/publications.md b/docs/docs/publications.md
@@ -16,7 +16,7 @@ This document holds a list of selected publications.
 - CLOSER 2024
 - _Accepted_
 - [Step-by-Step Guide](variability4tosca/guides/aware/index.md){target=_blank}
-- {{ repo_link('tests/hosting-aware-pruning ', 'Models of the Case Study') }}
+- {{ repo_link('examples ', 'Models of the Case Study') }} (Relevant models start with "unfurl-aware")
 - [GitHub Actions](https://github.com/OpenTOSCA/opentosca-vintner/actions/workflows/night.yaml){target=_blank} (Relevant jobs start with "Unfurl Aware")
 - [GitHub Actions Raw Logs](assets/documents/night.zip){target=_blank} (Relevant jobs start with "Unfurl Aware")
 - [Assets on Zenodo](https://doi.org/10.5281/zenodo.10452506){target=_blank}
@@ -29,7 +29,7 @@ This document holds a list of selected publications.
 - _Accepted_
 - [Step-by-Step Guide](variability4tosca/guides/modes/index.md){target=_blank}
 - {{ repo_link('tests/enricher', 'Models of the Experiments') }}
-- {{ repo_link('tests/pruning-modes', 'Models of the Case Study') }}
+- {{ repo_link('examples ', 'Models of the Case Study') }} (Relevant models start with "xopera-pruning")
 - [GitHub Actions](https://github.com/OpenTOSCA/opentosca-vintner/actions/workflows/night.yaml){target=_blank} (Relevant jobs start with "xOpera Pruning Mode")
 - [GitHub Actions Raw Logs](assets/documents/night.zip){target=_blank} (Relevant jobs start with "xOpera Pruning Mode")
 - [Assets on Zenodo](https://doi.org/10.5281/zenodo.10363694){target=_blank}

diff --git a/docs/docs/variability4tosca/testing.md b/docs/docs/variability4tosca/testing.md
@@ -47,7 +47,7 @@ The following configurations can be configured in the test configuration file.
 | error       | false     | String                                     | The expected error that is thrown.                                                           | 
 | template    | false     | String                                     | Path (relative to `test.yaml`) to the variable service template.                             | 
 | expected    | false     | String                                     | Path (relative to `test.yaml`) to the expected service template after resolving variability. | 
-| renames     | false     | List(Tuple(Find: String, Replace: String)) | An optional list of strings to search and replace for in the generated service template.     | 
+| replace     | false     | List(Tuple(Find: String, Replace: String)) | An optional list of strings to search and replace for in the generated service template.     | 
 | merge       | false     | Object                                     | An optional object that is merged into the expected service template.                        | 
 
 

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-count.md b/docs/docs/variability4tosca/tests/test-analytical-operators-count.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...ocs/variability4tosca/tests/test-analytical-operators-exponential_regression.md b/...ocs/variability4tosca/tests/test-analytical-operators-exponential_regression.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md b/docs/docs/variability4tosca/tests/test-analytical-operators-linear_regression.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...ocs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md b/...ocs/variability4tosca/tests/test-analytical-operators-logarithmic_regression.md
@@ -32,6 +32,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-max.md b/docs/docs/variability4tosca/tests/test-analytical-operators-max.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md b/docs/docs/variability4tosca/tests/test-analytical-operators-mean.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-median.md b/docs/docs/variability4tosca/tests/test-analytical-operators-median.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-min.md b/docs/docs/variability4tosca/tests/test-analytical-operators-min.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md b/...docs/variability4tosca/tests/test-analytical-operators-polynomial_regression.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md b/docs/docs/variability4tosca/tests/test-analytical-operators-standard_deviation.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md b/docs/docs/variability4tosca/tests/test-analytical-operators-sum.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md b/docs/docs/variability4tosca/tests/test-analytical-operators-variance.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-add.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-div.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-even.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mod-odd.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-mul.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md b/docs/docs/variability4tosca/tests/test-arithmetic-operators-sub.md
@@ -30,6 +30,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/.../docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md b/.../docs/variability4tosca/tests/test-artifacts-artifact-presence-number-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md b/...docs/variability4tosca/tests/test-artifacts-artifact-presence-number-present.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/.../docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md b/.../docs/variability4tosca/tests/test-artifacts-artifact-presence-string-absent.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md b/...docs/variability4tosca/tests/test-artifacts-artifact-presence-string-present.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-conditional.md b/docs/docs/variability4tosca/tests/test-artifacts-conditional.md
@@ -45,6 +45,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-absent.md
@@ -26,6 +26,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md b/docs/docs/variability4tosca/tests/test-artifacts-container-presence-present.md
@@ -22,6 +22,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative-false.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md b/docs/docs/variability4tosca/tests/test-artifacts-default-alternative.md
@@ -44,6 +44,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md b/docs/docs/variability4tosca/tests/test-artifacts-default-condition.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-prune.md b/docs/docs/variability4tosca/tests/test-artifacts-prune.md
@@ -28,6 +28,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-artifact.md
@@ -23,6 +23,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.

diff --git a/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md b/docs/docs/variability4tosca/tests/test-artifacts-throw-ambiguous-default.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.

diff --git a/...docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md b/...docs/variability4tosca/tests/test-artifacts-throw-missing-artifact-container.md
@@ -22,6 +22,7 @@ topology_template:
 
 
 
+
 ## Expected Error
 
 The following error is expected to be thrown, when resolving variability.

diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-empty.md
@@ -25,6 +25,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-false.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-false.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-nested-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md b/docs/docs/variability4tosca/tests/test-boolean-operators-and-true.md
@@ -29,6 +29,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md b/...docs/variability4tosca/tests/test-boolean-operators-implies-false-false-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/.../docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md b/.../docs/variability4tosca/tests/test-boolean-operators-implies-false-true-true.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.

diff --git a/...docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md b/...docs/variability4tosca/tests/test-boolean-operators-implies-true-false-false.md
@@ -27,6 +27,7 @@ topology_template:
 
 
 
+
 ## Variability-Resolved Service Template
 
 The following variability-resolved service template is expected.