Change monitorOVS to static factory.

Signed-off-by: Evan Zeller <evanrzeller@gmail.com>

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java
index 063ece74b4a71429ccd66445a27073457e442222..7483d70cfc0778a4146171223d2f1af04b8bd585 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java
@@ -21,7 +21,7 @@ public class OVSInstance {
     }\r
 \r
     @SuppressWarnings("unchecked")\r
-    public void monitorOVS(Connection connection){\r
+    public static OVSInstance monitorOVS(Connection connection){\r
         List<String> columns = new ArrayList<String>();\r
         columns.add("_uuid");\r
         columns.add("bridges");\r
@@ -46,8 +46,10 @@ public class OVSInstance {
 \r
         Map<String, Object> vSwitchTable = (Map) monitorResponse.get("Open_vSwitch");\r
         if(vSwitchTable != null){\r
-            this.uuid = (String) vSwitchTable.keySet().toArray()[0];\r
+            String uuid = (String) vSwitchTable.keySet().toArray()[0];\r
+            return new OVSInstance(uuid);\r
         }\r
+        return null;\r
     }\r
 \r
     public String getUuid(){\r

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
index e9cd772e0c4eda67b29f3f4acfe5c543d4a771c8..87b61a61a785c46f47de0f1af74344edce2c288e 100755 (executable)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
+++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java
@@ -84,8 +84,7 @@ public class ConfigurationService implements IPluginInNetworkConfigurationServic
 
                 Object addSwitchRequest;
 
-                OVSInstance instance = new OVSInstance();
-                instance.monitorOVS(connection);
+                OVSInstance instance = OVSInstance.monitorOVS(connection);
 
                 if(instance.getUuid() != null){
                     List<String> bridgeUuidPair = new ArrayList<String>();

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
index d36cf887b2af5ea005981dc6a3d27fbb61604168..3c963b9920eb208f0f2e62794e465f64d0027361 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java
@@ -24,7 +24,7 @@ public class OvsdbTestAddBridge {
         connectionService.init();\r
         String identifier = "TEST";\r
         Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();\r
-        params.put(ConnectionConstants.ADDRESS, "172.16.58.170");\r
+        params.put(ConnectionConstants.ADDRESS, "192.168.56.101");\r
 \r
         Node node = connectionService.connect(identifier, params);\r
         if(node == null){\r

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java
index d7ce714ad76a690c969e191f8e1b4d7811cf9347..d77de3b774e716ad8df5be96c706e1cb29ac0151 100755 (executable)
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java
@@ -24,7 +24,7 @@ public class OvsdbTestAddPort {
         connectionService.init();
         String identifier = "TEST";
         Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
-        params.put(ConnectionConstants.ADDRESS, "172.16.58.170");
+        params.put(ConnectionConstants.ADDRESS, "192.168.56.101");
 
         Node node = connectionService.connect(identifier, params);
         if(node == null){

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java
old mode 100644 (file)
new mode 100755 (executable)
index 50f1c44..8d49e86
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java
@@ -40,7 +40,7 @@ public class OvsdbTestAddTunnel {
         String tunnelendpoint = "192.168.100.100";
 
         Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
-        params.put(ConnectionConstants.ADDRESS, "172.16.58.170");
+        params.put(ConnectionConstants.ADDRESS, "192.168.56.101");
 
         Node node = connectionService.connect(identifier, params);
         if(node == null){

diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java
old mode 100644 (file)
new mode 100755 (executable)
index e0268e5..f4d9d3e
--- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java
+++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java
@@ -24,7 +24,7 @@ public class OvsdbTestAddVlan {
         connectionService.init();
         String identifier = "TEST";
         Map<ConnectionConstants, String> params = new HashMap<ConnectionConstants, String>();
-        params.put(ConnectionConstants.ADDRESS, "172.16.58.170");
+        params.put(ConnectionConstants.ADDRESS, "192.168.56.101");
         int vlanid = 100;
 
         Node node = connectionService.connect(identifier, params);