From cc25bd602626af194650e3ce3888992c9d9a4ff2 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Thu, 24 Jul 2014 17:56:18 +0900 Subject: [PATCH] Remove per-feature extension check method in api/neutron Change-Id: Ie1309d5a51e86a37c640e169d66c73724fc1c9ff Closes-Bug: #1348075 --- openstack_dashboard/api/network.py | 2 +- openstack_dashboard/api/neutron.py | 8 -------- openstack_dashboard/dashboards/admin/info/tabs.py | 2 +- openstack_dashboard/usage/base.py | 2 +- openstack_dashboard/usage/quotas.py | 2 +- 5 files changed, 4 insertions(+), 12 deletions(-) diff --git a/openstack_dashboard/api/network.py b/openstack_dashboard/api/network.py index 06dff05edf2..65a2d6fe675 100644 --- a/openstack_dashboard/api/network.py +++ b/openstack_dashboard/api/network.py @@ -34,7 +34,7 @@ def __init__(self, request): self.floating_ips = nova.FloatingIpManager(request) if (neutron_enabled and - neutron.is_security_group_extension_supported(request)): + neutron.is_extension_supported(request, 'security-group')): self.secgroups = neutron.SecurityGroupManager(request) else: self.secgroups = nova.SecurityGroupManager(request) diff --git a/openstack_dashboard/api/neutron.py b/openstack_dashboard/api/neutron.py index 74777bfea04..06524e7ea5c 100644 --- a/openstack_dashboard/api/neutron.py +++ b/openstack_dashboard/api/neutron.py @@ -864,14 +864,6 @@ def is_quotas_extension_supported(request): return False -def is_security_group_extension_supported(request): - return is_extension_supported(request, 'security-group') - - -def is_agent_extension_supported(request): - return is_extension_supported(request, 'agent') - - # Using this mechanism till a better plugin/sub-plugin detection # mechanism is available. # When using specific plugins the profile_support can be diff --git a/openstack_dashboard/dashboards/admin/info/tabs.py b/openstack_dashboard/dashboards/admin/info/tabs.py index 9bcd25824ea..a8e54deeb0e 100644 --- a/openstack_dashboard/dashboards/admin/info/tabs.py +++ b/openstack_dashboard/dashboards/admin/info/tabs.py @@ -90,7 +90,7 @@ class NetworkAgentsTab(tabs.TableTab): def allowed(self, request): try: return (base.is_service_enabled(request, 'network') and - neutron.is_agent_extension_supported(request)) + neutron.is_extension_supported(request, 'agent')) except Exception: exceptions.handle(request, _('Unable to get network agents info.')) return False diff --git a/openstack_dashboard/usage/base.py b/openstack_dashboard/usage/base.py index 471893f8737..f884d0c3f33 100644 --- a/openstack_dashboard/usage/base.py +++ b/openstack_dashboard/usage/base.py @@ -143,7 +143,7 @@ def get_neutron_limits(self): neutron_quotas_supported = \ api.neutron.is_quotas_extension_supported(self.request) neutron_sg_used = \ - api.neutron.is_security_group_extension_supported(self.request) + api.neutron.is_extension_supported(self.request, 'security-group') self._get_neutron_usage(self.limits, 'floatingip') if neutron_sg_used: self._get_neutron_usage(self.limits, 'security_group') diff --git a/openstack_dashboard/usage/quotas.py b/openstack_dashboard/usage/quotas.py index d131664161f..79f09a91d6a 100644 --- a/openstack_dashboard/usage/quotas.py +++ b/openstack_dashboard/usage/quotas.py @@ -172,7 +172,7 @@ def get_disabled_quotas(request): # Remove the nova network quotas disabled_quotas.extend(['floating_ips', 'fixed_ips']) - if neutron.is_security_group_extension_supported(request): + if neutron.is_extension_supported(request, 'security-group'): # If Neutron security group is supported, disable Nova quotas disabled_quotas.extend(['security_groups', 'security_group_rules']) else: