summaryrefslogtreecommitdiffstats
path: root/examples/examples-onap-vcpe/src/main/resources/logic
diff options
context:
space:
mode:
authorliamfallon <liam.fallon@est.tech>2020-11-16 13:13:43 +0000
committerliamfallon <liam.fallon@est.tech>2020-11-16 13:18:32 +0000
commitda12c1c622ebc2304965ff1f646dc9783c5363c6 (patch)
tree3ee158713320355320b22dd62b1f76345320d217 /examples/examples-onap-vcpe/src/main/resources/logic
parent90bc246ffec30f7d97474d772d8bad73715cdd45 (diff)
Update vCPE example for JSON Stringify
The JSON.stringify() call in the Rhino Javascript interpreter is not working correctly. A previous patch introduced a method into the Apex execution context to provide an alternative method for stringifying JSON. This patch updates the vCPE example in apex to use that new method. Issue-ID: POLICY-2463 Change-Id: I85cc33dc4633b1b6f4c4db3d5ad8579c66d7c18c Signed-off-by: liamfallon <liam.fallon@est.tech>
Diffstat (limited to 'examples/examples-onap-vcpe/src/main/resources/logic')
-rw-r--r--examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js15
1 files changed, 9 insertions, 6 deletions
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
index 13129f224..eabde8ecb 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/standalone/GetEntityStateTask.js
@@ -1,7 +1,6 @@
/*
* ============LICENSE_START=======================================================
* Copyright (C) 2020 Nordix Foundation.
- * Modifications Copyright (C) 2020 Nordix Foundation.
* ================================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -68,8 +67,8 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
var aaiInfo = executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper().createNewSubInstance(
"VCPE_AAI_Type");
- aaiInfo.put("genericVnfResourceVersion", clEvent.get("AAI").get(
- new utf8Type("generic_DasH_vnf_DoT_resource_DasH_version")));
+ aaiInfo.put("genericVnfResourceVersion", new utf8Type(clEvent.get("AAI").get(
+ new utf8Type("generic_DasH_vnf_DoT_resource_DasH_version"))));
aaiInfo.put("genericVnfVnfName", clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_name")));
aaiInfo.put("genericVnfProvStatus", clEvent.get("AAI").get(
new utf8Type("generic_DasH_vnf_DoT_prov_DasH_status")));
@@ -79,9 +78,8 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
new utf8Type("generic_DasH_vnf_DoT_orchestration_DasH_status")));
aaiInfo.put("genericVnfVnfType", clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_type")));
aaiInfo.put("genericVnfInMaint", clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_in_DasH_maint")));
- aaiInfo
- .put("genericVnfServiceId", clEvent.get("AAI")
- .get(new utf8Type("generic_DasH_vnf_DoT_service_DasH_id")));
+ aaiInfo.put("genericVnfServiceId", clEvent.get("AAI")
+ .get(new utf8Type("generic_DasH_vnf_DoT_service_DasH_id")));
aaiInfo.put("genericVnfVnfId", clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")));
aaiInfo.put("vserverIsClosedLoopDisabled", clEvent.get("AAI").get(
new utf8Type("vserver_DoT_is_DasH_closed_DasH_loop_DasH_disabled")));
@@ -98,6 +96,11 @@ if (clEvent.get("AAI").get(new utf8Type("generic_DasH_vnf_DoT_vnf_DasH_id")) !=
executor.getContextAlbum("ControlLoopStatusAlbum").put(vnfID.toString(), vcpeClosedLoopStatus);
+ // Test of stringify
+ executor.logger.info(new java.lang.String("vcpeClosedLoopStatus as JSON:"));
+ executor.logger.info(executor.stringify2Json(vcpeClosedLoopStatus,
+ executor.getContextAlbum("ControlLoopStatusAlbum").getSchemaHelper()));
+
executor.logger.info("Created context information for new vCPE VNF \"" + vnfID.toString() + "\"");
}