updating neutron-qos yang file for Qos Rule Types to change the model from Config...

[neutron.git] / model / src / main / yang / neutron-metering.yang

diff --git a/model/src/main/yang/neutron-metering.yang b/model/src/main/yang/neutron-metering.yang
index bed8e14ff37dfd8517b9b6ad85e892b2afd3202a..767f8f4e36ccab0dc48745f8389931572d790dbf 100644 (file)
--- a/model/src/main/yang/neutron-metering.yang
+++ b/model/src/main/yang/neutron-metering.yang
@@ -14,8 +14,7 @@ module neutron-metering {
     prefix neutron-metering;
 
     import ietf-yang-types { prefix "yang"; }
-    // It requires rfc6991 (revision 2013-07-15), but odl don't have it, so this patch verify build will fail.
-    import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; }
+    import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; }
     import neutron-attrs { prefix "attrs"; }
     import neutron-constants { prefix "constants"; }
 
@@ -32,18 +31,23 @@ module neutron-metering {
 
     grouping metering-label-attributes {
         description "OpenStack Layer3 Metering label information.";
-        leaf description {
-            type string;
-            description "Description for the metering label.";
+        leaf shared {
+            type boolean;
+            description "Indicates whether this metering label is shared across all tenants.";
+            default "false";
         }
     }
 
     grouping metering-rule-attributes {
         description "OpenStack Layer3 Metering label rules.";
-        leaf id {
+        leaf uuid {
             type yang:uuid;
             description "Metering Rule ID.";
         }
+        leaf tenant-id {
+            type yang:uuid;
+            description "The UUID of the tenant that will own the object.";
+        }
         leaf direction {
             type identityref {
                 base "constants:direction-base";
@@ -60,7 +64,7 @@ module neutron-metering {
         }
         leaf excluded {
             type boolean;
-            description "Specify whether the remote_ip_prefix 
+            description "Specify whether the remote_ip_prefix
                 will be excluded or not from traffic counters of
                 the metering label, ie: to not count the traffic
                 of a specific IP address of a range.";
@@ -84,7 +88,7 @@ module neutron-metering {
         container metering-rules {
             description " Container for metering rules.";
             list metering-rule {
-                key "id";
+                key "uuid";
                 uses metering-rule-attributes;
                 description "List of Metering Rules.";
             }