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>

16 files changed, 183 insertions, 428 deletions

diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
index ce97eeb09..5208767b0 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig.json
@@ -52,28 +52,6 @@
             "requestorPeer": "GuardRequestorProducer",
             "requestorTimeout": 500
         },
-        "AAIRequestorConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
-                "parameters": {
-                    "url": "http://10.0.1.1:8443/aai/search/named-query",
-                    "httpMethod": "POST",
-                    "restRequestTimeout": 2000
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryResponse"
-                }
-            },
-            "eventName": "AAINamedQueryResponseEvent",
-            "eventNameFilter": "AAINamedQueryResponseEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorProducer",
-            "requestorTimeout": 500
-        },
         "DCAEConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
@@ -88,10 +66,10 @@
                     "nameAlias": "closedLoopControlName",
                     "versionAlias": "version",
                     "sourceAlias": "from",
-                    "pojoField": "VirtualControlLoopEvent" 
+                    "pojoField": "VirtualControlLoopEvent"
                 }
             },
-            "eventName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e" 
+            "eventName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e"
         },
         "APPCConsumer": {
             "carrierTechnologyParameters": {
@@ -137,22 +115,6 @@
             "requestorPeer": "GuardRequestorConsumer",
             "requestorTimeout": 500
         },
-        "AAIRequestorProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryRequest"
-                }
-            },
-            "eventNameFilter": "AAINamedQueryRequestEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorConsumer",
-            "requestorTimeout": 500
-        },
         "APPCProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
index aa37f7ab2..cbd4d99a6 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfigStdin.json
@@ -68,28 +68,6 @@
             "requestorPeer": "GuardRequestorProducer",
             "requestorTimeout": 500
         },
-        "AAIRequestorConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
-                "parameters": {
-                    "url": "http://172.16.5.238:54321/OnapVCpeSim/sim/aai/search/named-query",
-                    "httpMethod": "POST",
-                    "restRequestTimeout": 2000
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryResponse"
-                }
-            },
-            "eventName": "AAINamedQueryResponseEvent",
-            "eventNameFilter": "AAINamedQueryResponseEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorProducer",
-            "requestorTimeout": 500
-        },
         "DCAEConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
             "requestorPeer": "GuardRequestorConsumer",
             "requestorTimeout": 500
         },
-        "AAIRequestorProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryRequest"
-                }
-            },
-            "eventNameFilter": "AAINamedQueryRequestEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorConsumer",
-            "requestorTimeout": 500
-        },
         "APPCProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
index 46c03af05..80672ed01 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim.json
@@ -3,7 +3,7 @@
         "name": "MyApexEngine",
         "version": "0.0.1",
         "id": 45,
-        "instanceCount": 4,
+        "instanceCount": 1,
         "deploymentPort": 12561,
         "policyModelFileName": "examples/models/ONAPvCPE/ONAPvCPEPolicyModel.json",
         "engineParameters": {
@@ -68,28 +68,6 @@
             "requestorPeer": "GuardRequestorProducer",
             "requestorTimeout": 500
         },
-        "AAIRequestorConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
-                "parameters": {
-                    "url": "http://localhost:54321/OnapVCpeSim/sim/aai/search/named-query",
-                    "httpMethod": "POST",
-                    "restRequestTimeout": 2000
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryResponse"
-                }
-            },
-            "eventName": "AAINamedQueryResponseEvent",
-            "eventNameFilter": "AAINamedQueryResponseEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorProducer",
-            "requestorTimeout": 500
-        },
         "DCAEConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
             "requestorPeer": "GuardRequestorConsumer",
             "requestorTimeout": 500
         },
-        "AAIRequestorProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryRequest"
-                }
-            },
-            "eventNameFilter": "AAINamedQueryRequestEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorConsumer",
-            "requestorTimeout": 500
-        },
         "APPCProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
index 052568111..806cf2d11 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/config/ONAPvCPE/ApexConfig_Sim_StdIO.json
@@ -68,28 +68,6 @@
             "requestorPeer": "GuardRequestorProducer",
             "requestorTimeout": 500
         },
