Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py (revision 11091) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py (revision 11092) @@ -14,8 +14,30 @@ """ Returns the floor_list array which stores the status of the node as ip of the node. +@return the floor_list array that has the number of the node. +""" +def setFloorNodes(): + floor_list=getNodeStatus() + for floor in floor_list: + for index in range(len(floor)): + floor[index] = floor[index]*(index+1) + return floor_list + +""" +Returns the floor_list array which stores the status of the node as ip of the node. @return the floor_list array that has the ip address of the node. """ -def setFloorNodes(): +def setFloorNodeIP(): floorBuffer = 10 #used to calculate the ip address of the node + floor_list=getNodeStatus() + for floor in floor_list: + for index in range(len(floor)): + floor[index] = floor[index]*(index+1+floorBuffer) + floorBuffer += 12 + return floor_list + +""" +Get status of nodes +""" +def getNodeStatus(): floor1_usrp_status=[0,0,0,1,0,0,0,0,0,1,0,0] floor2_usrp_status=[1,1,0,1,0,1,0,1,0,0,1,0] @@ -23,8 +45,4 @@ floor4_usrp_status=[1,0,1,1,0,0,1,0,0,1,0,0] floor_list=[floor1_usrp_status, floor2_usrp_status, floor3_usrp_status, floor4_usrp_status] - for floor in floor_list: - for index in range(len(floor)): - floor[index] = floor[index]*(index+1+floorBuffer) - floorBuffer += 12 return floor_list @@ -46,5 +64,5 @@ node_position_3 = ((175,705),(175,653),(175,598),(206,558),(175,518),(209,452),(236,404),(158,377),(209,333),(210,285),(209,250),(207,206)) node_position_4 = ((184,712),(184,666),(184,613),(219,557),(184,517),(222,437),(248,405),(168,372),(221,335),(220,275),(214,226),(219,190)) - floor_list = setFloorNodes() + floor_list = setFloorNodeIP() return render_to_response("HtmlPages/map.html", locals(), context_instance=RequestContext(request)) @@ -62,15 +80,6 @@ """ def node_menu(request): - nodes=[Node(id=3-1, ip=33), - Node(id=3-2, ip=34), - Node(id=3-3, ip=35), - Node(id=3-4, ip=36), - Node(id=3-5, ip=37), - Node(id=3-6, ip=38)] + nodes=[Node(id=3-1, ip=33),] return render_to_response("HtmlPages/node_menu.html", locals(), context_instance=RequestContext(request)) - -#@login_required -def loadNode(request, node_num): - return render_to_response("HtmlPages/nodes.html", locals(), context_instance=RequestContext(request)) def properties_page(request): Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/static/frames.js =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/static/frames.js (revision 11074) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/static/frames.js (revision 11092) @@ -69,7 +69,11 @@ function loadNode(ip) { - $("#directory").load("/~webdemo/django/WebDash/newIP/192.168.1."+ip+"/"); - //$("#directory").load("/WebDash/127.0.0."+ip+"/"); - nodeBooter = window.open("/~webdemo/django/connect/","Run Nodebooter", "status=1,height=300,width=400"); + $("#directory").load("/~webdemo/django/WebDash/index2/192.168.1."+ip+"/"); + //$("#directory").load("/loadNode"+ip+"/"); + //nodeBooter = window.open("/connect/","Run Nodebooter", "status=0,height=300,width=400"); +} + +function loadHrefToDiv(div,href){ + $(div).load(href); } Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/static/frames.js =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/static/frames.js (revision 11074) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/static/frames.js (revision 11092) @@ -69,7 +69,11 @@ function loadNode(ip) { - $("#directory").load("/~webdemo/django/WebDash/newIP/192.168.1."+ip+"/"); - //$("#directory").load("/WebDash/127.0.0."+ip+"/"); - nodeBooter = window.open("/~webdemo/django/connect/","Run Nodebooter", "status=1,height=300,width=400"); + $("#directory").load("/~webdemo/django/WebDash/index2/192.168.1."+ip+"/"); + //$("#directory").load("/loadNode"+ip+"/"); + //nodeBooter = window.open("/connect/","Run Nodebooter", "status=0,height=300,width=400"); +} + +function loadHrefToDiv(div){ + $(div).load($(this).attr("href")); } Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/README =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/README (revision 11067) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/README (revision 11092) @@ -1,2 +1,12 @@ +TODO: installation and setup and howto develop instructions for someone whos never used it +explain ./manage +define what functionality is in which files + +add refresh status of nodes +remove passwords from url -> put in SESSION variable +add ip and which node is running +choose which node to start domain manager on +pick the nodeBooter from dev/nodes/ +installation paragraph for local server ############# Django setup Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html (revision 11092) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/DomainMan/nodes.html (revision 11092) @@ -0,0 +1,1 @@ +

