Merge "Use the memorized service reference"

diff --combined openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
index a0066c90f49dc674830cfa217f702bca8557a6c7,4cdb8f290810db63cd2a9b3f7b94171f6d7d4255..705c15e33b536da63b9a15a4311ccd3d3771ed8d
--- 1/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
--- 2/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/NetworkHandler.java
@@@ -24,7 -24,7 +24,7 @@@ import org.opendaylight.ovsdb.openstack
  import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
- import org.osgi.framework.BundleContext;
+ 
  import org.osgi.framework.ServiceReference;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@@ -55,8 -55,8 +55,8 @@@ public class NetworkHandler extends Abs
       */
      @Override
      public int canCreateNetwork(NeutronNetwork network) {
 -        if (network.isShared()) {
 -            LOG.error(" Network shared attribute not supported ");
 +        if (network.isShared() && !network.getRouterExternal()) {
 +            LOG.error("Shared attribute is only supported on external networks");
              return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
          }
  
@@@ -89,8 -89,8 +89,8 @@@
      @Override
      public int canUpdateNetwork(NeutronNetwork delta,
                                  NeutronNetwork original) {
 -        if (delta.isShared()) {
 -            LOG.error(" Network shared attribute not supported ");
 +        if (delta.isShared() && !delta.getRouterExternal()) {
 +            LOG.error("Shared attribute is only supported on external networks");
              return HttpURLConnection.HTTP_NOT_ACCEPTABLE;
          }
  
@@@ -194,7 -194,7 +194,7 @@@
      }
  
      @Override
-     public void setDependencies(BundleContext bundleContext, ServiceReference serviceReference) {
+     public void setDependencies(ServiceReference serviceReference) {
          tenantNetworkManager =
                  (TenantNetworkManager) ServiceHelper.getGlobalInstance(TenantNetworkManager.class, this);
          bridgeConfigurationManager =
@@@ -207,8 -207,7 +207,7 @@@
                  (Southbound) ServiceHelper.getGlobalInstance(Southbound.class, this);
          eventDispatcher =
                  (EventDispatcher) ServiceHelper.getGlobalInstance(EventDispatcher.class, this);
-         eventDispatcher.eventHandlerAdded(
-                 bundleContext.getServiceReference(INeutronNetworkAware.class.getName()), this);
+         eventDispatcher.eventHandlerAdded(serviceReference, this);
      }
  
      @Override

diff --combined openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
index 603ecc58315a1fdc04fe25b437c08556ee779690,501c6693a27dfdd3243e50e1c2a2a1b9a051539c..b381f87d53d720548cf3de5b5cdd59d321cf354a
--- 1/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
--- 2/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3Adapter.java
@@@ -34,7 -34,6 +34,6 @@@ import com.google.common.util.concurren
  import com.google.common.util.concurrent.Futures;
  import com.google.common.util.concurrent.ListenableFuture;
  
- import org.osgi.framework.BundleContext;
  import org.osgi.framework.ServiceReference;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
@@@ -311,13 -310,6 +310,13 @@@ public class NeutronL3Adapter implement
              }
              this.updateL3ForNeutronPort(neutronPort, currPortShouldBeDeleted);
          }
 +
 +        if (isDelete) {
 +            /*
 +             *  Bug 4277: Remove the router interface cache only after deleting the neutron port l3 flows.
 +             */
 +            this.cleanupRouterCache(neutronRouterInterface);
 +        }
      }
  
      /**
@@@ -813,7 -805,13 +812,7 @@@
              }
          }
  
 -        // Keep cache for finding router's mac from network uuid -- remove
 -        //
 -        if (isDelete) {
 -            networkIdToRouterMacCache.remove(neutronNetwork.getNetworkUUID());
 -            networkIdToRouterIpListCache.remove(neutronNetwork.getNetworkUUID());
 -            subnetIdToRouterInterfaceCache.remove(subnet.getSubnetUUID());
 -        }
 +        // Keep cache for finding router's mac from network uuid -- NOTE: remove is done later, via cleanupRouterCache()
      }
  
      private void programFlowForNetworkFromExternal(final Node node,
@@@ -1275,21 -1273,6 +1274,21 @@@
          return null;
      }
  
 +     private void cleanupRouterCache(final NeutronRouter_Interface neutronRouterInterface) {
 +         /*
 +          *  Fix for 4277
 +          *  Remove the router cache only after deleting the neutron
 +          *  port l3 flows.
 +          */
 +         final NeutronPort neutronPort = neutronPortCache.getPort(neutronRouterInterface.getPortUUID());
 +
 +         if (neutronPort != null) {
 +             networkIdToRouterMacCache.remove(neutronPort.getNetworkUUID());
 +             networkIdToRouterIpListCache.remove(neutronPort.getNetworkUUID());
 +             subnetIdToRouterInterfaceCache.remove(neutronRouterInterface.getSubnetUUID());
 +         }
 +     }
 +
      public void triggerGatewayMacResolver(final Node node, final NeutronPort gatewayPort ){
  
          Preconditions.checkNotNull(node);
@@@ -1350,7 -1333,7 +1349,7 @@@
      }
  
      @Override
