NSB: Ixia remove unused traffic_generator arg

also fix pylint unittest warnings

JIRA: YARDSTICK-1014
Change-Id: I4ff9769fdca89c6fc1fb9ca62e9f8ea6b174681e
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

diff --git a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
index 616921e..f13945a 100644 (file)
--- a/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_ixia_rfc2544.py
@@ -179,9 +179,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                "dst_mac_0": "00:00:00:00:00:03",
                "dst_mac_1": "00:00:00:00:00:04",
                "dst_mac_2": "00:00:00:00:00:04"}
-        result = r_f_c2544_profile._get_ixia_traffic_profile(
-            self.PROFILE, mac, xfile="tmp",
-            static_traffic=STATIC_TRAFFIC)
+        result = r_f_c2544_profile._get_ixia_traffic_profile(self.PROFILE, mac)
         self.assertIsNotNone(result)
 
     def test_get_ixia_traffic_profile(self):
@@ -225,7 +223,6 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                     "proto": "udp",
                     "srcip4": "152.16.40.20",
                     "ttl": 32,
-                    "count": "1"
                 },
                 "outer_l4": {
                     "dstport": "2001",
@@ -260,7 +257,6 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                     "proto": "udp",
                     "srcip4": "152.16.40.20",
                     "ttl": 32,
-                    "count": "1"
                 },
                 "outer_l3v6": {
                     "count": 1024,
@@ -269,7 +265,6 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                     "proto": "udp",
                     "srcip4": "152.16.40.20",
                     "ttl": 32,
-                    "count": "1"
                 },
                 "outer_l4": {
                     "dstport": "1234",
@@ -289,12 +284,11 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                "dst_mac_0": "00:00:00:00:00:03",
                "dst_mac_1": "00:00:00:00:00:04",
                "dst_mac_2": "00:00:00:00:00:04"}
-        result = r_f_c2544_profile._get_ixia_traffic_profile(
-            self.PROFILE, mac, xfile="tmp", static_traffic=STATIC_TRAFFIC)
+        result = r_f_c2544_profile._get_ixia_traffic_profile(self.PROFILE, mac)
         self.assertIsNotNone(result)
 
     @mock.patch("yardstick.network_services.traffic_profile.ixia_rfc2544.open")
-    def test_get_ixia_traffic_profile_v6(self, mock_open):
+    def test_get_ixia_traffic_profile_v6(self, *args):
         traffic_generator = mock.Mock(autospec=TrexProfile)
         traffic_generator.my_ports = [0, 1]
         traffic_generator.uplink_ports = [-1]
@@ -435,8 +429,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                                      'outer_l4': {'dstport': '2001',
                                                   'srcport': '1234'}}},
                         'schema': 'isb:traffic_profile:0.1'}
-        result = r_f_c2544_profile._get_ixia_traffic_profile(
-            profile_data, mac, static_traffic=STATIC_TRAFFIC)
+        result = r_f_c2544_profile._get_ixia_traffic_profile(profile_data, mac)
         self.assertIsNotNone(result)
 
     def test__get_ixia_traffic_profile_default_args(self):
@@ -459,8 +452,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         ixia_obj = mock.MagicMock()
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.rate = 100
-        result = r_f_c2544_profile._ixia_traffic_generate(traffic_generator,
-                                                          traffic, ixia_obj)
+        result = r_f_c2544_profile._ixia_traffic_generate(traffic, ixia_obj)
         self.assertIsNone(result)
 
     def test_execute(self):
@@ -511,13 +503,6 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         self.assertEqual(r_f_c2544_profile.ports, ports_expected)
 
     def test_get_drop_percentage(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
-        traffic_generator.networks = {
-            "uplink_0": ["xe0"],
-            "downlink_0": ["xe1"],
-        }
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
         ixia_obj = mock.MagicMock()
@@ -541,17 +526,11 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                              "out_packets": 1000}
         tol_min = 100.0
         tolerance = 0.0
-        self.assertIsNotNone(r_f_c2544_profile.get_drop_percentage(
-                             traffic_generator, samples,
-                             tol_min, tolerance, ixia_obj))
+        self.assertIsNotNone(
+            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
+                                                  ixia_obj))
 
     def test_get_drop_percentage_update(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
-        traffic_generator.my_ports = [0, 1]
-        traffic_generator.uplink_ports = [0]
-        traffic_generator.downlink_ports = [1]
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
         ixia_obj = mock.MagicMock()
@@ -575,17 +554,11 @@ class TestIXIARFC2544Profile(unittest.TestCase):
                              "out_packets": 1002}
         tol_min = 0.0
         tolerance = 1.0
-        self.assertIsNotNone(r_f_c2544_profile.get_drop_percentage(
-                             traffic_generator, samples,
-                             tol_min, tolerance, ixia_obj))
+        self.assertIsNotNone(
+            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
+                                                  ixia_obj))
 
     def test_get_drop_percentage_div_zero(self):
-        traffic_generator = mock.Mock(autospec=TrexProfile)
-        traffic_generator.my_ports = [0, 1]
-        traffic_generator.uplink_ports = [0]
-        traffic_generator.downlink_ports = [1]
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
         ixia_obj = mock.MagicMock()
@@ -610,9 +583,9 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         tol_min = 0.0
         tolerance = 0.0
         r_f_c2544_profile.tmp_throughput = 0