-        "AAIRequestorConsumer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters",
-                "parameters": {
-                    "url": "http://localhost:54321/OnapVCpeSim/sim/aai/search/named-query",
-                    "httpMethod": "POST",
-                    "restRequestTimeout": 2000
-                }
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryResponse"
-                }
-            },
-            "eventName": "AAINamedQueryResponseEvent",
-            "eventNameFilter": "AAINamedQueryResponseEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorProducer",
-            "requestorTimeout": 500
-        },
         "DCAEConsumer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
@@ -151,22 +129,6 @@
             "requestorPeer": "GuardRequestorConsumer",
             "requestorTimeout": 500
         },
-        "AAIRequestorProducer": {
-            "carrierTechnologyParameters": {
-                "carrierTechnology": "RESTREQUESTOR",
-                "parameterClassName": "org.onap.policy.apex.plugins.event.carrier.restrequestor.RestRequestorCarrierTechnologyParameters"
-            },
-            "eventProtocolParameters": {
-                "eventProtocol": "JSON",
-                "parameters": {
-                    "pojoField": "AAINamedQueryRequest"
-                }
-            },
-            "eventNameFilter": "AAINamedQueryRequestEvent",
-            "requestorMode": true,
-            "requestorPeer": "AAIRequestorConsumer",
-            "requestorTimeout": 500
-        },
         "APPCProducer": {
             "carrierTechnologyParameters": {
                 "carrierTechnology": "RESTCLIENT",
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
index 09ace1ed6..430d50530 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/MultiEvents.json
@@ -15,7 +15,10 @@
         "generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
         "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0000"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000000",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_0"
     },
     "from": "DCAE",
     "version": "1.0.2"
@@ -37,7 +40,10 @@
         "generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
         "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0001"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000001",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_1"
     },
     "from": "DCAE",
     "version": "1.0.2"
@@ -52,7 +58,10 @@
     "target": "generic-vnf.vnf-id",
     "AAI": {
         "vserver.is-closed-loop-disabled": "false",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0002"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000002",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_2"
     },
     "from": "DCAE",
     "version": "1.0.2"
@@ -67,7 +76,10 @@
     "target": "generic-vnf.vnf-id",
     "AAI": {
         "vserver.is-closed-loop-disabled": "false",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0003"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000003",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_3"
     },
     "from": "DCAE",
     "version": "1.0.2"
@@ -84,7 +96,7 @@
     "version": "1.0.2",
     "from": "DCAE",
     "AAI": {
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000004",
         "generic-vnf.resource-version": "1",
         "generic-vnf.vnf-name": "vCPEInfraVNF0005",
         "generic-vnf.prov-status": "PREPROV",
@@ -92,7 +104,10 @@
         "generic-vnf.orchestration-status": "Created",
         "generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
-        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0005"
+        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0005",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_4"
     }
 }
 {
@@ -107,7 +122,7 @@
     "version": "1.0.2",
     "from": "DCAE",
     "AAI": {
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000005",
         "generic-vnf.resource-version": "1",
         "generic-vnf.vnf-name": "vCPEInfraVNF0006",
         "generic-vnf.prov-status": "PREPROV",
@@ -115,7 +130,10 @@
         "generic-vnf.orchestration-status": "Created",
         "generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
-        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0006"
+        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03b0006",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_5"
     }
 }
 {
@@ -130,7 +148,10 @@
     "version": "1.0.2",
     "from": "DCAE",
     "AAI": {
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0006"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000006",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_6"
     }
 }
 {
@@ -145,6 +166,9 @@
     "version": "1.0.2",
     "from": "DCAE",
     "AAI": {
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db0007"
+        "generic-vnf.vnf-id": "00000000-0000-0000-0000-000000000007",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "Ete_vCPECLvCPESNK_7ba1fbde_7"
     }
 }
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
index 5efbfef69..c97224cd2 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedAAIInfoEvent.json
@@ -18,6 +18,9 @@
         "generic-vnf.orchestration-status": "Created",
         "generic-vnf.vnf-type": "cCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
-        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f"
+        "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "vserverName"
     }
 }
\ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
index 7cc910e96..148e415f5 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEAbatedNoAAIInfoEvent.json
@@ -10,6 +10,9 @@
     "version": "1.0.2",
     "from": "DCAE",
     "AAI": {
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "vserverName"
     }
 }
\ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
index 49ba03d2c..dd31327e7 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetAAIInfoEvent.json
@@ -15,7 +15,10 @@
         "generic-vnf.vnf-type": "vCPEInfraService10/vCPEInfraService10 0",
         "generic-vnf.in-maint": "false",
         "generic-vnf.service-id": "5585fd2c-ad0d-4050-b0cf-dfe4a03bd01f",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+        "vserver.is-closed-loop-disabled": "false",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "vserverName"
     },
     "from": "DCAE",
     "version": "1.0.2"
diff --git a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
index 5f351a985..014780032 100644
--- a/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
+++ b/examples/examples-onap-vcpe/src/main/resources/examples/events/ONAPvCPE/VCPEOnsetNoAAIInfoEvent.json
@@ -8,7 +8,9 @@
     "target": "generic-vnf.vnf-id",
     "AAI": {
         "vserver.is-closed-loop-disabled": "false",
-        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1"
+        "generic-vnf.vnf-id": "b4fe00ac-1da6-4b00-ac0d-8e8300db39e1",
+        "vserver.prov-status": "ACTIVE",
+        "vserver.vserver-name": "vserverName"
     },
     "from": "DCAE",
     "version": "1.0.2"
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js
deleted file mode 100644
index cab75f6cd..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupRequestTask.js
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
-        executor.inFields.get("vnfID").toString());
-
-var aaiRequest = new org.onap.policy.aai.AaiNqRequest;
-aaiRequest.setQueryParameters(new org.onap.policy.aai.AaiNqQueryParameters);
-aaiRequest.setInstanceFilters(new org.onap.policy.aai.AaiNqInstanceFilters);
-
-aaiRequest.getQueryParameters().setNamedQuery(new org.onap.policy.aai.AaiNqNamedQuery);
-aaiRequest.getQueryParameters().getNamedQuery().setNamedQueryUuid(executor.inFields.get("requestID"));
-
-var genericVnfInstanceFilterMap = new java.util.HashMap();
-genericVnfInstanceFilterMap.put("vnf-id", vcpeClosedLoopStatus.get("AAI").get("genericVnfVnfId"));
-
-var genericVnfFilterMap = new java.util.HashMap();
-genericVnfFilterMap.put("generic-vnf", genericVnfInstanceFilterMap);
-
-aaiRequest.getInstanceFilters().getInstanceFilter().add(genericVnfFilterMap);
-
-executor.logger.info(aaiRequest);
-
-executor.outFields.put("AAINamedQueryRequest", aaiRequest);
-
-executor.getContextAlbum("ControlLoopExecutionIDAlbum").put(executor.executionId.toString(),
-        executor.inFields.get("vnfID"));
-
-executor.logger.info(executor.outFields);
-
-var returnValue = executor.isTrue;
\ No newline at end of file
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js
deleted file mode 100644
index 50961c214..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupResponseTask.js
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var vnfID = executor.getContextAlbum("ControlLoopExecutionIDAlbum").remove(executor.executionId.toString());
-
-executor.logger.info("Continuing execution with VNF ID: " + vnfID);
-
-var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(vnfID.toString());
-executor.logger.info(vcpeClosedLoopStatus);
-
-var aaiResponse = executor.inFields.get("AAINamedQueryResponse");
-
-for (var iterator = aaiResponse.getInventoryResponseItems().iterator(); iterator.hasNext(); ) {
-    var responseItem = iterator.next();
-    
-    if (responseItem.getModelName() != "vCPE") {
-        continue;
-    }
-    
-    var aaiInfo = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").getSchemaHelper().createNewSubInstance("VCPE_AAI_Type");
-
-    aaiInfo.put("genericVnfResourceVersion",      responseItem.getGenericVnf().getResourceVersion());
-    aaiInfo.put("genericVnfVnfName",              responseItem.getGenericVnf().getVnfName());
-    aaiInfo.put("genericVnfProvStatus",           responseItem.getGenericVnf().getProvStatus());
-    aaiInfo.put("genericVnfIsClosedLoopDisabled", responseItem.getGenericVnf().getIsClosedLoopDisabled().toString());
-    aaiInfo.put("genericVnfVnfType",              responseItem.getGenericVnf().getVnfType());
-    aaiInfo.put("genericVnfInMaint",              responseItem.getGenericVnf().getInMaint().toString());
-    aaiInfo.put("genericVnfServiceId",            responseItem.getGenericVnf().getServiceId());
-    aaiInfo.put("genericVnfVnfId",                responseItem.getGenericVnf().getVnfId());
-
-    aaiInfo.put("genericVnfOrchestrationStatus",  responseItem.getVfModule().getOrchestrationStatus());
-
-    vcpeClosedLoopStatus.put("AAI", aaiInfo);
-    
-    break;
-}
-
-// We should check here for the case where AAI returns an error or no data for the query
-
-
-var uuidType = Java.type("java.util.UUID");
-var requestID = uuidType.fromString(vcpeClosedLoopStatus.get("requestID"));
-
-executor.outFields.put("requestID", requestID);
-executor.outFields.put("vnfID", vnfID);
-
-executor.logger.info(executor.outFields);
-
-var returnValue = executor.isTrue;
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js
new file mode 100644
index 000000000..fcb39052d
--- /dev/null
+++ b/examples/examples-onap-vcpe/src/main/resources/logic/AAILookupTask.js
@@ -0,0 +1,85 @@
+/*
+ * ============LICENSE_START=======================================================
+ *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+ * ================================================================================
+ * 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.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+executor.logger.info(executor.subject.id);
+executor.logger.info(executor.inFields);
+
+var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
+        executor.inFields.get("vnfID").toString());
+
+executor.logger.info("Executing A&AI Lookup");
+executor.logger.info(vcpeClosedLoopStatus);
+
+var aaiInfo = vcpeClosedLoopStatus.get("AAI");
+
+if (aaiInfo.get("vserverName") == null) {
+    executor.message = "the field vserver.vserver-name must exist in the onset control loop event";
+    executor.logger.warn(executor.message);
+    var returnValue = executor.isFalse;
+}
+else if (aaiInfo.get("genericVnfVnfId") == null && aaiInfo.get("genericVnfVnfName") == null) {
+    executor.message = "either the field generic-vnf.vnf-id or generic-vnf.vnf-name must exist"
+        + " in the onset control loop event";
+    executor.logger.warn(executor.message);
+    var returnValue = executor.isFalse;
+}
+else {
+    var restManager = new org.onap.policy.rest.RestManager;
+    var aaiManager = new org.onap.policy.aai.AaiManager(restManager);
+
+    // We need to instantiate the type in order to trigger the static JAXB handling
+    // in the AaiCqResponse class
+    var aaiCqResponseType = Java.type("org.onap.policy.aai.AaiCqResponse");
+
+    var aaiResponse = aaiManager.getCustomQueryResponse(
+            "http://localhost:54321/OnapVCpeSim/sim",
+            "aai.username",
+            "aai.password",
+            executor.inFields.get("requestID"),
+            vcpeClosedLoopStatus.get("AAI").get("vserverName")
+    );
+
+    var genericVnf;
+
+    if (aaiInfo.get("genericVnfVnfId") != null) {
+        genericVnf = aaiResponse.getGenericVnfByModelInvariantId(aaiInfo.get("genericVnfVnfId"));
+    }
+    else {
+        genericVnf = aaiResponse.getGenericVnfByVnfName(aaiInfo.get("genericVnfVnfId"));
+    }
+
+    aaiInfo.put("genericVnfResourceVersion",      genericVnf.getResourceVersion());
+    aaiInfo.put("genericVnfVnfName",              genericVnf.getVnfName());
+    aaiInfo.put("genericVnfProvStatus",           genericVnf.getProvStatus());
+    aaiInfo.put("genericVnfIsClosedLoopDisabled", genericVnf.isIsClosedLoopDisabled().toString());
+    aaiInfo.put("genericVnfVnfType",              genericVnf.getVnfType());
+    aaiInfo.put("genericVnfInMaint",              genericVnf.isInMaint().toString());
+    aaiInfo.put("genericVnfServiceId",            genericVnf.getServiceId());
+    aaiInfo.put("genericVnfVnfId",                genericVnf.getVnfId());
+    aaiInfo.put("genericVnfOrchestrationStatus",
+            genericVnf.getVfModules().getVfModule().get(0).getOrchestrationStatus());
+
+    executor.outFields.put("requestID", executor.inFields.get("requestID"));
+    executor.outFields.put("vnfID", executor.inFields.get("vnfID"));
+
+    executor.logger.info(executor.outFields);
+
+    var returnValue = executor.isTrue;
+}
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);
 }
 
diff --git a/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js b/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js
deleted file mode 100644
index b397a5f7c..000000000
--- a/examples/examples-onap-vcpe/src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * ============LICENSE_START=======================================================
- *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- * ================================================================================
- * 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.
- * 
- * SPDX-License-Identifier: Apache-2.0
- * ============LICENSE_END=========================================================
- */
-
-executor.logger.info(executor.subject.id);
-executor.logger.info(executor.inFields);
-
-var returnValue = executor.isTrue;
-
-if( executor.inFields.get("vnfID") == null) {
-    executor.logger.info("ReceiveEventPolicyRequestAAIStateTSL: vnfID is null");
-    var vnfName = executor.inFields.get("vnfName");
-    var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
-        executor.inFields.get("vnfName"));
-    executor.logger.info("CL event status: " + vcpeClosedLoopStatus.get("closedLoopEventStatus"));
-    executor.subject.getTaskKey("NoAAILookupTask").copyTo(executor.selectedTask);
- } else {
-    var vcpeClosedLoopStatus = executor.getContextAlbum("VCPEClosedLoopStatusAlbum").get(
-        executor.inFields.get("vnfID").toString());
-    var aaiInfo = vcpeClosedLoopStatus.get("AAI");
-
-    executor.logger.info(aaiInfo);
-
-    if (aaiInfo.get("genericVnfResourceVersion") != null
-        && aaiInfo.get("genericVnfVnfName") != null
-        && aaiInfo.get("genericVnfProvStatus") != null
-        && aaiInfo.get("genericVnfIsClosedLoopDisabled") != null
-        && aaiInfo.get("genericVnfOrchestrationStatus") != null
-        && aaiInfo.get("genericVnfVnfType") != null
-        && aaiInfo.get("genericVnfInMaint") != null
-        && aaiInfo.get("genericVnfServiceId") != null
-        && aaiInfo.get("genericVnfVnfId") != null) {
-        executor.subject.getTaskKey("NoAAILookupTask").copyTo(executor.selectedTask);
-    } else {
-        executor.subject.getTaskKey("AAILookupRequestTask").copyTo(executor.selectedTask);
-    }
-}
-executor.logger.info("ReceiveEventPolicyOnsetOrAbatedStateTSL State Selected Task:" + executor.selectedTask);
diff --git a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
index 571cea9cc..0748cbed1 100644
--- a/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
+++ b/examples/examples-onap-vcpe/src/main/resources/policy/ONAPvCPEPolicyModel.apex
@@ -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.
-# 
+#
 # SPDX-License-Identifier: Apache-2.0
 # ============LICENSE_END=========================================================
 #-------------------------------------------------------------------------------
