Remove dependency on serviceutils

This removes dependency on serviceutils' upgrade component, restoring
codeflows to work without it.

Change-Id: Idbe9e85c7b276768173237799c776f6c4000fa55
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index 0c7026c170f57a141c71802f9f55a106163b952c..e3c2e0f565b03269ed47263e96b5c247ea9c0a8f 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -36,13 +36,6 @@
         <type>pom</type>
         <scope>import</scope>
       </dependency>
-      <dependency>
-        <groupId>org.opendaylight.serviceutils</groupId>
-        <artifactId>serviceutils-artifacts</artifactId>
-        <version>0.11.0-SNAPSHOT</version>
-        <type>pom</type>
-        <scope>import</scope>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 

diff --git a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
index 69cfb0d33916ed0d41f4686e346c7772b97725bb..0422bcce8b8187d57c6506cb45c433676887450d 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-features/odl-ovsdb-hwvtepsouthbound/pom.xml
@@ -26,13 +26,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <name>ODL :: ovsdb :: ${project.artifactId}</name>
 
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.serviceutils</groupId>
-            <artifactId>odl-serviceutils-tools</artifactId>
-            <version>0.11.0-SNAPSHOT</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>odl-ovsdb-hwvtepsouthbound-api</artifactId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
index 7fb982fed37cfc23dec78e6a37182fcb93e68228..438fdf4d12b142251628dbd05b335e842dedbd68 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/pom.xml
@@ -82,10 +82,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>jakarta.annotation-api</artifactId>
       <optional>true</optional>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>upgrade</artifactId>
-    </dependency>
     <dependency>
       <groupId>org.apache.karaf.shell</groupId>
       <artifactId>org.apache.karaf.shell.core</artifactId>

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
index c5ce15ffed336f883b762b2e7dabb406620c50e4..1139f2b562a6ca84163a24a5996820a4e8b5dc54 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundProvider.java
@@ -38,7 +38,6 @@ import org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md.TransactionInvoke
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
 import org.opendaylight.ovsdb.utils.mdsal.utils.Scheduler;
 import org.opendaylight.ovsdb.utils.mdsal.utils.TransactionHistory;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder;
@@ -68,18 +67,15 @@ public class HwvtepSouthboundProvider
     private HwvtepReconciliationManager hwvtepReconciliationManager;
     private final AtomicBoolean registered = new AtomicBoolean(false);
     private ListenerRegistration<HwvtepSouthboundProvider> operTopologyRegistration;
-    private final UpgradeState upgradeState;
 
     @Inject
     public HwvtepSouthboundProvider(final DataBroker dataBroker, final EntityOwnershipService entityOwnership,
             final OvsdbConnection ovsdbConnection, final DOMSchemaService schemaService,
-            final BindingNormalizedNodeSerializer serializer,
-            final UpgradeState upgradeState) {
+            final BindingNormalizedNodeSerializer serializer) {
         this.dataBroker = dataBroker;
-        this.entityOwnershipService = entityOwnership;
+        entityOwnershipService = entityOwnership;
         registration = null;
         this.ovsdbConnection = ovsdbConnection;
-        this.upgradeState = upgradeState;
         // FIXME: eliminate this static wiring
         HwvtepSouthboundUtil.setInstanceIdentifierCodec(new InstanceIdentifierCodec(schemaService, serializer));
         LOG.info("HwvtepSouthboundProvider ovsdbConnectionService: {}", ovsdbConnection);
@@ -93,10 +89,11 @@ public class HwvtepSouthboundProvider
         LOG.info("HwvtepSouthboundProvider Session Initiated");
         txInvoker = new TransactionInvokerImpl(dataBroker);
         cm = new HwvtepConnectionManager(dataBroker, txInvoker, entityOwnershipService, ovsdbConnection);
-        registerConfigListenerPostUpgrade();
+        hwvtepDTListener = new HwvtepDataChangeListener(dataBroker, cm);
+        hwvtepReconciliationManager = new HwvtepReconciliationManager(dataBroker, cm);
         //Register listener for entityOnwership changes
         providerOwnershipChangeListener =
-                new HwvtepsbPluginInstanceEntityOwnershipListener(this,this.entityOwnershipService);
+                new HwvtepsbPluginInstanceEntityOwnershipListener(this,entityOwnershipService);
 
         //register instance entity to get the ownership of the provider
         Entity instanceEntity = new Entity(ENTITY_TYPE, ENTITY_TYPE);
@@ -122,17 +119,6 @@ public class HwvtepSouthboundProvider
         }, HwvtepSouthboundConstants.PORT_OPEN_MAX_DELAY_IN_MINS, TimeUnit.MINUTES);
     }
 
