1 files changed, 8 insertions, 0 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
index cebdc1e9a..26a82fe57 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager.java
@@ -145,6 +145,14 @@ public class ControlLoopOperationManager implements Serializable {
                     }
                     else if (this.onset.target.equalsIgnoreCase("generic-vnf.vnf-name")) {
                         /*
+                         * If the onset is enriched with the vnf-id,
+                         * we don't need an A&AI response
+                         */
+                        if (virtualOnset.AAI.containsKey("generic-vnf.vnf-id")) {
+                            return virtualOnset.AAI.get("generic-vnf.vnf-id");
+                        }
+                        
+                        /*
                          * If the vnf-name was retrieved from the onset then the vnf-id
                          * must be obtained from the event manager's A&AI GET query
                          */