Broke out PLE, PLJ, GpENI into separate tabs. For now, make as few assumptions as...

[sfa-gui.git] / SfaData.py

diff --git a/SfaData.py b/SfaData.py
index b99c56e..9100b3e 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
@@ -73,11 +73,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,25 +93,25 @@ class ViniData(SfaData):
         xml = self.rspec.toxml()
         SfaData.applyRSpec(self, xml)
 
-class PlanetLabData(SfaData):
+class PLEData(PlanetLabData):
     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
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://www.planet-lab.eu:12346"
 
-    def refreshRSpec(self):
-        xml = SfaData.getRSpec(self)
-        self.rspec = RSpec(xml)
+class PLJData(PlanetLabData):
+    def __init__(self):
+        PlanetLabData.__init__(self)
+        self.slicemgr = "http://www.planet-lab.jp:12346"
 
-    def getRSpec(self):
-        if self.rspec is None:
-            self.refreshRSpec()
-        return self.rspec
-    
-    def applyRSpec(self):
-        xml = self.rspec.toxml()
-        SfaData.applyRSpec(self, xml)
+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):