Rename vpp-acl model to vpp-classfier-acl

Current acl implementation uses vpp's classfier.
The vpp-acl model will be used to expose new acl api.

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

4 files changed, 22 insertions, 22 deletions

diff --git a/v3po/api/src/main/yang/ietf-acl-context.yang b/v3po/api/src/main/yang/ietf-acl-context.yang
index 71bfb73e4..875e7f2c8 100644
--- a/v3po/api/src/main/yang/ietf-acl-context.yang
+++ b/v3po/api/src/main/yang/ietf-acl-context.yang
@@ -3,7 +3,7 @@ module ietf-acl-context {
     namespace "urn:opendaylight:params:xml:ns:yang:vpp:acl:context";
     prefix "nc";
 
-    description "Context for nat mapping";
+    description "Context for ietf-acl assignment mapping";
 
     revision "2016-12-14" {
         description "Initial revision.";
diff --git a/v3po/api/src/main/yang/v3po.yang b/v3po/api/src/main/yang/v3po.yang
index bc464646e..f503afe2b 100644
--- a/v3po/api/src/main/yang/v3po.yang
+++ b/v3po/api/src/main/yang/v3po.yang
@@ -36,8 +36,8 @@ module v3po {
   import yang-ext {
     prefix "ext";
   }
-  import vpp-acl {
-    prefix "vpp-acl";
+  import vpp-classfier-acl {
+    prefix "vpp-classfier-acl";
   }
 
   typedef bridge-domain-ref {
@@ -518,19 +518,19 @@ module v3po {
 
     container acl {
       container ingress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
     }
 
     container ietf-acl {
       container ingress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
     }
 
@@ -613,19 +613,19 @@ module v3po {
 
     container acl {
       container ingress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
     }
 
     container ietf-acl {
       container ingress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
     }
 
diff --git a/v3po/api/src/main/yang/vpp-acl.yang b/v3po/api/src/main/yang/vpp-classfier-acl.yang
index f0c93f45e..99567799f 100644
--- a/v3po/api/src/main/yang/vpp-acl.yang
+++ b/v3po/api/src/main/yang/vpp-classfier-acl.yang
@@ -1,11 +1,11 @@
-module vpp-acl {
+module vpp-classfier-acl {
   yang-version 1;
-  namespace "urn:opendaylight:params:xml:ns:yang:vpp:acl";
-  prefix "vpp-acl";
+  namespace "urn:opendaylight:params:xml:ns:yang:vpp:classfier:acl";
+  prefix "vpp-classfier-acl";
 
   revision "2016-12-14" {
     description
-      "Initial revision of vpp-acl model.";
+      "Initial revision of vpp-classfier-acl model.";
   }
 
   import ietf-access-control-list {
@@ -138,7 +138,7 @@ module vpp-acl {
   }
 
   augment /acl:access-lists/acl:acl/acl:access-list-entries/acl:ace/acl:matches/acl:ace-type {
-    ext:augment-identifier "vpp-acl-type-augmentation";
+    ext:augment-identifier "vpp-classfier-acl-type-augmentation";
     case ace-ip-and-eth {
       description
         "Access List entry that can define both ip and eth rules.";
diff --git a/v3po/api/src/main/yang/vpp-vlan.yang b/v3po/api/src/main/yang/vpp-vlan.yang
index cd3d320ee..383e70f1a 100644
--- a/v3po/api/src/main/yang/vpp-vlan.yang
+++ b/v3po/api/src/main/yang/vpp-vlan.yang
@@ -33,8 +33,8 @@ module vpp-vlan {
   import v3po {
     prefix v3po;
   }
-  import vpp-acl {
-    prefix vpp-acl;
+  import vpp-classfier-acl {
+    prefix vpp-classfier-acl;
   }
 
   typedef sub-interface-status {
@@ -170,19 +170,19 @@ module vpp-vlan {
 
     container acl {
       container ingress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:acl-base-attributes;
+        uses vpp-classfier-acl:acl-base-attributes;
       }
     }
 
     container ietf-acl {
       container ingress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
       container egress {
-        uses vpp-acl:ietf-acl-base-attributes;
+        uses vpp-classfier-acl:ietf-acl-base-attributes;
       }
     }
   }