Remove assumes from southbound-it now that deletes from operational work

Change-Id: I8493086453f09b8aac6d4825543bce2d00191ec1
Signed-off-by: Sam Hague <shague@redhat.com>

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
index 4a7d1146a437d05b4778004cda2812daf52655b9..ebaea27d94296fa1d8617c0b3b8bcfd13e85b7d5 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractConfigTestBase.java
@@ -43,16 +43,20 @@ public abstract class AbstractConfigTestBase {
      * Wait up to 10s for our configured module to come up
      */
     private static final int MODULE_TIMEOUT = 10000;
+    private static int configTimes = 0;
+    private static boolean extras = false;
 
     public abstract String getModuleName();
 
     public abstract String getInstanceName();
 
+    public abstract boolean setExtras();
+
     public abstract MavenUrlReference getFeatureRepo();
 
     public abstract String getFeatureName();
 
-    public Option[] getLoggingOptions() {
+    public Option[] getLoggingOptions(boolean extras) {
         Option[] options = new Option[] {
                 editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         logConfiguration(AbstractConfigTestBase.class),
@@ -65,11 +69,11 @@ public abstract class AbstractConfigTestBase {
         return "log4j.logger." + klazz.getPackage().getName();
     }
 
-    public Option[] getFeaturesOptions() {
+    public Option[] getFeaturesOptions(boolean extras) {
         return new Option[]{};
     }
 
-    public Option[] getPropertiesOptions() {
+    public Option[] getPropertiesOptions(boolean extras) {
         return new Option[]{};
     }
 
@@ -89,6 +93,9 @@ public abstract class AbstractConfigTestBase {
 
     @Configuration
     public Option[] config() {
+        LOG.info("Calling config, configTimes: {}", configTimes);
+        configTimes++;
+        extras = setExtras();
         Option[] options = new Option[] {
                 // KarafDistributionOption.debugConfiguration("5005", true),
                 karafDistributionConfiguration()
@@ -98,9 +105,9 @@ public abstract class AbstractConfigTestBase {
                 keepRuntimeFolder(),
                 //features(getFeatureRepo() , getFeatureName())
         };
-        options = ObjectArrays.concat(options, getFeaturesOptions(), Option.class);
-        options = ObjectArrays.concat(options, getLoggingOptions(), Option.class);
-        options = ObjectArrays.concat(options, getPropertiesOptions(), Option.class);
+        options = ObjectArrays.concat(options, getFeaturesOptions(extras), Option.class);
+        options = ObjectArrays.concat(options, getLoggingOptions(extras), Option.class);
+        options = ObjectArrays.concat(options, getPropertiesOptions(extras), Option.class);
         return options;
     }
 

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractMdsalTestBase.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractMdsalTestBase.java
index 72f0c24ade65ea454911f127ea149ec7ac47708b..05bab59f27164bde531c99b4f39a729bf36d8fcf 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractMdsalTestBase.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/AbstractMdsalTestBase.java
@@ -61,13 +61,13 @@ public abstract class AbstractMdsalTestBase extends AbstractConfigTestBase imple
     }
 
     @Override
-    public Option[] getLoggingOptions() {
+    public Option[] getLoggingOptions(boolean extras) {
         Option[] options = new Option[] {
                 editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         logConfiguration(AbstractMdsalTestBase.class),
                         LogLevel.INFO.name()),
         };
-        options = ObjectArrays.concat(options, super.getLoggingOptions(), Option.class);
+        options = ObjectArrays.concat(options, super.getLoggingOptions(extras), Option.class);
         return options;
     }
 

diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
index 2718f845e2315344a7a018c7ad94156ff73f87de..1d803c52ae0a1cd5d22c77c062ffdf8b2018b0d8 100644 (file)
--- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
+++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java
@@ -28,7 +28,6 @@ import java.util.Set;
 import javax.inject.Inject;
 
 import org.junit.Assert;
-import org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -104,9 +103,10 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     private static String addressStr;
     private static String portStr;
     private static String connectionType;
+    private static String extrasStr;
     private static Boolean setup = false;
     private static MdsalUtils mdsalUtils = null;
-    private static String extras = "false";
+    //private static String extras = "false";
     private static final String NETVIRT = "org.opendaylight.ovsdb.openstack.net-virt";
     private static final String NETVIRTPROVIDERS = "org.opendaylight.ovsdb.openstack.net-virt-providers";
 
@@ -140,7 +140,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        setExtras();
+        //setExtras();
         return "odl-ovsdb-southbound-impl-ui";
     }
 
@@ -151,8 +151,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     }
 
     @Override
-    public Option[] getFeaturesOptions() {
-        if (extras.equals("true")) {
+    public Option[] getFeaturesOptions(boolean extras) {
+        if (extras == true) {
             Option[] options = new Option[] {
                     features("mvn:org.opendaylight.ovsdb/features-ovsdb/1.1.0-SNAPSHOT/xml/features",
                             "odl-ovsdb-openstack-sb")};
@@ -163,7 +163,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     }
 
     @Override
-    public Option[] getLoggingOptions() {
+    public Option[] getLoggingOptions(boolean extras) {
         Option[] options = new Option[] {
                 /*editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb",
@@ -173,7 +173,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
                         LogLevelOption.LogLevel.DEBUG.name())
         };
 
-        if (extras.equals("true")) {
+        if (extras == true) {
             Option[] extraOptions = new Option[] {
                 editConfigurationFilePut(SouthboundITConstants.ORG_OPS4J_PAX_LOGGING_CFG,
                         "log4j.logger.org.opendaylight.ovsdb",
@@ -185,12 +185,12 @@ public class SouthboundIT extends AbstractMdsalTestBase {
             options = ObjectArrays.concat(options, extraOptions, Option.class);
         }
 
-        options = ObjectArrays.concat(options, super.getLoggingOptions(), Option.class);
+        options = ObjectArrays.concat(options, super.getLoggingOptions(extras), Option.class);
         return options;
     }
 
     @Override
-    public Option[] getPropertiesOptions() {
+    public Option[] getPropertiesOptions(boolean extras) {
         Properties props = new Properties(System.getProperties());
         String addressStr = props.getProperty(SouthboundITConstants.SERVER_IPADDRESS,
                 SouthboundITConstants.DEFAULT_SERVER_IPADDRESS);
@@ -198,9 +198,11 @@ public class SouthboundIT extends AbstractMdsalTestBase {
                 SouthboundITConstants.DEFAULT_SERVER_PORT);
         String connectionType = props.getProperty(SouthboundITConstants.CONNECTION_TYPE,
                 SouthboundITConstants.CONNECTION_TYPE_ACTIVE);
+        String extrasStr = props.getProperty(SouthboundITConstants.SERVER_EXTRAS,
+                SouthboundITConstants.DEFAULT_SERVER_EXTRAS);
 
-        LOG.info("Using the following properties: mode= {}, ip:port= {}:{}",
-                connectionType, addressStr, portStr);
+        LOG.info("getPropertiesOptions: Using the following properties: mode= {}, ip:port= {}:{}, extras= {}",
+                connectionType, addressStr, portStr, extrasStr);
 
         Option[] options = new Option[] {
                 editConfigurationFilePut(SouthboundITConstants.CUSTOM_PROPERTIES,
@@ -208,17 +210,20 @@ public class SouthboundIT extends AbstractMdsalTestBase {
                 editConfigurationFilePut(SouthboundITConstants.CUSTOM_PROPERTIES,
                         SouthboundITConstants.SERVER_PORT, portStr),
                 editConfigurationFilePut(SouthboundITConstants.CUSTOM_PROPERTIES,
-                        SouthboundITConstants.CONNECTION_TYPE, connectionType)
+                        SouthboundITConstants.CONNECTION_TYPE, connectionType),
+                editConfigurationFilePut(SouthboundITConstants.CUSTOM_PROPERTIES,
+                        SouthboundITConstants.SERVER_EXTRAS, extrasStr)
         };
         return options;
     }
 
-    private void setExtras() {
+
+    public boolean setExtras() {
         Properties props = new Properties(System.getProperties());
-        extras = props.getProperty(SouthboundITConstants.SERVER_EXTRAS,
-                SouthboundITConstants.DEFAULT_SERVER_EXTRAS);
-        LOG.info("extras: {}", extras);
-        System.out.println("extras: " + extras);
+        boolean extras = props.getProperty(SouthboundITConstants.SERVER_EXTRAS,
+                SouthboundITConstants.DEFAULT_SERVER_EXTRAS).equals("true");
+        LOG.info("setExtras: {}", extras);
+        return extras;
     }
 
     @Before
@@ -241,9 +246,10 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         addressStr = bundleContext.getProperty(SouthboundITConstants.SERVER_IPADDRESS);
         portStr = bundleContext.getProperty(SouthboundITConstants.SERVER_PORT);
         connectionType = bundleContext.getProperty(SouthboundITConstants.CONNECTION_TYPE);
+        extrasStr = bundleContext.getProperty(SouthboundITConstants.SERVER_EXTRAS);
 
-        LOG.info("Using the following properties: mode= {}, ip:port= {}:{}",
-                connectionType, addressStr, portStr);
+        LOG.info("setUp: Using the following properties: mode= {}, ip:port= {}:{}, extras= {}",
+                connectionType, addressStr, portStr, extrasStr);
         if (connectionType.equalsIgnoreCase(SouthboundITConstants.CONNECTION_TYPE_ACTIVE)) {
             if (addressStr == null) {
                 fail(usage());
@@ -253,7 +259,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         mdsalUtils = new MdsalUtils(dataBroker);
         setup = true;
 
-        if (extras.equals("true")) {
+        if (extrasStr.equals("true")) {
             isBundleReady(bundleContext, NETVIRT);
             isBundleReady(bundleContext, NETVIRTPROVIDERS);
         }
@@ -359,8 +365,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     private boolean disconnectOvsdbNode(ConnectionInfo connectionInfo) throws InterruptedException {
         Assert.assertTrue(deleteOvsdbNode(connectionInfo));
         Node node = getOvsdbNode(connectionInfo);
-        //Assert.assertNull(node);
-        Assume.assumeNotNull(node);
+        Assert.assertNull(node);
+        //Assume.assumeNotNull(node); // Using assumeNotNull because there is no assumeNull
         LOG.info("Disconnected from {}", connectionInfoToString(connectionInfo));
         return true;
     }
@@ -369,17 +375,19 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     public void testAddDeleteOvsdbNode() throws InterruptedException {
         ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
         Node ovsdbNode = connectOvsdbNode(connectionInfo);
-        //Assert.assertFalse(disconnectOvsdbNode(connectionInfo));
-        Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
+        //Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
     public void testOvsdbNodeOvsVersion() throws InterruptedException {
         ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
         Node ovsdbNode = connectOvsdbNode(connectionInfo);
-        OvsdbNodeAugmentation augment = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class);
-        assertNotNull(augment.getOvsVersion());
-        Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
+        OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class);
+        Assert.assertNotNull(ovsdbNodeAugmentation);
+        assertNotNull(ovsdbNodeAugmentation.getOvsVersion());
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
+        //Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     @Test
@@ -387,7 +395,7 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portStr);
         Node ovsdbNode = connectOvsdbNode(connectionInfo);
         OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class);
-        assertNotNull(ovsdbNodeAugmentation);
+        Assert.assertNotNull(ovsdbNodeAugmentation);
         List<OpenvswitchOtherConfigs> otherConfigsList = ovsdbNodeAugmentation.getOpenvswitchOtherConfigs();
         if (otherConfigsList != null) {
             for (OpenvswitchOtherConfigs otherConfig : otherConfigsList) {
@@ -401,8 +409,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
         } else {
             LOG.info("other_config is not present");
         }
-        //Assert.assertFalse(disconnectOvsdbNode(connectionInfo));
-        Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
+        //Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     private void setManagedBy(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
@@ -425,8 +433,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
                 new OvsdbTerminationPointAugmentationBuilder();
         ovsdbTerminationPointAugmentationBuilder.setInterfaceType(
                 new InterfaceTypeEntryBuilder()
-                .setInterfaceType(
-                        SouthboundMapper.createInterfaceType("internal"))
+                        .setInterfaceType(
+                                SouthboundMapper.createInterfaceType("internal"))
                         .build().getInterfaceType());
         return ovsdbTerminationPointAugmentationBuilder;
     }
@@ -452,7 +460,6 @@ public class SouthboundIT extends AbstractMdsalTestBase {
     }
 
     private boolean addBridge(ConnectionInfo connectionInfo, String bridgeName) throws InterruptedException {
-        //Node node = SouthboundMapper.createNode(connectionInfo);
         NodeBuilder bridgeNodeBuilder = new NodeBuilder();
         InstanceIdentifier<Node> bridgeIid =
                 SouthboundMapper.createInstanceIdentifier(connectionInfo, new OvsdbBridgeName(bridgeName));
@@ -506,8 +513,8 @@ public class SouthboundIT extends AbstractMdsalTestBase {
 
         Assert.assertTrue(deleteBridge(connectionInfo));
 
-        //Assert.assertFalse(disconnectOvsdbNode(connectionInfo));
-        Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
+        Assert.assertTrue(disconnectOvsdbNode(connectionInfo));
+        //Assume.assumeTrue(disconnectOvsdbNode(connectionInfo));
     }
 
     private InstanceIdentifier<Node> getTpIid(ConnectionInfo connectionInfo, OvsdbBridgeAugmentation bridge) {