summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsebdet <sebastien.determe@intl.att.com>2020-02-27 11:39:50 -0800
committersebdet <sebastien.determe@intl.att.com>2020-02-27 11:39:50 -0800
commit58135b810746267b300fbd5b1483e9920166c221 (patch)
tree089c96bcc02700cfad7abe10ca8e501cf3823740
parentd2a4df0b62b6a32c42bac45b4bee344016faa8fb (diff)
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>
-rw-r--r--ui-react/src/api/LoopCache.js6
-rw-r--r--ui-react/src/api/LoopCache.test.js2
-rw-r--r--ui-react/src/api/LoopCache_mokeLoopJsonCache.json2
3 files changed, 5 insertions, 5 deletions
diff --git a/ui-react/src/api/LoopCache.js b/ui-react/src/api/LoopCache.js
index b17723089..03cec9fa6 100644
--- 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 471fa4d71..97c09fa36 100644
--- 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 087ab5d45..23ea354ea 100644
--- 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": {}}
}