X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=a652d3c94d3e6faca5b759090ecf7fc61e3afad1;hb=4d1e9c36b4a05066d00628ed2a9e9d6d391d149a;hp=7731f869637d4f3a23b1c843be3dd28f91b08916;hpb=88ce17543e3f87197e7d6fd792ea56d99b7d67c3;p=tests.git

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 7731f86..a652d3c 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -12,7 +12,7 @@ from TestBoxQemu import TestBoxQemu
 from TestSsh import TestSsh
 
 from Completer import Completer, CompleterTask
-from TestSlice import CompleterTaskSshSlice
+from TestSlice import CompleterTaskSliceSsh
 
 class TestSliceSfa:
 
@@ -22,9 +22,10 @@ class TestSliceSfa:
         # shortcuts
         self.test_plc=self.test_auth_sfa.test_plc
 
-    def qualified(self,name): return self.test_auth_sfa.qualified(name)
-    def hrn (self): return self.qualified(self.slice_spec['name'])
-    def sfi_path (self): return self.test_auth_sfa.sfi_path()
+    def hrn (self): 
+        return self.test_auth_sfa.obj_hrn(self.slice_spec['name'])
+    def sfi_path (self):
+        return self.test_auth_sfa.sfi_path()
 
     # send back up to the TestAuthSfa
     def rspec_style (self): return self.test_auth_sfa.rspec_style()
@@ -38,12 +39,12 @@ class TestSliceSfa:
     # those are step names exposed as methods of TestPlc, hence the _sfa
 
     # needs to be run as pi
-    def sfa_add_slice(self,options):
-        "run sfi add (on Registry)"
-        sfi_command="add"
+    def sfa_register_slice(self,options):
+        "run sfi register (on Registry)"
+        sfi_command="register"
         sfi_command += " --type slice"
         sfi_command += " --xrn %s"%self.hrn()
-        for opt in self.slice_spec['add_options']:
+        for opt in self.slice_spec['register_options']:
             sfi_command += " %s"%(opt)
 	return self.test_plc.run_in_guest(self.sfi_pi(sfi_command))==0
 
@@ -142,6 +143,6 @@ class TestSliceSfa:
         dry_run = getattr(options,'dry_run',False)
         for nodename in self.slice_spec['nodenames']:
             (site_spec,node_spec) = self.test_plc.locate_node(nodename)
-            tasks.append( CompleterTaskSshSlice(self.test_plc,node_spec['node_fields']['hostname'],
+            tasks.append( CompleterTaskSliceSsh(self.test_plc,node_spec['node_fields']['hostname'],
                                                 slicename,private_key,command,expected=True,dry_run=dry_run))
         return Completer (tasks).run (timeout, graceout, period)