SDN Controller Blueprints Processor 73/65073/2
authorSingal, Kapil (ks220y) <ks220y@att.com>
Thu, 6 Sep 2018 20:01:47 +0000 (16:01 -0400)
committerSingal, Kapil (ks220y) <ks220y@att.com>
Thu, 6 Sep 2018 20:45:59 +0000 (16:45 -0400)
Fixing POM's, Junit Test Cases and removing extra resource files

Change-Id: Iaa6932903d1b476453d242779370197769d91484
Issue-ID: CCSDK-505
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
blueprints-processor/plugin/model-provider/src/main/java/org/onap/ccsdk/config/model/data/dict/SourcesProperties.java
blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/model/validator/ServiceTemplateValidationTest.java
blueprints-processor/plugin/model-provider/src/test/java/org/onap/ccsdk/config/params/service/ServiceTemplateCreateUtils.java
blueprints-processor/plugin/model-provider/src/test/resources/dictionary/dictionary_schema.json
blueprints-processor/plugin/model-provider/src/test/resources/service_templates/default.json
blueprints-processor/plugin/model-provider/src/test/resources/service_templates/vrr_config.json
pom.xml

index 5817631..5be1647 100644 (file)
@@ -23,8 +23,6 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 \r
 public class SourcesProperties {\r
 \r
-    private String key;\r
-\r
     @JsonProperty(value = "name")\r
     private String name;\r
 \r
@@ -52,14 +50,6 @@ public class SourcesProperties {
     @JsonProperty("key-dependencies")\r
     private List<String> dependencies;\r
 \r
-    public String getKey() {\r
-        return key;\r
-    }\r
-\r
-    public void setKey(String key) {\r
-        this.key = key;\r
-    }\r
-\r
     public String getName() {\r
         return name;\r
     }\r
index 5776b51..4c5e6a9 100644 (file)
@@ -38,10 +38,6 @@ public class ServiceTemplateValidationTest {
             serviceTemplateContent = IOUtils.toString(ServiceTemplateValidationTest.class.getClassLoader()\r
                     .getResourceAsStream("service_templates/resource_assignment.json"), Charset.defaultCharset());\r
             serviceTemplateValidator.validateServiceTemplate(serviceTemplateContent);\r
-            logger.info(" **************** Activate Netconf *****************");\r
-            serviceTemplateContent = IOUtils.toString(ServiceTemplateValidationTest.class.getClassLoader()\r
-                    .getResourceAsStream("service_templates/download_config.json"), Charset.defaultCharset());\r
-            serviceTemplateValidator.validateServiceTemplate(serviceTemplateContent);\r
         } catch (Exception e) {\r
             e.printStackTrace();\r
         }\r
index 6bfa903..52f5405 100644 (file)
@@ -45,12 +45,9 @@ public class ServiceTemplateCreateUtils {
 \r
                 String formattedServiceTemplateContent = TransformationUtils.getJson(serviceTemplate, true);\r
 \r
-                FileUtils.writeStringToFile(new File("src/test/resources/service_templates/_default.json"),\r
+                FileUtils.writeStringToFile(new File("src/test/resources/service_templates/default.json"),\r
                         formattedServiceTemplateContent, Charset.defaultCharset());\r
 \r
-                createNetconfdownloadNodeTemplate(serviceTemplate);\r
-                createRestconfdownloadNodeTemplate(serviceTemplate);\r
-                // createResourceAssignmentNodeTemplate(serviceTemplate);\r
                 createVrrNodeTemplate(serviceTemplate);\r
                 createDictionarySchema();\r
 \r
@@ -90,105 +87,6 @@ public class ServiceTemplateCreateUtils {
 \r
     }\r
 \r
-    public void createNetconfdownloadNodeTemplate(ServiceTemplate serviceTemplate) throws IOException {\r
-        if (serviceTemplate != null) {\r
-            ServiceTemplate workingServiceTemplate = new ServiceTemplate();\r
-            workingServiceTemplate.setMetadata(serviceTemplate.getMetadata());\r
-\r
-            Map<String, DataType> data_types = new HashMap<String, DataType>();\r
-            data_types.put("datatype-property", serviceTemplate.getDataTypes().get("datatype-property"));\r
-            data_types.put("datatype-resource-assignment",\r
-                    serviceTemplate.getDataTypes().get("datatype-resource-assignment"));\r
-            workingServiceTemplate.setDataTypes(data_types);\r
-\r
-            TopologyTemplate topology_template = new TopologyTemplate();\r
-            Map<String, NodeTemplate> node_templates = new HashMap<String, NodeTemplate>();\r
-\r
-            Map<String, NodeTemplate> node_Templates = serviceTemplate.getTopologyTemplate().getNodeTemplates();\r
-\r
-            node_templates.put("activate-action", node_Templates.get("activate-action"));\r
-            node_templates.put("base-config-template", node_Templates.get("base-config-template"));\r
-            node_templates.put("vrr-netconf-device", node_Templates.get("vrr-netconf-device"));\r
-            node_templates.put("get-netconf-config", node_Templates.get("get-netconf-config"));\r
-            node_templates.put("edit-netconf-config", node_Templates.get("edit-netconf-config"));\r
-            node_templates.put("transaction-netconf-baseconfig", node_Templates.get("transaction-netconf-baseconfig"));\r
-\r
-            topology_template.setNodeTemplates(node_templates);\r
-            topology_template.setInputs(serviceTemplate.getTopologyTemplate().getInputs());\r
-\r
-            Map<String, NodeType> node_types = new HashMap<String, NodeType>();\r
-            node_types.put("dg-activate-netconf", serviceTemplate.getNodeTypes().get("dg-activate-netconf"));\r
-            node_types.put("artifact-config-template", serviceTemplate.getNodeTypes().get("artifact-config-template"));\r
-            node_types.put("component-transaction-netconf",\r
-                    serviceTemplate.getNodeTypes().get("component-transaction-netconf"));\r
-            node_types.put("component-netconf-edit", serviceTemplate.getNodeTypes().get("component-netconf-edit"));\r
-            node_types.put("component-netconf-get", serviceTemplate.getNodeTypes().get("component-netconf-get"));\r
-            node_types.put("vnf-netconf-device", serviceTemplate.getNodeTypes().get("vnf-netconf-device"));\r
-\r
-            workingServiceTemplate.setNodeTypes(node_types);\r
-            workingServiceTemplate.setTopologyTemplate(topology_template);\r
-\r
-            String workingServiceTemplateContent = TransformationUtils.getJson(workingServiceTemplate, true);\r
-\r
-            FileUtils.writeStringToFile(new File("src/test/resources/service_templates/download_config.json"),\r
-                    workingServiceTemplateContent, Charset.defaultCharset());\r
-\r
-            File lcmFile = new File(\r
-                    "../../../adaptors/netconf-adaptor/provider/src/test/resources/service_templates/download_config.json");\r
-            FileUtils.writeStringToFile(lcmFile, workingServiceTemplateContent, Charset.defaultCharset());\r
-\r
-        }\r
-    }\r
-\r
-    public void createRestconfdownloadNodeTemplate(ServiceTemplate serviceTemplate) throws IOException {\r
-        if (serviceTemplate != null) {\r
-            ServiceTemplate workingServiceTemplate = new ServiceTemplate();\r
-            workingServiceTemplate.setMetadata(serviceTemplate.getMetadata());\r
-\r
-            Map<String, DataType> data_types = new HashMap<String, DataType>();\r
-            data_types.put("datatype-property", serviceTemplate.getDataTypes().get("datatype-property"));\r
-            data_types.put("datatype-resource-assignment",\r
-                    serviceTemplate.getDataTypes().get("datatype-resource-assignment"));\r
-            workingServiceTemplate.setDataTypes(data_types);\r
-\r
-            TopologyTemplate topology_template = new TopologyTemplate();\r
-            Map<String, NodeTemplate> node_templates = new HashMap<String, NodeTemplate>();\r
-\r
-            Map<String, NodeTemplate> node_Templates = serviceTemplate.getTopologyTemplate().getNodeTemplates();\r
-            node_templates.put("activate-restconf-action", node_Templates.get("activate-restconf-action"));\r
-            node_templates.put("base-config-template", node_Templates.get("base-config-template"));\r
-            node_templates.put("vrr-restconf-device", node_Templates.get("vrr-restconf-device"));\r
-            node_templates.put("edit-restconf-config", node_Templates.get("edit-restconf-config"));\r
-            node_templates.put("transaction-restconf-baseconfig",\r
-                    node_Templates.get("transaction-restconf-baseconfig"));\r
-\r
-            topology_template.setNodeTemplates(node_templates);\r
-            topology_template.setInputs(serviceTemplate.getTopologyTemplate().getInputs());\r
-\r
-            Map<String, NodeType> node_types = new HashMap<String, NodeType>();\r
-            node_types.put("dg-activate-restconf", serviceTemplate.getNodeTypes().get("dg-activate-restconf"));\r
-            node_types.put("artifact-config-template", serviceTemplate.getNodeTypes().get("artifact-config-template"));\r
-            node_types.put("component-transaction-restconf",\r
-                    serviceTemplate.getNodeTypes().get("component-transaction-restconf"));\r
-            node_types.put("component-restconf", serviceTemplate.getNodeTypes().get("component-restconf"));\r
-            node_types.put("vnf-restconf-device", serviceTemplate.getNodeTypes().get("vnf-restconf-device"));\r
-\r
-            workingServiceTemplate.setNodeTypes(node_types);\r
-            workingServiceTemplate.setTopologyTemplate(topology_template);\r
-\r
-            String workingServiceTemplateContent = TransformationUtils.getJson(workingServiceTemplate, true);\r
-\r
-            FileUtils.writeStringToFile(new File("src/test/resources/service_templates/restconf_download_config.json"),\r
-                    workingServiceTemplateContent, Charset.defaultCharset());\r
-\r
-            File lcmFile = new File(\r
-                    "../../../adaptors/netconf-adaptor/provider/src/test/resources/service_templates/restconf_download_config.json");\r
-            FileUtils.writeStringToFile(lcmFile, workingServiceTemplateContent, Charset.defaultCharset());\r
-\r
-        }\r
-\r
-    }\r
-\r
     public void createResourceAssignmentNodeTemplate(ServiceTemplate serviceTemplate) throws IOException {\r
         if (serviceTemplate != null) {\r
             ServiceTemplate workingServiceTemplate = new ServiceTemplate();\r
index dd297ab..809db7d 100644 (file)
        "type": "object",\r
        "properties": {\r
                "resource-path": {\r
+                       "tags": {\r
+                               "type": "string"\r
+                       },\r
+                       "name": {\r
+                               "type": "string",\r
+                               "required": true\r
+                       },\r
                        "type": "string",\r
                        "required": true\r
                },\r
-               "description": {\r
-                       "type": "string"\r
-               },\r
-               "updated-by": {\r
-                       "type": "string"\r
-               },\r
-               "data-type": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "sources": {\r
+               "property": {\r
                        "type": "object",\r
-                       "required": true,\r
                        "properties": {\r
-                               "input": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "key": {\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "component": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "name": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
                                "default": {\r
                                        "type": "any"\r
                                },\r
-                               "aai": {\r
-                                       "type": "any"\r
-                               },\r
-                               "mdsal": {\r
+                               "entry_schema": {\r
                                        "type": "object",\r
                                        "properties": {\r
-                                               "path": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "url-path": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
                                                "type": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "base": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "network-resource-discovery": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "db": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "query": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "type": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "base": {\r
-                                                       "type": "string",\r
-                                                       "required": true\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "policy": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "input-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               },\r
-                                               "output-key-mapping": {\r
-                                                       "type": "object",\r
-                                                       "additionalProperties": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               },\r
-               "candidate-dependency": {\r
-                       "type": "object",\r
-                       "properties": {\r
-                               "input": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
+                                                       "type": "string"\r
                                                }\r
                                        }\r
                                },\r
-                               "component": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
+                               "description": {\r
+                                       "type": "string"\r
                                },\r
-                               "aai": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
+                               "type": {\r
+                                       "type": "string"\r
                                },\r
-                               "mdsal": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
+                               "constraints": {\r
+                                       "type": "array",\r
+                                       "items": {\r
+                                               "type": "object",\r
+                                               "additionalProperties": {\r
+                                                       "type": "any"\r
                                                }\r
                                        }\r
                                },\r
-                               "network-resource-discovery": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
+                               "value": {\r
+                                       "type": "any"\r
                                },\r
-                               "db": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
+                               "required": {\r
+                                       "type": "boolean"\r
                                },\r
-                               "policy": {\r
-                                       "type": "object",\r
-                                       "properties": {\r
-                                               "names": {\r
-                                                       "type": "array",\r
-                                                       "items": {\r
-                                                               "type": "string"\r
-                                                       }\r
-                                               }\r
-                                       }\r
+                               "status": {\r
+                                       "type": "string"\r
                                }\r
                        }\r
                },\r
-               "tags": {\r
-                       "type": "string"\r
-               },\r
-               "default": {\r
-                       "type": "any"\r
-               },\r
-               "name": {\r
-                       "type": "string",\r
-                       "required": true\r
-               },\r
-               "valid-values": {\r
-                       "type": "string"\r
-               },\r
                "resource-type": {\r
                        "type": "string",\r
                        "required": true\r
                },\r
-               "sample-value": {\r
+               "updated-by": {\r
                        "type": "string"\r
                },\r
-               "entry-schema": {\r
-                       "type": "string"\r
+               "sources": {\r
+                       "type": "object",\r
+                       "required": true,\r
+                       "additionalProperties": {\r
+                               "type": "object",\r
+                               "properties": {\r
+                                       "type": {\r
+                                               "type": "string",\r
+                                               "required": true\r
+                                       },\r
+                                       "properties": {\r
+                                               "type": "object",\r
+                                               "required": true,\r
+                                               "properties": {\r
+                                                       "type": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "name": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "key": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "path": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "url-path": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "query": {\r
+                                                               "type": "string"\r
+                                                       },\r
+                                                       "input-key-mapping": {\r
+                                                               "type": "object",\r
+                                                               "additionalProperties": {\r
+                                                                       "type": "string"\r
+                                                               }\r
+                                                       },\r
+                                                       "output-key-mapping": {\r
+                                                               "type": "object",\r
+                                                               "additionalProperties": {\r
+                                                                       "type": "string"\r
+                                                               }\r
+                                                       },\r
+                                                       "key-dependencies": {\r
+                                                               "type": "array",\r
+                                                               "items": {\r
+                                                                       "type": "string"\r
+                                                               }\r
+                                                       }\r
+                                               }\r
+                                       }\r
+                               }\r
+                       }\r
                }\r
        }\r
-}\r
+}
\ No newline at end of file
index a2fc775..f7dc594 100644 (file)
 {\r
-       "tosca_definitions_version": "sdn_config_1_0_0",\r
-       "metadata": {\r
-               "author": "ks220y@att.com",\r
-               "service-template-name": "VRR-baseconfiguration",\r
-               "service-template-version": "1.0.0",\r
-               "release": "1802",\r
-               "service-type": "AVPN",\r
-               "vnf-type": "VRR"\r
-       },\r
-       "topology_template": {\r
-               "inputs": {\r
-                       "request-id": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "service-instance-id": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "action-name": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "scope-type": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       },\r
-                       "hostname": {\r
-                               "required": true,\r
-                               "type": "string"\r
-                       }\r
-               },\r
-               "node_templates": {\r
-                       "base-config-template": {\r
-                               "type": "artifact-config-template",\r
-                               "properties": {\r
-                                       "action-names": [\r
-                                               "resource-assignment-action"\r
-                                       ]\r
-                               },\r
-                               "capabilities": {\r
-                                       "content": {\r
-                                               "properties": {\r
-                                                       "content": "db://base-config-template"\r
-                                               }\r
-                                       },\r
-                                       "mapping": {\r
-                                               "properties": {\r
-                                                       "mapping": [\r
-                                                               {\r
-                                                                       "name": "vnf-id",\r
-                                                                       "input-param": true,\r
-                                                                       "property": {\r
-                                                                               "type": "string",\r
-                                                                               "required": true\r
-                                                                       },\r
-                                                                       "dictionary-name": "vnf-id",\r
-                                                                       "dictionary-source": "input"\r
-                                                               },\r
-                                                               {\r
-                                                                       "name": "group-name",\r
-                                                                       "input-param": true,\r
-                                                                       "property": {\r
-                                                                               "type": "string",\r
-                                                                               "required": true\r
-                                                                       },\r
-                                                                       "dictionary-name": "group-name",\r
-                                                                       "dictionary-source": "input"\r
-                                                               }\r
-                                                       ]\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "licence-template": {\r
-                               "type": "artifact-config-template",\r
-                               "properties": {\r
-                                       "action-names": [\r
-                                               "resource-assignment-action"\r
-                                       ]\r
-                               },\r
-                               "capabilities": {\r
-                                       "content": {\r
-                                               "properties": {\r
-                                                       "content": "db://licence-template"\r
-                                               }\r
-                                       },\r
-                                       "mapping": {\r
-                                               "properties": {\r
-                                                       "mapping": [\r
-                                                               {\r
-                                                                       "name": "bundle-id",\r
-                                                                       "input-param": true,\r
-                                                                       "property": {\r
-                                                                               "type": "string"\r
-                                                                       },\r
-                                                                       "dictionary-name": "bundle-id",\r
-                                                                       "dictionary-source": "input"\r
-                                                               },\r
-                                                               {\r
-                                                                       "name": "bundle-mac",\r
-                                                                       "input-param": true,\r
-                                                                       "property": {\r
-                                                                               "type": "string",\r
-                                                                               "required": true\r
-                                                                       },\r
-                                                                       "dictionary-name": "bundle-mac",\r
-                                                                       "dictionary-source": "input"\r
-                                                               }\r
-                                                       ]\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "resource-assignment-action": {\r
-                               "type": "dg-resource-assignment",\r
-                               "interfaces": {\r
-                                       "CONFIG": {\r
-                                               "operations": {\r
-                                                       "ResourceAssignment": {\r
-                                                               \r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "capabilities": {\r
-                                       "dg-node": {\r
-                                               \r
-                                       }\r
-                               },\r
-                               "requirements": {\r
-                                       "component-dependency": {\r
-                                               "capability": "component-node",\r
-                                               "node": "resource-assignment",\r
-                                               "relationship": "tosca.relationships.DependsOn"\r
-                                       }\r
-                               }\r
-                       },\r
-                       "config-generator-action": {\r
-                               "type": "dg-config-generator",\r
-                               "interfaces": {\r
-                                       "CONFIG": {\r
-                                               "operations": {\r
-                                                       "GenerateConfiguration": {\r
-                                                               \r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "capabilities": {\r
-                                       "dg-node": {\r
-                                               \r
-                                       }\r
-                               },\r
-                               "requirements": {\r
-                                       "component-dependency": {\r
-                                               "capability": "component-node",\r
-                                               "node": "generate-configuration",\r
-                                               "relationship": "tosca.relationships.DependsOn"\r
-                                       }\r
-                               }\r
-                       },\r
-                       "resource-assignment": {\r
-                               "type": "component-resource-assignment",\r
-                               "interfaces": {\r
-                                       "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
-                                               "operations": {\r
-                                                       "process": {\r
-                                                               "inputs": {\r
-                                                                       "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                                                                       "resource-type": "vnf-type",\r
-                                                                       "template-names": [\r
-                                                                               "base-config-template",\r
-                                                                               "licence-template"\r
-                                                                       ],\r
-                                                                       "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                                                                       "resource-id": "{ \"get_input\" : \"vnf-id\" }"\r
-                                                               },\r
-                                                               "outputs": {\r
-                                                                       "resource-assignment-params": "",\r
-                                                                       "status": ""\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "capabilities": {\r
-                                       "component-node": {\r
-                                               \r
-                                       }\r
-                               }\r
-                       },\r
-                       "generate-configuration": {\r
-                               "type": "component-config-generator",\r
-                               "interfaces": {\r
-                                       "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
-                                               "operations": {\r
-                                                       "process": {\r
-                                                               "inputs": {\r
-                                                                       "action-name": "{ \"get_input\" : \"action-name\" }",\r
-                                                                       "resource-type": "vnf-type",\r
-                                                                       "request-id": "{ \"get_input\" : \"request-id\" }",\r
-                                                                       "resource-id": "{ \"get_input\" : \"vnf-id\" }",\r
-                                                                       "template-name": "base-config-template"\r
-                                                               },\r
-                                                               "outputs": {\r
-                                                                       "generated-config": "",\r
-                                                                       "status": ""\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "capabilities": {\r
-                                       "component-node": {\r
-                                               \r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "artifact_types": {\r
-               "artifact-template-velocity": {\r
-                       "description": " Velocity Template used for Configuration",\r
-                       "version": "1.0.0",\r
-                       "file_ext": [\r
-                               "vtl"\r
-                       ],\r
-                       "derived_from": "tosca.artifacts.Implementation"\r
-               },\r
-               "artifact-mapping-resource": {\r
-                       "description": " Velocity Template Resource Mapping File used along with Configuration template",\r
-                       "version": "1.0.0",\r
-                       "file_ext": [\r
-                               "json"\r
-                       ],\r
-                       "derived_from": "tosca.artifacts.Implementation"\r
-               },\r
-               "artifact-script-python": {\r
-                       "description": " Python Script Template used for Configuration",\r
-                       "version": "1.0.0",\r
-                       "file_ext": [\r
-                               "py"\r
-                       ],\r
-                       "derived_from": "tosca.artifacts.Implementation"\r
-               }\r
-       },\r
-       "node_types": {\r
-               "dg-resource-assignment": {\r
-                       "description": "This is Resource Assignment Directed Graph",\r
-                       "version": "1.0.0",\r
-                       "properties": {\r
-                               "mode": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "sync"\r
-                               },\r
-                               "version": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "LATEST"\r
-                               },\r
-                               "is-start-flow": {\r
-                                       "required": false,\r
-                                       "type": "boolean",\r
-                                       "default": "false"\r
-                               }\r
-                       },\r
-                       "capabilities": {\r
-                               "dg-node": {\r
-                                       "type": "tosca.capabilities.Node"\r
-                               },\r
-                               "content": {\r
-                                       "type": "tosca.capability.Content",\r
-                                       "properties": {\r
-                                               "type": {\r
-                                                       "required": false,\r
-                                                       "type": "string",\r
-                                                       "default": "json"\r
-                                               },\r
-                                               "content": {\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "requirements": {\r
-                               "component-dependency": {\r
-                                       "capability": "component-node",\r
-                                       "node": "component-resource-assignment",\r
-                                       "relationship": "tosca.relationships.DependsOn"\r
-                               }\r
-                       },\r
-                       "interfaces": {\r
-                               "CONFIG": {\r
-                                       "operations": {\r
-                                               "ResourceAssignment": {\r
-                                                       "inputs": {\r
-                                                               "params": {\r
-                                                                       "required": false,\r
-                                                                       "type": "list",\r
-                                                                       "entry_schema": {\r
-                                                                               "type": "datatype-property"\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.DG"\r
-               },\r
-               "dg-config-generator": {\r
-                       "description": "This is Activate DG for Config Generator Directed Graph",\r
-                       "version": "1.0.0",\r
-                       "properties": {\r
-                               "mode": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "sync"\r
-                               },\r
-                               "version": {\r
-                                       "required": false,\r
-                                       "type": "string",\r
-                                       "default": "LATEST"\r
-                               },\r
-                               "is-start-flow": {\r
-                                       "required": false,\r
-                                       "type": "boolean",\r
-                                       "default": "false"\r
-                               }\r
-                       },\r
-                       "capabilities": {\r
-                               "dg-node": {\r
-                                       "type": "tosca.capabilities.Node"\r
-                               },\r
-                               "content": {\r
-                                       "type": "tosca.capability.Content",\r
-                                       "properties": {\r
-                                               "type": {\r
-                                                       "required": false,\r
-                                                       "type": "string",\r
-                                                       "default": "json"\r
-                                               },\r
-                                               "content": {\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "requirements": {\r
-                               "component-dependency": {\r
-                                       "capability": "component-node",\r
-                                       "node": "component-config-generator",\r
-                                       "relationship": "tosca.relationships.DependsOn"\r
-                               }\r
-                       },\r
-                       "interfaces": {\r
-                               "CONFIG": {\r
-                                       "operations": {\r
-                                               "GenerateConfiguration": {\r
-                                                       "inputs": {\r
-                                                               "params": {\r
-                                                                       "required": false,\r
-                                                                       "type": "list",\r
-                                                                       "entry_schema": {\r
-                                                                               "type": "datatype-property"\r
-                                                                       }\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.DG"\r
-               },\r
-               "artifact-config-template": {\r
-                       "description": "This is Configuration Velocity Template",\r
-                       "version": "1.0.0",\r
-                       "properties": {\r
-                               "action-names": {\r
-                                       "required": true,\r
-                                       "type": "list",\r
-                                       "entry_schema": {\r
-                                               "type": "string"\r
-                                       }\r
-                               },\r
-                               "content": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               },\r
-                               "mapping": {\r
-                                       "required": false,\r
-                                       "type": "list",\r
-                                       "entry_schema": {\r
-                                               "type": "datatype-resource-assignment"\r
-                                       }\r
-                               }\r
-                       },\r
-                       "capabilities": {\r
-                               "content": {\r
-                                       "type": "tosca.capability.Content",\r
-                                       "properties": {\r
-                                               "content": {\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               },\r
-                               "mapping": {\r
-                                       "type": "tosca.capability.Mapping",\r
-                                       "properties": {\r
-                                               "mapping": {\r
-                                                       "required": false,\r
-                                                       "type": "list",\r
-                                                       "entry_schema": {\r
-                                                               "type": "datatype-resource-assignment"\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.Artifact"\r
-               },\r
-               "component-resource-assignment": {\r
-                       "description": "This is Resource Assignment Component API",\r
-                       "version": "1.0.0",\r
-                       "capabilities": {\r
-                               "component-node": {\r
-                                       "type": "tosca.capabilities.Node"\r
-                               }\r
-                       },\r
-                       "interfaces": {\r
-                               "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": {\r
-                                       "operations": {\r
-                                               "process": {\r
-                                                       "inputs": {\r
-                                                               "action-name": {\r
-                                                                       "description": "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "handler-name": {\r
-                                                                       "description": "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "resource-type": {\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "template-names": {\r
-                                                                       "description": "Name of the Artifact Node Templates, to get the template Content.",\r
-                                                                       "required": true,\r
-                                                                       "type": "list",\r
-                                                                       "entry_schema": {\r
-                                                                               "type": "string"\r
-                                                                       }\r
-                                                               },\r
-                                                               "request-id": {\r
-                                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "resource-id": {\r
-                                                                       "description": "Id used to pull the data content from the data base. Either template-data or resource-id should be present",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       },\r
-                                                       "outputs": {\r
-                                                               "resource-assignment-params": {\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "status": {\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.Component"\r
-               },\r
-               "component-config-generator": {\r
-                       "description": "This is Generate Configuration Component API",\r
-                       "version": "1.0.0",\r
-                       "capabilities": {\r
-                               "component-node": {\r
-                                       "type": "tosca.capabilities.Node"\r
-                               }\r
-                       },\r
-                       "interfaces": {\r
-                               "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode": {\r
-                                       "operations": {\r
-                                               "process": {\r
-                                                       "inputs": {\r
-                                                               "template-data": {\r
-                                                                       "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "action-name": {\r
-                                                                       "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "template-content": {\r
-                                                                       "description": "Conditional : Dynamic Template used to generate Configuration.",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "resource-type": {\r
-                                                                       "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "request-id": {\r
-                                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "resource-id": {\r
-                                                                       "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "template-name": {\r
-                                                                       "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       },\r
-                                                       "outputs": {\r
-                                                               "generated-config": {\r
-                                                                       "description": "Generated Configuration for the Template adn Resource Data",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "mask-info": {\r
-                                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",\r
-                                                                       "required": false,\r
-                                                                       "type": "string"\r
-                                                               },\r
-                                                               "status": {\r
-                                                                       "description": "Status of the Component Execution ( success or failure )",\r
-                                                                       "required": true,\r
-                                                                       "type": "string"\r
-                                                               }\r
-                                                       }\r
-                                               }\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.nodes.Component"\r
-               }\r
-       },\r
-       "data_types": {\r
-               "datatype-resource-assignment": {\r
-                       "version": "1.0.0",\r
-                       "description": "This is Resource Assignment Data Type",\r
-                       "properties": {\r
-                               "property": {\r
-                                       "required": true,\r
-                                       "type": "datatype-property"\r
-                               },\r
-                               "input-param": {\r
-                                       "required": true,\r
-                                       "type": "boolean"\r
-                               },\r
-                               "dictionary-name": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               },\r
-                               "dictionary-source": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               },\r
-                               "dependencies": {\r
-                                       "required": true,\r
-                                       "type": "list",\r
-                                       "entry_schema": {\r
-                                               "type": "string"\r
-                                       }\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.datatypes.Root"\r
-               },\r
-               "datatype-property": {\r
-                       "version": "1.0.0",\r
-                       "description": "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",\r
-                       "properties": {\r
-                               "type": {\r
-                                       "required": true,\r
-                                       "type": "string"\r
-                               },\r
-                               "description": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               },\r
-                               "required": {\r
-                                       "required": false,\r
-                                       "type": "boolean"\r
-                               },\r
-                               "default": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               },\r
-                               "entry_schema": {\r
-                                       "required": false,\r
-                                       "type": "string"\r
-                               }\r
-                       },\r
-                       "derived_from": "tosca.datatypes.Root"\r
-               }\r
-       }\r
-}\r
+  "metadata" : {\r
+    "author" : "ks220y@att.com",\r
+    "service-template-name" : "VRR-baseconfiguration",\r
+    "service-template-version" : "1.0.0",\r
+    "release" : "1802",\r
+    "service-type" : "AVPN",\r
+    "vnf-type" : "VRR"\r
+  },\r
+  "tosca_definitions_version" : "sdn_config_1_0_0",\r
+  "topology_template" : {\r
+    "inputs" : {\r
+      "request-id" : {\r
+        "required" : true,\r
+        "type" : "string"\r
+      },\r
+      "service-instance-id" : {\r
+        "required" : true,\r
+        "type" : "string"\r
+      },\r
+      "action-name" : {\r
+        "required" : true,\r
+        "type" : "string"\r
+      },\r
+      "scope-type" : {\r
+        "required" : true,\r
+        "type" : "string"\r
+      },\r
+      "hostname" : {\r
+        "required" : true,\r
+        "type" : "string"\r
+      }\r
+    },\r
+    "node_templates" : {\r
+      "base-config-template" : {\r
+        "type" : "artifact-config-template",\r
+        "properties" : {\r
+          "action-names" : [ "resource-assignment-action" ]\r
+        },\r
+        "capabilities" : {\r
+          "content" : {\r
+            "properties" : {\r
+              "content" : "db://base-config-template"\r
+            }\r
+          },\r
+          "mapping" : {\r
+            "properties" : {\r
+              "mapping" : [ {\r
+                "name" : "vnf-id",\r
+                "input-param" : true,\r
+                "property" : {\r
+                  "type" : "string",\r
+                  "required" : true\r
+                },\r
+                "dictionary-name" : "vnf-id",\r
+                "dictionary-source" : "input"\r
+              }, {\r
+                "name" : "group-name",\r
+                "input-param" : true,\r
+                "property" : {\r
+                  "type" : "string",\r
+                  "required" : true\r
+                },\r
+                "dictionary-name" : "group-name",\r
+                "dictionary-source" : "input"\r
+              } ]\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "licence-template" : {\r
+        "type" : "artifact-config-template",\r
+        "properties" : {\r
+          "action-names" : [ "resource-assignment-action" ]\r
+        },\r
+        "capabilities" : {\r
+          "content" : {\r
+            "properties" : {\r
+              "content" : "db://licence-template"\r
+            }\r
+          },\r
+          "mapping" : {\r
+            "properties" : {\r
+              "mapping" : [ {\r
+                "name" : "bundle-id",\r
+                "input-param" : true,\r
+                "property" : {\r
+                  "type" : "string"\r
+                },\r
+                "dictionary-name" : "bundle-id",\r
+                "dictionary-source" : "input"\r
+              }, {\r
+                "name" : "bundle-mac",\r
+                "input-param" : true,\r
+                "property" : {\r
+                  "type" : "string",\r
+                  "required" : true\r
+                },\r
+                "dictionary-name" : "bundle-mac",\r
+                "dictionary-source" : "input"\r
+              } ]\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "resource-assignment-action" : {\r
+        "type" : "dg-resource-assignment",\r
+        "interfaces" : {\r
+          "CONFIG" : {\r
+            "operations" : {\r
+              "ResourceAssignment" : { }\r
+            }\r
+          }\r
+        },\r
+        "capabilities" : {\r
+          "dg-node" : { }\r
+        },\r
+        "requirements" : {\r
+          "component-dependency" : {\r
+            "capability" : "component-node",\r
+            "node" : "resource-assignment",\r
+            "relationship" : "tosca.relationships.DependsOn"\r
+          }\r
+        }\r
+      },\r
+      "config-generator-action" : {\r
+        "type" : "dg-config-generator",\r
+        "interfaces" : {\r
+          "CONFIG" : {\r
+            "operations" : {\r
+              "GenerateConfiguration" : { }\r
+            }\r
+          }\r
+        },\r
+        "capabilities" : {\r
+          "dg-node" : { }\r
+        },\r
+        "requirements" : {\r
+          "component-dependency" : {\r
+            "capability" : "component-node",\r
+            "node" : "generate-configuration",\r
+            "relationship" : "tosca.relationships.DependsOn"\r
+          }\r
+        }\r
+      },\r
+      "resource-assignment" : {\r
+        "type" : "component-resource-assignment",\r
+        "interfaces" : {\r
+          "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
+            "operations" : {\r
+              "process" : {\r
+                "inputs" : {\r
+                  "action-name" : "{ \"get_input\" : \"action-name\" }",\r
+                  "resource-type" : "vnf-type",\r
+                  "template-names" : [ "base-config-template", "licence-template" ],\r
+                  "request-id" : "{ \"get_input\" : \"request-id\" }",\r
+                  "resource-id" : "{ \"get_input\" : \"vnf-id\" }"\r
+                },\r
+                "outputs" : {\r
+                  "resource-assignment-params" : "",\r
+                  "status" : ""\r
+                }\r
+              }\r
+            }\r
+          }\r
+        },\r
+        "capabilities" : {\r
+          "component-node" : { }\r
+        }\r
+      },\r
+      "generate-configuration" : {\r
+        "type" : "component-config-generator",\r
+        "interfaces" : {\r
+          "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {\r
+            "operations" : {\r
+              "process" : {\r
+                "inputs" : {\r
+                  "action-name" : "{ \"get_input\" : \"action-name\" }",\r
+                  "resource-type" : "vnf-type",\r
+                  "request-id" : "{ \"get_input\" : \"request-id\" }",\r
+                  "resource-id" : "{ \"get_input\" : \"vnf-id\" }",\r
+                  "template-name" : "base-config-template"\r
+                },\r
+                "outputs" : {\r
+                  "generated-config" : "",\r
+                  "status" : ""\r
+                }\r
+              }\r
+            }\r
+          }\r
+        },\r
+        "capabilities" : {\r
+          "component-node" : { }\r
+        }\r
+      }\r
+    }\r
+  },\r
+  "artifact_types" : {\r
+    "artifact-template-velocity" : {\r
+      "description" : " Velocity Template used for Configuration",\r
+      "version" : "1.0.0",\r
+      "derived_from" : "tosca.artifacts.Implementation",\r
+      "file_ext" : [ "vtl" ]\r
+    },\r
+    "artifact-mapping-resource" : {\r
+      "description" : " Velocity Template Resource Mapping File used along with Configuration template",\r
+      "version" : "1.0.0",\r
+      "derived_from" : "tosca.artifacts.Implementation",\r
+      "file_ext" : [ "json" ]\r
+    },\r
+    "artifact-script-python" : {\r
+      "description" : " Python Script Template used for Configuration",\r
+      "version" : "1.0.0",\r
+      "derived_from" : "tosca.artifacts.Implementation",\r
+      "file_ext" : [ "py" ]\r
+    }\r
+  },\r
+  "node_types" : {\r
+    "dg-resource-assignment" : {\r
+      "description" : "This is Resource Assignment Directed Graph",\r
+      "version" : "1.0.0",\r
+      "properties" : {\r
+        "mode" : {\r
+          "required" : false,\r
+          "type" : "string",\r
+          "default" : "sync"\r
+        },\r
+        "version" : {\r
+          "required" : false,\r
+          "type" : "string",\r
+          "default" : "LATEST"\r
+        },\r
+        "is-start-flow" : {\r
+          "required" : false,\r
+          "type" : "boolean",\r
+          "default" : "false"\r
+        }\r
+      },\r
+      "capabilities" : {\r
+        "dg-node" : {\r
+          "type" : "tosca.capabilities.Node"\r
+        },\r
+        "content" : {\r
+          "type" : "tosca.capability.Content",\r
+          "properties" : {\r
+            "type" : {\r
+              "required" : false,\r
+              "type" : "string",\r
+              "default" : "json"\r
+            },\r
+            "content" : {\r
+              "required" : true,\r
+              "type" : "string"\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "requirements" : {\r
+        "component-dependency" : {\r
+          "capability" : "component-node",\r
+          "node" : "component-resource-assignment",\r
+          "relationship" : "tosca.relationships.DependsOn"\r
+        }\r
+      },\r
+      "interfaces" : {\r
+        "CONFIG" : {\r
+          "operations" : {\r
+            "ResourceAssignment" : {\r
+              "inputs" : {\r
+                "params" : {\r
+                  "required" : false,\r
+                  "type" : "list",\r
+                  "entry_schema" : {\r
+                    "type" : "datatype-property"\r
+                  }\r
+                }\r
+              }\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.nodes.DG"\r
+    },\r
+    "dg-config-generator" : {\r
+      "description" : "This is Activate DG for Config Generator Directed Graph",\r
+      "version" : "1.0.0",\r
+      "properties" : {\r
+        "mode" : {\r
+          "required" : false,\r
+          "type" : "string",\r
+          "default" : "sync"\r
+        },\r
+        "version" : {\r
+          "required" : false,\r
+          "type" : "string",\r
+          "default" : "LATEST"\r
+        },\r
+        "is-start-flow" : {\r
+          "required" : false,\r
+          "type" : "boolean",\r
+          "default" : "false"\r
+        }\r
+      },\r
+      "capabilities" : {\r
+        "dg-node" : {\r
+          "type" : "tosca.capabilities.Node"\r
+        },\r
+        "content" : {\r
+          "type" : "tosca.capability.Content",\r
+          "properties" : {\r
+            "type" : {\r
+              "required" : false,\r
+              "type" : "string",\r
+              "default" : "json"\r
+            },\r
+            "content" : {\r
+              "required" : true,\r
+              "type" : "string"\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "requirements" : {\r
+        "component-dependency" : {\r
+          "capability" : "component-node",\r
+          "node" : "component-config-generator",\r
+          "relationship" : "tosca.relationships.DependsOn"\r
+        }\r
+      },\r
+      "interfaces" : {\r
+        "CONFIG" : {\r
+          "operations" : {\r
+            "GenerateConfiguration" : {\r
+              "inputs" : {\r
+                "params" : {\r
+                  "required" : false,\r
+                  "type" : "list",\r
+                  "entry_schema" : {\r
+                    "type" : "datatype-property"\r
+                  }\r
+                }\r
+              }\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.nodes.DG"\r
+    },\r
+    "artifact-config-template" : {\r
+      "description" : "This is Configuration Velocity Template",\r
+      "version" : "1.0.0",\r
+      "properties" : {\r
+        "action-names" : {\r
+          "required" : true,\r
+          "type" : "list",\r
+          "entry_schema" : {\r
+            "type" : "string"\r
+          }\r
+        },\r
+        "content" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        },\r
+        "mapping" : {\r
+          "required" : false,\r
+          "type" : "list",\r
+          "entry_schema" : {\r
+            "type" : "datatype-resource-assignment"\r
+          }\r
+        }\r
+      },\r
+      "capabilities" : {\r
+        "content" : {\r
+          "type" : "tosca.capability.Content",\r
+          "properties" : {\r
+            "content" : {\r
+              "required" : true,\r
+              "type" : "string"\r
+            }\r
+          }\r
+        },\r
+        "mapping" : {\r
+          "type" : "tosca.capability.Mapping",\r
+          "properties" : {\r
+            "mapping" : {\r
+              "required" : false,\r
+              "type" : "list",\r
+              "entry_schema" : {\r
+                "type" : "datatype-resource-assignment"\r
+              }\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.nodes.Artifact"\r
+    },\r
+    "component-resource-assignment" : {\r
+      "description" : "This is Resource Assignment Component API",\r
+      "version" : "1.0.0",\r
+      "capabilities" : {\r
+        "component-node" : {\r
+          "type" : "tosca.capabilities.Node"\r
+        }\r
+      },\r
+      "interfaces" : {\r
+        "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : {\r
+          "operations" : {\r
+            "process" : {\r
+              "inputs" : {\r
+                "action-name" : {\r
+                  "description" : "Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "handler-name" : {\r
+                  "description" : "Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                },\r
+                "resource-type" : {\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "template-names" : {\r
+                  "description" : "Name of the Artifact Node Templates, to get the template Content.",\r
+                  "required" : true,\r
+                  "type" : "list",\r
+                  "entry_schema" : {\r
+                    "type" : "string"\r
+                  }\r
+                },\r
+                "request-id" : {\r
+                  "description" : "Request Id used to store the generated configuration, in the database along with the template-name",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                },\r
+                "resource-id" : {\r
+                  "description" : "Id used to pull the data content from the data base. Either template-data or resource-id should be present",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                }\r
+              },\r
+              "outputs" : {\r
+                "resource-assignment-params" : {\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                },\r
+                "status" : {\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                }\r
+              }\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.nodes.Component"\r
+    },\r
+    "component-config-generator" : {\r
+      "description" : "This is Generate Configuration Component API",\r
+      "version" : "1.0.0",\r
+      "capabilities" : {\r
+        "component-node" : {\r
+          "type" : "tosca.capabilities.Node"\r
+        }\r
+      },\r
+      "interfaces" : {\r
+        "org-onap-ccsdk-config-generator-service-ConfigGeneratorNode" : {\r
+          "operations" : {\r
+            "process" : {\r
+              "inputs" : {\r
+                "template-data" : {\r
+                  "description" : "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "action-name" : {\r
+                  "description" : "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "template-content" : {\r
+                  "description" : "Conditional : Dynamic Template used to generate Configuration.",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "resource-type" : {\r
+                  "description" : "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "request-id" : {\r
+                  "description" : "Request Id used to store the generated configuration, in the database along with the template-name",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                },\r
+                "resource-id" : {\r
+                  "description" : "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "template-name" : {\r
+                  "description" : "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                }\r
+              },\r
+              "outputs" : {\r
+                "generated-config" : {\r
+                  "description" : "Generated Configuration for the Template adn Resource Data",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                },\r
+                "mask-info" : {\r
+                  "description" : "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.config.model.data.custom.MaskInfo ",\r
+                  "required" : false,\r
+                  "type" : "string"\r
+                },\r
+                "status" : {\r
+                  "description" : "Status of the Component Execution ( success or failure )",\r
+                  "required" : true,\r
+                  "type" : "string"\r
+                }\r
+              }\r
+            }\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.nodes.Component"\r
+    }\r
+  },\r
+  "data_types" : {\r
+    "datatype-resource-assignment" : {\r
+      "version" : "1.0.0",\r
+      "description" : "This is Resource Assignment Data Type",\r
+      "properties" : {\r
+        "property" : {\r
+          "required" : true,\r
+          "type" : "datatype-property"\r
+        },\r
+        "input-param" : {\r
+          "required" : true,\r
+          "type" : "boolean"\r
+        },\r
+        "dictionary-name" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        },\r
+        "dictionary-source" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        },\r
+        "dependencies" : {\r
+          "required" : true,\r
+          "type" : "list",\r
+          "entry_schema" : {\r
+            "type" : "string"\r
+          }\r
+        }\r
+      },\r
+      "derived_from" : "tosca.datatypes.Root"\r
+    },\r
+    "datatype-property" : {\r
+      "version" : "1.0.0",\r
+      "description" : "This is Entry point Input Data Type, which is dynamic datatype, The parameter names will be populated during the Design time for each inputs",\r
+      "properties" : {\r
+        "type" : {\r
+          "required" : true,\r
+          "type" : "string"\r
+        },\r
+        "description" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        },\r
+        "required" : {\r
+          "required" : false,\r
+          "type" : "boolean"\r
+        },\r
+        "default" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        },\r
+        "entry_schema" : {\r
+          "required" : false,\r
+          "type" : "string"\r
+        }\r
+      },\r
+      "derived_from" : "tosca.datatypes.Root"\r
+    }\r
+  }\r
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e427377..e0b4699 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -1,72 +1,69 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.ccsdk.parent</groupId>
-        <artifactId>odlparent-lite</artifactId>
-        <version>1.1.0-SNAPSHOT</version>
-        <relativePath/>
-    </parent>
-
-    <groupId>org.onap.ccsdk.features</groupId>
-    <artifactId>ccsdk-features</artifactId>
-    <version>0.3.0-SNAPSHOT</version>
-    <packaging>pom</packaging>
-
-    <name>ccsdk-features</name>
-    <description>CCSDK applications</description>
-    <url>https://wiki.onap.org</url>
-    <organization>
-        <name>ONAP</name>
-    </organization>
-
-    <modules>
-    </modules>
-
-    <scm>
-        <connection>scm:git:ssh://git@${onap.git.host}/features.git</connection>
-        <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git</developerConnection>
-        <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse</url>
-    </scm>
-
-
-    <profiles>
-        <profile>
-            <id>blackduck</id>
-            <activation>
-                <property>
-                    <name>blackduck-scan</name>
-                </property>
-            </activation>
-            <build>
-                    <plugins>
-                        <plugin>
-                            <groupId>com.blackducksoftware.integration</groupId>
-                            <artifactId>hub-maven-plugin</artifactId>
-                            <version>1.4.0</version>
-                            <inherited>false</inherited>
-                            <configuration>
-                                <hubProjectName>${project.name}</hubProjectName>
-                                <outputDirectory>${project.basedir}</outputDirectory>
-                            </configuration>
-                            <executions>
-                                <execution>
-                                    <id>create-bdio-file</id>
-                                    <phase>package</phase>
-                                    <goals>
-                                        <goal>createHubOutput</goal>
-                                    </goals>
-                                </execution>
-                            </executions>
-                        </plugin>
-                    </plugins>
-
-
-
-            </build>
-
-        </profile>
-
-    </profiles>
-</project>
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">\r
+       <modelVersion>4.0.0</modelVersion>\r
+\r
+       <parent>\r
+               <groupId>org.onap.ccsdk.parent</groupId>\r
+               <artifactId>odlparent-lite</artifactId>\r
+               <version>1.1.0-SNAPSHOT</version>\r
+               <relativePath />\r
+       </parent>\r
+\r
+       <groupId>org.onap.ccsdk.features</groupId>\r
+       <artifactId>ccsdk-features</artifactId>\r
+       <version>0.3.0-SNAPSHOT</version>\r
+       <packaging>pom</packaging>\r
+\r
+       <name>ccsdk-features</name>\r
+       <description>CCSDK applications</description>\r
+       <url>https://wiki.onap.org</url>\r
+       <organization>\r
+               <name>ONAP</name>\r
+       </organization>\r
+\r
+       <modules>\r
+               <module>blueprints-processor</module>\r
+       </modules>\r
+\r
+       <scm>\r
+               <connection>scm:git:ssh://git@${onap.git.host}/features.git</connection>\r
+               <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/features.git</developerConnection>\r
+               <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/features/browse</url>\r
+       </scm>\r
+\r
+       <profiles>\r
+               <profile>\r
+                       <id>blackduck</id>\r
+                       <activation>\r
+                               <property>\r
+                                       <name>blackduck-scan</name>\r
+                               </property>\r
+                       </activation>\r
+                       <build>\r
+                               <plugins>\r
+                                       <plugin>\r
+                                               <groupId>com.blackducksoftware.integration</groupId>\r
+                                               <artifactId>hub-maven-plugin</artifactId>\r
+                                               <version>1.4.0</version>\r
+                                               <inherited>false</inherited>\r
+                                               <configuration>\r
+                                                       <hubProjectName>${project.name}</hubProjectName>\r
+                                                       <outputDirectory>${project.basedir}</outputDirectory>\r
+                                               </configuration>\r
+                                               <executions>\r
+                                                       <execution>\r
+                                                               <id>create-bdio-file</id>\r
+                                                               <phase>package</phase>\r
+                                                               <goals>\r
+                                                                       <goal>createHubOutput</goal>\r
+                                                               </goals>\r
+                                                       </execution>\r
+                                               </executions>\r
+                                       </plugin>\r
+                               </plugins>\r
+                       </build>\r
+               </profile>\r
+       </profiles>\r
+</project>\r