x/vmware-nsx
Code Issues Proposed changes

Remove deprecated assertEquals alias.

Browse Source 
We have code in the tree that uses both assertEquals and assertEqual. The
former is deprecated:

http://docs.python.org/2/library/unittest.html#deprecated-aliases

As it's a REALLY simple thing to fix, I went ahead and made it all happy.

Change-Id: Ibbd9461e2bda591693a6775b9ede1e87b8c008f2
This commit is contained in:
Monty Taylor 2013-02-16 23:04:14 -08:00 committed by Akihiro MOTOKI
parent b5c0ab7935
commit 2f7a01c2e8
14 changed files with 119 additions and 119 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
quantum/tests/unit/bigswitch/test_router_db.py
View File

@ -174,7 +174,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase):
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
net_id = (body['router'] net_id = (body['router']
['external_gateway_info']['network_id']) ['external_gateway_info']['network_id'])
self.assertEquals(net_id, s1['subnet']['network_id']) self.assertEqual(net_id, s1['subnet']['network_id'])
self._set_net_external(s2['subnet']['network_id']) self._set_net_external(s2['subnet']['network_id'])
self._add_external_gateway_to_router( self._add_external_gateway_to_router(
r['router']['id'], r['router']['id'],
@ -182,7 +182,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase):
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
net_id = (body['router'] net_id = (body['router']
['external_gateway_info']['network_id']) ['external_gateway_info']['network_id'])
self.assertEquals(net_id, s2['subnet']['network_id']) self.assertEqual(net_id, s2['subnet']['network_id'])
self._remove_external_gateway_from_router( self._remove_external_gateway_from_router(
r['router']['id'], r['router']['id'],
s2['subnet']['network_id']) s2['subnet']['network_id'])
@ -265,7 +265,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase):
self.assertTrue('port_id' in body) self.assertTrue('port_id' in body)
r_port_id = body['port_id'] r_port_id = body['port_id']
body = self._show('ports', r_port_id) body = self._show('ports', r_port_id)
self.assertEquals(body['port']['device_id'], r_id) self.assertEqual(body['port']['device_id'], r_id)
with self.subnet(cidr='10.0.20.0/24') as s1: with self.subnet(cidr='10.0.20.0/24') as s1:
s1_id = s1['subnet']['id'] s1_id = s1['subnet']['id']
@ -274,7 +274,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase):
self.assertTrue('port_id' in body) self.assertTrue('port_id' in body)
r1_port_id = body['port_id'] r1_port_id = body['port_id']
body = self._show('ports', r1_port_id) body = self._show('ports', r1_port_id)
self.assertEquals(body['port']['device_id'], r1_id) self.assertEqual(body['port']['device_id'], r1_id)
with self.subnet(cidr='11.0.0.0/24') as public_sub: with self.subnet(cidr='11.0.0.0/24') as public_sub:
public_net_id = public_sub['subnet']['network_id'] public_net_id = public_sub['subnet']['network_id']
@ -298,7 +298,7 @@ class RouterDBTestCase(test_l3_plugin.L3NatDBTestCase):
floatingip = self.deserialize(fmt, res) floatingip = self.deserialize(fmt, res)
result = plugin_obj._send_all_data() result = plugin_obj._send_all_data()
self.assertEquals(result[0], 200) self.assertEqual(result[0], 200)
self._delete('floatingips', self._delete('floatingips',
floatingip['floatingip']['id']) floatingip['floatingip']['id'])

14
quantum/tests/unit/midonet/test_midonet_lib.py
View File

@ -105,9 +105,9 @@ class MidonetChainManagerTestCase(MidonetLibTestCase):
self.mock_api.assert_has_calls(mock.call.get_chains( self.mock_api.assert_has_calls(mock.call.get_chains(
{"tenant_id": tenant_id})) {"tenant_id": tenant_id}))
self.assertEquals(len(chains), 2) self.assertEqual(len(chains), 2)
self.assertEquals(chains['in'], in_chain) self.assertEqual(chains['in'], in_chain)
self.assertEquals(chains['out'], out_chain) self.assertEqual(chains['out'], out_chain)
def test_create_router_chains(self): def test_create_router_chains(self):
tenant_id = 'test_tenant' tenant_id = 'test_tenant'
@ -130,9 +130,9 @@ class MidonetChainManagerTestCase(MidonetLibTestCase):
self.mock_api.assert_has_calls(mock.call.get_chains( self.mock_api.assert_has_calls(mock.call.get_chains(
{"tenant_id": tenant_id})) {"tenant_id": tenant_id}))
self.assertEquals(len(chains), 2) self.assertEqual(len(chains), 2)
self.assertEquals(chains['in'], in_chain) self.assertEqual(chains['in'], in_chain)
self.assertEquals(chains['out'], out_chain) self.assertEqual(chains['out'], out_chain)
class MidonetPortGroupManagerTestCase(MidonetLibTestCase): class MidonetPortGroupManagerTestCase(MidonetLibTestCase):
@ -176,7 +176,7 @@ class MidonetPortGroupManagerTestCase(MidonetLibTestCase):
pg = self.mgr.get_for_sg(tenant_id, sg_id) pg = self.mgr.get_for_sg(tenant_id, sg_id)
self.assertEquals(pg, pg_mock) self.assertEqual(pg, pg_mock)
class MidonetRuleManagerTestCase(MidonetLibTestCase): class MidonetRuleManagerTestCase(MidonetLibTestCase):

