UI tweaks

[sfa-gui.git] / SfaData.py

diff --git a/SfaData.py b/SfaData.py
index b99c56e..88d2b13 100644 (file)
--- a/SfaData.py
+++ b/SfaData.py
@@ -6,7 +6,7 @@ from sfa.util.rspecHelper import RSpec
 class SfaData:
     authority = "plc.princeton"
     user = "plc.princeton.acb"
-    slice = "plc.princeton.iias"
+    slice = "plc.princeton.sapan"
 
     def __init__(self):
         self.registry = None
@@ -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()
@@ -73,11 +76,11 @@ class SfaData:
               "-r", self.registry, "-s", self.slicemgr, "create", 
               slice, filename])
 
-class ViniData(SfaData):
+class PlanetLabData(SfaData):
     def __init__(self):
         SfaData.__init__(self)
         self.registry = "http://www.planet-lab.org:12345"
-        self.slicemgr = "http://www.vini-veritas.net:12346"
+        self.slicemgr = "http://www.planet-lab.org:12346"
         self.rspec = None
 
     def refreshRSpec(self):
@@ -93,16 +96,35 @@ class ViniData(SfaData):
         xml = self.rspec.toxml()
         SfaData.applyRSpec(self, xml)
 
-class PlanetLabData(SfaData):
+class PLEData(PlanetLabData):
+    def __init__(self):
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://www.planet-lab.eu:12346"
+
+class PLJData(PlanetLabData):
+    def __init__(self):
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://www.planet-lab.jp:12346"
+
+class ViniData(PlanetLabData):
+    def __init__(self):
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://www.vini-veritas.net:12346"
+
+class GpENIData(PlanetLabData):
+    def __init__(self):
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://198.248.241.100:12346"
+
+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.rspec = None
+        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 = RSpec(xml)
+        self.rspec = xml
 
     def getRSpec(self):
         if self.rspec is None:
@@ -110,12 +132,5 @@ class PlanetLabData(SfaData):
         return self.rspec
     
     def applyRSpec(self):
-        xml = self.rspec.toxml()
+        xml = self.rspec
         SfaData.applyRSpec(self, xml)
-
-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"
-