X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestSliceSfa.py;h=7731f869637d4f3a23b1c843be3dd28f91b08916;hb=79181cdffeaf5466e4b2d2ce2dfe5fbfe2ba22e7;hp=97ac883445f1d36a269a439ddff77f636a3f765c;hpb=8187af97b4b8d3c4134bf46905ccecc627b91daa;p=tests.git

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 97ac883..7731f86 100644
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -32,7 +32,7 @@ class TestSliceSfa:
     def sfi_user(self,*args,**kwds): return self.test_auth_sfa.sfi_user(*args, **kwds)
 
     def discover_option(self):
-        if self.rspec_style()=='pg': return "-r protogeni"
+        if self.rspec_style()=='pg': return "-r GENI"
         else:                        return "-r sfa"
 
     # those are step names exposed as methods of TestPlc, hence the _sfa
@@ -86,7 +86,8 @@ class TestSliceSfa:
             "sfiListNodes.py -i %s/%s -o %s/%s"%(self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile()),
             "sfiAddSliver.py -i %s/%s -n %s/%s -o %s/%s"%\
                 (self.sfi_path(),self.adfile(),self.sfi_path(),self.nodefile(),self.sfi_path(),self.reqfile()),
-            self.sfi_user("create %s %s"%(self.hrn(),self.reqfile())),
+            self.sfi_user("allocate %s %s"%(self.hrn(),self.reqfile())),
+            self.sfi_user("provision %s"%(self.hrn())),
             ]
         for command in commands:
             if self.test_plc.run_in_guest(command)!=0: return False
@@ -137,7 +138,7 @@ class TestSliceSfa:
         command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
         
         tasks=[]
-        slicename=self.slice_spec['name']
+        slicename=self.plc_name()
         dry_run = getattr(options,'dry_run',False)
         for nodename in self.slice_spec['nodenames']:
             (site_spec,node_spec) = self.test_plc.locate_node(nodename)