renamed sfa_* into sfi_* for steps list/show/slices

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 790c617..6c9007d 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -92,7 +92,7 @@ class TestPlc:
         'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
         'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 
         'sfa_update_user@1', 'sfa_update_slice@1', SEPSFA,
         'sfa_add_user@1', 'sfa_add_slice@1', 'sfa_discover@1', SEPSFA,
         'sfa_create_slice@1', 'sfa_check_slice_plc@1', SEPSFA, 
         'sfa_update_user@1', 'sfa_update_slice@1', SEPSFA,

-        'sfa_list@1', 'sfa_show@1', 'sfa_slices@1', 'sfa_utest@1', SEPSFA,
+        'sfi_list@1', 'sfi_show@1', 'sfi_slices@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,
         # 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,


@@ -1431,11 +1431,11 @@ class TestPlc:
     @slice_sfa_mapper
     def sfa_update_slice(self): pass
     @slice_sfa_mapper
     @slice_sfa_mapper
     def sfa_update_slice(self): pass
     @slice_sfa_mapper

-    def sfa_list(self): pass
+    def sfi_list(self): pass

     @slice_sfa_mapper
     @slice_sfa_mapper

-    def sfa_show(self): pass
+    def sfi_show(self): pass

     @slice_sfa_mapper
     @slice_sfa_mapper

-    def sfa_slices(self): pass
+    def sfi_slices(self): pass

     @slice_sfa_mapper
     def ssh_slice_sfa(self): pass
     @slice_sfa_mapper
     @slice_sfa_mapper
     def ssh_slice_sfa(self): pass
     @slice_sfa_mapper

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index 7f357fc..7874818 100644 (file)
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -158,18 +158,18 @@ class TestSliceSfa:
 
     # those are step names exposed as methods of TestPlc, hence the _sfa
 
 
     # those are step names exposed as methods of TestPlc, hence the _sfa
 

-    def sfa_list (self, options):
+    def sfi_list (self, options):

         "run (as regular user) sfi list (on Registry)"
        return \
             self.test_plc.run_in_guest(self.sfi_user("list -r %s"%self.auth_hrn()))==0 and \
             self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.site_hrn())))==0
 
         "run (as regular user) sfi list (on Registry)"
        return \
             self.test_plc.run_in_guest(self.sfi_user("list -r %s"%self.auth_hrn()))==0 and \
             self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.site_hrn())))==0
 

-    def sfa_show (self, options):
+    def sfi_show (self, options):

         "run (as regular user) sfi show (on Registry)"
        return \
             self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.site_hrn())))==0
 
         "run (as regular user) sfi show (on Registry)"
        return \
             self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.site_hrn())))==0
 

-    def sfa_slices (self, options):
+    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 
         "run (as regular user) sfi slices (on SM)"
        return \
             self.test_plc.run_in_guest(self.sfi_user("slices"))==0 

diff --git a/system/macros.py b/system/macros.py
index b6511fc..6d4ceaa 100644 (file)
--- a/system/macros.py
+++ b/system/macros.py
@@ -29,7 +29,7 @@ sequences['sfa'] = [
     'sfa_check_slice_plc', 
     'sfa_update_user',
     'sfa_update_slice', 
     'sfa_check_slice_plc', 
     'sfa_update_user',
     'sfa_update_slice', 

-    'sfa_view', 
+    'sfi_view_all', 

     'sfa_utest', 
     'sfa_delete_slice', 
     'sfa_delete_user',
     'sfa_utest', 
     'sfa_delete_slice', 
     'sfa_delete_user',


@@ -56,13 +56,13 @@ sequences['sfa_scratch'] = [
     'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', 
     'sfi_configure', 'sfa_add_user', 'sfa_add_slice', 'sfa_discover', 
     'sfa_create_slice', 'sfa_check_slice_plc', 
     'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', 
     'sfi_configure', 'sfa_add_user', 'sfa_add_slice', 'sfa_discover', 
     'sfa_create_slice', 'sfa_check_slice_plc', 

-    'sfa_update_user', 'sfa_update_slice', 'sfa_view', 'sfa_utest',
+    'sfa_update_user', 'sfa_update_slice', 'sfi_view_all', 'sfa_utest',

 ]
 
 ]
 

-sequences['sfa_view'] = [
-    'sfa-list',
-    'sfa-show',
-    'sfa-slices',
+sequences['sfi_view_all'] = [
+    'sfi_list',
+    'sfi_show',
+    'sfi_slices',

 ]
 
 # something that can given to the nightly to prepare a standalone sfa setup
 ]
 
 # something that can given to the nightly to prepare a standalone sfa setup


@@ -78,14 +78,14 @@ sequences['sfa_standalone'] = [
     'cross_sfa_configure',
     'sfa_start',
     'sfi_configure',
     'cross_sfa_configure',
     'sfa_start',
     'sfi_configure',

-    'sfa-add-site',
-    'sfa-add-pi',
-    'sfa-add-user',
-    'sfa-add-slice',
-    'sfa-view',
-    'sfa-delete-slice',
-    'sfa-delete-user',
-    'sfa-view',
+    'sfa_add_site',
+    'sfa_add_pi',
+    'sfa_add_user',
+    'sfa_add_slice',
+    'sfi_view_all',
+    'sfa_delete_slice',
+    'sfa_delete_user',
+    'sfi_view_all',

 ]
 
 
 ]