1 files changed, 68 insertions, 18 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
index 60846f6c..9053c9b2 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json
@@ -98,30 +98,51 @@
                     }
                 }
             },
+            "config-assign": {
+                "steps": {
+                    "config-assign": {
+                        "description": "Create a message",
+                        "target": "config-assign-process",
+                        "activities": [
+                            {
+                                "call_operation": ""
+                            }
+                        ]
+                    }
+                },
+                "inputs": {
+                    "resolution-key": {
+                        "required": true,
+                        "type": "string"
+                    },
+                    "store-result": {
+                        "required": true,
+                        "type": "boolean"
+                    },
+                    "config-assign-properties": {
+                        "description": "Dynamic PropertyDefinition for workflow(config-assign).",
+                        "required": true,
+                        "type": "dt-config-assign-properties"
+                    }
+                }
+            },
             "config-deploy": {
                 "steps": {
                     "config-deploy": {
-                        "description": "Config Deploy Workflow",
+                        "description": "Run kotlin script",
                         "target": "config-deploy-process"
                     }
                 },
                 "inputs": {
+                    "resolution-key": {
+                        "required": true,
+                        "type": "string"
+                    },
                     "config-deploy-properties": {
                         "description": "Dynamic PropertyDefinition for workflow(config-deploy).",
                         "required": true,
                         "type": "dt-config-deploy-properties"
                     }
-                },
-                "outputs": {
-                    "dry-run": {
-                        "type": "json",
-                        "value": {
-                            "get_attribute": [
-                                "config-deploy-process",
-                                "assignment-params"
-                            ]
-                        }
-                    }
                 }
             }
         },
@@ -220,29 +241,58 @@
                     }
                 }
             },
-            "config-deploy-process": {
+            "config-assign-process": {
                 "type": "component-resource-resolution",
                 "interfaces": {
                     "ResourceResolutionComponent": {
                         "operations": {
                             "process": {
                                 "inputs": {
+                                    "resolution-key": {
+                                        "get_input": "resolution-key"
+                                    },
+                                    "store-result": true,
                                     "artifact-prefix-names": [
-                                        "nf-params"
+                                        "cnf"
                                     ]
+                                },
+                                "outputs": {
+                                    "resource-assignment-params": {
+                                        "get_attribute": [
+                                            "SELF",
+                                            "assignment-params"
+                                        ]
+                                    },
+                                    "status": "success"
                                 }
                             }
                         }
                     }
                 },
                 "artifacts": {
-                    "nf-params-template": {
+                    "cnf-template": {
                         "type": "artifact-template-velocity",
-                        "file": "Templates/nf-params-template.vtl"
+                        "file": "Templates/cnf-template.vtl"
                     },
-                    "nf-params-mapping": {
+                    "cnf-mapping": {
                         "type": "artifact-mapping-resource",
-                        "file": "Templates/nf-params-mapping.json"
+                        "file": "Templates/cnf-mapping.json"
+                    }
+                }
+            },
+            "config-deploy-process": {
+                "type": "component-script-executor",
+                "interfaces": {
+                    "ComponentScriptExecutor": {
+                        "operations": {
+                            "process": {
+                                "inputs": {
+                                    "script-type": "kotlin",
+                                    "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploy",
+                                    "dynamic-properties": "*config-deploy-properties"
+                                }
+                            }
+                        }
                     }
                 }
             }