Pretty print json files in heat/

Fixing json files to conform to linter rules.

Change-Id: Ia758a50adffb13889255511594aacc03f66f4e4b
Issue-ID: INT-1482
Signed-off-by: Bartek Grzybowski <b.grzybowski@partner.samsung.com>

9 files changed, 1885 insertions, 1749 deletions

diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/artifact_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/artifact_types.json
index da498e35..bf55ac53 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/artifact_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/artifact_types.json
@@ -1,16 +1,20 @@
 {
-  "artifact_types" : {
-    "artifact-mapping-resource" : {
-      "description" : "Resource Mapping File used along with Configuration template",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json" ]
-    },
-    "artifact-template-velocity" : {
-      "description" : " Velocity Template used for Configuration",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "vtl" ]
+    "artifact_types": {
+        "artifact-mapping-resource": {
+            "description": "Resource Mapping File used along with Configuration template",
+            "version": "1.0.0",
+            "derived_from": "tosca.artifacts.Implementation",
+            "file_ext": [
+                "json"
+            ]
+        },
+        "artifact-template-velocity": {
+            "description": " Velocity Template used for Configuration",
+            "version": "1.0.0",
+            "derived_from": "tosca.artifacts.Implementation",
+            "file_ext": [
+                "vtl"
+            ]
+        }
     }
-  }
-}
\ No newline at end of file
+}
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 4ce487b8..2a534d4f 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
@@ -1,175 +1,185 @@
 {
-  "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" : {
-        "vpg-management-port" : {
-            "description" : "SSH external port of ssh. When 0 ssh service will not be exposed",
-            "type" : "string",
-            "default" : "0"
-        },
-        "k8s-rb-profile-namespace" : {
-          "description" : "K8s namespace to create helm chart for specified profile",
-          "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"
-        },
-        "private1-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "private2-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vnf-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "service-instance-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vnf_name" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "demo_artifacts_version" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "default" : "1.5.0"
-        },
-        "aic-cloud-region" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vf-module-model-customization-uuid" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "onap_private_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "management-prefix-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "dcae_collector_ip" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "default" : "10.0.4.1"
-        },
-        "int_private1_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vf-module-id" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "dcae_collector_port" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string",
-          "default" : "30235"
-        },
-        "vf-module-label" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vf-module-model-invariant-uuid" : {
-          "type" : "string"
-        },
-        "vf-naming-policy" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "int_private2_net_cidr" : {
-          "description" : "",
-          "required" : false,
-          "type" : "string"
-        },
-        "vf-module-model-version" : {
-          "type" : "string"
+    "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": {
+                "vpg-management-port": {
+                    "description": "SSH external port of ssh. When 0 ssh service will not be exposed",
+                    "type": "string",
+                    "default": "0"
+                },
+                "k8s-rb-profile-namespace": {
+                    "description": "K8s namespace to create helm chart for specified profile",
+                    "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"
+                },
+                "private1-prefix-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "private2-prefix-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vnf-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "service-instance-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vnf_name": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "demo_artifacts_version": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "default": "1.5.0"
+                },
+                "aic-cloud-region": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vf-module-model-customization-uuid": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "onap_private_net_cidr": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "management-prefix-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "dcae_collector_ip": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "default": "10.0.4.1"
+                },
+                "int_private1_net_cidr": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vf-module-id": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "dcae_collector_port": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "default": "30235"
+                },
+                "vf-module-label": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vf-module-model-invariant-uuid": {
+                    "type": "string"
+                },
+                "vf-naming-policy": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "int_private2_net_cidr": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "vf-module-model-version": {
+                    "type": "string"
+                }
+            },
+            "derived_from": "tosca.datatypes.Dynamic"
         }
-      },
-      "derived_from" : "tosca.datatypes.Dynamic"
     }
