clean

OpenTOSCA · Dec 25, 2024 · fa42769 · fa42769
1 parent 61761ae
commit fa42769
Show file tree

Hide file tree

Showing 8 changed files with 111 additions and 12 deletions.
diff --git a/src/enricher/constraints.ts b/src/enricher/constraints.ts
@@ -40,16 +40,21 @@ export class ConstraintEnricher {
         }
         assert.isDefined(left, 'Left not defined')
 
-        // TODO: migrate this
-        if (element.isRelation()) {
-            this.graph.addConstraint({
-                implies: [{and: [element.container.id, element.manualId, element.target.manualId]}, element.id],
-            })
-        } else {
-            this.graph.addConstraint({
-                implies: [{and: [element.container.id, element.manualId]}, element.id],
-            })
+        /**
+         * Implied by container presence and manual conditions
+         */
+        const antecedent: {and: [string, string]} = {and: [element.container.id, element.manualId]}
+
+        /**
+         * Enhanced implied relations also include manual conditions of target
+         */
+        if (element.isRelation() && this.graph.options.constraints.relationEnhancedImplication) {
+            antecedent.and.push(element.target.manualId)
         }
+
+        this.graph.addConstraint({
+            implies: [antecedent, element.id],
+        })
     }
 
     private enrichConstraints() {

diff --git a/src/graph/options.ts b/src/graph/options.ts
@@ -833,6 +833,7 @@ class ConstraintsOptions extends BaseOptions {
 
     readonly relationSource: boolean
     readonly relationTarget: boolean
+    readonly relationEnhancedImplication: boolean
     readonly artifactContainer: boolean
     readonly propertyContainer: boolean
     readonly typeContainer: boolean
@@ -860,6 +861,9 @@ class ConstraintsOptions extends BaseOptions {
         this.relationTarget = this.raw.relation_target_constraint ?? this.constraints
         assert.isBoolean(this.relationTarget)
 
+        this.relationEnhancedImplication = this.raw.relation_enhanced_implication_mode ?? true
+        assert.isBoolean(this.relationEnhancedImplication)
+
         this.artifactContainer = this.raw.artifact_container_constraint ?? this.constraints
         assert.isBoolean(this.artifactContainer)
 

diff --git a/src/specification/variability.ts b/src/specification/variability.ts
@@ -68,6 +68,10 @@ export type ConstraintsOptions = {
     constraints?: boolean
     relation_source_constraint?: boolean
     relation_target_constraint?: boolean
+    // TODO: doc
+    // TODO: implement
+    // TODO: tests
+    relation_enhanced_implication_mode?: boolean
     artifact_container_constraint?: boolean
     property_container_constraint?: boolean
     type_container_constraint?: boolean

diff --git a/tests/conformance/implied-enhanced/new/expected.yaml b/tests/conformance/implied-enhanced/new/expected.yaml
@@ -0,0 +1,10 @@
+tosca_definitions_version: tosca_simple_yaml_1_3
+
+node_types:
+    container:
+        derived_from: tosca.nodes.Root
+
+topology_template:
+    node_templates:
+        container:
+            type: container
diff --git a/tests/conformance/implied-enhanced/new/template.yaml b/tests/conformance/implied-enhanced/new/template.yaml
@@ -0,0 +1,38 @@
+tosca_definitions_version: tosca_variability_1_0_rc_3
+
+node_types:
+    container:
+        derived_from: tosca.nodes.Root
+
+topology_template:
+    variability:
+        options:
+            enrich_implementations: false
+            enrich_technologies: false
+            relation_enhanced_implication_mode: true
+
+    node_templates:
+        container:
+            type: container
+            persistent: true
+            managed: false
+            requirements:
+                - middleware: dmiddleware
+
+        dmiddleware:
+            type: container
+            managed: false
+            conditions: false
+            requirements:
+                - host: emachine
+
+        emachine:
+            type: container
+            managed: false
+            #conditions: false
+
+        other:
+            type: container
+            managed: false
+            requirements:
+                - host: emachine
diff --git a/tests/conformance/implied-enhanced/old/template.yaml b/tests/conformance/implied-enhanced/old/template.yaml
@@ -0,0 +1,38 @@
+tosca_definitions_version: tosca_variability_1_0_rc_3
+
+node_types:
+    container:
+        derived_from: tosca.nodes.Root
+
+topology_template:
+    variability:
+        options:
+            enrich_implementations: false
+            enrich_technologies: false
+            relation_enhanced_implication_mode: false
+
+    node_templates:
+        container:
+            type: container
+            persistent: true
+            managed: false
+            requirements:
+                - middleware: dmiddleware
+
+        dmiddleware:
+            type: container
+            managed: false
+            conditions: false
+            requirements:
+                - host: emachine
+
+        emachine:
+            type: container
+            managed: false
+            #conditions: false
+
+        other:
+            type: container
+            managed: false
+            requirements:
+                - host: emachine
diff --git a/tests/conformance/implied-enhanced/old/test.yaml b/tests/conformance/implied-enhanced/old/test.yaml
@@ -0,0 +1 @@
+error: Could not solve
diff --git a/tests/minisat/plays/play.yaml b/tests/minisat/plays/play.yaml
@@ -18,19 +18,18 @@ topology_template:
             requirements:
                 - middleware:
                       node: dmiddleware
-                      conditions: false
 
         dmiddleware:
             type: container
             managed: false
-            #conditions: false
+            conditions: false
             requirements:
                 - host: emachine
 
         emachine:
             type: container
             managed: false
-            conditions: false
+            #conditions: false
 
         other:
             type: container