-    private void registerConfigListenerPostUpgrade() {
-        if (upgradeState.isUpgradeInProgress()) {
-            LOG.error("Upgrade is in progress delay config data change listener registration");
-            Scheduler.getScheduledExecutorService().schedule(this::registerConfigListenerPostUpgrade,
-                    60, TimeUnit.SECONDS);
-            return;
-        }
-        hwvtepDTListener = new HwvtepDataChangeListener(dataBroker, cm);
-        hwvtepReconciliationManager = new HwvtepReconciliationManager(dataBroker, cm);
-    }
-
     @Override
     @PreDestroy
     @SuppressWarnings("checkstyle:IllegalCatch")
@@ -232,7 +218,7 @@ public class HwvtepSouthboundProvider
         }
 
         public void close() {
-            this.listenerRegistration.close();
+            listenerRegistration.close();
         }
 
         @Override

diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/OSGI-INF/blueprint/hwvtepsouthbound.xml b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/OSGI-INF/blueprint/hwvtepsouthbound.xml
index 90946521a07bcdd7e18b92ba020f596a59c706e3..82852f7806466af366667199fe73adbfebdee5d7 100644 (file)
--- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/OSGI-INF/blueprint/hwvtepsouthbound.xml
+++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/resources/OSGI-INF/blueprint/hwvtepsouthbound.xml
@@ -6,14 +6,12 @@
     <reference id="dOMSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
     <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
     <reference id="ovsdbConnection" interface="org.opendaylight.ovsdb.lib.OvsdbConnection"/>
-    <reference id="upgradeState" interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
     <bean id="hwvtepSouthboundProvider" class="org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProvider" init-method="init" destroy-method="close">
         <argument ref="dataBroker"/>
         <argument ref="entityOwnershipService"/>
         <argument ref="ovsdbConnection"/>
         <argument ref="dOMSchemaService"/>
         <argument ref="bindingNormalizedNodeSerializer"/>
-        <argument ref="upgradeState"/>
     </bean>
     <service ref="hwvtepSouthboundProvider" interface="org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundProviderInfo"/>
 

diff --git a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
index f3ca1289fa07c3a7f5088113be0f9e75ce4ebdce..72679cadc69aefc657b51d4f2f84e784f95a7f60 100644 (file)
--- a/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
+++ b/southbound/southbound-features/odl-ovsdb-southbound-impl/pom.xml
@@ -50,13 +50,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
             <type>xml</type>
             <classifier>features</classifier>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.serviceutils</groupId>
-            <artifactId>odl-serviceutils-tools</artifactId>
-            <version>0.11.0-SNAPSHOT</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>odl-ovsdb-utils</artifactId>

diff --git a/southbound/southbound-impl/pom.xml b/southbound/southbound-impl/pom.xml
index bcc5dd311c67b179472f3c92bcdb446c155d533b..c2441f6cde1c172f8ffc87df63eb503ff8d0e02c 100644 (file)
--- a/southbound/southbound-impl/pom.xml
+++ b/southbound/southbound-impl/pom.xml
@@ -87,10 +87,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.infrautils</groupId>
       <artifactId>ready-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.opendaylight.serviceutils</groupId>
