X-Git-Url: http://git.onelab.eu/?p=sface.git;a=blobdiff_plain;f=sface%2Fscreens%2Fmainscreen.py;h=cc34adb7814a932e19aceaaf27a9387dd5ced2a9;hp=d9ca7275f596b69d46ce3c547eb9dd7260f77d6a;hb=0f8d33ec09f1ba0c5a06daec528b141b96a34fc4;hpb=ce28008ccb30377603ecb6c6b4f4a4bc869f93b9

diff --git a/sface/screens/mainscreen.py b/sface/screens/mainscreen.py
index d9ca727..cc34adb 100644
--- a/sface/screens/mainscreen.py
+++ b/sface/screens/mainscreen.py
@@ -1,4 +1,5 @@
 
+import datetime
 import os
 from PyQt4.QtCore import *
 from PyQt4.QtGui import *
@@ -6,6 +7,7 @@ from PyQt4.QtGui import *
 #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
 
@@ -230,11 +232,14 @@ class SliceWidget(QWidget):
 
         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)
 
@@ -246,6 +251,7 @@ class SliceWidget(QWidget):
         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)'),
@@ -266,7 +272,7 @@ class SliceWidget(QWidget):
         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):
@@ -307,11 +313,11 @@ class SliceWidget(QWidget):
             status = self.itemStatus(item)
             if status == node_status['add']:
                 print "Add hostname: %s" % hostname
-                rspec.add_slivers(hostname, testbed)
+                rspec.add_slivers(str(hostname), testbed)
                 change = True
             elif status == node_status['remove']:
                 print "Remove hostname: %s" % hostname
-                rspec.remove_slivers(hostname, testbed)
+                rspec.remove_slivers(str(hostname), testbed)
                 change = True
         elif depth == 3: # Tag
             tag, value = self.itemText(item).split(": ")
@@ -358,7 +364,22 @@ class SliceWidget(QWidget):
 
         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():
@@ -450,6 +471,44 @@ class SliceWidget(QWidget):
     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)
@@ -459,7 +518,7 @@ class MainScreen(SfaScreen):
 
     def rspecUpdated(self):
         self.mainwin.rspecWindow.updateView()
-        
+
     def configurationChanged(self):
         self.widget.updateSliceName()
         self.widget.updateView()