[vFW_CNF_CDS] Sort generated json files 76/121476/2
authorKonrad Bańka <k.banka@samsung.com>
Fri, 21 May 2021 11:22:29 +0000 (13:22 +0200)
committerKonrad Bańka <k.banka@samsung.com>
Fri, 21 May 2021 13:25:25 +0000 (15:25 +0200)
Sort generated generated _types.json files for easier comparison of
changes between commits.
Provide "jsonlint_cba" target to simply lint autogenerated _types.json
files.

Issue-ID: INT-1899
Signed-off-by: Konrad Bańka <k.banka@samsung.com>
Change-Id: I83f6543f21a65cdd293aa72689766d2f4b48824e

heat/vFW_CNF_CDS/templates/Makefile
heat/vFW_CNF_CDS/templates/cba/Definitions/artifact_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/data_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/node_types.json
heat/vFW_CNF_CDS/templates/cba/Definitions/resources_definition_types.json

index f81585f..7a8db06 100644 (file)
@@ -1,7 +1,9 @@
-.PHONY: all clean helm base cba clean_all package
+.PHONY: all clean helm base clean_all package cba jsonlint_cba
 DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
 NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
 CBA_NAME ?= CBA
 DUMMY_ONBOARDING_PACKAGE_NAME ?= vfw_k8s_demo
 NATIVE_ONBOARDING_PACKAGE_NAME ?= native_vfw_k8s_demo
 CBA_NAME ?= CBA