@@ -28,9 +28,6 @@ schema create name=UUIDType          flavour=Java schema=java.util.UUID
 schema create name=VirtualControlLoopEventType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopEvent
 schema create name=VirtualControlLoopNotificationType flavour=Java schema=org.onap.policy.controlloop.VirtualControlLoopNotification
 
-schema create name=AAIServiceNamedQueryRequestType flavour=Java schema=org.onap.policy.aai.AaiNqRequest
-schema create name=AAIServiceNamedQueryResponseType flavour=Java schema=org.onap.policy.aai.AaiNqResponse
-
 schema create name=APPCLCMRequestType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper
 schema create name=APPCLCMResponseType flavour=Java schema=org.onap.policy.appclcm.AppcLcmDmaapWrapper
 
@@ -75,12 +72,6 @@ event parameter create name=APPCRestartVNFResponseEvent parName=APPCLCMResponseE
 event create name=ControlLoopLogEvent nameSpace=org.onap.policy.apex.onap.vcpe source=APEX target=APEX
 event parameter create name=ControlLoopLogEvent parName=VirtualControlLoopNotification schemaName=VirtualControlLoopNotificationType
 
-event create name=AAINamedQueryRequestEvent nameSpace=org.onap.policy.apex.onap.vcpe source=APEX target=AAI
-event parameter create name=AAINamedQueryRequestEvent parName=AAINamedQueryRequest schemaName=AAIServiceNamedQueryRequestType
-
-event create name=AAINamedQueryResponseEvent nameSpace=org.onap.policy.apex.onap.vcpe source=AAI target=APEX
-event parameter create name=AAINamedQueryResponseEvent parName=AAINamedQueryResponse schemaName=AAIServiceNamedQueryResponseType
-
 task create name=GetVCPEStateTask
 
 task inputfield create name=GetVCPEStateTask fieldName=VirtualControlLoopEvent schemaName=VirtualControlLoopEventType
@@ -197,32 +188,18 @@ task logic create name=ControlLoopLogTask logicFlavour=JAVASCRIPT logic=LS
 #MACROFILE:"src/main/resources/logic/ControlLoopLogTask.js"
 LE
 
-task create name=AAILookupRequestTask
+task create name=AAILookupTask
 
-task inputfield create name=AAILookupRequestTask fieldName=requestID schemaName=UUIDType
-task inputfield create name=AAILookupRequestTask fieldName=vnfID     schemaName=UUIDType
+task inputfield create name=AAILookupTask fieldName=requestID schemaName=UUIDType
+task inputfield create name=AAILookupTask fieldName=vnfID     schemaName=UUIDType
 
-task outputfield create name=AAILookupRequestTask fieldName=AAINamedQueryRequest schemaName=AAIServiceNamedQueryRequestType
+task outputfield create name=AAILookupTask fieldName=requestID schemaName=UUIDType
+task outputfield create name=AAILookupTask fieldName=vnfID     schemaName=UUIDType
 
-task contextref create name=AAILookupRequestTask albumName=VCPEClosedLoopStatusAlbum
-task contextref create name=AAILookupRequestTask albumName=ControlLoopExecutionIDAlbum
+task contextref create name=AAILookupTask albumName=VCPEClosedLoopStatusAlbum
 
