From 1885741f27d74104a34cadf1f4d9c73f82c4fcff Mon Sep 17 00:00:00 2001
From: xg353y <xg353y@intl.att.com>
Date: Wed, 20 Feb 2019 12:45:04 +0100
Subject: Fix the bugs

Fix the bugs in tosca model related code, due to the json removal
activity.

Issue-ID: CLAMP-292
Change-Id: I6306930052b876b1ba8b0e1ce71689d4499e165c

Change-Id: I6306930052b876b1ba8b0e1ce71689d4499e165c
Signed-off-by: xg353y <xg353y@intl.att.com>
---
 .../resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js     | 2 +-
 src/main/resources/clds/camel/rest/clds-services.xml                    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/main/resources')

diff --git a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
index dc71fcd2f..f78ad1e6b 100644
--- a/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/ToscaModelCtrl.js
@@ -29,7 +29,7 @@ app.controller('ToscaModelCtrl',
 	        	toscaModelService.getHpModelJsonByPolicyType(selectedPolicy).then(function(response) {
 	        		$('#editor').empty();
 
-		    		var toscaModel = JSON.parse(response.body.toscaModelJson);
+		    		var toscaModel = JSON.parse(response.toscaModelJson);
 		    		if($scope.policyList && toscaModel.schema.properties && toscaModel.schema.properties.policyList){
 		    			toscaModel.schema.properties.policyList.enum = $scope.policyList;
 		    		}
diff --git a/src/main/resources/clds/camel/rest/clds-services.xml b/src/main/resources/clds/camel/rest/clds-services.xml
index e4c4f4cbc..7abffd35d 100644
--- a/src/main/resources/clds/camel/rest/clds-services.xml
+++ b/src/main/resources/clds/camel/rest/clds-services.xml
@@ -115,6 +115,7 @@
 				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=parseToscaModelAndSave(${header.toscaModelName},${body})" />
 		</put>
 		<get uri="/tosca/models/policyType/{policyType}"
+		outType="org.onap.clamp.clds.model.CldsToscaModel"
 			produces="application/json">
 			<to
 				uri="bean:org.onap.clamp.clds.service.CldsToscaService?method=getToscaModelsByPolicyType(${header.policyType})" />
-- 
cgit 1.2.3-korg