implied properties (#430)

examples/unfurl-technology---industry---baseline-maintenance/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---baseline-original/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-automated/tests/customer/expected.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-automated/tests/development/expected.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-automated/tests/hyperscaler/expected.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-automated/tests/local/expected.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-automated/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-maintenance-manual/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-original-automated/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

examples/unfurl-technology---industry---plus-original-manual/variable-service-template.yaml

@@ -8,6 +8,9 @@ topology_template:
         domain:
             type: string
 
+        dbms_password:
+            type: string
+
         retailer_name:
             type: string
 

src/enricher/constraints.ts

@@ -40,10 +40,6 @@ export class ConstraintEnricher {
         }
         assert.isDefined(left, 'Left not defined')
 
-        // Sanity check
-        if (!(element.isRelation() || element.isArtifact()))
-            throw new Error(`${element.Display} is not issued a manual id`)
-
         this.graph.addConstraint({
             implies: [{and: [element.container.id, element.manualId]}, element.id],
         })
@@ -96,7 +92,7 @@ export class ConstraintEnricher {
         }
 
         /**
-         * Ensure that each property has maximum one value (also considering non-present nodes)
+         * Ensure that each property has exactly one value
          */
         if (this.graph.options.constraints.uniqueProperty) {
             for (const element of [
@@ -107,7 +103,10 @@ export class ConstraintEnricher {
                 ...this.graph.artifacts,
             ]) {
                 for (const properties of element.propertiesMap.values()) {
-                    this.graph.addConstraint({amo: properties.map(it => it.id)})
+                    if (properties.length === 0) continue
+                    this.graph.addConstraint({
+                        implies: [properties[0].container.id, {exo: properties.map(it => it.id)}],
+                    })
                 }
             }
         }

src/enricher/index.ts

@@ -32,7 +32,7 @@ export default class Enricher {
         /**
          * Regenerate graph
          */
-        graph = graph.regenerate()
+        graph = new Graph(this.serviceTemplate)
 
         /**
          * Condition Enricher

src/graph/graph.ts

@@ -128,6 +128,39 @@ export default class Graph {
         new Populator(this).run()
     }
 
+    guessElement(data: string, context: Context = {}): Element {
+        assert.isString(data)
+        try {
+            return this.getNode(data, context)
+        } catch (e) {
+            // NIL
+        }
+
+        try {
+            return this.getGroup(data, context)
+        } catch (e) {
+            // NIL
+        }
+
+        try {
+            return this.getPolicy(data, context)
+        } catch (e) {
+            // NIL
+        }
+
+        try {
+            return this.getGroup(data, context)
+        } catch (e) {
+            // NIL
+        }
+
+        // TODO: guess property? relation? artifact?
+
+        throw new Error(
+            `Could not get element "${data}" from context element "${context.element?.display}" and context cached "${context.cached?.display}"`
+        )
+    }
+
     getNode(name: string | 'SELF' | 'CONTAINER' | 'SOURCE' | 'TARGET', context: Context = {}): Node {
         assert.isString(name)
 
@@ -648,8 +681,4 @@ export default class Graph {
     replaceTechnologies(node: Node, maps: TechnologyTemplateMap[]) {
         node.raw.technology = maps
     }
-
-    regenerate() {
-        return new Graph(this.serviceTemplate)
-    }
 }

src/graph/options.ts

@@ -4,6 +4,7 @@ import {ServiceTemplate, TOSCA_DEFINITIONS_VERSION} from '#spec/service-template
 import {
     ArtifactDefaultConditionMode,
     NodeDefaultConditionMode,
+    PropertyDefaultConditionMode,
     RelationDefaultConditionMode,
     TechnologyDefaultConditionMode,
     VariabilityOptions,
@@ -91,6 +92,7 @@ class DefaultOptions extends BaseOptions {
     readonly artifactDefaultSemanticCondition: boolean
 
     readonly propertyDefaultCondition: boolean
+    readonly propertyDefaultConditionMode: PropertyDefaultConditionMode
     readonly propertyDefaultConsistencyCondition: boolean
     readonly propertyDefaultSemanticCondition: boolean
 
@@ -288,6 +290,10 @@ class DefaultOptions extends BaseOptions {
             this.raw.property_default_condition ?? mode.property_default_condition ?? this.defaultCondition
         assert.isBoolean(this.propertyDefaultCondition)
 
+        this.propertyDefaultConditionMode =
+            this.raw.property_default_condition_mode ?? mode.property_default_condition_mode ?? 'container-consuming'
+        assert.isString(this.propertyDefaultConditionMode)
+
         this.propertyDefaultConsistencyCondition =
             this.raw.property_default_consistency_condition ??
             mode.property_default_consistency_condition ??