some hard-coded instances of 'main' were remaining

[tests.git] / system / TestUserSfa.py

diff --git a/system/TestUserSfa.py b/system/TestUserSfa.py
index e578c08..cb84cb6 100644 (file)
--- a/system/TestUserSfa.py
+++ b/system/TestUserSfa.py
@@ -8,23 +8,23 @@ import utils
 
 class TestUserSfa:
 
-    def __init__ (self,test_plc,plc_spec_sfa):
+    def __init__ (self,test_plc):
        self.test_plc=test_plc
-       self.spec_sfa=plc_spec_sfa
-
-    def name(self):
-        return self.user_spec['user_fields']['email']
+        # shortcuts
+        self.sfa_spec=test_plc.plc_spec['sfa']
+        self.piuser=self.sfa_spec['piuser']
+        self.regularuser=self.sfa_spec['regularuser']
+        self.slicename=self.sfa_spec['slicename']
+        self.login_base=self.sfa_spec['login_base']
 
     def add_user (self):
-       return \
-        self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add  person.xml")==0
+       return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ add person.xml")==0
 
     def update_user (self):
-       return \
-        self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update  person.xml")==0
+       return self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ update person.xml")==0
 
     def delete_user(self):
-       auth=self.spec_sfa['SFA_REGISTRY_ROOT_AUTH']
+       auth=self.sfa_spec['SFA_REGISTRY_ROOT_AUTH']
        return \
-       self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t user %s.main.sfafakeuser1"%auth)==0
+            self.test_plc.run_in_guest("sfi.py -d /root/.sfi/ remove -t user %s.%s.%s"%(auth,self.login_base,self.regularuser))==0