openstack/horizon
Code Issues Proposed changes

Merge "Remove per-feature extension check method in api/neutron"

Browse Source
This commit is contained in:
Jenkins 2014-07-28 13:49:52 +00:00 committed by Gerrit Code Review
commit ad4eae9543
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/api/network.py
View File

@ -34,7 +34,7 @@ class NetworkClient(object):
self.floating_ips = nova.FloatingIpManager(request) self.floating_ips = nova.FloatingIpManager(request)
if (neutron_enabled and if (neutron_enabled and
neutron.is_security_group_extension_supported(request)): neutron.is_extension_supported(request, 'security-group')):
self.secgroups = neutron.SecurityGroupManager(request) self.secgroups = neutron.SecurityGroupManager(request)
else: else:
self.secgroups = nova.SecurityGroupManager(request) self.secgroups = nova.SecurityGroupManager(request)

8
openstack_dashboard/api/neutron.py
View File

@ -864,14 +864,6 @@ def is_quotas_extension_supported(request):
return False 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 # Using this mechanism till a better plugin/sub-plugin detection
# mechanism is available. # mechanism is available.
# When using specific plugins the profile_support can be # When using specific plugins the profile_support can be

2
openstack_dashboard/dashboards/admin/info/tabs.py
View File

@ -90,7 +90,7 @@ class NetworkAgentsTab(tabs.TableTab):
def allowed(self, request): def allowed(self, request):
try: try:
return (base.is_service_enabled(request, 'network') and return (base.is_service_enabled(request, 'network') and
neutron.is_agent_extension_supported(request)) neutron.is_extension_supported(request, 'agent'))
except Exception: except Exception:
exceptions.handle(request, _('Unable to get network agents info.')) exceptions.handle(request, _('Unable to get network agents info.'))
return False return False

2
openstack_dashboard/usage/base.py
View File

@ -143,7 +143,7 @@ class BaseUsage(object):
neutron_quotas_supported = \ neutron_quotas_supported = \
api.neutron.is_quotas_extension_supported(self.request) api.neutron.is_quotas_extension_supported(self.request)
neutron_sg_used = \ 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') self._get_neutron_usage(self.limits, 'floatingip')
if neutron_sg_used: if neutron_sg_used:
self._get_neutron_usage(self.limits, 'security_group') self._get_neutron_usage(self.limits, 'security_group')

2
openstack_dashboard/usage/quotas.py
View File

@ -172,7 +172,7 @@ def get_disabled_quotas(request):
# Remove the nova network quotas # Remove the nova network quotas
disabled_quotas.extend(['floating_ips', 'fixed_ips']) 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 # If Neutron security group is supported, disable Nova quotas
disabled_quotas.extend(['security_groups', 'security_group_rules']) disabled_quotas.extend(['security_groups', 'security_group_rules'])
else: else: