From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Wed, 17 Apr 2013 08:06:17 +0000 (+0200)
Subject: Merge branch 'master' into sfa-geni-v3
X-Git-Tag: tests-5.3-1~11
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=07d6d9c2d137dcdc88b789b137d751501469d623;hp=16bca316a73d30fa1e44e1561a29be593c80e977;p=tests.git

Merge branch 'master' into sfa-geni-v3
---

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index 5fb5eb7..7a4b90b 100644
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -154,11 +154,6 @@ class TestAuthSfa:
 	return \
             self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.hrn())))==0
 
-    def sfi_slices (self, options):
-        "run (as regular user) sfi slices (on SM)"
-	return \
-            self.test_plc.run_in_guest(self.sfi_user("slices"))==0 
-
     # those are step names exposed as methods of TestPlc, hence the _sfa
     @slice_sfa_mapper
     def sfa_add_slice (self, *args, **kwds): pass
diff --git a/system/TestPlc.py b/system/TestPlc.py
index d3151ae..ef5fc7a 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -97,7 +97,7 @@ class TestPlc:
         'sfi_configure@1', 'sfa_add_site@1','sfa_add_pi@1', SEPSFA,
         'sfa_add_user@1', 'sfa_update_user@1', 'sfa_add_slice@1', 'sfa_renew_slice@1', SEPSFA,
         'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
-        'sfi_list@1', 'sfi_show@1', 'sfi_slices@1', 'sfa_utest@1', SEPSFA,
+        'sfi_list@1', 'sfi_show@1', 'sfa_utest@1', SEPSFA,
         # we used to run plcsh_stress_test, and then ssh_node_debug and ssh_node_boot
         # but as the stress test might take a while, we sometimes missed the debug mode..
         'ssh_node_debug@1', 'plcsh_stress_test@1', SEP,
@@ -1514,8 +1514,6 @@ class TestPlc:
     @auth_sfa_mapper
     def sfi_show(self): pass
     @auth_sfa_mapper
-    def sfi_slices(self): pass
-    @auth_sfa_mapper
     def ssh_slice_sfa(self): pass
     @auth_sfa_mapper
     def sfa_delete_user(self): pass
diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 7de388d..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
diff --git a/system/macros.py b/system/macros.py
index 0c7464a..3fc7dc8 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -77,7 +77,6 @@ sequences['sfa_scratch'] = [
 sequences['sfi_view_all'] = [
     'sfi_list',
     'sfi_show',
-    'sfi_slices',
 ]
 
 # macro to exercice the registry only