-     public void setDependencies(BundleContext bundleContext, ServiceReference serviceReference) {
+     public void setDependencies(ServiceReference serviceReference) {
          tenantNetworkManager =
                  (TenantNetworkManager) ServiceHelper.getGlobalInstance(TenantNetworkManager.class, this);
          configurationService =

diff --combined openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java
index 49419a40baee7d330bbdc574ba47c4763e2d6ac1,ab7728eec521059a162125923ec1023298dd936f..e5566bdf8515346589227720b39204ebf4919d94
--- 1/openstack/net-virt/src/test/java/org/opendaylight/ovsdb/openstack/netvirt/impl/NeutronL3AdapterTest.java
--- 2/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
@@@ -63,7 -63,7 +63,7 @@@ import org.opendaylight.yang.gen.v1.urn
  import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
  import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
- import org.osgi.framework.BundleContext;
+ 
  import org.osgi.framework.ServiceReference;
  import org.powermock.api.mockito.PowerMockito;
  import org.powermock.api.support.membermodification.MemberMatcher;
@@@ -583,7 -583,6 +583,7 @@@ public class NeutronL3AdapterTest 
          NeutronPort neutronPort = mock(NeutronPort.class);
          when(neutronPort.getMacAddress()).thenReturn(MAC_ADDRESS);
          when(neutronPort.getFixedIPs()).thenReturn(ips);
 +        when(neutronPort.getNetworkUUID()).thenReturn(UUID);
          NeutronSubnet neutronSubnet = mock(NeutronSubnet.class);
          when(neutronSubnet.getNetworkUUID()).thenReturn(UUID);
          when(neutronSubnet.getGatewayIP()).thenReturn(IP);
@@@ -592,7 -591,6 +592,7 @@@
          when(neutronNetwork.getProviderSegmentationID()).thenReturn(ID);
          when(neutronNetwork.getRouterExternal()).thenReturn(false); //might change that to true
          when(neutronNetwork.getNetworkUUID()).thenReturn(UUID);
 +        NeutronRouter neutronRouter = mock(NeutronRouter.class);
  
          Node node = mock(Node.class);
          List<Node> nodes = new ArrayList<Node>();
@@@ -607,7 -605,6 +607,7 @@@
          // init instance variables
          INeutronPortCRUD neutronPortCache = mock(INeutronPortCRUD.class);
          PowerMockito.when(neutronPortCache.getPort(anyString())).thenReturn(neutronPort);
 +        PowerMockito.when(neutronPortCache.getAllPorts()).thenReturn(new ArrayList<NeutronPort>());
          INeutronSubnetCRUD neutronSubnetCache = mock(INeutronSubnetCRUD.class);
          PowerMockito.when(neutronSubnetCache.getSubnet(anyString())).thenReturn(neutronSubnet);
          INeutronNetworkCRUD neutronNetworkCache = mock(INeutronNetworkCRUD.class);
@@@ -641,16 -638,14 +641,16 @@@
  
          networkIdToRouterMacCache.put(UUID, MAC_ADDRESS);
          networkIdToRouterIpListCache.put(UUID, ips);
 +        subnetIdToRouterInterfaceCache.put(UUID, intf);
          networkIdToRouterMacCacheSize = networkIdToRouterMacCache.size();
          networkIdToRouterIpListCacheSize = networkIdToRouterIpListCache.size();
          subnetIdToRouterInterfaceCacheSize = subnetIdToRouterInterfaceCache.size();
  
 -        Whitebox.invokeMethod(neutronL3Adapter, "programFlowsForNeutronRouterInterface", intf, true);
 +        Whitebox.invokeMethod(neutronL3Adapter, "handleNeutronRouterInterfaceEvent", neutronRouter, intf, Action.DELETE);
  
 +        PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programFlowsForNeutronRouterInterface", intf, true);
          PowerMockito.verifyPrivate(neutronL3Adapter, times(2)).invoke("getDpidForIntegrationBridge", any(Node.class));
 -        PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programFlowsForNeutronRouterInterfacePair", any(Node.class), anyLong(), any(NeutronRouter_Interface.class), any(NeutronRouter_Interface.class), any(NeutronNetwork.class), anyString(), anyString(), anyString(), anyInt(), eq(Action.DELETE), anyBoolean());
 +        PowerMockito.verifyPrivate(neutronL3Adapter, times(2)).invoke("programFlowsForNeutronRouterInterfacePair", any(Node.class), anyLong(), any(NeutronRouter_Interface.class), any(NeutronRouter_Interface.class), any(NeutronNetwork.class), anyString(), anyString(), anyString(), anyInt(), eq(Action.DELETE), anyBoolean());
          PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programFlowForNetworkFromExternal", any(Node.class), anyLong(), anyString(), anyString(), anyString(), anyInt(), eq(Action.DELETE));
          PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programStaticArpStage1", anyLong(), anyString(), anyString(), anyString(), eq(Action.DELETE));
          PowerMockito.verifyPrivate(neutronL3Adapter, times(1)).invoke("programIpRewriteExclusionStage1", any(Node.class), anyLong(), anyString(), anyString(), eq(Action.DELETE));
@@@ -952,7 -947,7 +952,7 @@@
          PowerMockito.when(ServiceHelper.getGlobalInstance(NodeCacheManager.class, neutronL3Adapter)).thenReturn(nodeCacheManager);
          PowerMockito.when(ServiceHelper.getGlobalInstance(Southbound.class, neutronL3Adapter)).thenReturn(southbound);
  
-         neutronL3Adapter.setDependencies(mock(BundleContext.class), mock(ServiceReference.class));
+         neutronL3Adapter.setDependencies(mock(ServiceReference.class));
  
          assertEquals("Error, did not return the correct object", getField("tenantNetworkManager"), tenantNetworkManager);
          assertEquals("Error, did not return the correct object", getField("configurationService"), configurationService);