Fix service blueprints

Blueprints were failing enrichment. Cba's were referencing requirement
restconf-connection which is not defined in component-netconf-executor.

Added new capability for restconf and fixed referencing

Issue-ID: CCSDK-2859
Change-Id: I13f8800ea5fad9daed8a8b7b81cc3649efbebbc9
Signed-off-by: Jozsef Csongvai <jozsef.csongvai@bell.ca>

1 files changed, 991 insertions, 1149 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
index 9f7aa9d83..83ff60d51 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vLB/Definitions/data_types.json
@@ -1,1157 +1,999 @@
 {
-   "data_types": {
-      "dt-config-assign-properties": {
-         "description": "Dynamic DataType definition for workflow(config-assign).",
-         "version": "1.0.0",
-         "properties": {
-            "vdns_int_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": ""
-               }
-            },
-            "vdns_vf_module_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "service-instance-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+  "data_types" : {
+    "dt-HealthCheck-properties" : {
+      "description" : "Dynamic DataType definition for workflow(HealthCheck).",
+      "version" : "1.0.0",
+      "properties" : {
+        "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" : ""
+          }
+        },
+        "ip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-config-deploy-properties": {
-         "description": "Dynamic DataType definition for workflow(config-deploy).",
-         "version": "1.0.0",
-         "properties": {
-            "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": ""
-               }
-            },
-            "ip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-ScaleOutReconfiguration-properties" : {
+      "description" : "Dynamic DataType definition for workflow(ScaleOutReconfiguration).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vdns_int_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" : ""
+          }
+        },
+        "vdns_vf_module_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "service-instance-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-HealthCheck-properties": {
-         "description": "Dynamic DataType definition for workflow(config-deploy).",
-         "version": "1.0.0",
-         "properties": {
-            "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": ""
-               }
-            },
-            "ip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-config-assign-properties" : {
+      "description" : "Dynamic DataType definition for workflow(config-assign).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vdns_int_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" : ""
+          }
+        },
+        "vdns_vf_module_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "service-instance-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-ScaleOutReconfiguration-properties": {
-         "description": "Dynamic DataType definition for workflow(config-deploy).",
-         "version": "1.0.0",
-         "properties": {
-            "vnf-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-			          "vf-module-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "service-instance-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "ip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_int_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_vf_module_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-config-deploy-properties" : {
+      "description" : "Dynamic DataType definition for workflow(config-deploy).",
+      "version" : "1.0.0",
+      "properties" : {
+        "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" : ""
+          }
+        },
+        "ip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-vf-config-assign-properties": {
-         "description": "Dynamic DataType definition for workflow(config-assign).",
-         "version": "1.0.0",
-         "properties": {
-            "vdns_int_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": ""
-               }
-            },
-            "vdns_vf_module_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "service-instance-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-resource-assignment-properties" : {
+      "description" : "Dynamic DataType definition for workflow(resource-assignment).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vlb_int_pktgen_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "private1-prefix-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnf-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_private_net_cidr" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_private_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "default" : "private1",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vdns_onap_private_ip_0.replaceAll(\"/.+\", \"\")}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_image_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "public_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-assign" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vf-module-assign}_${service-instance-id}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "sec_group" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "nfc-naming-code" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnfc-model-invariant-uuid" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "nexus_artifact_repo" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "onap_private_net_cidr" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_name_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_int_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vdns_int_private_ip_0.replaceAll(\"/.+\", \"\")}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "image_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "dcae_collector_ip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_name_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vip.replaceAll(\"/.+\", \"\")}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-naming-policy" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "int_private_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vnf_name}_${int_private_net_id}"
+          },
+          "default" : "private1",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vfccustomizationuuid" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "onap_private_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "demo_artifacts_version" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_int_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnf-model-customization-uuid" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "int_private_subnet_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vnf_name}_${int_private_subnet_id}_subnet"
+          },
+          "default" : "private1",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "key_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_name_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_0_int_pktgen_private_port_0_mac" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "install_script_version" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "int_pktgen_private_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vnf_name}_${int_pktgen_private_net_id}"
+          },
+          "default" : "private2",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vm-type" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnf_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "onap_private_subnet_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "aic-cloud-region" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "gre_ipaddr" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${gre_ipaddr.replaceAll(\"/.+\", \"\")}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-model-customization-uuid" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "pg_int" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${pg_int.replaceAll(\"/.+\", \"\")}"
+          },
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "dcae_collector_port" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-label" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "pktgen_private_net_cidr" : {
+          "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",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_flavor_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnfc-model-version" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "service-instance-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "nb_api_version" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vpg_int_pktgen_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vf-module-type" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "pub_key" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "management-prefix-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "int_pktgen_private_subnet_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "metadata" : {
+            "transform-template" : "${vnf_name}_${int_pktgen_private_subnet_id}_subnet"
+          },
+          "default" : "private2",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "pktgen_private_net_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "default" : "private2",
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "create-md-sal-vnf-param" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vnf_assign_aai" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "cloud_env" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_image_name" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vlb_0_int_pktgen_private_port_0_mac" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-vf-config-deploy-properties": {
-         "description": "Dynamic DataType definition for workflow(config-deploy).",
-         "version": "1.0.0",
-         "properties": {
-            "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": ""
-               }
-            },
-            "ip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-vf-config-assign-properties" : {
+      "description" : "Dynamic DataType definition for workflow(vf-config-assign).",
+      "version" : "1.0.0",
+      "properties" : {
+        "vdns_int_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" : ""
+          }
+        },
+        "vdns_vf_module_id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "service-instance-id" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        },
+        "vdns_onap_private_ip_0" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
       },
-      "dt-resource-assignment-properties": {
-         "description": "Dynamic DataType definition for workflow(resource-assignment).",
-         "version": "1.0.0",
-         "properties": {
-            "vlb_int_pktgen_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_0_int_pktgen_private_port_0_mac": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-assign": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnf_assign_aai": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vpg_0_int_pktgen_private_port_0_mac": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "private1-prefix-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnf-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_private_net_cidr": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_image_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "public_net_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "sec_group": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "nfc-naming-code": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnfc-model-invariant-uuid": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "nexus_artifact_repo": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "onap_private_net_cidr": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vpg_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_name_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_int_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "image_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "flavor_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "dcae_collector_ip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vpg_name_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vip": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-naming-policy": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "int_private_net_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vfccustomizationuuid": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "onap_private_net_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "demo_artifacts_version": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_int_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnf-model-customization-uuid": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "int_private_subnet_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "key_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_name_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "install_script_version": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "int_pktgen_private_net_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vm-type": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnf_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "keypair": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "onap_private_subnet_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "aic-cloud-region": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "gre_ipaddr": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-model-customization-uuid": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "pg_int": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vpg_flavor_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "dcae_collector_port": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-label": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_flavor_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "pktgen_private_net_cidr": {
-               "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",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vdns_flavor_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vnfc-model-version": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "service-instance-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "nb_api_version": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vpg_int_pktgen_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vf-module-type": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "pub_key": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "management-prefix-id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "int_pktgen_private_subnet_id": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "create-md-sal-vnf-param": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_onap_private_ip_0": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "cloud_env": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            },
-            "vlb_image_name": {
-               "description": "",
-               "required": false,
-               "type": "string",
-               "status": "",
-               "constraints": [
-                  {}
-               ],
-               "entry_schema": {
-                  "type": ""
-               }
-            }
-         },
-         "derived_from": "tosca.datatypes.Dynamic"
-      }
-   }
+      "derived_from" : "tosca.datatypes.Dynamic"
+    },
+    "dt-vf-config-deploy-properties" : {
+      "description" : "Dynamic DataType definition for workflow(vf-config-deploy).",
+      "version" : "1.0.0",
+      "properties" : {
+        "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" : ""
+          }
+        },
+        "ip" : {
+          "description" : "",
+          "required" : false,
+          "type" : "string",
+          "status" : "",
+          "constraints" : [ { } ],
+          "entry_schema" : {
+            "type" : ""
+          }
+        }
+      },
+      "derived_from" : "tosca.datatypes.Dynamic"
+    }
+  }
 }
\ No newline at end of file