-      <artifactId>upgrade</artifactId>
-    </dependency>
     <!-- external dependencies -->
     <dependency>
       <groupId>org.opendaylight.infrautils</groupId>

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
index 4df5af87d202bb140f3ab1f73a7e3d9357a01cba..90151624fbc9aa081fadf84c464d50ead25d81c1 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
@@ -52,7 +53,6 @@ import org.opendaylight.ovsdb.southbound.reconciliation.configuration.BridgeConf
 import org.opendaylight.ovsdb.southbound.reconciliation.connection.ConnectionReconciliationTask;
 import org.opendaylight.ovsdb.southbound.transactions.md.OvsdbNodeRemoveCommand;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAttributes;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
@@ -66,8 +66,7 @@ import org.slf4j.LoggerFactory;
 
 public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoCloseable {
 
-    private final Map<ConnectionInfo, OvsdbConnectionInstance> clients =
-            new ConcurrentHashMap<>();
+    private final ConcurrentMap<ConnectionInfo, OvsdbConnectionInstance> clients = new ConcurrentHashMap<>();
     private static final Logger LOG = LoggerFactory.getLogger(OvsdbConnectionManager.class);
     private static final String ENTITY_TYPE = "ovsdb";
     private static final int DB_FETCH_TIMEOUT = 1000;
@@ -86,13 +85,11 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     private final OvsdbConnection ovsdbConnection;
     private final ReconciliationManager reconciliationManager;
     private final InstanceIdentifierCodec instanceIdentifierCodec;
-    private final UpgradeState upgradeState;
 
     public OvsdbConnectionManager(final DataBroker db,final TransactionInvoker txInvoker,
                                   final EntityOwnershipService entityOwnershipService,
                                   final OvsdbConnection ovsdbConnection,
-                                  final InstanceIdentifierCodec instanceIdentifierCodec,
-                                  final UpgradeState upgradeState) {
+                                  final InstanceIdentifierCodec instanceIdentifierCodec) {
         this.db = db;
         this.txInvoker = txInvoker;
         this.entityOwnershipService = entityOwnershipService;
@@ -100,7 +97,6 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         this.ovsdbConnection = ovsdbConnection;
         reconciliationManager = new ReconciliationManager(db, instanceIdentifierCodec);
         this.instanceIdentifierCodec = instanceIdentifierCodec;
-        this.upgradeState = upgradeState;
     }
 
     @Override
@@ -406,7 +402,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
     }
 
     public void reconcileConnection(final InstanceIdentifier<Node> iid, final OvsdbNodeAugmentation ovsdbNode) {
-        this.retryConnection(iid, ovsdbNode,
+        retryConnection(iid, ovsdbNode,
                 ConnectionReconciliationTriggers.ON_CONTROLLER_INITIATED_CONNECTION_FAILURE);
 
     }
@@ -476,10 +472,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
             //*this* instance of southbound plugin is owner of the device,
             //so register for monitor callbacks
             ovsdbConnectionInstance.registerCallbacks(instanceIdentifierCodec);
-            LOG.trace("Ovsdb isUpgradeInProgress {}", upgradeState.isUpgradeInProgress());
-            if (!upgradeState.isUpgradeInProgress()) {
-                reconcileBridgeConfigurations(ovsdbConnectionInstance);
-            }
+
+            reconcileBridgeConfigurations(ovsdbConnectionInstance);
         } else {
             //You were owner of the device, but now you are not. With the current ownership
             //grant mechanism, this scenario should not occur. Because this scenario will occur
@@ -665,7 +659,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
         }
     }
 
-    public void reconcileBridgeConfigurations(final OvsdbConnectionInstance client) {
+    private void reconcileBridgeConfigurations(final OvsdbConnectionInstance client) {
         final InstanceIdentifier<Node> nodeIid = client.getInstanceIdentifier();
         final ReconciliationTask task = new BridgeConfigReconciliationTask(
                 reconciliationManager, OvsdbConnectionManager.this, nodeIid, client, instanceIdentifierCodec);
@@ -726,8 +720,4 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos
             return state;
         }
     }
