From f29702c7952c99768f7ec2f378ae39916071b420 Mon Sep 17 00:00:00 2001
From: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Date: Fri, 10 Jan 2020 12:35:01 -0800
Subject: 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>
---
 .../vFW/Definitions/data_types.json                | 292 ++++++++++++++++-----
 1 file changed, 222 insertions(+), 70 deletions(-)

(limited to 'components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json')

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
index b7109251e..4df92dd3e 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/data_types.json
@@ -1,21 +1,78 @@
 {
   "data_types" : {
+    "dt-config-deploy-properties" : {
+      "description" : "Dynamic DataType definition for workflow(config-deploy).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vpg_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnf-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "service-instance-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "active-streams" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "put-active-streams" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
+      },
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
     "dt-resource-assignment-properties" : {
       "description" : "Dynamic DataType definition for workflow(resource-assignment).",
       "version" : "1.0.0",
       "properties" : {
-        "nf-role" : {
+        "vf-module-name" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "default" : "vSN",
+          "default" : "${vf-module-name}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vm-type" : {
+        "private1-prefix-id" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -27,7 +84,27 @@
         },
         "vnf-id" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vsn_flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vfw_int_private2_ip_0" : {
+          "description" : "",
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -37,17 +114,15 @@
         },
         "public_net_id" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "value" : "public_net_id",
-          "default" : "public_net_id",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vnf_name" : {
+        "sec_group" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -57,7 +132,7 @@
             "type" : ""
           }
         },
-        "vfw_private_ip_1" : {
+        "nfc-naming-code" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -67,27 +142,28 @@
             "type" : ""
           }
         },
-        "unprotected-prefix-id" : {
+        "vnfc-model-invariant-uuid" : {
           "description" : "",
           "required" : false,
-          "type" : "integer",
+          "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
           "entry_schema" : {
             "type" : ""
           }
         },
-        "onap_private_subnet_id" : {
+        "vfw_name_0" : {
           "description" : "",
           "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vfw_name_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vfw_private_ip_0" : {
+        "nexus_artifact_repo" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -97,9 +173,9 @@
             "type" : ""
           }
         },
-        "aic-cloud-region" : {
+        "onap_private_net_cidr" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -107,18 +183,18 @@
             "type" : ""
           }
         },
-        "sec_group" : {
+        "vpg_onap_private_ip_0" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "default" : "onap_sg_PUhf",
+          "default" : "vpg_onap_private_ip_0",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vfw_private_ip_2" : {
+        "image_name" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -128,9 +204,9 @@
             "type" : ""
           }
         },
-        "vnfc-model-invariant-uuid" : {
+        "flavor_name" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -138,29 +214,31 @@
             "type" : ""
           }
         },
-        "nfc-naming-code" : {
+        "dcae_collector_ip" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "10.0.4.1",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "private-prefix-id" : {
+        "vpg_name_0" : {
           "description" : "",
           "required" : false,
-          "type" : "integer",
+          "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vpg_name_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vf-module-model-customization-uuid" : {
+        "vf-naming-policy" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -168,7 +246,7 @@
             "type" : ""
           }
         },
-        "vfw_name_0" : {
+        "int_private2_net_cidr" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -178,7 +256,7 @@
             "type" : ""
           }
         },
-        "vf_module_name" : {
+        "vfccustomizationuuid" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -188,21 +266,20 @@
             "type" : ""
           }
         },
-        "nexus_artifact_repo" : {
+        "vsn_name_0" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "value" : "nexus_artifact_repo",
-          "default" : "nexus_artifact_repo",
+          "default" : "${vsn_name_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "onap_private_net_cidr" : {
+        "onap_private_net_id" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -210,7 +287,7 @@
             "type" : ""
           }
         },
-        "image_name" : {
+        "demo_artifacts_version" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -220,9 +297,9 @@
             "type" : ""
           }
         },
-        "vf-nf-code" : {
+        "vnf-model-customization-uuid" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -230,19 +307,20 @@
             "type" : ""
           }
         },
-        "vf-module-id" : {
+        "vfw_int_private1_ip_0" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vfw_int_private1_ip_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vf-module-label" : {
+        "key_name" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -250,7 +328,7 @@
             "type" : ""
           }
         },
-        "vsn_private_ip_0" : {
+        "install_script_version" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -260,7 +338,7 @@
             "type" : ""
           }
         },
-        "vpg_name_0" : {
+        "vfw_image_name" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -270,19 +348,20 @@
             "type" : ""
           }
         },
-        "vpg_private_ip_1" : {
+        "vfw_onap_private_ip_0" : {
           "description" : "",
           "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vfw_onap_private_ip_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "protected_private_net_cidr" : {
+        "vnf_name" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -290,18 +369,17 @@
             "type" : ""
           }
         },
-        "vf-naming-policy" : {
+        "onap_private_subnet_id" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
-          "default" : "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vpg_private_ip_0" : {
+        "aic-cloud-region" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -311,7 +389,7 @@
             "type" : ""
           }
         },
-        "vsn_private_ip_1" : {
+        "vsn_int_private2_ip_0" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -321,9 +399,9 @@
             "type" : ""
           }
         },
-        "vfccustomizationuuid" : {
+        "vf-module-model-customization-uuid" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -331,9 +409,9 @@
             "type" : ""
           }
         },
-        "unprotected_private_net_cidr" : {
+        "vsn_image_name" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -341,7 +419,7 @@
             "type" : ""
           }
         },
-        "vsn_name_0" : {
+        "vpg_flavor_name" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -351,7 +429,58 @@
             "type" : ""
           }
         },
-        "onap_private_net_id" : {
+        "vf-module-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "dcae_collector_port" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "default" : "30235",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-label" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vfw_int_private2_floating_ip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_image_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "private2-prefix-id" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -363,7 +492,7 @@
         },
         "vnfc-model-version" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -373,7 +502,7 @@
         },
         "service-instance-id" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -381,19 +510,30 @@
             "type" : ""
           }
         },
-        "vf-module-type" : {
+        "vsn_onap_private_ip_0" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vsn_onap_private_ip_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vnf-model-customization-uuid" : {
+        "vfw_flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-type" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
@@ -411,7 +551,17 @@
             "type" : ""
           }
         },
-        "key_name" : {
+        "management-prefix-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "int_private1_net_cidr" : {
           "description" : "",
           "required" : false,
           "type" : "string",
@@ -421,22 +571,24 @@
             "type" : ""
           }
         },
-        "protected-prefix-id" : {
+        "vpg_int_private1_ip_0" : {
           "description" : "",
           "required" : false,
-          "type" : "integer",
+          "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "${vpg_int_private1_ip_0}",
           "entry_schema" : {
             "type" : ""
           }
         },
-        "vnf-name" : {
+        "cloud_env" : {
           "description" : "",
-          "required" : true,
+          "required" : false,
           "type" : "string",
           "status" : "",
           "constraints" : [ { } ],
+          "default" : "openstack",
           "entry_schema" : {
             "type" : ""
           }
-- 
cgit 1.2.3-korg