From fa14d9f454a7248a71135375bfb0758cdb532ca7 Mon Sep 17 00:00:00 2001
From: selias <samelias@cisco.com>
Date: Thu, 11 May 2017 18:02:03 +0200
Subject: CSIT-576 HC Test: Improve SPAN test coverage

 - add test for multiple destination interfaces using one source interface
 - duplicate all existing cases using a sub-interface as the destination

Change-Id: Ifabf78bca258247a19624b2b2a0474d21d1229d3
Signed-off-by: selias <samelias@cisco.com>
---
 resources/test_data/honeycomb/span.py              | 67 ++++++++++++++++++++++
 .../test_data/honeycomb/spanrx-apihc-apivat.py     | 65 ---------------------
 2 files changed, 67 insertions(+), 65 deletions(-)
 create mode 100644 resources/test_data/honeycomb/span.py
 delete mode 100644 resources/test_data/honeycomb/spanrx-apihc-apivat.py

(limited to 'resources/test_data')

diff --git a/resources/test_data/honeycomb/span.py b/resources/test_data/honeycomb/span.py
new file mode 100644
index 0000000000..9e1004d8ed
--- /dev/null
+++ b/resources/test_data/honeycomb/span.py
@@ -0,0 +1,67 @@
+# Copyright (c) 2016 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+"""Test variables for SPAN port mirroring test suite."""
+
+
+def get_variables(interface1, interface2, interface3):
+    """Create and return a dictionary of test variables.
+
+    :param interface1: Name of an interface.
+    :param interface2: Name of an interface.
+    :param interface3: Name of an interface.
+    :type interface1: string
+    :type interface2: string
+    :type interface3: string
+
+    :returns: Dictionary of test variables - settings for Honeycomb's
+    SPAN port mirroring suite.
+    :rtype: dict
+    """
+    variables = {
+        "interface1": interface1,
+        "interface2": interface2,
+        "interface3": interface3,
+
+        # Interface 2 - ingress
+        "settings_receive": {
+            "state": "receive",
+            "iface-ref": interface2,
+        },
+
+        # Interface 2 - egress
+        "settings_transmit": {
+            "state": "transmit",
+            "iface-ref": interface2,
+        },
+
+        # Interface 2 - ingress/egress
+        "settings_both": {
+            "state": "both",
+            "iface-ref": interface2,
+        },
+
+        # Interface 3 - ingress/egress
+        "settings_if2": {
+            "state": "both",
+            "iface-ref": interface3,
+        },
+
+        # IP addresses for traffic test
+        "tg_to_dut_if1_ip": "192.168.1.1",
+        "dut_to_tg_if1_ip": "192.168.1.2",
+        "tg_to_dut_if2_ip": "192.168.2.1",
+        "dut_to_tg_if2_ip": "192.168.2.2",
+        "prefix": 24,
+    }
+    return variables
diff --git a/resources/test_data/honeycomb/spanrx-apihc-apivat.py b/resources/test_data/honeycomb/spanrx-apihc-apivat.py
deleted file mode 100644
index 3f6a1e6a00..0000000000
--- a/resources/test_data/honeycomb/spanrx-apihc-apivat.py
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Test variables for SPAN port mirroring test suite."""
-
-
-def get_variables(node,
-                  interface1,
-                  interface2,
-                  interface3
-                 ):
-    """Create and return a dictionary of test variables.
-
-    :param node: Honeycomb node.
-    :param interface1: Name of an interface.
-    :param interface2: Name of an interface.
-    :param interface3: Name of an interface.
-    :type node: dict
-    :type interface1: string
-    :type interface2: string
-    :type interface3: string
-
-    :returns: Dictionary of test variables - settings for Honeycomb's
-    SPAN port mirroring suite.
-    :rtype: dict
-    """
-    variables = {
-        "interface1": interface1,
-        "interface2": interface2,
-        "interface3": interface3,
-        "settings_1": {
-            "state": "receive",
-            "iface-ref": interface2,
-        },
-
-        "settings_2": {
-            "state": "transmit",
-            "iface-ref": interface2,
-        },
-
-        "settings_3": {
-            "state": "both",
-            "iface-ref": interface2,
-        },
-
-        "settings_4": {
-            "state": "both",
-            "iface-ref": interface3,
-        },
-
-        "tg_to_dut_if1_ip": "192.168.1.1",
-        "dut_to_tg_if1_ip": "192.168.1.2",
-        "prefix": 24,
-    }
-    return variables
-- 
cgit 1.2.3-korg