Changeset 6254
- Timestamp:
- Sep 9, 2008, 8:55:14 AM (17 years ago)
- Location:
- exodus
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
TabularUnified exodus/admin.py ¶
r6234 r6254 4 4 5 5 admin.site.register(Antenna) 6 admin.site.register( DhcpStatic)6 admin.site.register(Location) 7 7 admin.site.register(DnsServer) 8 admin.site.register(Interlink)9 admin.site.register(Mode)10 admin.site.register(NIC)11 admin.site.register(NICType)12 8 admin.site.register(Network) 13 9 admin.site.register(Node) 14 admin.site.register(Omni) 15 admin.site.register(Polar) 16 admin.site.register(Status) 10 admin.site.register(LinkPool) 11 admin.site.register(Link) 12 admin.site.register(Interface) 13 admin.site.register(PublicAP) 14 admin.site.register(DhcpStatic) -
TabularUnified exodus/templates/addinterlink.html ¶
r6239 r6254 3 3 {% block content %} 4 4 5 <h1> add an interlink </h1>5 <h1> add Link </h1> 6 6 {% if error_message %}<p><strong>{{ error_message }}</strong></p>{% endif %} 7 7 -
TabularUnified exodus/templates/addnic.html ¶
r6206 r6254 2 2 3 3 {% block content %} 4 <h1>Create a NIC</h1>4 <h1>Create a Interface</h1> 5 5 6 6 <form method="post" action="."> -
TabularUnified exodus/templates/exodus-template.html ¶
r6238 r6254 15 15 <A class="menu" href="{% url root %}">Exodus</a><br> 16 16 <A class="menu" href="{% url nodelist %}">Node List</a><br> 17 <A class="menu" href="{% url exodus.views.add location %}">Add Location</a><br>18 <A class="menu" href="{% url exodus.views.add node %}">Add Node</a><br>19 <A class="menu" href="{% url exodus.views.add nic %}">Add NIC</a><br>20 <A class="menu" href="{% url exodus.views.add interlink %}">Add Interlink</a><br>21 <A class="menu" href="{% url exodus.views.add omni %}">Add Omni</a><br>17 <A class="menu" href="{% url exodus.views.addLocation %}">Add Location</a><br> 18 <A class="menu" href="{% url exodus.views.addNode %}">Add Node</a><br> 19 <A class="menu" href="{% url exodus.views.addInterface %}">Add Interface</a><br> 20 <A class="menu" href="{% url exodus.views.addLink %}">Add Link</a><br> 21 <A class="menu" href="{% url exodus.views.addPublicAP %}">Add PublicAP</a><br> 22 22 <p> 23 23 </td> -
TabularUnified exodus/templates/node-detail.html ¶
r6233 r6254 2 2 3 3 {% block content %} 4 5 <div style="border:1px solid #000000;"> 4 6 <h1> {{ object.name }} </h1> 5 6 <div>7 7 <h3> Location </h3> 8 8 Description: {{ object.location.description }} <br> … … 10 10 Latitude: {{ object.location.latitude }} <br> 11 11 12 Master ip: {{ object.masterip }} 13 12 Master ip: {{ object.masterip }} <br> 13 <a href="{% url exodus.views.addnode %}">EDIT</a> 14 14 </div> 15 15 -
TabularUnified exodus/templatetags/network.py ¶
r6244 r6254 37 37 return BroadcastNode(address, subnet) 38 38 39 @register.filter 39 @register.filte 40 40 41 def subnet(value): 41 42 return wllogic.getSubnet(value) -
TabularUnified exodus/urls.py ¶
r6238 r6254 9 9 10 10 from django.contrib import databrowse 11 databrowse.site.register(NICType)12 databrowse.site.register(Polar)13 databrowse.site.register(Status)14 databrowse.site.register(Mode)15 11 databrowse.site.register(Antenna) 16 12 databrowse.site.register(Location) 13 databrowse.site.register(DnsServer) 17 14 databrowse.site.register(Network) 18 databrowse.site.register(DnsServer)19 15 databrowse.site.register(Node) 20 databrowse.site.register(NIC) 21 databrowse.site.register(Interlink) 22 databrowse.site.register(Omni) 16 databrowse.site.register(LinkPool) 17 databrowse.site.register(Link) 18 databrowse.site.register(Interface) 19 databrowse.site.register(PublicAP) 23 20 databrowse.site.register(DhcpStatic) 24 21 … … 45 42 46 43 # add urls 47 (r'^addlocation/$', 'exodus.views.add location'),48 (r'^addnode/$', 'exodus.views.add node'),49 (r'^addnic/$', 'exodus.views.add nic'),50 (r'^addinterlink/$', 'exodus.views.add interlink'),51 (r'^addomni/$', 'exodus.views.add omni'),44 (r'^addlocation/$', 'exodus.views.addLocation'), 45 (r'^addnode/$', 'exodus.views.addNode'), 46 (r'^addnic/$', 'exodus.views.addInterface'), 47 (r'^addinterlink/$', 'exodus.views.addLink'), 48 (r'^addomni/$', 'exodus.views.addPublicAP'), 52 49 50 # delete/remove urls 51 (r'^delnode/$', 'exodus.views.delnode'), 52 ) 53 54 if settings.DEBUG: 55 urlpatterns += patterns('', 53 56 url(r'^static/(?P<path>.*)$$', 'django.views.static.serve', {'document_root': 54 57 settings.DJANGOROOT + '/exodus/static'}, "static"), 55 )58 ) -
TabularUnified exodus/views.py ¶
r6242 r6254 14 14 model = Location 15 15 16 def add location(request):16 def addLocation(request): 17 17 if request.POST: 18 18 form = AddLocationForm(request.POST) … … 29 29 exclude = ( 'masterip', ) 30 30 31 def add node(request):31 def addNode(request): 32 32 if request.POST: 33 33 form = AddNodeForm(request.POST) … … 39 39 return HttpResponseRedirect("/exodus/") 40 40 else: 41 # XXX: Parse node if found 42 nodeId = request.GET.get('id') 43 try: 44 node = Node.objects.get(pk=nodeId) 45 form = AddNodeForm(instance=node) 46 except Node.DoesNotExist: 47 form = AddNodeForm() 41 48 form = AddNodeForm() 42 return render_to_response('addnode.html', {'form': form }) 43 44 class addNicForm(forms.ModelForm): 45 class Meta: 46 model = NIC 47 exclude = ( 'ssid', 'mode', 'channel' ) 48 49 def addnic(request): 50 if request.POST: 51 form = addNicForm(request.POST) 49 return render_to_response('addnode.html', {'form': form }) 50 51 def delnode(request): 52 if request.POST: 53 form = AddNodeForm(request.POST) 54 if form.is_valid(): 55 # input a valid master ip into new_data 56 instance = form.save(commit=False) 57 instance.masterip = freemasterip() 58 instance.save() 59 return HttpResponseRedirect("/exodus/") 60 else: 61 form = AddNodeForm() 62 return render_to_response('delnode.html', {'form': form }) 63 64 class addInterfaceForm(forms.ModelForm): 65 class Meta: 66 model = Interface 67 exclude = ( 'ssid', 'mode', 'channel', 'links' ) 68 69 def addInterface(request): 70 if request.POST: 71 form = addInterfaceForm(request.POST) 52 72 if form.is_valid(): 53 73 instance = form.save(commit=False) … … 59 79 return HttpResponseRedirect("/exodus/") 60 80 else: 61 form = add NicForm()81 form = addInterfaceForm() 62 82 return render_to_response('addnic.html', {'form': form }) 63 83 64 class add InterlinkForm(forms.ModelForm):65 class Meta: 66 model = Interlink67 exclude = ( 'shortdesc 1', 'shortdesc2', 'desc1', 'desc2' )68 69 def add interlink(request):70 if request.POST: 71 form = add InterlinkForm(request.POST)84 class addLinkForm(forms.ModelForm): 85 class Meta: 86 model = Link 87 exclude = ( 'shortdesc', 'desc' ) 88 89 def addLink(request): 90 if request.POST: 91 form = addLinkForm(request.POST) 72 92 if form.is_valid(): 73 93 instance = form.save(commit=False) … … 96 116 return HttpResponseRedirect("/exodus/") 97 117 else: 98 form = add InterlinkForm(instance = instance)118 form = addLinkForm(instance = instance) 99 119 if compatibleInterfaces == False: 100 120 errorMessage = "Please use compatible interfaces" … … 111 131 else: 112 132 #XXX: Autofetch new IP numbers 113 newForm = Interlink(ip1='172.16.0.0', ip2='172.16.0.0')114 form = add InterlinkForm(instance = newForm)133 newForm = Link() 134 form = addLinkForm(instance = newForm) 115 135 return render_to_response('addinterlink.html',{'form': form}) 116 136 117 class add OmniForm(forms.ModelForm):118 class Meta: 119 model = Omni137 class addPublicAPForm(forms.ModelForm): 138 class Meta: 139 model = PublicAP 120 140 exclude = ('shortdesc', 'desc') 121 141 122 def add omni(request):123 if request.POST: 124 form = add OmniForm(request.POST)142 def addPublicAP(request): 143 if request.POST: 144 form = addPublicAPForm(request.POST) 125 145 if form.is_valid(): 126 146 instance = form.save(commit=False) … … 129 149 return HttpResponseRedirect("/exodus/") 130 150 else: 131 form = add OmniForm()151 form = addPublicAPForm() 132 152 return render_to_response('addomni.html', {'form': form }) 133 153
Note:
See TracChangeset
for help on using the changeset viewer.