Use Felix DM for OVSDB Neutron Services

[ovsdb.git] / neutron / src / main / java / org / opendaylight / ovsdb / neutron / NodeConfiguration.java

diff --git a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
index 04b1f9625a742664d4be456bcbb7fe9b69655417..ae9914384e20d8392a5d33a22d1a1f46f223f1a8 100644 (file)
--- a/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
+++ b/neutron/src/main/java/org/opendaylight/ovsdb/neutron/NodeConfiguration.java
@@ -32,12 +32,13 @@ public class NodeConfiguration {
     private static final int MAX_VLAN = 4096;
     private java.util.Queue<Integer> internalVlans = new LinkedList<>();
     private ConcurrentMap<String, Integer> tenantVlanMap = new ConcurrentHashMap<>();
+    private ITenantNetworkManager tenantNetworkManager;
 
-    public NodeConfiguration(Node node) {
+    public NodeConfiguration(Node node, ITenantNetworkManager tenantNetworkManager) {
         for (int i = 1; i < MAX_VLAN ; i++) {
             internalVlans.add(i);
         }
-
+        setTenantNetworkManager(tenantNetworkManager);
         initializeNodeConfiguration(node);
     }
 
@@ -77,7 +78,7 @@ public class NodeConfiguration {
                         continue;
                     }
 
-                    networkId = TenantNetworkManager.getManager().getTenantNetworkForInterface(iface).getNetworkUUID();
+                    networkId = tenantNetworkManager.getTenantNetworkForInterface(iface).getNetworkUUID();
 
                     if (networkId != null) break;
                 }
@@ -138,4 +139,7 @@ public class NodeConfiguration {
         return vlan.intValue();
     }
 
+    public void setTenantNetworkManager(ITenantNetworkManager tenantNetworkManager) {
+        this.tenantNetworkManager = tenantNetworkManager;
+    }
 }