Skip to content

CIRCLE / cloud

Go to a project
Commit d00fee67 by Bence Dányi
Options

firewall_gui: save vlan details

parent 214ba8d8
Showing with 60 additions and 17 deletions
cloud/urls.py
...@@ -107,4 +107,5 @@ urlpatterns = patterns('', ...@@ -107,4 +107,5 @@ urlpatterns = patterns('',
url(r'^firewall/rules/save/$', 'firewall_gui.views.save_rule'), url(r'^firewall/rules/save/$', 'firewall_gui.views.save_rule'),
url(r'^firewall/hosts/save/$', 'firewall_gui.views.save_host'), url(r'^firewall/hosts/save/$', 'firewall_gui.views.save_host'),
url(r'^firewall/vlans/save/$', 'firewall_gui.views.save_vlan'),
) )
firewall_gui/static/partials/vlan-edit.html
...@@ -6,10 +6,11 @@ ...@@ -6,10 +6,11 @@
<input class="input-mini" type="text" id="ID" placeholder="ID" value="{{entity.id}}" disabled="disabled"> <input class="input-mini" type="text" id="ID" placeholder="ID" value="{{entity.id}}" disabled="disabled">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('vid')">
<label class="control-label" for="VID">VID</label> <label class="control-label" for="VID">VID</label>
<div class="controls"> <div class="controls">
<input class="input-mini" type="text" id="VID" placeholder="ID" ng-model="entity.vid"> <input class="input-mini" type="text" id="VID" placeholder="ID" ng-model="entity.vid">
<span class="help-inline" ng-bind="getError('vid')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
...@@ -24,80 +25,91 @@ ...@@ -24,80 +25,91 @@
<input class="input" type="text" id="modified_at" ng-model="entity.modified_at" disabled="disabled"> <input class="input" type="text" id="modified_at" ng-model="entity.modified_at" disabled="disabled">
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('name')">
<label class="control-label" for="name">Name</label> <label class="control-label" for="name">Name</label>
<div class="controls"> <div class="controls">
<input type="text" id="name" ng-model="entity.name" /> <input type="text" id="name" ng-model="entity.name" />
<span class="help-inline" ng-bind="getError('name')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('ipv4')">
<label class="control-label" for="ipv4">IPv4</label> <label class="control-label" for="ipv4">IPv4</label>
<div class="controls"> <div class="controls">
<input type="text" id="ipv4" ng-model="entity.ipv4" /> <input type="text" id="ipv4" ng-model="entity.ipv4" />
<span class="help-inline" ng-bind="getError('ipv4')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('ipv6')">
<label class="control-label" for="ipv6">IPv6</label> <label class="control-label" for="ipv6">IPv6</label>
<div class="controls"> <div class="controls">
<input type="text" class="input-xlarge" id="ipv6" ng-model="entity.ipv6" /> <input type="text" class="input-xlarge" id="ipv6" ng-model="entity.ipv6" />
<span class="help-inline" ng-bind="getError('ipv6')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('snat_ip')">
<label class="control-label" for="nat">NAT</label> <label class="control-label" for="snat_ip">NAT</label>
<div class="controls"> <div class="controls">
<input type="text" id="nat" ng-model="entity.nat" /> <input type="text" id="snat_ip" ng-model="entity.nat" />
<span class="help-inline" ng-bind="getError('snat_ip')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('owner')">
<label class="control-label" for="owner">Owner</label> <label class="control-label" for="owner">Owner</label>
<div class="controls"> <div class="controls">
<input type="text" autocomplete="off" id="owner" ng-model="entity.owner.name" /> <input type="text" autocomplete="off" id="owner" ng-model="entity.owner.name" />
<span class="help-inline" ng-bind="getError('owner')"></span>
</div> </div>
</div> </div>
</div> </div>
<div class="span5"> <div class="span5">
<div class="control-group"> <div class="control-group" ng-class="hasError('interface')">
<label class="control-label" for="interface">Interface</label> <label class="control-label" for="interface">Interface</label>
<div class="controls"> <div class="controls">
<input type="text" autocomplete="off" id="interface" ng-model="entity.interface.name" /> <input type="text" autocomplete="off" id="interface" ng-model="entity.interface" />
<span class="help-inline" ng-bind="getError('interface')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('domain')">
<label class="control-label" for="domain">Domain</label> <label class="control-label" for="domain">Domain</label>
<div class="controls"> <div class="controls">
<input type="text" class="domain" data-provide="typeahead" autocomplete="off" id="domain" ng-model="entity.domain.name" /> <input type="text" class="domain" data-provide="typeahead" autocomplete="off" id="domain" ng-model="entity.domain.name" />
<span class="help-inline" ng-bind="getError('domain')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('reverse_domain')">
<label class="control-label" for="reverse_domain">Reverse domain</label> <label class="control-label" for="reverse_domain">Reverse domain</label>
<div class="controls"> <div class="controls">
<input type="text" autocomplete="off" id="reverse_domain" ng-model="entity.reverse_domain.name" /> <input type="text" autocomplete="off" id="reverse_domain" ng-model="entity.reverse_domain" />
<span class="help-inline" ng-bind="getError('reverse_domain')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('description')">
<label class="control-label" for="description">Description</label> <label class="control-label" for="description">Description</label>
<div class="controls"> <div class="controls">
<textarea rows="2" id="description" ng-model="entity.description"> <textarea rows="2" id="description" ng-model="entity.description">
</textarea> </textarea>
<span class="help-inline" ng-bind="getError('description')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('comment')">
<label class="control-label" for="comment">Comment</label> <label class="control-label" for="comment">Comment</label>
<div class="controls"> <div class="controls">
<textarea rows="2" id="comment" ng-model="entity.comment"> <textarea rows="2" id="comment" ng-model="entity.comment">
</textarea> </textarea>
<span class="help-inline" ng-bind="getError('comment')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group" ng-class="hasError('dhcp_pool')">
<label class="control-label" for="dhcp_pool">DHCP Pool</label> <label class="control-label" for="dhcp_pool">DHCP Pool</label>
<div class="controls"> <div class="controls">
<textarea rows="2" id="dhcp_pool" ng-model="entity.dhcp_pool"> <textarea rows="2" id="dhcp_pool" ng-model="entity.dhcp_pool">
</textarea> </textarea>
<span class="help-inline" ng-bind="getError('dhcp_pool')"></span>
</div> </div>
</div> </div>
<div class="control-group"> <div class="control-group">
<div class="controls"> <div class="controls">
<button type="submit" class="btn">Save (nem működik!)</button> <button type="submit" class="btn" ng-click="save()">Save</button>
</div> </div>
</div> </div>
</div> </div>
......
firewall_gui/views.py
...@@ -454,3 +454,33 @@ def save_host(request): ...@@ -454,3 +454,33 @@ def save_host(request):
return HttpResponse(json.dumps(errors), content_type='application/json', status=400) return HttpResponse(json.dumps(errors), content_type='application/json', status=400)
host.save() host.save()
return HttpResponse('KTHXBYE') return HttpResponse('KTHXBYE')
def save_vlan(request):
data = json.loads(request.body)
if data['id']:
vlan = get_object_or_404(Vlan, id=data['id'])
else:
vlan = Vlan.objects.create()
errors = {}
vlan.vid = data['vid']
vlan.name = data['name']
vlan.ipv4 = data['ipv4'].split('/')[0]
vlan.prefix4 = data['ipv4'].split('/')[1]
vlan.ipv6 = data['ipv6'].split('/')[0]
vlan.prefix6 = data['ipv6'].split('/')[1]
vlan.snat_ip = data['nat']
vlan.description = data['description']
vlan.comment = data['comment']
vlan.reverse_domain = data['reverse_domain']
vlan.dhcp_pool = data['dhcp_pool']
vlan.interface = data['interface']
set_field(vlan, 'owner', errors, username=data['owner']['name'])
set_field(vlan, 'domain', errors, name=data['domain']['name'])
try:
vlan.full_clean()
except Exception as e:
errors = dict(errors.items() + e.message_dict.items())
if len(errors) > 0:
return HttpResponse(json.dumps(errors), content_type='application/json', status=400)
vlan.save()
return HttpResponse('KTHXBYE')
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment