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:
b9b34de
)
use new rspec libs
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 25 May 2011 19:37:37 +0000
(15:37 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Wed, 25 May 2011 19:37:37 +0000
(15:37 -0400)
sface/screens/mainscreen.py
patch
|
blob
|
history
diff --git
a/sface/screens/mainscreen.py
b/sface/screens/mainscreen.py
index
c573aea
..
d9ca727
100644
(file)
--- a/
sface/screens/mainscreen.py
+++ b/
sface/screens/mainscreen.py
@@
-3,7
+3,8
@@
import os
from PyQt4.QtCore import *
from PyQt4.QtGui import *
from PyQt4.QtCore import *
from PyQt4.QtGui import *
-from sfa.util.rspecHelper import RSpec
+#from sfa.util.rspecHelper import RSpec
+from sfa.rspecs.rspec_parser import parse_rspec
from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
from sface.config import config
from sface.sfiprocess import SfiProcess
from sface.screens.sfascreen import SfaScreen
@@
-306,11
+307,11
@@
class SliceWidget(QWidget):
status = self.itemStatus(item)
if status == node_status['add']:
print "Add hostname: %s" % hostname
status = self.itemStatus(item)
if status == node_status['add']:
print "Add hostname: %s" % hostname
- rspec.add_sliver(hostname, testbed)
+ rspec.add_sliver
s
(hostname, testbed)
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
- rspec.remove_sliver(hostname, testbed)
+ rspec.remove_sliver
s
(hostname, testbed)
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
@@
-385,12
+386,15
@@
class SliceWidget(QWidget):
return None
rootItem = self.nodeModel.invisibleRootItem()
return None
rootItem = self.nodeModel.invisibleRootItem()
- networks = sorted(rspec.get_network_list())
+ #networks = sorted(rspec.get_network_list())
+ networks = rspec.get_networks()
for network in networks:
self.network_names.append(network)
for network in networks:
self.network_names.append(network)
- all_nodes = rspec.get_node_list(network)
- sliver_nodes = rspec.get_sliver_list(network)
+ #all_nodes = rspec.get_node_list(network)
+ #sliver_nodes = rspec.get_sliver_list(network)
+ all_nodes = rspec.get_nodes(network)
+ sliver_nodes = rspec.get_nodes_with_slivers(network)
available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
networkItem = QStandardItem(QString(network))
available_nodes = [ node for node in all_nodes if node not in sliver_nodes ]
networkItem = QStandardItem(QString(network))