Removed extra IpAddress.toInt() calls, which are not needed.

Change-Id: Ic295d0e4ca963b15eb4ebf905d6360e457832c8f

Removed extra IpAddress.toInt() calls, which are not needed.
Change-Id: Ic295d0e4ca963b15eb4ebf905d6360e457832c8f
Pavlin Radoslavov
Commit 211f4e562cf5c3d4939c80d9480a3fd55cb9f1de 211f4e56 1 parent 379ff9b1
Showing 2 changed files with 14 additions and 14 deletions
apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
View file @211f4e5
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/PeerConnectivityManager.java
View file @211f4e5
@@ -147,9 +147,9 @@ public class PeerConnectivityManager {
                 TrafficSelector selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_TCP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .matchTcpDst((short) BgpConstants.BGP_PORT)
                         .build();
@@ -170,9 +170,9 @@ public class PeerConnectivityManager {
                 selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_TCP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .matchTcpSrc((short) BgpConstants.BGP_PORT)
                         .build();
@@ -190,9 +190,9 @@ public class PeerConnectivityManager {
                 selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_TCP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .matchTcpDst((short) BgpConstants.BGP_PORT)
                         .build();
@@ -210,9 +210,9 @@ public class PeerConnectivityManager {
                 selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_TCP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .matchTcpSrc((short) BgpConstants.BGP_PORT)
                         .build();
@@ -280,9 +280,9 @@ public class PeerConnectivityManager {
                 TrafficSelector selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_ICMP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .build();
 
@@ -300,9 +300,9 @@ public class PeerConnectivityManager {
                 selector = DefaultTrafficSelector.builder()
                         .matchEthType(Ethernet.TYPE_IPV4)
                         .matchIPProtocol(IPv4.PROTOCOL_ICMP)
-                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress.toInt(),
+                         .matchIPSrc(IpPrefix.valueOf(bgpdPeerAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
-                         .matchIPDst(IpPrefix.valueOf(bgpdAddress.toInt(),
+                         .matchIPDst(IpPrefix.valueOf(bgpdAddress,
                                 IpPrefix.MAX_INET_MASK_LENGTH))
                         .build();
 
--- a/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
View file @211f4e5
+++ b/apps/sdnip/src/main/java/org/onlab/onos/sdnip/bgp/BgpSession.java
View file @211f4e5
@@ -1241,8 +1241,8 @@ public class BgpSession extends SimpleChannelHandler {
             }
             address <<= extraShift;
             IpPrefix prefix =
-                 IpPrefix.valueOf(IpAddress.valueOf((int) address).toInt(),
-                               (short) prefixBitlen);
+                 IpPrefix.valueOf(IpAddress.valueOf((int) address),
+                                  prefixBitlen);
             result.add(prefix);
         }