commit 87dd930f2edf1c4d18f63d6a9f6ae48b864bacb0
author Pavlin Radoslavov <pavlin@onlab.us> Tue Mar 10 13:53:24 2015 -0700
committer Pavlin Radoslavov <pavlin@onlab.us> Tue Mar 10 13:53:24 2015 -0700
tree b96c4e3a26762d11060b1726a8b43ab401b9ed74
parent 34ffe727537d5943547b618793d5929c861aca15

Use a cleaner mechanism to test whether an IP address or prefix
is IPv4 or IPv6.

Change-Id: Ia88f76be87a30573a50eeeedb78d98713ac1ae27

apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
index c10df94..cc65ccc 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/IntentSynchronizer.java
@@ -17,7 +17,6 @@
 
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import org.onlab.packet.Ethernet;
-import org.onlab.packet.Ip4Address;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
@@ -315,7 +314,7 @@
 
         // Match the destination IP prefix at the first hop
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
-        if (prefix.version() == Ip4Address.VERSION) {
+        if (prefix.isIp4()) {
             selector.matchEthType(Ethernet.TYPE_IPV4);
             selector.matchIPDst(prefix);
         } else {

apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java

diff --git a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
index caca1cf..fd99c6a 100644
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
@@ -18,7 +18,6 @@
 import org.onlab.packet.Ethernet;
 import org.onlab.packet.IPv4;
 import org.onlab.packet.IPv6;
-import org.onlab.packet.Ip4Address;
 import org.onlab.packet.IpAddress;
 import org.onlab.packet.IpPrefix;
 import org.onosproject.core.ApplicationId;
@@ -175,7 +174,7 @@
         byte tcpProtocol;
         byte icmpProtocol;
 
-        if (bgpdAddress.version() == Ip4Address.VERSION) {
+        if (bgpdAddress.isIp4()) {
             tcpProtocol = IPv4.PROTOCOL_TCP;
             icmpProtocol = IPv4.PROTOCOL_ICMP;
         } else {
@@ -261,7 +260,7 @@
                                           Short dstTcpPort) {
         TrafficSelector.Builder builder = null;
 
-        if (dstIp.version() == Ip4Address.VERSION) {
+        if (dstIp.isIp4()) {
             builder = DefaultTrafficSelector.builder()
                     .matchEthType(Ethernet.TYPE_IPV4)
                     .matchIPProtocol(ipProto)