git://git.onelab.eu
/
sface.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
85ba0f3
)
add rspec helper methods
author
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Wed, 8 Sep 2010 17:27:50 +0000
(19:27 +0200)
committer
Barış Metin
<Talip-Baris.Metin@sophia.inria.fr>
Wed, 8 Sep 2010 17:27:50 +0000
(19:27 +0200)
sfamainscreen.py
patch
|
blob
|
history
diff --git
a/sfamainscreen.py
b/sfamainscreen.py
index
d58335b
..
db66414
100644
(file)
--- a/
sfamainscreen.py
+++ b/
sfamainscreen.py
@@
-34,15
+34,28
@@
class SliceWidget(QWidget):
self.connect(label, SIGNAL('linkActivated(QString)'),
self.refresh)
self.connect(label, SIGNAL('linkActivated(QString)'),
self.refresh)
-
+
+
+ def rspec_get_networks(self, rspec):
+ return rspec.rspec.xpath("./network[@name]/@name")
+
+ def rspec_get_nodes_of_network(self, rspec, network):
+ return rspec.rspec.xpath("./network[@name='%s']/site/node/hostname/text()" % network)
+
def refresh(self, link=None):
data = SfaData()
def refresh(self, link=None):
data = SfaData()
- xml = data.getRSpecFromSM()
+# xml = data.getRSpecFromSM()
+ import os
+ xml = open(os.path.expanduser("~/.sfi/ple.inria.heartbeat.rspec")).read()
rspec = RSpec(xml)
rspec = RSpec(xml)
- nodes = rspec.get_node_list()
-
- for n in nodes:
- self.addNode("TestBedName", n)
+
+ networks = self.rspec_get_networks(rspec)
+ networks.reverse()
+
+ for network in networks:
+ nodes = self.rspec_get_nodes_of_network(rspec, network)
+ for node in nodes:
+ self.addNode(network, node)
def addNode(self, testbed, hostname):
self.nodeModel.insertRow(0)
def addNode(self, testbed, hostname):
self.nodeModel.insertRow(0)