vFW CNF updates after integration tests

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Definitions / data_types.json

diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
index 5f3a2c0..53d1197 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
@@ -1,68 +1,47 @@
 {
     "data_types": {
-        "dt-config-deploy-properties": {
-            "description": "Dynamic DataType definition for workflow(config-deploy).",
+        "dt-config-assign-properties": {
+            "description": "Dynamic DataType definition for workflow(config-assign).",
             "version": "1.0.0",
             "properties": {
-                "vpg_onap_private_ip_0": {
+                "service-instance-id": {
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                        {}
-                    ],
-                    "entry_schema": {
-                        "type": ""
-                    }
+                    "type": "string"
                 },
                 "vnf-id": {
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                        {}
-                    ],
-                    "entry_schema": {
-                        "type": ""
-                    }
+                    "type": "string"
+                },
+                "vf-modules-list": {
+                    "type": "json"
                 },
+                "config-deploy-setup": {
+                    "type": "json"
+                }
+            },
+            "derived_from": "tosca.datatypes.Dynamic"
+        },
+        "dt-config-deploy-properties": {
+            "description": "Dynamic DataType definition for workflow(config-deploy).",
+            "version": "1.0.0",
+            "properties": {
                 "service-instance-id": {
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                        {}
-                    ],
-                    "entry_schema": {
-                        "type": ""
-                    }
+                    "type": "string"
                 },
-                "active-streams": {
+                "vnf-id": {
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                        {}
-                    ],
-                    "entry_schema": {
-                        "type": ""
-                    }
+                    "type": "string"
                 },
-                "put-active-streams": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "status": "",
-                    "constraints": [
-                        {}
-                    ],
-                    "entry_schema": {
-                        "type": ""
-                    }
+                "vf-modules-list": {
+                    "type": "json"
+                },
+                "config-deploy-setup": {
+                    "type": "json"
                 }
             },
             "derived_from": "tosca.datatypes.Dynamic"
@@ -73,22 +52,45 @@
             "properties": {
                 "vpg-management-port": {
                     "description": "SSH external port of optional ssh service for vPKG.",
-                    "type": "string",
-                    "default": "0"
+                    "type": "integer",
+                    "default": 0
                 },
                 "k8s-rb-profile-namespace": {
                     "description": "K8s namespace to create helm chart for specified profile",
-                    "type": "string",
-                    "default": "default"
+                    "type": "string"
                 },
                 "k8s-rb-profile-name": {
                     "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
                     "type": "string"
                 },
+                "k8s-rb-instance-release-name": {
+                    "description": "Name of the release for the helm package instance in k8s",
+                    "type": "string"
+                },
                 "k8s-rb-profile-source": {
                     "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
                     "type": "string"
                 },
+                "k8s-rb-profile-k8s-version": {
+                    "description": "Profile k8s version used in multicloud/k8s plugin",
+                    "type": "string"
+                },
+                "k8s-rb-config-template-name": {
+                    "description": "The name of configuration template for config-assign operation",
+                    "type": "string"
+                },
+                "k8s-rb-config-template-source": {
+                    "description": "The source of configuration template for config-assign operation",
+                    "type": "string"
+                },
+                "k8s-rb-config-name": {
+                    "description": "The source of configuration values for config-deploy operation",
+                    "type": "string"
+                },
+                "k8s-rb-config-value-source": {
+                    "description": "The source of configuration values for config-deploy operation",
+                    "type": "string"
+                },
                 "private1-prefix-id": {
                     "description": "",
                     "required": false,