BUG 5746 - Ovsdb QoS and Queue model enhancements

[ovsdb.git] / southbound / southbound-api / src / main / yang / ovsdb.yang

diff --git a/southbound/southbound-api/src/main/yang/ovsdb.yang b/southbound/southbound-api/src/main/yang/ovsdb.yang
index cc276199803b713129dbbcd3d27958a313b0bc94..b5ca74a6c687255b71cd2ba5fc658091849684a6 100755 (executable)
--- a/southbound/southbound-api/src/main/yang/ovsdb.yang
+++ b/southbound/southbound-api/src/main/yang/ovsdb.yang
@@ -34,6 +34,16 @@ module ovsdb {
         type instance-identifier;
     }
 
+    typedef ovsdb-qos-ref {
+        description "A reference to a ovsdb QoS entry";
+        type instance-identifier;
+    }
+
+    typedef ovsdb-queue-ref {
+        description "A reference to an ovsdb queue entry";
+        type instance-identifier;
+    }
+
     typedef ovsdb-bridge-name {
         type string;
     }
@@ -514,9 +524,15 @@ module ovsdb {
                     type uint32;
                 }
 
+                leaf queue-ref {
+                    description "Instance identifier to a Queue in the MD-SAL.";
+                    type ovsdb-queue-ref;
+                }
+
                 leaf queue-uuid {
                     description "The unique identifier of the queue record.";
                     type yang:uuid;
+                    status deprecated;
                 }
             }
             list qos-external-ids {
@@ -702,6 +718,11 @@ module ovsdb {
         base interface-type-base;
     }
 
+    identity interface-type-vxlan-gpe {
+        description "Interface type for vxlan gpe interfaces";
+        base interface-type-base;
+    }
+
     identity interface-type-patch {
         description "Interface type for patch interfaces";
         base interface-type-base;
@@ -781,6 +802,26 @@ module ovsdb {
         base qos-type-base;
     }
 
+    identity qos-type-linux-sfq {
+        description "linux stochastic fairness queueing classifier";
+        base qos-type-base;
+    }
+
+    identity qos-type-linux-codel {
+        description "linux controlled delay classifier";
+        base qos-type-base;
+    }
+
+    identity qos-type-linux-fq-codel {
+        description "linux fair queueing controlled delay classifier";
+        base qos-type-base;
+    }
+
+    identity qos-type-egress-policer {
+        description "DPDK user space egress policer";
+        base qos-type-base;
+    }
+
     grouping ovsdb-port-interface-attributes {
         leaf port-uuid {
             description "The unique identifier of the OVSDB port";
@@ -836,7 +877,6 @@ module ovsdb {
 
         list trunks {
             description "Represents the trunks of a termination point.";
-            key "trunk";
             leaf trunk {
                 type ethertype:vlan-id;
             }
@@ -1217,7 +1257,7 @@ module ovsdb {
                        last change in session state. The error messages are defined in
                        section 4.1 of [RFC 5880].
 
-                bfd_status : flap_count: optional string, 
+                bfd_status : flap_count: optional string,
                        containing an integer, minimum 0
                        Counts the number of bfd_status:forwarding flaps since start.
                        A flap is considered as a change of the bfd_status:forwarding value.";
@@ -1235,8 +1275,40 @@ module ovsdb {
 
         leaf qos {
             description "The unique identifier of the QoS entry for this port.";
+            status deprecated;
             type yang:uuid;
         }
+
+        list qos-entry {
+            key "qos-key";
+            max-elements 1;
+            leaf qos-key {
+                description "Fixed key to reference the QoS entry in MD-SAL.";
+                type uint32 {
+                    range "1..1";
+                }
+                mandatory true;
+            }
+            leaf qos-ref {
+                description "Instance identifier of a QoS entry in the MD-SAL.";
+                type ovsdb-qos-ref;
+                mandatory true;
+            }
+        }
+
+        leaf ingress-policing-rate {
+            description "Maximum rate for data received on this interface in kbps.
+                Data received faster than this rate is dropped.  Set to 0 (default)
+                to disable policing";
+            type uint32;
+        }
+
+        leaf ingress-policing-burst {
+            description "Maximum burst size for data received on this interface in kb.
+                The default burst size if set to 0 is 1000 kb.  This value has no
+                effect if ingress-policing-rate is 0.";
+            type uint32;
+        }
     }
 
     augment "/topo:network-topology/topo:topology/topo:node" {