2
quantum/tests/unit/midonet/test_midonet_plugin.py
View File

@ -120,7 +120,7 @@ class TestMidonetNetworksV2(test_plugin.TestNetworksV2,
with self.network(name='net1') as net1: with self.network(name='net1') as net1:
req = self.new_list_request('networks') req = self.new_list_request('networks')
res = self.deserialize('json', req.get_response(self.api)) res = self.deserialize('json', req.get_response(self.api))
self.assertEquals(res['networks'][0]['name'], self.assertEqual(res['networks'][0]['name'],
net1['network']['name']) net1['network']['name'])
def test_show_network(self): def test_show_network(self):

12
quantum/tests/unit/nicira/test_networkgw.py
View File

@ -285,7 +285,7 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase):
# fetch port and confirm device_id # fetch port and confirm device_id
gw_port_id = connection_info['port_id'] gw_port_id = connection_info['port_id']
port_body = self._show('ports', gw_port_id) port_body = self._show('ports', gw_port_id)
self.assertEquals(port_body['port']['device_id'], self.assertEqual(port_body['port']['device_id'],
gw[self.resource]['id']) gw[self.resource]['id'])
# Clean up - otherwise delete will fail # Clean up - otherwise delete will fail
body = self._gateway_action('disconnect', body = self._gateway_action('disconnect',
@ -304,7 +304,7 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase):
keys = [('devices', devices), ('name', name)] keys = [('devices', devices), ('name', name)]
with self._network_gateway(name=name, devices=devices) as gw: with self._network_gateway(name=name, devices=devices) as gw:
for k, v in keys: for k, v in keys:
self.assertEquals(gw[self.resource][k], v) self.assertEqual(gw[self.resource][k], v)
def _test_delete_network_gateway(self, exp_gw_count=0): def _test_delete_network_gateway(self, exp_gw_count=0):
name = 'test-gw' name = 'test-gw'
@ -338,7 +338,7 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase):
req = self.new_show_request(networkgw.COLLECTION_NAME, req = self.new_show_request(networkgw.COLLECTION_NAME,
gw[self.resource]['id']) gw[self.resource]['id'])
res = self.deserialize('json', req.get_response(self.ext_api)) res = self.deserialize('json', req.get_response(self.ext_api))
self.assertEquals(res[self.resource]['name'], self.assertEqual(res[self.resource]['name'],
gw[self.resource]['name']) gw[self.resource]['name'])
def test_list_network_gateways(self): def test_list_network_gateways(self):
@ -347,10 +347,10 @@ class NetworkGatewayDbTestCase(test_db_plugin.QuantumDbPluginV2TestCase):
req = self.new_list_request(networkgw.COLLECTION_NAME) req = self.new_list_request(networkgw.COLLECTION_NAME)
res = self.deserialize('json', req.get_response(self.ext_api)) res = self.deserialize('json', req.get_response(self.ext_api))
key = self.resource + 's' key = self.resource + 's'
self.assertEquals(len(res[key]), 2) self.assertEqual(len(res[key]), 2)
self.assertEquals(res[key][0]['name'], self.assertEqual(res[key][0]['name'],
gw1[self.resource]['name']) gw1[self.resource]['name'])
self.assertEquals(res[key][1]['name'], self.assertEqual(res[key][1]['name'],
gw2[self.resource]['name']) gw2[self.resource]['name'])
def test_connect_and_disconnect_network(self): def test_connect_and_disconnect_network(self):

20
quantum/tests/unit/nicira/test_nicira_plugin.py
View File