-        self.assertIsNotNone(r_f_c2544_profile.get_drop_percentage(
-                             traffic_generator, samples,
-                             tol_min, tolerance, ixia_obj))
+        self.assertIsNotNone(
+            r_f_c2544_profile.get_drop_percentage(samples, tol_min, tolerance,
+                                                  ixia_obj))
 
     def test_get_multiplier(self):
         r_f_c2544_profile = IXIARFC2544Profile(self.TRAFFIC_PROFILE)
@@ -638,8 +611,7 @@ class TestIXIARFC2544Profile(unittest.TestCase):
         r_f_c2544_profile._ixia_traffic_generate = mock.Mock()
         self.assertEqual(
             None,
-            r_f_c2544_profile.start_ixia_latency(traffic_generator,
-                                                 ixia_obj))
+            r_f_c2544_profile.start_ixia_latency(traffic_generator, ixia_obj))
 
 
 if __name__ == '__main__':

diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index 7881131..3ab157d 100644 (file)
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -26,7 +26,7 @@ class IXIARFC2544Profile(TrexProfile):
     UPLINK = 'uplink'
     DOWNLINK = 'downlink'
 
-    def _get_ixia_traffic_profile(self, profile_data, mac=None, xfile=None, static_traffic=None):
+    def _get_ixia_traffic_profile(self, profile_data, mac=None):
         if mac is None:
             mac = {}
 
@@ -74,12 +74,12 @@ class IXIARFC2544Profile(TrexProfile):
                     },
                     'outer_l4': value['outer_l4'],
                 }
-            except Exception:
+            except KeyError:
                 continue
 
         return result
 
-    def _ixia_traffic_generate(self, traffic_generator, traffic, ixia_obj):
+    def _ixia_traffic_generate(self, traffic, ixia_obj):
         for key, value in traffic.items():
             if key.startswith((self.UPLINK, self.DOWNLINK)):
                 value["iload"] = str(self.rate)
@@ -106,7 +106,7 @@ class IXIARFC2544Profile(TrexProfile):
 
         self.ports = [port for port in port_generator()]
 
-    def execute_traffic(self, traffic_generator, ixia_obj, mac=None, xfile=None):
+    def execute_traffic(self, traffic_generator, ixia_obj, mac=None):
         if mac is None:
             mac = {}
         if self.first_run:
@@ -114,28 +114,27 @@ class IXIARFC2544Profile(TrexProfile):
             self.pg_id = 0
             self.update_traffic_profile(traffic_generator)
             traffic = \
-                self._get_ixia_traffic_profile(self.full_profile, mac, xfile)
+                self._get_ixia_traffic_profile(self.full_profile, mac)
             self.max_rate = self.rate
             self.min_rate = 0
             self.get_multiplier()
-            self._ixia_traffic_generate(traffic_generator, traffic, ixia_obj)
+            self._ixia_traffic_generate(traffic, ixia_obj)
 
     def get_multiplier(self):
         self.rate = round((self.max_rate + self.min_rate) / 2.0, 2)
         multiplier = round(self.rate / self.pps, 2)
         return str(multiplier)
 
-    def start_ixia_latency(self, traffic_generator, ixia_obj,
-                           mac=None, xfile=None):
+    def start_ixia_latency(self, traffic_generator, ixia_obj, mac=None):
         if mac is None:
             mac = {}
         self.update_traffic_profile(traffic_generator)
         traffic = \
-            self._get_ixia_traffic_profile(self.full_profile, mac, xfile)
-        self._ixia_traffic_generate(traffic_generator, traffic, ixia_obj)
+            self._get_ixia_traffic_profile(self.full_profile, mac)
+        self._ixia_traffic_generate(traffic, ixia_obj)
 
-    def get_drop_percentage(self, traffic_generator, samples, tol_min,
-                            tolerance, ixia_obj, mac=None, xfile=None):
+    def get_drop_percentage(self, samples, tol_min, tolerance, ixia_obj,
+                            mac=None):
         if mac is None:
             mac = {}
         status = 'Running'
@@ -179,6 +178,6 @@ class IXIARFC2544Profile(TrexProfile):
             samples['DropPercentage'] = drop_percent
             return status, samples
         self.get_multiplier()
-        traffic = self._get_ixia_traffic_profile(self.full_profile, mac, xfile)
-        self._ixia_traffic_generate(traffic_generator, traffic, ixia_obj)
+        traffic = self._get_ixia_traffic_profile(self.full_profile, mac)
+        self._ixia_traffic_generate(traffic, ixia_obj)
         return status, samples

diff --git a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
index 630c8b9..12510db 100644 (file)
--- a/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
+++ b/yardstick/network_services/vnf_generic/vnf/tg_rfc2544_ixia.py
@@ -149,7 +149,7 @@ class IxiaResourceHelper(ClientResourceHelper):
                 self.client.ix_stop_traffic()
                 samples = self.generate_samples(traffic_profile.ports)
                 self._queue.put(samples)
-                status, samples = traffic_profile.get_drop_percentage(self, samples, min_tol,
+                status, samples = traffic_profile.get_drop_percentage(samples, min_tol,
                                                                       max_tol, self.client, mac)
 
                 current = samples['CurrentDropPercentage']