Update vFW_CDS packages

Issue-ID: CCSDK-1825
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I53668b3df0cf13ceaa78cbffc92df05db23fe642
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>

1 files changed, 301 insertions, 264 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
index 148696443..86a5cc857 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json
@@ -1,70 +1,66 @@
 [
   {
-    "name": "service-instance-id",
+    "name": "cloud_env",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
+    "dictionary-name": "cloud_env",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
   {
-    "name": "vnf-id",
+    "name": "vpg_int_private1_ip_0",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
+    "dictionary-name": "vpg_int_private1_ip_0",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
-  {
-    "name": "vnf-name",
+    {
+    "name": "nexus_artifact_repo",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vnf-name",
+    "dictionary-name": "nexus_artifact_repo",
     "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
@@ -72,216 +68,237 @@
     ],
     "version": 0
   },
+  
+  
+  
   {
-    "name": "vnf-model-customization-uuid",
+    "name": "vfw_int_private2_floating_ip",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vnf-model-customization-uuid",
-    "dictionary-source": "input",
+    "dictionary-name": "vfw_int_private2_floating_ip",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
   {
-    "name": "vf-module-id",
+    "name": "vfw_int_private1_ip_0",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vf-module-id",
-    "dictionary-source": "input",
+    "dictionary-name": "vfw_int_private1_ip_0",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
+  
   {
-    "name": "vf-module-type",
+    "name": "vfw_int_private2_ip_0",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
+    "dictionary-name": "vfw_int_private2_ip_0",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      "vf-module-model-customization-uuid"
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
+  
+  
+  
+   
+     
   {
-    "name": "vf-module-model-customization-uuid",
+    "name": "private1-prefix-id",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
+      
     },
     "input-param": false,
-    "dictionary-name": "vf-module-model-customization-uuid",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ],
+    "dictionary-name": "private1-prefix-id",
+    "dictionary-source": "processor-db",
+    "dependencies": [],
     "version": 0
   },
-  {
-    "name": "vfccustomizationuuid",
+    {
+    "name": "management-prefix-id",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
+      
     },
     "input-param": false,
-    "dictionary-name": "vfccustomizationuuid",
+    "dictionary-name": "management-prefix-id",
     "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-model-customization-uuid"
-    ],
+    "dependencies": [],
     "version": 0
   },
   {
-    "name": "aic-cloud-region",
+    "name": "onap_private_net_cidr",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "aic-cloud-region",
-    "dictionary-source": "input",
+    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
   {
-    "name": "vm-type",
+    "name": "vf-module-name",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "${vf-module-name}"
+    },
+    "input-param": false,
+    "dictionary-name": "vf-module-name",
+    "dictionary-source": "default",
+    "dependencies": [],
+    "version": 0
+  },
+  {
+    "name": "install_script_version",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
+	
     },
     "input-param": false,
-    "dictionary-name": "vm-type",
-    "dictionary-source": "processor-db",
+    "dictionary-name": "install_script_version",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+	 "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
-  {
-    "name": "vnfc-model-invariant-uuid",
+    {
+    "name": "demo_artifacts_version",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
+	
     },
     "input-param": false,
-    "dictionary-name": "vnfc-model-invariant-uuid",
-    "dictionary-source": "processor-db",
+    "dictionary-name": "demo_artifacts_version",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      "vfccustomizationuuid"
+	 "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
+
+ 
+ 
   {
-    "name": "vnfc-model-version",
+    "name": "nfc-naming-code",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vnfc-model-version",
+    "dictionary-name": "nfc-naming-code",
     "dictionary-source": "processor-db",
     "dependencies": [
       "vfccustomizationuuid"
@@ -289,97 +306,90 @@
     "version": 0
   },
   {
-    "name": "nf-role",
+    "name": "onap_private_net_id",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "vFW"
+      }
     },
     "input-param": false,
-    "dictionary-name": "nf-role",
-    "dictionary-source": "default",
+    "dictionary-name": "onap_private_net_id",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      "vnf-model-customization-uuid"
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
   {
-    "name": "nfc-naming-code",
+    "name": "onap_private_subnet_id",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "nfc-naming-code",
-    "dictionary-source": "processor-db",
+    "dictionary-name": "onap_private_subnet_id",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      "vfccustomizationuuid"
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
-  {
-    "name": "public_net_id",
+    {
+    "name": "int_private1_net_cidr",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "public_net_id"
+      }
     },
     "input-param": false,
-    "dictionary-name": "public_net_id",
-    "dictionary-source": "default",
+    "dictionary-name": "int_private1_net_cidr",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
-  {
-    "name": "image_name",
+      {
+    "name": "int_private2_net_cidr",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "image_name",
+    "dictionary-name": "int_private2_net_cidr",
     "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
@@ -388,23 +398,21 @@
     "version": 0
   },
   {
-    "name": "key_name",
+    "name": "public_net_id",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "key_name",
+    "dictionary-name": "public_net_id",
     "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
@@ -412,7 +420,8 @@
     ],
     "version": 0
   },
-  {
+
+   {
     "name": "pub_key",
     "property": {
       "description": "",
@@ -420,9 +429,7 @@
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
@@ -438,23 +445,21 @@
     "version": 0
   },
   {
-    "name": "onap_private_net_id",
+    "name": "sec_group",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "onap_private_net_id",
+    "dictionary-name": "sec_group",
     "dictionary-source": "sdnc",
     "dependencies": [
       "service-instance-id",
@@ -463,319 +468,351 @@
     "version": 0
   },
   {
-    "name": "onap_private_subnet_id",
+    "name": "service-instance-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"
-    ],
+    "dictionary-name": "service-instance-id",
+    "dictionary-source": "input",
+    "dependencies": [],
     "version": 0
   },
+ 
   {
-    "name": "unprotected_private_net_cidr",
+    "name": "vfw_name_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "${vfw_name_0}"
+    },
+    "input-param": false,
+    "dictionary-name": "vfw_name_0",
+    "dictionary-source": "default",
+    "dependencies": [],
+    "version": 0
+  },
+    {
+    "name": "vfw_onap_private_ip_0",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      },
+      "default": "${vfw_onap_private_ip_0}"
+    },
+    "input-param": false,
+    "dictionary-name": "vfw_onap_private_ip_0",
+    "dictionary-source": "default",
+    "dependencies": [],
+    "version": 0
+  },
+ 
+  {
+    "name": "vf-module-id",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "unprotected_private_net_cidr",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      
-    ],
+    "dictionary-name": "vf-module-id",
+    "dictionary-source": "input",
+    "dependencies": [],
     "version": 0
   },
   {
-    "name": "protected_private_net_cidr",
+    "name": "vf-module-label",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "protected_private_net_cidr",
+    "dictionary-name": "vf-module-label",
     "dictionary-source": "processor-db",
     "dependencies": [
-      
+      "vf-module-model-customization-uuid"
     ],
     "version": 0
   },
   {
-    "name": "nexus_artifact_repo",
+    "name": "vf-module-model-customization-uuid",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "nexus_artifact_repo"
+      }
     },
     "input-param": false,
-    "dictionary-name": "nexus_artifact_repo",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ],
+    "dictionary-name": "vf-module-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [],
     "version": 0
   },
   {
-    "name": "sec_group",
+    "name": "vf-module-type",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "onap_sg_PUhf"
+      }
     },
     "input-param": false,