-  }
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
index 66b0d7c5..253f9dc4 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
@@ -1,329 +1,362 @@
 {
-  "node_types" : {
-    "component-resource-resolution" : {
-      "description" : "This is Resource Assignment Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "assignment-params" : {
-          "required" : true,
-          "type" : "string"
-        }
-      },
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "ResourceResolutionComponent" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "resolution-key" : {
-                  "description" : "Key for service instance related correlation.",
-                  "required" : false,
-                  "type" : "string"
-                },
-                "occurrence" : {
-                  "description" : "Number of time to perform the resolution.",
-                  "required" : false,
-                  "type" : "integer",
-                  "default" : 1
+    "node_types": {
+        "component-resource-resolution": {
+            "description": "This is Resource Assignment Component API",
+            "version": "1.0.0",
+            "attributes": {
+                "assignment-params": {
+                    "required": true,
+                    "type": "string"
+                }
+            },
+            "capabilities": {
+                "component-node": {
+                    "type": "tosca.capabilities.Node"
+                }
+            },
+            "interfaces": {
+                "ResourceResolutionComponent": {
+                    "operations": {
+                        "process": {
+                            "inputs": {
+                                "resolution-key": {
+                                    "description": "Key for service instance related correlation.",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "occurrence": {
+                                    "description": "Number of time to perform the resolution.",
+                                    "required": false,
+                                    "type": "integer",
+                                    "default": 1
+                                },
+                                "store-result": {
+                                    "description": "Whether or not to store the output.",
+                                    "required": false,
+                                    "type": "boolean"
+                                },
+                                "resource-type": {
+                                    "description": "Request type.",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "resolution-summary": {
+                                    "description": "Enable resolution-summary output",
+                                    "required": false,
+                                    "type": "boolean"
+                                },
+                                "artifact-prefix-names": {
+                                    "description": "Template , Resource Assignment Artifact Prefix names",
+                                    "required": true,
+                                    "type": "list",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    }
+                                },
+                                "request-id": {
+                                    "description": "Request Id, Unique Id for the request.",
+                                    "required": true,
+                                    "type": "string"
+                                },
+                                "resource-id": {
+                                    "description": "Resource Id.",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "action-name": {
+                                    "description": "Action Name of the process",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "dynamic-properties": {
+                                    "description": "Dynamic Json Content or DSL Json reference.",
+                                    "required": false,
+                                    "type": "json"
+                                }
+                            },
+                            "outputs": {
+                                "resource-assignment-params": {
+                                    "required": true,
+                                    "type": "string"
+                                },
+                                "status": {
+                                    "required": true,
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "derived_from": "tosca.nodes.Component"
+        },
+        "component-script-executor": {
+            "description": "This is CLI Transaction Configuration Component API",
+            "version": "1.0.0",
+            "attributes": {
+                "response-data": {
+                    "required": false,
+                    "type": "json"
+                }
+            },
+            "capabilities": {
+                "component-node": {
+                    "type": "tosca.capabilities.Node"
+                }
+            },
+            "interfaces": {
+                "ComponentScriptExecutor": {
+                    "operations": {
+                        "process": {
+                            "inputs": {
+                                "script-type": {
+                                    "description": "Script type, kotlin type is supported",
+                                    "required": true,
+                                    "type": "string",
+                                    "constraints": [
+                                        {
+                                            "valid_values": [
+                                                "kotlin",
+                                                "jython",
+                                                "internal"
+                                            ]
+                                        }
+                                    ],
+                                    "default": "internal"
+                                },
+                                "script-class-reference": {
+                                    "description": "Kotlin Script class name or jython script name.",
+                                    "required": true,
+                                    "type": "string"
+                                },
+                                "dynamic-properties": {
+                                    "description": "Dynamic Json Content or DSL Json reference.",
+                                    "required": false,
+                                    "type": "json"
+                                }
+                            },
+                            "outputs": {
+                                "response-data": {
+                                    "description": "Execution Response Data.",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "status": {
+                                    "description": "Status of the Component Execution ( success or failure )",
+                                    "required": true,
+                                    "type": "string"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "derived_from": "tosca.nodes.Component"
+        },
+        "source-capability": {
+            "description": "This is Component Resource Source Node Type",
+            "version": "1.0.0",
+            "properties": {
+                "script-type": {
+                    "required": true,
+                    "type": "string",
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "kotlin",
+                                "internal",
+                                "jython"
+                            ]
+                        }
+                    ],
+                    "default": "kotlin"
                 },
-                "store-result" : {
-                  "description" : "Whether or not to store the output.",
-                  "required" : false,
-                  "type" : "boolean"
+                "script-class-reference": {
+                    "description": "Capability reference name for internal and kotlin, for jython script file path",
+                    "required": true,
+                    "type": "string"
                 },
-                "resource-type" : {
-                  "description" : "Request type.",
-                  "required" : false,
-                  "type" : "string"
+                "instance-dependencies": {
+                    "description": "Instance dependency Names to Inject to Kotlin / Jython Script.",
+                    "required": false,
+                    "type": "list",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 },
-                "resolution-summary" : {
-                  "description" : "Enable resolution-summary output",
-                  "required" : false,
-                  "type" : "boolean"
+                "key-dependencies": {
+                    "description": "Resource Resolution dependency dictionary names.",
+                    "required": true,
+                    "type": "list",
+                    "entry_schema": {
+                        "type": "string"
+                    }
+                }
+            },
+            "derived_from": "tosca.nodes.ResourceSource"
+        },
+        "source-db": {
+            "description": "This is Database Resource Source Node Type",
+            "version": "1.0.0",
+            "properties": {
+                "type": {
+                    "required": true,
+                    "type": "string",
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "SQL",
+                                "PLSQL"
+                            ]
+                        }
+                    ],
+                    "default": "SQL"
                 },
-                "artifact-prefix-names" : {
-                  "description" : "Template , Resource Assignment Artifact Prefix names",
-                  "required" : true,
-                  "type" : "list",
-                  "entry_schema" : {
-                    "type" : "string"
-                  }
+                "endpoint-selector": {
+                    "required": false,
+                    "type": "string"
                 },
-                "request-id" : {
-                  "description" : "Request Id, Unique Id for the request.",
-                  "required" : true,
-                  "type" : "string"
+                "query": {
+                    "required": true,
+                    "type": "string"
                 },
-                "resource-id" : {
-                  "description" : "Resource Id.",
-                  "required" : false,
-                  "type" : "string"
+                "input-key-mapping": {
+                    "required": false,
+                    "type": "map",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 },
-                "action-name" : {
-                  "description" : "Action Name of the process",
-                  "required" : false,
-                  "type" : "string"
+                "output-key-mapping": {
+                    "required": false,
+                    "type": "map",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
+                "key-dependencies": {
+                    "required": true,
+                    "type": "list",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 }
-              },
-              "outputs" : {
-                "resource-assignment-params" : {
-                  "required" : true,
-                  "type" : "string"
+            },
+            "derived_from": "tosca.nodes.ResourceSource"
+        },
+        "source-default": {
+            "description": "This is Default Resource Source Node Type",
+            "version": "1.0.0",
+            "properties": {},
+            "derived_from": "tosca.nodes.ResourceSource"
+        },
+        "source-input": {
+            "description": "This is Input Resource Source Node Type",
+            "version": "1.0.0",
+            "properties": {},
+            "derived_from": "tosca.nodes.ResourceSource"
+        },
+        "source-rest": {
+            "description": "This is Rest Resource Source Node Type",
+            "version": "1.0.0",
+            "properties": {
+                "type": {
+                    "required": true,
+                    "type": "string",
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "JSON"
+                            ]
+                        }
+                    ],
+                    "default": "JSON"
                 },
-                "status" : {
-                  "required" : true,
-                  "type" : "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "component-script-executor" : {
-      "description" : "This is CLI Transaction Configuration Component API",
-      "version" : "1.0.0",
-      "attributes" : {
-        "response-data" : {
-          "required" : false,
-          "type" : "json"
-        }
-      },
-      "capabilities" : {
-        "component-node" : {
-          "type" : "tosca.capabilities.Node"
-        }
-      },
-      "interfaces" : {
-        "ComponentScriptExecutor" : {
-          "operations" : {
-            "process" : {
-              "inputs" : {
-                "script-type" : {
-                  "description" : "Script type, kotlin type is supported",
-                  "required" : true,
-                  "type" : "string",
-                  "constraints" : [ {
-                    "valid_values" : [ "kotlin", "jython", "internal" ]
-                  } ],
-                  "default" : "internal"
+                "headers": {
+                    "required": false,
+                    "type": "map",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 },
-                "script-class-reference" : {
-                  "description" : "Kotlin Script class name or jython script name.",
-                  "required" : true,
-                  "type" : "string"
+                "verb": {
+                    "required": true,
+                    "type": "string",
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "GET",
+                                "POST",
+                                "DELETE",
+                                "PUT"
+                            ]
+                        }
+                    ],
+                    "default": "GET"
                 },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                }
-              },
-              "outputs" : {
-                "response-data" : {
-                  "description" : "Execution Response Data.",
-                  "required" : false,
-                  "type" : "string"
+                "payload": {
+                    "required": false,
+                    "type": "string",
+                    "default": ""
+                },
+                "endpoint-selector": {
+                    "required": false,
+                    "type": "string"
+                },
+                "url-path": {
+                    "required": true,
+                    "type": "string"
                 },
-                "status" : {
-                  "description" : "Status of the Component Execution ( success or failure )",
-                  "required" : true,
-                  "type" : "string"
+                "path": {
+                    "required": true,
+                    "type": "string"
+                },
+                "expression-type": {
+                    "required": false,
+                    "type": "string",
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "JSON_PATH",
+                                "JSON_POINTER"
+                            ]
+                        }
+                    ],
+                    "default": "JSON_PATH"
+                },
+                "input-key-mapping": {
+                    "required": false,
+                    "type": "map",
+                    "entry_schema": {
+                        "type": "string"
+                    }
+                },
+                "output-key-mapping": {
+                    "required": false,
+                    "type": "map",
+                    "entry_schema": {
+                        "type": "string"
+                    }
+                },
+                "key-dependencies": {
+                    "required": true,
+                    "type": "list",
+                    "entry_schema": {
+                        "type": "string"
+                    }
                 }
-              }
-            }
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Component"
-    },
-    "source-capability" : {
-      "description" : "This is Component Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "script-type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "kotlin", "internal", "jython" ]
-          } ],
-          "default" : "kotlin"
-        },
-        "script-class-reference" : {
-          "description" : "Capability reference name for internal and kotlin, for jython script file path",
-          "required" : true,
-          "type" : "string"
-        },
-        "instance-dependencies" : {
-          "description" : "Instance dependency Names to Inject to Kotlin / Jython Script.",
-          "required" : false,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "description" : "Resource Resolution dependency dictionary names.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-db" : {
-      "description" : "This is Database Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "SQL", "PLSQL" ]
-          } ],
-          "default" : "SQL"
-        },
-        "endpoint-selector" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "query" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-default" : {
-      "description" : "This is Default Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : { },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-rest" : {
-      "description" : "This is Rest Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "type" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON" ]
-          } ],
-          "default" : "JSON"
-        },
-        "headers" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        },
-        "verb" : {
-          "required" : true,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
-          } ],
-          "default" : "GET"
-        },
-        "payload" : {
-          "required" : false,
-          "type" : "string",
-          "default" : ""
-        },
-        "endpoint-selector" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "url-path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "path" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "expression-type" : {
-          "required" : false,
-          "type" : "string",
-          "constraints" : [ {
-            "valid_values" : [ "JSON_PATH", "JSON_POINTER" ]
-          } ],
-          "default" : "JSON_PATH"
-        },
-        "input-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
+            },
+            "derived_from": "tosca.nodes.ResourceSource"
         },
-        "output-key-mapping" : {
-          "required" : false,
-          "type" : "map",
-          "entry_schema" : {
-            "type" : "string"
-          }
+        "tosca.nodes.Component": {
+            "description": "This is default Component Node",
+            "version": "1.0.0",
+            "derived_from": "tosca.nodes.Root"
         },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
+        "tosca.nodes.ResourceSource": {
+            "description": "TOSCA base type for Resource Sources",
+            "version": "1.0.0",
+            "derived_from": "tosca.nodes.Root"
         }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "tosca.nodes.Component" : {
-      "description" : "This is default Component Node",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
-    "tosca.nodes.ResourceSource" : {
-      "description" : "TOSCA base type for Resource Sources",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
     }
-  }
-}
\ No newline at end of file
+}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/policy_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/policy_types.json
index 1e44cc70..335746c4 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/policy_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/policy_types.json
@@ -1,3 +1,3 @@
 {
-  "policy_types" : { }
-}
\ No newline at end of file
+    "policy_types": {}
+}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/relationship_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/relationship_types.json
index 4ddd7a57..8a388510 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/relationship_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/relationship_types.json
@@ -1,3 +1,3 @@
 {
-  "relationship_types" : { }
-}
\ No newline at end of file
+    "relationship_types": {}
+}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
index ab2abcde..cb5aaeb4 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json
@@ -1,930 +1,992 @@
 {
-  "active-streams" : {
-    "tags" : "active-streams",
-    "name" : "active-streams",
-    "property" : {
-      "description" : "active-streams",
-      "type" : "string"
-    },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "aic-cloud-region" : {
-    "tags" : "aic-cloud-region",
-    "name" : "aic-cloud-region",
-    "property" : {
-      "description" : "aic-cloud-region",
-      "type" : "string"
-    },
-    "group" : "default",
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      }
-    }
-  },
-  "dcae_collector_ip" : {
-    "tags" : "dcae_collector_ip",
-    "name" : "dcae_collector_ip",
-    "property" : {
-      "description" : "dcae_collector_ip",
-      "type" : "string"
-    },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "dcae_collector_ip" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "active-streams": {
+        "tags": "active-streams",
+        "name": "active-streams",
+        "property": {
+            "description": "active-streams",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            }
         }
-      }
-    }
-  },
-  "dcae_collector_port" : {
-    "tags" : "dcae_collector_port",
-    "name" : "dcae_collector_port",
-    "property" : {
-      "description" : "dcae_collector_port",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "dcae_collector_port" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "aic-cloud-region": {
+        "tags": "aic-cloud-region",
+        "name": "aic-cloud-region",
+        "property": {
+            "description": "aic-cloud-region",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Singal, Kapil <ks220y@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input",
+                "properties": {}
+            }
         }
-      }
-    }
-  },
-  "demo_artifacts_version" : {
-    "tags" : "demo_artifacts_version",
-    "name" : "demo_artifacts_version",
-    "property" : {
-      "description" : "demo_artifacts_version",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "demo_artifacts_version" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "dcae_collector_ip": {
+        "tags": "dcae_collector_ip",
+        "name": "dcae_collector_ip",
+        "property": {
+            "description": "dcae_collector_ip",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_ip",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "dcae_collector_ip": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "int_private1_net_cidr" : {
-    "tags" : "int_private1_net_cidr",
-    "name" : "int_private1_net_cidr",
-    "property" : {
-      "description" : "int_private1_net_cidr",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "int_private1_net_cidr" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "dcae_collector_port": {
+        "tags": "dcae_collector_port",
+        "name": "dcae_collector_port",
+        "property": {
+            "description": "dcae_collector_port",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/dcae_collector_port",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "dcae_collector_port": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "int_private1_net_cidr" : "prefix"
-          }
-        }
-      }
-    }
-  },
-  "int_private2_net_cidr" : {
-    "tags" : "int_private2_net_cidr",
-    "name" : "int_private2_net_cidr",
-    "property" : {
-      "description" : "int_private2_net_cidr",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
-          "output-key-mapping" : {
-            "int_private2_net_cidr" : "prefix"
-          },
-          "input-key-mapping" : { }
+    "demo_artifacts_version": {
+        "tags": "demo_artifacts_version",
+        "name": "demo_artifacts_version",
+        "property": {
+            "description": "demo_artifacts_version",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/demo_artifacts_version",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "demo_artifacts_version": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "int_private2_net_cidr" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-        }
-      }
-    }
-  },
-  "k8s-rb-profile-name" : {
-    "tags" : "k8s, cnf, profile, k8s-rb-profile-name",
-    "name" : "k8s-rb-profile-name",
-    "property" : {
-      "description" : "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-name",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "k8s-rb-profile-name" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "int_private1_net_cidr": {
+        "tags": "int_private1_net_cidr",
+        "name": "int_private1_net_cidr",
+        "property": {
+            "description": "int_private1_net_cidr",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private1_net_cidr",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "int_private1_net_cidr": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "int_private1_net_cidr": "prefix"
+                    }
+                }
+            }
         }
-      }
-    }
-  },
-  "k8s-rb-profile-namespace" : {
-    "tags" : "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
-    "name" : "k8s-rb-profile-namespace",
-    "property" : {
-      "description" : "Profile name used in multicloud/k8s plugin",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-namespace",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "k8s-rb-profile-namespace" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "int_private2_net_cidr": {
+        "tags": "int_private2_net_cidr",
+        "name": "int_private2_net_cidr",
+        "property": {
+            "description": "int_private2_net_cidr",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "output-key-mapping": {
+                        "int_private2_net_cidr": "prefix"
+                    },
+                    "input-key-mapping": {}
+                }
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/int_private2_net_cidr",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "int_private2_net_cidr": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "management-prefix-id" : {
-    "tags" : "management-prefix-id",
-    "name" : "management-prefix-id",
-    "property" : {
-      "description" : "management-prefix-id",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "management-prefix-id" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
-        }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "management-prefix-id" : "prefix_id"
-          }
+    "k8s-rb-profile-name": {
+        "tags": "k8s, cnf, profile, k8s-rb-profile-name",
+        "name": "k8s-rb-profile-name",
+        "property": {
+            "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-name",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "k8s-rb-profile-name": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "onap_private_net_cidr" : {
-    "tags" : "onap_private_net_cidr",
-    "name" : "onap_private_net_cidr",
-    "property" : {
-      "description" : "onap_private_net_cidr",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "onap_private_net_cidr" : "prefix"
-          }
-        }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "onap_private_net_cidr" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "k8s-rb-profile-namespace": {
+        "tags": "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
+        "name": "k8s-rb-profile-namespace",
+        "property": {
+            "description": "Profile name used in multicloud/k8s plugin",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-namespace",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "k8s-rb-profile-namespace": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "private1-prefix-id" : {
-    "tags" : "private1-prefix-id",
-    "name" : "private1-prefix-id",
-    "property" : {
-      "description" : "private1-prefix-id",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "private1-prefix-id" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "management-prefix-id": {
+        "tags": "management-prefix-id",
+        "name": "management-prefix-id",
+        "property": {
+            "description": "management-prefix-id",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/management-prefix-id",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "management-prefix-id": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "management-prefix-id": "prefix_id"
+                    }
+                }
+            }
         }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "private1-prefix-id" : "prefix_id"
-          }
-        }
-      }
-    }
-  },
-  "private2-prefix-id" : {
-    "tags" : "private2-prefix-id",
-    "name" : "private2-prefix-id",
-    "property" : {
-      "description" : "private2-prefix-id",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "private2-prefix-id" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "onap_private_net_cidr": {
+        "tags": "onap_private_net_cidr",
+        "name": "onap_private_net_cidr",
+        "property": {
+            "description": "onap_private_net_cidr",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "onap_private_net_cidr": "prefix"
+                    }
+                }
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_cidr",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "onap_private_net_cidr": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "endpoint-selector" : "dynamic-db-source",
-          "query" : "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "private2-prefix-id" : "prefix_id"
-          }
-        }
-      }
-    }
-  },
-  "put-active-streams" : {
-    "tags" : "put-active-streams",
-    "name" : "put-active-streams",
-    "property" : {
-      "description" : "put-active-streams",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "PUT",
-          "type" : "JSON",
-          "url-path" : "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "vpg_onap_private_ip_0" : "vpg_onap_private_ip_0",
-            "active-streams" : "active-streams"
-          },
-          "output-key-mapping" : { },
-          "key-dependencies" : [ "vpg_onap_private_ip_0", "active-streams" ],
-          "endpoint-selector" : "vpkg-rest-api",
-          "payload" : "{\"streams\": {\"active-streams\": $active-streams}}"
+    "private1-prefix-id": {
+        "tags": "private1-prefix-id",
+        "name": "private1-prefix-id",
+        "property": {
+            "description": "private1-prefix-id",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private1-prefix-id",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "private1-prefix-id": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private1-prefix-id": "prefix_id"
+                    }
+                }
+            }
         }