-
-    public Map<ConnectionInfo, OvsdbConnectionInstance> getClients() {
-        return clients;
-    }
 }

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
index 0f9d9233df7152c3211671ca7d0b331c0c51632a..c82fd17059eae8d2b2fbff83c5fa5cc91dedaec8 100644 (file)
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
+++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
@@ -39,10 +39,8 @@ import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipListenerRegistratio
 import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
-import org.opendaylight.ovsdb.southbound.reconciliation.OvsdbUpgradeStateListener;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvoker;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvokerImpl;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyBuilder;
@@ -79,11 +77,9 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
     private final OvsdbConnection ovsdbConnection;
     private final InstanceIdentifierCodec instanceIdentifierCodec;
     private final SystemReadyMonitor systemReadyMonitor;
-    private final UpgradeState upgradeState;
     private final AtomicBoolean registered = new AtomicBoolean(false);
     private ListenerRegistration<SouthboundProvider> operTopologyRegistration;
     private final OvsdbDiagStatusProvider ovsdbStatusProvider;
-    private OvsdbUpgradeStateListener ovsdbUpgradeStateListener;
 
     @Inject
     public SouthboundProvider(final DataBroker dataBroker,
@@ -92,8 +88,7 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
                               final DOMSchemaService schemaService,
                               final BindingNormalizedNodeSerializer bindingNormalizedNodeSerializer,
                               final SystemReadyMonitor systemReadyMonitor,
-                              final DiagStatusService diagStatusService,
-                              final UpgradeState upgradeState) {
+                              final DiagStatusService diagStatusService) {
         SouthboundProvider.db = dataBroker;
         entityOwnershipService = entityOwnershipServiceDependency;
         registration = null;
@@ -101,7 +96,6 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
         ovsdbStatusProvider = new OvsdbDiagStatusProvider(diagStatusService);
         instanceIdentifierCodec = new InstanceIdentifierCodec(schemaService, bindingNormalizedNodeSerializer);
         this.systemReadyMonitor = systemReadyMonitor;
-        this.upgradeState = upgradeState;
         LOG.info("SouthboundProvider ovsdbConnectionService Initialized");
     }
 
@@ -114,7 +108,7 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
         ovsdbStatusProvider.reportStatus(ServiceState.STARTING, "OVSDB initialization in progress");
         txInvoker = new TransactionInvokerImpl(db);
         cm = new OvsdbConnectionManager(db, txInvoker, entityOwnershipService, ovsdbConnection,
-                instanceIdentifierCodec, upgradeState);
+                instanceIdentifierCodec);
         ovsdbDataTreeChangeListener = new OvsdbDataTreeChangeListener(db, cm, instanceIdentifierCodec);
         ovsdbOperGlobalListener = new OvsdbOperGlobalListener(db, cm, txInvoker);
 
@@ -138,7 +132,6 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
 
         LOG.trace("Registering listener for path {}", treeId);
         operTopologyRegistration = db.registerDataTreeChangeListener(treeId, this);
-        ovsdbUpgradeStateListener = new OvsdbUpgradeStateListener(db, cm);
     }
 
     @Override
@@ -161,9 +154,6 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
             operTopologyRegistration = null;
         }
         ovsdbStatusProvider.reportStatus(ServiceState.UNREGISTERED, "OVSDB Service stopped");
-        if (ovsdbUpgradeStateListener != null) {
-            ovsdbUpgradeStateListener.close();
-        }
     }
 
     private static void initializeOvsdbTopology(final @NonNull LogicalDatastoreType type) {
@@ -268,8 +258,4 @@ public class SouthboundProvider implements ClusteredDataTreeChangeListener<Topol
     boolean isRegistered() {
         return registered.get();
     }
-
-    public UpgradeState getUpgradeState() {
-        return upgradeState;
-    }
 }

diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java
deleted file mode 100644 (file)
index a3b71f8..0000000
--- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/OvsdbUpgradeStateListener.java
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2019 Ericsson India Global Services Pvt Ltd. and others.  All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.southbound.reconciliation;
-
-import java.util.Collection;
-import java.util.Map;
-import org.eclipse.jdt.annotation.NonNull;
-import org.opendaylight.mdsal.binding.api.ClusteredDataTreeChangeListener;
-import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
-import org.opendaylight.mdsal.binding.api.DataTreeChangeListener;
-import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
-import org.opendaylight.mdsal.binding.api.DataTreeModification;
-import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.ovsdb.southbound.OvsdbConnectionInstance;
-import org.opendaylight.ovsdb.southbound.OvsdbConnectionManager;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.serviceutils.upgrade.rev180702.UpgradeConfig;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public final class OvsdbUpgradeStateListener implements ClusteredDataTreeChangeListener<UpgradeConfig>, AutoCloseable {
-
-    private static final Logger LOG = LoggerFactory.getLogger(OvsdbUpgradeStateListener.class);
-
-    private final DataBroker dataBroker;
-
-    /** The connection manager. */
-    private final OvsdbConnectionManager cm;
-
-    /** Our registration. */
-    private final ListenerRegistration<DataTreeChangeListener<UpgradeConfig>> registration;
-
-    public OvsdbUpgradeStateListener(final DataBroker db, OvsdbConnectionManager cm) {
-
-        DataTreeIdentifier<UpgradeConfig> dataTreeIdentifier =
-            DataTreeIdentifier.create(LogicalDatastoreType.CONFIGURATION,
-                        InstanceIdentifier.create(UpgradeConfig.class));
-        registration = db.registerDataTreeChangeListener(dataTreeIdentifier, this);
-
-        this.dataBroker = db;
-        this.cm = cm;
-        LOG.info("OvsdbUpgradeStateListener (ovsdb) initialized");
-    }
-
-    @Override
-    public void close() {
-        registration.close();
-        LOG.info("OVSDB topology listener has been closed.");
-    }
-
-    @Override
-    public void onDataTreeChanged(@NonNull Collection<DataTreeModification<UpgradeConfig>> changes) {
-        LOG.trace("onDataTreeChanged: {}", changes);
-        for (DataTreeModification<UpgradeConfig> change: changes) {
-
-            if (change.getRootNode().getModificationType() == ModificationType.WRITE) {
-                UpgradeConfig before = change.getRootNode().getDataBefore();
-                UpgradeConfig after = change.getRootNode().getDataAfter();
-                if (before != null && before.getUpgradeInProgress() && after != null && !after.getUpgradeInProgress()) {
-                    LOG.info("Upgrade Flag is set from {} to {}, Trigger Reconciliation",
-                        before.getUpgradeInProgress(), after.getUpgradeInProgress());
-                    //TODO Trigger Reconciliation on all the ovsDbConnectionInstance
-                    for (Map.Entry<ConnectionInfo, OvsdbConnectionInstance> entry : cm.getClients().entrySet()) {
-                        ConnectionInfo connectionInfo = entry.getKey();
-                        OvsdbConnectionInstance connectionInstance = entry.getValue();
-                        LOG.trace("ConnectionInfo : {}", connectionInfo);
-                        LOG.trace("OvsdbConnectionInstance : {}", connectionInstance);
-                        cm.reconcileBridgeConfigurations(connectionInstance);
-                    }
-                }
-            }
-
-        }
-    }
-}

diff --git a/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml b/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
index ad4864db9624889986e8ba2036486a1bf54fea08..04f822bd40e4c140cde41693a418a8d229be8e46 100644 (file)
--- a/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
+++ b/southbound/southbound-impl/src/main/resources/OSGI-INF/blueprint/southbound.xml
@@ -28,7 +28,6 @@
   <reference id="domSchemaService" interface="org.opendaylight.mdsal.dom.api.DOMSchemaService"/>
   <reference id="entityOwnershipService" interface="org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService"/>
   <reference id="ovsdbConnection" interface="org.opendaylight.ovsdb.lib.OvsdbConnection"/>
-  <reference id="upgradeState" interface="org.opendaylight.serviceutils.upgrade.UpgradeState"/>
 
   <bean id="southboundProvider" class="org.opendaylight.ovsdb.southbound.SouthboundProvider" init-method="init" destroy-method="close">
     <argument ref="dataBroker"/>
