Merge "Make files pep8 compliant before replacing assertEqual(None, xx)"

2 files changed, 199 insertions, 265 deletions

diff --git a/tests/unit/network_services/helpers/test_samplevnf_helper.py b/tests/unit/network_services/helpers/test_samplevnf_helper.py
index 05acdfaa9..6152263e2 100644
--- a/tests/unit/network_services/helpers/test_samplevnf_helper.py
+++ b/tests/unit/network_services/helpers/test_samplevnf_helper.py
@@ -15,14 +15,12 @@
 # limitations under the License.
 #
 
-from __future__ import absolute_import
-from __future__ import division
-
-import unittest
-
 import mock
+import os
+import six
+import unittest
 
-from yardstick.network_services.helpers.samplevnf_helper import MultiPortConfig, PortPairs
+from yardstick.network_services.helpers import samplevnf_helper
 from yardstick.network_services.vnf_generic.vnf.base import VnfdHelper
 
 
@@ -30,31 +28,32 @@ class TestPortPairs(unittest.TestCase):
     def test_port_pairs_list(self):
         vnfd = TestMultiPortConfig.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         interfaces = vnfd['vdu'][0]['external-interface']
-        port_pairs = PortPairs(interfaces)
+        port_pairs = samplevnf_helper.PortPairs(interfaces)
         self.assertEqual(port_pairs.port_pair_list, [("xe0", "xe1")])
 
     def test_valid_networks(self):
         vnfd = TestMultiPortConfig.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         interfaces = vnfd['vdu'][0]['external-interface']
-        port_pairs = PortPairs(interfaces)
-        self.assertEqual(port_pairs.valid_networks, [("uplink_0", "downlink_0")])
+        port_pairs = samplevnf_helper.PortPairs(interfaces)
+        self.assertEqual(port_pairs.valid_networks, [
+                         ("uplink_0", "downlink_0")])
 
     def test_all_ports(self):
         vnfd = TestMultiPortConfig.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         interfaces = vnfd['vdu'][0]['external-interface']
-        port_pairs = PortPairs(interfaces)
+        port_pairs = samplevnf_helper.PortPairs(interfaces)
         self.assertEqual(set(port_pairs.all_ports), {"xe0", "xe1"})
 
     def test_uplink_ports(self):
         vnfd = TestMultiPortConfig.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         interfaces = vnfd['vdu'][0]['external-interface']
-        port_pairs = PortPairs(interfaces)
+        port_pairs = samplevnf_helper.PortPairs(interfaces)
         self.assertEqual(port_pairs.uplink_ports, ["xe0"])
 
     def test_downlink_ports(self):
         vnfd = TestMultiPortConfig.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         interfaces = vnfd['vdu'][0]['external-interface']
-        port_pairs = PortPairs(interfaces)
+        port_pairs = samplevnf_helper.PortPairs(interfaces)
         self.assertEqual(port_pairs.downlink_ports, ["xe1"])
 
 
@@ -63,14 +62,14 @@ class TestMultiPortConfig(unittest.TestCase):
     VNFD_0 = {'short-name': 'VpeVnf',
               'vdu':
                   [{'routing_table':
-                        [{'network': '152.16.100.20',
-                          'netmask': '255.255.255.0',
-                          'gateway': '152.16.100.20',
-                          'if': 'xe0'},
-                         {'network': '152.16.40.20',
-                          'netmask': '255.255.255.0',
-                          'gateway': '152.16.40.20',
-                          'if': 'xe1'}],
+                    [{'network': '152.16.100.20',
+                      'netmask': '255.255.255.0',
+                      'gateway': '152.16.100.20',
+                      'if': 'xe0'},
+                     {'network': '152.16.40.20',
+                      'netmask': '255.255.255.0',
+                      'gateway': '152.16.40.20',
+                      'if': 'xe1'}],
                     'description': 'VPE approximation using DPDK',
                     'name': 'vpevnf-baremetal',
                     'nd_route_tbl':
@@ -121,7 +120,7 @@ class TestMultiPortConfig(unittest.TestCase):
                                 },
                                 'vnfd-connection-point-ref': 'xe1',
                                 'name': 'xe1'}
-                        ]}],
+                    ]}],
               'description': 'Vpe approximation using DPDK',
               'mgmt-interface':
                   {'vdu-id': 'vpevnf-baremetal',
@@ -143,67 +142,85 @@ class TestMultiPortConfig(unittest.TestCase):
         }
     }
 
