vrfvalidation exceptions not getting logged

Remove unused imports in VrfValidation class
Check for null AAI network and vpn-bindings. Do not catch exceptions in
WorkflowAction.traverseVrfCondifuration. Propagate exceptions and let
calling method selectExecutionList() handle exceptions.

Change-Id: I26adfdb351cee6dc111f496901558340b8152a2a
Issue-ID: SO-1988
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>

2 files changed, 24 insertions, 2 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java
index 526ebe8581..3a8c318cc2 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/VrfValidationTest.java
@@ -96,7 +96,29 @@ public class VrfValidationTest extends BaseTaskTest {
         org.onap.aai.domain.yang.VpnBinding aaiVpnBinding = new org.onap.aai.domain.yang.VpnBinding();
         aaiVpnBinding.setVpnType("SERVICE-INFRASTRUCTURE");
         ExpectedException.none();
-        vrfValidation.aaiVpnBindingValidation(aaiVpnBinding);
+        vrfValidation.aaiVpnBindingValidation("test-vpn", aaiVpnBinding);
+    }
+
+    @Test
+    public void testAaiVpnBindingValidationVpnBindingIsNull() throws VrfBondingServiceException {
+        exceptionRule.expect(VrfBondingServiceException.class);
+        exceptionRule.expectMessage("The infrastructure vpn test-vpn does not exist in A&AI.");
+        vrfValidation.aaiVpnBindingValidation("test-vpn", null);
+    }
+
+    @Test
+    public void testAaiNetworkValidation() throws VrfBondingServiceException {
+        org.onap.aai.domain.yang.L3Network aaiLocalNetwork = new org.onap.aai.domain.yang.L3Network();
+        aaiLocalNetwork.setNetworkId("test-network");
+        ExpectedException.none();
+        vrfValidation.aaiNetworkValidation("test-network", aaiLocalNetwork);
+    }
+
+    @Test
+    public void testAaiNetworkValidationNetworkIsNull() throws VrfBondingServiceException {
+        exceptionRule.expect(VrfBondingServiceException.class);
+        exceptionRule.expectMessage("The local network test-network does not exist in A&AI.");
+        vrfValidation.aaiNetworkValidation("test-network", null);
     }
 
     @Test
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
index 10d36f9527..ece3682d65 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowActionTest.java
@@ -1552,7 +1552,7 @@ public class WorkflowActionTest extends BaseTaskTest {
 
     @Ignore
     @Test
-    public void traverseCatalogDbServiceMultipleNetworkTest() throws IOException {
+    public void traverseCatalogDbServiceMultipleNetworkTest() throws IOException, VrfBondingServiceException {
         execution.setVariable("testProcessKey", "testProcessKeyValue");
         Service service = new Service();
         List<NetworkResourceCustomization> networkCustomizations = new ArrayList<>();