x/vmware-nsx
Code Issues Proposed changes

Merge "make assertRaises() test for specific exceptions"

Browse Source
This commit is contained in:
Jenkins 2013-08-13 21:55:01 +00:00 committed by Gerrit Code Review
commit b125ced188
3 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/plugins/nicira/common/exceptions.py
View File

@ -52,3 +52,7 @@ class NvpNatRuleMismatch(NvpPluginException):
message = _("While retrieving NAT rules, %(actual_rules)s were found " message = _("While retrieving NAT rules, %(actual_rules)s were found "
"whereas rules in the (%(min_rules)s,%(max_rules)s) interval " "whereas rules in the (%(min_rules)s,%(max_rules)s) interval "
"were expected") "were expected")
class NvpInvalidAttachmentType(NvpPluginException):
message = _("Invalid NVP attachment type '%(attachment_type)s'")

5
neutron/plugins/nicira/nvplib.py
View File

@ -866,9 +866,8 @@ def plug_router_port_attachment(cluster, router_id, port_id,
if attachment_vlan: if attachment_vlan:
attach_obj['vlan_id'] = attachment_vlan attach_obj['vlan_id'] = attachment_vlan
else: else:
# TODO(salv-orlando): avoid raising generic exception raise nvp_exc.NvpInvalidAttachmentType(
raise Exception(_("Invalid NVP attachment type '%s'"), attachment_type=nvp_attachment_type)
nvp_attachment_type)
return do_request(HTTP_PUT, uri, json.dumps(attach_obj), cluster=cluster) return do_request(HTTP_PUT, uri, json.dumps(attach_obj), cluster=cluster)

4
neutron/tests/unit/nicira/test_nvplib.py
View File

@ -902,7 +902,7 @@ class TestNvplibLogicalRouters(NvplibTestCase):
lrouter_port = nvplib.create_router_lport( lrouter_port = nvplib.create_router_lport(
self.fake_cluster, lrouter['uuid'], 'pippo', 'neutron_port_id', self.fake_cluster, lrouter['uuid'], 'pippo', 'neutron_port_id',
'name', True, ['192.168.0.1']) 'name', True, ['192.168.0.1'])
self.assertRaises(Exception, self.assertRaises(nvp_exc.NvpInvalidAttachmentType,
nvplib.plug_router_port_attachment, nvplib.plug_router_port_attachment,
self.fake_cluster, lrouter['uuid'], self.fake_cluster, lrouter['uuid'],
lrouter_port['uuid'], 'gw_att', 'BadType') lrouter_port['uuid'], 'gw_att', 'BadType')
@ -965,7 +965,7 @@ class TestNvplibLogicalRouters(NvplibTestCase):
with mock.patch.object(self.fake_cluster.api_client, with mock.patch.object(self.fake_cluster.api_client,
'get_nvp_version', 'get_nvp_version',
new=lambda: '2.0'): new=lambda: '2.0'):
self.assertRaises(Exception, self.assertRaises(AttributeError,
nvplib.create_lrouter_snat_rule, nvplib.create_lrouter_snat_rule,
self.fake_cluster, lrouter['uuid'], self.fake_cluster, lrouter['uuid'],
'10.0.0.2', '10.0.0.2', order=200, '10.0.0.2', '10.0.0.2', order=200,