4070N/ASolaris/EVS do not yet support security_groups so disable all

4070N/Asecurity_group quotas and remove the pie chart from the summary page.

4070N/AThis patch is not suitable for upstream contribution.

4070N/A

6033N/A--- horizon-2015.1.2/horizon/templates/horizon/common/_limit_summary.html.orig 2015-12-12 12:53:10.612619487 -0500

6033N/A+++ horizon-2015.1.2/horizon/templates/horizon/common/_limit_summary.html 2015-12-12 12:54:55.097278375 -0500

4070N/A@@ -30,12 +30,6 @@

4070N/A </strong>

4070N/A </div>

6033N/A

4070N/A- <div class="d3_quota_bar">

6033N/A- <div class="d3_pie_chart_usage" data-used="{% quotapercent usage.limits.totalSecurityGroupsUsed usage.limits.maxSecurityGroups %}"></div>

4070N/A- <strong>{% trans "Security Groups" %} <br />

6033N/A- {% blocktrans with used=usage.limits.totalSecurityGroupsUsed|intcomma available=usage.limits.maxSecurityGroups|quotainf|intcomma %}Used <span> {{ used }} </span> of <span> {{ available }} </span>{% endblocktrans %}

4070N/A- </strong>

4070N/A- </div>

4070N/A {% if usage.limits.totalVolumesUsed >= 0 %}

4070N/A <div class="d3_quota_bar">

6033N/A <div class="d3_pie_chart_usage" data-used="{% quotapercent usage.limits.totalVolumesUsed usage.limits.maxTotalVolumes %}"></div>

4070N/A

6033N/A--- horizon-2015.1.2/openstack_dashboard/usage/quotas.py.orig 2015-12-12 12:56:35.439533474 -0500

6033N/A+++ horizon-2015.1.2/openstack_dashboard/usage/quotas.py 2015-12-12 13:03:03.987504312 -0500

6033N/A@@ -235,13 +235,11 @@

4070N/A # Remove the nova network quotas

4070N/A disabled_quotas.extend(['floating_ips', 'fixed_ips'])

6033N/A

4070N/A- if neutron.is_extension_supported(request, 'security-group'):

4070N/A- # If Neutron security group is supported, disable Nova quotas

4070N/A- disabled_quotas.extend(['security_groups', 'security_group_rules'])

4070N/A- else:

4070N/A- # If Nova security group is used, disable Neutron quotas

4070N/A- disabled_quotas.extend(['security_group', 'security_group_rule'])

6033N/A-

4070N/A+ # Solaris/EVS do not yet support security_groups, so disable all

4070N/A+ # security_group quotas

4070N/A+ disabled_quotas.extend(['security_groups', 'security_group_rules'])

4070N/A+ disabled_quotas.extend(['security_group', 'security_group_rule'])

6033N/A+

4070N/A try:

4070N/A if not neutron.is_quotas_extension_supported(request):

6033N/A disabled_quotas.extend(NEUTRON_QUOTA_FIELDS)

6033N/A