CDS Blueprint for vFW K8s Use Case

Introduce blueprint changes on top of latest
vFW demo to also support multicloud/K8s plugin
integration.

This commit brings resource resolution part for
k8s related parameters that are enough to instantiate
CNF defined by Helm charts in multicloud/k8s plugin.

Issue-ID: INT-1260

Signed-off-by: Samuli Silvius <s.silvius@partner.samsung.com>
Change-Id: I783e364a201cda25ea812d83795ae2a4be71def9

1 files changed, 47 insertions, 53 deletions

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
index 532e157f..a4b74507 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -43,7 +43,7 @@
     ],
     "version": 0
   },
-  
+
   {
     "name": "vf-module-name",
     "property": {
@@ -88,54 +88,6 @@
     "version": 0
   },
   {
-    "name": "dcae_collector_ip",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "10.0.4.1"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_ip",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "dcae_collector_port",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      },
-      "default": "30235"
-    },
-    "input-param": false,
-    "dictionary-name": "dcae_collector_port",
-    "dictionary-source": "default",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
     "name": "demo_artifacts_version",
     "property": {
       "description": "",
@@ -747,7 +699,7 @@
       "entry_schema": {
         "type": ""
       }
-      
+
     },
     "input-param": false,
     "dictionary-name": "private1-prefix-id",
@@ -768,7 +720,7 @@
       "entry_schema": {
         "type": ""
       }
-      
+
     },
     "input-param": false,
     "dictionary-name": "management-prefix-id",
@@ -789,12 +741,54 @@
       "entry_schema": {
         "type": ""
       }
-      
+
     },
     "input-param": false,
     "dictionary-name": "private2-prefix-id",
     "dictionary-source": "processor-db",
     "dependencies": [],
     "version": 0
+  },
+  {
+    "name": "k8s-rb-profile-name",
+    "property": {
+      "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-name",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "int_private2_gw_ip",
+    "property": {
+      "description": "Private protected network gateway ip",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "int_private2_gw_ip",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "int_private2_net_id",
+    "property": {
+      "description": "Private protected network identification",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "int_private2_net_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
   }
-]
\ No newline at end of file
+]