Changeset 6188

Timestamp:

Aug 12, 2008, 11:52:05 PM (17 years ago)

Author:

RIck van der Zwet

Message:

First attempt on using both nodename and nodeid as input variable

Location:

exodus

Files:

• templates/node-list.html (modified) (1 diff)
• urls.py (modified) (1 diff)
• views.py (modified) (3 diffs)

exodus/templates/node-list.html

@@ -9 +9 @@
     {% for object in object_list %}
                 <tr>
-                <td class="list" ><a class="list"href=../{{ object.id }}/node/> {{ object.name }} </a><td>
-            <td><a href=../{{ object.id }}/dhcpd.conf/>dhcpd.conf</a></td>
-            <td><a href=../{{ object.id }}/named.conf/>named.conf</a></td>
-            <td><a href=../{{ object.id }}/rc.node.local/>rc.node.local</a></td>
-            <td><a href=../{{ object.id }}/resolve.conf/>resolv.conf</a></td>
+                <td class="list" ><a class="list"href=../{{ object.name }}/node/> {{ object.name }} </a><td>
+            <td><a href=../{{ object.name }}/dhcpd.conf/>dhcpd.conf</a></td>
+            <td><a href=../{{ object.name }}/named.conf/>named.conf</a></td>
+            <td><a href=../{{ object.name }}/rc.node.local/>rc.node.local</a></td>
+            <td><a href=../{{ object.name }}/resolve.conf/>resolv.conf</a></td>
                 </tr>
 

exodus/urls.py

@@ -15 +15 @@
         (r'^$', 'django.views.generic.simple.direct_to_template', {'template': 'index.html'}) ,
         (r'^nodelist/$', 'django.views.generic.list_detail.object_list', dict(node_dict, template_name='node-list.html')),
-        (r'^(?P<object_id>\d+)/node/$', 'django.views.generic.list_detail.object_detail', dict(node_dict,template_name='node-detail.html')),
+        (r'^(?P<slug>.+)/node/$', 'django.views.generic.list_detail.object_detail', dict(node_dict,slug_field='name',template_name='node-detail.html')),
 
         # config urls
-        (r'^(?P<object_id>\d+)/dhcp.conf/$', 'exodus.views.conf_dhcp_conf'),
-        (r'^(?P<object_id>\d+)/named.conf/$', 'exodus.views.conf_named_conf'),
-        (r'^(?P<object_id>\d+)/rc.node.local/$', 'exodus.views.conf_rc_node_local'),
-        (r'^(?P<object_id>\d+)/resolv.conf/$', 'exodus.views.conf_resolv_conf'),
+        (r'^(?P<object_id>.+)/dhcp.conf/$', 'exodus.views.conf_dhcp_conf'),
+        (r'^(?P<object_id>.+)/named.conf/$', 'exodus.views.conf_named_conf'),
+        (r'^(?P<object_id>.+)/rc.node.local/$', 'exodus.views.conf_rc_node_local'),
+        (r'^(?P<object_id>.+)/resolv.conf/$', 'exodus.views.conf_resolv_conf'),
 
 

exodus/views.py

@@ -159 +159 @@
 def conf_rc_local(request, object_id):
     """5.X legacy rc.local conf generator"""
+
     object = Node.objects.get(pk=object_id).nic_set.all()
     object.date = datetime.now()
@@ -192 +193 @@
 def conf_rc_node_local(request, object_id):
         """rc.node.local conf generator"""
-
+        
+        #Convert Node name -> id
+        try:
+                object_id = Node.objects.get(name=object_id).id
+        except Node.DoesNotExist:
+                pass # Most likely valid id already
+        
         object = Node.objects.get(pk=object_id).nic_set.all()
         object.date = datetime.now()
@@ -206 +213 @@
 def conf_rc_node_localorig(request, object_id):
         """rc.node.local conf generator"""
+                
 
         object = Node.objects.get(pk=object_id).nic_set.all()