@ -748,7 +748,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lswitch_dict.clear() self.fc._fake_lswitch_dict.clear()
req = self.new_list_request('networks') req = self.new_list_request('networks')
nets = self.deserialize('json', req.get_response(self.api)) nets = self.deserialize('json', req.get_response(self.api))
self.assertEquals(nets['networks'][0]['status'], self.assertEqual(nets['networks'][0]['status'],
constants.NET_STATUS_ERROR) constants.NET_STATUS_ERROR)
def test_show_network_not_in_nvp(self): def test_show_network_not_in_nvp(self):
@ -757,7 +757,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lswitch_dict.clear() self.fc._fake_lswitch_dict.clear()
req = self.new_show_request('networks', net['network']['id']) req = self.new_show_request('networks', net['network']['id'])
net = self.deserialize('json', req.get_response(self.api)) net = self.deserialize('json', req.get_response(self.api))
self.assertEquals(net['network']['status'], self.assertEqual(net['network']['status'],
constants.NET_STATUS_ERROR) constants.NET_STATUS_ERROR)
def test_delete_port_not_in_nvp(self): def test_delete_port_not_in_nvp(self):
@ -778,7 +778,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lswitch_lport_dict.clear() self.fc._fake_lswitch_lport_dict.clear()
req = self.new_list_request('ports') req = self.new_list_request('ports')
nets = self.deserialize('json', req.get_response(self.api)) nets = self.deserialize('json', req.get_response(self.api))
self.assertEquals(nets['ports'][0]['status'], self.assertEqual(nets['ports'][0]['status'],
constants.PORT_STATUS_ERROR) constants.PORT_STATUS_ERROR)
def test_show_port_not_in_nvp(self): def test_show_port_not_in_nvp(self):
@ -789,7 +789,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lswitch_lport_dict.clear() self.fc._fake_lswitch_lport_dict.clear()
req = self.new_show_request('ports', port['port']['id']) req = self.new_show_request('ports', port['port']['id'])
net = self.deserialize('json', req.get_response(self.api)) net = self.deserialize('json', req.get_response(self.api))
self.assertEquals(net['port']['status'], self.assertEqual(net['port']['status'],
constants.PORT_STATUS_ERROR) constants.PORT_STATUS_ERROR)
def test_delete_port_and_network_not_in_nvp(self): def test_delete_port_and_network_not_in_nvp(self):
@ -820,7 +820,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lrouter_dict.clear() self.fc._fake_lrouter_dict.clear()
req = self.new_list_request('routers') req = self.new_list_request('routers')
routers = self.deserialize('json', req.get_response(self.ext_api)) routers = self.deserialize('json', req.get_response(self.ext_api))
self.assertEquals(routers['routers'][0]['status'], self.assertEqual(routers['routers'][0]['status'],
constants.NET_STATUS_ERROR) constants.NET_STATUS_ERROR)
def test_show_router_not_in_nvp(self): def test_show_router_not_in_nvp(self):
@ -829,7 +829,7 @@ class NiciraQuantumNVPOutOfSync(test_l3_plugin.L3NatTestCaseBase,
self.fc._fake_lrouter_dict.clear() self.fc._fake_lrouter_dict.clear()
req = self.new_show_request('routers', router['router']['id']) req = self.new_show_request('routers', router['router']['id'])
router = self.deserialize('json', req.get_response(self.ext_api)) router = self.deserialize('json', req.get_response(self.ext_api))
self.assertEquals(router['router']['status'], self.assertEqual(router['router']['status'],
constants.NET_STATUS_ERROR) constants.NET_STATUS_ERROR)
@ -849,12 +849,12 @@ class TestNiciraNetworkGateway(test_l2_gw.NetworkGatewayDbTestCase,
res = self.deserialize('json', req.get_response(self.ext_api)) res = self.deserialize('json', req.get_response(self.ext_api))
# We expect the default gateway too # We expect the default gateway too
key = self.resource + 's' key = self.resource + 's'
self.assertEquals(len(res[key]), 3) self.assertEqual(len(res[key]), 3)
self.assertEquals(res[key][0]['default'], self.assertEqual(res[key][0]['default'],
True) True)
self.assertEquals(res[key][1]['name'], self.assertEqual(res[key][1]['name'],
gw1[self.resource]['name']) gw1[self.resource]['name'])
self.assertEquals(res[key][2]['name'], self.assertEqual(res[key][2]['name'],
gw2[self.resource]['name']) gw2[self.resource]['name'])
def test_delete_network_gateway(self): def test_delete_network_gateway(self):

6
quantum/tests/unit/test_agent_config.py
View File

@ -31,15 +31,15 @@ class TestRootHelper(testtools.TestCase):
conf = config.setup_conf() conf = config.setup_conf()
config.register_root_helper(conf) config.register_root_helper(conf)
conf.set_override('root_helper', 'my_root_helper', 'AGENT') conf.set_override('root_helper', 'my_root_helper', 'AGENT')
self.assertEquals(config.get_root_helper(conf), 'my_root_helper') self.assertEqual(config.get_root_helper(conf), 'my_root_helper')
def test_root_helper(self): def test_root_helper(self):
conf = config.setup_conf() conf = config.setup_conf()
config.register_root_helper(conf) config.register_root_helper(conf)
conf.set_override('root_helper', 'my_root_helper') conf.set_override('root_helper', 'my_root_helper')
self.assertEquals(config.get_root_helper(conf), 'my_root_helper') self.assertEqual(config.get_root_helper(conf), 'my_root_helper')
def test_root_default(self): def test_root_default(self):
conf = config.setup_conf() conf = config.setup_conf()
config.register_root_helper(conf) config.register_root_helper(conf)
self.assertEquals(config.get_root_helper(conf), 'sudo') self.assertEqual(config.get_root_helper(conf), 'sudo')

20
quantum/tests/unit/test_attributes.py
View File

@ -414,7 +414,7 @@ class TestAttributes(testtools.TestCase):
for uuid in uuids: for uuid in uuids:
msg = attributes._validate_uuid_list(uuid) msg = attributes._validate_uuid_list(uuid)
error = "'%s' is not a list" % uuid error = "'%s' is not a list" % uuid
self.assertEquals(msg, error) self.assertEqual(msg, error)
# check invalid uuid in a list # check invalid uuid in a list
invalid_uuid_lists = [[None], invalid_uuid_lists = [[None],
@ -428,7 +428,7 @@ class TestAttributes(testtools.TestCase):
for uuid_list in invalid_uuid_lists: for uuid_list in invalid_uuid_lists:
msg = attributes._validate_uuid_list(uuid_list) msg = attributes._validate_uuid_list(uuid_list)
error = "'%s' is not a valid UUID" % uuid_list[0] error = "'%s' is not a valid UUID" % uuid_list[0]
self.assertEquals(msg, error) self.assertEqual(msg, error)
# check duplicate items in a list # check duplicate items in a list
duplicate_uuids = ['e5069610-744b-42a7-8bd8-ceac1a229cd4', duplicate_uuids = ['e5069610-744b-42a7-8bd8-ceac1a229cd4',
@ -437,7 +437,7 @@ class TestAttributes(testtools.TestCase):
msg = attributes._validate_uuid_list(duplicate_uuids) msg = attributes._validate_uuid_list(duplicate_uuids)
error = ("Duplicate items in the list: " error = ("Duplicate items in the list: "
"'%s'" % ', '.join(duplicate_uuids)) "'%s'" % ', '.join(duplicate_uuids))
self.assertEquals(msg, error) self.assertEqual(msg, error)
# check valid uuid lists # check valid uuid lists
valid_uuid_lists = [['e5069610-744b-42a7-8bd8-ceac1a229cd4'], valid_uuid_lists = [['e5069610-744b-42a7-8bd8-ceac1a229cd4'],
@ -446,11 +446,11 @@ class TestAttributes(testtools.TestCase):
'f3eeab00-8367-4524-b662-55e64d4cacb5']] 'f3eeab00-8367-4524-b662-55e64d4cacb5']]
for uuid_list in valid_uuid_lists: for uuid_list in valid_uuid_lists:
msg = attributes._validate_uuid_list(uuid_list) msg = attributes._validate_uuid_list(uuid_list)
self.assertEquals(msg, None) self.assertEqual(msg, None)
def test_validate_dict_type(self): def test_validate_dict_type(self):
for value in (None, True, '1', []): for value in (None, True, '1', []):
self.assertEquals(attributes._validate_dict(value), self.assertEqual(attributes._validate_dict(value),
"'%s' is not a dictionary" % value) "'%s' is not a dictionary" % value)
def test_validate_dict_without_constraints(self): def test_validate_dict_without_constraints(self):
@ -529,7 +529,7 @@ class TestAttributes(testtools.TestCase):
def test_validate_non_negative(self): def test_validate_non_negative(self):
for value in (-1, '-2'): for value in (-1, '-2'):
self.assertEquals(attributes._validate_non_negative(value), self.assertEqual(attributes._validate_non_negative(value),
"'%s' should be non-negative" % value) "'%s' should be non-negative" % value)
for value in (0, 1, '2', True, False): for value in (0, 1, '2', True, False):
@ -632,16 +632,16 @@ class TestConvertToList(testtools.TestCase):
def test_convert_to_empty_list(self): def test_convert_to_empty_list(self):
for item in (None, [], (), {}): for item in (None, [], (), {}):
self.assertEquals(attributes.convert_to_list(item), []) self.assertEqual(attributes.convert_to_list(item), [])
def test_convert_to_list_string(self): def test_convert_to_list_string(self):
for item in ('', 'foo'): for item in ('', 'foo'):
self.assertEquals(attributes.convert_to_list(item), [item]) self.assertEqual(attributes.convert_to_list(item), [item])
def test_convert_to_list_iterable(self): def test_convert_to_list_iterable(self):
for item in ([None], [1, 2, 3], (1, 2, 3), set([1, 2, 3]), ['foo']): for item in ([None], [1, 2, 3], (1, 2, 3), set([1, 2, 3]), ['foo']):
self.assertEquals(attributes.convert_to_list(item), list(item)) self.assertEqual(attributes.convert_to_list(item), list(item))
def test_convert_to_list_non_iterable(self): def test_convert_to_list_non_iterable(self):
for item in (True, False, 1, 1.2, object()): for item in (True, False, 1, 1.2, object()):
self.assertEquals(attributes.convert_to_list(item), [item]) self.assertEqual(attributes.convert_to_list(item), [item])

2
quantum/tests/unit/test_db.py
View File

@ -42,6 +42,6 @@ class DBTestCase(testtools.TestCase):
with mock.patch.object(db.LOG, 'warn') as mock_log: with mock.patch.object(db.LOG, 'warn') as mock_log:
mock_log.return_value = False mock_log.return_value = False
db.configure_db() db.configure_db()
self.assertEquals(mock_log.call_count, 1) self.assertEqual(mock_log.call_count, 1)
args = mock_log.call_args args = mock_log.call_args
self.assertNotEqual(args.find('sql_connection'), -1) self.assertNotEqual(args.find('sql_connection'), -1)

2
quantum/tests/unit/test_db_plugin.py
View File

@ -3026,7 +3026,7 @@ class TestSubnetsV2(QuantumDbPluginV2TestCase):
req = self.new_update_request('subnets', data, req = self.new_update_request('subnets', data,
subnet['subnet']['id']) subnet['subnet']['id'])
res = req.get_response(self.api) res = req.get_response(self.api)
self.assertEquals(res.status_int, 409) self.assertEqual(res.status_int, 409)
def test_show_subnet(self): def test_show_subnet(self):
with self.network() as network: with self.network() as network:

10
quantum/tests/unit/test_extension_extraroute.py
View File

@ -93,7 +93,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
{'router': {'routes': routes}}) {'router': {'routes': routes}})
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
self.assertEquals(body['router']['routes'], self.assertEqual(body['router']['routes'],
routes) routes)
self._update('routers', r['router']['id'], self._update('routers', r['router']['id'],
{'router': {'routes': []}}) {'router': {'routes': []}})
@ -119,7 +119,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
{'router': {'routes': routes}}) {'router': {'routes': routes}})
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
self.assertEquals(body['router']['routes'], self.assertEqual(body['router']['routes'],
routes) routes)
self._router_interface_action( self._router_interface_action(
@ -422,7 +422,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
s['subnet']['network_id']) s['subnet']['network_id'])
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
net_id = body['router']['external_gateway_info']['network_id'] net_id = body['router']['external_gateway_info']['network_id']
self.assertEquals(net_id, s['subnet']['network_id']) self.assertEqual(net_id, s['subnet']['network_id'])
port_res = self._list_ports('json', port_res = self._list_ports('json',
200, 200,
s['subnet']['network_id'], s['subnet']['network_id'],
@ -439,7 +439,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
routes}}) routes}})
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
self.assertEquals(body['router']['routes'], self.assertEqual(body['router']['routes'],
routes) routes)
self._remove_external_gateway_from_router( self._remove_external_gateway_from_router(
@ -447,7 +447,7 @@ class ExtraRouteDBTestCase(test_l3.L3NatDBTestCase):
s['subnet']['network_id']) s['subnet']['network_id'])
body = self._show('routers', r['router']['id']) body = self._show('routers', r['router']['id'])
gw_info = body['router']['external_gateway_info'] gw_info = body['router']['external_gateway_info']
self.assertEquals(gw_info, None) self.assertEqual(gw_info, None)
def test_router_list_with_sort(self): def test_router_list_with_sort(self):
with contextlib.nested(self.router(name='router1'), with contextlib.nested(self.router(name='router1'),

36
quantum/tests/unit/test_extension_portsecurity.py
View File

@ -190,34 +190,34 @@ class TestPortSecurity(PortSecurityDBTestCase):
def test_create_network_with_portsecurity_mac(self): def test_create_network_with_portsecurity_mac(self):
res = self._create_network('json', 'net1', True) res = self._create_network('json', 'net1', True)
net = self.deserialize('json', res) net = self.deserialize('json', res)
self.assertEquals(net['network'][psec.PORTSECURITY], True) self.assertEqual(net['network'][psec.PORTSECURITY], True)
def test_create_network_with_portsecurity_false(self): def test_create_network_with_portsecurity_false(self):
res = self._create_network('json', 'net1', True, res = self._create_network('json', 'net1', True,
arg_list=('port_security_enabled',), arg_list=('port_security_enabled',),
port_security_enabled=False) port_security_enabled=False)
net = self.deserialize('json', res) net = self.deserialize('json', res)
self.assertEquals(net['network'][psec.PORTSECURITY], False) self.assertEqual(net['network'][psec.PORTSECURITY], False)
def test_updating_network_port_security(self): def test_updating_network_port_security(self):
res = self._create_network('json', 'net1', True, res = self._create_network('json', 'net1', True,
port_security_enabled='True') port_security_enabled='True')
net = self.deserialize('json', res) net = self.deserialize('json', res)
self.assertEquals(net['network'][psec.PORTSECURITY], True) self.assertEqual(net['network'][psec.PORTSECURITY], True)
update_net = {'network': {psec.PORTSECURITY: False}} update_net = {'network': {psec.PORTSECURITY: False}}
req = self.new_update_request('networks', update_net, req = self.new_update_request('networks', update_net,
net['network']['id']) net['network']['id'])
net = self.deserialize('json', req.get_response(self.api)) net = self.deserialize('json', req.get_response(self.api))
self.assertEquals(net['network'][psec.PORTSECURITY], False) self.assertEqual(net['network'][psec.PORTSECURITY], False)
req = self.new_show_request('networks', net['network']['id']) req = self.new_show_request('networks', net['network']['id'])
net = self.deserialize('json', req.get_response(self.api)) net = self.deserialize('json', req.get_response(self.api))
self.assertEquals(net['network'][psec.PORTSECURITY], False) self.assertEqual(net['network'][psec.PORTSECURITY], False)
def test_create_port_default_true(self): def test_create_port_default_true(self):
with self.network() as net: with self.network() as net:
res = self._create_port('json', net['network']['id']) res = self._create_port('json', net['network']['id'])
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_create_port_passing_true(self): def test_create_port_passing_true(self):
@ -227,7 +227,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
net = self.deserialize('json', res) net = self.deserialize('json', res)
res = self._create_port('json', net['network']['id']) res = self._create_port('json', net['network']['id'])
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_create_port_on_port_security_false_network(self): def test_create_port_on_port_security_false_network(self):
@ -237,7 +237,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
net = self.deserialize('json', res) net = self.deserialize('json', res)
res = self._create_port('json', net['network']['id']) res = self._create_port('json', net['network']['id'])
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], False) self.assertEqual(port['port'][psec.PORTSECURITY], False)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_create_port_security_overrides_network_value(self): def test_create_port_security_overrides_network_value(self):
@ -249,7 +249,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
arg_list=('port_security_enabled',), arg_list=('port_security_enabled',),
port_security_enabled=True) port_security_enabled=True)
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_create_port_with_default_security_group(self): def test_create_port_with_default_security_group(self):
@ -259,8 +259,8 @@ class TestPortSecurity(PortSecurityDBTestCase):
with self.subnet(network=net): with self.subnet(network=net):
res = self._create_port('json', net['network']['id']) res = self._create_port('json', net['network']['id'])
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 1) self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 1)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_update_port_security_off_with_security_group(self): def test_update_port_security_off_with_security_group(self):
@ -270,7 +270,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
with self.subnet(network=net): with self.subnet(network=net):
res = self._create_port('json', net['network']['id']) res = self._create_port('json', net['network']['id'])
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
update_port = {'port': {psec.PORTSECURITY: False}} update_port = {'port': {psec.PORTSECURITY: False}}
req = self.new_update_request('ports', update_port, req = self.new_update_request('ports', update_port,
@ -294,7 +294,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
arg_list=('port_security_enabled',), arg_list=('port_security_enabled',),
port_security_enabled=True) port_security_enabled=True)
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
# remove security group on port # remove security group on port
update_port = {'port': {ext_sg.SECURITYGROUPS: None, update_port = {'port': {ext_sg.SECURITYGROUPS: None,
@ -303,8 +303,8 @@ class TestPortSecurity(PortSecurityDBTestCase):
port['port']['id']) port['port']['id'])
port = self.deserialize('json', req.get_response(self.api)) port = self.deserialize('json', req.get_response(self.api))
self.assertEquals(port['port'][psec.PORTSECURITY], False) self.assertEqual(port['port'][psec.PORTSECURITY], False)
self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 0) self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 0)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_update_port_remove_port_security_security_group_readd(self): def test_update_port_remove_port_security_security_group_readd(self):
@ -316,7 +316,7 @@ class TestPortSecurity(PortSecurityDBTestCase):
arg_list=('port_security_enabled',), arg_list=('port_security_enabled',),
port_security_enabled=True) port_security_enabled=True)
port = self.deserialize('json', res) port = self.deserialize('json', res)
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
# remove security group on port # remove security group on port
update_port = {'port': {ext_sg.SECURITYGROUPS: None, update_port = {'port': {ext_sg.SECURITYGROUPS: None,
@ -333,8 +333,8 @@ class TestPortSecurity(PortSecurityDBTestCase):
port['port']['id']) port['port']['id'])
port = self.deserialize('json', req.get_response(self.api)) port = self.deserialize('json', req.get_response(self.api))
self.assertEquals(port['port'][psec.PORTSECURITY], True) self.assertEqual(port['port'][psec.PORTSECURITY], True)
self.assertEquals(len(port['port'][ext_sg.SECURITYGROUPS]), 1) self.assertEqual(len(port['port'][ext_sg.SECURITYGROUPS]), 1)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
def test_create_port_security_off_shared_network(self): def test_create_port_security_off_shared_network(self):

6
quantum/tests/unit/test_extension_security_group.py
View File

@ -339,9 +339,9 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
ethertype=ethertype) as rule: ethertype=ethertype) as rule:
# the lower case value will be return # the lower case value will be return
self.assertEquals(rule['security_group_rule']['protocol'], self.assertEqual(rule['security_group_rule']['protocol'],
protocol.lower()) protocol.lower())
self.assertEquals(rule['security_group_rule']['ethertype'], self.assertEqual(rule['security_group_rule']['ethertype'],
'IPv4') 'IPv4')
def test_get_security_group(self): def test_get_security_group(self):
@ -606,7 +606,7 @@ class TestSecurityGroups(SecurityGroupDBTestCase):
ports = self.deserialize(self.fmt, ports = self.deserialize(self.fmt,
res.get_response(self.api)) res.get_response(self.api))
port = ports['ports'][0] port = ports['ports'][0]
self.assertEquals(len(port[ext_sg.SECURITYGROUPS]), 1) self.assertEqual(len(port[ext_sg.SECURITYGROUPS]), 1)
self._delete('ports', port['id']) self._delete('ports', port['id'])
def test_list_security_group_rules(self): def test_list_security_group_rules(self):

