Fix exception handling ixload

[yardstick.git] / yardstick / tests / unit / network_services / vnf_generic / vnf / test_vpe_vnf.py

diff --git a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py
index c1664f2..8d49cb3 100644 (file)
--- a/yardstick/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py
+++ b/yardstick/tests/unit/network_services/vnf_generic/vnf/test_vpe_vnf.py
@@ -16,7 +16,6 @@ from multiprocessing import Process, Queue
 import time
 
 import mock
-from six.moves import configparser
 import unittest
 
 from yardstick.benchmark.contexts import base as ctx_base
@@ -147,48 +146,6 @@ class TestConfigCreate(unittest.TestCase):
         self.assertEqual(config_create.downlink_ports, ['xe1'])
         self.assertEqual(config_create.socket, 2)
 
-    def test_dpdk_port_to_link_id(self):
-        vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
-        config_create = vpe_vnf.ConfigCreate(vnfd_helper, 2)
-        self.assertEqual(config_create.dpdk_port_to_link_id_map, {'xe0': 0, 'xe1': 1})
-
-    def test_vpe_initialize(self):
-        vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
-        config_create = vpe_vnf.ConfigCreate(vnfd_helper, 2)
-        config = configparser.ConfigParser()
-        config_create.vpe_initialize(config)
-        self.assertEqual(config.get('EAL', 'log_level'), '0')
-        self.assertEqual(config.get('PIPELINE0', 'type'), 'MASTER')
-        self.assertEqual(config.get('PIPELINE0', 'core'), 's2C0')
-        self.assertEqual(config.get('MEMPOOL0', 'pool_size'), '256K')
-        self.assertEqual(config.get('MEMPOOL1', 'pool_size'), '2M')
-
-    def test_vpe_rxq(self):
-        vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
-        config_create = vpe_vnf.ConfigCreate(vnfd_helper, 2)
-        config = configparser.ConfigParser()
-        config_create.downlink_ports = ['xe0']
-        config_create.vpe_rxq(config)
-        self.assertEqual(config.get('RXQ0.0', 'mempool'), 'MEMPOOL1')
-
-    def test_get_sink_swq(self):
-        vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
-        config_create = vpe_vnf.ConfigCreate(vnfd_helper, 2)
-        config = configparser.ConfigParser()
-        config.add_section('PIPELINE0')
-        config.set('PIPELINE0', 'key1', 'value1')
-        config.set('PIPELINE0', 'key2', 'value2 SINK')
-        config.set('PIPELINE0', 'key3', 'TM value3')
-        config.set('PIPELINE0', 'key4', 'value4')
-        config.set('PIPELINE0', 'key5', 'the SINK value5')
-
-        self.assertEqual(config_create.get_sink_swq(config, 'PIPELINE0', 'key1', 5), 'SWQ-1')
-        self.assertEqual(config_create.get_sink_swq(config, 'PIPELINE0', 'key2', 5), 'SWQ-1 SINK0')
-        self.assertEqual(config_create.get_sink_swq(config, 'PIPELINE0', 'key3', 5), 'SWQ-1 TM5')
-        config_create.sw_q += 1
-        self.assertEqual(config_create.get_sink_swq(config, 'PIPELINE0', 'key4', 5), 'SWQ0')
-        self.assertEqual(config_create.get_sink_swq(config, 'PIPELINE0', 'key5', 5), 'SWQ0 SINK1')
-
     def test_generate_vpe_script(self):
         vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
         vpe_config_vnf = vpe_vnf.ConfigCreate(vnfd_helper, 2)
@@ -214,36 +171,6 @@ class TestConfigCreate(unittest.TestCase):
         self.assertIsInstance(result, str)
         self.assertNotEqual(result, '')
 
-    def test_create_vpe_config(self):
-        vnfd_helper = vnf_base.VnfdHelper(self.VNFD_0)
-        config_create = vpe_vnf.ConfigCreate(vnfd_helper, 23)
-        config_create.uplink_ports = ['xe1']
-        with mock.patch.object(config_create, 'vpe_upstream') as mock_up, \
-                mock.patch.object(config_create, 'vpe_downstream') as \
-                mock_down, \
-                mock.patch.object(config_create, 'vpe_tmq') as mock_tmq, \
-                mock.patch.object(config_create, 'vpe_initialize') as \
-                mock_ini, \
-                mock.patch.object(config_create, 'vpe_rxq') as mock_rxq:
-            mock_ini_obj = mock.Mock()
-            mock_rxq_obj = mock.Mock()
-            mock_up_obj = mock.Mock()
-            mock_down_obj = mock.Mock()
-            mock_tmq_obj = mock.Mock()
-            mock_ini.return_value = mock_ini_obj
-            mock_rxq.return_value = mock_rxq_obj
-            mock_up.return_value = mock_up_obj
-            mock_down.return_value = mock_down_obj
-            mock_tmq.return_value = mock_tmq_obj
-            config_create.create_vpe_config('fake_config_file')
-
-        mock_rxq.assert_called_once_with(mock_ini_obj)
-        mock_up.assert_called_once_with('fake_config_file', 0)
-        mock_down.assert_called_once_with('fake_config_file', 0)
-        mock_tmq.assert_called_once_with(mock_down_obj, 0)
-        mock_up_obj.write.assert_called_once()
-        mock_tmq_obj.write.assert_called_once()
-
 
 class TestVpeApproxVnf(unittest.TestCase):
 