+    def setUp(self):
+        self._mock_open = mock.patch.object(six.moves.builtins, 'open')
+        self.mock_open = self._mock_open.start()
+        self._mock_os = mock.patch.object(os, 'path')
+        self.mock_os = self._mock_os.start()
+        self._mock_config_parser = mock.patch.object(
+            samplevnf_helper, 'ConfigParser')
+        self.mock_config_parser = self._mock_config_parser.start()
+
+        self.addCleanup(self._cleanup)
+
+    def _cleanup(self):
+        self._mock_open.stop()
+        self._mock_os.stop()
+        self._mock_config_parser.stop()
+
     def test_validate_ip_and_prefixlen(self):
-        ip_addr, prefix_len = MultiPortConfig.validate_ip_and_prefixlen('10.20.30.40', '16')
+        ip_addr, prefix_len = (
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen(
+                '10.20.30.40', '16'))
         self.assertEqual(ip_addr, '10.20.30.40')
         self.assertEqual(prefix_len, 16)
 
-        ip_addr, prefix_len = MultiPortConfig.validate_ip_and_prefixlen('::1', '40')
+        ip_addr, prefix_len = (
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen(
+            '::1', '40'))
         self.assertEqual(ip_addr, '0000:0000:0000:0000:0000:0000:0000:0001')
         self.assertEqual(prefix_len, 40)
 
     def test_validate_ip_and_prefixlen_negative(self):
         with self.assertRaises(AttributeError):
-            MultiPortConfig.validate_ip_and_prefixlen('', '')
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen('', '')
 
         with self.assertRaises(AttributeError):
-            MultiPortConfig.validate_ip_and_prefixlen('10.20.30.400', '16')
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen(
+                '10.20.30.400', '16')
 
         with self.assertRaises(AttributeError):
-            MultiPortConfig.validate_ip_and_prefixlen('10.20.30.40', '33')
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen(
+                '10.20.30.40', '33')
 
         with self.assertRaises(AttributeError):
