X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Futil%2Fapi.py;h=ce6a7abed458302cd497d658779180ad71d85c66;hb=e0ffcf4ed82441080a2e1afb6cbfbdc0a57b3c3e;hp=03ea9a1b79f3f82f496e63e3bb6d00e0c63d21cc;hpb=7e7237bcba3737207996095332f46ca4fb4c0b37;p=sfa.git

diff --git a/sfa/util/api.py b/sfa/util/api.py
index 03ea9a1b..ce6a7abe 100644
--- a/sfa/util/api.py
+++ b/sfa/util/api.py
@@ -117,16 +117,16 @@ class GeniAPI:
         self.credential = None
         self.plshell = self.getPLCShell()
         self.plshell_version = self.getPLCShellVersion()
-        self.basedir = self.config.GENI_BASE_DIR + os.sep
+        self.basedir = self.config.SFA_BASE_DIR + os.sep
         self.server_basedir = self.basedir + os.sep + "geni" + os.sep
-        self.hrn = self.config.GENI_INTERFACE_HRN
+        self.hrn = self.config.SFA_INTERFACE_HRN
         self.time_format = "%Y-%m-%d %H:%M:%S"
 
 
     def getPLCShell(self):
-        self.plauth = {'Username': self.config.GENI_PLC_USER,
+        self.plauth = {'Username': self.config.SFA_PLC_USER,
                        'AuthMethod': 'password',
-                       'AuthString': self.config.GENI_PLC_PASSWORD}
+                       'AuthString': self.config.SFA_PLC_PASSWORD}
         try:
             import PLC.Shell
             shell = PLC.Shell.Shell(globals = globals())
@@ -134,7 +134,7 @@ class GeniAPI:
             return shell
         except ImportError:
             # connect via xmlrpc
-            url = self.config.GENI_PLC_URL
+            url = self.config.SFA_PLC_URL
              
             shell = xmlrpclib.Server(url, verbose = 0, allow_none = True)
             shell.AuthCheck(self.plauth)