X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=openstack%2Fnet-virt%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fopenstack%2Fnetvirt%2Fimpl%2FNeutronL3AdapterTest.java;h=c0d6a019f396f60d42fe443132dbb5bc70b32eac;hb=d244a610b2521c2d98c20dd3d577665e6733967b;hp=521c7c6a23d40a95fe7e81660326af9d259bfdb6;hpb=c29ee6745f8152632a4dfd3b7fd6b716b5b82c58;p=ovsdb.git diff --git a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java index 521c7c6a2..c0d6a019f 100644 --- a/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java +++ b/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java @@ -135,11 +135,11 @@ public class NeutronL3AdapterTest { @Test public void testHandleNeutronPortEvent() throws Exception { - Map subnetIdToRouterInterfaceCache = new HashMap(); + Map subnetIdToRouterInterfaceCache = new HashMap<>(); // Mock variables Neutron_IPs neutronIP = mock(Neutron_IPs.class); when(neutronIP.getSubnetUUID()).thenReturn(UUID); - List list_neutronIP = new ArrayList(); + List list_neutronIP = new ArrayList<>(); list_neutronIP.add(neutronIP); NeutronPort neutronPort = mock(NeutronPort.class); when(neutronPort.getDeviceOwner()).thenReturn(OWNER_ROUTER_INTERFACE); @@ -182,7 +182,7 @@ public class NeutronL3AdapterTest { Neutron_IPs neutronIP = mock(Neutron_IPs.class); when(neutronIP.getSubnetUUID()).thenReturn(UUID); NeutronPort neutronPort = mock(NeutronPort.class); - List list_neutronIP = new ArrayList(); + List list_neutronIP = new ArrayList<>(); list_neutronIP.add(neutronIP); when(neutronPort.getFixedIPs()).thenReturn(list_neutronIP); List list_neutronPort = new ArrayList<>(); @@ -280,7 +280,7 @@ public class NeutronL3AdapterTest { // Suppress the called to these functions MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programOutboundIpRewriteStage1", floatingIpClass, Action.class)); - + PowerMockito.doReturn(floatIpDataMapCache.values()).when(neutronL3Adapter, "getAllFloatingIPsWithMetadata"); Whitebox.invokeMethod(neutronL3Adapter, "flushExistingIpRewrite"); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programOutboundIpRewriteStage1", any(floatingIpClass), eq(Action.DELETE)); } @@ -297,6 +297,7 @@ public class NeutronL3AdapterTest { // Suppress the called to these functions MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programOutboundIpRewriteStage1", floatingIpClass, Action.class)); + PowerMockito.doReturn(floatIpDataMapCache.values()).when(neutronL3Adapter, "getAllFloatingIPsWithMetadata"); Whitebox.invokeMethod(neutronL3Adapter, "rebuildExistingIpRewrite"); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programOutboundIpRewriteStage1", any(floatingIpClass), eq(Action.ADD)); } @@ -304,8 +305,8 @@ public class NeutronL3AdapterTest { @SuppressWarnings({ "unchecked", "rawtypes" }) @Test public void testProgramFlowsForFloatingIPArpAdd() throws Exception { - Map neutronPortToDpIdCache = new HashMap(); - Map networkIdToRouterMacCache = new HashMap(); + Map neutronPortToDpIdCache = new HashMap<>(); + Map networkIdToRouterMacCache = new HashMap<>(); Map floatIpDataMapCache = new HashMap(); NeutronFloatingIP neutronFloatingIP = mock(NeutronFloatingIP.class); @@ -327,7 +328,7 @@ public class NeutronL3AdapterTest { INeutronPortCRUD neutronPortCache = mock(INeutronPortCRUD.class); when(neutronPortCache.getPort(anyString())).thenReturn(neutronPort); PowerMockito.doReturn(neutronPort).when(neutronL3Adapter, "findNeutronPortForFloatingIp", anyString()); - PowerMockito.doReturn(Long.valueOf(15)).when(neutronL3Adapter, "findOFPortForExtPatch", anyLong()); + PowerMockito.doReturn(15L).when(neutronL3Adapter, "findOFPortForExtPatch", anyLong()); MemberModifier.field(NeutronL3Adapter.class, "floatIpDataMapCache").set(neutronL3Adapter , floatIpDataMapCache); MemberModifier.field(NeutronL3Adapter.class, "neutronPortToDpIdCache").set(neutronL3Adapter , neutronPortToDpIdCache); MemberModifier.field(NeutronL3Adapter.class, "neutronPortCache").set(neutronL3Adapter , neutronPortCache); @@ -380,7 +381,7 @@ public class NeutronL3AdapterTest { ConfigurationService configurationService = mock(ConfigurationService.class); when(configurationService.getPatchPortName(any(Pair.class))).thenReturn(PORT_INT); MemberModifier.field(NeutronL3Adapter.class, "configurationService").set(neutronL3Adapter , configurationService); - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); nodes.add(mock(Node.class)); NodeCacheManager nodeCacheManager = mock(NodeCacheManager.class); when(nodeCacheManager.getBridgeNodes()).thenReturn(nodes); @@ -403,7 +404,7 @@ public class NeutronL3AdapterTest { @Test public void testHandleInterfaceEvent() throws Exception { - Map> neutronPortToDpIdCache = new HashMap>(); + Map> neutronPortToDpIdCache = new HashMap<>(); // init instance variables TenantNetworkManager tenantNetworkManager = mock(TenantNetworkManager.class); MemberModifier.field(NeutronL3Adapter.class, "tenantNetworkManager").set(neutronL3Adapter , tenantNetworkManager); @@ -429,7 +430,7 @@ public class NeutronL3AdapterTest { MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "handleInterfaceEventAdd", String.class, Long.class, Uuid.class)); MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "handleInterfaceEventDelete", OvsdbTerminationPointAugmentation.class, Long.class)); - PowerMockito.when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)).thenReturn(Long.valueOf(45)); + PowerMockito.when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)).thenReturn(45L); Mockito.doNothing().when(neutronL3Adapter).handleNeutronPortEvent(any(NeutronPort.class), any(Action.class)); neutronL3Adapter.handleInterfaceEvent(node, intf, mock(NeutronNetwork.class), Action.ADD); @@ -444,7 +445,7 @@ public class NeutronL3AdapterTest { @Test public void testHandleInterfaceEventAdd() throws Exception { - Map> neutronPortToDpIdCache = new HashMap>(); + Map> neutronPortToDpIdCache = new HashMap<>(); // init instance variables MemberModifier.field(NeutronL3Adapter.class, "neutronPortToDpIdCache").set(neutronL3Adapter , neutronPortToDpIdCache); int temp = neutronPortToDpIdCache.size(); @@ -457,7 +458,7 @@ public class NeutronL3AdapterTest { @SuppressWarnings("unchecked") @Test public void testHandleInterfaceEventDelete() throws Exception { - Map> neutronPortToDpIdCache = new HashMap>(); + Map> neutronPortToDpIdCache = new HashMap<>(); OvsdbTerminationPointAugmentation intf = mock(OvsdbTerminationPointAugmentation.class); Uuid uuid = mock(Uuid.class); when(intf.getInterfaceUuid()).thenReturn(uuid ); @@ -476,11 +477,11 @@ public class NeutronL3AdapterTest { @Test public void testUpdateL3ForNeutronPort() throws Exception { - Map networkIdToRouterMacCache = new HashMap(); + Map networkIdToRouterMacCache = new HashMap<>(); Neutron_IPs neutronIp = mock(Neutron_IPs.class); when(neutronIp.getIpAddress()).thenReturn(FIXED_IP_ADDRESS); - List neutronIps = new ArrayList(); + List neutronIps = new ArrayList<>(); neutronIps.add(neutronIp); NeutronPort neutronPort = mock(NeutronPort.class); when(neutronPort.getNetworkUUID()).thenReturn(UUID); @@ -488,9 +489,9 @@ public class NeutronL3AdapterTest { when(neutronPort.getFixedIPs()).thenReturn(neutronIps); NeutronNetwork neutronNetwork = mock(NeutronNetwork.class); when(neutronNetwork.getProviderSegmentationID()).thenReturn(ID); - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); nodes.add(mock(Node.class)); - PowerMockito.doReturn(Long.valueOf(15)).when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)); + PowerMockito.doReturn(15L).when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)); // init instance variables networkIdToRouterMacCache .put(UUID, MAC_ADDRESS); @@ -519,10 +520,8 @@ public class NeutronL3AdapterTest { PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programStaticArpStage1", anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE)); } - // either add or remove item in l3ForwardingCache @Test public void testProgramL3ForwardingStage1() throws Exception { - Set l3ForwardingCache = new HashSet(); NodeId nodeId = mock(NodeId.class); when(nodeId.getValue()).thenReturn(ID); @@ -533,22 +532,16 @@ public class NeutronL3AdapterTest { MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programL3ForwardingStage2", Node.class, Long.class, String.class, String.class, String.class, Action.class)); // init instance variables - MemberModifier.field(NeutronL3Adapter.class, "l3ForwardingCache").set(neutronL3Adapter , l3ForwardingCache ); PowerMockito.when(neutronL3Adapter, "programL3ForwardingStage2", any(Node.class), anyLong(), anyString(), anyString(), anyString(), eq(Action.ADD)).thenReturn(new Status(StatusCode.SUCCESS)); PowerMockito.when(neutronL3Adapter, "programL3ForwardingStage2", any(Node.class), anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE)).thenReturn(new Status(StatusCode.SUCCESS)); - int temp = l3ForwardingCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programL3ForwardingStage1", node, Long.valueOf(45), SEG_ID, MAC_ADDRESS, IP, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programL3ForwardingStage2", any(Node.class), anyLong(), anyString(), anyString(), anyString(), eq(Action.ADD)); - assertEquals("Error, did not add the value", temp, l3ForwardingCache.size()-1); - l3ForwardingCache.add(node.getNodeId().getValue() + ":" + SEG_ID + ":" + IP); - temp = l3ForwardingCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programL3ForwardingStage1", node, Long.valueOf(45), SEG_ID, MAC_ADDRESS, IP, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programL3ForwardingStage2", any(Node.class), anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE)); - assertEquals("Error, did not delete the value", temp, l3ForwardingCache.size()+1); } @Test @@ -569,16 +562,16 @@ public class NeutronL3AdapterTest { @Test public void testProgramFlowsForNeutronRouterInterface() throws Exception { - Map networkIdToRouterMacCache = new HashMap(); - Map> networkIdToRouterIpListCache = new HashMap>(); - Map subnetIdToRouterInterfaceCache = new HashMap(); + Map networkIdToRouterMacCache = new HashMap<>(); + Map> networkIdToRouterIpListCache = new HashMap<>(); + Map subnetIdToRouterInterfaceCache = new HashMap<>(); NeutronRouter_Interface intf = mock(NeutronRouter_Interface.class); when(intf.getPortUUID()).thenReturn(UUID); when(intf.getSubnetUUID()).thenReturn(UUID); Neutron_IPs neutronIp = mock(Neutron_IPs.class); when(neutronIp.getIpAddress()).thenReturn(FIXED_IP_ADDRESS); - List ips = new ArrayList(); + List ips = new ArrayList<>(); ips.add(neutronIp); NeutronPort neutronPort = mock(NeutronPort.class); when(neutronPort.getMacAddress()).thenReturn(MAC_ADDRESS); @@ -595,7 +588,7 @@ public class NeutronL3AdapterTest { NeutronRouter neutronRouter = mock(NeutronRouter.class); Node node = mock(Node.class); - List nodes = new ArrayList(); + List nodes = new ArrayList<>(); nodes.add(node); MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "getDpidForIntegrationBridge", Node.class)); @@ -621,7 +614,7 @@ public class NeutronL3AdapterTest { MemberModifier.field(NeutronL3Adapter.class, "neutronSubnetCache").set(neutronL3Adapter , neutronSubnetCache); MemberModifier.field(NeutronL3Adapter.class, "neutronNetworkCache").set(neutronL3Adapter , neutronNetworkCache); MemberModifier.field(NeutronL3Adapter.class, "nodeCacheManager").set(neutronL3Adapter , nodeCacheManager); - PowerMockito.when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)).thenReturn(Long.valueOf(45)); + PowerMockito.when(neutronL3Adapter, "getDpidForIntegrationBridge", any(Node.class)).thenReturn(45L); int networkIdToRouterMacCacheSize, networkIdToRouterIpListCacheSize, subnetIdToRouterInterfaceCacheSize; networkIdToRouterMacCacheSize = networkIdToRouterMacCache.size(); @@ -680,7 +673,7 @@ public class NeutronL3AdapterTest { when(neutronNetwork.getProviderSegmentationID()).thenReturn(ID); Neutron_IPs ip = mock(Neutron_IPs.class); when(ip.getIpAddress()).thenReturn(IP); - List ips = new ArrayList(); + List ips = new ArrayList<>(); ips.add(ip); ips.add(ip); ips.add(ip); @@ -715,7 +708,6 @@ public class NeutronL3AdapterTest { @Test public void testProgramRouterInterfaceStage1() throws Exception { - Set routerInterfacesCache = new HashSet(); NodeId nodeId = mock(NodeId.class); when(nodeId.getValue()).thenReturn(ID); @@ -724,24 +716,18 @@ public class NeutronL3AdapterTest { MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programRouterInterfaceStage2", Node.class, Long.class, String.class, String.class, String.class, String.class, int.class, Action.class)); - MemberModifier.field(NeutronL3Adapter.class, "routerInterfacesCache").set(neutronL3Adapter , routerInterfacesCache); PowerMockito.when(neutronL3Adapter, "programRouterInterfaceStage2", any(Node.class), anyLong(), anyString(), anyString(), anyString(), anyString(), anyInt(), any(Action.class)).thenReturn(new Status(StatusCode.SUCCESS)); - int t = routerInterfacesCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programRouterInterfaceStage1", node, Long.valueOf(12), SEG_ID, SEG_ID, MAC_ADDRESS, IP, 4, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programRouterInterfaceStage1", any(Node.class), anyLong(), anyString(), anyString(), anyString(), anyString(), anyInt(), eq(Action.ADD)); - assertEquals("Error, did not add the interface", t, routerInterfacesCache.size() - 1); - t = routerInterfacesCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programRouterInterfaceStage1", node, Long.valueOf(12), SEG_ID, SEG_ID, MAC_ADDRESS, IP, 4, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programRouterInterfaceStage1", any(Node.class), anyLong(), anyString(), anyString(), anyString(), anyString(), anyInt(), eq(Action.DELETE)); - assertEquals("Error, did not delete the interface", t, routerInterfacesCache.size() + 1); } - // either add or remove routerInterfacesCache @Test public void testProgramRouterInterfaceStage2() throws Exception { NodeId nodeId = mock(NodeId.class); @@ -759,28 +745,21 @@ public class NeutronL3AdapterTest { } - //either add or remove staticArpEntryCache @Test public void testProgramStaticArpStage1() throws Exception { - Set staticArpEntryCache = new HashSet(); MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programStaticArpStage2", Long.class, String.class, String.class, String.class, Action.class)); - MemberModifier.field(NeutronL3Adapter.class, "staticArpEntryCache").set(neutronL3Adapter , staticArpEntryCache); PowerMockito.when(neutronL3Adapter, "programStaticArpStage2", anyLong(), anyString(), anyString(), anyString(), any(Action.class)).thenReturn(new Status(StatusCode.SUCCESS)); - int t = staticArpEntryCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programStaticArpStage1", Long.valueOf(12), PORT_INT, MAC_ADDRESS, IP, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programStaticArpStage2", anyLong(), anyString(), anyString(), anyString(), eq(Action.ADD)); - assertEquals("Error, did not add the static arp", t, staticArpEntryCache.size() - 1); - t = staticArpEntryCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programStaticArpStage1", Long.valueOf(12), PORT_INT, MAC_ADDRESS, IP, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programStaticArpStage2", anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE)); - assertEquals("Error, did not delete the static arp", t, staticArpEntryCache.size() + 1); } @Test @@ -794,28 +773,21 @@ public class NeutronL3AdapterTest { assertEquals("Error, this not return the correct status code", new Status(StatusCode.SUCCESS), Whitebox.invokeMethod(neutronL3Adapter, "programStaticArpStage2", Long.valueOf(45), PORT_INT, MAC_ADDRESS, IP, Action.ADD)); } - // either add or remove inboundIpRewriteCache @Test public void testProgramInboundIpRewriteStage1() throws Exception { - Set inboundIpRewriteCache = new HashSet(); MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programInboundIpRewriteStage2", Long.class, Long.class, String.class, String.class, String.class, Action.class)); - MemberModifier.field(NeutronL3Adapter.class, "inboundIpRewriteCache").set(neutronL3Adapter , inboundIpRewriteCache); PowerMockito.when(neutronL3Adapter, "programInboundIpRewriteStage2", anyLong(), anyLong(), anyString(), anyString(), anyString(), any(Action.class)).thenReturn(new Status(StatusCode.SUCCESS)); - int t = inboundIpRewriteCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programInboundIpRewriteStage1", Long.valueOf(12), Long.valueOf(12), PORT_INT, MAC_ADDRESS, IP, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programInboundIpRewriteStage2", anyLong(), anyLong(), anyString(), anyString(), anyString(), eq(Action.ADD)); - assertEquals("Error, did not add the inboundIpRewrite", t, inboundIpRewriteCache.size() - 1); - t = inboundIpRewriteCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programInboundIpRewriteStage1", Long.valueOf(12), Long.valueOf(12),PORT_INT, MAC_ADDRESS, IP, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programInboundIpRewriteStage2", anyLong(), anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE)); - assertEquals("Error, did not delete the inboundIpRewrite", t, inboundIpRewriteCache.size() + 1); } @Test @@ -829,10 +801,8 @@ public class NeutronL3AdapterTest { assertEquals("Error, this not return the correct status code", new Status(StatusCode.SUCCESS), Whitebox.invokeMethod(neutronL3Adapter, "programInboundIpRewriteStage2", Long.valueOf(45), Long.valueOf(45), SEG_ID, MAC_ADDRESS, IP, Action.ADD)); } - // either add or remove outboundIpRewriteExclusionCache @Test public void testProgramIpRewriteExclusionStage1() throws Exception { - Set outboundIpRewriteExclusionCache = new HashSet(); NodeId nodeId = mock(NodeId.class); when(nodeId.getValue()).thenReturn(ID); @@ -841,21 +811,16 @@ public class NeutronL3AdapterTest { MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programIpRewriteExclusionStage2", Node.class, Long.class, String.class, String.class, Action.class)); - MemberModifier.field(NeutronL3Adapter.class, "outboundIpRewriteExclusionCache").set(neutronL3Adapter , outboundIpRewriteExclusionCache); PowerMockito.when(neutronL3Adapter, "programIpRewriteExclusionStage2", any(Node.class), anyLong(), anyString(), anyString(), any(Action.class)).thenReturn(new Status(StatusCode.SUCCESS)); - int t = outboundIpRewriteExclusionCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programIpRewriteExclusionStage1", node, Long.valueOf(12), SEG_ID, CIDR, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programIpRewriteExclusionStage2", any(Node.class), anyLong(), anyString(), anyString(), eq(Action.ADD)); - assertEquals("Error, did not add the outboundIpRewriteExclusion", t, outboundIpRewriteExclusionCache.size() - 1); - t = outboundIpRewriteExclusionCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programIpRewriteExclusionStage1", node, Long.valueOf(12), SEG_ID, CIDR, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programIpRewriteExclusionStage2", any(Node.class), anyLong(), anyString(), anyString(), eq(Action.DELETE)); - assertEquals("Error, did not delete the outboundIpRewriteExclusion", t, outboundIpRewriteExclusionCache.size() + 1); } @Test @@ -868,29 +833,22 @@ public class NeutronL3AdapterTest { assertEquals("Error, this not return the correct status code", new Status(StatusCode.SUCCESS), Whitebox.invokeMethod(neutronL3Adapter, "programIpRewriteExclusionStage2", node, Long.valueOf(45), SEG_ID, CIDR, Action.ADD)); } - // either add or remove outboundIpRewriteCache @SuppressWarnings("unchecked") @Test public void testProgramOutboundIpRewriteStage1() throws Exception{ - Set outboundIpRewriteCache = new HashSet(); MemberModifier.suppress(MemberMatcher.method(NeutronL3Adapter.class, "programOutboundIpRewriteStage2", floatingIpClass, Action.class)); - MemberModifier.field(NeutronL3Adapter.class, "outboundIpRewriteCache").set(neutronL3Adapter , outboundIpRewriteCache); PowerMockito.when(neutronL3Adapter, "programOutboundIpRewriteStage2", any(floatingIpClass), any(Action.class)).thenReturn(new Status(StatusCode.SUCCESS)); - int t = outboundIpRewriteCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programOutboundIpRewriteStage1", floatingIpObject, Action.ADD); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programOutboundIpRewriteStage2", any(floatingIpClass), eq(Action.ADD)); - assertEquals("Error, did not add the outbound ip", t, outboundIpRewriteCache.size() - 1); - t = outboundIpRewriteCache.size(); Whitebox.invokeMethod(neutronL3Adapter, "programOutboundIpRewriteStage1", floatingIpObject, Action.DELETE); PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programOutboundIpRewriteStage2", any(floatingIpClass), eq(Action.DELETE)); - assertEquals("Error, did not delete the outbound ip", t, outboundIpRewriteCache.size() + 1); } /*@Test @@ -919,14 +877,14 @@ public class NeutronL3AdapterTest { PowerMockito.when(southbound.getBridge(any(Node.class), anyString())).thenReturn(mock(OvsdbBridgeAugmentation.class)); PowerMockito.when(configurationService.getIntegrationBridgeName()).thenReturn(""); - PowerMockito.when(southbound.getDataPathId(any(Node.class))).thenReturn(Long.valueOf(45)); + PowerMockito.when(southbound.getDataPathId(any(Node.class))).thenReturn(45L); - assertEquals("Error, did not return the correct Dpid", Long.valueOf(45), Whitebox.invokeMethod(neutronL3Adapter, "getDpidForIntegrationBridge", mock(Node.class))); + assertEquals("Error, did not return the correct Dpid", 45L, Whitebox.invokeMethod(neutronL3Adapter, "getDpidForIntegrationBridge", mock(Node.class))); } @Test public void testencodeExcplicitOFPort() throws Exception { - assertEquals("Error, did not correctly encode the port", OFPort, NeutronL3Adapter.encodeExcplicitOFPort(Long.valueOf(45))); + assertEquals("Error, did not correctly encode the port", OFPort, NeutronL3Adapter.encodeExcplicitOFPort(45L)); } @Test @@ -967,6 +925,8 @@ public class NeutronL3AdapterTest { @Test public void testSetDependenciesObject() throws Exception{ + MemberModifier.field(NeutronL3Adapter.class, "enabled").set(neutronL3Adapter , false); + INeutronNetworkCRUD iNeutronNetworkCRUD = mock(INeutronNetworkCRUD.class); neutronL3Adapter.setDependencies(iNeutronNetworkCRUD); assertEquals("Error, did not return the correct object", getField("neutronNetworkCache"), iNeutronNetworkCRUD); @@ -998,6 +958,8 @@ public class NeutronL3AdapterTest { L3ForwardingProvider l3ForwardingProvider = mock(L3ForwardingProvider.class); neutronL3Adapter.setDependencies(l3ForwardingProvider); assertEquals("Error, did not return the correct object", getField("l3ForwardingProvider"), l3ForwardingProvider); + + MemberModifier.field(NeutronL3Adapter.class, "enabled").set(neutronL3Adapter , true); } private Object getField(String fieldName) throws Exception { @@ -1011,6 +973,6 @@ public class NeutronL3AdapterTest { Class clazz = Whitebox.getInnerClassType(NeutronL3Adapter.class, "FloatIpData"); Constructor [] constructors = clazz.getConstructors(); Constructor c = constructors[0]; - return c.newInstance(new NeutronL3Adapter(), Long.valueOf(415), Long.valueOf(415), "a", "b", "c", "d", "e"); + return c.newInstance(neutronL3Adapter, 415L, 415L, "a", "b", "c", "d", "e"); } }