x/vmware-nsx
Code Issues Proposed changes

Merge "Remove pbr warnerrors in favor of sphinx check"

Browse Source
This commit is contained in:
Jenkins 2017-06-12 17:14:26 +00:00 committed by Gerrit Code Review
commit 4c5419c6cf
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vmware_nsx_tempest/tests/api/test_qos.py
View File

@ -240,7 +240,7 @@ class QosPolicyTest(BaseQosTest):
self.assertEqual('test policy desc2',
retrieved_policy['description'])
self.assertTrue(retrieved_policy['shared'])
self.assertEqual([], retrieved_policy['rules'])
self.assertEmpty(retrieved_policy['rules'])
@decorators.idempotent_id('1cb42653-54bd-4a9a-b888-c55e18199201')
def test_delete_policy(self):

2
vmware_nsx_tempest/tests/nsxv/api/lbaas/test_load_balancers_non_admin.py
View File

@ -468,7 +468,7 @@ class LoadBalancersTest(base.BaseTestCase):
load_balancer = statuses['loadbalancer']
self.assertEqual("ONLINE", load_balancer['operating_status'])
self.assertEqual("ACTIVE", load_balancer['provisioning_status'])
self.assertEqual([], load_balancer['listeners'])
self.assertEmpty(load_balancer['listeners'])
@test.attr(type='smoke')
@decorators.idempotent_id('a23677a9-b770-4894-8be9-cd66590c228b')

2
vmware_nsx_tempest/tests/nsxv/api/lbaas/test_pools_non_admin.py
View File

@ -75,7 +75,7 @@ class TestPools(base.BaseTestCase):
def test_list_pools_empty(self):
"""Test get pools when empty"""
pools = self._list_pools()
self.assertEqual([], pools)
self.assertEmpty(pools)
@test.attr(type='smoke')
@decorators.idempotent_id('4f09b544-8e82-4313-b452-8fe3ca5ad14e')

6
vmware_nsx_tempest/tests/nsxv/api/test_provider_sec_group.py
View File

@ -147,7 +147,7 @@ class ProviderSecGroup(base.BaseAdminNetworkTest):
def test_tenant_provider_sec_group_with_no_rules(self):
sg = self.create_security_provider_group(self.cmgr_adm,
provider=True)
self.assertEqual([], sg.get('security_group_rules'))
self.assertEmpty(sg.get('security_group_rules'))
@test.attr(type='nsxv')
@decorators.idempotent_id('5e6237ca-033a-4bee-b5fb-8f225ed00b0c')
@ -271,7 +271,7 @@ class ProviderSecGroup(base.BaseAdminNetworkTest):
port_client = self.cmgr_adm.ports_client
port_id = port_client.create_port(**body)
ss = port_client.show_port(port_id['port']['id'])
self.assertEqual([], ss['port']['provider_security_groups'])
self.assertEmpty(ss['port']['provider_security_groups'])
port_client.delete_port(port_id['port']['id'])
net_client.delete_network(network['network']['id'])
@ -318,7 +318,7 @@ class ProviderSecGroup(base.BaseAdminNetworkTest):
port_client = self.cmgr_adm.ports_client
port_id = port_client.create_port(**body)
ss = port_client.show_port(port_id['port']['id'])
self.assertEqual([], ss['port']['provider_security_groups'])
self.assertEmpty(ss['port']['provider_security_groups'])
project_id = self.cmgr_adm.networks_client.tenant_id
sg = self.create_security_provider_group(self.cmgr_adm,
project_id=project_id,

10
vmware_nsx_tempest/tests/nsxv3/api/test_provider_sec_group.py
View File

@ -134,7 +134,7 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
sg_rule = self.create_security_group_rule(sg_id, cmgr=self.cmgr_adm,
protocol='icmp')
sg_rule.get('id')
self.assertNotEqual([], self.nsx.get_firewall_section(sg_name, sg_id))
self.assertNotEmpty(self.nsx.get_firewall_section(sg_name, sg_id))
@test.attr(type='nsxv3')
@decorators.idempotent_id('2c8d013d-4c0b-4d2b-b77c-779351a789ce')
@ -167,7 +167,7 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
def test_tenant_provider_sec_group_with_no_rules(self):
sg = self.create_security_provider_group(self.cmgr_adm,
provider=True)
self.assertEqual([], sg.get('security_group_rules'))
self.assertEmpty(sg.get('security_group_rules'))
@test.attr(type='nsxv3')
@decorators.idempotent_id('a92c8e1e-ce2c-40be-8449-d326690e078e')
@ -303,7 +303,7 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
port_client.delete_port,
port_id['port']['id'])
ss = port_client.show_port(port_id['port']['id'])
self.assertEqual([], ss['port']['provider_security_groups'])
self.assertEmpty(ss['port']['provider_security_groups'])
kwargs = {"provider_security_groups": ''}
port_client.update_port(port_id['port']['id'], **kwargs)
@ -394,7 +394,7 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
port_client.delete_port,
port_id['port']['id'])
ss = port_client.show_port(port_id['port']['id'])
self.assertEqual([], ss['port']['provider_security_groups'],
self.assertEmpty(ss['port']['provider_security_groups'],
"Provider security group is not set on port")
project_id = self.cmgr_adm.networks_client.tenant_id
sg = self.create_security_provider_group(self.cmgr_adm,
@ -432,7 +432,7 @@ class ProviderSecurityGroupTest(base.BaseAdminNetworkTest):
port_client.delete_port,
port_id['port']['id'])
ss = port_client.show_port(port_id['port']['id'])
self.assertEqual([], ss['port']['provider_security_groups'],
self.assertEmpty(ss['port']['provider_security_groups'],
"Provider security group is not set on port")
project_id = self.cmgr_adm.networks_client.tenant_id
sg = self.create_security_provider_group(self.cmgr_adm,