From ebcc45b8c8703cadc49cf3a0b888545845ccb9e6 Mon Sep 17 00:00:00 2001
From: Jozsef Csongvai <jozsef.csongvai@bell.ca>
Date: Tue, 21 Jan 2020 11:27:14 -0500
Subject: Eliminate Template Requirement

Enables resource assignment without the use of a template.
If no template is defined by the CBA, the default output is
a kev-value map. If operation input: resolution-summary is set
to true, output will be a list of ResolutionSummary.

Issue-ID: CCSDK-2038
Change-Id: I5f6bcefcacec6e83cffac1134b13690b500a7563
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>
---
 .../Definitions/activation-blueprint.json          |  4 +++
 .../Definitions/notemplate-mapping.json            | 36 ++++++++++++++++++++++
 .../node_type/component-resource-resolution.json   |  5 +++
 3 files changed, 45 insertions(+)
 create mode 100644 components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/notemplate-mapping.json

(limited to 'components')

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 639c21490..85a056c5e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -179,6 +179,10 @@
           "another-mapping": {
             "type": "artifact-mapping-resource",
             "file": "Definitions/another-mapping.json"
+          },
+          "notemplate-mapping": {
+            "type": "artifact-mapping-resource",
+            "file": "Definitions/notemplate-mapping.json"
           }
         }
       },
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/notemplate-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/notemplate-mapping.json
new file mode 100644
index 000000000..5aa3b3dcb
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/notemplate-mapping.json
@@ -0,0 +1,36 @@
+[
+  {
+    "name": "service-instance-id",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [
+    ]
+  },
+  {
+    "name": "vnf-id",
+    "input-param": true,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "vnf-id",
+    "dictionary-source": "input",
+    "dependencies": []
+  },
+  {
+    "name": "vnf_name",
+    "input-param": false,
+    "property": {
+      "type": "string"
+    },
+    "dictionary-name": "vnf_name",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  }
+]
\ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
index 1c81b7f6e..ff1b5260e 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
@@ -38,6 +38,11 @@
               "required": false,
               "type": "string"
             },
+            "resolution-summary": {
+              "description": "Enable resolution-summary output",
+              "required": false,
+              "type": "boolean"
+            },
             "artifact-prefix-names": {
               "required": true,
               "description": "Template , Resource Assignment Artifact Prefix names",
-- 
cgit 1.2.3-korg