- Fix the SDNIP IPv6 flows installation in the switches

Change-Id: Ida3653a06e6f452c7a185fd3ead92d036abc32d8

- Fix the SDNIP IPv6 flows installation in the switches
Change-Id: Ida3653a06e6f452c7a185fd3ead92d036abc32d8
Pier Luigi Ventre · Gerrit Code Review
Commit b38243fa41a9e426fc78262e90d9a092be7cfa6d b38243fa 1 parent 3b695540
Showing 1 changed file with 5 additions and 5 deletions
apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
--- a/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
View file @b38243f
+++ b/apps/sdnip/src/main/java/org/onosproject/sdnip/PeerConnectivityManager.java
View file @b38243f
@@ -340,15 +340,15 @@ public class PeerConnectivityManager {
     private TrafficSelector buildSelector(byte ipProto, IpAddress srcIp,
                                           IpAddress dstIp, Short srcTcpPort,
                                           Short dstTcpPort) {
-        TrafficSelector.Builder builder = DefaultTrafficSelector.builder()
+        TrafficSelector.Builder builder = DefaultTrafficSelector.builder().matchIPProtocol(ipProto);
-                .matchEthType(Ethernet.TYPE_IPV4)
-                .matchIPProtocol(ipProto);
         if (dstIp.isIp4()) {
-            builder.matchIPSrc(IpPrefix.valueOf(srcIp, IpPrefix.MAX_INET_MASK_LENGTH))
+            builder.matchEthType(Ethernet.TYPE_IPV4)
+                    .matchIPSrc(IpPrefix.valueOf(srcIp, IpPrefix.MAX_INET_MASK_LENGTH))
                     .matchIPDst(IpPrefix.valueOf(dstIp, IpPrefix.MAX_INET_MASK_LENGTH));
         } else {
-            builder.matchIPv6Src(IpPrefix.valueOf(srcIp, IpPrefix.MAX_INET6_MASK_LENGTH))
+            builder.matchEthType(Ethernet.TYPE_IPV6)
+                    .matchIPv6Src(IpPrefix.valueOf(srcIp, IpPrefix.MAX_INET6_MASK_LENGTH))
                     .matchIPv6Dst(IpPrefix.valueOf(dstIp, IpPrefix.MAX_INET6_MASK_LENGTH));
         }