Replace String Literals in ITs with constants

Code cleanup.
Replace String literals in Integration Tests with contants.

Change-Id: Ib5d2d181edb3b4b2f47be67778aadcb843d2f8f8
Signed-off-by: Dave Tucker <dave@dtucker.co.uk>

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridgeIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridgeIT.java
index f58b19b41df6d4c62546f24f29ea0d9441486123..53540804d766a195c82d9f54497b873dd892b984 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridgeIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridgeIT.java
@@ -33,7 +33,7 @@ public class OvsdbTestAddBridgeIT extends OvsdbTestBase {
          */\r
         ConfigurationService configurationService = new ConfigurationService();\r
         configurationService.setConnectionServiceInternal(connectionService);\r
-        configurationService.createBridgeDomain(node, "JUNIT_BRIDGE_TEST", null);\r
+        configurationService.createBridgeDomain(node, BRIDGE_NAME, null);\r
     }\r
 \r
 }\r

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPortIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPortIT.java
index adafe4c5c9a452b0449cbc2a675b281aa601550d..c9f089946a63a430337d29633e6a315d93c69315 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPortIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPortIT.java
@@ -43,6 +43,6 @@ public class OvsdbTestAddPortIT extends OvsdbTestBase {
          */
         ConfigurationService configurationService = new ConfigurationService();
         configurationService.setConnectionServiceInternal(connectionService);
-        configurationService.addPort(node, "JUNIT_BRIDGE_TEST", "Jvif0", null);
+        configurationService.addPort(node, BRIDGE_NAME, PORT_NAME, null);
     }
 }