Node: {{node}} IP: {{ip}} Port: {{port}}

Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/map.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/map.html (revision 10936) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/map.html (revision 11092) @@ -1,2 +1,4 @@ + + {% ifequal floor "1" %} @@ -4,5 +6,5 @@ {% for node_top, node_left in node_position_1 %} {% if node and forloop.counter0 == forloop.parentloop.counter0 %} - + {% else %} {% if forloop.counter0 == forloop.parentloop.counter0 %} @@ -18,5 +20,5 @@ {% for node_top, node_left in node_position_2 %} {% if node and forloop.counter0 == forloop.parentloop.counter0 %} - + {% else %} {% if forloop.counter0 == forloop.parentloop.counter0 %} @@ -32,5 +34,5 @@ {% for node_top, node_left in node_position_3 %} {% if node and forloop.counter0 == forloop.parentloop.counter0 %} - + {% else %} {% if forloop.counter0 == forloop.parentloop.counter0 %} @@ -46,5 +48,5 @@ {% for node_top, node_left in node_position_4 %} {% if node and forloop.counter0 == forloop.parentloop.counter0 %} - + {% else %} {% if forloop.counter0 == forloop.parentloop.counter0 %} Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html (revision 11091) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/ossie.html (revision 11092) @@ -10,10 +10,9 @@

- Waveforms - +

{#end menu div#} -
+

Active Applications

@@ -22,11 +21,11 @@
-
+
Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/grid.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/grid.html (revision 11012) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/grid.html (revision 11092) @@ -1,2 +1,4 @@ + + @@ -11,5 +13,6 @@ {% for node in floor %} {% if node %} - + + {% else %} Index: /siedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/nodes.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/HtmlPages/nodes.html (revision 10836) +++ (revision ) @@ -1,17 +1,0 @@ -{% if floor_list %} - -{% else %} -

No Nodes available

-{% endif %} - Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/index.html =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/index.html (revision 11012) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/templates/WebDash/index.html (revision 11092) @@ -3,35 +3,31 @@ {% if availableList %} -
- - - - {% for wave in availableList %} - - - - {% endfor %} - - -
{{ wave.getName }}  
+ + {% for wave in availableList %} + + + + {% endfor %} + + +
{{ wave.getName }}  
{% else %}

No waveforms are available.

{% endif %} ---> {%endblock%} Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py (revision 11091) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/views.py (revision 11092) @@ -5,5 +5,5 @@ from paramiko import SSHClient, AutoAddPolicy from models import * -import time +from WebDash.views import index2 """Views for DomainMan application @@ -130,4 +130,18 @@ return render_to_response('DomainMan/runningNodebooter.html', locals(), context_instance=RequestContext(request)) +#@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") + node = Node(floor, num) + ip = node.ip + port = node.port + index2(request, ip) + return render_to_response("DomainMan/nodes.html", locals(), context_instance=RequestContext(request)) + """Returns connection form """ Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/models.py =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/models.py (revision 11073) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/DomainMan/models.py (revision 11092) @@ -27,5 +27,5 @@ def __unicode__(self): - return unicode("node_id: ".__add__(self.floor).__add__("-").__add__(self.num)) + return unicode("node_id: " + str(self.floor)+ "-" + str(self.num)) def setClient(self, user, password): Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py (revision 11071) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/urls.py (revision 11092) @@ -20,5 +20,5 @@ url(r'^WebDash/uninstall/(?P.*)/', 'WebDash.views.uninstall'), url(r'^WebDash/updateNamingService/', 'WebDash.views.updateNamingService'), - url(r'^WebDash/newIP/(?P
.*)/', 'WebDash.views.index2', name='index2'), + url(r'^WebDash/index2/(?P
.*)/', 'WebDash.views.index2', name='index2'), url(r'^$', 'LoginUser.views.main_page'), url(r'^ossie/$', 'HtmlPages.views.ossie_view'), @@ -27,5 +27,5 @@ url(r'^account/$', 'LoginUser.views.account_page'), url(r'^nodeMenu/$', 'HtmlPages.views.node_menu'), - url(r'^loadNode/(\d*)/$', 'HtmlPages.views.loadNode'), + url(r'^loadNode/(\d{1})/(\d+)/$', 'DomainMan.views.loadNode'), url(r'^nodes/$', 'HtmlPages.views.nodes'), url(r'^map/(\d*)/$', 'HtmlPages.views.map_view'), Index: /ossiedev/branches/jsnyder/trunk/tools/cornetApps/WebDash/views.py =================================================================== --- /ossiedev/branches/jsnyder/trunk/tools/cornetApps/WebDash/views.py (revision 10913) +++ /ossiedev/branches/jsnyder/trunk/tools/cornetApps/WebDash/views.py (revision 11092) @@ -42,4 +42,7 @@ return render_to_response("WebDash/waveforms.html", locals(), context_instance=RequestContext(request)) +""" +Displays available waveforms by checking with naming service from session variables +""" def index(request): ctrlr = buildController(request) @@ -63,4 +66,7 @@ {'availableList' : availableList, 'instancesList' : instancesList, 'address' : request.session.get('namingService')}, context_instance=RequestContext(request)) +""" +Takes in an address as parameter to display available waveforms on node +""" def index2(request, address): ctrlr = buildController(request, address)