Update vCPE example for A&AI custom query

The change in policy-models to use custom queries means that the named
queries used in apex examples must be updated to use custom queries.
This review is the second of two reviews to implement this change.

This patch updates the policy and its associated tests to work with A&AI
custom queries.

Issue-ID: POLICY-2125
Change-Id: I6a5b90002e43272e3cf296158f09f91a0f6d6907
Signed-off-by: liamfallon <liam.fallon@est.tech>

1 files changed, 17 insertions, 14 deletions

diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
index 0ba3c0985..f4f6d908d 100644
--- a/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/GetVCPEStateTask.js
@@ -5,15 +5,15 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * 
+ *
  * Note: The incoming closedloop message can be ONSET with both VNF-name and VNF-ID
  *       or ABATED with only VNF-name. So need to handle differently. For ABATED case,
  *       since we still keep the RequireIDVNFID context album, we can get it from there.
@@ -76,7 +76,10 @@ if (clEvent.getAai().get("generic-vnf.vnf-id") != null) {
       aaiInfo.put("genericVnfInMaint",              clEvent.getAai().get("generic-vnf.in-maint"));
       aaiInfo.put("genericVnfServiceId",            clEvent.getAai().get("generic-vnf.service-id"));
       aaiInfo.put("genericVnfVnfId",                clEvent.getAai().get("generic-vnf.vnf-id"));
-    
+      aaiInfo.put("vserverIsClosedLoopDisabled",    clEvent.getAai().get("vserver.is-closed-loop-disabled"));
+      aaiInfo.put("vserverProvStatus",              clEvent.getAai().get("vserver.prov-status"));
+      aaiInfo.put("vserverName",                    clEvent.getAai().get("vserver.vserver-name"));
+
       vcpeClosedLoopStatus.put("AAI", aaiInfo);
 
       if (clEvent.getClosedLoopAlarmEnd() != null) {
@@ -99,14 +102,14 @@ else {
     executor.logger.info("No vnf-id in VirtualControlLoopEvent, status:" + clEvent.getClosedLoopEventStatus().toString());
     var vnfName = clEvent.getAai().get("generic-vnf.vnf-name");
     executor.logger.info("No vnf-id in VirtualControlLoopEvent for " + vnfName);
- 
+
     vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(vnfName.toString());
- 
+
     if (vcpeClosedLoopStatus == null) {
         executor.logger.info("Creating context information for new vCPE VNF \"" + vnfName.toString() + "\"");
- 
+
         vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewInstance();
- 
+
         vcpeClosedLoopStatus.put("closedLoopControlName", clEvent.getClosedLoopControlName());
         vcpeClosedLoopStatus.put("closedLoopAlarmStart",  clEvent.getClosedLoopAlarmStart().toEpochMilli());
         vcpeClosedLoopStatus.put("closedLoopEventClient", clEvent.getClosedLoopEventClient());
@@ -122,24 +125,24 @@ else {
         vcpeClosedLoopStatus.put("notification",          "ACTIVE");
         vcpeClosedLoopStatus.put("notificationTime",      java.lang.System.currentTimeMillis());
         vcpeClosedLoopStatus.put("message",               "");
- 
+
         var aaiInfo = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewSubInstance("VCPE_AAI_Type");
- 
+
         aaiInfo.put("genericVnfVnfName", clEvent.getAai().get("generic-vnf.vnf-name"));
         vcpeClosedLoopStatus.put("AAI", aaiInfo);
- 
+
         if (clEvent.getClosedLoopAlarmEnd() != null) {
             vcpeClosedLoopStatus.put("closedLoopAlarmEnd", clEvent.getClosedLoopAlarmEnd().toEpochMilli());
         } else {
             vcpeClosedLoopStatus.put("closedLoopAlarmEnd", java.lang.Long.valueOf(0));
         }
- 
+
         executor.getContextAlbum("VCPEClosedLoopStatusAlbum").put(vnfName.toString(), vcpeClosedLoopStatus);
- 
+
         executor.logger.info("Created context information for new vCPE VNF \"" + vnfName.toString() + "\"");
     }
     executor.outFields.put("requestID", requestID);
-    executor.outFields.put("vnfName", vnfName);   
+    executor.outFields.put("vnfName", vnfName);
     executor.logger.info(executor.outFields);
 }