UI tweaks

[sfa-gui.git] / SfaData.py

diff --git a/SfaData.py b/SfaData.py
index 9100b3e..88d2b13 100644 (file)
--- a/SfaData.py
+++ b/SfaData.py
@@ -54,10 +54,12 @@ class SfaData:
 
     def getRSpec(self):
         slice = self.getSlice()
+        # Write RSpec to file for testing.
+        filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
+        os.remove(filename)
         call(["sfi.py", "-u", self.getUser(), "-a", self.getAuthority(), 
               "-r", self.registry, "-s", self.slicemgr, "resources", 
               "-o", slice, slice])
-        filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
         f = open(filename, "r")
         xml = f.read()
         f.close()
@@ -66,6 +68,7 @@ class SfaData:
     def applyRSpec(self, xml):
         slice = self.getSlice()
         filename = os.path.expanduser("~/.sfi/" + slice + ".rspec")
+        os.remove(filename)
         f = open(filename, "w")
         f.write(xml)
         f.close()
@@ -116,6 +119,18 @@ class GpENIData(PlanetLabData):
 class OpenCirrusData(SfaData):
     def __init__(self):
         SfaData.__init__(self)
-        self.registry = "http://www.planet-lab.org:12345"
-        self.slicemgr = "http://www.planet-lab.org:12346"
+        self.registry = "http://198.55.37.29:12345"
+        self.slicemgr = "http://198.55.37.29:12346"
+
+    def refreshRSpec(self):
+        xml = SfaData.getRSpec(self)
+        self.rspec = xml
 
+    def getRSpec(self):
+        if self.rspec is None:
+            self.refreshRSpec()
+        return self.rspec
+    
+    def applyRSpec(self):
+        xml = self.rspec
+        SfaData.applyRSpec(self, xml)