X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ui-react%2Fsrc%2Fapi%2FLoopService.js;h=96bb8a0a705636acfed6277ad4e9be5f9265488f;hb=e673a058c995392b3ad6cbab91a9571bed29a57b;hp=698ee28c23f0cb8be910631db373183a3b435676;hpb=e916ac28ba46ff7cad64f1a3150b128ba4772c70;p=clamp.git

diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 698ee28c..96bb8a0a 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -22,7 +22,7 @@
 
 export default class LoopService {
 	static getLoopNames() {
-		return fetch('/restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/getAllNames', { method: 'GET', credentials: 'same-origin' })
 			.then(function (response) {
 				console.debug("GetLoopNames response received: ", response.status);
 				if (response.ok) {
@@ -39,7 +39,7 @@ export default class LoopService {
 	}
 
 	static createLoop(loopName, templateName) {
-		return fetch('/restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/create/' + loopName + '?templateName=' + templateName, {
 			method: 'POST',
 			headers: {
 				"Content-Type": "application/json"
@@ -57,7 +57,7 @@ export default class LoopService {
 	}
 
 	static getLoop(loopName) {
-		return fetch('/restservices/clds/v2/loop/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/' + loopName, {
 			method: 'GET',
 			headers: {
 				"Content-Type": "application/json"
@@ -79,28 +79,8 @@ export default class LoopService {
 			});
 	}
 
-	static getSvg(loopName) {
-		return fetch('/restservices/clds/v2/loop/svgRepresentation/' + loopName, {
-			method: 'GET',
-			credentials: 'same-origin'
-		})
-			.then(function (response) {
-				console.debug("svgRepresentation response received: ", response.status);
-				if (response.ok) {
-					return response.text();
-				} else {
-					console.error("svgRepresentation query failed");
-					return "";
-				}
-			})
-			.catch(function (error) {
-				console.error("svgRepresentation error received", error);
-				return "";
-			});
-	}
-
 	static setMicroServiceProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateMicroservicePolicy/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -124,7 +104,7 @@ export default class LoopService {
 	}
 	
 	static setOperationalPolicyProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateOperationalPolicies/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -148,7 +128,7 @@ export default class LoopService {
 	}
 
 	static updateGlobalProperties(loopName, jsonData) {
-		return fetch('/restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/updateGlobalProperties/' + loopName, {
 			method: 'POST',
 			credentials: 'same-origin',
 			headers: {
@@ -172,7 +152,7 @@ export default class LoopService {
 	}
 
 	static refreshOperationalPolicyJson(loopName,operationalPolicyName) {
-		return fetch('/restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
@@ -195,7 +175,7 @@ export default class LoopService {
 	}
 
 		static refreshMicroServicePolicyJson(loopName,microServicePolicyName) {
-    		return fetch('/restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
+    		return fetch(window.location.pathname + 'restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
     			method: 'PUT',
     			headers: {
     				"Content-Type": "application/json"
@@ -218,7 +198,7 @@ export default class LoopService {
     }
 
 	static addOperationalPolicyType(loopName, policyType, policyVersion) {
-		return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"
@@ -226,22 +206,21 @@ export default class LoopService {
 			credentials: 'same-origin'
 		})
 				.then(function (response) {
-					console.debug("Add Operational Policy response received: ", response.status);
+				console.debug("Add Operational Policy response received: ", response.status);
 				if (response.ok) {
 					return response.json();
 				} else {
-					console.error("Add Operational Policy query failed");
-					return {};
+					return response.text();
 				}
 			})
 			.catch(function (error) {
-				console.error("Add Operational Policy error received", error);
-				return {};
-			});
+				console.error("Add Operational Policy query failed");
+				throw new Error(error);
+			})
 	}
 
-	static removeOperationalPolicyType(loopName, policyType, policyVersion) {
-		return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
+	static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) {
+		return fetch(window.location.pathname + 'restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
 			method: 'PUT',
 			headers: {
 				"Content-Type": "application/json"