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>

2 files changed, 11 insertions, 8 deletions

diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json
index 39a1b2ddb..364695965 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPEStandalone/ApexConfig_Sim.json
@@ -35,7 +35,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "fileName": "examples/events/ONAPvCPEStandalone/ConfigureBlackWhiteLists.json"
+                    "fileName": "src/main/resources/examples/events/ONAPvCPEStandalone/ConfigureBlackWhiteLists.json"
                 }
             },
             "eventProtocolParameters": {
@@ -46,7 +46,7 @@
             "carrierTechnologyParameters": {
                 "carrierTechnology": "FILE",
                 "parameters": {
-                    "fileName": "examples/events/ONAPvCPEStandalone/MultiEvents.json"
+                    "fileName": "src/main/resources/examples/events/ONAPvCPEStandalone/MultiEvents.json"
                 }
             },
             "eventProtocolParameters": {
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() + "\"");
     }