From 8c1c60dd4caa5e583bdd3bee6727485ea928ccb6 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 28 Apr 2014 15:31:27 +0200
Subject: [PATCH] rename sfi_show as sfi_show_site and add a new sfa_show_slice

---
 system/TestAuthSfa.py | 11 +++++++++--
 system/TestPlc.py     |  6 ++++--
 system/macros.py      |  9 ++++++---
 3 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index d69333d..8b47ea2 100644
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -13,7 +13,7 @@ def slice_sfa_mapper (method):
     def actual(self,*args, **kwds):
         overall=True
         slice_method = TestSliceSfa.__dict__[method.__name__]
-        for slice_spec in [ self.auth_sfa_spec['slice_spec'] ]:
+        with self.auth_sfa_spec['slice_spec'] as slice_spec:
             test_slice_sfa = TestSliceSfa(self,slice_spec)
             if not slice_method(test_slice_sfa, *args, **kwds): overall=False
         return overall
@@ -148,7 +148,14 @@ class TestAuthSfa:
             self.test_plc.run_in_guest(self.sfi_user("list -r %s"%self.root_hrn()))==0 and \
             self.test_plc.run_in_guest(self.sfi_user("list %s"%(self.auth_hrn())))==0
 
-    def sfi_show (self, options):
+    def sfi_show_slice (self, options):
+        "run (as PI) sfi show -n <slice> (on Registry)"
+        slice_spec=self.auth_sfa_spec['slice_spec']
+        slice_hrn=self.obj_hrn(slice_spec['name'])
+        return \
+            self.test_plc.run_in_guest(self.sfi_pi("show -n %s"%slice_hrn))==0
+
+    def sfi_show_site (self, options):
         "run (as regular user) sfi show (on Registry)"
 	return \
             self.test_plc.run_in_guest(self.sfi_user("show %s"%(self.auth_hrn())))==0
diff --git a/system/TestPlc.py b/system/TestPlc.py
index 6cd6704..d642f5b 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -151,7 +151,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', 'sfa_utest@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..
         'probe_kvm_iptables',
@@ -1632,7 +1632,9 @@ class TestPlc:
     @auth_sfa_mapper
     def sfi_list(self): pass
     @auth_sfa_mapper
-    def sfi_show(self): pass
+    def sfi_show_site(self): pass
+    @auth_sfa_mapper
+    def sfi_show_slice(self): pass
     @auth_sfa_mapper
     def ssh_slice_sfa(self): pass
     @auth_sfa_mapper
diff --git a/system/macros.py b/system/macros.py
index 0c77f9e..37c8e26 100644
--- a/system/macros.py
+++ b/system/macros.py
@@ -76,7 +76,8 @@ sequences['sfa_scratch'] = [
 
 sequences['sfi_view_all'] = [
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+    'sfi_show_slice',
 ]
 
 # macro to exercice the registry only
@@ -102,11 +103,13 @@ sequences['sfa_standalone'] = [
     'sfa_add_user',
     'sfa_add_slice',
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+    'sfi_show_slice',
     'sfa_delete_slice',
     'sfa_delete_user',
     'sfi_list',
-    'sfi_show',
+    'sfi_show_site',
+#    'sfi_show_slice',
 ]
 
 # re-run a qemu node when things go wrong
-- 
2.43.0