Implement Resource Resolution Services

Change-Id: Ia1cf57c9fa16cb943836e3a78d4d2c9776f0e32f
Issue-ID: CCSDK-724
Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>

6 files changed, 119 insertions, 8 deletions

diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index e5f0c9c0..446932d5 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -136,6 +136,9 @@
                   "resource-id": {
                     "get_input": "hostname"
                   },
+                  "artifact-prefix-names": [
+                    "baseconfig"
+                  ],
                   "template-content": {
                     "get_artifact": [
                       "SELF",
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index caee773b..c457086c 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -1,3 +1,36 @@
-{
-  "assignments": "Sample Assignments"
-}
\ No newline at end of file
+[
+  {
+    "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": "mdsal",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  }
+]
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
index 2723510a..6e8d839e 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
@@ -69,6 +69,14 @@
                   "required": true,
                   "type": "string"
                 },
+                "artifact-prefix-names": {
+                  "required": false,
+                  "description": "Template , Resource Assignment Artifact Prefix names",
+                  "type": "list",
+                  "entry_schema": {
+                    "type": "string"
+                  }
+                },
                 "template-content": {
                   "description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",
                   "required": true,
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json
new file mode 100644
index 00000000..557f6efc
--- /dev/null
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionary_types.json
@@ -0,0 +1,62 @@
+{
+  "service-instance-id": {
+    "name": "service-instance-id",
+    "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "To be provided",
+      "type": "string"
+    },
+    "sources": {
+      "input": {
+        "type": "source-input",
+        "properties": {}
+      }
+    }
+  },
+  "vnf-id": {
+    "name": "vnf-id",
+    "tags": "vnf-id",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "vnf-id",
+      "type": "string"
+    },
+    "sources": {
+      "input": {
+        "type": "source-input",
+        "properties": {}
+      }
+    }
+  },
+  "vnf_name": {
+    "name": "vnf_name",
+    "tags": "vnf_name",
+    "updated-by": "Singal, Kapil <ks220y@att.com>",
+    "property": {
+      "description": "vnf_name",
+      "type": "string"
+    },
+    "sources": {
+      "mdsal": {
+        "type": "source-rest",
+        "properties": {
+          "type": "JSON",
+          "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+          "path": "/param/0/value",
+          "input-key-mapping": {
+            "service-instance-id": "service-instance-id",
+            "vnf-id": "vnf-id"
+          },
+          "output-key-mapping": {
+            "vnf_name": "value"
+          },
+          "key-dependencies": [
+            "service-instance-id",
+            "vnf-id"
+          ]
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionaty_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionaty_types.json
deleted file mode 100644
index 0e0dcd23..00000000
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/resources_dictionaty_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-
-}
\ No newline at end of file
diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json
index a29a875c..51d70ede 100644
--- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json
@@ -11,12 +11,12 @@
       "operations": {

         "process": {

           "inputs": {

-           "template-name": {

+            "template-name": {

               "description": "Service Template Name.",

               "required": true,

               "type": "string"

             },

-           "template-version": {

+            "template-version": {

               "description": "Service Template Version.",

               "required": true,

               "type": "string"

@@ -34,6 +34,14 @@
                 "type": "string"

               }

             },

+            "artifact-prefix-names": {

+              "required": false,

+              "description": "Template , Resource Assignment Artifact Prefix names",

+              "type": "list",

+              "entry_schema": {

+                "type": "string"

+              }

+            },

             "request-id": {

               "description": "Request Id, Unique Id for the request.",

               "required": true,