3 files changed, 55 insertions, 91 deletions
diff --git a/gui-clamp/ui-react/src/api/PoliciesListCache.js b/gui-clamp/ui-react/src/api/PoliciesListCache.js
deleted file mode 100644
index 265dab4..0000000
--- a/gui-clamp/ui-react/src/api/PoliciesListCache.js
+++ /dev/null
@@ -1,34 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP CLAMP
- * ================================================================================
- * Copyright (C) 2021 AT&T Intellectual Property. All rights
- *                             reserved.
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * ============LICENSE_END============================================
- * ===================================================================
- *
- */
-
-export default class PoliciesListCache {
-  policiesJsonCache;
-
-  constructor(policiesJson) {
-    this.policiesJsonCache = policiesJson;
-  }
-
-  getAllPolicies() {
-    return this.policiesJsonCache["policies"];
-  }
-}
diff --git a/gui-clamp/ui-react/src/api/PolicyService.js b/gui-clamp/ui-react/src/api/PolicyService.js
index 046f789..cf4f0fd 100644
--- a/gui-clamp/ui-react/src/api/PolicyService.js
+++ b/gui-clamp/ui-react/src/api/PolicyService.js
@@ -41,7 +41,7 @@ export default class PolicyService {
         console.error("getPoliciesList error occurred ", error);
         alert("getPoliciesList error occurred " + error);
         return undefined;
-      })
+      });
   }
 
   static createNewPolicy(policyModelType, policyModelVersion, policyName, policyVersion, policyJson) {
@@ -95,4 +95,58 @@ export default class PolicyService {
         return undefined;
       });
   }
+
+  static updatePdpDeployment(pdpOperationsList) {
+    return fetch(window.location.pathname + 'restservices/clds/v2/policies/pdpDeployment', {
+      method: 'PUT',
+      credentials: 'same-origin',
+      headers: {
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(pdpOperationsList)
+    })
+      .then(function (response) {
+        console.debug("updatePdpDeployment response received: ", response.status);
+        if (response.ok) {
+          console.info("updatePdpDeployment query successful");
+          return response.text();
+        } else {
+          return response.text().then(responseBody => {
+            throw new Error("HTTP " + response.status + "," + responseBody);
+          })
+        }
+      })
+      .catch(function (error) {
+        console.error("updatePdpDeployment error occurred ", error);
+        alert("updatePdpDeployment error occurred " + error);
+        return undefined;
+      });
+  }
+
+  static sendNewPolicyModel(newPolicyModel) {
+    return fetch(window.location.pathname + 'restservices/clds/v2/policies/policytype', {
+      method: 'POST',
+      credentials: 'same-origin',
+      headers: {
+        "Content-Type": "plain/text"
+      },
+      body: newPolicyModel
+    })
+      .then(function (response) {
+        console.debug("sendNewPolicyModel response received: ", response.status);
+        if (response.ok) {
+          console.info("sendNewPolicyModel query successful");
+          return response.text();
+        } else {
+          return response.text().then(responseBody => {
+            throw new Error("HTTP " + response.status + "," + responseBody);
+          })
+        }
+      })
+      .catch(function (error) {
+        console.error("sendNewPolicyModel error occurred ", error);
+        alert("sendNewPolicyModel error occurred " + error);
+        return undefined;
+      });
+  }
 }
diff --git a/gui-clamp/ui-react/src/api/PolicyToscaService.js b/gui-clamp/ui-react/src/api/PolicyToscaService.js
index b5282f9..6c74149 100644
--- a/gui-clamp/ui-react/src/api/PolicyToscaService.js
+++ b/gui-clamp/ui-react/src/api/PolicyToscaService.js
@@ -77,60 +77,4 @@ export default class PolicyToscaService {
         return {};
       });
   }
-
-  static createPolicyModelFromToscaModel(jsonData) {
-    return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels', {
-      method: 'POST',
-      credentials: 'same-origin',
-      headers: {
-        "Content-Type": "a",
-      },
-      body: JSON.stringify(jsonData)
-    })
-      .then(function (response) {
-        console.debug("createPolicyModelFromToscaModel response received: ", response.status);
-        if (response.ok) {
-          var message = {
-            status: response.status,
-            message: 'Tosca Policy Model successfully uploaded'
-          };
-          return message;
-        } else {
-          console.error("createPolicyModelFromToscaModel failed");
-          return response.text();
-        }
-      })
-      .catch(function (error) {
-        console.error("createPolicyModelFromToscaModel error received", error);
-        return "";
-      });
-  }
-
-  static updatePolicyModelTosca(policyModelType, policyModelVersion, jsonData) {
-    return fetch(window.location.pathname + 'restservices/clds/v2/policyToscaModels/' + policyModelType + '/' + policyModelVersion, {
-      method: 'PUT',
-      credentials: 'same-origin',
-      headers: {
-        "Content-Type": "a",
-      },
-      body: JSON.stringify(jsonData)
-    })
-      .then(function (response) {
-        console.debug("updatePolicyModelTosca response received: ", response.status);
-        if (response.ok) {
-          var message = {
-            status: response.status,
-            message: 'Tosca Policy Model successfully uploaded'
-          };
-          return message;
-        } else {
-          console.error("updatePolicyModelTosca failed");
-          return response.text();
-        }
-      })
-      .catch(function (error) {
-        console.error("updatePolicyModelTosca error received", error);
-        return "";
-      });
-  }
 }