Make source-db consistent across samples

Issue-Id: CCSDK-1623

Signed-off-by: Oleg Mitsura <oleg.mitsura@amdocs.com>
Change-Id: Iec7c6909c39c34894be11bfdac45f6394010d9cf

13 files changed, 370 insertions, 442 deletions

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/another-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
index 67d2a914e..9b155c23d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/baseconfig-mapping.json
@@ -27,7 +27,7 @@
       "type": "string"
     },
     "dictionary-name": "vnf_name",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "service-instance-id",
       "vnf-id"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index 3595a9f67..c57ebe768 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -332,7 +332,7 @@
       "properties": {},
       "derived_from": "tosca.nodes.ResourceSource"
     },
-    "source-processor-db": {
+    "source-db": {
       "description": "This is Database Resource Source Node Type",
       "version": "1.0.0",
       "properties": {
@@ -527,4 +527,4 @@
       "derived_from": "tosca.nodes.Vnf"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index fe364f974..ecd48289d 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -27,7 +27,7 @@
         "properties": {}
       },
       "processor-db": {
-        "type": "source-processor-db",
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -65,7 +65,7 @@
     },
     "updated-by": "Singal, Kapil <ks220y@att.com>",
     "sources": {
-      "primary-config-data": {
+      "config-data": {
         "type": "source-rest",
         "properties": {
           "verb": "GET",
@@ -96,7 +96,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -124,7 +124,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -154,7 +154,7 @@
     },
     "updated-by": "Steve, Siani <steve.djissitchi@bell.ca>",
     "sources": {
-      "primary-aai-data": {
+      "aai-data": {
         "type": "source-rest",
         "properties": {
           "type": "JSON",
@@ -174,4 +174,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
index 37bad8d0a..178d2be3a 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Environments/source-rest.properties
@@ -1,9 +1,9 @@
-blueprintsprocessor.restclient.primary-config-data.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data.token=sampletoken
+blueprintsprocessor.restclient.config-data.type=basic-auth
+blueprintsprocessor.restclient.config-data.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data.userId=sampleuser
+blueprintsprocessor.restclient.config-data.token=sampletoken
 
-blueprintsprocessor.restclient.primary-config-data1.type=basic-auth
-blueprintsprocessor.restclient.primary-config-data1.url=http://127.0.0.1:9111
-blueprintsprocessor.restclient.primary-config-data1.userId=sampleuser
-blueprintsprocessor.restclient.primary-config-data1.token=sampletoken
\ No newline at end of file
+blueprintsprocessor.restclient.config-data1.type=basic-auth
+blueprintsprocessor.restclient.config-data1.url=http://127.0.0.1:9111
+blueprintsprocessor.restclient.config-data1.userId=sampleuser
+blueprintsprocessor.restclient.config-data1.token=sampletoken
diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
index 3d10a7c5f..4c128a9b4 100755
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/resources_definition_types.json
@@ -12,8 +12,8 @@
         "type" : "source-input",
         "properties" : { }
       },
-      "primary-db": {
-        "type": "source-processor-db",
+      "processor-db": {
+        "type": "source-db",
         "properties": {
           "endpoint-selector": "dynamic-db-source",
           "query": "SELECT artifact_name FROM sdnctl.BLUEPRINT_RUNTIME where artifact_version=\"1.0.0\"",
@@ -50,4 +50,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
index 6ec3b4105..da498e35e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/artifact_types.json
@@ -1,11 +1,5 @@
 {
   "artifact_types" : {
-    "artifact-directed-graph" : {
-      "description" : "Directed Graph File",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.artifacts.Implementation",
-      "file_ext" : [ "json", "xml" ]
-    },
     "artifact-mapping-resource" : {
       "description" : "Resource Mapping File used along with Configuration template",
       "version" : "1.0.0",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
index 5c0f1b351..2a4f39447 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/data_types.json
@@ -13,6 +13,9 @@
         "interface-name" : {
           "type" : "string"
         },
+        "golden-vf-module-type" : {
+          "type" : "string"
+        },
         "interface-description" : {
           "type" : "string"
         },
@@ -23,9 +26,6 @@
           "type" : "string",
           "default" : "6"
         },
-        "vf-module-type" : {
-          "type" : "string"
-        },
         "vf-module-number" : {
           "type" : "string",
           "default" : "3"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
index 7e1bd8b30..7c73752a3 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json
@@ -1,319 +1,296 @@
 {
-  "metadata": {
-    "template_author": "Alexis de Talhouët",
-    "author-email": "adetalhouet89@gmail.com",
-    "user-groups": "ADMIN, OPERATION",
-    "template_name": "golden",
-    "template_version": "1.0.0",
-    "template_tags": "test"
+  "tosca_definitions_version" : "controller_blueprint_1_0_0",
+  "metadata" : {
+    "template_author" : "Alexis de Talhouët",
+    "author-email" : "adetalhouet89@gmail.com",
+    "user-groups" : "ADMIN, OPERATION",
+    "template_name" : "golden",
+    "template_version" : "1.0.0",
+    "template_tags" : "test"
   },
-  "imports": [
-    {
-      "file": "Definitions/data_types.json"
+  "imports" : [ {
+    "file" : "Definitions/data_types.json"
+  }, {
+    "file" : "Definitions/relationship_types.json"
+  }, {
+    "file" : "Definitions/artifact_types.json"
+  }, {
+    "file" : "Definitions/node_types.json"
+  }, {
+    "file" : "Definitions/policy_types.json"
+  } ],
+  "dsl_definitions" : {
+    "ipam-1" : {
+      "type" : "token-auth",
+      "url" : "http://netbox-nginx:8080",
+      "token" : "Token 0123456789abcdef0123456789abcdef01234567"
     },
-    {
-      "file": "Definitions/relationship_types.json"
-    },
-    {
-      "file": "Definitions/artifact_types.json"
-    },
-    {
-      "file": "Definitions/node_types.json"
-    },
-    {
-      "file": "Definitions/policy_types.json"
-    }
-  ],
-  "dsl_definitions": {
-    "ipam-1": {
-      "type": "token-auth",
-      "url": "http://netbox-nginx:8080",
-      "token": "Token 0123456789abcdef0123456789abcdef01234567"
-    },
-    "config-deploy-properties": {
-      "resolution-key": {
-        "get_input": "resolution-key"
+    "config-deploy-properties" : {
+      "resolution-key" : {
+        "get_input" : "resolution-key"
       }
     }
   },
-  "topology_template": {
-    "workflows": {
-      "resource-assignment": {
-        "steps": {
-          "resource-assignment": {
-            "description": "Resource Assign Workflow",
-            "target": "resource-assignment",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+  "topology_template" : {
+    "workflows" : {
+      "resource-assignment" : {
+        "steps" : {
+          "resource-assignment" : {
+            "description" : "Resource Assign Workflow",
+            "target" : "resource-assignment",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resource-assignment-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(resource-assignment).",
-            "required": true,
-            "type": "dt-resource-assignment-properties"
+        "inputs" : {
+          "resource-assignment-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(resource-assignment).",
+            "required" : true,
+            "type" : "dt-resource-assignment-properties"
           }
         },
-        "outputs": {
-          "meshed-template": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "resource-assignment",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "meshed-template" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "resource-assignment", "assignment-params" ]
             }
           }
         }
       },
-      "config-assign": {
-        "steps": {
-          "config-assign": {
-            "description": "Config Assign Workflow",
-            "target": "config-assign",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-assign" : {
+        "steps" : {
+          "config-assign" : {
+            "description" : "Config Assign Workflow",
+            "target" : "config-assign",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": true,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : true,
+            "type" : "string"
           },
-          "config-assign-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(config-assign).",
-            "required": true,
-            "type": "dt-config-assign-properties"
+          "config-assign-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(config-assign).",
+            "required" : true,
+            "type" : "dt-config-assign-properties"
           }
         },
-        "outputs": {
-          "dry-run": {
-            "type": "json",
-            "value": {
-              "get_attribute": [
-                "config-assign",
-                "assignment-params"
-              ]
+        "outputs" : {
+          "dry-run" : {
+            "type" : "json",
+            "value" : {
+              "get_attribute" : [ "config-assign", "assignment-params" ]
             }
           }
         }
       },
-      "config-deploy": {
-        "steps": {
-          "config-deploy": {
-            "description": "Resource Assign and Python Netconf Activation Workflow",
-            "target": "config-deploy",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "config-deploy" : {
+        "steps" : {
+          "config-deploy" : {
+            "description" : "Resource Assign and Python Netconf Activation Workflow",
+            "target" : "config-deploy",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           }
         }
       },
-      "rollback": {
-        "steps": {
-          "rollback": {
-            "description": "Rollback Workflow",
-            "target": "rollback",
-            "activities": [
-              {
-                "call_operation": ""
-              }
-            ]
+      "rollback" : {
+        "steps" : {
+          "rollback" : {
+            "description" : "Rollback Workflow",
+            "target" : "rollback",
+            "activities" : [ {
+              "call_operation" : ""
+            } ]
           }
         },
-        "inputs": {
-          "resolution-key": {
-            "required": false,
-            "type": "string"
+        "inputs" : {
+          "resolution-key" : {
+            "required" : false,
+            "type" : "string"
           },
-          "password": {
-            "required": true,
-            "type": "string"
+          "password" : {
+            "required" : true,
+            "type" : "string"
           },
-          "username": {
-            "required": true,
-            "type": "string"
+          "username" : {
+            "required" : true,
+            "type" : "string"
           },
-          "ip": {
-            "required": true,
-            "type": "string"
+          "ip" : {
+            "required" : true,
+            "type" : "string"
           },
-          "rollback-properties": {
-            "description": "Dynamic PropertyDefinition for workflow(rollback).",
-            "required": true,
-            "type": "dt-rollback-properties"
+          "rollback-properties" : {
+            "description" : "Dynamic PropertyDefinition for workflow(rollback).",
+            "required" : true,
+            "type" : "dt-rollback-properties"
           }
         }
       }
     },
-    "node_templates": {
-      "resource-assignment": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "artifact-prefix-names": [
-                    "vf-module-1"
-                  ]
+    "node_templates" : {
+      "resource-assignment" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "artifact-prefix-names" : [ "vf-module-1" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "vf-module-1-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vf-module-1-template.vtl"
+        "artifacts" : {
+          "vf-module-1-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vf-module-1-template.vtl"
           },
-          "vf-module-1-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vf-module-1-mapping.json"
+          "vf-module-1-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vf-module-1-mapping.json"
           }
         }
       },
-      "config-assign": {
-        "type": "component-resource-resolution",
-        "interfaces": {
-          "ResourceResolutionComponent": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "resolution-key": {
-                    "get_input": "resolution-key"
+      "config-assign" : {
+        "type" : "component-resource-resolution",
+        "interfaces" : {
+          "ResourceResolutionComponent" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "resolution-key" : {
+                    "get_input" : "resolution-key"
                   },
-                  "store-result": true,
-                  "artifact-prefix-names": [
-                    "hostname", "vfw-interface"
-                  ]
+                  "store-result" : true,
+                  "artifact-prefix-names" : [ "hostname", "vfw-interface" ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "hostname-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/hostname-template.vtl"
+        "artifacts" : {
+          "hostname-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/hostname-template.vtl"
           },
-          "hostname-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/hostname-mapping.json"
+          "hostname-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/hostname-mapping.json"
           },
-          "vfw-interface-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/vfw-interface-template.vtl"
+          "vfw-interface-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/vfw-interface-template.vtl"
           },
-          "vfw-interface-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/vfw-interface-mapping.json"
+          "vfw-interface-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/vfw-interface-mapping.json"
           }
         }
       },
-      "config-deploy": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "config-deploy" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/ConfigDeploy.py",
-                  "instance-dependencies": [],
-                  "dynamic-properties": "*config-deploy-properties"
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/ConfigDeploy.py",
+                  "instance-dependencies" : [ ],
+                  "dynamic-properties" : "*config-deploy-properties"
                 }
               }
             }
           }
         }
       },
-      "rollback": {
-        "type": "component-netconf-executor",
-        "requirements": {
-          "netconf-connection": {
-            "capability": "netconf",
-            "node": "netconf-device",
-            "relationship": "tosca.relationships.ConnectsTo"
+      "rollback" : {
+        "type" : "component-netconf-executor",
+        "requirements" : {
+          "netconf-connection" : {
+            "capability" : "netconf",
+            "node" : "netconf-device",
+            "relationship" : "tosca.relationships.ConnectsTo"
           }
         },
-        "interfaces": {
-          "ComponentNetconfExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "script-type": "jython",
-                  "script-class-reference": "Scripts/python/Rollback.py",
-                  "instance-dependencies": []
+        "interfaces" : {
+          "ComponentNetconfExecutor" : {
+            "operations" : {
+              "process" : {
+                "inputs" : {
+                  "script-type" : "jython",
+                  "script-class-reference" : "Scripts/python/Rollback.py",
+                  "instance-dependencies" : [ ]
                 }
               }
             }
           }
         },
-        "artifacts": {
-          "junos-rollback-RPC-template": {
-            "type": "artifact-template-velocity",
-            "file": "Templates/junos-rollback-RPC-template.vtl"
+        "artifacts" : {
+          "junos-rollback-RPC-template" : {
+            "type" : "artifact-template-velocity",
+            "file" : "Templates/junos-rollback-RPC-template.vtl"
           },
-          "junos-rollback-RPC-mapping": {
-            "type": "artifact-mapping-resource",
-            "file": "Templates/junos-rollback-RPC-mapping.json"
+          "junos-rollback-RPC-mapping" : {
+            "type" : "artifact-mapping-resource",
+            "file" : "Templates/junos-rollback-RPC-mapping.json"
           }
         }
       },
-      "netconf-device": {
-        "type": "vnf-netconf-device",
-        "capabilities": {
-          "netconf": {
-            "properties": {
-              "login-key": {
-                "get_input": "password"
+      "netconf-device" : {
+        "type" : "vnf-netconf-device",
+        "capabilities" : {
+          "netconf" : {
+            "properties" : {
+              "login-key" : {
+                "get_input" : "password"
               },
-              "login-account": {
-                "get_input": "username"
+              "login-account" : {
+                "get_input" : "username"
               },
-              "target-ip-address": {
-                "get_input": "ip"
+              "target-ip-address" : {
+                "get_input" : "ip"
               },
-              "port-number": 830,
-              "connection-time-out": 5
+              "port-number" : 830,
+              "connection-time-out" : 5
             }
           }
         }
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
index c1cded219..80ae5d76e 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
@@ -3,6 +3,12 @@
     "component-netconf-executor" : {
       "description" : "This is Netconf Transaction Configuration Component API",
       "version" : "1.0.0",
+      "attributes" : {
+        "response-data" : {
+          "required" : false,
+          "type" : "json"
+        }
+      },
       "capabilities" : {
         "component-node" : {
           "type" : "tosca.capabilities.Node"
@@ -29,11 +35,6 @@
                   } ],
                   "default" : "internal"
                 },
-                "dynamic-properties" : {
-                  "description" : "Dynamic Json Content or DSL Json reference.",
-                  "required" : false,
-                  "type" : "json"
-                },
                 "script-class-reference" : {
                   "description" : "Kotlin Script class name or jython script name.",
                   "required" : true,
@@ -46,6 +47,11 @@
                   "entry_schema" : {
                     "type" : "string"
                   }
+                },
+                "dynamic-properties" : {
+                  "description" : "Dynamic Json Content or DSL Json reference.",
+                  "required" : false,
+                  "type" : "json"
                 }
               },
               "outputs" : {
@@ -90,6 +96,12 @@
                   "required" : false,
                   "type" : "string"
                 },
+                "occurrence" : {
+                  "description" : "Number of time to perform the resolution.",
+                  "required" : false,
+                  "type" : "integer",
+                  "default" : 1
+                },
                 "store-result" : {
                   "description" : "Whether or not to store the output.",
                   "required" : false,
@@ -145,25 +157,6 @@
       },
       "derived_from" : "tosca.nodes.Component"
     },
-    "dg-generic" : {
-      "description" : "This is Generic Directed Graph Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "content" : {
-          "required" : true,
-          "type" : "string"
-        },
-        "dependency-node-templates" : {
-          "description" : "Dependent Step Components NodeTemplate name.",
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.Workflow"
-    },
     "source-capability" : {
       "description" : "This is Component Resource Source Node Type",
       "version" : "1.0.0",
@@ -200,43 +193,7 @@
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
-    "source-default" : {
-      "description" : "This is Default Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-input" : {
-      "description" : "This is Input Resource Source Node Type",
-      "version" : "1.0.0",
-      "properties" : {
-        "key" : {
-          "required" : false,
-          "type" : "string"
-        },
-        "key-dependencies" : {
-          "required" : true,
-          "type" : "list",
-          "entry_schema" : {
-            "type" : "string"
-          }
-        }
-      },
-      "derived_from" : "tosca.nodes.ResourceSource"
-    },
-    "source-processor-db" : {
+    "source-db" : {
       "description" : "This is Database Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
@@ -245,7 +202,8 @@
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "SQL", "PLSQL" ]
-          } ]
+          } ],
+          "default" : "SQL"
         },
         "endpoint-selector" : {
           "required" : false,
@@ -279,12 +237,24 @@
       },
       "derived_from" : "tosca.nodes.ResourceSource"
     },
+    "source-default" : {
+      "description" : "This is Default Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
+    "source-input" : {
+      "description" : "This is Input Resource Source Node Type",
+      "version" : "1.0.0",
+      "properties" : { },
+      "derived_from" : "tosca.nodes.ResourceSource"
+    },
     "source-rest" : {
       "description" : "This is Rest Resource Source Node Type",
       "version" : "1.0.0",
       "properties" : {
         "type" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "JSON" ]
@@ -292,7 +262,7 @@
           "default" : "JSON"
         },
         "verb" : {
-          "required" : false,
+          "required" : true,
           "type" : "string",
           "constraints" : [ {
             "valid_values" : [ "GET", "POST", "DELETE", "PUT" ]
@@ -353,11 +323,6 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.Workflow" : {
-      "description" : "This is Directed Graph Node Type",
-      "version" : "1.0.0",
-      "derived_from" : "tosca.nodes.Root"
-    },
     "tosca.nodes.ResourceSource" : {
       "description" : "TOSCA base type for Resource Sources",
       "version" : "1.0.0",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
index 1169a8d58..73ee86174 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/resources_definition_types.json
@@ -8,7 +8,7 @@
     },
     "updated-by" : "adetalhouet",
     "sources" : {
-      "primary-config-data" : {
+      "config-data" : {
         "type" : "source-rest",
         "properties" : {
           "type" : "JSON",
@@ -28,6 +28,31 @@
       }
     }
   },
+  "golden-vf-module-type" : {
+    "tags" : "golden-vf-module-type",
+    "name" : "golden-vf-module-type",
+    "property" : {
+      "description" : "golden-vf-module-type",
+      "type" : "string"
+    },
+    "updated-by" : "adetalhouet",
+    "sources" : {
+      "processor-db" : {
+        "type" : "source-db",
+        "properties" : {
+          "type" : "SQL",
+          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
+          "input-key-mapping" : {
+            "vfmoduleid" : "vf-module-number"
+          },
+          "output-key-mapping" : {
+            "golden-vf-module-type" : "value"
+          },
+          "key-dependencies" : [ "vf-module-number" ]
+        }
+      }
+    }
+  },
   "hostname" : {
     "tags" : "hostname",
     "name" : "hostname",
@@ -35,7 +60,7 @@
       "description" : "hostname",
       "type" : "string"
     },
-    "updated-by" : "adetalhouet",
+    "updated-by" : "Singal, Kapil <ks220y@att.com>",
     "sources" : {
       "input" : {
         "type" : "source-input"
@@ -119,30 +144,5 @@
         "properties" : { }
       }
     }
-  },
-  "vf-module-type" : {
-    "tags" : "vf-module-type",
-    "name" : "vf-module-type",
-    "property" : {
-      "description" : "vf-module-type",
-      "type" : "string"
-    },
-    "updated-by" : "adetalhouet",
-    "sources" : {
-      "processor-db" : {
-        "type" : "source-processor-db",
-        "properties" : {
-          "type" : "SQL",
-          "query" : "select sdnctl.demo.value as value from sdnctl.demo where sdnctl.demo.id=:vfmoduleid",
-          "input-key-mapping" : {
-            "vfmoduleid" : "vf-module-number"
-          },
-          "output-key-mapping" : {
-            "vf-module-type" : "value"
-          },
-          "key-dependencies" : [ "vf-module-number" ]
-        }
-      }
-    }
   }
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
index f4fc9ab1e..738b0d4d6 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vf-module-1-mapping.json
@@ -17,7 +17,7 @@
     "property": {
       "type": "string"
     },
-    "dictionary-name": "vf-module-type",
+    "dictionary-name": "golden-vf-module-type",
     "dictionary-source": "processor-db",
     "dependencies": [
       "vf-module-number"
@@ -33,7 +33,7 @@
     "dictionary-name": "vf-module-number",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -46,7 +46,7 @@
     "dictionary-name": "prefix-id",
     "dictionary-source": "default",
     "dependencies": [
-      
+
     ]
   },
   {
@@ -56,9 +56,9 @@
         "type": "dt-netbox-ip"
     },
     "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
+    "dictionary-source": "config-data",
     "dependencies": [
       "prefix-id"
     ]
   }
-]
\ No newline at end of file
+]
diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
index 9de84441f..427df73f2 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Templates/vfw-interface-mapping.json
@@ -1,88 +1,80 @@
-[
-  {
-    "name": "interface-description",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-description",
-    "dictionary-source": "capability",
-    "dependencies": [
-      "vf-module-type"
-    ]
+[{
+  "name": "interface-description",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "interface-name",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "interface-name",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-description",
+  "dictionary-source": "capability",
+  "dependencies": [
+    "golden-vf-module-type"
+  ]
+}, {
+  "name": "interface-name",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "unit-number",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "unit-number",
-    "dictionary-source": "input",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "interface-name",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "unit-number",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "prefix-id",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "6"
-    },
-    "dictionary-name": "prefix-id",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "unit-number",
+  "dictionary-source": "input",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "prefix-id",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "6"
   },
-  {
-    "name": "vf-module-type",
-    "input-param": true,
-    "property": {
-      "type": "string"
-    },
-    "dictionary-name": "vf-module-type",
-    "dictionary-source": "processor-db",
-    "dependencies": [
-      "vf-module-number"
-    ]
+  "dictionary-name": "prefix-id",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "golden-vf-module-type",
+  "input-param": true,
+  "property": {
+    "type": "string"
   },
-  {
-    "name": "vf-module-number",
-    "input-param": true,
-    "property": {
-      "type": "string",
-      "default": "3"
-    },
-    "dictionary-name": "vf-module-number",
-    "dictionary-source": "default",
-    "dependencies": [
-      
-    ]
+  "dictionary-name": "golden-vf-module-type",
+  "dictionary-source": "processor-db",
+  "dependencies": [
+    "vf-module-number"
+  ]
+}, {
+  "name": "vf-module-number",
+  "input-param": true,
+  "property": {
+    "type": "string",
+    "default": "3"
   },
-  {
-    "name": "vfw_interface_ip",
-    "input-param": true,
-    "property": {
-        "type": "dt-netbox-ip"
-    },
-    "dictionary-name": "create_netbox_ip",
-    "dictionary-source": "primary-config-data",
-    "dependencies": [
-      "prefix-id"
-    ]
-  }
-]
\ No newline at end of file
+  "dictionary-name": "vf-module-number",
+  "dictionary-source": "default",
+  "dependencies": [
+
+  ]
+}, {
+  "name": "vfw_interface_ip",
+  "input-param": true,
+  "property": {
+    "type": "dt-netbox-ip"
+  },
+  "dictionary-name": "create_netbox_ip",
+  "dictionary-source": "config-data",
+  "dependencies": [
+    "prefix-id"
+  ]
+}]