Implementation of IP address classifier.

[groupbasedpolicy.git] / renderers / ofoverlay / src / main / java / org / opendaylight / groupbasedpolicy / renderer / ofoverlay / sf / IpProtoClassifier.java

diff --git a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/IpProtoClassifier.java b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/IpProtoClassifier.java
index e105bc76bf8f37fdbd94befa1b29d914c4f8fa43..cf175f594e6786d92b580e484a985b5af4768f3c 100644 (file)
--- a/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/IpProtoClassifier.java
+++ b/renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/IpProtoClassifier.java
@@ -32,7 +32,7 @@ import com.google.common.collect.ImmutableMap;
 /**
  * Match on the IP protocol of IP traffic
  */
-public class IpProtoClassifier extends EtherTypeClassifier {
+public class IpProtoClassifier extends IpAddressClassifier {
     public static final ClassifierDefinitionId ID = 
             new ClassifierDefinitionId("79c6fdb2-1e1a-4832-af57-c65baf5c2335");
     protected static final String PROTO = "proto";
@@ -50,11 +50,6 @@ public class IpProtoClassifier extends EtherTypeClassifier {
                     .build()))
                 .build();
 
-    private static final Map<String, Object> ipv4 = 
-        ImmutableMap.<String,Object>of(TYPE, FlowUtils.IPv4);
-    private static final Map<String, Object> ipv6 = 
-            ImmutableMap.<String,Object>of(TYPE, FlowUtils.IPv6);
-
     @Override
     public ClassifierDefinitionId getId() {
         return ID;
@@ -75,8 +70,7 @@ public class IpProtoClassifier extends EtherTypeClassifier {
         
         ArrayList<MatchBuilder> r = new ArrayList<>();
         for (MatchBuilder b : matches) {
-            r.addAll(updateMatch(new MatchBuilder(b.build()), proto, ipv4));
-            r.addAll(updateMatch(new MatchBuilder(b.build()), proto, ipv6));
+            r.addAll(updateMatch(new MatchBuilder(b.build()), proto, params));
         }
         return r;
     }