X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvnf-mapping.json;h=e0728241f39808e3be76aca789688a17dfea364a;hb=be3024dfe9b6c06419c6f4a5f724a01b7e0ab103;hp=a1d411994f0f38a894507b93e867df1c9a26e5e9;hpb=42ecc70c1f5a05c4de5dda414a7964398552b47d;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
index a1d41199..e0728241 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -115,7 +115,7 @@
       "entry_schema": {
         "type": ""
       },
-	  "default":"vpg_onap_private_ip_0"
+	  "default":"${vpg_onap_private_ip_0}"
     },
     "input-param": false,
     "dictionary-name": "vpg_onap_private_ip_0",
@@ -436,48 +436,6 @@
     "dependencies": [],
     "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": "input",
-    "dependencies": [],
-    "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": "input",
-    "dependencies": [],
-    "version": 0
-  },
   {
     "name": "vfw_int_private2_ip_0",
     "property": {
@@ -638,7 +596,7 @@
     "property": {
       "description": "Private unprotected network gateway ip",
       "type": "string",
-      "default": "192.168.10.1/24"
+      "default": "${int_private1_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "int_private1_gw_ip",
@@ -646,38 +604,12 @@
     "dependencies": [
     ]
   },
-  {
-    "name": "int_private1_net_id",
-    "property": {
-      "description": "Private unprotected network identification",
-      "type": "string",
-      "default": "${int_private1_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_net_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
-    "name": "int_private1_subnet_id",
-    "property": {
-      "description": "Private unprotected subnetwork identification",
-      "type": "string",
-      "default": "${int_private1_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private1_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
   {
     "name": "int_private2_gw_ip",
     "property": {
       "description": "Private protected network gateway ip",
       "type": "string",
-      "default": "192.168.20.1/24"
+      "default": "${int_private2_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "int_private2_gw_ip",
@@ -685,38 +617,12 @@
     "dependencies": [
     ]
   },
-  {
-    "name": "int_private2_net_id",
-    "property": {
-      "description": "Private protected network identification",
-      "type": "string",
-      "default": "${int_private2_net_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_net_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
-  {
-    "name": "int_private2_subnet_id",
-    "property": {
-      "description": "Private protected subnetwork identification",
-      "type": "string",
-      "default": "${int_private2_subnet_id}"
-    },
-    "input-param": false,
-    "dictionary-name": "int_private2_subnet_id",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  },
   {
     "name": "onap_private_gw_ip",
     "property": {
       "description": "Private onap management network gateway ip",
       "type": "string",
-      "default": "10.10.0.1/16"
+      "default": "${onap_private_gw_ip}"
     },
     "input-param": false,
     "dictionary-name": "onap_private_gw_ip",