From 0759425f08bd7b8a003f4fb2ab9b443216517d8f Mon Sep 17 00:00:00 2001
From: Vratko Polak <vrpolak@cisco.com>
Date: Thu, 19 Jul 2018 19:14:26 +0200
Subject: CSIT-1097: Migrate ip4 to NDRPDR and edit MRR

Change-Id: I9e3b2973c14f818247658a2ae34456c9fc2bae4e
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
(cherry picked from commit 74771ecb4e2742efd3ab40bb8dd9cf9ac1bb40c8)
---
 resources/libraries/python/Policer.py              | 14 +++++++++----
 .../robot/performance/performance_setup.robot      | 23 ++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

(limited to 'resources')

diff --git a/resources/libraries/python/Policer.py b/resources/libraries/python/Policer.py
index c72212914b..55429e7cb3 100644
--- a/resources/libraries/python/Policer.py
+++ b/resources/libraries/python/Policer.py
@@ -294,17 +294,23 @@ class Policer(object):
         """Set policer CB.
 
         :param cb: Committed Burst size.
-        :type cb: int
+        :type cb: int or str
         """
-        self._cb = cb
+        if cb == "IMIX_v4_1":
+            self._cb = 1518
+        else:
+            self._cb = cb
 
     def policer_set_eb(self, eb):
         """Set policer EB.
 
         :param eb: Excess Burst size.
-        :type eb: int
+        :type eb: int or str
         """
-        self._eb = eb
+        if eb == "IMIX_v4_1":
+            self._eb = 1518
+        else:
+            self._eb = eb
 
     def policer_set_rate_type_kbps(self):
         """Set policer rate type to kbps."""
diff --git a/resources/libraries/robot/performance/performance_setup.robot b/resources/libraries/robot/performance/performance_setup.robot
index 3f7eba0393..a41894c747 100644
--- a/resources/libraries/robot/performance/performance_setup.robot
+++ b/resources/libraries/robot/performance/performance_setup.robot
@@ -758,6 +758,16 @@
 | | Show NAT verbose | ${dut1}
 | | Show NAT verbose | ${dut2}
 
+| Tear down mrr test with NAT
+| | [Documentation] | Common test teardown for mrr performance \
+| | ... | tests with NAT feature used.
+| | ...
+| | ... | \| Tear down mrr test with NAT \|
+| | ...
+| | Tear down performance mrr test
+| | Show NAT verbose | ${dut1}
+| | Show NAT verbose | ${dut2}
+
 | Tear down performance test with ACL
 | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
 | | ... | tests with ACL feature used.
@@ -780,6 +790,19 @@
 | | Run Keyword If Test Failed | Run Keyword And Ignore Error
 | | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
 
+| Tear down mrr test with ACL
+| | [Documentation] | Common test teardown for mrr performance \
+| | ... | tests with ACL feature used.
+| | ...
+| | ... | *Example:*
+| | ...
+| | ... | \| Tear down mrr test with ACL \|
+| | ...
+| | Tear down performance mrr test
+| | Vpp Log Plugin Acl Settings | ${dut1}
+| | Run Keyword If Test Failed | Run Keyword And Ignore Error
+| | ... | Vpp Log Plugin Acl Interface Assignment | ${dut1}
+
 | Tear down performance test with MACIP ACL
 | | [Documentation] | Common test teardown for ndrdisc and pdrdisc performance \
 | | ... | tests with MACIP ACL feature used.
-- 
cgit 1.2.3-korg