From 768123992afdcd3997bb8c57b2210a4bcf88b29c 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>
---
 .../core/service/BluePrintExpressionServiceTest.kt         | 14 +++++++++++---
 .../core/service/BluePrintRuntimeServiceTest.kt            | 12 ++++++------
 .../core/src/test/resources/componentnode/default.json     |  6 +++---
 components/core/src/test/resources/properties/convert.json |  4 ++--
 components/core/src/test/resources/properties/default.json |  4 ++--
 5 files changed, 24 insertions(+), 16 deletions(-)

(limited to 'components/core/src/test')

diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
index 911a891a8..a0214023e 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintExpressionServiceTest.kt
@@ -60,14 +60,22 @@ class BluePrintExpressionServiceTest {
 
     @Test
     fun testAttributeExpression() {
-        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")
+        val node : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"resource\"] }")
         val expressionData : ExpressionData = BluePrintExpressionService.getExpressionData(node)
         assertNotNull(expressionData, " Failed to populate expression data")
         assertEquals(expressionData.isExpression, true, "Failed to identify as expression")
         assertNotNull(expressionData.attributeExpression, " Failed to populate attribute expression data")
         assertEquals("SELF", expressionData.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
-        assertEquals("attribute-name", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")
-        assertEquals("resource/name",expressionData.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")
+        assertEquals("resource", expressionData.attributeExpression?.attributeName, " Failed to get expected attributeName")
+
+        val node1 : JsonNode = jacksonObjectMapper().readTree("{ \"get_attribute\" : [\"SELF\", \"\",\"attribute-name\", \"resource\", \"name\"] }")
+        val expressionData1 : ExpressionData = BluePrintExpressionService.getExpressionData(node1)
+        assertNotNull(expressionData1, " Failed to populate expression data")
+        assertEquals(expressionData1.isExpression, true, "Failed to identify as expression")
+        assertNotNull(expressionData1.attributeExpression, " Failed to populate attribute expression data")
+        assertEquals("SELF", expressionData1.attributeExpression?.modelableEntityName, " Failed to get expected modelableEntityName")
+        assertEquals("attribute-name", expressionData1.attributeExpression?.attributeName, " Failed to get expected attributeName")
+        assertEquals("resource/name",expressionData1.attributeExpression?.subAttributeName, " Failed to populate nested subAttributeName expression data")
     }
 
 
diff --git a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 919dc564e..277ec3ac9 100644
--- a/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/components/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -87,7 +87,7 @@ class BluePrintRuntimeServiceTest {
         log.info("Prepared Context {}", context)
 
         val inContext: MutableMap<String, Any?> = bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationInputs("resource-assignment-ra-component",
-                "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode", "process")
+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process")
 
         log.info("In Context {}", inContext)
 
@@ -110,18 +110,18 @@ class BluePrintRuntimeServiceTest {
 
         val componentContext: MutableMap<String, Any?> = hashMapOf()
         val successValue: JsonNode = jsonNodeFromObject("Success")
-        componentContext["resource-assignment-ra-component.org-onap-sdnc-config-assignment-service-ConfigAssignmentNode.process.status"] = successValue
-        componentContext["resource-assignment-ra-component.org-onap-sdnc-config-assignment-service-ConfigAssignmentNode.process.resource-assignment-params"] = null
+        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.status"] = successValue
+        componentContext["resource-assignment-ra-component.org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode.process.resource-assignment-params"] = null
 
         bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationOutputs("resource-assignment-ra-component",
-                "org-onap-sdnc-config-assignment-service-ConfigAssignmentNode", "process", componentContext)
+                "org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode", "process", componentContext)
 
         assertEquals(NullNode.instance,
-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-sdnc-config-assignment-service-ConfigAssignmentNode/operations/process/properties/resource-assignment-params"),
+                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/resource-assignment-params"),
                 "Failed to get operation property resource-assignment-params")
 
         assertEquals(successValue,
-                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-sdnc-config-assignment-service-ConfigAssignmentNode/operations/process/properties/status"),
+                context.get("node_templates/resource-assignment-ra-component/interfaces/org-onap-ccsdk-config-assignment-service-ConfigAssignmentNode/operations/process/properties/status"),
                 "Failed to get operation property status")
 
 
diff --git a/components/core/src/test/resources/componentnode/default.json b/components/core/src/test/resources/componentnode/default.json
index b7265fcd1..184b59881 100644
--- a/components/core/src/test/resources/componentnode/default.json
+++ b/components/core/src/test/resources/componentnode/default.json
@@ -41,13 +41,13 @@
 			"generate-configuration": {
 				"type": "mock-component-generateConfig",
 				"interfaces": {
-					"org-openecomp-sdnc-config-params-service-MockComponentNode": {
+					"org-onap-ccsdk-config-params-service-MockComponentNode": {
 						"operations": {
 							"process": {
 								"inputs": {
 									"entity-type": "vnf-type",
 									"template-content": "sample-template",
-									"entity-id": "{ \"get_input\" : \"vnf-id\" }"
+									"entity-id": { "get_input" : "vnf-id" }
 								},
 								"outputs": {
 									"mergedData": "merged Data",
@@ -63,7 +63,7 @@
 	"node_types": {
 		"mock-component-generateConfig": {
 			"interfaces": {
-				"org-openecomp-sdnc-config-params-service-MockComponentNode": {
+				"org-onap-ccsdk-config-params-service-MockComponentNode": {
 					"operations": {
 						"process": {
 							"inputs": {
diff --git a/components/core/src/test/resources/properties/convert.json b/components/core/src/test/resources/properties/convert.json
index cb7d08e44..af79915fa 100644
--- a/components/core/src/test/resources/properties/convert.json
+++ b/components/core/src/test/resources/properties/convert.json
@@ -19,12 +19,12 @@
 								"required": true
 							}
 						],
-						"pre-data": "{ \"get_attribute\" : \"get-resource-assignment.config-params\" }",
+						"pre-data": { "get_input" : "get-resource-assignment.config-params" },
 						"prifix": "get-resource-assignment"
 					},
 					"outputs": {
 						"resource-assignment-status": "success",
-						"resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params\" }"
+						"resource-assignment-params": "{ \"set_value\" : \"get-resource-assignment.config-params" }
 					}
 				}
 			}
diff --git a/components/core/src/test/resources/properties/default.json b/components/core/src/test/resources/properties/default.json
index 0ac97f907..ec416dc95 100644
--- a/components/core/src/test/resources/properties/default.json
+++ b/components/core/src/test/resources/properties/default.json
@@ -1,5 +1,5 @@
 {
-	"default": "{ \"get_input\" : \"loopback-default\" }",
+	"default": { "get_input" : "loopback-default" },
 	"domain": "ethernet",
 	"criteria": [
 		{
@@ -8,7 +8,7 @@
 			"nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"
 		},
 		{
-			"value": "{ \"get_input\" : \"host-ip-address\" }",
+			"value": { "get_input" : "host-ip-address" },
 			"type": "simple",
 			"nodeString": "layer3-service-list[].service-data.l3sdn-vnf-fields.vnf-name"
 		}
-- 
cgit 1.2.3-korg