Adjust to the ovsdb MdsalUtils change

ovsdb’s MdsalUtils switched to the mdsal DataBroker, to continue using
the controller DataBroker we need to switch to ControllerMdsalUtils.

Change-Id: If644b85d4bb1af8194b9143196050e1c194798c9
Signed-off-by: Stephen Kitt <skitt@redhat.com>

diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
index 911e7cffcdcbb28074a846bc00328058232928a2..5a1931e51dc184d3e7bb252254eb3c5a4efd85eb 100644 (file)
--- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
+++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java
@@ -42,7 +42,7 @@ import org.opendaylight.infrautils.utils.concurrent.ListenableFutures;
 import org.opendaylight.netvirt.elan.cache.ElanInstanceCache;
 import org.opendaylight.netvirt.elan.internal.ElanBridgeManager;
 import org.opendaylight.netvirt.elanmanager.api.IElanService;
-import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
+import org.opendaylight.ovsdb.utils.mdsal.utils.ControllerMdsalUtils;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder;
@@ -102,7 +102,7 @@ public class TransportZoneNotificationUtil {
         this.elanConfig = elanConfig;
         this.elanBridgeManager = elanBridgeManager;
         this.elanInstanceCache = elanInstanceCache;
-        southBoundUtils = new SouthboundUtils(new MdsalUtils(dbx));
+        southBoundUtils = new SouthboundUtils(new ControllerMdsalUtils(dbx));
     }
 
     public boolean shouldCreateVtep(List<VpnInterfaces> vpnInterfaces) {

diff --git a/elanmanager/impl/src/main/resources/OSGI-INF/blueprint/elanmanager.xml b/elanmanager/impl/src/main/resources/OSGI-INF/blueprint/elanmanager.xml
index 4c907e4821b9f5609f50e3d12693d11d62c72aec..89fae2567b70d7bad62b35df8cde9f3e54d7e098 100644 (file)
--- a/elanmanager/impl/src/main/resources/OSGI-INF/blueprint/elanmanager.xml
+++ b/elanmanager/impl/src/main/resources/OSGI-INF/blueprint/elanmanager.xml
@@ -58,7 +58,7 @@
     <argument ref="entityOwnershipService" />
   </bean>
 
-  <bean id="mdsalUtils" class="org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils">
+  <bean id="mdsalUtils" class="org.opendaylight.ovsdb.utils.mdsal.utils.ControllerMdsalUtils">
     <argument ref="dataBroker" />
   </bean>
 

diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
index 434b10507ca55784a98ff183f34f506e291d0db4..901e3df960897815fe389adec3c220685c648f3c 100644 (file)
--- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
+++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestModule.java
@@ -47,7 +47,7 @@ import org.opendaylight.netvirt.neutronvpn.NeutronvpnManagerImpl;
 import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayCache;
 import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
 import org.opendaylight.netvirt.vpnmanager.api.IVpnManager;
-import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
+import org.opendaylight.ovsdb.utils.mdsal.utils.ControllerMdsalUtils;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
 import org.opendaylight.serviceutils.srm.ServiceRecoveryRegistry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
@@ -133,8 +133,8 @@ public class ElanServiceTestModule extends AbstractGuiceJsr250Module {
         bind(IBgpManager.class).toInstance(ibgpManager);
         bind(IElanService.class).to(ElanServiceProvider.class);
 
-        MdsalUtils mdsalUtils = new MdsalUtils(dataBroker);
-        bind(MdsalUtils.class).toInstance(mdsalUtils);
+        ControllerMdsalUtils mdsalUtils = new ControllerMdsalUtils(dataBroker);
+        bind(ControllerMdsalUtils.class).toInstance(mdsalUtils);
         bind(SouthboundUtils.class).toInstance(new SouthboundUtils(mdsalUtils));
     }
 }

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
index 0475f8347e7323bb0fcfaf11033e0f0634946ca5..84814ad0f8578f4bbd85ed4dfb22931d23fa006e 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java
@@ -17,7 +17,7 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
-import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
+import org.opendaylight.ovsdb.utils.mdsal.utils.ControllerMdsalUtils;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.hostconfig.rev150712.hostconfig.attributes.Hostconfigs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.hostconfig.rev150712.hostconfig.attributes.hostconfigs.Hostconfig;
@@ -49,13 +49,13 @@ public class NeutronHostConfigChangeListener
 
     private final DataBroker dataBroker;
     private final SouthboundUtils southboundUtils;
-    private final MdsalUtils mdsalUtils;
+    private final ControllerMdsalUtils mdsalUtils;
 
     @Inject
     public NeutronHostConfigChangeListener(final DataBroker dataBroker) {
         super(Node.class,NeutronHostConfigChangeListener.class);
         this.dataBroker = dataBroker;
-        this.mdsalUtils = new MdsalUtils(dataBroker);
+        this.mdsalUtils = new ControllerMdsalUtils(dataBroker);
         this.southboundUtils = new SouthboundUtils(mdsalUtils);
     }