From 08ddd6710c307a972dcf4918aeaa554f0b8d0299 Mon Sep 17 00:00:00 2001 From: "Muthuramalingam, Brinda Santh(bs2796)" Date: Fri, 7 Sep 2018 22:43:20 +0000 Subject: Controller Blueprints Microservice Modify get_input, get_attribute, get_property and get_artifact functions string implementation to Json Implementation. Change-Id: I6d4aadd370dc23127a176964f84fc9bb5e7ab5ee Issue-ID: CCSDK-432 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) --- .../Definitions/activation-blueprint.json | 180 +++++++++------------ .../node_type/component-resource-assignment.json | 6 +- .../blueprints/vrr-test/Definitions/vrr-test.json | 98 ++++++----- .../service_template/default_netconf.json | 46 ++---- .../test/resources/enhance/enhance-template.json | 67 ++++++-- .../test/resources/enhance/enhanced-template.json | 60 +++++-- 6 files changed, 243 insertions(+), 214 deletions(-) (limited to 'ms/controllerblueprints') diff --git a/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json b/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json index d4fbf5cf4..06e7e9303 100644 --- a/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json +++ b/ms/controllerblueprints/application/load/blueprints/baseconfiguration/Definitions/activation-blueprint.json @@ -2,7 +2,7 @@ "metadata": { "template_author": "Brinda Santh Muthuramalingam", "author-email": "brindasanth@gmail.com", - "user-groups" : "ADMIN, OPERATION", + "user-groups": "ADMIN, OPERATION", "template_name": "baseconfiguration", "template_version": "1.0.0", "template_tags": "brinda, tosca" @@ -30,9 +30,21 @@ "activate-process": { "type": "bpmn-activate", "properties": { - "process-name": { "get_input" : "action-name" }, - "version" : { "get_property" : ["SELF", "process-name"] }, - "content": { "get_artifact" : ["SELF", "activate-process"] } + "process-name": { + "get_input": "action-name" + }, + "version": { + "get_property": [ + "SELF", + "process-name" + ] + }, + "content": { + "get_artifact": [ + "SELF", + "activate-process" + ] + } }, "artifacts": { "activate-process": { @@ -43,7 +55,7 @@ }, "resource-assignment": { "type": "component-resource-assignment", - "properties":{ + "properties": { "request-id": "1234" }, "interfaces": { @@ -51,12 +63,28 @@ "operations": { "process": { "inputs": { - "action-name": { "get_input" : "action-name" }, + "action-name": { + "get_input": "action-name" + }, "resource-type": "vnf-type", - "request-id": { "get_input" : "request-id" }, - "resource-id": { "get_input" : "hostname" }, - "template-content": { "get_artifact" : ["SELF", "baseconfig-template"] }, - "mapping-content": { "get_artifact" : ["SELF", "baseconfig-mapping"] } + "request-id": { + "get_input": "request-id" + }, + "resource-id": { + "get_input": "hostname" + }, + "template-content": { + "get_artifact": [ + "SELF", + "baseconfig-template" + ] + }, + "mapping-content": { + "get_artifact": [ + "SELF", + "baseconfig-mapping" + ] + } }, "outputs": { "resource-assignment-params": "", @@ -79,18 +107,20 @@ }, "resource-assignment-py": { "type": "component-resource-assignment", - "properties":{ + "properties": { "request-id": "1234" }, "interfaces": { "DefaultComponentNode": { "operations": { "process": { - "implementation" :{ - "primary" : "component-script" + "implementation": { + "primary": "component-script" }, "inputs": { - "action-name": { "get_input" : "action-name" } + "action-name": { + "get_input": "action-name" + } }, "outputs": { "resource-assignment-params": "", @@ -108,37 +138,37 @@ } } }, - "workflows":{ - "activate-process":{ - "steps" : { - "call-resource-assignment" : { - "description" : "Invoke Resource Assignment Component", - "target" : "resource-assignment", - "activities" : [ - { - "call_operation": "ResourceAssignmentNode.process" - } - ], - "on_success" : [ - "download-baseconfig" - ] - }, - "download-baseconfig" : { - "description" : "Call Download Base Config Component", - "target" : "activate-netconf", - "activities" : [ + "workflows": { + "activate-process": { + "steps": { + "call-resource-assignment": { + "description": "Invoke Resource Assignment Component", + "target": "resource-assignment", + "activities": [ + { + "call_operation": "ResourceAssignmentNode.process" + } + ], + "on_success": [ + "download-baseconfig" + ] + }, + "download-baseconfig": { + "description": "Call Download Base Config Component", + "target": "activate-netconf", + "activities": [ { "call_operation": "NetconfTransactionNode.process" } ], - "on_success" : [ + "on_success": [ "download-licence" ] }, - "download-licence" : { - "description" : "Call Download Licence Component", - "target" : "activate-netconf", - "activities" : [ + "download-licence": { + "description": "Call Download Licence Component", + "target": "activate-netconf", + "activities": [ { "call_operation": "NetconfTransactionNode.process" } @@ -214,7 +244,7 @@ "version": { "required": false, "type": "string", - "default" : "LATEST" + "default": "LATEST" } }, "derived_from": "tosca.nodes.DG" @@ -222,74 +252,16 @@ "tosca.nodes.Component": { "description": "This is Resource Assignment Component API", "version": "1.0.0", - "properties": { - "type": { - "description": "Request Id used to store the generated configuration, in the database along with the template-name", - "required": false, - "type": "string" - } - }, - "interfaces": { - "DefaultOperation": { - "operations": { - "validate": { - "inputs": { - "action-name": { - "description": "validate for action", - "required": false, - "type": "string" - } - } - } - } - } - }, - "artifacts" :{ - "component-jar": { - "description": "Component Jar", - "type": "artifact-component-jar", - "file": "Component/basecomponent.jar" - } - }, "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.DG" : { - "description" : "This is Directed Graph Node Type", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" + "tosca.nodes.DG": { + "description": "This is Directed Graph Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" }, "tosca.nodes.component.Python": { "description": "This is Resource Assignment Python Component API", "version": "1.0.0", - "properties": { - "type": { - "description": "Request Id used to store the generated configuration, in the database along with the template-name", - "required": false, - "type": "string" - } - }, - "interfaces": { - "DefaultOperation": { - "operations": { - "validate": { - "inputs": { - "action-name": { - "description": "validate for action", - "required": false, - "type": "string" - } - } - } - } - } - }, - "artifacts" :{ - "component-jar": { - "description": "Component Jar", - "type": "artifact-component-jar", - "file": "Component/basecomponent.jar" - } - }, "derived_from": "tosca.nodes.Root" }, "component-resource-assignment": { @@ -392,7 +364,7 @@ } }, "data_types": { - "sample-property" : { + "sample-property": { "description": "This is sample data type", "version": "1.0.0", "properties": { @@ -407,10 +379,10 @@ "version": { "required": false, "type": "string", - "default" : "LATEST" + "default": "LATEST" } }, - "derived_from" : "tosca.datatypes.Root" + "derived_from": "tosca.datatypes.Root" } } } \ No newline at end of file diff --git a/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json b/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json index 34c028482..d424a8e43 100644 --- a/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json +++ b/ms/controllerblueprints/application/load/model_type/node_type/component-resource-assignment.json @@ -7,16 +7,16 @@ } }, "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { - "service-template-name": { + "template-name": { "description": "Service Template Name.", "required": true, "type": "string" }, - "service-template-version": { + "template-version": { "description": "Service Template Version.", "required": true, "type": "string" diff --git a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json index 5fe2d2510..41f6e92f0 100644 --- a/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json +++ b/ms/controllerblueprints/modules/service/load/blueprints/vrr-test/Definitions/vrr-test.json @@ -3,7 +3,7 @@ "template_author": "Brinda Santh ( bs2796@onap.com )", "template_name": "vrr-test", "template_version": "1.0.0", - "template_tags" : "brinda, VRR", + "template_tags": "brinda, VRR", "release": "201802", "service-type": "AVPN", "vnf-type": "VRR" @@ -172,20 +172,30 @@ "resource-assignment": { "type": "component-resource-assignment", "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { - "service-template-name": "{ \"get_attribute\" : \"template_name\" }", - "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }", - "action-name": "{ \"get_input\" : \"action-name\" }", + "template-name": { + "get_input": "template_name" + }, + "template-version": { + "get_input": "template_version" + }, + "action-name": { + "get_input": "action-name" + }, "resource-type": "vnf-type", "template-names": [ "base-config-template", "licence-template" ], - "request-id": "{ \"get_input\" : \"request-id\" }", - "resource-id": "{ \"get_input\" : \"vnf-id\" }" + "request-id": { + "get_input": "request-id" + }, + "resource-id": { + "get_input": "vnf-id" + } }, "outputs": { "resource-assignment-params": "", @@ -205,8 +215,12 @@ "netconf": { "properties": { "profile-name": "sample", - "oam-ipv4-address": "{ \"get_attribute\" : \"hostname\" }", - "port-number": { "get_input" : "host-port" }, + "oam-ipv4-address": { + "get_input": "hostname" + }, + "port-number": { + "get_input": "host-port" + }, "connection-time-out": 30 } } @@ -218,19 +232,29 @@ "org-openecomp-sdnc-netconf-adaptor-service-NetconfExecutorNode": { "operations": { "process": { - "implementation" : { - "primary" : "file://netconf-adaptor/DefaultGetConfig.py" + "implementation": { + "primary": "file://netconf-adaptor/DefaultGetConfig.py" }, "inputs": { - "action-name": "{ \"get_input\" : \"action-name\" }", + "action-name": { + "get_input": "action-name" + }, "resource-type": "vnf-type", - "request-id": "{ \"get_attribute\" : \"request-id\" }", - "resource-id": "{ \"get_input\" : \"vnf-id\" }", + "request-id": { + "get_input": "request-id" + }, + "resource-id": { + "get_input": "vnf-id" + }, "execution-script": "execution-script" }, "outputs": { - "response-data": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }", - "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }" + "response-data": { + "get_attribute": ["SELF", "netconf-executor-baseconfig.response-data"] + }, + "status": { + "get_attribute": ["SELF", "netconf-executor-baseconfig.status"] + } } } } @@ -311,7 +335,7 @@ } }, "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { @@ -320,12 +344,12 @@ "required": true, "type": "string" }, - "service-template-name": { + "template-name": { "description": "Service Template Name.", "required": true, "type": "string" }, - "service-template-version": { + "template-version": { "description": "Service Template Version.", "required": true, "type": "string" @@ -569,12 +593,12 @@ "required": true, "type": "string" }, - "service-template-name": { + "template-name": { "description": "Service Template Name", "required": true, "type": "string" }, - "service-template-version": { + "template-version": { "description": "Service Template Version", "required": true, "type": "string" @@ -617,25 +641,25 @@ }, "derived_from": "tosca.nodes.Component" }, - "tosca.nodes.DG" : { - "description" : "This is Directed Graph Node Type", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" + "tosca.nodes.DG": { + "description": "This is Directed Graph Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.Vnf" : { - "description" : "This is VNF Node Type", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" + "tosca.nodes.Vnf": { + "description": "This is VNF Node Type", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.Artifact" : { - "description" : "This is Deprecated Artifact Node Type.", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" + "tosca.nodes.Artifact": { + "description": "This is Deprecated Artifact Node Type.", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" }, - "tosca.nodes.Component" : { - "description" : "This is default Component Node", - "version" : "1.0.0", - "derived_from" : "tosca.nodes.Root" + "tosca.nodes.Component": { + "description": "This is default Component Node", + "version": "1.0.0", + "derived_from": "tosca.nodes.Root" } }, "data_types": { diff --git a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json index 8b1c7909a..5b5332fce 100644 --- a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json +++ b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json @@ -13,11 +13,11 @@ "required": true, "type": "string" }, - "service-template-name": { + "template-name": { "required": true, "type": "string" }, - "service-template-version": { + "template-version": { "required": true, "type": "string" }, @@ -146,7 +146,7 @@ "resource-assignment": { "type": "component-resource-assignment", "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { @@ -155,8 +155,8 @@ "base-config-template", "licence-template" ], - "request-id": "{ \"get_attribute\" : \"request-id\" }", - "resource-id": "{ \"get_input\" : \"vnf-id\" }" + "request-id": { "get_input" : "request-id" }, + "resource-id": { "get_input" : "vnf-id" } }, "outputs": { "resource-assignment-params": "", @@ -220,10 +220,10 @@ ], "resource-type": "vnf-type", "initialise-sftp": false, - "request-id": "{ \"get_input\" : \"request-id\" }", + "request-id": {"get_input" : "request-id"}, "initialise-ssh": false, - "resource-id": "{ \"get_input\" : \"vnf-id\" }", - "action-name": "{ \"get_input\" : \"action-name\" }" + "resource-id": { "get_input" : "vnf-id" }, + "action-name": {"get_input" : "action-name"} }, "outputs": { "rpc-response-message": "", @@ -400,20 +400,6 @@ "capabilities": { "dg-node": { "type": "tosca.capabilities.Node" - }, - "content": { - "type": "tosca.capabilities.Content", - "properties": { - "type": { - "required": false, - "type": "string", - "default": "json" - }, - "content": { - "required": true, - "type": "string" - } - } } }, "requirements": { @@ -465,20 +451,6 @@ "capabilities": { "dg-node": { "type": "tosca.capabilities.Node" - }, - "content": { - "type": "tosca.capabilities.Content", - "properties": { - "type": { - "required": false, - "type": "string", - "default": "json" - }, - "content": { - "required": true, - "type": "string" - } - } } }, "requirements": { @@ -553,7 +525,7 @@ } }, "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json index d5d3f6698..70d03e0a8 100644 --- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json +++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhance-template.json @@ -39,7 +39,12 @@ "login-key": "sdnc", "login-account": "sndc-local", "source": "local", - "target-ip-address": "{\"get_attribute\":\"lo0-local-ipv4-address\"}", + "target-ip-address": { + "get_attribute": [ + "SELF", + "lo0-local-ipv4-address" + ] + }, "port-number": 22, "connection-time-out": 30 } @@ -63,20 +68,40 @@ "operations": { "process": { "inputs": { - "action-name": "{ \"get_input\" : \"action-name\" }", - "template-name": "{ \"get_attribute\" : \"template_name\" }", - "template-version": "{ \"get_attribute\" : \"template_version\" }", + "action-name": { + "get_input": "action-name" + }, + "template-name": { + "get_input": "template_name" + }, + "template-version": { + "get_input": "template_version" + }, "resource-type": "vnf-type", - "request-id": "{ \"get_input\" : \"request-id\" }", - "resource-id": "{ \"get_input\" : \"hostname\" }", + "request-id": { + "get_input": "request-id" + }, + "resource-id": { + "get_input": "hostname" + }, "execution-script": "execution-script" }, "outputs": { - "response-data": "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }", - "status": "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }" + "response-data": { + "get_attribute": [ + "SELF", + "netconf-executor-baseconfig.response-data" + ] + }, + "status": { + "get_attribute": [ + "SELF", + "netconf-executor-baseconfig.status" + ] + } }, - "implementation" : { - "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py" + "implementation": { + "primary": "file://netconf_adaptor/DefaultBaseLicenceConfig.py" } } } @@ -89,7 +114,7 @@ "component-node": {} }, "interfaces": { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode": { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode": { "operations": { "process": { "inputs": { @@ -97,12 +122,22 @@ "base-config-template", "licence-template" ], - "action-name": "{ \"get_input\" : \"action-name\" }", - "service-template-name": "{ \"get_attribute\" : \"template_name\" }", - "service-template-version": "{ \"get_attribute\" : \"service-template-version\" }", + "action-name": { + "get_input": "action-name" + }, + "template-name": { + "get_input": "template_name" + }, + "template-version": { + "get_input": "template-version" + }, "resource-type": "vnf-type", - "request-id": "{ \"get_input\" : \"request-id\" }", - "resource-id": "{ \"get_input\" : \"hostname\" }" + "request-id": { + "get_input": "request-id" + }, + "resource-id": { + "get_input": "hostname" + } }, "outputs": { "resource-assignment-params": "success", diff --git a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json index b6898d845..bf3deffb5 100644 --- a/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json +++ b/ms/controllerblueprints/modules/service/src/test/resources/enhance/enhanced-template.json @@ -215,16 +215,16 @@ } }, "interfaces" : { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode" : { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : { "operations" : { "process" : { "inputs" : { - "service-template-name" : { + "template-name" : { "description" : "Service Template Name.", "required" : true, "type" : "string" }, - "service-template-version" : { + "template-version" : { "description" : "Service Template Version.", "required" : true, "type" : "string" @@ -535,7 +535,9 @@ "login-key" : "sdnc", "login-account" : "sndc-local", "source" : "local", - "target-ip-address" : "{\"get_attribute\":\"lo0-local-ipv4-address\"}", + "target-ip-address" : { + "get_attribute" : [ "SELF", "lo0-local-ipv4-address" ] + }, "port-number" : 22, "connection-time-out" : 30 } @@ -562,17 +564,31 @@ "primary" : "file://netconf_adaptor/DefaultBaseLicenceConfig.py" }, "inputs" : { - "action-name" : "{ \"get_input\" : \"action-name\" }", - "template-name" : "{ \"get_attribute\" : \"template_name\" }", - "template-version" : "{ \"get_attribute\" : \"template_version\" }", + "action-name" : { + "get_input" : "action-name" + }, + "template-name" : { + "get_input" : "template_name" + }, + "template-version" : { + "get_input" : "template_version" + }, "resource-type" : "vnf-type", - "request-id" : "{ \"get_input\" : \"request-id\" }", - "resource-id" : "{ \"get_input\" : \"hostname\" }", + "request-id" : { + "get_input" : "request-id" + }, + "resource-id" : { + "get_input" : "hostname" + }, "execution-script" : "execution-script" }, "outputs" : { - "response-data" : "{ \"get_attribute\" : \"netconf-executor-baseconfig.response-data\" }", - "status" : "{ \"get_attribute\" : \"netconf-executor-baseconfig.status\" }" + "response-data" : { + "get_attribute" : [ "SELF", "netconf-executor-baseconfig.response-data" ] + }, + "status" : { + "get_attribute" : [ "SELF", "netconf-executor-baseconfig.status" ] + } } } } @@ -585,17 +601,27 @@ "component-node" : { } }, "interfaces" : { - "org-openecomp-sdnc-config-assignment-service-ConfigAssignmentNode" : { + "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode" : { "operations" : { "process" : { "inputs" : { "template-names" : [ "base-config-template", "licence-template" ], - "action-name" : "{ \"get_input\" : \"action-name\" }", - "service-template-name" : "{ \"get_attribute\" : \"template_name\" }", - "service-template-version" : "{ \"get_attribute\" : \"service-template-version\" }", + "action-name" : { + "get_input" : "action-name" + }, + "template-name" : { + "get_input" : "template_name" + }, + "template-version" : { + "get_input" : "template-version" + }, "resource-type" : "vnf-type", - "request-id" : "{ \"get_input\" : \"request-id\" }", - "resource-id" : "{ \"get_input\" : \"hostname\" }" + "request-id" : { + "get_input" : "request-id" + }, + "resource-id" : { + "get_input" : "hostname" + } }, "outputs" : { "resource-assignment-params" : "success", -- cgit 1.2.3-korg