-      }
-    }
-  },
-  "service-instance-id" : {
-    "tags" : "service-instance-id, tosca.datatypes.Root, data_type",
-    "name" : "service-instance-id",
-    "property" : {
-      "description" : "To be provided",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      },
-      "any-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "service-instance-id" : "artifact_name"
-          }
-        }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "query" : "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
-          "input-key-mapping" : { },
-          "output-key-mapping" : {
-            "service-instance-id" : "artifact_name"
-          }
-        }
-      },
-      "capability" : {
-        "type" : "source-capability",
-        "properties" : {
-          "script-type" : "jython",
-          "script-class-reference" : "SampleRAProcessor",
-          "instance-dependencies" : [ ]
+    "private2-prefix-id": {
+        "tags": "private2-prefix-id",
+        "name": "private2-prefix-id",
+        "property": {
+            "description": "private2-prefix-id",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/private2-prefix-id",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "private2-prefix-id": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "endpoint-selector": "dynamic-db-source",
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private2-prefix-id": "prefix_id"
+                    }
+                }
+            }
         }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
-          "path" : "/service/0/service-instance-id",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance.service-instance-id"
-          },
-          "output-key-mapping" : {
-            "service-instance-id" : "service-instance-id"
-          },
-          "key-dependencies" : [ "service-instance.service-instance-id" ]
+    },
+    "put-active-streams": {
+        "tags": "put-active-streams",
+        "name": "put-active-streams",
+        "property": {
+            "description": "put-active-streams",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "PUT",
+                    "type": "JSON",
+                    "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "vpg_onap_private_ip_0": "vpg_onap_private_ip_0",
+                        "active-streams": "active-streams"
+                    },
+                    "output-key-mapping": {},
+                    "key-dependencies": [
+                        "vpg_onap_private_ip_0",
+                        "active-streams"
+                    ],
+                    "endpoint-selector": "vpkg-rest-api",
+                    "payload": "{\"streams\": {\"active-streams\": $active-streams}}"
+                }
+            }
         }
