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
if itemType(index) == "node":
if status_data == node_status['in']: # already in the slice
- painter.fillPath(path, QColor("cyan"))
+ painter.fillPath(path, QColor.fromRgb(0, 250, 250))
painter.setPen(QColor.fromRgb(0, 0, 0))
painter.drawText(option.rect, 0, QString(data))
else:
if status_data == tag_status['in']: # already in the slice
- painter.fillPath(path, QColor("cyan"))
+ painter.fillPath(path, QColor.fromRgb(0, 250, 250))
painter.setPen(QColor.fromRgb(0, 0, 0))
painter.drawText(option.rect, 0, QString(data))
rspec_file = config.getSliceRSpecFile()
if os.path.exists(rspec_file):
xml = open(rspec_file).read()
- return RSpec(xml)
+ return parse_rspec(xml)
return None
def setStatus(self, msg, timeout=None):
status = self.itemStatus(item)
if status == node_status['add']:
print "Add hostname: %s" % hostname
- rspec.add_sliver(hostname, testbed)
+ rspec.add_slivers(hostname, testbed)
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
- rspec.remove_sliver(hostname, testbed)
+ rspec.remove_slivers(hostname, testbed)
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
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)
- 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))