From a9da538995d6e3f9450b8040bffd9a0539bce3f0 Mon Sep 17 00:00:00 2001 From: Ankur Gupta Date: Sun, 5 Jun 2016 14:58:32 -0500 Subject: [PATCH] Add Try/Exception block to Network Forms Add Try/Except around is_extension_supported Neutron API call. Change-Id: Ic21eb5c5f1d5dbacd92f89c5d8ecab666111f629 --- .../dashboards/admin/networks/forms.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/openstack_dashboard/dashboards/admin/networks/forms.py b/openstack_dashboard/dashboards/admin/networks/forms.py index e0986d9a78..41774a7632 100644 --- a/openstack_dashboard/dashboards/admin/networks/forms.py +++ b/openstack_dashboard/dashboards/admin/networks/forms.py @@ -150,8 +150,16 @@ class CreateNetwork(forms.SelfHandlingForm): if api.neutron.is_port_profiles_supported(): self.fields['net_profile_id'].choices = ( self.get_network_profile_choices(request)) + try: + is_extension_supported = \ + api.neutron.is_extension_supported(request, 'provider') + except Exception: + msg = _("Unable to verify Neutron service providers") + exceptions.handle(self.request, msg) + self._hide_provider_network_type() + is_extension_supported = False - if api.neutron.is_extension_supported(request, 'provider'): + if is_extension_supported: neutron_settings = getattr(settings, 'OPENSTACK_NEUTRON_NETWORK', {}) self.seg_id_range = SEGMENTATION_ID_RANGE.copy() @@ -210,8 +218,6 @@ class CreateNetwork(forms.SelfHandlingForm): self._hide_provider_network_type() else: self.fields['network_type'].choices = network_type_choices - else: - self._hide_provider_network_type() def get_network_profile_choices(self, request): profile_choices = [('', _("Select a profile"))]