From e12f98c2bbed5191714bdc553e7b269b1437cecd Mon Sep 17 00:00:00 2001 From: Emma Foley Date: Fri, 27 Apr 2018 10:41:10 +0000 Subject: Move tests: unit/network_services/nfvi * Fix pylint errors * Add TODOs Some errors are ignored locally, as they were a symptom of other problems. These issues have been flagged with a TODO, and should be fixed later. JIRA: YARDSTICK-837 Signed-off-by: Emma Foley Change-Id: Id330ee1c89d54ef487edb7fe160e5a31d9a3094f --- tests/unit/network_services/nfvi/__init__.py | 0 tests/unit/network_services/nfvi/test_collectd.py | 151 ----------- tests/unit/network_services/nfvi/test_resource.py | 298 ---------------------- 3 files changed, 449 deletions(-) delete mode 100644 tests/unit/network_services/nfvi/__init__.py delete mode 100644 tests/unit/network_services/nfvi/test_collectd.py delete mode 100644 tests/unit/network_services/nfvi/test_resource.py (limited to 'tests/unit') diff --git a/tests/unit/network_services/nfvi/__init__.py b/tests/unit/network_services/nfvi/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/unit/network_services/nfvi/test_collectd.py b/tests/unit/network_services/nfvi/test_collectd.py deleted file mode 100644 index 0ae175624..000000000 --- a/tests/unit/network_services/nfvi/test_collectd.py +++ /dev/null @@ -1,151 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# 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. - -from __future__ import absolute_import -import unittest -import multiprocessing -import mock - -from yardstick.network_services.nfvi.collectd import AmqpConsumer - - -class TestAmqpConsumer(unittest.TestCase): - def setUp(self): - self.queue = multiprocessing.Queue() - self.url = 'amqp://admin:admin@127.0.0.1:5672/%2F' - self.amqp_consumer = AmqpConsumer(self.url, self.queue) - - def test___init__(self): - self.assertEqual(self.url, self.amqp_consumer._url) - - def test_on_connection_open(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.add_on_close_callback = \ - mock.Mock(return_value=0) - self.amqp_consumer._connection.channel = mock.Mock(return_value=0) - self.assertIsNone(self.amqp_consumer.on_connection_open(10)) - - def test_on_connection_closed(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.ioloop = mock.Mock() - self.amqp_consumer._connection.ioloop.stop = mock.Mock(return_value=0) - self.amqp_consumer._connection.add_timeout = mock.Mock(return_value=0) - self.amqp_consumer._closing = True - self.assertIsNone( - self.amqp_consumer.on_connection_closed("", 404, "Not Found")) - self.amqp_consumer._closing = False - self.assertIsNone( - self.amqp_consumer.on_connection_closed("", 404, "Not Found")) - - def test_reconnect(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.ioloop = mock.Mock() - self.amqp_consumer._connection.ioloop.stop = mock.Mock(return_value=0) - self.amqp_consumer.connect = mock.Mock(return_value=0) - self.amqp_consumer._closing = True - self.assertIsNone(self.amqp_consumer.reconnect()) - - def test_on_channel_open(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.add_on_close_callback = \ - mock.Mock(return_value=0) - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer.add_on_channel_close_callback = mock.Mock() - self.amqp_consumer._channel.exchange_declare = \ - mock.Mock(return_value=0) - self.assertIsNone( - self.amqp_consumer.on_channel_open(self.amqp_consumer._channel)) - - def test_add_on_channel_close_callback(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.add_on_close_callback = \ - mock.Mock(return_value=0) - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.add_on_close_callback = mock.Mock() - self.assertIsNone(self.amqp_consumer.add_on_channel_close_callback()) - - def test_on_channel_closed(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.close = mock.Mock(return_value=0) - _channel = mock.Mock() - self.assertIsNone( - self.amqp_consumer.on_channel_closed(_channel, "", "")) - - def test_ion_exchange_declareok(self): - self.amqp_consumer.setup_queue = mock.Mock(return_value=0) - self.assertIsNone(self.amqp_consumer.on_exchange_declareok(10)) - - def test_setup_queue(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.add_on_close_callback = mock.Mock() - self.assertIsNone(self.amqp_consumer.setup_queue("collectd")) - - def test_on_queue_declareok(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.queue_bind = mock.Mock() - self.assertIsNone(self.amqp_consumer.on_queue_declareok(10)) - - def test__on_bindok(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.basic_consume = mock.Mock() - self.amqp_consumer.add_on_cancel_callback = mock.Mock() - self.assertIsNone(self.amqp_consumer._on_bindok(10)) - - def test_add_on_cancel_callback(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.add_on_cancel_callback = mock.Mock() - self.assertIsNone(self.amqp_consumer.add_on_cancel_callback()) - - def test_on_consumer_cancelled(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.close = mock.Mock() - self.assertIsNone(self.amqp_consumer.on_consumer_cancelled(10)) - - def test_on_message(self): - body = "msg {} cpu/cpu-0/ipc 101010:10" - properties = "" - basic_deliver = mock.Mock() - basic_deliver.delivery_tag = mock.Mock(return_value=0) - self.amqp_consumer.ack_message = mock.Mock() - self.assertIsNone( - self.amqp_consumer.on_message(10, basic_deliver, properties, body)) - - def test_ack_message(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.basic_ack = mock.Mock() - self.assertIsNone(self.amqp_consumer.ack_message(10)) - - def test_on_cancelok(self): - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.close = mock.Mock() - self.assertIsNone(self.amqp_consumer.on_cancelok(10)) - - def test_run(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer.connect = mock.Mock() - self.amqp_consumer._connection.ioloop.start = mock.Mock() - self.assertIsNone(self.amqp_consumer.run()) - - def test_stop(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer.connect = mock.Mock() - self.amqp_consumer._connection.ioloop.start = mock.Mock() - self.amqp_consumer._channel = mock.Mock() - self.amqp_consumer._channel.basic_cancel = mock.Mock() - self.assertIsNone(self.amqp_consumer.stop()) - - def test_close_connection(self): - self.amqp_consumer._connection = mock.Mock(autospec=AmqpConsumer) - self.amqp_consumer._connection.close = mock.Mock() - self.assertIsNone(self.amqp_consumer.close_connection()) diff --git a/tests/unit/network_services/nfvi/test_resource.py b/tests/unit/network_services/nfvi/test_resource.py deleted file mode 100644 index 9f337c673..000000000 --- a/tests/unit/network_services/nfvi/test_resource.py +++ /dev/null @@ -1,298 +0,0 @@ -# Copyright (c) 2016-2017 Intel Corporation -# -# 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. - -import errno - -import mock -import unittest - -from yardstick.network_services.nfvi.resource import ResourceProfile -from yardstick.network_services.nfvi import resource, collectd -from yardstick.common.exceptions import ResourceCommandError -from yardstick import ssh - -class TestResourceProfile(unittest.TestCase): - VNFD = {'vnfd:vnfd-catalog': - {'vnfd': - [{'short-name': 'VpeVnf', - 'vdu': - [{'routing_table': - [{'network': '172.16.100.20', - 'netmask': '255.255.255.0', - 'gateway': '172.16.100.20', - 'if': 'xe0'}, - {'network': '172.16.40.20', - 'netmask': '255.255.255.0', - 'gateway': '172.16.40.20', - 'if': 'xe1'}], - 'description': 'VPE approximation using DPDK', - 'name': 'vpevnf-baremetal', - 'nd_route_tbl': - [{'network': '0064:ff9b:0:0:0:0:9810:6414', - 'netmask': '112', - 'gateway': '0064:ff9b:0:0:0:0:9810:6414', - 'if': 'xe0'}, - {'network': '0064:ff9b:0:0:0:0:9810:2814', - 'netmask': '112', - 'gateway': '0064:ff9b:0:0:0:0:9810:2814', - 'if': 'xe1'}], - 'id': 'vpevnf-baremetal', - 'external-interface': - [{'virtual-interface': - {'dst_mac': '3c:fd:fe:9e:64:38', - 'vpci': '0000:05:00.0', - 'local_ip': '172.16.100.19', - 'type': 'PCI-PASSTHROUGH', - 'netmask': '255.255.255.0', - 'dpdk_port_num': 0, - 'bandwidth': '10 Gbps', - 'dst_ip': '172.16.100.20', - 'local_mac': '3c:fd:fe:a1:2b:80'}, - 'vnfd-connection-point-ref': 'xe0', - 'name': 'xe0'}, - {'virtual-interface': - {'dst_mac': '00:1e:67:d0:60:5c', - 'vpci': '0000:05:00.1', - 'local_ip': '172.16.40.19', - 'type': 'PCI-PASSTHROUGH', - 'netmask': '255.255.255.0', - 'dpdk_port_num': 1, - 'bandwidth': '10 Gbps', - 'dst_ip': '172.16.40.20', - 'local_mac': '3c:fd:fe:a1:2b:81'}, - 'vnfd-connection-point-ref': 'xe1', - 'name': 'xe1'}]}], - 'description': 'Vpe approximation using DPDK', - 'mgmt-interface': - {'vdu-id': 'vpevnf-baremetal', - 'host': '127.0.0.1', - 'password': 'r00t', - 'user': 'root', - 'ip': '127.0.0.1'}, - 'benchmark': - {'kpi': ['packets_in', 'packets_fwd', 'packets_dropped']}, - 'connection-point': [{'type': 'VPORT', 'name': 'xe0'}, - {'type': 'VPORT', 'name': 'xe1'}], - 'id': 'VpeApproxVnf', 'name': 'VPEVnfSsh'}]}} - - def setUp(self): - with mock.patch("yardstick.ssh.AutoConnectSSH") as ssh: - self.ssh_mock = mock.Mock(autospec=ssh.SSH) - self.ssh_mock.execute = \ - mock.Mock(return_value=(0, "", "")) - ssh.from_node.return_value = self.ssh_mock - - mgmt = self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]['mgmt-interface'] - # interfaces = \ - # self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]['vdu'][0]['external-interface'] - port_names = \ - self.VNFD['vnfd:vnfd-catalog']['vnfd'][0]['vdu'][0]['external-interface'] - self.resource_profile = \ - ResourceProfile(mgmt, port_names) - self.resource_profile.connection = self.ssh_mock - - def test___init__(self): - self.assertTrue(self.resource_profile.enable) - - def test_check_if_system_agent_running(self): - self.assertEqual(self.resource_profile.check_if_system_agent_running("collectd"), - (0, "")) - - def test_check_if_system_agent_running_excetion(self): - with mock.patch.object(self.resource_profile.connection, "execute") as mock_execute: - mock_execute.side_effect = OSError(errno.ECONNRESET, "error") - self.assertEqual( - self.resource_profile.check_if_system_agent_running("collectd"), - (1, None)) - - def test_get_cpu_data(self): - reskey = ["", "cpufreq", "cpufreq-0"] - value = "metric:10" - val = self.resource_profile.get_cpu_data(reskey[1], reskey[2], value) - self.assertIsNotNone(val) - - def test_get_cpu_data_error(self): - reskey = ["", "", ""] - value = "metric:10" - val = self.resource_profile.get_cpu_data(reskey[0], reskey[1], value) - self.assertEqual(val, ('error', 'Invalid', '', '')) - - def test__start_collectd(self): - ssh_mock = mock.Mock() - ssh_mock.execute = mock.Mock(return_value=(0, "", "")) - self.assertIsNone(self.resource_profile._start_collectd(ssh_mock, - "/opt/nsb_bin")) - - ssh_mock.execute = mock.Mock(side_effect=ssh.SSHError) - with self.assertRaises(ssh.SSHError): - self.resource_profile._start_collectd(ssh_mock, "/opt/nsb_bin") - - ssh_mock.execute = mock.Mock(return_value=(1, "", "")) - self.assertIsNone(self.resource_profile._start_collectd(ssh_mock, - "/opt/nsb_bin")) - - def test__start_rabbitmq(self): - ssh_mock = mock.Mock() - ssh_mock.execute = mock.Mock(return_value=(0, "RabbitMQ", "")) - self.assertIsNone(self.resource_profile._start_rabbitmq(ssh_mock)) - - ssh_mock.execute = mock.Mock(return_value=(0, "", "")) - with self.assertRaises(ResourceCommandError): - self.resource_profile._start_rabbitmq(ssh_mock) - - ssh_mock.execute = mock.Mock(return_value=(1, "", "")) - with self.assertRaises(ResourceCommandError): - self.resource_profile._start_rabbitmq(ssh_mock) - - def test__prepare_collectd_conf(self): - self.assertIsNone( - self.resource_profile._prepare_collectd_conf("/opt/nsb_bin")) - - def test__setup_ovs_stats(self): - # TODO(elfoley): This method doesn't actually return anything, the side - # effects should be checked - self.assertIsNone( - self.resource_profile._setup_ovs_stats(self.ssh_mock)) - - def test__provide_config_file(self,): - loadplugin = range(5) - port_names = range(5) - kwargs = { - "interval": '25', - "loadplugin": loadplugin, - "port_names": port_names, - } - self.resource_profile._provide_config_file("/opt/nsb_bin", "collectd.conf", kwargs) - self.ssh_mock.execute.assert_called_once() - - def test_initiate_systemagent(self): - self.resource_profile._start_collectd = mock.Mock() - self.resource_profile._start_rabbitmq = mock.Mock() - self.assertIsNone( - self.resource_profile.initiate_systemagent("/opt/nsb_bin")) - - def test_initiate_systemagent_raise(self): - self.resource_profile._start_rabbitmq = mock.Mock(side_effect=RuntimeError) - with self.assertRaises(RuntimeError): - self.resource_profile.initiate_systemagent("/opt/nsb_bin") - - def test__parse_hugepages(self): - reskey = ["cpu", "cpuFreq"] - value = "timestamp:12345" - res = self.resource_profile.parse_hugepages(reskey, value) - self.assertEqual({'cpu/cpuFreq': '12345'}, res) - - def test__parse_dpdkstat(self): - reskey = ["dpdk0", "0"] - value = "tx:12345" - res = self.resource_profile.parse_dpdkstat(reskey, value) - self.assertEqual({'dpdk0/0': '12345'}, res) - - def test__parse_virt(self): - reskey = ["vm0", "cpu"] - value = "load:45" - res = self.resource_profile.parse_virt(reskey, value) - self.assertEqual({'vm0/cpu': '45'}, res) - - def test__parse_ovs_stats(self): - reskey = ["ovs", "stats"] - value = "tx:45" - res = self.resource_profile.parse_ovs_stats(reskey, value) - self.assertEqual({'ovs/stats': '45'}, res) - - def test_parse_collectd_result(self): - res = self.resource_profile.parse_collectd_result({}) - expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {}, - 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'virt': {}} - self.assertDictEqual(res, expected_result) - - def test_parse_collectd_result_cpu(self): - metric = {"nsb_stats/cpu/0/ipc": "101"} - self.resource_profile.get_cpu_data = mock.Mock(return_value=[1, - "ipc", - "1234", - ""]) - res = self.resource_profile.parse_collectd_result(metric) - expected_result = {'cpu': {1: {'ipc': '1234'}}, 'dpdkstat': {}, 'hugepages': {}, - 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'virt': {}} - self.assertDictEqual(res, expected_result) - - def test_parse_collectd_result_memory(self): - metric = {"nsb_stats/memory/bw": "101"} - res = self.resource_profile.parse_collectd_result(metric) - expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {}, - 'memory': {'bw': '101'}, 'ovs_stats': {}, 'timestamp': '', - 'virt': {}} - self.assertDictEqual(res, expected_result) - - def test_parse_collectd_result_hugepage(self): - # amqp returns bytes - metric = {b"nsb_stats/hugepages/free": b"101"} - self.resource_profile.parse_hugepages = mock.Mock(return_value={"free": "101"}) - res = self.resource_profile.parse_collectd_result(metric) - expected_result = {'cpu': {}, 'dpdkstat': {}, 'hugepages': {'free': '101'}, - 'memory': {}, 'ovs_stats': {}, 'timestamp': '', - 'virt': {}} - self.assertDictEqual(res, expected_result) - - def test_parse_collectd_result_dpdk_virt_ovs(self): - metric = {b"nsb_stats/dpdkstat/tx": b"101", - b"nsb_stats/ovs_stats/tx": b"101", - b"nsb_stats/virt/virt/memory": b"101"} - self.resource_profile.parse_dpdkstat = \ - mock.Mock(return_value={"tx": "101"}) - self.resource_profile.parse_virt = \ - mock.Mock(return_value={"memory": "101"}) - self.resource_profile.parse_ovs_stats = \ - mock.Mock(return_value={"tx": "101"}) - res = self.resource_profile.parse_collectd_result(metric) - expected_result = {'cpu': {}, 'dpdkstat': {'tx': '101'}, 'hugepages': {}, - 'memory': {}, 'ovs_stats': {'tx': '101'}, 'timestamp': '', - 'virt': {'memory': '101'}} - self.assertDictEqual(res, expected_result) - - def test_amqp_process_for_nfvi_kpi(self): - self.resource_profile.amqp_client = \ - mock.MagicMock(side_effect=[None, mock.MagicMock()]) - self.resource_profile.run_collectd_amqp = \ - mock.Mock(return_value=0) - res = self.resource_profile.amqp_process_for_nfvi_kpi() - self.assertIsNone(res) - - def test_amqp_collect_nfvi_kpi(self): - self.resource_profile.amqp_client = \ - mock.MagicMock(side_effect=[None, mock.MagicMock()]) - self.resource_profile.run_collectd_amqp = \ - mock.Mock(return_value=0) - self.resource_profile.parse_collectd_result = mock.Mock() - res = self.resource_profile.amqp_collect_nfvi_kpi() - self.assertIsNotNone(res) - - def test_run_collectd_amqp(self): - resource.AmqpConsumer = mock.Mock(autospec=collectd) - self.assertIsNone(self.resource_profile.run_collectd_amqp()) - - def test_start(self): - self.assertIsNone(self.resource_profile.start()) - - def test_stop(self): - self.assertIsNone(self.resource_profile.stop()) - - def test_stop_amqp_not_running(self): - self.resource_profile.amqp_client = mock.MagicMock() - # TODO(efoley): Fix this incorrect test. - # Should check that we don't try to stop amqp when it's not running - self.assertIsNone(self.resource_profile.stop()) -- cgit 1.2.3-korg