Correct CBA package for vFW_CNF_CDS usecase

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Templates / vpkg-mapping.json

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
index 03e9afa..5c665c1 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -175,52 +175,6 @@
     ],
     "version": 0
   },
-  {
-    "name": "onap_private_net_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_net_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
-  {
-    "name": "onap_private_subnet_id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "onap_private_subnet_id",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  },
   {
     "name": "public_net_id",
     "property": {
@@ -857,15 +811,28 @@
     ]
   },
   {
-    "name": "k8s-rb-profile-namespace",
+    "name": "onap_private_net_id",
     "property": {
-      "description": "K8s namespace to create helm chart for specified profile",
-      "type": "string",
-      "default": "default"
+      "description": "onap private net id",
+      "type": "string"
     },
     "input-param": false,
-    "dictionary-name": "k8s-rb-profile-namespace",
-    "dictionary-source": "default",
+    "dictionary-name": "onap_private_net_id",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
+  },
+  {
+    "name": "onap_private_subnet_id",
+    "property": {
+      "description": "onap private subnet id",
+      "type": "string"
+    },
+    "input-param": false,
+    "dictionary-name": "onap_private_subnet_id",
+    "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
@@ -874,7 +841,7 @@
   {
     "name": "int_private1_net_id",
     "property": {
-      "description": "Private unprotected network identification",
+      "description": "private1 net id",
       "type": "string"
     },
     "input-param": false,
@@ -884,5 +851,20 @@
       "service-instance-id",
       "vnf-id"
     ]
+  },
+  {
+    "name": "k8s-rb-profile-namespace",
+    "property": {
+      "description": "K8s namespace to create helm chart for specified profile",
+      "type": "string",
+      "default": "default"
+    },
+    "input-param": false,
+    "dictionary-name": "k8s-rb-profile-namespace",
+    "dictionary-source": "default",
+    "dependencies": [
+      "service-instance-id",
+      "vnf-id"
+    ]
   }
 ]