Migrate to serviceutils upgrade

JIRA: GENIUS-190

Change-Id: If9057f7b57a175054cec7e4e83c2723b588c97ca
Signed-off-by: Faseela K <faseela.k@ericsson.com>

diff --git a/neutronvpn/impl/pom.xml b/neutronvpn/impl/pom.xml
index 37c62eead74c559c96ffb1c91b92c64f78a7453d..8e779483f33074d38af0e24ab575640bcdb2d864 100644 (file)
--- a/neutronvpn/impl/pom.xml
+++ b/neutronvpn/impl/pom.xml
@@ -59,6 +59,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <groupId>org.opendaylight.serviceutils</groupId>
             <artifactId>tools-api</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.serviceutils</groupId>
+            <artifactId>upgrade</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.opendaylight.genius</groupId>
             <artifactId>mdsalutil-api</artifactId>

diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
index 6a1733f60a7e8718ea560c08bddf552da7e53268..d58930f92d19de77475c1f71169c2aff96a22922 100644 (file)
--- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
+++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/UpgradeStateListener.java
@@ -15,13 +15,13 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.serviceutils.tools.mdsal.listener.AbstractClusteredSyncDataTreeChangeListener;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.mdsalutil.rev170830.Config;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @Singleton
-public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeListener<Config> {
+public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeListener<UpgradeConfig> {
     private static final Logger LOG = LoggerFactory.getLogger(UpgradeStateListener.class);
 
     private final NeutronSubnetGwMacResolver neutronSubnetGwMacResolver;
@@ -30,21 +30,21 @@ public class UpgradeStateListener extends AbstractClusteredSyncDataTreeChangeLis
     public UpgradeStateListener(final DataBroker dataBroker,
                                 final NeutronSubnetGwMacResolver neutronSubnetGwMacResolver) {
         super(dataBroker, new DataTreeIdentifier<>(
-                LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Config.class)));
+                LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(UpgradeConfig.class)));
         LOG.trace("UpgradeStateListener (neutronvpn) initialized");
         this.neutronSubnetGwMacResolver = neutronSubnetGwMacResolver;
     }
 
     @Override
-    public void add(@Nonnull Config newDataObject) {
+    public void add(@Nonnull UpgradeConfig newDataObject) {
     }
 
     @Override
-    public void remove(@Nonnull Config removedDataObject) {
+    public void remove(@Nonnull UpgradeConfig removedDataObject) {
     }
 
     @Override
-    public void update(@Nonnull Config original, Config updated) {
+    public void update(@Nonnull UpgradeConfig original, UpgradeConfig updated) {
         LOG.info("UpgradeStateListener update from {} to {}", original, updated);
         neutronSubnetGwMacResolver.sendArpRequestsToExtGateways();
     }