onfiguration will be defined in file

Change-Id: I46dc9537f4315ef2a31ad6129621c3faee248891
Signed-off-by: Konsta Pozdeev <konsta.pozdeev@hpe.com>

diff --git a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NodeConnectorListener.java b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NodeConnectorListener.java
index 10e9b5ccfdc38b331dc5e68028ca00d29df25608..0b2136a77d6868d0a1f9112c43e6f3a843621bfa 100644 (file)
--- a/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NodeConnectorListener.java
+++ b/netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NodeConnectorListener.java
@@ -48,14 +48,12 @@ public class NodeConnectorListener extends UnimgrDataTreeChangeListener<FlowCapa
     private static final String BRIDGE_PREFIX = "br-";
     private static final String TUNNEL_PREFIX = "tun";
     private static final Logger log = LoggerFactory.getLogger(NodeConnectorListener.class);
-    private static boolean generateMac = false;
     private final UniPortManager uniPortManager;
     private ListenerRegistration<NodeConnectorListener> nodeConnectorListenerRegistration;
 
-    public NodeConnectorListener(final DataBroker dataBroker, final UniPortManager uniPortManager, final boolean generateMac) {
+    public NodeConnectorListener(final DataBroker dataBroker, final UniPortManager uniPortManager) {
         super(dataBroker);
         this.uniPortManager = uniPortManager;
-        NodeConnectorListener.generateMac = generateMac;
         registerListener();
     }
 
@@ -65,8 +63,6 @@ public class NodeConnectorListener extends UnimgrDataTreeChangeListener<FlowCapa
                     LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier());
             nodeConnectorListenerRegistration = dataBroker.registerDataTreeChangeListener(dataTreeIid, this);
             log.info("NodeConnectorListener created and registered");
-
-            configIntegrationBridge();
         } catch (final Exception e) {
             log.error("Node connector listener registration failed !", e);
             throw new IllegalStateException("Node connector listener registration failed.", e);
@@ -241,16 +237,4 @@ public class NodeConnectorListener extends UnimgrDataTreeChangeListener<FlowCapa
         String[] splits = interfaceName.split(":");
         return splits.length > 1 && (splits[1].startsWith(TUNNEL_PREFIX) || splits[1].startsWith(BRIDGE_PREFIX));
     }
-
-    private void configIntegrationBridge() {
-        if (generateMac == true) {// default for netvirt
-            return;
-        }
-
-        ElanConfigBuilder elanConfigBuilder = new ElanConfigBuilder();
-        elanConfigBuilder.setIntBridgeGenMac(false);
-        InstanceIdentifier<ElanConfig> id = InstanceIdentifier.builder(ElanConfig.class).build();
-
-        MdsalUtils.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, id, elanConfigBuilder.build());
-    }
 }

diff --git a/netvirt/src/main/resources/org/opendaylight/blueprint/netvirt-driver.xml b/netvirt/src/main/resources/org/opendaylight/blueprint/netvirt-driver.xml
index 1cd2c52f5e9856ffc9f94ec0a5e7734e51c4da7c..5d259018db137fa2193af059f42260156090b36b 100644 (file)
--- a/netvirt/src/main/resources/org/opendaylight/blueprint/netvirt-driver.xml
+++ b/netvirt/src/main/resources/org/opendaylight/blueprint/netvirt-driver.xml
@@ -23,7 +23,6 @@
                class="org.opendaylight.unimgr.mef.netvirt.NodeConnectorListener">
                <argument ref="dataBroker" />
                <argument ref="uniPortManager" />
-               <argument value="false" />
        </bean>
 
        <bean id="evcListener" class="org.opendaylight.unimgr.mef.netvirt.EvcListener">