diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-03-15 15:23:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-03-15 15:23:15 +0000 |
| commit | d4e456876e8eaaadbdb806b4d4c1b609bb7e5d3e (patch) | |
| tree | 37d12781f7d33375869f195e1bfddf38578a6b1e /nova/api | |
| parent | 7770390bf3ebda9f46719ce6ba86a1acb37cea88 (diff) | |
| parent | 3971c4ee489fb3b059448eac173d76a87e202e66 (diff) | |
| download | nova-d4e456876e8eaaadbdb806b4d4c1b609bb7e5d3e.tar.gz nova-d4e456876e8eaaadbdb806b4d4c1b609bb7e5d3e.tar.xz nova-d4e456876e8eaaadbdb806b4d4c1b609bb7e5d3e.zip | |
Merge "Fix exception message in Networks API extension"
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/os_networks.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/api/openstack/compute/contrib/os_networks.py b/nova/api/openstack/compute/contrib/os_networks.py index c6268f277..2cea0e081 100644 --- a/nova/api/openstack/compute/contrib/os_networks.py +++ b/nova/api/openstack/compute/contrib/os_networks.py @@ -139,6 +139,9 @@ class NetworkController(wsgi.Controller): try: self.network_api.add_network_to_project( context, project_id, network_id) + except NotImplementedError: + msg = (_("VLAN support must be enabled")) + raise exc.HTTPNotImplemented(explanation=msg) except Exception as ex: msg = (_("Cannot associate network %(network)s" " with project %(project)s: %(message)s") % |