split sfa-create-slice into sfa-rspec\ 1 sfa-allocate and sfa-provision

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index 4ec2dbf..cbf52e3 100644 (file)
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -190,7 +190,11 @@ class TestAuthSfa:
     @slice_sfa_mapper
     def sfa_discover (self, *args, **kwds): pass
     @slice_sfa_mapper
-    def sfa_create_slice (self, *args, **kwds): pass
+    def sfa_rspec (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_allocate (self, *args, **kwds): pass
+    @slice_sfa_mapper
+    def sfa_provision (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_check_slice_plc (self, *args, **kwds): pass
     @slice_sfa_mapper

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 88b7feb..01b6ee4 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -153,7 +153,8 @@ class TestPlc:
         'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA,
         'sfa_remove_user_from_slice@1','sfi_show_slice_researchers@1', 
         'sfa_insert_user_in_slice@1','sfi_show_slice_researchers@1', SEPSFA,
-        'sfa_discover@1', 'sfa_create_slice@1', 'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
+        'sfa_discover@1', 'sfa_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA,
+        'sfa_check_slice_plc@1', 'sfa_update_slice@1', SEPSFA,
         'sfi_list@1', 'sfi_show_site@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..
@@ -1594,7 +1595,11 @@ class TestPlc:
     @auth_sfa_mapper
     def sfa_discover(self): pass
     @auth_sfa_mapper
-    def sfa_create_slice(self): pass
+    def sfa_rspec(self): pass
+    @auth_sfa_mapper
+    def sfa_allocate(self): pass
+    @auth_sfa_mapper
+    def sfa_provision(self): pass
     @auth_sfa_mapper
     def sfa_check_slice_plc(self): pass
     @auth_sfa_mapper

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 5f1b266..a6c7f84 100644 (file)
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -110,26 +110,33 @@ class TestSliceSfa:
         return self.test_plc.run_in_guest(self.sfi_user(\
                 "resources %s -o %s/%s"% (self.discover_option(),self.sfi_path(),self.adfile())))==0
 
-    # run sfi create as a regular user
-    def sfa_create_slice(self,options):
-        "run sfi create (on SM) - 1st time"
+    def sfa_rspec(self,options):
+        "invoke sfiListNodes and sfiAddSlivers to prepare a rspec"
         commands=[
             "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("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
         return True
 
+    def sfa_allocate(self,options):
+        "invoke run sfi allocate (on SM)"
+        command=self.sfi_user("allocate %s %s"%(self.hrn(),self.reqfile()))
+        return self.test_plc.run_in_guest(command)==0
+
+    def sfa_provision(self,options):
+        "invoke run sfi provision (on SM)"
+        command=self.sfi_user("provision %s"%(self.hrn()))
+        return self.test_plc.run_in_guest(command)==0
+
     def plc_name (self):
         return "%s_%s"%(self.test_auth_sfa.login_base,self.slice_spec['name'])
 
     # all local nodes in slice ?
     def sfa_check_slice_plc (self,options):
-        "check sfa_create_slice at the plcs - all local nodes should be in slice"
+        "check the slices have been created at the plcs - all local nodes should be in slice"
         slice=self.test_plc.apiserver.GetSlices(self.test_plc.auth_root(), self.plc_name())[0]
         nodes=self.test_plc.apiserver.GetNodes(self.test_plc.auth_root(), {'peer_id':None})
         result=True
@@ -141,10 +148,12 @@ class TestSliceSfa:
                 result=False
         return result
 
-    # actually the same for now
+    # xxx historically this used to do the same as sfa-create-slice
+    # which was later on split into 3 distinct steps, 
+    # and we can ignore the first that is about setting up the rspec
     def sfa_update_slice(self,options):
-        "run sfi create (on SM) on existing object"
-        return self.sfa_create_slice(options)
+        "re-run sfi allocate and provision (on SM) on existing object"
+        return self.sfa_allocate(options) and self.sfa_provision(options)
 
     # run as pi
     def sfa_delete_slice(self,options):

diff --git a/system/macros.py b/system/macros.py
index 7446f0b..f5585f3 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -18,6 +18,12 @@ sequences['sfa_restart'] = [
     'sfi_configure',
     ]
 
+sequences ['sfa_create_slice'] = [
+    'sfa_rspec',
+    'sfa_allocate',
+    'sfa_provision',
+]
+
 "re-run a complete sfa cycle from a nightly test"
 sequences['sfa_populate'] = [ 
     'sfa_register_site',