-    "dictionary-name": "sec_group",
-    "dictionary-source": "default",
+    "dictionary-name": "vf-module-type",
+    "dictionary-source": "processor-db",
     "dependencies": [
-      
+      "vf-module-model-customization-uuid"
     ],
     "version": 0
   },
+    {
+    "name": "vf-naming-policy",
+    "property": {
+      "description": "",
+      "required": false,
+      "type": "string",
+      "status": "",
+      "constraints": [
+        {}
+      ],
+      "entry_schema": {
+        "type": ""
+      }
+	  },
+    "input-param": false,
+    "dictionary-name": "vf-naming-policy",
+    "dictionary-source": "sdnc",
+    "dependencies": [
+	  "service-instance-id",
+      "vnf-id"
+	],
+    "version": 0
+  },
+  
   {
-    "name": "onap_private_net_cidr",
+    "name": "vfccustomizationuuid",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "onap_private_net_cidr",
+    "dictionary-name": "vfccustomizationuuid",
     "dictionary-source": "processor-db",
     "dependencies": [
-      
+      "vf-module-model-customization-uuid"
     ],
     "version": 0
   },
+ 
   {
-    "name": "vfw_name_0",
+    "name": "vnf-id",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vfw_name_0",
+    "dictionary-name": "vnf-id",
     "dictionary-source": "input",
-    "dependencies": [
-      
-    ],
+    "dependencies": [],
     "version": 0
   },
   {
-    "name": "vf-naming-policy",
+    "name": "vnf-model-customization-uuid",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
-      },
-      "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP"
+      }
     },
     "input-param": false,
-    "dictionary-name": "vf-naming-policy",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ],
+    "dictionary-name": "vnf-model-customization-uuid",
+    "dictionary-source": "input",
+    "dependencies": [],
     "version": 0
   },
   {
-    "name": "vf_module_name",
+    "name": "vnf_name",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vf_module_name",
-    "dictionary-source": "input",
+    "dictionary-name": "vnf_name",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
+      "service-instance-id",
+      "vnf-id"
     ],
     "version": 0
   },
   {
-    "name": "vf-module-label",
+    "name": "vnfc-model-invariant-uuid",
     "property": {
       "description": "",
-      "required": true,
+      "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vf-module-label",
+    "dictionary-name": "vnfc-model-invariant-uuid",
     "dictionary-source": "processor-db",
     "dependencies": [
-      "vf-module-model-customization-uuid"
+      "vfccustomizationuuid"
     ],
     "version": 0
   },
   {
-    "name": "private-prefix-id",
+    "name": "vfw_image_name",
     "property": {
       "description": "",
       "required": false,
-      "type": "integer",
+      "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
-    },
+	  },
     "input-param": false,
-    "dictionary-name": "private-prefix-id",
-    "dictionary-source": "processor-db",
+    "dictionary-name": "image_name",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
-    ],
+	  "service-instance-id",
+      "vnf-id"
+	  ],
     "version": 0
   },
-  {
-    "name": "vfw_private_ip_2",
+   {
+    "name": "vfw_flavor_name",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
-    },
+	  },
     "input-param": false,
-    "dictionary-name": "vfw_private_ip_2",
-    "dictionary-source": "input",
+    "dictionary-name": "flavor_name",
+    "dictionary-source": "sdnc",
     "dependencies": [
-      
-    ],
+	  "service-instance-id",
+      "vnf-id"
+	  ],
     "version": 0
   },
   {
-    "name": "vnf_name",
+    "name": "vnfc-model-version",
     "property": {
       "description": "",
       "required": false,
       "type": "string",
       "status": "",
       "constraints": [
-        {
-          
-        }
+        {}
       ],
       "entry_schema": {
         "type": ""
       }
     },
     "input-param": false,
-    "dictionary-name": "vnf_name",
-    "dictionary-source": "input",
+    "dictionary-name": "vnfc-model-version",
+    "dictionary-source": "processor-db",
     "dependencies": [
-      
+      "vfccustomizationuuid"
     ],
     "version": 0
   }
-]
+]
\ No newline at end of file