Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/runningNodebooter.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/runningNodebooter.html	(revision 11073)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/runningNodebooter.html	(revision 11086)
@@ -1,10 +1,10 @@
-<p>The naming service is: 
+<p>Stuff is: 
 {% if runningNodebooter %}
 	<span style="color: green;">on</span>
+	<a href='{{MEDIA_URL}}/stopNodeBooter/{{ip}}/{{port}}/{{user}}/{{password}}'>Stop Nodebooter</a>
 {% endif %}
 {% if not runningNodebooter %}
 	<span style="color: red;">off</span>
+	<a href='{{MEDIA_URL}}/startNodeBooter/{{ip}}/{{port}}/{{user}}/{{password}}'>Start Nodebooter</a>
 {% endif %}
 </p>
-<a href='{{MEDIA_URL}}/startNodeBooter/{{ip}}/{{port}}/{{user}}/{{password}}'>Start Nodebooter</a>
-<a href='{{MEDIA_URL}}/stopNodeBooter/{{ip}}/{{port}}/{{user}}/{{password}}'>Stop Nodebooter</a>
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/connect.html
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/connect.html	(revision 11085)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/connect.html	(revision 11086)
@@ -3,5 +3,5 @@
 <form action="{{MEDIA_URL}}/connect_to_node/" method="post">{% csrf_token %}
 	<p>floor: 
-		<select>
+		<select name = "floor">
 			{% for floor in number_of_floors %}
 				<option value="{{floor}}">Floor {{floor}}</option>
@@ -10,5 +10,5 @@
 	</p>
 	<p>number: 
-		<select>
+		<select name="number">
 			{% for node in number_of_nodes %}
 				<option value="{{node}}">Node {{node}}</option>
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py
===================================================================
--- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11085)
+++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py	(revision 11086)
@@ -7,5 +7,5 @@
 
 """Views for DomainMan application
-Starts and stops nodeBooter/naming service
+Starts and stops nodeBooter/naming service through paramiko
 """
 
@@ -36,12 +36,18 @@
 '''
 def nodeBooter_running(client):
-    stdin, stdout, stderr = client.exec_command('ps x | grep nodeBooter')
+    stdin, stdout, stderr = client.exec_command('ps -aux | grep GPP')
     processes = stdout.readlines()
+    
+    #processes = processes.split()
+    
     for proc in processes:
-        if 'dev/nodes' in proc and 'DeviceManager.dcd' in proc:
+        print 'proc: ' + str(proc)
+        #if '/usr/local/bin/nodeBooter' in proc or '/usr/bin/nodeBooter' in proc or 'nodeBooter' in proc:
+        if 'dev/bin/GPP' in proc:
             runningNodebooter = 1
             break
         else:
             runningNodebooter = 0
+    print 'runningNodebooter: ' + str(runningNodebooter)
 #    runningNodebooter = 'dev/nodes/' in processes
     return runningNodebooter
@@ -57,5 +63,5 @@
     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')
-    client.exec_command('cd /sdr; nodeBooter -D -d dev/nodes/default_GPP_node/DeviceManager.dcd.xml')
+    client.exec_command('cd /sdr && nodeBooter -D -d dev/nodes/default_GPP_node/DeviceManager.dcd.xml')
     runningNodebooter = nodeBooter_running(client)
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))
@@ -80,5 +86,5 @@
 def stopNodebooter(request, ip, port, user, password):
     client = connect(ip, port, user, password)
-    stdin, stdout, stderr = client.exec_command('killall nodeBooter')
+    stdin, stdout, stderr = client.exec_command('killall nodeBooter && killall GPP')
     runningNodebooter = nodeBooter_running(client)
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))
@@ -119,7 +125,9 @@
         client = connect(ip, port, user, password)
         #stdin, stdout, stderr = client.exec_command('ls')
+        print 'calling runningNodebooter'
         runningNodebooter = nodeBooter_running(client)
     else:
         message = 'Missing ssh connection parameters'
+        print message
     return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request))