Index: ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py
===================================================================
--- ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11092)
+++ ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11093)
@@ -58,5 +58,10 @@
 @param password: The user's password
 '''
-def startNodebooter(request, ip, port, user, password):
+def startNodebooter(request, floor, num, user, password):
+    floor = int(floor)
+    num = int(num)
+    node = Node(floor, num)
+    ip = node.ip
+    port = node.port
     client = connect(ip, port, user, password)
     #stdin, stdout, stderr = client.exec_command('cd /sdr; nodeBooter -D -d dev/nodes/default_GPP_node/DeviceManager.dcd.xml')
@@ -82,5 +87,10 @@
 @param password: The user's password
 '''
-def stopNodebooter(request, ip, port, user, password):
+def stopNodebooter(request, floor, num, user, password):
+    floor = int(floor)
+    num = int(num)
+    node = Node(floor, num)
+    ip = node.ip
+    port = node.port
     client = connect(ip, port, user, password)
     stdin, stdout, stderr = client.exec_command('killall nodeBooter && killall GPP')
@@ -106,22 +116,18 @@
     return render_to_response('DomainMan/console.html', locals(), context_instance=RequestContext(request))
 
-"""Connect to a nodebooter through a form
+"""
+Connect to a node through a form
 """
 def connect_to_node(request):
     if 'floor' in request.POST and 'number' in request.POST and 'user' in request.POST and 'pass' in request.POST:
-        postFloor = int(request.POST['floor'])
-        postNum = int(request.POST['number'])
+        floor = int(request.POST['floor'])
+        num = int(request.POST['number'])
         user = str(request.POST['user'])
         password = str(request.POST['pass'])
         
-        thisNode = Node(postFloor, postNum)
-        ip = thisNode.ip
-        port = thisNode.port
-        #thisNode.save()
-        #thisNode.setClient(user, password)
-        #node = Node.objects.get(floor=4, num=1)
+        node = Node(floor, num)
+        ip = node.ip
+        port = node.port
         client = connect(ip, port, user, password)
-        #stdin, stdout, stderr = client.exec_command('ls')
-        print 'calling runningNodebooter'
         runningNodebooter = nodeBooter_running(client)
     else:
@@ -130,23 +136,34 @@
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))
 
+"""
+Raise exception if the inputs of the floor and node number are invalid
+"""
+def testValidInputs(floor, num):
+    if floor < 1 or floor > 4:
+        raise Exception("Floor must be between 1 and 4")
+    if num < 1 or num > 12:
+        raise Exception("Node must be between 1 and 12")
+
 #@login_required
 def loadNode(request, floor_num, node_num):
     floor = int(floor_num)
     num = int(node_num)
-    if floor < 1 or floor > 4:
-        raise Exception("Floor must be between 1 and 4")
-    if num < 1 or num > 12:
-        raise Exception("Node must be between 1 and 12")
+    testValidInputs(floor, num)
     node = Node(floor, num)
     ip = node.ip
     port = node.port
-    index2(request, ip)
+    address = str(ip)+":"+str(port)
+    index2(request, address)
     return render_to_response("DomainMan/nodes.html", locals(), context_instance=RequestContext(request))
 
-"""Returns connection form
 """
-def connect_to_node_view(request):
+Returns connection form
+"""
+def connect_to_node_view(request, selectFloor, selectNum):
     number_of_floors = range(1,5)
     number_of_nodes = range(1,13)
+    selectedFloor=int(selectFloor)
+    selectedNum=int(selectNum)
+    testValidInputs(selectedFloor, selectedNum)
     return render_to_response('DomainMan/connect.html', locals(), RequestContext(request))