From 08c54826db08f104359e36a67e4a3affb477a245 Mon Sep 17 00:00:00 2001 From: daniel Date: Mon, 30 Oct 2017 07:58:34 -0500 Subject: Fix Final Failure on AAI Queries The drools engine will now send final failure notifications if there is an error returned from A&AI queries instead of rejected notifications. Issue-Id: POLICY-364 Change-Id: Ie9c22686d859c633bad47d223726957cc9599f7c Signed-off-by: Daniel Cruz --- .../eventmanager/ControlLoopEventManager.java | 48 ++++++++++++---------- .../eventmanager/ControlLoopEventManagerTest.java | 20 ++++++++- .../ControlLoopOperationManagerTest.java | 20 +++++++++ .../onap/policy/simulators/AaiSimulatorJaxRs.java | 2 +- 4 files changed, 66 insertions(+), 24 deletions(-) (limited to 'controlloop/common') diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java index d320b75ee..b1674206b 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java @@ -149,7 +149,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable { // Syntax check the event // checkEventSyntax(event); - checkEventAAISyntax(event); + // // At this point we are good to go with this event // @@ -184,7 +184,6 @@ public class ControlLoopEventManager implements LockCallback, Serializable { // Syntax check the event // checkEventSyntax(event); - checkEventAAISyntax(event); // // Check the YAML @@ -437,7 +436,7 @@ public class ControlLoopEventManager implements LockCallback, Serializable { ; } - public NEW_EVENT_STATUS onNewEvent(VirtualControlLoopEvent event) { + public NEW_EVENT_STATUS onNewEvent(VirtualControlLoopEvent event) throws AAIException { try { this.checkEventSyntax(event); if (event.closedLoopEventStatus == ControlLoopEventStatus.ONSET) { @@ -445,6 +444,11 @@ public class ControlLoopEventManager implements LockCallback, Serializable { // Check if this is our original ONSET // if (event.equals(this.onset)) { + // + // Query A&AI if needed + // + queryAai(event); + // // DO NOT retract it // @@ -546,58 +550,58 @@ public class ControlLoopEventManager implements LockCallback, Serializable { ! "generic-vnf.vnf-name".equalsIgnoreCase(event.target) ) { throw new ControlLoopException("target field invalid - expecting VM_NAME or VNF_NAME"); } + if (event.AAI == null) { + throw new ControlLoopException("AAI is null"); + } + if (event.AAI.get("generic-vnf.vnf-id") == null && event.AAI.get("vserver.vserver-name") == null && + event.AAI.get("generic-vnf.vnf-name") == null) { + throw new ControlLoopException("generic-vnf.vnf-id or generic-vnf.vnf-name or vserver.vserver-name information missing"); + } } - public void checkEventAAISyntax(VirtualControlLoopEvent event) throws ControlLoopException { - if (event.AAI == null) { - throw new ControlLoopException("AAI is null"); - } - if (event.AAI.get("generic-vnf.vnf-id") == null && event.AAI.get("vserver.vserver-name") == null && - event.AAI.get("generic-vnf.vnf-name") == null) { - throw new ControlLoopException("generic-vnf.vnf-id or generic-vnf.vnf-name or vserver.vserver-name information missing"); - } + public void queryAai(VirtualControlLoopEvent event) throws AAIException { if (event.AAI.get("vserver.is-closed-loop-disabled") == null) { try { if (event.AAI.get("generic-vnf.vnf-id") != null) { vnfResponse = getAAIVnfInfo(event); if (vnfResponse == null) { - throw new ControlLoopException("AAI Response is null (query by vnf-id)"); + throw new AAIException("AAI Response is null (query by vnf-id)"); } if (vnfResponse.requestError != null) { - throw new ControlLoopException("AAI Responded with a request error (query by vnf-id)"); + throw new AAIException("AAI Responded with a request error (query by vnf-id)"); } if (isClosedLoopDisabled(vnfResponse) == true) { - throw new ControlLoopException("is-closed-loop-disabled is set to true"); + throw new AAIException("is-closed-loop-disabled is set to true"); } } else if (event.AAI.get("generic-vnf.vnf-name") != null) { vnfResponse = getAAIVnfInfo(event); if (vnfResponse == null) { - throw new ControlLoopException("AAI Response is null (query by vnf-name)"); + throw new AAIException("AAI Response is null (query by vnf-name)"); } if (vnfResponse.requestError != null) { - throw new ControlLoopException("AAI Responded with a request error (query by vnf-name)"); + throw new AAIException("AAI Responded with a request error (query by vnf-name)"); } if (isClosedLoopDisabled(vnfResponse) == true) { - throw new ControlLoopException("is-closed-loop-disabled is set to true"); + throw new AAIException("is-closed-loop-disabled is set to true"); } } else if (event.AAI.get("vserver.vserver-name") != null) { vserverResponse = getAAIVserverInfo(event); if (vserverResponse == null) { - throw new ControlLoopException("AAI Response is null (query by vserver-name)"); + throw new AAIException("AAI Response is null (query by vserver-name)"); } if (vserverResponse.requestError != null) { - throw new ControlLoopException("AAI responded with a request error (query by vserver-name)"); + throw new AAIException("AAI responded with a request error (query by vserver-name)"); } if (isClosedLoopDisabled(vserverResponse) == true) { - throw new ControlLoopException("is-closed-loop-disabled is set to true"); + throw new AAIException("is-closed-loop-disabled is set to true"); } } } catch (Exception e) { logger.error("Exception from getAAIInfo: ", e); - throw new ControlLoopException("Exception from getAAIInfo: " + e.toString()); + throw new AAIException("Exception from getAAIInfo: " + e.toString()); } } else if (isClosedLoopDisabled(event)) { - throw new ControlLoopException("is-closed-loop-disabled is set to true"); + throw new AAIException("is-closed-loop-disabled is set to true"); } } diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java index 223361505..be0eb2bc3 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java @@ -40,6 +40,7 @@ import org.onap.policy.aai.Relationship; import org.onap.policy.aai.RelationshipData; import org.onap.policy.aai.RelationshipDataItem; import org.onap.policy.aai.RelationshipList; +import org.onap.policy.aai.util.AAIException; import org.onap.policy.controlloop.ControlLoopEventStatus; import org.onap.policy.controlloop.ControlLoopException; import org.onap.policy.controlloop.ControlLoopNotificationType; @@ -227,6 +228,17 @@ public class ControlLoopEventManagerTest { assertNotNull(notification); assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification); + + ControlLoopEventManager.NEW_EVENT_STATUS status = null; + try { + status = manager.onNewEvent(event); + } catch (AAIException e) { + logger.warn(e.toString()); + fail("A&AI Query Failed"); + } + assertNotNull(status); + assertEquals(ControlLoopEventManager.NEW_EVENT_STATUS.FIRST_ONSET, status); + AAIGETVnfResponse response = manager.getVnfResponse(); assertNotNull(response); assertNull(manager.getVserverResponse()); @@ -240,7 +252,13 @@ public class ControlLoopEventManagerTest { event2.AAI = new HashMap<>(); event2.AAI.put("generic-vnf.vnf-name", "onsetTwo"); - ControlLoopEventManager.NEW_EVENT_STATUS status = manager.onNewEvent(event2); + + try { + status = manager.onNewEvent(event2); + } catch (AAIException e) { + logger.warn(e.toString()); + fail("A&AI Query Failed"); + } assertEquals(ControlLoopEventManager.NEW_EVENT_STATUS.SUBSEQUENT_ONSET, status); AAIGETVnfResponse response2 = manager.getVnfResponse(); assertNotNull(response2); diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java index e7a31190e..1714d3e26 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManagerTest.java @@ -107,6 +107,16 @@ public class ControlLoopOperationManagerTest { assertNotNull(notification); assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification); + ControlLoopEventManager.NEW_EVENT_STATUS status = null; + try { + status = eventManager.onNewEvent(onset); + } catch (AAIException e) { + logger.warn(e.toString()); + fail("A&AI Query Failed"); + } + assertNotNull(status); + assertEquals(ControlLoopEventManager.NEW_EVENT_STATUS.FIRST_ONSET, status); + ControlLoopOperationManager manager = new ControlLoopOperationManager(onset, processor.getCurrentPolicy(), eventManager); logger.debug("{}",manager); // @@ -226,6 +236,16 @@ public class ControlLoopOperationManagerTest { assertNotNull(notification); assertEquals(ControlLoopNotificationType.ACTIVE, notification.notification); + ControlLoopEventManager.NEW_EVENT_STATUS status = null; + try { + status = eventManager.onNewEvent(onset); + } catch (AAIException e) { + logger.warn(e.toString()); + fail("A&AI Query Failed"); + } + assertNotNull(status); + assertEquals(ControlLoopEventManager.NEW_EVENT_STATUS.FIRST_ONSET, status); + ControlLoopOperationManager manager = new ControlLoopOperationManager(onset, processor.getCurrentPolicy(), eventManager); // // diff --git a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java index 1a0eb311f..8ecc11466 100644 --- a/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java +++ b/controlloop/common/simulators/src/main/java/org/onap/policy/simulators/AaiSimulatorJaxRs.java @@ -109,7 +109,7 @@ public class AaiSimulatorJaxRs { @Path("/v11/nodes/vservers") @Consumes(MediaType.APPLICATION_JSON) @Produces("application/json") - public String getByVserverName (@QueryParam("vserverName") String vserverName) + public String getByVserverName (@QueryParam("vserver-name") String vserverName) { if ("getFail".equals(vserverName)) { return "{\"requestError\":{\"serviceException\":{\"messageId\":\"SVC3001\",\"text\":\"Resource not found for %1 using id %2 (msg=%3) (ec=%4)\",\"variables\":[\"GET\",\"nodes/vservers\",\"Node Not Found:No Node of type generic-vnf found at nodes/vservers\",\"ERR.5.4.6114\"]}}}"; -- cgit 1.2.3-korg