-task logic create name=AAILookupRequestTask logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/AAILookupRequestTask.js"
-LE
-
-task create name=AAILookupResponseTask
-
-task inputfield create name=AAILookupResponseTask fieldName=AAINamedQueryResponse schemaName=AAIServiceNamedQueryResponseType
-
-task outputfield create name=AAILookupResponseTask fieldName=requestID schemaName=UUIDType
-task outputfield create name=AAILookupResponseTask fieldName=vnfID     schemaName=UUIDType
-
-task contextref create name=AAILookupResponseTask albumName=VCPEClosedLoopStatusAlbum
-task contextref create name=AAILookupResponseTask albumName=ControlLoopExecutionIDAlbum
-
-task logic create name=AAILookupResponseTask logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/AAILookupResponseTask.js"
+task logic create name=AAILookupTask logicFlavour=JAVASCRIPT logic=LS
+#MACROFILE:"src/main/resources/logic/AAILookupTask.js"
 LE
 
 task create name=NoAAILookupTask
@@ -239,7 +216,7 @@ LE
 
 #
 # ReceiveEventPolicy
-# 
+#
 policy create name=ReceiveEventPolicy template=Freestyle firstState=GetVCPEState
 
 policy state create name=ReceiveEventPolicy stateName=AbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
@@ -258,50 +235,19 @@ policy state selecttasklogic create name=ReceiveEventPolicy stateName=OnsetOrAba
 #MACROFILE:"src/main/resources/logic/OnsetOrAbatedStateTSL.js"
 LE
 
-policy state create name=ReceiveEventPolicy stateName=RequestAAIState triggerName=VCPEStateUpdatedEvent defaultTaskName=AAILookupRequestTask
-policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=RequestAAIStateOutput eventName=AAINamedQueryRequestEvent
-policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=AAILookupRequestTask outputType=DIRECT outputName=RequestAAIStateOutput
-policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=DoNotRequestAAIStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
-policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=NoAAILookupTask outputType=DIRECT outputName=DoNotRequestAAIStateOutput
+policy state create name=ReceiveEventPolicy stateName=RequestAAIState triggerName=VCPEStateUpdatedEvent defaultTaskName=AAILookupTask
+policy state output create name=ReceiveEventPolicy stateName=RequestAAIState outputName=RequestAAIStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
+policy state taskref create name=ReceiveEventPolicy stateName=RequestAAIState taskName=AAILookupTask outputType=DIRECT outputName=RequestAAIStateOutput
 
 policy state contextref create name=ReceiveEventPolicy stateName=RequestAAIState albumName=VCPEClosedLoopStatusAlbum
 
