X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=test%2Fvpp_qos.py;h=a7374d1b1d8212766636df1920963f53106f7bd2;hb=d3b47c6d796bfe31d3495c74f6626f659fa570bb;hp=0577863ef8cadb3fcbea0bfe4a90d86115015836;hpb=5281a9029ea56f397a37ea1cf478ac526882770a;p=vpp.git

diff --git a/test/vpp_qos.py b/test/vpp_qos.py
index 0577863ef8c..a7374d1b1d8 100644
--- a/test/vpp_qos.py
+++ b/test/vpp_qos.py
@@ -8,7 +8,7 @@ from vpp_object import VppObject
 
 
 class VppQosRecord(VppObject):
-    """ QoS Record(ing) configuration """
+    """QoS Record(ing) configuration"""
 
     def __init__(self, test, intf, source):
         self._test = test
@@ -18,32 +18,77 @@ class VppQosRecord(VppObject):
     def add_vpp_config(self):
         self._test.vapi.qos_record_enable_disable(
             enable=1,
-            record={'sw_if_index': self.intf.sw_if_index,
-                    'input_source': self.source})
+            record={"sw_if_index": self.intf.sw_if_index, "input_source": self.source},
+        )
         self._test.registry.register(self, self._test.logger)
         return self
 
     def remove_vpp_config(self):
         self._test.vapi.qos_record_enable_disable(
             enable=0,
-            record={'sw_if_index': self.intf.sw_if_index,
-                    'input_source': self.source})
+            record={"sw_if_index": self.intf.sw_if_index, "input_source": self.source},
+        )
 
     def query_vpp_config(self):
         rs = self._test.vapi.qos_record_dump()
 
         for r in rs:
-            if self.intf.sw_if_index == r.record.sw_if_index and \
-               self.source == r.record.input_source:
+            if (
+                self.intf.sw_if_index == r.record.sw_if_index
+                and self.source == r.record.input_source
+            ):
                 return True
         return False
 
     def object_id(self):
-        return ("qos-record-%s-%d" % (self.intf, self.source))
+        return "qos-record-%s-%d" % (self.intf, self.source)
+
+
+class VppQosStore(VppObject):
+    """QoS Store(ing) configuration"""
+
+    def __init__(self, test, intf, source, value):
+        self._test = test
+        self.intf = intf
+        self.source = source
+        self.value = value
+
+    def add_vpp_config(self):
+        self._test.vapi.qos_store_enable_disable(
+            enable=1,
+            store={
+                "sw_if_index": self.intf.sw_if_index,
+                "input_source": self.source,
+                "value": self.value,
+            },
+        )
+        self._test.registry.register(self, self._test.logger)
+        return self
+
+    def remove_vpp_config(self):
+        self._test.vapi.qos_store_enable_disable(
+            enable=0,
+            store={"sw_if_index": self.intf.sw_if_index, "input_source": self.source},
+        )
+
+    def query_vpp_config(self):
+        rs = self._test.vapi.qos_store_dump()
+
+        for r in rs:
+            if (
+                self.intf.sw_if_index == r.store.sw_if_index
+                and self.source == r.store.input_source
+                and self.value == r.store.value
+            ):
+                return True
+        return False
+
+    def object_id(self):
+        return "qos-store-%s-%d" % (self.intf, self.source)
 
 
 class VppQosEgressMap(VppObject):
-    """ QoS Egress Map(ping) configuration """
+    """QoS Egress Map(ping) configuration"""
 
     def __init__(self, test, id, rows):
         self._test = test
@@ -51,9 +96,7 @@ class VppQosEgressMap(VppObject):
         self.rows = rows
 
     def add_vpp_config(self):
-        self._test.vapi.qos_egress_map_update(
-            map={'id': self.id,
-                 'rows': self.rows})
+        self._test.vapi.qos_egress_map_update(map={"id": self.id, "rows": self.rows})
         self._test.registry.register(self, self._test.logger)
         return self
 
@@ -69,11 +112,11 @@ class VppQosEgressMap(VppObject):
         return False
 
     def object_id(self):
-        return ("qos-map-%d" % (self.id))
+        return "qos-map-%d" % (self.id)
 
 
 class VppQosMark(VppObject):
-    """ QoS Mark(ing) configuration """
+    """QoS Mark(ing) configuration"""
 
     def __init__(self, test, intf, map, source):
         self._test = test
@@ -84,27 +127,32 @@ class VppQosMark(VppObject):
     def add_vpp_config(self):
         self._test.vapi.qos_mark_enable_disable(
             enable=1,
-            mark={'sw_if_index': self.intf.sw_if_index,
-                  'map_id': self.map.id,
-                  'output_source': self.source})
+            mark={
+                "sw_if_index": self.intf.sw_if_index,
+                "map_id": self.map.id,
+                "output_source": self.source,
+            },
+        )
         self._test.registry.register(self, self._test.logger)
         return self
 
     def remove_vpp_config(self):
         self._test.vapi.qos_mark_enable_disable(
             enable=0,
-            mark={'sw_if_index': self.intf.sw_if_index,
-                  'output_source': self.source})
+            mark={"sw_if_index": self.intf.sw_if_index, "output_source": self.source},
+        )
 
     def query_vpp_config(self):
         ms = self._test.vapi.qos_mark_dump()
 
         for m in ms:
-            if self.intf.sw_if_index == m.mark.sw_if_index and \
-               self.source == m.mark.output_source and \
-               self.map.id == m.mark.map_id:
+            if (
+                self.intf.sw_if_index == m.mark.sw_if_index
+                and self.source == m.mark.output_source
+                and self.map.id == m.mark.map_id
+            ):
                 return True
         return False
 
     def object_id(self):
-        return ("qos-mark-%s-%d" % (self.intf, self.source))
+        return "qos-mark-%s-%d" % (self.intf, self.source)