Merge "Sort security group rules by protocol and port" into stable/icehouse

1 files changed, 2 insertions, 1 deletions

diff --git a/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py b/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py
index 5aefbf497..093f216e9 100644
--- a/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py
+++ b/openstack_dashboard/dashboards/project/access_and_security/security_groups/views.py
@@ -58,7 +58,8 @@ class DetailView(tables.DataTableView):
         data = self._get_data()
         if data is None:
             return []
-        return data.rules
+        return sorted(data.rules, key=lambda rule: (rule.ip_protocol,
+                                                    rule.from_port))
 
     def get_context_data(self, **kwargs):
         context = super(DetailView, self).get_context_data(**kwargs)