From 296786770ef898b573ad425e12c50e737f5d9a62 Mon Sep 17 00:00:00 2001
From: "Mcblain, Thomas" <tom.mcblain@att.com>
Date: Fri, 31 May 2019 11:52:36 -0400
Subject: Handle multiple host routes correctly for networks

unit test for the method that creates subnets
Remove project name from junit test data
Handle multiple host routes correctly for networks

Change-Id: I537b9bbb68c11901c06ed2366591cedeb3b29acd
Issue-ID: SO-1961
Signed-off-by: Benjamin, Max (mb388a) <mb388a@us.att.com>
---
 .../client/adapter/network/mapper/NetworkAdapterObjectMapper.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'bpmn/so-bpmn-tasks/src/main')

diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
index 4fee1f909b..173e776af9 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/adapter/network/mapper/NetworkAdapterObjectMapper.java
@@ -34,7 +34,6 @@ import org.onap.so.adapters.nwrest.ContrailNetwork;
 import org.onap.so.adapters.nwrest.CreateNetworkRequest;
 import org.onap.so.adapters.nwrest.CreateNetworkResponse;
 import org.onap.so.adapters.nwrest.DeleteNetworkRequest;
-import org.onap.so.adapters.nwrest.NetworkTechnology;
 import org.onap.so.adapters.nwrest.ProviderVlanNetwork;
 import org.onap.so.adapters.nwrest.RollbackNetworkRequest;
 import org.onap.so.adapters.nwrest.UpdateNetworkRequest;
@@ -261,7 +260,7 @@ public class NetworkAdapterObjectMapper {
      * @param L3Network
      * @return List<org.onap.so.openstack.beans.Subnet>
      */
-    private List<Subnet> buildOpenstackSubnetList(L3Network l3Network) {
+    protected List<Subnet> buildOpenstackSubnetList(L3Network l3Network) {
 
         List<org.onap.so.bpmn.servicedecomposition.bbobjects.Subnet> subnets = l3Network.getSubnets();
         List<org.onap.so.openstack.beans.Subnet> subnetList = new ArrayList<org.onap.so.openstack.beans.Subnet>();
@@ -292,9 +291,10 @@ public class NetworkAdapterObjectMapper {
                         .setCidr(subnet.getNetworkStartAddress().concat(FORWARD_SLASH).concat(subnet.getCidrMask()));
             List<org.onap.so.bpmn.servicedecomposition.bbobjects.HostRoute> hostRouteList = subnet.getHostRoutes();
             List<org.onap.so.openstack.beans.HostRoute> openstackHostRouteList = new ArrayList<>();
-            org.onap.so.openstack.beans.HostRoute openstackHostRoute = new org.onap.so.openstack.beans.HostRoute();
+            org.onap.so.openstack.beans.HostRoute openstackHostRoute = null;
             // TODO only 2 fields available on openstack object. Confirm it is sufficient or add as needed
             for (org.onap.so.bpmn.servicedecomposition.bbobjects.HostRoute hostRoute : hostRouteList) {
+                openstackHostRoute = new org.onap.so.openstack.beans.HostRoute();
                 openstackHostRoute.setNextHop(hostRoute.getNextHop());
                 openstackHostRoute.setPrefix(hostRoute.getRoutePrefix());
                 // add host route to the list
-- 
cgit 1.2.3-korg