From 0a6821bb6f0dc84fb3f12ed83115aead064cef62 Mon Sep 17 00:00:00 2001
From: Konstantin Blagov <kblagov@cisco.com>
Date: Tue, 24 Feb 2015 10:01:49 +0100
Subject: [PATCH] Added range type to subject-feature-definition/parameter

Change-Id: If770711b5c947024d0a20227f445dbc12a65eb00
Signed-off-by: Konstantin Blagov <kblagov@cisco.com>
---
 .../renderer/ofoverlay/sf/L4Classifier.java   | 44 ++++++++++++-------
 .../src/main/yang/model/policy.yang           | 15 ++++++-
 2 files changed, 42 insertions(+), 17 deletions(-)
 mode change 100644 => 100755 groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/L4Classifier.java
 mode change 100644 => 100755 groupbasedpolicy/src/main/yang/model/policy.yang

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/L4Classifier.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/L4Classifier.java
old mode 100644
new mode 100755
index 229b47207..da8b8f893
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/L4Classifier.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/sf/L4Classifier.java
@@ -36,29 +36,41 @@ public class L4Classifier extends IpProtoClassifier {
     public static final ClassifierDefinitionId ID = 
             new ClassifierDefinitionId("4250ab32-e8b8-445a-aebb-e1bd2cdd291f");
     private static final String SPORT = "sourceport";
+    private static final String SPORT_RANGE = "sourceport_range";
     private static final String DPORT = "destport";
-    private static final ClassifierDefinition DEF = 
+    private static final String DPORT_RANGE = "destport_range";
+    private static final ClassifierDefinition DEF =
             new ClassifierDefinitionBuilder()
                 .setId(new ClassifierDefinitionId("4250ab32-e8b8-445a-aebb-e1bd2cdd291f"))
                 .setParent(IpProtoClassifier.ID)
                 .setName(new ClassifierName("l4"))
                 .setDescription(new Description("Match on the port number of UDP or TCP traffic"))
                 .setParameter(ImmutableList.of(new ParameterBuilder()
-                        .setName(new ParameterName(SPORT))
-                        .setDescription(new Description("The source port number to match against"))
-                        .setType(Type.Int)
-                        .build(),
-                    new ParameterBuilder()
-                        .setName(new ParameterName(DPORT))
-                        .setDescription(new Description("The destination port number to match against"))
-                        .setType(Type.Int)
-                        .build(),
-                    new ParameterBuilder()
-                        .setName(new ParameterName(TYPE))
-                        .setDescription(new Description("TCP or UDP"))
-                        .setIsRequired(IsRequired.Required)
-                        .setType(Type.String)
-                        .build()))
+                                .setName(new ParameterName(SPORT))
+                                .setDescription(new Description("The source port number to match against"))
+                                .setType(Type.Int)
+                                .build(),
+                        new ParameterBuilder()
+                                .setName(new ParameterName(SPORT_RANGE))
+                                .setDescription(new Description("The source port range to match against"))
+                                .setType(Type.Range)
+                                .build(),
+                        new ParameterBuilder()
+                                .setName(new ParameterName(DPORT))
+                                .setDescription(new Description("The destination port number to match against"))
+                                .setType(Type.Int)
+                                .build(),
+                        new ParameterBuilder()
+                                .setName(new ParameterName(DPORT_RANGE))
+                                .setDescription(new Description("The destination port range to match against"))
+                                .setType(Type.Range)
+                                .build(),
+                        new ParameterBuilder()
+                                .setName(new ParameterName(TYPE))
+                                .setDescription(new Description("TCP or UDP"))
+                                .setIsRequired(IsRequired.Required)
+                                .setType(Type.String)
+                                .build()))
                 .build();
     
     private static final Map<String, Object> tcp = 
diff --git a/groupbasedpolicy/src/main/yang/model/policy.yang b/groupbasedpolicy/src/main/yang/model/policy.yang
old mode 100644
new mode 100755
index f8de33698..53a5a8c9f
--- a/groupbasedpolicy/src/main/yang/model/policy.yang
+++ b/groupbasedpolicy/src/main/yang/model/policy.yang
@@ -439,6 +439,16 @@ module policy {
             leaf int-value {
                 type int64;
             }
+            container range-value {
+                leaf min {
+                    type int64;
+                    mandatory true;
+                }
+                leaf max {
+                    type int64;
+                    mandatory true;
+                }
+            }
         }
     }
 
@@ -560,6 +570,9 @@ module policy {
                     enum int {
                         description "An integer-valued parameter";
                     }
+                    enum range {
+                        description "An integer-range parameter";
+                    }
                 }
             }
             leaf is-required {
@@ -1327,4 +1340,4 @@ module policy {
             }
         }
     }
-}
\ No newline at end of file
+}
-- 
2.36.6