Added trunks code to go with the model.

[netvirt.git] / integrationtest / src / test / java / org / opendaylight / ovsdb / integrationtest / schema / openvswitch / OpenVSwitchIT.java

diff --git a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
index 2b787884fea7a2a4f171c5eb5bb82c2ad3352635..d3f99f1a0084a03b7349fa704064000b040e33f2 100644 (file)
--- a/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
+++ b/integrationtest/src/test/java/org/opendaylight/ovsdb/integrationtest/schema/openvswitch/OpenVSwitchIT.java
@@ -38,11 +38,7 @@ import java.util.Set;
 import java.util.concurrent.ExecutionException;
 import javax.inject.Inject;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.TestRule;
-import org.junit.rules.TestWatcher;
-import org.junit.runner.Description;
 import org.junit.runner.RunWith;
 import org.opendaylight.ovsdb.integrationtest.ConfigurationBundles;
 import org.opendaylight.ovsdb.integrationtest.OvsdbIntegrationTestBase;
@@ -155,31 +151,13 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
                 propagateSystemProperty("ovsdbserver.ipaddress"),
                 propagateSystemProperty("ovsdbserver.port"),
 
+                ConfigurationBundles.mdsalBundles(),
                 ConfigurationBundles.controllerBundles(),
                 ConfigurationBundles.ovsdbLibraryBundles(),
-                ConfigurationBundles.ovsdbDefaultSchemaBundles(),
-                junitBundles()
+                ConfigurationBundles.ovsdbDefaultSchemaBundles()
         );
     }
 
-    /*
-     * Method adds a log as each test method starts and finishes. This is useful when
-     * the test suite is used because the suites only print a final summary.
-     */
-    @Rule
-    public TestRule watcher = new TestWatcher() {
-        @Override
-        protected void starting(Description description) {
-            LOG.info("TestWatcher: Starting test: {}",
-                    description.getDisplayName());
-        }
-
-        @Override
-        protected void finished(Description description) {
-            LOG.info("TestWatcher: Finished test: {}", description.getDisplayName());
-        }
-    };
-
     @Before
     public void setUp () throws ExecutionException, InterruptedException, IOException {
         areWeReady(bc);
@@ -955,9 +933,10 @@ public class OpenVSwitchIT extends OvsdbIntegrationTestBase {
         String portUuidStr = "testPort";
         String intfUuidStr = "testIntf";
         String tunnelEncap = "vxlan";
+        int tag = 10;
         Port port = getClient().createTypedRowWrapper(Port.class);
         port.setName("testPort");
-        port.setTag(ImmutableSet.of(1L));
+        port.setTag(tag);
         port.setMac(ImmutableSet.of("00:00:00:00:00:01"));
         port.setInterfaces(ImmutableSet.of(new UUID(intfUuidStr)));