Bug 8476 Add support for logical switch replication mode

Add helper method to SouthboundUtils to check database
version.

Change-Id: Ie271b665b3e47ad275f9c6340764013daa4fd9ad
Signed-off-by: Victor Pickard <vpickard@redhat.com>

diff --git a/utils/southbound-utils/pom.xml b/utils/southbound-utils/pom.xml
index 8eaa9a5d7b43e352637e8b21092f8be20158c3df..f295b8a36225d725554ba9dcbd6b1502bcafd1f1 100644 (file)
--- a/utils/southbound-utils/pom.xml
+++ b/utils/southbound-utils/pom.xml
@@ -50,6 +50,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>org.opendaylight.mdsal.model</groupId>
       <artifactId>ietf-topology</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>library</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <!-- testing dependencies -->
     <dependency>
       <groupId>junit</groupId>

diff --git a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
index fd8fd7a58f1041483d4c139d2319df048f23febf..9cea9316d4fb801be236593ca1ccf50633ff76b5 100644 (file)
--- a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
+++ b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java
@@ -25,6 +25,7 @@ import java.util.Map;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.ovsdb.utils.config.ConfigProperties;
 import org.opendaylight.ovsdb.utils.mdsal.utils.MdsalUtils;
+import org.opendaylight.ovsdb.lib.notation.Version;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil;
 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.Ipv6Address;
@@ -1216,4 +1217,16 @@ public class SouthboundUtils {
         }
         return null;
     }
+
+    public static boolean compareDbVersionToMinVersion(final String dbVersion, final String minVersion) {
+        if (dbVersion != null && !dbVersion.isEmpty() && minVersion != null
+                && !minVersion.isEmpty()) {
+            Version dbVer = Version.fromString(dbVersion);
+            Version minVer = Version.fromString(minVersion);
+            if (dbVer.compareTo(minVer) >= 0) {
+                return true;
+            }
+        }
+        return false;
+    }
 }