-policy state selecttasklogic create name=ReceiveEventPolicy stateName=RequestAAIState logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/ReceiveEventPolicyRequestAAIStateTSL.js"
-LE
-
 policy state create name=ReceiveEventPolicy stateName=GetVCPEState triggerName=ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e defaultTaskName=GetVCPEStateTask
 policy state output create name=ReceiveEventPolicy stateName=GetVCPEState outputName=GetVCPEStateOutput eventName=VCPEStateUpdatedEvent nextState=RequestAAIState
 policy state taskref create name=ReceiveEventPolicy stateName=GetVCPEState taskName=GetVCPEStateTask outputType=DIRECT outputName=GetVCPEStateOutput
 
 #
-# AAIResponsePolicy
-# 
-policy create name=AAIResponsePolicy template=Freestyle firstState=AAIResponseState
-
-policy state create name=AAIResponsePolicy stateName=AbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
-policy state output create name=AAIResponsePolicy stateName=AbatedState outputName=AbatedOutput eventName=ControlLoopLogEvent
-policy state taskref create name=AAIResponsePolicy stateName=AbatedState taskName=ControlLoopLogTask outputType=DIRECT outputName=AbatedOutput
-
-policy state create name=AAIResponsePolicy stateName=OnsetOrAbatedState triggerName=VCPEStateUpdatedEvent defaultTaskName=AbatedTask
-policy state output create name=AAIResponsePolicy stateName=OnsetOrAbatedState outputName=OnsetOutput eventName=GuardRequestEvent
-policy state taskref create name=AAIResponsePolicy stateName=OnsetOrAbatedState taskName=GuardRequestTask outputType=DIRECT outputName=OnsetOutput
-policy state output create name=AAIResponsePolicy stateName=OnsetOrAbatedState outputName=AbatedOutput eventName=VCPEStateUpdatedEvent nextState=AbatedState
-policy state taskref create name=AAIResponsePolicy stateName=OnsetOrAbatedState taskName=AbatedTask outputType=DIRECT outputName=AbatedOutput
-
-policy state contextref create name=AAIResponsePolicy stateName=OnsetOrAbatedState albumName=VCPEClosedLoopStatusAlbum
-
-policy state selecttasklogic create name=AAIResponsePolicy stateName=OnsetOrAbatedState logicFlavour=JAVASCRIPT logic=LS
-#MACROFILE:"src/main/resources/logic/OnsetOrAbatedStateTSL.js"
-LE
-
-policy state create name=AAIResponsePolicy stateName=AAIResponseState triggerName=AAINamedQueryResponseEvent defaultTaskName=AAILookupResponseTask
-policy state output create name=AAIResponsePolicy stateName=AAIResponseState outputName=AAIResponseStateOutput eventName=VCPEStateUpdatedEvent nextState=OnsetOrAbatedState
-policy state taskref create name=AAIResponsePolicy stateName=AAIResponseState taskName=AAILookupResponseTask outputType=DIRECT outputName=AAIResponseStateOutput
-
-#
 # RestartAPPCRequestPolicy
-# 
+#
 policy create name=RestartAPPCRequestPolicy template=Freestyle firstState=PolicyGuardResponseState
 
 policy state create name=RestartAPPCRequestPolicy stateName=DeniedState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
@@ -326,7 +272,7 @@ LE
 
 #
 # RestartAPPCResponsePolicy
-# 
+#
 policy create name=RestartAPPCResponsePolicy template=Freestyle firstState=RestartAPPCResponseState
 
 policy state create name=RestartAPPCResponsePolicy stateName=ResponseLogState triggerName=VCPEStateUpdatedEvent defaultTaskName=ControlLoopLogTask
diff --git a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
index cc83c5219..b02287d2a 100644
--- a/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
+++ b/examples/examples-onap-vcpe/src/main/resources/schemas/VCPEClosedLoopStatusType.avsc
@@ -44,6 +44,18 @@
                     {
                         "name": "genericVnfVnfId",
                         "type": "string"
+                    },
+                    {
+                        "name": "vserverIsClosedLoopDisabled",
+                        "type": "string"
+                    },
+                    {
+                        "name": "vserverName",
+                        "type": "string"
+                    },
+                    {
+                        "name": "vserverProvStatus",
+                        "type": "string"
                     }
                 ]
             }