+_type_files = $(wildcard cba/Definitions/*_types.json)
+
 
 clean_all:
        $(MAKE) clean
 
 clean_all:
        $(MAKE) clean
@@ -17,7 +19,7 @@ all: package helm base cba
        cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip  ../automation/vsp/
 
 helm: package
        cp $(NATIVE_ONBOARDING_PACKAGE_NAME).zip  ../automation/vsp/
 
 helm: package
-       make -C helm
+       $(MAKE) -C helm
        mv helm/helm_*.tgz package_native/
        mv helm/*.tgz package_dummy/
 
        mv helm/helm_*.tgz package_native/
        mv helm/*.tgz package_dummy/
 
@@ -43,3 +45,12 @@ clean:
        rm -rf cba_dummy
        rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip
        rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip
        rm -rf cba_dummy
        rm -f $(DUMMY_ONBOARDING_PACKAGE_NAME).zip
        rm -f $(NATIVE_ONBOARDING_PACKAGE_NAME).zip
+
+jsonlint_cba: $(_type_files)
+       @:
+
+#This shouldn't be PHONY, but it's easier now to define this way
+.PHONY: $(_type_files)
+$(_type_files):
+       @which jq expand unexpand sponge >/dev/null
+       jq -S . <$@ | unexpand -t 2 | expand -t 4 | sponge $@
index 4211156..778394d 100644 (file)
@@ -1,30 +1,30 @@
 {
     "artifact_types": {
 {
     "artifact_types": {
+        "artifact-k8sconfig-content": {
+            "derived_from": "tosca.artifacts.Implementation",
+            "description": "K8s Config Folder Artifact",
+            "version": "1.0.0"
+        },
+        "artifact-k8sprofile-content": {
+            "derived_from": "tosca.artifacts.Implementation",
+            "description": "K8s Profile Folder Artifact",
+            "version": "1.0.0"
+        },
         "artifact-mapping-resource": {
         "artifact-mapping-resource": {
-            "description": "Resource Mapping File used along with Configuration template",
-            "version": "1.0.0",
             "derived_from": "tosca.artifacts.Implementation",
             "derived_from": "tosca.artifacts.Implementation",
+            "description": "Resource Mapping File used along with Configuration template",
             "file_ext": [
                 "json"
             "file_ext": [
                 "json"
-            ]
+            ],
+            "version": "1.0.0"
         },
         "artifact-template-velocity": {
         },
         "artifact-template-velocity": {
-            "description": " Velocity Template used for Configuration",
-            "version": "1.0.0",
             "derived_from": "tosca.artifacts.Implementation",
             "derived_from": "tosca.artifacts.Implementation",
+            "description": " Velocity Template used for Configuration",
             "file_ext": [
                 "vtl"
             "file_ext": [
                 "vtl"
-            ]
-        },
-        "artifact-k8sprofile-content": {
-            "description": "K8s Profile Folder Artifact",
-            "version": "1.0.0",
-            "derived_from": "tosca.artifacts.Implementation"
-        },
-        "artifact-k8sconfig-content": {
-            "description": "K8s Config Folder Artifact",
-            "version": "1.0.0",
-            "derived_from": "tosca.artifacts.Implementation"
+            ],
+            "version": "1.0.0"
         }
     }
 }
         }
     }
 }
index 53d1197..f4d9266 100644 (file)
@@ -1,78 +1,90 @@
 {
     "data_types": {
         "dt-config-assign-properties": {
 {
     "data_types": {
         "dt-config-assign-properties": {
+            "derived_from": "tosca.datatypes.Dynamic",
             "description": "Dynamic DataType definition for workflow(config-assign).",
             "description": "Dynamic DataType definition for workflow(config-assign).",
-            "version": "1.0.0",
             "properties": {
             "properties": {
+                "config-deploy-setup": {
+                    "type": "json"
+                },
                 "service-instance-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
                 "service-instance-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
+                "vf-modules-list": {
+                    "type": "json"
+                },
                 "vnf-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 "vnf-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
-                },
-                "vf-modules-list": {
-                    "type": "json"
-                },
-                "config-deploy-setup": {
-                    "type": "json"
                 }
             },
                 }
             },
-            "derived_from": "tosca.datatypes.Dynamic"
+            "version": "1.0.0"
         },
         "dt-config-deploy-properties": {
         },
         "dt-config-deploy-properties": {
+            "derived_from": "tosca.datatypes.Dynamic",
             "description": "Dynamic DataType definition for workflow(config-deploy).",
             "description": "Dynamic DataType definition for workflow(config-deploy).",
-            "version": "1.0.0",
             "properties": {
             "properties": {
+                "config-deploy-setup": {
+                    "type": "json"
+                },
                 "service-instance-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
                 "service-instance-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
+                "vf-modules-list": {
+                    "type": "json"
+                },
                 "vnf-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 "vnf-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
-                },
-                "vf-modules-list": {
-                    "type": "json"
-                },
-                "config-deploy-setup": {
-                    "type": "json"
                 }
             },
                 }
             },
-            "derived_from": "tosca.datatypes.Dynamic"
+            "version": "1.0.0"
         },
         "dt-resource-assignment-properties": {
         },
         "dt-resource-assignment-properties": {
+            "derived_from": "tosca.datatypes.Dynamic",
             "description": "Dynamic DataType definition for workflow(resource-assignment).",
             "description": "Dynamic DataType definition for workflow(resource-assignment).",
-            "version": "1.0.0",
             "properties": {
             "properties": {
-                "vpg-management-port": {
-                    "description": "SSH external port of optional ssh service for vPKG.",
-                    "type": "integer",
-                    "default": 0
+                "aic-cloud-region": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
                 },
                 },
-                "k8s-rb-profile-namespace": {
-                    "description": "K8s namespace to create helm chart for specified profile",
+                "dcae_collector_ip": {
+                    "default": "10.0.4.1",
+                    "description": "",
+                    "required": false,
                     "type": "string"
                 },
                     "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.",
+                "dcae_collector_port": {
+                    "default": "30235",
+                    "description": "",
+                    "required": false,
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "k8s-rb-instance-release-name": {
-                    "description": "Name of the release for the helm package instance in k8s",
+                "demo_artifacts_version": {
+                    "default": "1.5.0",
+                    "description": "",
+                    "required": false,
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "k8s-rb-profile-source": {
-                    "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
+                "int_private1_net_cidr": {
+                    "description": "",
+                    "required": false,
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "k8s-rb-profile-k8s-version": {
-                    "description": "Profile k8s version used in multicloud/k8s plugin",
+                "int_private2_net_cidr": {
+                    "description": "",
+                    "required": false,
+                    "type": "string"
+                },
+                "k8s-rb-config-name": {
+                    "description": "The source of configuration values for config-deploy operation",
                     "type": "string"
                 },
                 "k8s-rb-config-template-name": {
                     "type": "string"
                 },
                 "k8s-rb-config-template-name": {
                     "description": "The source of configuration template for config-assign operation",
                     "type": "string"
                 },
                     "description": "The source of configuration template for config-assign operation",
                     "type": "string"
                 },
-                "k8s-rb-config-name": {
-                    "description": "The source of configuration values for config-deploy operation",
-                    "type": "string"
-                },
                 "k8s-rb-config-value-source": {
                     "description": "The source of configuration values for config-deploy operation",
                     "type": "string"
                 },
                 "k8s-rb-config-value-source": {
                     "description": "The source of configuration values for config-deploy operation",
                     "type": "string"
                 },
-                "private1-prefix-id": {
-                    "description": "",
-                    "required": false,
-                    "type": "string"
-                },
-                "private2-prefix-id": {
-                    "description": "",
-                    "required": false,
+                "k8s-rb-instance-release-name": {
+                    "description": "Name of the release for the helm package instance in k8s",
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "vnf-id": {
-                    "description": "",
-                    "required": false,
+                "k8s-rb-profile-k8s-version": {
+                    "description": "Profile k8s version used in multicloud/k8s plugin",
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "service-instance-id": {
-                    "description": "",
-                    "required": false,
+                "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"
                 },
                     "type": "string"
                 },
-                "vnf_name": {
-                    "description": "",
-                    "required": false,
+                "k8s-rb-profile-namespace": {
+                    "description": "K8s namespace to create helm chart for specified profile",
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "demo_artifacts_version": {
-                    "description": "",
-                    "required": false,
-                    "type": "string",
-                    "default": "1.5.0"
-                },
-                "aic-cloud-region": {
-                    "description": "",
-                    "required": false,
+                "k8s-rb-profile-source": {
+                    "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
                     "type": "string"
                 },
                     "type": "string"
                 },
-                "vf-module-model-customization-uuid": {
+                "management-prefix-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                     "description": "",
                     "required": false,
                     "type": "string"
                     "required": false,
                     "type": "string"
                 },
                     "required": false,
                     "type": "string"
                 },
-                "management-prefix-id": {
+                "private1-prefix-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
-                "dcae_collector_ip": {
+                "private2-prefix-id": {
                     "description": "",
                     "required": false,
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "default": "10.0.4.1"
+                    "type": "string"
                 },
                 },
-                "int_private1_net_cidr": {
+                "service-instance-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                     "description": "",
                     "required": false,
                     "type": "string"
                     "required": false,
                     "type": "string"
                 },
                     "required": false,
                     "type": "string"
                 },
-                "dcae_collector_port": {
+                "vf-module-label": {
                     "description": "",
                     "required": false,
                     "description": "",
                     "required": false,
-                    "type": "string",
-                    "default": "30235"
+                    "type": "string"
                 },
                 },
-                "vf-module-label": {
+                "vf-module-model-customization-uuid": {
                     "description": "",
                     "required": false,
                     "type": "string"
                     "description": "",
                     "required": false,
                     "type": "string"
                 "vf-module-model-invariant-uuid": {
                     "type": "string"
                 },
                 "vf-module-model-invariant-uuid": {
                     "type": "string"
                 },
+                "vf-module-model-version": {
+                    "type": "string"
+                },
                 "vf-naming-policy": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
                 "vf-naming-policy": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
-                "int_private2_net_cidr": {
+                "vnf-id": {
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
                     "description": "",
                     "required": false,
                     "type": "string"
                 },
-                "vf-module-model-version": {
+                "vnf_name": {
+                    "description": "",
+                    "required": false,
                     "type": "string"
                     "type": "string"
+                },
+                "vpg-management-port": {
+                    "default": 0,
+                    "description": "SSH external port of optional ssh service for vPKG.",
+                    "type": "integer"
                 }
             },
                 }
             },
-            "derived_from": "tosca.datatypes.Dynamic"
+            "version": "1.0.0"
         }
     }
 }
         }
     }
 }
index c191f16..98ed5d2 100644 (file)
@@ -1,18 +1,10 @@
 {
     "node_types": {
 {
     "node_types": {
-        "component-resource-resolution": {
-            "description": "This is Resource Assignment Component API",
-            "version": "1.0.0",
+        "component-k8s-config-template": {
             "attributes": {
             "attributes": {
-                "assignment-params": {
-                    "description": "Holds resolved template, resolution-summary or key-value",
-                    "required": true,
-                    "type": "string"
-                },
-                "assignment-map": {
-                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
+                "statuses": {
                     "required": true,
                     "required": true,
-                    "type": "map"
+                    "type": "json"
                 }
             },
             "capabilities": {
                 }
             },
             "capabilities": {
                     "type": "tosca.capabilities.Node"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
+            "derived_from": "tosca.nodes.Component",
+            "description": "This component is rendering and sending the k8s template to the multicloud plugin.",
             "interfaces": {
             "interfaces": {
-                "ResourceResolutionComponent": {
+                "K8sConfigTemplateComponent": {
                     "operations": {
                         "process": {
                             "inputs": {
                     "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,
-                                    "default": 1,
-                                    "type": "integer"
-                                },
-                                "store-result": {
-                                    "description": "Whether or not to store the output.",
+                                "artifact-prefix-names": {
+                                    "description": "Resource Assignment Artifact Prefix names",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    },
                                     "required": false,
                                     "required": false,
-                                    "type": "boolean"
+                                    "type": "list"
                                 },
                                 },
-                                "resource-type": {
-                                    "description": "Request type.",
+                                "k8s-rb-config-template-name": {
+                                    "description": "K8s template name",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "resolution-summary": {
-                                    "description": "Enable resolution-summary output",
+                                "k8s-rb-config-template-source": {
+                                    "description": "Source (tgz/folder) for the template in CBA",
                                     "required": false,
                                     "required": false,
-                                    "type": "boolean"
-                                },
-                                "artifact-prefix-names": {
-                                    "required": true,
-                                    "description": "Template , Resource Assignment Artifact Prefix names",
-                                    "type": "list",
-                                    "entry_schema": {
-                                        "type": "string"
-                                    }
-                                },
-                                "request-id": {
-                                    "description": "Request Id, Unique Id for the request.",
-                                    "required": true,
                                     "type": "string"
                                 },
                                     "type": "string"
                                 },
-                                "resource-id": {
-                                    "description": "Resource Id.",
+                                "k8s-rb-definition-name": {
+                                    "description": "K8s definition name",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "action-name": {
-                                    "description": "Action Name of the process",
+                                "k8s-rb-definition-version": {
+                                    "description": "Version of the definition",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "dynamic-properties": {
-                                    "description": "Dynamic Json Content or DSL Json reference.",
+                                "resource-assignment-map": {
+                                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
                                     "required": false,
                                     "type": "json"
                                 }
                             },
                             "outputs": {
                                     "required": false,
                                     "type": "json"
                                 }
                             },
                             "outputs": {
-                                "resource-assignment-params": {
-                                    "required": true,
-                                    "type": "string"
-                                },
-                                "resource-assignment-map": {
-                                    "required": true,
-                                    "type": "string"
-                                },
-                                "status": {
+                                "statuses": {
                                     "required": true,
                                     "type": "string"
                                 }
                                     "required": true,
                                     "type": "string"
                                 }
                     }
                 }
             },
                     }
                 }
             },
-            "derived_from": "tosca.nodes.Component"
+            "version": "1.0.0"
         },
         },
-        "component-script-executor": {
-            "description": "This is CLI Transaction Configuration Component API",
-            "version": "1.0.0",
+        "component-k8s-config-value": {
             "attributes": {
             "attributes": {
-                "response-data": {
-                    "required": false,
+                "statuses": {
+                    "required": true,
                     "type": "json"
                 }
             },
                     "type": "json"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
+            "derived_from": "tosca.nodes.Component",
+            "description": "This component is sending the k8s config value to the multicloud plugin.",
             "interfaces": {
             "interfaces": {
-                "ComponentScriptExecutor": {
+                "K8sConfigValueComponent": {
                     "operations": {
                         "process": {
                             "inputs": {
                     "operations": {
                         "process": {
                             "inputs": {
-                                "script-type": {
-                                    "description": "Script type, kotlin type is supported",
-                                    "required": true,
-                                    "type": "string",
+                                "artifact-prefix-names": {
+                                    "description": "Resource Assignment Artifact Prefix names",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    },
+                                    "required": false,
+                                    "type": "list"
+                                },
+                                "k8s-config-operation-type": {
                                     "constraints": [
                                         {
                                             "valid_values": [
                                     "constraints": [
                                         {
                                             "valid_values": [
-                                                "kotlin",
-                                                "jython",
-                                                "internal"
+                                                "create",
+                                                "update",
+                                                "delete"
                                             ]
                                         }
                                     ],
                                             ]
                                         }
                                     ],
-                                    "default": "internal"
+                                    "default": "create",
+                                    "required": false,
+                                    "type": "string"
                                 },
                                 },
-                                "script-class-reference": {
-                                    "description": "Kotlin Script class name or jython script name.",
-                                    "required": true,
+                                "k8s-instance-id": {
+                                    "description": "K8s instance id",
+                                    "required": false,
                                     "type": "string"
                                 },
                                     "type": "string"
                                 },
-                                "instance-dependencies": {
-                                    "description": "Instance names to inject to Jython or Kotlin Script.",
-                                    "required": true,
-                                    "type": "list",
-                                    "entry_schema": {
-                                        "type": "string"
-                                    }
+                                "k8s-rb-config-name": {
+                                    "description": "K8s config name",
+                                    "required": false,
+                                    "type": "string"
                                 },
                                 },
-                                "dynamic-properties": {
-                                    "description": "Dynamic Json Content or DSL Json reference.",
+                                "k8s-rb-config-template-name": {
+                                    "description": "K8s template name",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "k8s-rb-config-value-source": {
+                                    "description": "Location of value source in CBA",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "resource-assignment-map": {
+                                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
                                     "required": false,
                                     "type": "json"
                                 }
                             },
                             "outputs": {
                                     "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 )",
+                                "statuses": {
                                     "required": true,
                                     "type": "string"
                                 }
                                     "required": true,
                                     "type": "string"
                                 }
                     }
                 }
             },
                     }
                 }
             },
-            "derived_from": "tosca.nodes.Component"
+            "version": "1.0.0"
         },
         "component-k8s-profile-upload": {
         },
         "component-k8s-profile-upload": {
-            "description": "This component is rendering and sending the k8s profile to the multicloud plugin.",
-            "version": "1.0.0",
             "attributes": {
                 "statuses": {
                     "required": true,
             "attributes": {
                 "statuses": {
                     "required": true,
                     "type": "tosca.capabilities.Node"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
+            "derived_from": "tosca.nodes.Component",
+            "description": "This component is rendering and sending the k8s profile to the multicloud plugin.",
             "interfaces": {
                 "K8sProfileUploadComponent": {
                     "operations": {
                         "process": {
                             "inputs": {
             "interfaces": {
                 "K8sProfileUploadComponent": {
                     "operations": {
                         "process": {
                             "inputs": {
-                                "k8s-rb-profile-name": {
-                                    "description": "K8s profile name",
+                                "artifact-prefix-names": {
+                                    "description": "Resource Assignment Artifact Prefix names",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    },
                                     "required": false,
                                     "required": false,
-                                    "type": "string"
+                                    "type": "list"
                                 },
                                 "k8s-rb-definition-name": {
                                     "description": "K8s definition name",
                                 },
                                 "k8s-rb-definition-name": {
                                     "description": "K8s definition name",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "k8s-rb-profile-namespace": {
-                                    "description": "a K8s namespace for the profile",
+                                "k8s-rb-profile-k8s-version": {
+                                    "description": "a K8s cluster version for the profile",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "k8s-rb-profile-k8s-version": {
-                                    "description": "a K8s cluster version for the profile",
+                                "k8s-rb-profile-name": {
+                                    "description": "K8s profile name",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "k8s-rb-profile-source": {
-                                    "description": "Source (tgz/folder) for the template in CBA",
+                                "k8s-rb-profile-namespace": {
+                                    "description": "a K8s namespace for the profile",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "artifact-prefix-names": {
-                                    "description": "Resource Assignment Artifact Prefix names",
+                                "k8s-rb-profile-source": {
+                                    "description": "Source (tgz/folder) for the template in CBA",
                                     "required": false,
                                     "required": false,
-                                    "type": "list",
-                                    "entry_schema": {
-                                        "type": "string"
-                                    }
+                                    "type": "string"
                                 },
                                 "resource-assignment-map": {
                                     "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
                                 },
                                 "resource-assignment-map": {
                                     "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
                     }
                 }
             },
                     }
                 }
             },
-            "derived_from": "tosca.nodes.Component"
+            "version": "1.0.0"
         },
         },
-        "component-k8s-config-template": {
-            "description": "This component is rendering and sending the k8s template to the multicloud plugin.",
-            "version": "1.0.0",
+        "component-resource-resolution": {
             "attributes": {
             "attributes": {
-                "statuses": {
+                "assignment-map": {
+                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
                     "required": true,
                     "required": true,
-                    "type": "json"
+                    "type": "map"
+                },
+                "assignment-params": {
+                    "description": "Holds resolved template, resolution-summary or key-value",
+                    "required": true,
+                    "type": "string"
                 }
             },
             "capabilities": {
                 }
             },
             "capabilities": {
                     "type": "tosca.capabilities.Node"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
+            "derived_from": "tosca.nodes.Component",
+            "description": "This is Resource Assignment Component API",
             "interfaces": {
             "interfaces": {
-                "K8sConfigTemplateComponent": {
+                "ResourceResolutionComponent": {
                     "operations": {
                         "process": {
                             "inputs": {
                     "operations": {
                         "process": {
                             "inputs": {
-                                "k8s-rb-config-template-name": {
-                                    "description": "K8s template name",
+                                "action-name": {
+                                    "description": "Action Name of the process",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "k8s-rb-definition-name": {
-                                    "description": "K8s definition name",
+                                "artifact-prefix-names": {
+                                    "description": "Template , Resource Assignment Artifact Prefix names",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    },
+                                    "required": true,
+                                    "type": "list"
+                                },
+                                "dynamic-properties": {
+                                    "description": "Dynamic Json Content or DSL Json reference.",
+                                    "required": false,
+                                    "type": "json"
+                                },
+                                "occurrence": {
+                                    "default": 1,
+                                    "description": "Number of time to perform the resolution.",
                                     "required": false,
                                     "required": false,
+                                    "type": "integer"
+                                },
+                                "request-id": {
+                                    "description": "Request Id, Unique Id for the request.",
+                                    "required": true,
                                     "type": "string"
                                 },
                                     "type": "string"
                                 },
-                                "k8s-rb-definition-version": {
-                                    "description": "Version of the definition",
+                                "resolution-key": {
+                                    "description": "Key for service instance related correlation.",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "k8s-rb-config-template-source": {
-                                    "description": "Source (tgz/folder) for the template in CBA",
+                                "resolution-summary": {
+                                    "description": "Enable resolution-summary output",
+                                    "required": false,
+                                    "type": "boolean"
+                                },
+                                "resource-id": {
+                                    "description": "Resource Id.",
                                     "required": false,
                                     "type": "string"
                                 },
                                     "required": false,
                                     "type": "string"
                                 },
-                                "artifact-prefix-names": {
-                                    "description": "Resource Assignment Artifact Prefix names",
+                                "resource-type": {
+                                    "description": "Request type.",
                                     "required": false,
                                     "required": false,
-                                    "type": "list",
-                                    "entry_schema": {
-                                        "type": "string"
-                                    }
+                                    "type": "string"
                                 },
                                 },
-                                "resource-assignment-map": {
-                                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
+                                "store-result": {
+                                    "description": "Whether or not to store the output.",
                                     "required": false,
                                     "required": false,
-                                    "type": "json"
+                                    "type": "boolean"
                                 }
                             },
                             "outputs": {
                                 }
                             },
                             "outputs": {
-                                "statuses": {
+                                "resource-assignment-map": {
+                                    "required": true,
+                                    "type": "string"
+                                },
+                                "resource-assignment-params": {
+                                    "required": true,
+                                    "type": "string"
+                                },
+                                "status": {
                                     "required": true,
                                     "type": "string"
                                 }
                                     "required": true,
                                     "type": "string"
                                 }
                     }
                 }
             },
                     }
                 }
             },
-            "derived_from": "tosca.nodes.Component"
+            "version": "1.0.0"
         },
         },
-        "component-k8s-config-value": {
-            "description": "This component is sending the k8s config value to the multicloud plugin.",
-            "version": "1.0.0",
+        "component-script-executor": {
             "attributes": {
             "attributes": {
-                "statuses": {
-                    "required": true,
+                "response-data": {
+                    "required": false,
                     "type": "json"
                 }
             },
                     "type": "json"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
                     "type": "tosca.capabilities.Node"
                 }
             },
+            "derived_from": "tosca.nodes.Component",
+            "description": "This is CLI Transaction Configuration Component API",
             "interfaces": {
             "interfaces": {
-                "K8sConfigValueComponent": {
+                "ComponentScriptExecutor": {
                     "operations": {
                         "process": {
                             "inputs": {
                     "operations": {
                         "process": {
                             "inputs": {
-                                "k8s-rb-config-template-name": {
-                                    "description": "K8s template name",
-                                    "required": false,
-                                    "type": "string"
-                                },
-                                "k8s-rb-config-name": {
-                                    "description": "K8s config name",
+                                "dynamic-properties": {
+                                    "description": "Dynamic Json Content or DSL Json reference.",
                                     "required": false,
                                     "required": false,
-                                    "type": "string"
+                                    "type": "json"
                                 },
                                 },
-                                "k8s-instance-id": {
-                                    "description": "K8s instance id",
-                                    "required": false,
-                                    "type": "string"
+                                "instance-dependencies": {
+                                    "description": "Instance names to inject to Jython or Kotlin Script.",
+                                    "entry_schema": {
+                                        "type": "string"
+                                    },
+                                    "required": true,
+                                    "type": "list"
                                 },
                                 },
-                                "k8s-rb-config-value-source": {
-                                    "description": "Location of value source in CBA",
-                                    "required": false,
+                                "script-class-reference": {
+                                    "description": "Kotlin Script class name or jython script name.",
+                                    "required": true,
                                     "type": "string"
                                 },
                                     "type": "string"
                                 },
-                                "k8s-config-operation-type": {
-                                    "required": false,
-                                    "type": "string",
+                                "script-type": {
                                     "constraints": [
                                         {
                                             "valid_values": [
                                     "constraints": [
                                         {
                                             "valid_values": [
-                                                "create",
-                                                "update",
-                                                "delete"
+                                                "kotlin",
+                                                "jython",
+                                                "internal"
                                             ]
                                         }
                                     ],
                                             ]
                                         }
                                     ],
-                                    "default": "create"
-                                },
-                                "artifact-prefix-names": {
-                                    "description": "Resource Assignment Artifact Prefix names",
-                                    "required": false,
-                                    "type": "list",
-                                    "entry_schema": {
-                                        "type": "string"
-                                    }
-                                },
-                                "resource-assignment-map": {
-                                    "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }",
-                                    "required": false,
-                                    "type": "json"
+                                    "default": "internal",
+                                    "description": "Script type, kotlin type is supported",
+                                    "required": true,
+                                    "type": "string"
                                 }
                             },
                             "outputs": {
                                 }
                             },
                             "outputs": {
-                                "statuses": {
+                                "response-data": {
+                                    "description": "Execution Response Data.",
+                                    "required": false,
+                                    "type": "string"
+                                },
+                                "status": {
+                                    "description": "Status of the Component Execution ( success or failure )",
                                     "required": true,
                                     "type": "string"
                                 }
                                     "required": true,
                                     "type": "string"
                                 }
                     }
                 }
             },
                     }
                 }
             },
-            "derived_from": "tosca.nodes.Component"
+            "version": "1.0.0"
         },
         "source-capability": {
         },
         "source-capability": {
+            "derived_from": "tosca.nodes.ResourceSource",
             "description": "This is Component Resource Source Node Type",
             "description": "This is Component Resource Source Node Type",
-            "version": "1.0.0",
             "properties": {
             "properties": {
-                "script-type": {
+                "instance-dependencies": {
+                    "description": "Instance dependency Names to Inject to Kotlin / Jython Script.",
+                    "entry_schema": {
+                        "type": "string"
+                    },
+                    "required": false,
+                    "type": "list"
+                },
+                "key-dependencies": {
+                    "description": "Resource Resolution dependency dictionary names.",
+                    "entry_schema": {
+                        "type": "string"
+                    },
+                    "required": true,
+                    "type": "list"
+                },
+                "script-class-reference": {
+                    "description": "Capability reference name for internal and kotlin, for jython script file path",
                     "required": true,
                     "required": true,
-                    "type": "string",
+                    "type": "string"
+                },
+                "script-type": {
                     "constraints": [
                         {
                             "valid_values": [
                     "constraints": [
                         {
                             "valid_values": [
                             ]
                         }
                     ],
                             ]
                         }
                     ],
-                    "default": "kotlin"
-                },
-                "script-class-reference": {
-                    "description": "Capability reference name for internal and kotlin, for jython script file path",
+                    "default": "kotlin",
                     "required": true,
                     "type": "string"
                     "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"
+            "version": "1.0.0"
         },
         "source-db": {
         },
         "source-db": {
+            "derived_from": "tosca.nodes.ResourceSource",
             "description": "This is Database Resource Source Node Type",
             "description": "This is Database Resource Source Node Type",
-            "version": "1.0.0",
             "properties": {
             "properties": {
-                "type": {
-                    "required": true,
-                    "type": "string",
-                    "constraints": [
-                        {
-                            "valid_values": [
-                                "SQL",
-                                "PLSQL"
-                            ]
-                        }
-                    ],
-                    "default": "SQL"
-                },
                 "endpoint-selector": {
                     "required": false,
                     "type": "string"
                 },
                 "endpoint-selector": {
                     "required": false,
                     "type": "string"
                 },
-                "query": {
-                    "required": true,
-                    "type": "string"
-                },
                 "input-key-mapping": {
                 "input-key-mapping": {
+                    "entry_schema": {
+                        "type": "string"
+                    },
                     "required": false,
                     "required": false,
-                    "type": "map",
+                    "type": "map"
+                },
+                "key-dependencies": {
                     "entry_schema": {
                         "type": "string"
                     "entry_schema": {
                         "type": "string"
-                    }
+                    },
+                    "required": true,
+                    "type": "list"
                 },
                 "output-key-mapping": {
                 },
                 "output-key-mapping": {
-                    "required": false,
-                    "type": "map",
                     "entry_schema": {
                         "type": "string"
                     "entry_schema": {
                         "type": "string"
-                    }
+                    },
+                    "required": false,
+                    "type": "map"
                 },
                 },
-                "key-dependencies": {
+                "query": {
                     "required": true,
                     "required": true,
-                    "type": "list",
-                    "entry_schema": {
-                        "type": "string"
-                    }
+                    "type": "string"
+                },
+                "type": {
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "SQL",
+                                "PLSQL"
+                            ]
+                        }
+                    ],
+                    "default": "SQL",
+                    "required": true,
+                    "type": "string"
                 }
             },
                 }
             },
-            "derived_from": "tosca.nodes.ResourceSource"
+            "version": "1.0.0"
         },
         "source-default": {
         },
         "source-default": {
+            "derived_from": "tosca.nodes.ResourceSource",
             "description": "This is Default Resource Source Node Type",
             "description": "This is Default Resource Source Node Type",
-            "version": "1.0.0",
             "properties": {},
             "properties": {},
-            "derived_from": "tosca.nodes.ResourceSource"
+            "version": "1.0.0"
         },
         "source-input": {
         },
         "source-input": {
+            "derived_from": "tosca.nodes.ResourceSource",
             "description": "This is Input Resource Source Node Type",
             "description": "This is Input Resource Source Node Type",
-            "version": "1.0.0",
             "properties": {},
             "properties": {},
-            "derived_from": "tosca.nodes.ResourceSource"
+            "version": "1.0.0"
         },
         "source-rest": {
         },
         "source-rest": {
+            "derived_from": "tosca.nodes.ResourceSource",
             "description": "This is Rest Resource Source Node Type",
             "description": "This is Rest Resource Source Node Type",
-            "version": "1.0.0",
             "properties": {
             "properties": {
-                "type": {
-                    "required": true,
-                    "type": "string",
+                "endpoint-selector": {
+                    "required": false,
+                    "type": "string"
+                },
+                "expression-type": {
                     "constraints": [
                         {
                             "valid_values": [
                     "constraints": [
                         {
                             "valid_values": [
-                                "JSON"
+                                "JSON_PATH",
+                                "JSON_POINTER"
                             ]
                         }
                     ],
                             ]
                         }
                     ],
-                    "default": "JSON"
+                    "default": "JSON_PATH",
+                    "required": false,
+                    "type": "string"
                 },
                 "headers": {
                 },
                 "headers": {
+                    "entry_schema": {
+                        "type": "string"
+                    },
                     "required": false,
                     "required": false,
-                    "type": "map",
+                    "type": "map"
+                },
+                "input-key-mapping": {
                     "entry_schema": {
                         "type": "string"
                     "entry_schema": {
                         "type": "string"
-                    }
+                    },
+                    "required": false,
+                    "type": "map"
                 },
                 },
-                "verb": {
+                "key-dependencies": {
+                    "entry_schema": {
+                        "type": "string"
+                    },
                     "required": true,
                     "required": true,
-                    "type": "string",
-                    "constraints": [
-                        {
-                            "valid_values": [
-                                "GET",
-                                "POST",
-                                "DELETE",
-                                "PUT"
-                            ]
-                        }
-                    ],
-                    "default": "GET"
+                    "type": "list"
                 },
                 },
-                "payload": {
+                "output-key-mapping": {
+                    "entry_schema": {
+                        "type": "string"
+                    },
                     "required": false,
                     "required": false,
-                    "type": "string",
-                    "default": ""
+                    "type": "map"
                 },
                 },
-                "endpoint-selector": {
+                "path": {
+                    "required": true,
+                    "type": "string"
+                },
+                "payload": {
+                    "default": "",
                     "required": false,
                     "type": "string"
                 },
                     "required": false,
                     "type": "string"
                 },
-                "url-path": {
+                "type": {
+                    "constraints": [
+                        {
+                            "valid_values": [
+                                "JSON"
+                            ]
+                        }
+                    ],
+                    "default": "JSON",
                     "required": true,
                     "type": "string"
                 },
                     "required": true,
                     "type": "string"
                 },
-                "path": {
+                "url-path": {
                     "required": true,
                     "type": "string"
                 },
                     "required": true,
                     "type": "string"
                 },
-                "expression-type": {
-                    "required": false,
-                    "type": "string",
+                "verb": {
                     "constraints": [
                         {
                             "valid_values": [
                     "constraints": [
                         {
                             "valid_values": [
-                                "JSON_PATH",
-                                "JSON_POINTER"
+                                "GET",
+                                "POST",
+                                "DELETE",
+                                "PUT"
                             ]
                         }
                     ],
                             ]
                         }
                     ],
-                    "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": {
+                    "default": "GET",
                     "required": true,
                     "required": true,
-                    "type": "list",
-                    "entry_schema": {
-                        "type": "string"
-                    }
+                    "type": "string"
                 }
             },
                 }
             },
-            "derived_from": "tosca.nodes.ResourceSource"
+            "version": "1.0.0"
         },
         "tosca.nodes.Component": {
         },
         "tosca.nodes.Component": {
+            "derived_from": "tosca.nodes.Root",
             "description": "This is default Component Node",
             "description": "This is default Component Node",
-            "version": "1.0.0",
-            "derived_from": "tosca.nodes.Root"
+            "version": "1.0.0"
         },
         "tosca.nodes.ResourceSource": {
         },
         "tosca.nodes.ResourceSource": {
+            "derived_from": "tosca.nodes.Root",
             "description": "TOSCA base type for Resource Sources",
             "description": "TOSCA base type for Resource Sources",
-            "version": "1.0.0",
-            "derived_from": "tosca.nodes.Root"
+            "version": "1.0.0"
         },
         "tosca.nodes.Vnf": {
         },
         "tosca.nodes.Vnf": {
+            "derived_from": "tosca.nodes.Root",
             "description": "This is VNF Node Type",
             "description": "This is VNF Node Type",
-            "version": "1.0.0",
-            "derived_from": "tosca.nodes.Root"
+            "version": "1.0.0"
         },
         "tosca.nodes.Workflow": {
         },
         "tosca.nodes.Workflow": {
+            "derived_from": "tosca.nodes.Root",
             "description": "This is Directed Graph Node Type",
             "description": "This is Directed Graph Node Type",
-            "version": "1.0.0",
-            "derived_from": "tosca.nodes.Root"
+            "version": "1.0.0"
         },
         "vnf-netconf-device": {
         },
         "vnf-netconf-device": {
-            "description": "This is VNF Device with Netconf  Capability",
-            "version": "1.0.0",
             "capabilities": {
                 "netconf": {
             "capabilities": {
                 "netconf": {
-                    "type": "tosca.capabilities.Netconf",
                     "properties": {
                     "properties": {
-                        "login-key": {
-                            "required": true,
-                            "type": "string",
-                            "default": "sdnc"
+                        "connection-time-out": {
+                            "default": 30,
+                            "required": false,
+                            "type": "integer"
                         },
                         "login-account": {
                         },
                         "login-account": {
+                            "default": "sdnc-tacacs",
                             "required": true,
                             "required": true,
-                            "type": "string",
-                            "default": "sdnc-tacacs"
-                        },
-                        "source": {
-                            "required": false,
-                            "type": "string",
-                            "default": "npm"
+                            "type": "string"
                         },
                         },
-                        "target-ip-address": {
+                        "login-key": {
+                            "default": "sdnc",
                             "required": true,
                             "type": "string"
                         },
                         "port-number": {
                             "required": true,
                             "type": "string"
                         },
                         "port-number": {
+                            "default": 830,
                             "required": true,
                             "required": true,
-                            "type": "integer",
-                            "default": 830
+                            "type": "integer"
                         },
                         },
-                        "connection-time-out": {
+                        "source": {
+                            "default": "npm",
                             "required": false,
                             "required": false,
-                            "type": "integer",
-                            "default": 30
+                            "type": "string"
+                        },
+                        "target-ip-address": {
+                            "required": true,
+                            "type": "string"
                         }
                         }
-                    }
+                    },
+                    "type": "tosca.capabilities.Netconf"
                 },
                 "restconf": {
                 },
                 "restconf": {
-                    "type": "tosca.capabilities.Restconf",
                     "properties": {
                     "properties": {
-                        "login-key": {
-                            "required": true,
-                            "type": "string"
+                        "connection-time-out": {
+                            "default": 30,
+                            "required": false,
+                            "type": "integer"
                         },
                         "login-account": {
                             "required": true,
                             "type": "string"
                         },
                         },
                         "login-account": {
                             "required": true,
                             "type": "string"
                         },
-                        "target-ip-address": {
+                        "login-key": {
                             "required": true,
                             "type": "string"
                         },
                             "required": true,
                             "type": "string"
                         },
                             "required": true,
                             "type": "integer"
                         },
                             "required": true,
                             "type": "integer"
                         },
-                        "connection-time-out": {
-                            "required": false,
-                            "type": "integer",
-                            "default": 30
+                        "target-ip-address": {
+                            "required": true,
+                            "type": "string"
                         }
                         }
-                    }
+                    },
+                    "type": "tosca.capabilities.Restconf"
                 }
             },
                 }
             },
-            "derived_from": "tosca.nodes.Vnf"
+            "derived_from": "tosca.nodes.Vnf",
+            "description": "This is VNF Device with Netconf  Capability",
+            "version": "1.0.0"
         }
     }
 }
         }
     }
 }
index 9975878..9fe3956 100644 (file)
 {
     "active-streams": {
 {
     "active-streams": {
-        "tags": "active-streams",
+        "group": "default",
         "name": "active-streams",
         "property": {
             "description": "active-streams",
             "type": "string"
         },
         "name": "active-streams",
         "property": {
             "description": "active-streams",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "active-streams",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "aic-cloud-region": {
     },
     "aic-cloud-region": {
-        "tags": "aic-cloud-region",
+        "group": "default",
         "name": "aic-cloud-region",
         "property": {
             "description": "aic-cloud-region",
             "type": "string"
         },
         "name": "aic-cloud-region",
         "property": {
             "description": "aic-cloud-region",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
             "input": {
         "sources": {
             "input": {
-                "type": "source-input",
-                "properties": {}
+                "properties": {},
+                "type": "source-input"
+            }
+        },
+        "tags": "aic-cloud-region",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
+    },
+    "config-deploy-setup": {
+        "group": "default",
+        "name": "config-deploy-setup",
+        "property": {
+            "description": "Configuration Input setup for config-deploy operation",
+            "type": "json"
+        },
+        "sources": {
+            "capability": {
+                "properties": {
+                    "instance-dependencies": [],
+                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploySetup",
+                    "script-type": "kotlin"
+                },
+                "type": "source-capability"
             }
             }
-        }
+        },
+        "tags": "config-deploy-setup",
+        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>"
     },
     "dcae_collector_ip": {
     },
     "dcae_collector_ip": {
-        "tags": "dcae_collector_ip",
+        "group": "default",
         "name": "dcae_collector_ip",
         "property": {
             "description": "dcae_collector_ip",
             "type": "string"
         },
         "name": "dcae_collector_ip",
         "property": {
             "description": "dcae_collector_ip",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "dcae_collector_ip": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "dcae_collector_ip",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "dcae_collector_port": {
     },
     "dcae_collector_port": {
-        "tags": "dcae_collector_port",
+        "group": "default",
         "name": "dcae_collector_port",
         "property": {
             "description": "dcae_collector_port",
             "type": "string"
         },
         "name": "dcae_collector_port",
         "property": {
             "description": "dcae_collector_port",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "dcae_collector_port": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "dcae_collector_port",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "demo_artifacts_version": {
     },
     "demo_artifacts_version": {
-        "tags": "demo_artifacts_version",
+        "group": "default",
         "name": "demo_artifacts_version",
         "property": {
             "description": "demo_artifacts_version",
             "type": "string"
         },
         "name": "demo_artifacts_version",
         "property": {
             "description": "demo_artifacts_version",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "demo_artifacts_version": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "demo_artifacts_version",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "int_private1_net_cidr": {
     },
     "int_private1_net_cidr": {
-        "tags": "int_private1_net_cidr",
+        "group": "default",
         "name": "int_private1_net_cidr",
         "property": {
             "description": "int_private1_net_cidr",
             "type": "string"
         },
         "name": "int_private1_net_cidr",
         "property": {
             "description": "int_private1_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "int_private1_net_cidr": "prefix"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private1\"",
-                    "input-key-mapping": {},
+                    ],
                     "output-key-mapping": {
                     "output-key-mapping": {
-                        "int_private1_net_cidr": "prefix"
-                    }
-                }
+                        "int_private1_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "int_private1_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "int_private2_net_cidr": {
     },
     "int_private2_net_cidr": {
-        "tags": "int_private2_net_cidr",
+        "group": "default",
         "name": "int_private2_net_cidr",
         "property": {
             "description": "int_private2_net_cidr",
             "type": "string"
         },
         "name": "int_private2_net_cidr",
         "property": {
             "description": "int_private2_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "properties": {
-                    "type": "SQL",
-                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "input-key-mapping": {},
                     "output-key-mapping": {
                         "int_private2_net_cidr": "prefix"
                     },
                     "output-key-mapping": {
                         "int_private2_net_cidr": "prefix"
                     },
-                    "input-key-mapping": {}
-                }
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "int_private2_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "int_private2_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     },
-    "k8s-rb-profile-name": {
-        "tags": "k8s, cnf, profile, k8s-rb-profile-name",
-        "name": "k8s-rb-profile-name",
+    "k8s-rb-config-name": {
+        "group": "default",
+        "name": "k8s-rb-config-name",
         "property": {
         "property": {
-            "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
+            "description": "The source of configuration values for config-deploy operation",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     },
-    "k8s-rb-instance-release-name": {
-        "tags": "k8s, cnf, profile, k8s-rb-instance-release-name",
-        "name": "k8s-rb-instance-release-name",
+    "k8s-rb-config-template-name": {
+        "group": "default",
+        "name": "k8s-rb-config-template-name",
         "property": {
         "property": {
-            "description": "Name of the release for the helm package instance in k8s",
+            "description": "The name of configuration template for config-assign operation",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-template-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     },
-    "k8s-rb-profile-namespace": {
-        "tags": "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
-        "name": "k8s-rb-profile-namespace",
+    "k8s-rb-config-template-source": {
+        "group": "default",
+        "name": "k8s-rb-config-template-source",
         "property": {
         "property": {
-            "description": "Profile name used in multicloud/k8s plugin",
+            "description": "The source of configuration template for config-assign operation",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
+            }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-template-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-config-value-source": {
+        "group": "default",
+        "name": "k8s-rb-config-value-source",
+        "property": {
+            "description": "The source of configuration values for config-deploy operation",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
             },
             },
+            "input": {
+                "type": "source-input"
+            }
+        },
+        "tags": "k8s, cnf, config, k8s-rb-config-value-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
+    },
+    "k8s-rb-instance-release-name": {
+        "group": "default",
+        "name": "k8s-rb-instance-release-name",
+        "property": {
+            "description": "Name of the release for the helm package instance in k8s",
+            "type": "string"
+        },
+        "sources": {
             "default": {
             "default": {
-                "type": "source-default",
-                "properties": {}
+                "properties": {},
+                "type": "source-default"
             },
             },
-            "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"
-                    ]
-                }
+            "input": {
+                "type": "source-input"
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-instance-release-name",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     "k8s-rb-profile-k8s-version": {
     },
     "k8s-rb-profile-k8s-version": {
-        "tags": "k8s, cnf, profile, k8s version, k8s-rb-profile-k8s-version",
+        "group": "default",
         "name": "k8s-rb-profile-k8s-version",
         "property": {
             "description": "Profile k8s version used in multicloud/k8s plugin",
             "type": "string"
         },
         "name": "k8s-rb-profile-k8s-version",
         "property": {
             "description": "Profile k8s version used in multicloud/k8s plugin",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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-k8s-version",
-                    "path": "/param/0/value",
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
                     "input-key-mapping": {
                         "service-instance-id": "service-instance-id",
                         "vnf-id": "vnf-id"
                     },
-                    "output-key-mapping": {
-                        "k8s-rb-profile-k8s-version": "value"
-                    },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            }
-        }
-    },
-    "k8s-rb-profile-source": {
-        "tags": "k8s, cnf, profile, k8s-rb-profile-source",
-        "name": "k8s-rb-profile-source",
-        "property": {
-            "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
-            "type": "string"
-        },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
-        "sources": {
-            "input": {
-                "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+                    ],
+                    "output-key-mapping": {
+                        "k8s-rb-profile-k8s-version": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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-k8s-version",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
-    },
-    "k8s-rb-config-template-name": {
-        "tags": "k8s, cnf, config, k8s-rb-config-template-name",
-        "name": "k8s-rb-config-template-name",
-        "property": {
-            "description": "The name of configuration template for config-assign operation",
-            "type": "string"
         },
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
-        "sources": {
-            "input": {
-                "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            }
-        }
+        "tags": "k8s, cnf, profile, k8s version, k8s-rb-profile-k8s-version",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     },
-    "k8s-rb-config-template-source": {
-        "tags": "k8s, cnf, config, k8s-rb-config-template-source",
-        "name": "k8s-rb-config-template-source",
+    "k8s-rb-profile-name": {
+        "group": "default",
+        "name": "k8s-rb-profile-name",
         "property": {
         "property": {
-            "description": "The source of configuration template for config-assign operation",
+            "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-profile-name",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
     },
-    "k8s-rb-config-value-source": {
-        "tags": "k8s, cnf, config, k8s-rb-config-value-source",
-        "name": "k8s-rb-config-value-source",
+    "k8s-rb-profile-namespace": {
+        "group": "default",
+        "name": "k8s-rb-profile-namespace",
         "property": {
         "property": {
-            "description": "The source of configuration values for config-deploy operation",
+            "description": "Profile name used in multicloud/k8s plugin",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "service-instance-id",
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "k8s-rb-profile-namespace": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, namespace, k8s-rb-profile-namespace",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
     },
-    "k8s-rb-config-name": {
-        "tags": "k8s, cnf, config, k8s-rb-config-name",
-        "name": "k8s-rb-config-name",
+    "k8s-rb-profile-source": {
+        "group": "default",
+        "name": "k8s-rb-profile-source",
         "property": {
         "property": {
-            "description": "The source of configuration values for config-deploy operation",
+            "description": "The source folder or file relative to 'Templates/k8s-profiles' folder",
             "type": "string"
         },
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "k8s, cnf, profile, k8s-rb-profile-source",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     "management-prefix-id": {
     },
     "management-prefix-id": {
-        "tags": "management-prefix-id",
+        "group": "default",
         "name": "management-prefix-id",
         "property": {
             "description": "management-prefix-id",
             "type": "string"
         },
         "name": "management-prefix-id",
         "property": {
             "description": "management-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "management-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "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": {
                     "output-key-mapping": {
-                        "management-prefix-id": "prefix_id"
-                    }
-                }
+                        "management-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "management-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "onap_private_net_cidr": {
     },
     "onap_private_net_cidr": {
-        "tags": "onap_private_net_cidr",
+        "group": "default",
         "name": "onap_private_net_cidr",
         "property": {
             "description": "onap_private_net_cidr",
             "type": "string"
         },
         "name": "onap_private_net_cidr",
         "property": {
             "description": "onap_private_net_cidr",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "properties": {
-                    "type": "SQL",
-                    "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"
                     "input-key-mapping": {},
                     "output-key-mapping": {
                         "onap_private_net_cidr": "prefix"
-                    }
-                }
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix as prefix from sdnctl.IPAM_IP_POOL where description = \"management\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "onap_private_net_cidr": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "onap_private_net_cidr",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "private1-prefix-id": {
     },
     "private1-prefix-id": {
-        "tags": "private1-prefix-id",
+        "group": "default",
         "name": "private1-prefix-id",
         "property": {
             "description": "private1-prefix-id",
             "type": "string"
         },
         "name": "private1-prefix-id",
         "property": {
             "description": "private1-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private1-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private1\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "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": {
                     "output-key-mapping": {
-                        "private1-prefix-id": "prefix_id"
-                    }
-                }
+                        "private1-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "private1-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "private2-prefix-id": {
     },
     "private2-prefix-id": {
-        "tags": "private2-prefix-id",
+        "group": "default",
         "name": "private2-prefix-id",
         "property": {
             "description": "private2-prefix-id",
             "type": "string"
         },
         "name": "private2-prefix-id",
         "property": {
             "description": "private2-prefix-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
+            "processor-db": {
+                "properties": {
+                    "input-key-mapping": {},
+                    "output-key-mapping": {
+                        "private2-prefix-id": "prefix_id"
+                    },
+                    "query": "select sdnctl.IPAM_IP_POOL.prefix_id as prefix_id from sdnctl.IPAM_IP_POOL where description = \"private2\"",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            },
-            "processor-db": {
-                "type": "source-db",
-                "properties": {
-                    "type": "SQL",
-                    "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": {
                     "output-key-mapping": {
-                        "private2-prefix-id": "prefix_id"
-                    }
-                }
+                        "private2-prefix-id": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "private2-prefix-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "put-active-streams": {
     },
     "put-active-streams": {
-        "tags": "put-active-streams",
+        "group": "default",
         "name": "put-active-streams",
         "property": {
             "description": "put-active-streams",
             "type": "string"
         },
         "name": "put-active-streams",
         "property": {
             "description": "put-active-streams",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "properties": {
-                    "verb": "PUT",
-                    "type": "JSON",
-                    "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
-                    "path": "/param/0/value",
+                    "endpoint-selector": "vpkg-rest-api",
                     "input-key-mapping": {
                     "input-key-mapping": {
-                        "vpg_onap_private_ip_0": "vpg_onap_private_ip_0",
-                        "active-streams": "active-streams"
+                        "active-streams": "active-streams",
+                        "vpg_onap_private_ip_0": "vpg_onap_private_ip_0"
                     },
                     },
-                    "output-key-mapping": {},
                     "key-dependencies": [
                         "vpg_onap_private_ip_0",
                         "active-streams"
                     ],
                     "key-dependencies": [
                         "vpg_onap_private_ip_0",
                         "active-streams"
                     ],
-                    "endpoint-selector": "vpkg-rest-api",
-                    "payload": "{\"streams\": {\"active-streams\": $active-streams}}"
-                }
+                    "output-key-mapping": {},
+                    "path": "/param/0/value",
+                    "payload": "{\"streams\": {\"active-streams\": $active-streams}}",
+                    "type": "JSON",
+                    "url-path": "$vpg_onap_private_ip_0:8183/restconf/config/stream-count:stream-count/streams",
+                    "verb": "PUT"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "put-active-streams",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "service-instance-id": {
     },
     "service-instance-id": {
-        "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+        "group": "default",
         "name": "service-instance-id",
         "property": {
             "description": "To be provided",
             "type": "string"
         },
         "name": "service-instance-id",
         "property": {
             "description": "To be provided",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
         "sources": {
-            "input": {
-                "type": "source-input",
-                "properties": {}
-            },
             "any-db": {
             "any-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     "input-key-mapping": {},
                     "output-key-mapping": {
                         "service-instance-id": "artifact_name"
-                    }
-                }
+                    },
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\""
+                },
+                "type": "source-db"
+            },
+            "capability": {
+                "properties": {
+                    "instance-dependencies": [],
+                    "script-class-reference": "SampleRAProcessor",
+                    "script-type": "jython"
+                },
+                "type": "source-capability"
+            },
+            "input": {
+                "properties": {},
+                "type": "source-input"
             },
             "processor-db": {
             },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     "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": []
-                }
+                    },
+                    "query": "SELECT artifact_name FROM BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\""
+                },
+                "type": "source-db"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "input-key-mapping": {
                         "service-instance-id": "service-instance.service-instance-id"
                     },
+                    "key-dependencies": [
+                        "service-instance.service-instance-id"
+                    ],
                     "output-key-mapping": {
                         "service-instance-id": "service-instance-id"
                     },
                     "output-key-mapping": {
                         "service-instance-id": "service-instance-id"
                     },
-                    "key-dependencies": [
-                        "service-instance.service-instance-id"
-                    ]
-                }
+                    "path": "/service/0/service-instance-id",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "service-instance-id, tosca.datatypes.Root, data_type",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
     },
     "vf-module-id": {
     },
     "vf-module-id": {
-        "tags": "vf-module-id",
+        "group": "default",
         "name": "vf-module-id",
         "property": {
             "description": "vf-module-id",
             "type": "string"
         },
         "name": "vf-module-id",
         "property": {
             "description": "vf-module-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "Singal, Kapil <ks220y@att.com>",
         "sources": {
             "input": {
         "sources": {
             "input": {
-                "type": "source-input",
-                "properties": {}
+                "properties": {},
+                "type": "source-input"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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",
                     "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"
+                        "vf-module-id": "vf-module.vf-module-id",
+                        "vnf-id": "vnf-id"
                     },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id",
                         "vf-module.vf-module-id"
                     },
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id",
                         "vf-module.vf-module-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vf-module-id": "vf-module-id"
+                    },
+                    "path": "/vf-module/0/vf-module-id",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "vf-module-id",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
     },
     "vf-module-label": {
     },
     "vf-module-label": {
-        "tags": "vf-module-label",
+        "group": "default",
         "name": "vf-module-label",
         "property": {
             "description": "vf-module-label",
             "type": "string"
         },
         "name": "vf-module-label",
         "property": {
             "description": "vf-module-label",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
-            "input": {
-                "type": "source-input"
-            },
             "default": {
             "default": {
-                "type": "source-default",
-                "properties": {}
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
             },
             "processor-db": {
             },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     },
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-module-label": "vf_module_label"
                     },
                     "output-key-mapping": {
                         "vf-module-label": "vf_module_label"
                     },
-                    "key-dependencies": [
-                        "vf-module-model-customization-uuid"
-                    ]
-                }
+                    "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",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             }
             }
-        }
+        },
+        "tags": "vf-module-label",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vf-module-model-customization-uuid": {
     },
     "vf-module-model-customization-uuid": {
-        "tags": "vf-module-model-customization-uuid",
+        "group": "default",
         "name": "vf-module-model-customization-uuid",
         "property": {
             "description": "vf-module-model-customization-uuid",
             "type": "string"
         },
         "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": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "vf-module-model-customization-uuid",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vf-module-model-invariant-uuid": {
     },
     "vf-module-model-invariant-uuid": {
-        "tags": "vnf, vf-module",
+        "group": "default",
         "name": "vf-module-model-invariant-uuid",
         "property": {
             "description": "vf module model invariant uuid",
             "type": "string"
         },
         "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": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     },
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-module-model-invariant-uuid": "vf_module_model_invariant_uuid"
                     },
                     "output-key-mapping": {
                         "vf-module-model-invariant-uuid": "vf_module_model_invariant_uuid"
                     },
-                    "key-dependencies": [
-                        "vf-module-model-customization-uuid"
-                    ]
-                }
+                    "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",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             }
             }
-        }
+        },
+        "tags": "vnf, vf-module",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
     "vf-module-model-version": {
     },
     "vf-module-model-version": {
-        "tags": "vnf, vf-module",
+        "group": "default",
         "name": "vf-module-model-version",
         "property": {
             "description": "vf module model model version",
             "type": "string"
         },
         "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": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "processor-db": {
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     },
                     "input-key-mapping": {
                         "customizationid": "vf-module-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vf-module-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-module-model-version": "vf_module_model_version"
                     },
                     "output-key-mapping": {
                         "vf-module-model-version": "vf_module_model_version"
                     },
-                    "key-dependencies": [
-                        "vf-module-model-customization-uuid"
-                    ]
-                }
+                    "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",
+                    "type": "SQL"
+                },
+                "type": "source-db"
             }
             }
-        }
+        },
+        "tags": "vnf, vf-module",
+        "updated-by": "Samuli, Silvius <s.silvius@partner.samsung.com>"
     },
     },
-    "vf-naming-policy": {
-        "tags": "vf-naming-policy",
-        "name": "vf-naming-policy",
+    "vf-modules-list": {
+        "group": "default",
+        "name": "vf-modules-list",
         "property": {
         "property": {
-            "description": "vf-naming-policy",
-            "type": "string"
+            "description": "List of vf-modules associated with vnf",
+            "type": "json"
         },
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "aai-data": {
+                "properties": {
+                    "input-key-mapping": {
+                        "vnf-id": "vnf-id"
+                    },
+                    "key-dependencies": [
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "vf-modules": "vf-module"
+                    },
+                    "path": "/vf-modules",
+                    "type": "JSON",
+                    "url-path": "/aai/v19/network/generic-vnfs/generic-vnf/${vnf-id}?depth=1",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
+            },
             "default": {
             "default": {
-                "type": "source-default",
-                "properties": {}
+                "properties": {},
+                "type": "source-default"
+            },
+            "input": {
+                "type": "source-input"
             },
             "sdnc": {
             },
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vf-modules": "vf-module"
+                    },
+                    "path": "/vf-modules",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
+            }
+        },
+        "tags": "vf-modules-list",
+        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>"
+    },
+    "vf-naming-policy": {
+        "group": "default",
+        "name": "vf-naming-policy",
+        "property": {
+            "description": "vf-naming-policy",
+            "type": "string"
+        },
+        "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
             },
             "processor-db": {
             },
             "processor-db": {
-                "type": "source-db",
                 "properties": {
                 "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"
                     },
                     "input-key-mapping": {
                         "vnf_model_customization_uuid": "vnf-model-customization-uuid"
                     },
+                    "key-dependencies": [
+                        "vnf-model-customization-uuid"
+                    ],
                     "output-key-mapping": {
                         "vf-naming-policy": "vf_naming_policy"
                     },
                     "output-key-mapping": {
                         "vf-naming-policy": "vf_naming_policy"
                     },
+                    "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",
+                    "type": "SQL"
+                },
+                "type": "source-db"
+            },
+            "sdnc": {
+                "properties": {
+                    "input-key-mapping": {
+                        "service-instance-id": "service-instance-id",
+                        "vnf-id": "vnf-id"
+                    },
                     "key-dependencies": [
                     "key-dependencies": [
-                        "vnf-model-customization-uuid"
-                    ]
-                }
+                        "service-instance-id",
+                        "vnf-id"
+                    ],
+                    "output-key-mapping": {
+                        "vf-naming-policy": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "vf-naming-policy",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vnf-id": {
     },
     "vnf-id": {
-        "tags": "vnf-id",
+        "group": "default",
         "name": "vnf-id",
         "property": {
             "description": "vnf-id",
             "type": "string"
         },
         "name": "vnf-id",
         "property": {
             "description": "vnf-id",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "generic-vnf.vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vnf-id": "vnf-id"
+                    },
+                    "path": "/vnf/0/vnf-id",
+                    "type": "JSON",
+                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "vnf-id",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vnf_name": {
     },
     "vnf_name": {
-        "tags": "vnf_name",
+        "group": "default",
         "name": "vnf_name",
         "property": {
             "description": "vnf_name",
             "type": "string"
         },
         "name": "vnf_name",
         "property": {
             "description": "vnf_name",
             "type": "string"
         },
-        "group": "default",
-        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
+                    ],
+                    "output-key-mapping": {
+                        "vnf_name": "value"
+                    },
+                    "path": "/param/0/value",
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
+        },
+        "tags": "vnf_name",
+        "updated-by": "MALAKOV, YURIY <yuriy.malakov@att.com>"
     },
     "vpg-management-port": {
     },
     "vpg-management-port": {
-        "tags": "vpg-management-port",
+        "group": "default",
         "name": "vpg-management-port",
         "property": {
             "description": "vpg-management-port",
             "type": "integer"
         },
         "name": "vpg-management-port",
         "property": {
             "description": "vpg-management-port",
             "type": "integer"
         },
-        "group": "default",
-        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>",
         "sources": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             "input": {
                 "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
             }
             }
-        }
+        },
+        "tags": "vpg-management-port",
+        "updated-by": "Rajewski, Lukasz <lukasz.rajewski@orange.com>"
     },
     "vpg_onap_private_ip_0": {
     },
     "vpg_onap_private_ip_0": {
-        "tags": "vpg_onap_private_ip_0",
+        "group": "default",
         "name": "vpg_onap_private_ip_0",
         "property": {
             "description": "vpg_onap_private_ip_0",
             "type": "string"
         },
         "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": {
         "sources": {
+            "default": {
+                "properties": {},
+                "type": "source-default"
+            },
             "input": {
                 "type": "source-input"
             },
             "input": {
                 "type": "source-input"
             },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
             "sdnc": {
             "sdnc": {
-                "type": "source-rest",
                 "properties": {
                 "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"
                     },
                     "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"
                     "key-dependencies": [
                         "service-instance-id",
                         "vnf-id"
-                    ]
-                }
-            }
-        }
-    },
-    "vf-modules-list": {
-        "tags": "vf-modules-list",
-        "name": "vf-modules-list",
-        "property": {
-            "description": "List of vf-modules associated with vnf",
-            "type": "json"
-        },
-        "group": "default",
-        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>",
-        "sources": {
-            "input": {
-                "type": "source-input"
-            },
-            "default": {
-                "type": "source-default",
-                "properties": {}
-            },
-            "aai-data": {
-                "type": "source-rest",
-                "properties": {
-                    "verb": "GET",
-                    "type": "JSON",
-                    "url-path": "/aai/v19/network/generic-vnfs/generic-vnf/${vnf-id}?depth=1",
-                    "path": "/vf-modules",
-                    "input-key-mapping": {
-                        "vnf-id": "vnf-id"
-                    },
+                    ],
                     "output-key-mapping": {
                     "output-key-mapping": {
-                        "vf-modules": "vf-module"
+                        "vpg_onap_private_ip_0": "value"
                     },
                     },
-                    "key-dependencies": [
-                        "vnf-id"
-                    ]
-                }
-            },
-            "sdnc": {
-                "type": "source-rest",
-                "properties": {
-                    "verb": "GET",
+                    "path": "/param/0/value",
                     "type": "JSON",
                     "type": "JSON",
-                    "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules",
-                    "path": "/vf-modules",
-                    "input-key-mapping": {
-                        "service-instance-id": "service-instance-id",
-                        "vnf-id": "vnf-id"
-                    },
-                    "output-key-mapping": {
-                        "vf-modules": "vf-module"
-                    },
-                    "key-dependencies": [
-                        "service-instance-id",
-                        "vnf-id"
-                    ]
-                }
+                    "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",
+                    "verb": "GET"
+                },
+                "type": "source-rest"
             }
             }
-        }
-    },
-    "config-deploy-setup": {
-        "tags": "config-deploy-setup",
-        "name": "config-deploy-setup",
-        "property": {
-            "description": "Configuration Input setup for config-deploy operation",
-            "type": "json"
         },
         },
-        "group": "default",
-        "updated-by": "Lukasz Rajewski <lukasz.rajewski@orange.com>",
-        "sources": {
-            "capability": {
-                "type": "source-capability",
-                "properties": {
-                    "script-type": "kotlin",
-                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploySetup",
-                    "instance-dependencies": []
-                }
-            }
-        }
+        "tags": "vpg_onap_private_ip_0",
+        "updated-by": "Singal, Kapil <ks220y@att.com>"
     }
 }
     }
 }