From eb8218c4ea3635171e126ab8fd9994a934fc67ff Mon Sep 17 00:00:00 2001 From: Adit Sarfaty Date: Tue, 18 Dec 2018 09:41:55 +0200 Subject: [PATCH] Fix qosqueue unit tests Commit I7a34291cb7abbe288e7dda329b2d1ef2c3e7890f moced some policy.d definitions out of neutron. The qosqueue do not load the relevant policy files, and normally policy rules are not tested in teh plugin unit tests, so this patch will remove the tests that depend on those rules. [Note that qosqueue is not longer used except for the MH plugin anyway] Change-Id: Id8e61066db520852a80b416ea57389e58a800533 --- .../tests/unit/extensions/test_qosqueues.py | 45 ------------------- 1 file changed, 45 deletions(-) diff --git a/vmware_nsx/tests/unit/extensions/test_qosqueues.py b/vmware_nsx/tests/unit/extensions/test_qosqueues.py index 04327088df..9d881c00d4 100644 --- a/vmware_nsx/tests/unit/extensions/test_qosqueues.py +++ b/vmware_nsx/tests/unit/extensions/test_qosqueues.py @@ -204,23 +204,6 @@ class TestQoSQueue(test_nsx_plugin.NsxPluginV2TestCase): port = self.deserialize('json', res) self.assertEqual(len(port['port'][ext_qos.QUEUE]), 36) - def test_get_port_with_qos_not_admin(self): - body = {'qos_queue': {'tenant_id': 'not_admin', - 'name': 'foo', 'min': 20, 'max': 20}} - res = self._create_qos_queue('json', body, tenant_id='not_admin') - q1 = self.deserialize('json', res) - res = self._create_network('json', 'net1', True, - arg_list=(ext_qos.QUEUE, 'tenant_id',), - queue_id=q1['qos_queue']['id'], - tenant_id="not_admin") - net1 = self.deserialize('json', res) - self.assertEqual(len(net1['network'][ext_qos.QUEUE]), 36) - res = self._create_port('json', net1['network']['id'], - tenant_id='not_admin', set_context=True) - - port = self.deserialize('json', res) - self.assertNotIn(ext_qos.QUEUE, port['port']) - def test_dscp_value_out_of_range(self): body = {'qos_queue': {'tenant_id': 'admin', 'dscp': '64', 'name': 'foo', 'min': 20, 'max': 20}} @@ -234,34 +217,6 @@ class TestQoSQueue(test_nsx_plugin.NsxPluginV2TestCase): res = self._create_qos_queue('json', body) self.assertEqual(res.status_int, 400) - def test_non_admin_cannot_create_queue(self): - body = {'qos_queue': {'tenant_id': 'not_admin', - 'name': 'foo', 'min': 20, 'max': 20}} - res = self._create_qos_queue('json', body, tenant_id='not_admin', - set_context=True) - self.assertEqual(res.status_int, 403) - - def test_update_port_non_admin_does_not_show_queue_id(self): - body = {'qos_queue': {'tenant_id': 'not_admin', - 'name': 'foo', 'min': 20, 'max': 20}} - res = self._create_qos_queue('json', body, tenant_id='not_admin') - q1 = self.deserialize('json', res) - res = self._create_network('json', 'net1', True, - arg_list=(ext_qos.QUEUE,), - tenant_id='not_admin', - queue_id=q1['qos_queue']['id']) - - net1 = self.deserialize('json', res) - res = self._create_port('json', net1['network']['id'], - tenant_id='not_admin', set_context=True) - port = self.deserialize('json', res) - device_id = "00fff4d0-e4a8-4a3a-8906-4c4cdafb59f1" - data = {'port': {'device_id': device_id}} - neutron_context = context.Context('', 'not_admin') - port = self._update('ports', port['port']['id'], data, - neutron_context=neutron_context) - self.assertNotIn(ext_qos.QUEUE, port['port']) - def _test_rxtx_factor(self, max_value, rxtx_factor): with self.qos_queue(max=max_value) as q1: