X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FClassify.py;h=c781bbbd1456d97d12485788ada8043458a53d6e;hb=176eda8bf7775a2c761a6544ab932c2bc59dfa57;hp=dfa5c3377dd895e05a79981978001f4dc999cd82;hpb=5d2ce55a8641a030ec6984089c51aa9313f46af1;p=csit.git

diff --git a/resources/libraries/python/Classify.py b/resources/libraries/python/Classify.py
index dfa5c3377d..c781bbbd14 100644
--- a/resources/libraries/python/Classify.py
+++ b/resources/libraries/python/Classify.py
@@ -11,12 +11,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+"""Classify utilities library."""
 
 from robot.api import logger
 
 from resources.libraries.python.VatExecutor import VatExecutor, VatTerminal
 
 
+# pylint: disable=too-many-arguments, invalid-name
+
 class Classify(object):
     """Classify utilities."""
 
@@ -37,6 +40,7 @@ class Classify(object):
         :rtype: tuple(int, int, int)
         :raises RuntimeError: If VPP can't create table.
         """
+
         output = VatExecutor.cmd_from_template(node, "classify_add_table.vat",
                                                ip_version=ip_version,
                                                direction=direction)
@@ -116,9 +120,9 @@ class Classify(object):
         return table_index, skip_n, match_n
 
     @staticmethod
-    def vpp_configures_classify_session_l3(node, acl_method, table_index, skip_n,
-                                          match_n, ip_version, direction,
-                                          address):
+    def vpp_configures_classify_session_l3(node, acl_method, table_index,
+                                           skip_n, match_n, ip_version,
+                                           direction, address):
         """Configuration of classify session for IP address filtering.
 
         :param node: VPP node to setup classify session.
@@ -149,8 +153,8 @@ class Classify(object):
                                                     address=address)
 
     @staticmethod
-    def vpp_configures_classify_session_l2(node, acl_method, table_index, skip_n,
-                                          match_n, direction, address):
+    def vpp_configures_classify_session_l2(node, acl_method, table_index,
+                                           skip_n, match_n, direction, address):
         """Configuration of classify session for MAC address filtering.
 
         :param node: VPP node to setup classify session.
@@ -169,17 +173,18 @@ class Classify(object):
         :type address: str
         """
         with VatTerminal(node) as vat:
-            vat.vat_terminal_exec_cmd_from_template("classify_add_session_l2.vat",
-                                                    acl_method=acl_method,
-                                                    table_index=table_index,
-                                                    skip_n=skip_n,
-                                                    match_n=match_n,
-                                                    direction=direction,
-                                                    address=address)
+            vat.vat_terminal_exec_cmd_from_template(
+                "classify_add_session_l2.vat",
+                acl_method=acl_method,
+                table_index=table_index,
+                skip_n=skip_n,
+                match_n=match_n,
+                direction=direction,
+                address=address)
 
     @staticmethod
     def vpp_configures_classify_session_hex(node, acl_method, table_index,
-                                           skip_n, match_n, hex_value):
+                                            skip_n, match_n, hex_value):
         """Configuration of classify session with hex value.
 
         :param node: VPP node to setup classify session.
@@ -204,6 +209,43 @@ class Classify(object):
                 match_n=match_n,
                 hex_value=hex_value)
 
+    @staticmethod
+    def vpp_configures_classify_session_generic(node, session_type, table_index,
+                                                skip_n, match_n, match,
+                                                match2=''):
+        """Configuration of classify session.
+
+        :param node: VPP node to setup classify session.
+        :param session_type: Session type - hit-next, l2-hit-next, acl-hit-next
+        or policer-hit-next, and their respective parameters.
+        :param table_index: Classify table index.
+        :param skip_n: Number of skip vectors based on mask.
+        :param match_n: Number of match vectors based on mask.
+        :param match: Match value - l2, l3, l4 or hex, and their
+        respective parameters.
+        :param match2: Additional match values, to avoid using overly long
+        variables in RobotFramework.
+        :type node: dict
+        :type session_type: str
+        :type table_index: int
+        :type skip_n: int
+        :type match_n: int
+        :type match: str
+        :type match2: str
+        """
+
+        match = ' '.join((match, match2))
+
+        with VatTerminal(node) as vat:
+            vat.vat_terminal_exec_cmd_from_template(
+                "classify_add_session_generic.vat",
+                type=session_type,
+                table_index=table_index,
+                skip_n=skip_n,
+                match_n=match_n,
+                match=match,
+            )
+
     @staticmethod
     def compute_classify_hex_mask(ip_version, protocol, direction):
         """Compute classify hex mask for TCP or UDP packet matching.