@@ -38,7 +37,6 @@
     <argument ref="bindingNormalizedNodeSerializer"/>
     <argument ref="systemReadyMonitor"/>
     <argument ref="diagStatusService"/>
-    <argument ref="upgradeState"/>
   </bean>
 
 </blueprint>

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
index dbc0cfe49d54f77b56a9799f2f2b7242623b095c..1b68abf82be6cfe053f676e3ab7581d2498cdb08 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListenerTest.java
@@ -23,7 +23,6 @@ import org.opendaylight.mdsal.eos.binding.api.EntityOwnershipService;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
 import org.opendaylight.ovsdb.southbound.transactions.md.TransactionInvokerImpl;
 import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
 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.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
@@ -50,10 +49,9 @@ public class OvsdbDataTreeChangeListenerTest extends AbstractConcurrentDataBroke
         dataBroker = getDataBroker();
         EntityOwnershipService entityOwnershipService = mock(EntityOwnershipService.class);
         InstanceIdentifierCodec instanceIdentifierCodec = mock(InstanceIdentifierCodec.class);
-        UpgradeState upgradeState = mock(UpgradeState.class);
         listener = new OvsdbDataTreeChangeListener(dataBroker,
                 new OvsdbConnectionManager(dataBroker, new TransactionInvokerImpl(dataBroker), entityOwnershipService,
-                        ovsdbConnection, instanceIdentifierCodec, upgradeState), instanceIdentifierCodec);
+                        ovsdbConnection, instanceIdentifierCodec), instanceIdentifierCodec);
     }
 
     @Test

diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
index 51db44141472b2f06a742c73bca2d381b20bdda5..8f1c7a37b7b0d1337e0ba30e04fe2540507ce549 100644 (file)
--- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
+++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundProviderTest.java
@@ -41,7 +41,6 @@ import org.opendaylight.mdsal.eos.common.api.CandidateAlreadyRegisteredException
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipChangeState;
 import org.opendaylight.mdsal.eos.common.api.EntityOwnershipState;
 import org.opendaylight.ovsdb.lib.OvsdbConnection;
-import org.opendaylight.serviceutils.upgrade.UpgradeState;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.TopologyKey;
@@ -78,8 +77,7 @@ public class SouthboundProviderTest extends AbstractConcurrentDataBrokerTest {
                 Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class),
                 new TestSystemReadyMonitor(IMMEDIATE),
-                Mockito.mock(DiagStatusService.class),
-                Mockito.mock(UpgradeState.class))) {
+                Mockito.mock(DiagStatusService.class))) {
 
             // Initiate the session
             southboundProvider.init();
@@ -106,8 +104,7 @@ public class SouthboundProviderTest extends AbstractConcurrentDataBrokerTest {
                 Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class),
                 new TestSystemReadyMonitor(IMMEDIATE),
-                Mockito.mock(DiagStatusService.class),
-                Mockito.mock(UpgradeState.class))) {
+                Mockito.mock(DiagStatusService.class))) {
 
             // Initiate the session
             southboundProvider.init();
@@ -136,8 +133,7 @@ public class SouthboundProviderTest extends AbstractConcurrentDataBrokerTest {
                 Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class),
                 new TestSystemReadyMonitor(IMMEDIATE),
-                Mockito.mock(DiagStatusService.class),
-                Mockito.mock(UpgradeState.class))) {
+                Mockito.mock(DiagStatusService.class))) {
 
             southboundProvider.init();
 
@@ -161,8 +157,7 @@ public class SouthboundProviderTest extends AbstractConcurrentDataBrokerTest {
                 Mockito.mock(DOMSchemaService.class),
                 Mockito.mock(BindingNormalizedNodeSerializer.class),
                 new TestSystemReadyMonitor(IMMEDIATE),
-                Mockito.mock(DiagStatusService.class),
-                Mockito.mock(UpgradeState.class))) {
+                Mockito.mock(DiagStatusService.class))) {
 
             southboundProvider.init();