Rework the policy refresh
Rework the policy refresh for the new unique dialog policyModel
Issue-ID: CLAMP-578
Signed-off-by: sebdet <sebastien.determe@intl.att.com>
Change-Id: Ie8c91223e92c1e344d7ead5784ffea33d4f6a00f
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index 5eaa79a..c54337f 100644
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -70,10 +70,6 @@
return this.loopJsonCache["name"];
}
- getOperationalPolicyConfigurationJson() {
- return this.loopJsonCache["operationalPolicies"]["0"]["configurationsJson"];
- }
-
getOperationalPolicyJsonSchema() {
return this.loopJsonCache["operationalPolicies"]["0"]["jsonRepresentation"];
}
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index fc75681..4642ff5 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -30,17 +30,6 @@
expect(loopCache.getLoopName()).toBe("LOOP_Jbv1z_v1_0_ResourceInstanceName1_tca");
});
- it('getOperationalPolicyConfigurationJson', () => {
- const opPolicyConfig = {
- "guard_policies": {},
- "operational_policy": {
- "controlLoop": {},
- "policies": []
- }
- };
- expect(loopCache.getOperationalPolicyConfigurationJson()).toStrictEqual(opPolicyConfig);
- });
-
it('getOperationalPolicies', () => {
const opPolicy = [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
diff --git a/ui-react/src/api/LoopService.js b/ui-react/src/api/LoopService.js
index 2750763..698ee28 100644
--- a/ui-react/src/api/LoopService.js
+++ b/ui-react/src/api/LoopService.js
@@ -171,8 +171,8 @@
});
}
- static refreshOpPolicyJson(loopName) {
- return fetch('/restservices/clds/v2/loop/refreshOpPolicyJsonSchema/' + loopName, {
+ static refreshOperationalPolicyJson(loopName,operationalPolicyName) {
+ return fetch('/restservices/clds/v2/loop/refreshOperationalPolicyJsonSchema/' + loopName + '/' + operationalPolicyName, {
method: 'PUT',
headers: {
"Content-Type": "application/json"
@@ -194,6 +194,29 @@
});
}
+ static refreshMicroServicePolicyJson(loopName,microServicePolicyName) {
+ return fetch('/restservices/clds/v2/loop/refreshMicroServicePolicyJsonSchema/' + loopName + '/' + microServicePolicyName, {
+ method: 'PUT',
+ headers: {
+ "Content-Type": "application/json"
+ },
+ credentials: 'same-origin'
+ })
+ .then(function (response) {
+ console.debug("Refresh Operational Policy Json Schema response received: ", response.status);
+ if (response.ok) {
+ return response.json();
+ } else {
+ console.error("Refresh Operational Policy Json Schema query failed");
+ return {};
+ }
+ })
+ .catch(function (error) {
+ console.error("Refresh Operational Policy Json Schema error received", error);
+ return {};
+ });
+ }
+
static addOperationalPolicyType(loopName, policyType, policyVersion) {
return fetch('/restservices/clds/v2/loop/addOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
method: 'PUT',
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
index 7ed8ba6..89e7079 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.js
@@ -127,7 +127,7 @@
}
handleRefresh() {
- LoopService.refreshOpPolicyJson(this.state.loopCache.getLoopName()).then(data => {
+ LoopService.refreshOperationalPolicyJson(this.state.loopCache.getLoopName(), this.state.loopCache.getOperationalPolicies()[0]).then(data => {
var newLoopCache = new LoopCache(data);
var schema_json = newLoopCache.getOperationalPolicyJsonSchema();
var operationalPoliciesData = newLoopCache.getOperationalPoliciesNoJsonSchema();