Fix the loopCache

Fix the loop cache so that the micro service configuration are well read.

Issue-ID: CLAMP-653

Change-Id: I68524bd3d5bfbf5ca5a3acf5c59823df06fd4cd9
Signed-off-by: sebdet <sebastien.determe@intl.att.com>

diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index b177230..03cec9f 100644 (file)
--- a/ui-react/src/api/LoopCache.js
+++ b/ui-react/src/api/LoopCache.js
@@ -31,7 +31,7 @@ export default class LoopCache {
        updateMicroServiceProperties(name, newMsProperties) {
                        for (var policy in this.loopJsonCache["microServicePolicies"]) {
                                if (this.loopJsonCache["microServicePolicies"][policy]["name"] === name) {
-                                       this.loopJsonCache["microServicePolicies"][policy]["properties"] = newMsProperties;
+                                       this.loopJsonCache["microServicePolicies"][policy]["configurationsJson"] = newMsProperties;
                                }
                        }
        }
@@ -91,7 +91,7 @@ export default class LoopCache {
        getOperationalPolicyPropertiesForName(name) {
                var opConfig = this.getOperationalPolicyForName(name);
                if (opConfig !== null) {
-                       return opConfig["properties"];
+                       return opConfig["configurationsJson"];
                }
                return null;
        }
@@ -118,7 +118,7 @@ export default class LoopCache {
        getMicroServicePropertiesForName(name) {
                var msConfig = this.getMicroServiceForName(name);
                if (msConfig !== null) {
-                       return msConfig["properties"];
+                       return msConfig["configurationsJson"];
                }
                return null;
        }

diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index 471fa4d..97c09fa 100644 (file)
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -103,7 +103,7 @@ describe('Verify LoopCache functions', () => {
       const msJson = {
           "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
           "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-          "properties": {"domain": "measurementsForVfScaling"},
+          "configurationsJson": {"domain": "measurementsForVfScaling"},
           "shared": false,
           "jsonRepresentation": {"schema": {}}
       };

diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 087ab5d..23ea354 100644 (file)
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -103,7 +103,7 @@
     {
       "name": "TCA_h2NMX_v1_0_ResourceInstanceName1_tca",
       "modelType": "onap.policies.monitoring.cdap.tca.hi.lo.app",
-      "properties": {"domain": "measurementsForVfScaling"},
+      "configurationsJson": {"domain": "measurementsForVfScaling"},
       "shared": false,
       "jsonRepresentation": {"schema": {}}
     }