From 08ddd6710c307a972dcf4918aeaa554f0b8d0299 Mon Sep 17 00:00:00 2001
From: "Muthuramalingam, Brinda Santh(bs2796)" <bs2796@att.com>
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) <bs2796@att.com>
---
 .../service_template/default_netconf.json          | 46 +++++-----------------
 1 file changed, 9 insertions(+), 37 deletions(-)

(limited to 'ms/controllerblueprints/modules/service/src/main/resources')

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": {
-- 
cgit 1.2.3-korg