30
quantum/tests/unit/test_security_groups_rpc.py
View File

@ -71,7 +71,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
rule2['security_group_rule']]} rule2['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -96,7 +96,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'source_ip_prefix': fake_prefix}, 'source_ip_prefix': fake_prefix},
{'ethertype': 'IPv4', 'direction': 'egress'}, {'ethertype': 'IPv4', 'direction': 'egress'},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
@ -120,7 +120,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
rule2['security_group_rule']]} rule2['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -144,7 +144,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'port_range_min': 23, 'port_range_min': 23,
'dest_ip_prefix': fake_prefix}, 'dest_ip_prefix': fake_prefix},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
@ -166,7 +166,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'security_group_rules': [rule1['security_group_rule']]} 'security_group_rules': [rule1['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -194,7 +194,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'security_group_id': sg1_id}, 'security_group_id': sg1_id},
{'ethertype': 'IPv4', 'direction': 'egress'}, {'ethertype': 'IPv4', 'direction': 'egress'},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
self._delete('ports', port_id2) self._delete('ports', port_id2)
@ -223,7 +223,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
rule2['security_group_rule']]} rule2['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -249,7 +249,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'source_ip_prefix': fake_prefix}, 'source_ip_prefix': fake_prefix},
{'ethertype': 'IPv6', 'direction': 'egress'}, {'ethertype': 'IPv6', 'direction': 'egress'},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
@ -277,7 +277,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
rule2['security_group_rule']]} rule2['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -303,7 +303,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'port_range_min': 23, 'port_range_min': 23,
'dest_ip_prefix': fake_prefix}, 'dest_ip_prefix': fake_prefix},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
@ -329,7 +329,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'security_group_rules': [rule1['security_group_rule']]} 'security_group_rules': [rule1['security_group_rule']]}
res = self._create_security_group_rule(self.fmt, rules) res = self._create_security_group_rule(self.fmt, rules)
self.deserialize(self.fmt, res) self.deserialize(self.fmt, res)
self.assertEquals(res.status_int, 201) self.assertEqual(res.status_int, 201)
res1 = self._create_port( res1 = self._create_port(
self.fmt, n['network']['id'], self.fmt, n['network']['id'],
@ -360,7 +360,7 @@ class SGServerRpcCallBackMixinTestCase(test_sg.SecurityGroupDBTestCase):
'security_group_id': sg1_id}, 'security_group_id': sg1_id},
{'ethertype': 'IPv6', 'direction': 'egress'}, {'ethertype': 'IPv6', 'direction': 'egress'},
] ]
self.assertEquals(port_rpc['security_group_rules'], self.assertEqual(port_rpc['security_group_rules'],
expected) expected)
self._delete('ports', port_id1) self._delete('ports', port_id1)
self._delete('ports', port_id2) self._delete('ports', port_id2)
@ -534,12 +534,12 @@ class SecurityGroupAgentRpcApiTestCase(testtools.TestCase):
def test_security_groups_rule_not_updated(self): def test_security_groups_rule_not_updated(self):
self.notifier.security_groups_rule_updated( self.notifier.security_groups_rule_updated(
None, security_groups=[]) None, security_groups=[])
self.assertEquals(False, self.notifier.fanout_cast.called) self.assertEqual(False, self.notifier.fanout_cast.called)
def test_security_groups_member_not_updated(self): def test_security_groups_member_not_updated(self):
self.notifier.security_groups_member_updated( self.notifier.security_groups_member_updated(
None, security_groups=[]) None, security_groups=[])
self.assertEquals(False, self.notifier.fanout_cast.called) self.assertEqual(False, self.notifier.fanout_cast.called)
#Note(nati) bn -> binary_name #Note(nati) bn -> binary_name
# id -> device_id # id -> device_id
@ -1159,7 +1159,7 @@ class SGNotificationTestMixin():
port['port']['id']) port['port']['id'])
res = self.deserialize(self.fmt, res = self.deserialize(self.fmt,
req.get_response(self.api)) req.get_response(self.api))
self.assertEquals(res['port'][ext_sg.SECURITYGROUPS][0], self.assertEqual(res['port'][ext_sg.SECURITYGROUPS][0],
security_group_id) security_group_id)
self._delete('ports', port['port']['id']) self._delete('ports', port['port']['id'])
self.notifier.assert_has_calls( self.notifier.assert_has_calls(

12
quantum/tests/unit/test_servicetype.py
View File

@ -411,14 +411,14 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase):
data = self.deserialize(res) data = self.deserialize(res)
self.assertTrue('service_types' in data) self.assertTrue('service_types' in data)
# it must be 3 because we have the default service type too! # it must be 3 because we have the default service type too!
self.assertEquals(len(data['service_types']), 3) self.assertEqual(len(data['service_types']), 3)
def test_get_default_service_type(self): def test_get_default_service_type(self):
res = self._list_service_types() res = self._list_service_types()
self.assertEqual(res.status_int, webexc.HTTPOk.code) self.assertEqual(res.status_int, webexc.HTTPOk.code)
data = self.deserialize(res) data = self.deserialize(res)
self.assertTrue('service_types' in data) self.assertTrue('service_types' in data)
self.assertEquals(len(data['service_types']), 1) self.assertEqual(len(data['service_types']), 1)
def_svc_type = data['service_types'][0] def_svc_type = data['service_types'][0]
self.assertEqual(def_svc_type['default'], True) self.assertEqual(def_svc_type['default'], True)
@ -438,7 +438,7 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase):
ctx = context.Context('', '', is_admin=True) ctx = context.Context('', '', is_admin=True)
mgr.increase_service_type_refcount(ctx, svc_type_data['id']) mgr.increase_service_type_refcount(ctx, svc_type_data['id'])
res = self._delete_service_type(svc_type_data['id'], True) res = self._delete_service_type(svc_type_data['id'], True)
self.assertEquals(res.status_int, webexc.HTTPConflict.code) self.assertEqual(res.status_int, webexc.HTTPConflict.code)
mgr.decrease_service_type_refcount(ctx, svc_type_data['id']) mgr.decrease_service_type_refcount(ctx, svc_type_data['id'])
def test_create_dummy_increases_service_type_refcount(self): def test_create_dummy_increases_service_type_refcount(self):
@ -446,20 +446,20 @@ class ServiceTypeManagerTestCase(ServiceTypeTestCaseBase):
svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self._show_service_type(dummy['service_type'])
svc_type_res = self.deserialize(svc_type_res) svc_type_res = self.deserialize(svc_type_res)
svc_type = svc_type_res[self.resource_name] svc_type = svc_type_res[self.resource_name]
self.assertEquals(svc_type['num_instances'], 1) self.assertEqual(svc_type['num_instances'], 1)
def test_delete_dummy_decreases_service_type_refcount(self): def test_delete_dummy_decreases_service_type_refcount(self):
dummy = self._create_dummy() dummy = self._create_dummy()
svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self._show_service_type(dummy['service_type'])
svc_type_res = self.deserialize(svc_type_res) svc_type_res = self.deserialize(svc_type_res)
svc_type = svc_type_res[self.resource_name] svc_type = svc_type_res[self.resource_name]
self.assertEquals(svc_type['num_instances'], 1) self.assertEqual(svc_type['num_instances'], 1)
self.api.delete(_get_path('dummys/%s' % str(dummy['id']), self.api.delete(_get_path('dummys/%s' % str(dummy['id']),
fmt=self.fmt)) fmt=self.fmt))
svc_type_res = self._show_service_type(dummy['service_type']) svc_type_res = self._show_service_type(dummy['service_type'])
svc_type_res = self.deserialize(svc_type_res) svc_type_res = self.deserialize(svc_type_res)
svc_type = svc_type_res[self.resource_name] svc_type = svc_type_res[self.resource_name]
self.assertEquals(svc_type['num_instances'], 0) self.assertEqual(svc_type['num_instances'], 0)
class ServiceTypeManagerTestCaseXML(ServiceTypeManagerTestCase): class ServiceTypeManagerTestCaseXML(ServiceTypeManagerTestCase):