-            MultiPortConfig.validate_ip_and_prefixlen('::1', '129')
+            samplevnf_helper.MultiPortConfig.validate_ip_and_prefixlen(
+                '::1', '129')
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test___init__(self, mock_open, mock_os, ConfigParser):
+    def test___init__(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         self.assertEqual(0, opnfv_vnf.swq)
-        mock_os.path = mock.MagicMock()
-        mock_os.path.isfile = mock.Mock(return_value=False)
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        self.mock_os.path = mock.MagicMock()
+        self.mock_os.path.isfile = mock.Mock(return_value=False)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         self.assertEqual(0, opnfv_vnf.swq)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_update_timer(self, mock_open, mock_os, ConfigParser):
+    def test_update_timer(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.update_write_parser = mock.MagicMock()
         self.assertEqual(None, opnfv_vnf.update_timer())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_script(self, mock_open, mock_os, ConfigParser):
+    def test_generate_script(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = VnfdHelper(self.VNFD_0)
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -218,15 +235,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.lb_config = 'HW'
         self.assertIsNotNone(opnfv_vnf.generate_script(self.VNFD))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_script_data(self, mock_open, mock_os, ConfigParser):
+    def test_generate_script_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -240,15 +255,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.generate_rule_config = mock.Mock()
         self.assertIsNotNone(opnfv_vnf.generate_script_data())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_rule_config(self, mock_open, mock_os, ConfigParser):
+    def test_generate_rule_config(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -261,9 +274,11 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.get_port_pairs = mock.Mock()
         opnfv_vnf.vnf_type = 'ACL'
         opnfv_vnf.get_ports_gateway = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.get_ports_gateway6 = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway6 = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway6 = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.txrx_pipeline = ''
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         opnfv_vnf.interfaces = opnfv_vnf.vnfd['vdu'][0]['external-interface']
@@ -272,15 +287,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.rules = 'new'
         self.assertIsNotNone(opnfv_vnf.generate_rule_config())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_action_config(self, mock_open, mock_os, ConfigParser):
+    def test_generate_action_config(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -293,22 +306,22 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.get_port_pairs = mock.Mock()
         opnfv_vnf.vnf_type = 'VFW'
         opnfv_vnf.get_ports_gateway = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.get_ports_gateway6 = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway6 = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway6 = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.txrx_pipeline = ''
         opnfv_vnf.rules = ''
         self.assertIsNotNone(opnfv_vnf.generate_action_config())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_arp_config6(self, mock_open, mock_os, ConfigParser):
+    def test_generate_arp_config6(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -321,24 +334,24 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.get_port_pairs = mock.Mock()
         opnfv_vnf.vnf_type = 'VFW'
         opnfv_vnf.get_ports_gateway = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.get_ports_gateway6 = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway6 = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway6 = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.txrx_pipeline = ''
         opnfv_vnf.rules = ''
         opnfv_vnf.interfaces = mock.MagicMock()
         opnfv_vnf.get_ports_gateway6 = mock.Mock()
         self.assertIsNotNone(opnfv_vnf.generate_arp_config6())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_arp_config(self, mock_open, mock_os, ConfigParser):
+    def test_generate_arp_config(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -351,24 +364,24 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.get_port_pairs = mock.Mock()
         opnfv_vnf.vnf_type = 'VFW'
         opnfv_vnf.get_ports_gateway = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.get_ports_gateway6 = mock.Mock(return_value=u'1.1.1.1')
-        opnfv_vnf.get_netmask_gateway6 = mock.Mock(return_value=u'255.255.255.0')
+        opnfv_vnf.get_netmask_gateway6 = mock.Mock(
+            return_value=u'255.255.255.0')
         opnfv_vnf.txrx_pipeline = ''
         opnfv_vnf.rules = ''
         opnfv_vnf.interfaces = mock.MagicMock()
         opnfv_vnf.get_ports_gateway6 = mock.Mock()
         self.assertIsNotNone(opnfv_vnf.generate_arp_config())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_get_ports_gateway(self, mock_open, mock_os, ConfigParser):
+    def test_get_ports_gateway(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -387,15 +400,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         self.assertIsNotNone(opnfv_vnf.get_ports_gateway('xe0'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_get_ports_gateway6(self, mock_open, mock_os, ConfigParser):
+    def test_get_ports_gateway6(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -414,15 +425,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         self.assertIsNotNone(opnfv_vnf.get_ports_gateway6('xe0'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_get_netmask_gateway(self, mock_open, mock_os, ConfigParser):
+    def test_get_netmask_gateway(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -441,15 +450,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         self.assertIsNotNone(opnfv_vnf.get_netmask_gateway('xe0'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_get_netmask_gateway6(self, mock_open, mock_os, ConfigParser):
+    def test_get_netmask_gateway6(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -468,16 +475,14 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         self.assertIsNotNone(opnfv_vnf.get_netmask_gateway6('xe0'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_link_config(self, mock_open, mock_os, ConfigParser):
+    def test_generate_link_config(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
 
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -495,20 +500,19 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.vnfd = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]
         opnfv_vnf.interfaces = opnfv_vnf.vnfd['vdu'][0]['external-interface']
         opnfv_vnf.all_ports = ['32', '1', '987']
-        opnfv_vnf.validate_ip_and_prefixlen = mock.Mock(return_value=('10.20.30.40', 16))
+        opnfv_vnf.validate_ip_and_prefixlen = mock.Mock(
+            return_value=('10.20.30.40', 16))
 
         result = opnfv_vnf.generate_link_config()
         self.assertEqual(len(result.splitlines()), 9)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_config(self, mock_open, mock_os, ConfigParser):
+    def test_generate_config(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.get_config_tpl_data = mock.MagicMock()
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
@@ -531,17 +535,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.is_openstack = False
         self.assertIsNone(opnfv_vnf.generate_config())
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_get_config_tpl_data(self, mock_open, mock_os, ConfigParser,
-                                 OrderedDict):
+    def test_get_config_tpl_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -555,17 +555,13 @@ class TestMultiPortConfig(unittest.TestCase):
 
         self.assertIsNotNone(opnfv_vnf.get_config_tpl_data('filename'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_get_txrx_tpl_data(self, mock_open, mock_os, ConfigParser,
-                               OrderedDict):
+    def test_get_txrx_tpl_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -579,17 +575,13 @@ class TestMultiPortConfig(unittest.TestCase):
 
         self.assertIsNotNone(opnfv_vnf.get_txrx_tpl_data('filename'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_init_write_parser_template(self, mock_open, mock_os, ConfigParser,
-                                        OrderedDict):
+    def test_init_write_parser_template(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -608,17 +600,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.write_parser.set = mock.Mock()
         self.assertIsNone(opnfv_vnf.init_write_parser_template('filename'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_init_write_parser_template_2(self, mock_open, mock_os, ConfigParser,
-                                          OrderedDict):
+    def test_init_write_parser_template_2(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -632,17 +620,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.read_parser.items = mock.MagicMock()
         self.assertIsNone(opnfv_vnf.init_write_parser_template('filename'))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_update_write_parser(self, mock_open, mock_os, ConfigParser,
-                                 OrderedDict):
+    def test_update_write_parser(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -658,17 +642,13 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.pipeline_counter = 0
         self.assertIsNone(opnfv_vnf.update_write_parser({'filename': 1}))
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_get_worker_threads(self, mock_open, mock_os, ConfigParser,
-                                OrderedDict):
+    def test_get_worker_threads(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -692,17 +672,14 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.get_worker_threads(3)
         self.assertEqual(2, result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_next_core_id(self, mock_open, mock_os, ConfigParser,
-                                   OrderedDict):
+    # TODO(elfoley): Split this test into smaller tests
+    def test_generate_next_core_id(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -728,17 +705,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_next_core_id()
         self.assertEqual(None, result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_lb_to_port_pair_mapping(self, mock_open, mock_os, ConfigParser,
-                                              OrderedDict):
+    def test_generate_lb_to_port_pair_mapping(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = VnfdHelper(self.VNFD_0)
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.txrx_pipeline = ''
@@ -754,24 +727,20 @@ class TestMultiPortConfig(unittest.TestCase):
         opnfv_vnf.worker_config = '1t'
         opnfv_vnf.start_core = 0
         opnfv_vnf.lb_count = 1
-        opnfv_vnf._port_pairs = PortPairs(vnfd_mock.interfaces)
+        opnfv_vnf._port_pairs = samplevnf_helper.PortPairs(vnfd_mock.interfaces)
         opnfv_vnf.port_pair_list = opnfv_vnf._port_pairs.port_pair_list
         result = opnfv_vnf.generate_lb_to_port_pair_mapping()
         self.assertEqual(None, result)
         result = opnfv_vnf.set_priv_to_pub_mapping()
         self.assertEqual('(0,1)', result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_set_priv_que_handler(self, mock_open, mock_os, ConfigParser,
-                                  OrderedDict):
+    def test_set_priv_que_handler(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = VnfdHelper(self.VNFD_0)
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -792,9 +761,8 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.set_priv_que_handler()
         self.assertEqual(None, result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    def test_generate_arp_route_tbl(self, *_):
+    def test_generate_arp_route_tbl(self):
+        # ELF: could n=do this in setup
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = ""
@@ -821,7 +789,8 @@ class TestMultiPortConfig(unittest.TestCase):
             },
         ]
 
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.all_ports = [3, 2, 5]
 
         expected = 'routeadd net 32 10.20.30.40 0xfffff000\n' \
@@ -830,17 +799,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_arp_route_tbl()
         self.assertEqual(result, expected)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_arpicmp_data(self, mock_open, mock_os, ConfigParser,
-                                   OrderedDict):
+    def test_generate_arpicmp_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -875,17 +840,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_arpicmp_data()
         self.assertIsNotNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_final_txrx_data(self, mock_open, mock_os, ConfigParser,
-                                      OrderedDict):
+    def test_generate_final_txrx_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -917,17 +878,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_final_txrx_data()
         self.assertIsNotNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_initial_txrx_data(self, mock_open, mock_os,
-                                        ConfigParser, OrderedDict):
+    def test_generate_initial_txrx_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -971,17 +928,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_initial_txrx_data()
         self.assertIsNotNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_lb_data(self, mock_open, mock_os, ConfigParser,
-                              OrderedDict):
+    def test_generate_lb_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -1008,17 +961,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_lb_data()
         self.assertIsNotNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_vnf_data(self, mock_open, mock_os, ConfigParser,
-                               OrderedDict):
+    def test_generate_vnf_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -1057,17 +1006,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_vnf_data()
         self.assertIsNotNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_generate_config_data(self, mock_open, mock_os, ConfigParser,
-                                  OrderedDict):
+    def test_generate_config_data(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = VnfdHelper(self.VNFD_0)
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
@@ -1123,17 +1068,13 @@ class TestMultiPortConfig(unittest.TestCase):
         result = opnfv_vnf.generate_config_data()
         self.assertIsNone(result)
 
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.open')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.os')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.ConfigParser')
-    @mock.patch('yardstick.network_services.helpers.samplevnf_helper.OrderedDict')
-    def test_init_eal(self, mock_open, mock_os, ConfigParser,
-                      OrderedDict):
+    def test_init_eal(self):
         topology_file = mock.Mock()
         config_tpl = mock.Mock()
         tmp_file = mock.Mock()
         vnfd_mock = mock.MagicMock()
-        opnfv_vnf = MultiPortConfig(topology_file, config_tpl, tmp_file, vnfd_mock)
+        opnfv_vnf = samplevnf_helper.MultiPortConfig(
+            topology_file, config_tpl, tmp_file, vnfd_mock)
         opnfv_vnf.socket = 0
         opnfv_vnf.start_core = 0
         opnfv_vnf.port_pair_list = [("xe0", "xe1")]
diff --git a/tests/unit/network_services/traffic_profile/test_rfc2544.py b/tests/unit/network_services/traffic_profile/test_rfc2544.py
index fe563e9fd..1749b8730 100644
--- a/tests/unit/network_services/traffic_profile/test_rfc2544.py
+++ b/tests/unit/network_services/traffic_profile/test_rfc2544.py
@@ -15,9 +15,6 @@
 # limitations under the License.
 #
 
-from __future__ import absolute_import
-from __future__ import division
-
 import unittest
 import mock
 
@@ -51,29 +48,29 @@ class TestRFC2544Profile(unittest.TestCase):
                'traffic_profile': {'traffic_type': 'RFC2544Profile',
                                    'frame_rate': 100},
                'downlink_0': {'ipv4':
-                          {'outer_l2': {'framesize':
-                                        {'64B': '100', '1518B': '0',
-                                         '128B': '0', '1400B': '0',
-                                         '256B': '0', '373b': '0',
-                                         '570B': '0'}},
-                           'outer_l3v4': {'dstip4': '1.1.1.1-1.15.255.255',
-                                          'proto': 'udp',
-                                          'srcip4': '90.90.1.1-90.105.255.255',
-                                          'dscp': 0, 'ttl': 32, 'count': 1},
-                           'outer_l4': {'srcport': '2001',
-                               'dsrport': '1234', 'count': 1}}},
+                              {'outer_l2': {'framesize':
+                                            {'64B': '100', '1518B': '0',
+                                             '128B': '0', '1400B': '0',
+                                             '256B': '0', '373b': '0',
+                                             '570B': '0'}},
+                               'outer_l3v4': {'dstip4': '1.1.1.1-1.15.255.255',
+                                              'proto': 'udp',
+                                              'srcip4': '90.90.1.1-90.105.255.255',
+                                              'dscp': 0, 'ttl': 32, 'count': 1},
+                               'outer_l4': {'srcport': '2001',
+                                            'dsrport': '1234', 'count': 1}}},
                'uplink_0': {'ipv4':
-                           {'outer_l2': {'framesize':
-                                         {'64B': '100', '1518B': '0',
-                                          '128B': '0', '1400B': '0',
-                                          '256B': '0', '373b': '0',
-                                          '570B': '0'}},
-                            'outer_l3v4': {'dstip4': '9.9.1.1-90.105.255.255',
-                                           'proto': 'udp',
-                                           'srcip4': '1.1.1.1-1.15.255.255',
-                                           'dscp': 0, 'ttl': 32, 'count': 1},
-                            'outer_l4': {'dstport': '2001',
-                                'srcport': '1234', 'count': 1}}},
+                            {'outer_l2': {'framesize':
+                                          {'64B': '100', '1518B': '0',
+                                           '128B': '0', '1400B': '0',
+                                           '256B': '0', '373b': '0',
+                                           '570B': '0'}},
+                             'outer_l3v4': {'dstip4': '9.9.1.1-90.105.255.255',
+                                            'proto': 'udp',
+                                            'srcip4': '1.1.1.1-1.15.255.255',
+                                            'dscp': 0, 'ttl': 32, 'count': 1},
+                             'outer_l4': {'dstport': '2001',
+                                          'srcport': '1234', 'count': 1}}},
                'schema': 'isb:traffic_profile:0.1'}
 
     def test___init__(self):
@@ -86,8 +83,7 @@ class TestRFC2544Profile(unittest.TestCase):
             "uplink_0": ["xe0"],
             "downlink_0": ["xe1"],
         }
-        traffic_generator.client = \
-            mock.Mock(return_value=True)
+        traffic_generator.client.return_value = True
         r_f_c2544_profile = RFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
         r_f_c2544_profile.first_run = True
@@ -99,7 +95,7 @@ class TestRFC2544Profile(unittest.TestCase):
             "uplink_0": ["xe0"],
             "downlink_0": ["xe1"],
         }
-        traffic_generator.client = mock.Mock(return_value=True)
+        traffic_generator.client.return_value = True
 
         r_f_c2544_profile = RFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
@@ -133,7 +129,7 @@ class TestRFC2544Profile(unittest.TestCase):
                 'rx_throughput_fps': 20,
             },
         }
-        traffic_generator.generate_samples = mock.MagicMock(return_value=samples)
+        traffic_generator.generate_samples.return_value = samples
         traffic_generator.RUN_DURATION = 30
         traffic_generator.rfc2544_helper.tolerance_low = 0.0001
         traffic_generator.rfc2544_helper.tolerance_high = 0.0001
@@ -179,7 +175,8 @@ class TestRFC2544Profile(unittest.TestCase):
                 'rx_throughput_fps': 20,
             },
         }
-        traffic_generator.generate_samples = mock.MagicMock(return_value=samples)
+        traffic_generator.generate_samples = mock.MagicMock(
+            return_value=samples)
         traffic_generator.RUN_DURATION = 30
         traffic_generator.rfc2544_helper.tolerance_low = 0.0001
         traffic_generator.rfc2544_helper.tolerance_high = 0.0001
@@ -196,7 +193,8 @@ class TestRFC2544Profile(unittest.TestCase):
             mock.Mock(return_value=True)
         r_f_c2544_profile = RFC2544Profile(self.TRAFFIC_PROFILE)
         r_f_c2544_profile.params = self.PROFILE
-        self.assertEqual(None, r_f_c2544_profile.execute_traffic(traffic_generator))
+        self.assertIsNone(
+            r_f_c2544_profile.execute_traffic(traffic_generator))
         samples = {}
         for ifname in range(1):
             name = "xe{}".format(ifname)
@@ -217,7 +215,7 @@ class TestRFC2544Profile(unittest.TestCase):
                 'tx_throughput_mbps': 10, 'rx_throughput_fps': 20
             }
         }
-        traffic_generator.generate_samples = mock.MagicMock(return_value=samples)
+        traffic_generator.generate_samples = mock.Mock(return_value=samples)
         traffic_generator.RUN_DURATION = 30
         traffic_generator.rfc2544_helper.tolerance_low = 0.0001
         traffic_generator.rfc2544_helper.tolerance_high = 0.0001
@@ -277,10 +275,5 @@ class TestRFC2544Profile(unittest.TestCase):
         r_f_c2544_profile.calculate_pps = mock.Mock(return_value=[2274546.67,
                                                                   1.0])
 
-        self.assertEqual(None,
-                         r_f_c2544_profile.execute_latency(traffic_generator,
-                                                           samples))
-
-
-if __name__ == '__main__':
-    unittest.main()
+        self.assertIsNone(r_f_c2544_profile.execute_latency(traffic_generator,
+                                                            samples))