commit 6d75dbfd8507acbad3d2bda466011de6089512a6
author samuel <jiangchuncheng@huawei.com> Mon Aug 03 10:06:10 2015 +0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Aug 03 17:10:59 2015 +0000
tree 7f719bece4e34b30f802c07621a3330dff4e1800
parent a5e17fc2c2ed07dcd0e4005b2d4fdb2e091a37fe

[ONOS-2512]Fix the bug that catch the node ip and port is wrong in
OvsdbTunnelConfig and OvsdbBridgeConfig

Change-Id: I36da6d2196ca8b2372dd8f70b3c25582fbfdea70

drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java

diff --git a/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java
index a5c5474..54f95a6 100644
--- a/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java
+++ b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbBridgeConfig.java
@@ -120,7 +120,7 @@
     private OvsdbNodeId changeDeviceIdToNodeId(DeviceId deviceId) {
         int lastColon = deviceId.toString().lastIndexOf(":");
         int fistColon = deviceId.toString().indexOf(":");
-        String ip = deviceId.toString().substring(fistColon + 1, lastColon - 1);
+        String ip = deviceId.toString().substring(fistColon + 1, lastColon);
         String port = deviceId.toString().substring(lastColon + 1);
         IpAddress ipAddress = IpAddress.valueOf(ip);
         long portL = Long.valueOf(port).longValue();

drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbTunnelConfig.java

diff --git a/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbTunnelConfig.java b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbTunnelConfig.java
index e07bd53..665c21e 100644
--- a/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbTunnelConfig.java
+++ b/drivers/src/main/java/org/onosproject/driver/ovsdb/OvsdbTunnelConfig.java
@@ -111,7 +111,7 @@
     private OvsdbNodeId changeDeviceIdToNodeId(DeviceId deviceId) {
         int lastColon = deviceId.toString().lastIndexOf(":");
         int fistColon = deviceId.toString().indexOf(":");
-        String ip = deviceId.toString().substring(fistColon + 1, lastColon - 1);
+        String ip = deviceId.toString().substring(fistColon + 1, lastColon);
         String port = deviceId.toString().substring(lastColon + 1);
         IpAddress ipAddress = IpAddress.valueOf(ip);
         long portL = Long.valueOf(port).longValue();