Remove call to networkCreated in NetworkHandler 19/4819/2
authorDave Tucker <dave.j.tucker@hp.com>
Sun, 26 Jan 2014 19:19:41 +0000 (19:19 +0000)
committerDave Tucker <dave.j.tucker@hp.com>
Sun, 26 Jan 2014 20:01:10 +0000 (20:01 +0000)
Tenant VLAN assignment is handled as part of the interface update.
This now means that each node does not need to allocate a VLAN for each tenant.

Change-Id: If817e54a603e2abb3312b9c98a0104dee128cfb2
Signed-off-by: Dave Tucker <dave.j.tucker@hp.com>
neutron/src/main/java/org/opendaylight/ovsdb/neutron/NetworkHandler.java
neutron/src/main/java/org/opendaylight/ovsdb/neutron/TenantNetworkManager.java

index 8ff8410fa5882971ef82efa5e595699e709c2e9e..62880477910e7cbee24ae8056a756961159b66f5 100644 (file)
@@ -58,7 +58,6 @@ public class NetworkHandler extends BaseHandler
             return;
         }
 
-       TenantNetworkManager.getManager().networkCreated(network.getID());
     }
 
     /**
index b0b98a939c582b8b3b030763662d7ae3da7abb48..5a23385f2df23c1e4649828fb96ffea938a1fa29 100644 (file)
@@ -37,7 +37,6 @@ import org.opendaylight.ovsdb.lib.table.Open_vSwitch;
 import org.opendaylight.ovsdb.lib.table.Port;
 import org.opendaylight.ovsdb.lib.table.internal.Table;
 import org.opendaylight.ovsdb.neutron.provider.ProviderNetworkManager;
-import org.opendaylight.ovsdb.plugin.IConnectionServiceInternal;
 import org.opendaylight.ovsdb.plugin.OVSDBConfigService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -91,16 +90,6 @@ public class TenantNetworkManager {
         return nodeConfigurationCache.get(nodeUuid);
     }
 
-    public void networkCreated (String networkId) {
-        IConnectionServiceInternal connectionService = (IConnectionServiceInternal)ServiceHelper.getGlobalInstance(IConnectionServiceInternal.class, this);
-        List<Node> nodes = connectionService.getNodes();
-
-        for (Node node : nodes) {
-            this.networkCreated(node, networkId);
-        }
-
-    }
-
     private String getNodeUUID(Node node) {
         String nodeUuid = new String();
         OVSDBConfigService ovsdbConfigService = (OVSDBConfigService)ServiceHelper.getGlobalInstance(OVSDBConfigService.class, this);