\ No newline at end of file

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnelIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnelIT.java
index 0c38f31cc5c1d0d09bf59c9f71936afef194be58..32029ba8ad21c4ccd58b7805a4d0ba69a8f5ea4c 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnelIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnelIT.java
@@ -41,7 +41,7 @@ public class OvsdbTestAddTunnelIT extends OvsdbTestBase {
 
         Encapsulation encap = Encapsulation.VXLAN;
         String tunencap = encap.toString();
-        String tunnelendpoint = "192.168.100.100";
+        String tunnelendpoint = FAKE_IP;
 
         /**
          * Create an Encapsulated Tunnel Interface and destination Tunnel Endpoint
@@ -62,7 +62,7 @@ public class OvsdbTestAddTunnelIT extends OvsdbTestBase {
         configs.put(ConfigConstants.TUNNEL_TYPE, tunencap);
         configs.put(ConfigConstants.DEST_IP, tunnelendpoint);
 
-        configurationService.addPort(node, "JUNIT_BRIDGE_TEST", "Jtunnel0", configs);
+        configurationService.addPort(node, BRIDGE_NAME, TUNNEL_PORT_NAME, configs);
 
     }
 }
\ No newline at end of file

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlanIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlanIT.java
index ee66acde9278b4e47661c51deec83acd7480468f..496a976796eb4aa19bfdf76dbf71feefa3ad8d62 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlanIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlanIT.java
@@ -44,6 +44,6 @@ public class OvsdbTestAddVlanIT extends OvsdbTestBase {
         Map<ConfigConstants, Object> configs = new HashMap<ConfigConstants, Object>();
         configs.put(ConfigConstants.TYPE, "VLAN");
         configs.put(ConfigConstants.VLAN, vlanid+"");
-        configurationService.addPort(node, "JUNIT_BRIDGE_TEST", "Jtagvif0", configs);
+        configurationService.addPort(node, BRIDGE_NAME, TAGGED_PORT_NAME, configs);
     }
 }
\ No newline at end of file

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java
index fd43fdfd3567cb428b5a856f3fee17a7cdb40396..3bdbefbcc300cba31d031f2af516c0aaeafdd29c 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBase.java
@@ -21,6 +21,11 @@ import org.opendaylight.controller.sal.core.NodeConnector;
 
 public abstract class OvsdbTestBase {
     private final static String identifier = "TEST";
+    protected final static String BRIDGE_NAME = "JUNIT_TEST_BRIDGE";
+    protected final static String PORT_NAME = "eth0";
+    protected final static String TAGGED_PORT_NAME = "eth1";
+    protected final static String TUNNEL_PORT_NAME = "vxlan0";
+    protected final static String FAKE_IP = "192.168.254.254";
 
     public Properties loadProperties() throws IOException {
         InputStream is = this

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
index bc0eb13603871d7bbb81de9f1eac673608393a1d..d8891f91e65307ff7b0354b2e68cc36f957bfbe1 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestBridgeConfigIT.java
@@ -31,13 +31,13 @@ public class OvsdbTestBridgeConfigIT extends OvsdbTestBase {
         Map<ConfigConstants, Object> configs = new HashMap<ConfigConstants, Object>();
 
         Map<String, String> exterIDPairs = new HashMap<String, String>();
-        exterIDPairs.put("bridge-foo", "bri-bar");
+        exterIDPairs.put("br-foo", "br-bar");
         //Will accept multiple array pairs. Pairs must be arrays not maps.
         configs.put(ConfigConstants.CUSTOM, exterIDPairs);
 
         ConfigurationService configurationService = new ConfigurationService();
         configurationService.setConnectionServiceInternal(connectionService);
-        configurationService.addBridgeDomainConfig(node, "br0", configs);
+        configurationService.addBridgeDomainConfig(node, BRIDGE_NAME, configs);
     }
 
 }
\ No newline at end of file

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
index 17673a66c805c8476736dec0ea8f327f718752f4..c52d60751fe9176259e287d6fdf418aee1ba600a 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestDeletePortIT.java
@@ -38,6 +38,6 @@ public class OvsdbTestDeletePortIT extends OvsdbTestBase {
 
         ConfigurationService configurationService = new ConfigurationService();
         configurationService.setConnectionServiceInternal(connectionService);
-        configurationService.deletePort(node, "ovsbr0", "tap2");
+        configurationService.deletePort(node, BRIDGE_NAME, PORT_NAME);
     }
 }

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManagerIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManagerIT.java
index cdff94ef81daeb41d253e0c85048b6197fb4fedd..4dba778569926ce76bb022db9e2584ceafc56765 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManagerIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManagerIT.java
@@ -24,6 +24,13 @@ public class OvsdbTestSetManagerIT extends OvsdbTestBase {
         ConnectionService connectionService = testObjects.connectionService;\r
         Node node = testObjects.node;\r
 \r
+\r
+        String port = "6634";\r
+        String host = FAKE_IP;\r
+        String connectionType = "ptcp";\r
+\r
+        String manager = connectionType + ":" + host + ":" + port;\r
+\r
         /**\r
          * Implements the OVS Connection for Managers\r
          *\r
@@ -33,7 +40,7 @@ public class OvsdbTestSetManagerIT extends OvsdbTestBase {
          */\r
         ConfigurationService configurationService = new ConfigurationService();\r
         configurationService.setConnectionServiceInternal(connectionService);\r
-        configurationService.setManager(node, "ptcp:6634:172.16.58.128");\r
+        configurationService.setManager(node, manager);\r
     }\r
 \r
 }\r

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControllerIT.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControllerIT.java
index 763414d53c5a6683cb81a50f46a45d66c6c160bb..e7d9737cd8882637790091d2ea806e7c2362ba6c 100644 (file)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControllerIT.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetOFControllerIT.java
@@ -33,7 +33,7 @@ public class OvsdbTestSetOFControllerIT extends OvsdbTestBase {
         configs.put(ConfigConstants.CUSTOM, "6633");
         ConfigurationService configurationService = new ConfigurationService();
         configurationService.setConnectionServiceInternal(connectionService);
-        configurationService.setBridgeOFController(node, "br0");
+        configurationService.setBridgeOFController(node, BRIDGE_NAME);
 
     }
 }