Prod fixes August 21st

changes required for unit tests to pass again
Changes sniro homing BB license demand to be a named array per sniro
defect.
boolean checks must now account for null
fixed compilation issues in code
updated tests and removed primatives from bbobjects
upgraded to A&AI dependency with Boolean

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

4 files changed, 9 insertions, 9 deletions

diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
index c3b0048e07..0355006d15 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/aai/mapper/AAIObjectMapperTest.java
@@ -63,7 +63,7 @@ import org.onap.so.db.catalog.beans.OrchestrationStatus;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectWriter;
 
-public class AAIObjectMapperTest{
+public class AAIObjectMapperTest {
 	private AAIObjectMapper aaiObjectMapper = new AAIObjectMapper();
 	private final static String JSON_FILE_LOCATION = "src/test/resources/__files/BuildingBlocks/";
 
@@ -343,7 +343,7 @@ public class AAIObjectMapperTest{
 		l3Network.setContrailNetworkFqdn("contrailNetworkFqdn");
 		l3Network.setIsBoundToVpn(false);
 		l3Network.setIsCascaded(false);
-		l3Network.setIsExternalNetwork(false);
+		l3Network.setIsSharedNetwork(false);
 		l3Network.setHeatStackId("heatStackId");
 		l3Network.setOperationalStatus("operationalStatus");
 		l3Network.setPhysicalNetworkName("physicalNetworkName");
@@ -429,7 +429,7 @@ public class AAIObjectMapperTest{
 		l3Network.setPhysicalNetworkName("physicalNetwork_name");
 		l3Network.setIsProviderNetwork(true);
 		l3Network.setIsSharedNetwork(false);
-		l3Network.setIsExternalNetwork(false);
+		l3Network.setIsExternalNetwork(true);
 		l3Network.setSelflink("self_link");
 		l3Network.setOperationalStatus("operationalStatus");
 
@@ -562,7 +562,7 @@ public class AAIObjectMapperTest{
 		AAIObjectMapper aaiObjectMapper = new AAIObjectMapper();
 		org.onap.aai.domain.yang.CtagAssignments v12CtagAssingments = aaiObjectMapper.mapToAAICtagAssignmentList(ctagAssignments);
 
-		assertEquals(ctagAssignments.get(0).getVlanIdInner(), v12CtagAssingments.getCtagAssignment().get(0).getVlanIdInner());
+		assertEquals(ctagAssignments.get(0).getVlanIdInner().longValue(), v12CtagAssingments.getCtagAssignment().get(0).getVlanIdInner());
 
 		String jsonToCompare = new String(Files.readAllBytes(Paths.get(JSON_FILE_LOCATION + "aaiCtagAssingmentsMapped_to_aai.json")));
 		ObjectMapper omapper = new ObjectMapper();
diff --git a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
index 96fbe7ffb7..fddba98f4c 100644
--- a/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
+++ b/bpmn/so-bpmn-tasks/src/test/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapperTest.java
@@ -187,6 +187,7 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup{
 		
 		Subnet actualSubnet = new Subnet();
 		actualSubnet.setSubnetId("subnetId");
+		actualSubnet.setDhcpEnabled(false);
 		actualSubnet.setIpVersion("4");
 		
 		RouteTarget routeTarget = new RouteTarget();
@@ -231,7 +232,7 @@ public class NetworkAdapterObjectMapperTest extends TestDataSetup{
 		expectedUpdateNetworkRequest.setNetworkParams(userInput);
 		expectedUpdateNetworkRequest.setMsoRequest(msoRequest);
 		expectedUpdateNetworkRequest.setSkipAAI(true);
-		expectedUpdateNetworkRequest.setBackout(!Boolean.valueOf(orchestrationContext.getIsRollbackEnabled()));
+		expectedUpdateNetworkRequest.setBackout(!Boolean.TRUE.equals(orchestrationContext.getIsRollbackEnabled()));
 		expectedUpdateNetworkRequest.setMessageId("messageId");
 		expectedUpdateNetworkRequest.setNotificationUrl("http://localhost:28080/mso/WorkflowMesssage/NetworkAResponse/messageId");
 
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped.json
index 81362e3dca..d6c08fbaee 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped.json
@@ -14,7 +14,6 @@
   "physicalNetworkName": "physicalNetworkName",
   "isProviderNetwork": false,
   "isSharedNetwork": false,
-  "isExternalNetwork": false,
   "selflink": "selflink",
   "operationalStatus": "operationalStatus"
 }
\ No newline at end of file
diff --git a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped_to_aai.json b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped_to_aai.json
index 7a30ade095..bca5f94294 100644
--- a/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped_to_aai.json
+++ b/bpmn/so-bpmn-tasks/src/test/resources/__files/BuildingBlocks/aaiL3NetworkMapped_to_aai.json
@@ -5,7 +5,7 @@
   "networkRole" : "dmz_direct",
   "networkTechnology" : "contrail",
   "neutronNetworkId" : null,
-  "isBoundToVpn" : false,
+  "isBoundToVpn" : true,
   "serviceId" : "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb",
   "networkRoleInstance" : 1,
   "resourceVersion" : null,
@@ -20,9 +20,9 @@
   "widgetModelId" : "widgetModel_id",
   "widgetModelVersion" : "widgetModel_version",
   "physicalNetworkName" : "physicalNetwork_name",
-  "isProviderNetwork" : false,
+  "isProviderNetwork" : true,
   "isSharedNetwork" : false,
-  "isExternalNetwork" : false,
+  "isExternalNetwork" : true,
   "selflink" : "self_link",
   "operationalStatus" : "operationalStatus",
   "subnets" : {