HC2VPP-55: policer&policer assignment CRUD support

Change-Id: I627d2a56ab2a282744ea0172b4a0c72240b0032f
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>

2 files changed, 25 insertions, 20 deletions

diff --git a/vpp-classifier/api/src/main/yang/interface-policer.yang b/vpp-classifier/api/src/main/yang/interface-policer.yang
index d92faa9bf..2fd7b6b83 100644
--- a/vpp-classifier/api/src/main/yang/interface-policer.yang
+++ b/vpp-classifier/api/src/main/yang/interface-policer.yang
@@ -27,23 +27,25 @@ module interface-policer {
     }
 
     grouping interface-policer-attributes {
-        description
-            "Defines references to policer classify tables.
-            At least one table reference should be specified.";
-        leaf l2-table {
-            type vpp-classifier:classify-table-ref;
+        container policer {
             description
-                "An L2 policer table";
-        }
-        leaf ip4-table {
-            type vpp-classifier:classify-table-ref;
-            description
-                "An IPv4 policer table";
-        }
-        leaf ip6-table {
-            type vpp-classifier:classify-table-ref;
-            description
-                "An IPv6 policer table";
+                "Defines references to policer classify tables.
+                 At least one table reference should be specified.";
+            leaf l2-table {
+                type vpp-classifier:classify-table-ref;
+                description
+                    "An L2 policer table";
+            }
+            leaf ip4-table {
+                type vpp-classifier:classify-table-ref;
+                description
+                    "An IPv4 policer table";
+            }
+            leaf ip6-table {
+                type vpp-classifier:classify-table-ref;
+                description
+                    "An IPv6 policer table";
+            }
         }
     }
 
diff --git a/vpp-classifier/api/src/main/yang/policer.yang b/vpp-classifier/api/src/main/yang/policer.yang
index 1f730b6a5..637967128 100644
--- a/vpp-classifier/api/src/main/yang/policer.yang
+++ b/vpp-classifier/api/src/main/yang/policer.yang
@@ -91,7 +91,7 @@ module policer {
         "transmit action type in a meter";
     }
 
-    typedef vpp-dcsp-type {
+    typedef vpp-dscp-type {
         description
             "DSCP field values supported by VPP";
         type enumeration {
@@ -162,9 +162,9 @@ module policer {
         default CS0;
     }
 
-    typedef dcsp-type {
+    typedef dscp-type {
         type union {
-            type vpp-dcsp-type;
+            type vpp-dscp-type;
             type inet:dscp;
         }
     }
@@ -182,7 +182,7 @@ module policer {
       }
       leaf dscp {
         when "../meter-action-type = meter-action-mark-dscp";
-        type dcsp-type;
+        type dscp-type;
         description
           "dscp marking";
       }
@@ -217,12 +217,15 @@ module policer {
             type boolean;
         }
         container conform-action {
+            presence "Defines conform action";
             uses meter-action-params;
         }
         container exceed-action {
+            presence "Defines exceed action";
             uses meter-action-params;
         }
         container violate-action {
+            presence "Defines violate action";
             uses meter-action-params;
         }
     }