@@ -549,7 +476,7 @@ class TestVpeApproxVnf(unittest.TestCase):
         self._mock_time_sleep.stop()
 
     def test___init__(self):
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         self.assertIsNone(vpe_approx_vnf._vnf_process)
 
     @mock.patch.object(ctx_base.Context, 'get_physical_node_from_server',
@@ -563,7 +490,7 @@ class TestVpeApproxVnf(unittest.TestCase):
         resource.amqp_collect_nfvi_kpi.return_value = {'foo': 234}
         resource.check_if_system_agent_running.return_value = (1, None)
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf.scenario_helper.scenario_cfg = {
             'nodes': {vpe_approx_vnf.name: "mock"}
         }
@@ -592,7 +519,7 @@ class TestVpeApproxVnf(unittest.TestCase):
         resource.check_if_system_agent_running.return_value = 0, '1234'
         resource.amqp_collect_nfvi_kpi.return_value = {'foo': 234}
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf.scenario_helper.scenario_cfg = {
             'nodes': {vpe_approx_vnf.name: "mock"}
         }
@@ -614,7 +541,7 @@ class TestVpeApproxVnf(unittest.TestCase):
     @mock.patch.object(sample_vnf, 'VnfSshHelper')
     def test_vnf_execute(self, ssh):
         test_base.mock_ssh(ssh)
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf.q_in = mock.MagicMock()
         vpe_approx_vnf.q_out = mock.MagicMock()
         vpe_approx_vnf.q_out.qsize = mock.Mock(return_value=0)
@@ -624,7 +551,7 @@ class TestVpeApproxVnf(unittest.TestCase):
     def test_run_vpe(self, ssh):
         test_base.mock_ssh(ssh)
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf.tc_file_name = get_file_abspath(TEST_FILE_YAML)
         vpe_approx_vnf.vnf_cfg = {
             'lb_config': 'SW',
@@ -707,7 +634,7 @@ class TestVpeApproxVnf(unittest.TestCase):
 
         mock_resource = mock.MagicMock()
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock_process
         vpe_approx_vnf.q_out = mock_q_out
         vpe_approx_vnf.queue_wrapper = mock.Mock(
@@ -732,7 +659,7 @@ class TestVpeApproxVnf(unittest.TestCase):
 
         mock_resource = mock.MagicMock()
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock_process
         vpe_approx_vnf.q_out = mock_q_out
         vpe_approx_vnf.queue_wrapper = mock.Mock(
@@ -751,7 +678,7 @@ class TestVpeApproxVnf(unittest.TestCase):
 
         mock_resource = mock.MagicMock()
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock_process
         vpe_approx_vnf.resource_helper.resource = mock_resource
 
@@ -770,7 +697,7 @@ class TestVpeApproxVnf(unittest.TestCase):
 
         mock_resource = mock.MagicMock()
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock_process
         vpe_approx_vnf.resource_helper.resource = mock_resource
 
@@ -795,7 +722,7 @@ class TestVpeApproxVnf(unittest.TestCase):
 
         mock_resource = mock.MagicMock()
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock_process
         vpe_approx_vnf.q_out = mock_q_out
         vpe_approx_vnf.resource_helper.resource = mock_resource
@@ -809,7 +736,7 @@ class TestVpeApproxVnf(unittest.TestCase):
     def test_terminate(self, ssh):
         test_base.mock_ssh(ssh)
 
-        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0)
+        vpe_approx_vnf = vpe_vnf.VpeApproxVnf(NAME, self.VNFD_0, 'task_id')
         vpe_approx_vnf._vnf_process = mock.MagicMock()
         vpe_approx_vnf._resource_collect_stop = mock.Mock()
         vpe_approx_vnf.resource_helper = mock.MagicMock()