firewall_gui: vlangroup details page added

cloud/urls.py

@@ -107,6 +107,7 @@ urlpatterns = patterns('',
     url(r'^firewall/rules/(?P<id>\d+)/$', 'firewall_gui.views.show_rule'),
     url(r'^firewall/rules/(?P<id>\d+)/$', 'firewall_gui.views.show_rule'),
     url(r'^firewall/hosts/(?P<id>\d+)/$', 'firewall_gui.views.show_host'),
     url(r'^firewall/hosts/(?P<id>\d+)/$', 'firewall_gui.views.show_host'),
     url(r'^firewall/vlans/(?P<id>\d+)/$', 'firewall_gui.views.show_vlan'),
     url(r'^firewall/vlans/(?P<id>\d+)/$', 'firewall_gui.views.show_vlan'),
+    url(r'^firewall/vlangroups/(?P<id>\d+)/$', 'firewall_gui.views.show_vlangroup'),
 
 
     url(r'^firewall/autocomplete/vlan/$', 'firewall_gui.views.autocomplete_vlan'),
     url(r'^firewall/autocomplete/vlan/$', 'firewall_gui.views.autocomplete_vlan'),
     url(r'^firewall/autocomplete/vlangroup/$', 'firewall_gui.views.autocomplete_vlangroup'),
     url(r'^firewall/autocomplete/vlangroup/$', 'firewall_gui.views.autocomplete_vlangroup'),

firewall_gui/static/js/project.js

@@ -34,7 +34,7 @@ $.ajaxSetup({
  * @type {Array}
  * @type {Array}
  */
  */
 var listControllers = ['rule', 'host', 'vlan', 'vlangroup', 'hostgroup', 'firewall', 'domain', 'record', 'blacklist'];
 var listControllers = ['rule', 'host', 'vlan', 'vlangroup', 'hostgroup', 'firewall', 'domain', 'record', 'blacklist'];
-var entityControllers = ['rule', 'host', 'vlan'];
+var entityControllers = ['rule', 'host', 'vlan', 'vlangroup'];
 var module = angular.module('firewall', []).config(
 var module = angular.module('firewall', []).config(
 ['$routeProvider', function($routeProvider) {
 ['$routeProvider', function($routeProvider) {
     for (var i in listControllers) {
     for (var i in listControllers) {
@@ -153,7 +153,7 @@ function EntityController(url) {
                     return true;
                     return true;
                 }
                 }
             });
             });
-            ['vlan', 'host', 'firewall'].forEach(function(t) {
+            ['vlan', 'vlangroup', 'host', 'firewall'].forEach(function(t) {
                 $('#' + t).typeahead({
                 $('#' + t).typeahead({
                     source: function(query, process) {
                     source: function(query, process) {
                         $.ajax({
                         $.ajax({

firewall_gui/templates/firewall/index.html

@@ -15,6 +15,14 @@
       body {
       body {
         padding-top: 60px;
         padding-top: 60px;
       }
       }
+      .label {
+        margin: 3px;
+        padding: 5px;
+      }
+      .label a {
+        color: black;
+        font-weight: normal;
+      }
     </style>
     </style>
     <link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
     <link href="{% static "css/bootstrap-responsive.min.css" %}" rel="stylesheet">
 
 

firewall_gui/views.py

@@ -323,6 +323,36 @@ def show_vlan(request, id):
     }
     }
     return HttpResponse(json.dumps(vlan), content_type='application/json')
     return HttpResponse(json.dumps(vlan), content_type='application/json')
 
 
+def show_vlangroup(request, id):
+    group = get_object_or_404(VlanGroup, id=id)
+    group = {
+        'id': group.id,
+        'name': group.name,
+        'vlans': [{
+            'id': vlan.id,
+            'name': vlan.name
+        } for vlan in group.vlans.all()],
+        'description': group.description,
+        'owner': {
+            'id': group.owner.id,
+            'name': str(group.owner)
+        },
+        'created_at': group.created_at.isoformat(),
+        'modified_at': group.modified_at.isoformat(),
+        'rules': [{
+            'id': rule.id,
+            'direction': rule.get_direction_display(),
+            'proto': rule.proto,
+            'owner': {
+                'id': rule.owner.id,
+                'name': str(rule.owner),
+            },
+            'accept': rule.accept,
+            'nat': rule.nat
+        } for rule in group.rules.all()]
+    }
+    return HttpResponse(json.dumps(group), content_type='application/json')
+
 
 
 def autocomplete_vlan(request):
 def autocomplete_vlan(request):
     return HttpResponse(json.dumps([{
     return HttpResponse(json.dumps([{