-      }
-    }
-  },
-  "vf-module-id" : {
-    "tags" : "vf-module-id",
-    "name" : "vf-module-id",
-    "property" : {
-      "description" : "vf-module-id",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id",
-          "path" : "/vf-module/0/vf-module-id",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id",
-            "vf-module-id" : "vf-module.vf-module-id"
-          },
-          "output-key-mapping" : {
-            "vf-module-id" : "vf-module-id"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module.vf-module-id" ]
+    "service-instance-id": {
+        "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+        "name": "service-instance-id",
+        "property": {
+            "description": "To be provided",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Singal, Kapil <ks220y@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input",
+                "properties": {}
+            },
+            "any-db": {
+                "type": "source-db",
+                "properties": {
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "service-instance-id": "artifact_name"
+                    }
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "service-instance-id": "artifact_name"
+                    }
+                }
+            },
+            "capability": {
+                "type": "source-capability",
+                "properties": {
+                    "script-type": "jython",
+                    "script-class-reference": "SampleRAProcessor",
+                    "instance-dependencies": []
+                }
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
+                    "path": "/service/0/service-instance-id",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance.service-instance-id"
+                    },
+                    "output-key-mapping": {
+                        "service-instance-id": "service-instance-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance.service-instance-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "vf-module-label" : {
-    "tags" : "vf-module-label",
-    "name" : "vf-module-label",
-    "property" : {
-      "description" : "vf-module-label",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-          "input-key-mapping" : {
-            "customizationid" : "vf-module-model-customization-uuid"
-          },
-          "output-key-mapping" : {
-            "vf-module-label" : "vf_module_label"
-          },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+    "vf-module-id": {
+        "tags": "vf-module-id",
+        "name": "vf-module-id",
+        "property": {
+            "description": "vf-module-id",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Singal, Kapil <ks220y@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id",
+                    "path": "/vf-module/0/vf-module-id",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id",
+                        "vf-module-id": "vf-module.vf-module-id"
+                    },
+                    "output-key-mapping": {
+                        "vf-module-id": "vf-module-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id",
+                        "vf-module.vf-module-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "vf-module-model-customization-uuid" : {
-    "tags" : "vf-module-model-customization-uuid",
-    "name" : "vf-module-model-customization-uuid",
-    "property" : {
-      "description" : "vf-module-model-customization-uuid",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "vf-module-model-invariant-uuid" : {
-    "tags" : "vnf, vf-module",
-    "name" : "vf-module-model-invariant-uuid",
-    "property" : {
-      "description" : "vf module model invariant uuid",
-      "type" : "string"
+    "vf-module-label": {
+        "tags": "vf-module-label",
+        "name": "vf-module-label",
+        "property": {
+            "description": "vf-module-label",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "query": "select sdnctl.VF_MODULE_MODEL.vf_module_label as vf_module_label from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "input-key-mapping": {
+                        "customizationid": "vf-module-model-customization-uuid"
+                    },
+                    "output-key-mapping": {
+                        "vf-module-label": "vf_module_label"
+                    },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
+                    "endpoint-selector": "dynamic-db-source"
+                }
+            }
+        }
     },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.VF_MODULE_MODEL.invariant_uuid as vf_module_model_invariant_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-          "input-key-mapping" : {
-            "customizationid" : "vf-module-model-customization-uuid"
-          },
-          "output-key-mapping" : {
-            "vf-module-model-invariant-uuid" : "vf_module_model_invariant_uuid"
-          },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+    "vf-module-model-customization-uuid": {
+        "tags": "vf-module-model-customization-uuid",
+        "name": "vf-module-model-customization-uuid",
+        "property": {
+            "description": "vf-module-model-customization-uuid",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            }
         }
-      }
-    }
-  },
-  "vf-module-model-version" : {
-    "tags" : "vnf, vf-module",
-    "name" : "vf-module-model-version",
-    "property" : {
-      "description" : "vf module model model version",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Samuli, Silvius <s.silvius@partner.samsung.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_model_version from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
-          "input-key-mapping" : {
-            "customizationid" : "vf-module-model-customization-uuid"
-          },
-          "output-key-mapping" : {
-            "vf-module-model-version" : "vf_module_model_version"
-          },
-          "key-dependencies" : [ "vf-module-model-customization-uuid" ],
-          "endpoint-selector" : "dynamic-db-source"
+    "vf-module-model-invariant-uuid": {
+        "tags": "vnf, vf-module",
+        "name": "vf-module-model-invariant-uuid",
+        "property": {
+            "description": "vf module model invariant uuid",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "query": "select sdnctl.VF_MODULE_MODEL.invariant_uuid as vf_module_model_invariant_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "input-key-mapping": {
+                        "customizationid": "vf-module-model-customization-uuid"
+                    },
+                    "output-key-mapping": {
+                        "vf-module-model-invariant-uuid": "vf_module_model_invariant_uuid"
+                    },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
+                    "endpoint-selector": "dynamic-db-source"
+                }
+            }
         }
-      }
-    }
-  },
-  "vf-naming-policy" : {
-    "tags" : "vf-naming-policy",
-    "name" : "vf-naming-policy",
-    "property" : {
-      "description" : "vf-naming-policy",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "vf-naming-policy" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "vf-module-model-version": {
+        "tags": "vnf, vf-module",
+        "name": "vf-module-model-version",
+        "property": {
+            "description": "vf module model model version",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "query": "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_model_version from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid",
+                    "input-key-mapping": {
+                        "customizationid": "vf-module-model-customization-uuid"
+                    },
+                    "output-key-mapping": {
+                        "vf-module-model-version": "vf_module_model_version"
+                    },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
+                    "endpoint-selector": "dynamic-db-source"
+                }
+            }
         }
-      },
-      "processor-db" : {
-        "type" : "source-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
-          "input-key-mapping" : {
-            "vnf_model_customization_uuid" : "vnf-model-customization-uuid"
-          },
-          "output-key-mapping" : {
-            "vf-naming-policy" : "vf_naming_policy"
-          },
-          "key-dependencies" : [ "vnf-model-customization-uuid" ]
+    },
+    "vf-naming-policy": {
+        "tags": "vf-naming-policy",
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "vf-naming-policy",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vf-naming-policy",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "vf-naming-policy": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            },
+            "processor-db": {
+                "type": "source-db",
+                "properties": {
+                    "type": "SQL",
+                    "query": "select sdnctl.VF_MODEL.naming_policy as vf_naming_policy from sdnctl.VF_MODEL where sdnctl.VF_MODEL.customization_uuid=:vnf_model_customization_uuid",
+                    "input-key-mapping": {
+                        "vnf_model_customization_uuid": "vnf-model-customization-uuid"
+                    },
+                    "output-key-mapping": {
+                        "vf-naming-policy": "vf_naming_policy"
+                    },
+                    "key-dependencies": [
+                        "vnf-model-customization-uuid"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "vnf-id" : {
-    "tags" : "vnf-id",
-    "name" : "vnf-id",
-    "property" : {
-      "description" : "vnf-id",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
-          "path" : "/vnf/0/vnf-id",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "generic-vnf.vnf-id"
-          },
-          "output-key-mapping" : {
-            "vnf-id" : "vnf-id"
-          },
-          "key-dependencies" : [ "service-instance-id", "generic-vnf.vnf-id" ]
+    "vnf-id": {
+        "tags": "vnf-id",
+        "name": "vnf-id",
+        "property": {
+            "description": "vnf-id",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
+                    "path": "/vnf/0/vnf-id",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "generic-vnf.vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "generic-vnf.vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "vnf_name" : {
-    "tags" : "vnf_name",
-    "name" : "vnf_name",
-    "property" : {
-      "description" : "vnf_name",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "MALAKOV, YURIY <yuriy.malakov@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "vnf_name" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "vnf_name": {
+        "tags": "vnf_name",
+        "name": "vnf_name",
+        "property": {
+            "description": "vnf_name",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vnf_name",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "vnf_name": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
-    }
-  },
-  "vpg-management-port" : {
-    "tags" : "vpg-management-port",
-    "name" : "vpg-management-port",
-    "property" : {
-      "description" : "vpg-management-port",
-      "type" : "string"
     },
-    "group" : "default",
-    "updated-by" : "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      }
-    }
-  },
-  "vpg_onap_private_ip_0" : {
-    "tags" : "vpg_onap_private_ip_0",
-    "name" : "vpg_onap_private_ip_0",
-    "property" : {
-      "description" : "vpg_onap_private_ip_0",
-      "type" : "string"
+    "vpg-management-port": {
+        "tags": "vpg-management-port",
+        "name": "vpg-management-port",
+        "property": {
+            "description": "vpg-management-port",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            }
+        }
     },
-    "group" : "default",
-    "updated-by" : "Singal, Kapil <ks220y@att.com>",
-    "sources" : {
-      "input" : {
-        "type" : "source-input"
-      },
-      "default" : {
-        "type" : "source-default",
-        "properties" : { }
-      },
-      "sdnc" : {
-        "type" : "source-rest",
-        "properties" : {
-          "verb" : "GET",
-          "type" : "JSON",
-          "url-path" : "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
-          "path" : "/param/0/value",
-          "input-key-mapping" : {
-            "service-instance-id" : "service-instance-id",
-            "vnf-id" : "vnf-id"
-          },
-          "output-key-mapping" : {
-            "vpg_onap_private_ip_0" : "value"
-          },
-          "key-dependencies" : [ "service-instance-id", "vnf-id" ]
+    "vpg_onap_private_ip_0": {
+        "tags": "vpg_onap_private_ip_0",
+        "name": "vpg_onap_private_ip_0",
+        "property": {
+            "description": "vpg_onap_private_ip_0",
+            "type": "string"
+        },
+        "group": "default",
+        "updated-by": "Singal, Kapil <ks220y@att.com>",
+        "sources": {
+            "input": {
+                "type": "source-input"
+            },
+            "default": {
+                "type": "source-default",
+                "properties": {}
+            },
+            "sdnc": {
+                "type": "source-rest",
+                "properties": {
+                    "verb": "GET",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_onap_private_ip_0",
+                    "path": "/param/0/value",
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "output-key-mapping": {
+                        "vpg_onap_private_ip_0": "value"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ]
+                }
+            }
         }
-      }
     }
-  }
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
index 4a0ec295..914405b3 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
@@ -1,267 +1,299 @@
 {
-  "tosca_definitions_version" : "controller_blueprint_1_0_0",
-  "metadata" : {
-    "template_author" : "Samuli Silvius <s.silvius@partner.samsung.com>",
-    "author-email" : "abdelmuhaimen.seaudi@orange.com",
-    "user-groups" : "ADMIN, OPERATION",
-    "template_name" : "vFW_CNF_CDS",
-    "template_version" : "1.0.44",
-    "template_tags" : "Samuli Silvius, vFW_CNF_CDS",
-    "template_type" : "DEFAULT"
-  },
-  "imports" : [ {
-    "file" : "Definitions/data_types.json"
-  }, {
-    "file" : "Definitions/relationship_types.json"
-  }, {
-    "file" : "Definitions/artifact_types.json"
-  }, {
-    "file" : "Definitions/node_types.json"
-  }, {
-    "file" : "Definitions/policy_types.json"
-  } ],
-  "dsl_definitions" : {
-    "vpkg-rest-api" : {
-      "type" : "basic-auth",
-      "url" : "http://",
-      "username" : "admin",
-      "password" : "admin"
+    "tosca_definitions_version": "controller_blueprint_1_0_0",
+    "metadata": {
+        "template_author": "Samuli Silvius <s.silvius@partner.samsung.com>",
+        "author-email": "abdelmuhaimen.seaudi@orange.com",
+        "user-groups": "ADMIN, OPERATION",
+        "template_name": "vFW_CNF_CDS",
+        "template_version": "1.0.44",
+        "template_tags": "Samuli Silvius, vFW_CNF_CDS",
+        "template_type": "DEFAULT"
     },
-    "multicloud-k8s-api" : {
-      "type" : "basic-auth",
-      "username" : "admin",
-      "password" : "admin",
-      "url" : "http://multicloud-k8s:9015"
-    },
-    "profile-upload-properties" : {
-      "assignment-params" : {
-        "get_attribute" : [ "resource-assignment", "assignment-params" ]
-      },
-      "profile-modification-decision-data" : {
-        "get_input" : "vpg-management-port"
-      },
-      "profile-artifacts" : {
-        "get_attribute" : [ "profile-modification", "assignment-params" ]
-      },
-      "api-access" : "*multicloud-k8s-api"
-    },
-    "config-deploy-properties" : {
-      "resolution-key" : {
-        "get_input" : "resolution-key"
-      }
-    },
-    "dynamic-db-source" : {
-      "type" : "maria-db",
-      "url" : "jdbc:mysql://mariadb-galera:3306/sdnctl",
-      "username" : "root",
-      "password" : "secretpassword"
-    }
-  },
-  "topology_template" : {
-    "workflows" : {
-      "resource-assignment" : {
-        "steps" : {
-          "resource-assignment" : {
-            "description" : "Resource Assign Workflow",
-            "target" : "resource-assignment",
-            "activities" : [ {
-              "call_operation" : "ResourceResolutionComponent.process"
-            } ],
-            "on_success" : [ "profile-modification" ]
-          },
-          "profile-modification" : {
-            "description" : "Profile Modification Resources",
-            "target" : "profile-modification",
-            "activities" : [ {
-              "call_operation" : "ResourceResolutionComponent.process"
-            } ],
-            "on_success" : [ "profile-upload" ]
-          },
-          "profile-upload" : {
-            "description" : "Upload K8s Profile",
-            "target" : "profile-upload",
-            "activities" : [ {
-              "call_operation" : "ComponentScriptExecutor.process"
-            } ]
-          }
+    "imports": [
+        {
+            "file": "Definitions/data_types.json"
         },
-        "inputs" : {
-          "template-prefix" : {
-            "required" : true,
-            "type" : "list",
-            "entry_schema" : {
-              "type" : "string"
-            }
-          },
-          "resolution-key" : {
-            "required" : false,
-            "type" : "string",
-            "entry_schema" : {
-              "type" : ""
-            }
-          },
-          "resource-assignment-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
-            "required" : true,
-            "type" : "dt-resource-assignment-properties"
-          }
+        {
+            "file": "Definitions/relationship_types.json"
         },
-        "outputs" : {
-          "meshed-template" : {
-            "type" : "json",
-            "value" : {
-              "get_attribute" : [ "resource-assignment", "assignment-params" ]
-            }
-          }
+        {
+            "file": "Definitions/artifact_types.json"
+        },
+        {
+            "file": "Definitions/node_types.json"
+        },
+        {
+            "file": "Definitions/policy_types.json"
         }
-      },
-      "config-deploy" : {
-        "steps" : {
-          "config-deploy" : {
-            "description" : "Config Deploy Workflow",
-            "target" : "config-deploy-process"
-          }
+    ],
+    "dsl_definitions": {
+        "vpkg-rest-api": {
+            "type": "basic-auth",
+            "url": "http://",
+            "username": "admin",
+            "password": "admin"
+        },
+        "multicloud-k8s-api": {
+            "type": "basic-auth",
+            "username": "admin",
+            "password": "admin",
+            "url": "http://multicloud-k8s:9015"
         },
-        "inputs" : {
-          "config-deploy-properties" : {
-            "description" : "Dynamic PropertyDefinition for workflow(config-deploy).",
-            "required" : true,
-            "type" : "dt-config-deploy-properties"
-          }
+        "profile-upload-properties": {
+            "assignment-params": {
+                "get_attribute": [
+                    "resource-assignment",
+                    "assignment-params"
+                ]
+            },
+            "profile-modification-decision-data": {
+                "get_input": "vpg-management-port"
+            },
+            "profile-artifacts": {
+                "get_attribute": [
+                    "profile-modification",
+                    "assignment-params"
+                ]
+            },
+            "api-access": "*multicloud-k8s-api"
         },
-        "outputs" : {
-          "dry-run" : {
-            "type" : "json",
-            "value" : {
-              "get_attribute" : [ "config-deploy-process", "assignment-params" ]
+        "config-deploy-properties": {
+            "resolution-key": {
+                "get_input": "resolution-key"
             }
-          }
+        },
+        "dynamic-db-source": {
+            "type": "maria-db",
+            "url": "jdbc:mysql://mariadb-galera:3306/sdnctl",
+            "username": "root",
+            "password": "secretpassword"
         }
-      }
     },
-    "node_templates" : {
-      "resource-assignment" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "artifact-prefix-names" : {
-                    "get_input" : "template-prefix"
-                  }
+    "topology_template": {
+        "workflows": {
+            "resource-assignment": {
+                "steps": {
+                    "resource-assignment": {
+                        "description": "Resource Assign Workflow",
+                        "target": "resource-assignment",
+                        "activities": [
+                            {
+                                "call_operation": "ResourceResolutionComponent.process"
+                            }
+                        ],
+                        "on_success": [
+                            "profile-modification"
+                        ]
+                    },
+                    "profile-modification": {
+                        "description": "Profile Modification Resources",
+                        "target": "profile-modification",
+                        "activities": [
+                            {
+                                "call_operation": "ResourceResolutionComponent.process"
+                            }
+                        ],
+                        "on_success": [
+                            "profile-upload"
+                        ]
+                    },
+                    "profile-upload": {
+                        "description": "Upload K8s Profile",
+                        "target": "profile-upload",
+                        "activities": [
+                            {
+                                "call_operation": "ComponentScriptExecutor.process"
+                            }
+                        ]
+                    }
+                },
+                "inputs": {
+                    "template-prefix": {
+                        "required": true,
+                        "type": "list",
+                        "entry_schema": {
+                            "type": "string"
+                        }
+                    },
+                    "resolution-key": {
+                        "required": false,
+                        "type": "string",
+                        "entry_schema": {
+                            "type": ""
+                        }
+                    },
+                    "resource-assignment-properties": {
+                        "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
+                        "required": true,
+                        "type": "dt-resource-assignment-properties"
+                    }
+                },
+                "outputs": {
+                    "meshed-template": {
+                        "type": "json",
+                        "value": {
+                            "get_attribute": [
+                                "resource-assignment",
+                                "assignment-params"
+                            ]
+                        }
+                    }
                 }
-              }
-            }
-          }
-        },
-        "artifacts" : {
-          "base_template-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/base_template-template.vtl"
-          },
-          "base_template-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/base_template-mapping.json"
-          },
-          "vpkg-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vpkg-template.vtl"
-          },
-          "vpkg-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vpkg-mapping.json"
-          },
-          "vfw-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vfw-template.vtl"
-          },
-          "vfw-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vfw-mapping.json"
-          },
-          "vnf-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vnf-template.vtl"
-          },
-          "vnf-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vnf-mapping.json"
-          },
-          "vsn-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/vsn-template.vtl"
-          },
-          "vsn-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/vsn-mapping.json"
-          }
-        }
-      },
-      "profile-modification" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "artifact-prefix-names" : [ "ssh-service" ]
+            },
+            "config-deploy": {
+                "steps": {
+                    "config-deploy": {
+                        "description": "Config Deploy Workflow",
+                        "target": "config-deploy-process"
+                    }
+                },
+                "inputs": {
+                    "config-deploy-properties": {
+                        "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
+                        "required": true,
+                        "type": "dt-config-deploy-properties"
+                    }
+                },
+                "outputs": {
+                    "dry-run": {
+                        "type": "json",
+                        "value": {
+                            "get_attribute": [
+                                "config-deploy-process",
+                                "assignment-params"
+                            ]
+                        }
+                    }
                 }
-              }
             }
-          }
         },
-        "artifacts" : {
-          "ssh-service-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/k8s-profiles/ssh-service-template.vtl"
-          },
-          "ssh-service-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/k8s-profiles/ssh-service-mapping.json"
-          }
-        }
-      },
-      "profile-upload" : {
-        "type" : "component-script-executor",
-        "interfaces" : {
-          "ComponentScriptExecutor" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "script-type" : "kotlin",
-                  "script-class-reference" : "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload",
-                  "dynamic-properties" : "*profile-upload-properties"
+        "node_templates": {
+            "resource-assignment": {
+                "type": "component-resource-resolution",
+                "interfaces": {
+                    "ResourceResolutionComponent": {
+                        "operations": {
+                            "process": {
+                                "inputs": {
+                                    "artifact-prefix-names": {
+                                        "get_input": "template-prefix"
+                                    }
+                                }
+                            }
+                        }
+                    }
+                },
+                "artifacts": {
+                    "base_template-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/base_template-template.vtl"
+                    },
+                    "base_template-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/base_template-mapping.json"
+                    },
+                    "vpkg-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/vpkg-template.vtl"
+                    },
+                    "vpkg-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/vpkg-mapping.json"
+                    },
+                    "vfw-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/vfw-template.vtl"
+                    },
+                    "vfw-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/vfw-mapping.json"
+                    },
+                    "vnf-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/vnf-template.vtl"
+                    },
+                    "vnf-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/vnf-mapping.json"
+                    },
+                    "vsn-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/vsn-template.vtl"
+                    },
+                    "vsn-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/vsn-mapping.json"
+                    }
                 }
-              }
-            }
-          }
-        }
-      },
-      "config-deploy-process" : {
-        "type" : "component-resource-resolution",
-        "interfaces" : {
-          "ResourceResolutionComponent" : {
-            "operations" : {
-              "process" : {
-                "inputs" : {
-                  "artifact-prefix-names" : [ "nf-params" ]
+            },
+            "profile-modification": {
+                "type": "component-resource-resolution",
+                "interfaces": {
+                    "ResourceResolutionComponent": {
+                        "operations": {
+                            "process": {
+                                "inputs": {
+                                    "artifact-prefix-names": [
+                                        "ssh-service"
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                },
+                "artifacts": {
+                    "ssh-service-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/k8s-profiles/ssh-service-template.vtl"
+                    },
+                    "ssh-service-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/k8s-profiles/ssh-service-mapping.json"
+                    }
+                }
+            },
+            "profile-upload": {
+                "type": "component-script-executor",
+                "interfaces": {
+                    "ComponentScriptExecutor": {
+                        "operations": {
+                            "process": {
+                                "inputs": {
+                                    "script-type": "kotlin",
+                                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload",
+                                    "dynamic-properties": "*profile-upload-properties"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "config-deploy-process": {
+                "type": "component-resource-resolution",
+                "interfaces": {
+                    "ResourceResolutionComponent": {
+                        "operations": {
+                            "process": {
+                                "inputs": {
+                                    "artifact-prefix-names": [
+                                        "nf-params"
+                                    ]
+                                }
+                            }
+                        }
+                    }
+                },
+                "artifacts": {
+                    "nf-params-template": {
+                        "type": "artifact-template-velocity",
+                        "file": "Templates/nf-params-template.vtl"
+                    },
+                    "nf-params-mapping": {
+                        "type": "artifact-mapping-resource",
+                        "file": "Templates/nf-params-mapping.json"
+                    }
                 }
-              }
             }
-          }
-        },
-        "artifacts" : {
-          "nf-params-template" : {
-            "type" : "artifact-template-velocity",
-            "file" : "Templates/nf-params-template.vtl"
-          },
-          "nf-params-mapping" : {
-            "type" : "artifact-mapping-resource",
-            "file" : "Templates/nf-params-mapping.json"
-          }
         }
-      }
     }
-  }
 }
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-mapping.json
index 1960e0e3..34be0c48 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/k8s-profiles/ssh-service-mapping.json
@@ -1,15 +1,14 @@
 [
-  {
-    "name": "vpg-management-port",
-    "property": {
-      "description": "The number of node port for ssh service of vpg. 0 means that ssh service will not be exposed",
-      "type": "string",
-      "default": "0"
-    },
-    "input-param": false,
-    "dictionary-name": "vpg-management-port",
-    "dictionary-source": "default",
-    "dependencies": [
-    ]
-  }
-]
\ No newline at end of file
+    {
+        "name": "vpg-management-port",
+        "property": {
+            "description": "The number of node port for ssh service of vpg. 0 means that ssh service will not be exposed",
+            "type": "string",
+            "default": "0"
+        },
+        "input-param": false,
+        "dictionary-name": "vpg-management-port",
+        "dictionary-source": "default",
+        "dependencies": []
+    }
+]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/nf-params-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/nf-params-mapping.json
index 50ab8d80..32f7860c 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/nf-params-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/nf-params-mapping.json
@@ -1,112 +1,108 @@
 [
-  {
-    "name": "service-instance-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
+    {
+        "name": "service-instance-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "status": "",
+            "constraints": [
+                {}
+            ],
+            "entry_schema": {
+                "type": ""
+            }
+        },
+        "input-param": false,
+        "dictionary-name": "service-instance-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "service-instance-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  {
-    "name": "vnf-id",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
+    {
+        "name": "vnf-id",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "status": "",
+            "constraints": [
+                {}
+            ],
+            "entry_schema": {
+                "type": ""
+            }
+        },
+        "input-param": false,
+        "dictionary-name": "vnf-id",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "vnf-id",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  
-  {
-    "name": "active-streams",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
+    {
+        "name": "active-streams",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "status": "",
+            "constraints": [
+                {}
+            ],
+            "entry_schema": {
+                "type": ""
+            }
+        },
+        "input-param": false,
+        "dictionary-name": "active-streams",
+        "dictionary-source": "input",
+        "dependencies": [],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "active-streams",
-    "dictionary-source": "input",
-    "dependencies": [],
-    "version": 0
-  },
-  
-  {
-    "name": "put-active-streams",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
+    {
+        "name": "put-active-streams",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "status": "",
+            "constraints": [
+                {}
+            ],
+            "entry_schema": {
+                "type": ""
+            }
+        },
+        "input-param": false,
+        "dictionary-name": "put-active-streams",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "vpg_onap_private_ip_0",
+            "active-streams"
+        ],
+        "version": 0
     },
-    "input-param": false,
-    "dictionary-name": "put-active-streams",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-	"vpg_onap_private_ip_0",
-	"active-streams"
-	
-	],
-    "version": 0
-  },
-  
-  {
-    "name": "vpg_onap_private_ip_0",
-    "property": {
-      "description": "",
-      "required": false,
-      "type": "string",
-      "status": "",
-      "constraints": [
-        {}
-      ],
-      "entry_schema": {
-        "type": ""
-      }
-    },
-    "input-param": false,
-    "dictionary-name": "vpg_onap_private_ip_0",
-    "dictionary-source": "sdnc",
-    "dependencies": [
-      "service-instance-id",
-      "vnf-id"
-    ],
-    "version": 0
-  }
-]
\ No newline at end of file
+    {
+        "name": "vpg_onap_private_ip_0",
+        "property": {
+            "description": "",
+            "required": false,
+            "type": "string",
+            "status": "",
+            "constraints": [
+                {}
+            ],
+            "entry_schema": {
+                "type": ""
+            }
+        },
+        "input-param": false,
+        "dictionary-name": "vpg_onap_private_ip_0",
+        "dictionary-source": "sdnc",
+        "dependencies": [
+            "service-instance-id",
+            "vnf-id"
+        ],
+        "version": 0
+    }
+]