Ignore testGetOpenflowVersion: it is no longer applicable

The openFlow version is now determined by configuration's getProperty("ovsdb.of.version", "1.3").
Thus, the ovs version attribute (returned by ovs' OpenVSwitch table) is not used to determine what is
the openFlow version chosen by netVirtConfigurationService.

See: https://git.opendaylight.org/gerrit/#/c/11084/
     https://github.com/opendaylight/ovsdb/commit/2bc58c9cca16dc3e389cdfc18593578748fd52d5

Patch 2: include Sam's feedback

Change-Id: Icf4f3f633b2131a4521ef2509c02bcb0c7223abf
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java
index 3ac457e9cf55a92d5ee72e1db10046297b09cf93..2a6d206098019be16ed5ee23f90b1e39b5289da3 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/neutron/NeutronIT.java
@@ -42,6 +42,7 @@ import org.apache.felix.dm.DependencyManager;
 import org.junit.After;
 import org.junit.Assert;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.ops4j.pax.exam.Configuration;
@@ -241,6 +242,12 @@ public class NeutronIT extends OvsdbIntegrationTestBase {
         Assert.assertNotEquals(ovsRow.getVersion(), originalVersion);
     }
 
+    // Note: The openFlow version is now determined by configuration's getProperty("ovsdb.of.version", "1.3").
+    // Thus, the ovs version attribute (returned by ovs' OpenVSwitch table) is not used to determine what is
+    // the openFlow version chosen by netVirtConfigurationService.
+    // See: https://git.opendaylight.org/gerrit/#/c/11084/
+    //      https://github.com/opendaylight/ovsdb/commit/2bc58c9cca16dc3e389cdfc18593578748fd52d5
+    @Ignore("netVirtConfigurationService.getOpenflowVersion(node) is not dependent on Constants.OPENFLOW13_SUPPORTED")
     @Test
     public void testGetOpenflowVersion() throws Exception {
         Thread.sleep(5000);