+import datetime
import os
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.sfirenew import SfiRenewer
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))
refresh = QPushButton("Update Slice Data", self)
refresh.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
+ renew = QPushButton("Renew Slice", self)
+ renew.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
submit = QPushButton("Submit", self)
submit.setSizePolicy(QSizePolicy.Maximum, QSizePolicy.Maximum)
bottomlayout = QHBoxLayout()
bottomlayout.addWidget(refresh, 0, Qt.AlignLeft)
+ bottomlayout.addWidget(renew, 0, Qt.AlignLeft)
bottomlayout.addStretch()
bottomlayout.addWidget(submit, 0, Qt.AlignRight)
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
self.connect(refresh, SIGNAL('clicked()'), self.refresh)
+ self.connect(renew, SIGNAL('clicked()'), self.renew)
self.connect(submit, SIGNAL('clicked()'), self.submit)
self.connect(searchbox, SIGNAL('textChanged(QString)'), self.filter)
self.connect(self.nodeView, SIGNAL('hostnameClicked(QString)'),
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(str(hostname), testbed)
change = True
elif status == node_status['remove']:
print "Remove hostname: %s" % hostname
- rspec.remove_sliver(hostname, testbed)
+ rspec.remove_slivers(str(hostname), testbed)
change = True
elif depth == 3: # Tag
tag, value = self.itemText(item).split(": ")
self.process.applyRSpec(rspec)
self.setStatus("Sending slice data (RSpec). This will take some time...")
-
+
+ def renew(self):
+ dlg = RenewWindow(parent=self)
+ if (dlg.exec_() == QDialog.Accepted):
+ self.setStatus("Renewing Slice.")
+
+ self.renewProcess = SfiRenewer(config.getSlice(), dlg.get_new_expiration(), self)
+ self.connect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
+
+ def renewFinished(self):
+ if self.renewProcess.statusMsg:
+ self.setStatus("Renew " + self.renewProcess.status + ": " + self.renewProcess.statusMsg)
+ else:
+ self.setStatus("Renew " + self.renewProcess.status)
+ self.disconnect(self.renewProcess, SIGNAL('finished()'), self.renewFinished)
+ self.renewProcess = None
def refresh(self):
if not config.getSlice():
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)
- available_nodes = filter(lambda x:x not in sliver_nodes, all_nodes)
+ #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))
msg = "%s Nodes\t%s Selected" % (len(all_nodes), len(sliver_nodes))
def nodeSelectionChanged(self, hostname):
self.parent().nodeSelectionChanged(hostname)
+class RenewWindow(QDialog):
+ def __init__(self, parent=None):
+ super(RenewWindow, self).__init__(parent)
+ self.setWindowTitle("Renew Slivers")
+
+ self.duration = QComboBox()
+
+ self.expirations = []
+
+ durations = ( (1, "One Week"), (2, "Two Weeks"), (3, "Three Weeks"), (4, "One Month") )
+
+ now = datetime.datetime.utcnow()
+ for (weeks, desc) in durations:
+ exp = now + datetime.timedelta(days = weeks * 7)
+ desc = desc + " " + exp.strftime("%Y-%m-%d %H:%M:%S")
+ self.expirations.append(exp)
+ self.duration.addItem(desc)
+
+ self.duration.setCurrentIndex(0)
+
+ buttonBox = QDialogButtonBox(QDialogButtonBox.Ok | QDialogButtonBox.Cancel)
+ buttonBox.button(QDialogButtonBox.Ok).setDefault(True)
+
+ layout = QVBoxLayout()
+ layout.addWidget(self.duration)
+ layout.addWidget(buttonBox)
+ self.setLayout(layout)
+
+ self.connect(buttonBox, SIGNAL("accepted()"), self, SLOT("accept()"))
+ self.connect(buttonBox, SIGNAL("rejected()"), self, SLOT("reject()"))
+
+ def accept(self):
+ QDialog.accept(self)
+
+ def get_new_expiration(self):
+ index = self.duration.currentIndex()
+ return self.expirations[index]
+
class MainScreen(SfaScreen):
def __init__(self, parent):
SfaScreen.__init__(self, parent)
slice = SliceWidget(self)
- self.init(slice, "Main Window", "OneLab Federation GUI")
+ self.init(slice, "Main Window", "OneLab SFA crawler")
def rspecUpdated(self):
self.mainwin.rspecWindow.updateView()
-
+
def configurationChanged(self):
self.widget.updateSliceName()
self.widget.updateView()
git://git.onelab.eu / sface.git / blobdiff