added step sfa-describe that at the very least does a rain check on sfi describe...

diff --git a/system/TestAuthSfa.py b/system/TestAuthSfa.py
index 981d4e6..771cf2c 100644 (file)
--- a/system/TestAuthSfa.py
+++ b/system/TestAuthSfa.py
@@ -198,6 +198,8 @@ class TestAuthSfa:
     @slice_sfa_mapper
     def sfa_provision_empty (self, *args, **kwds): pass
     @slice_sfa_mapper
     @slice_sfa_mapper
     def sfa_provision_empty (self, *args, **kwds): pass
     @slice_sfa_mapper

+    def sfa_describe (self, *args, **kwds): pass
+    @slice_sfa_mapper

     def sfa_check_slice_plc (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_check_slice_plc_empty (self, *args, **kwds): pass
     def sfa_check_slice_plc (self, *args, **kwds): pass
     @slice_sfa_mapper
     def sfa_check_slice_plc_empty (self, *args, **kwds): pass

diff --git a/system/TestPlc.py b/system/TestPlc.py
index 9252862..a9ebd96 100644 (file)
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -168,7 +168,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_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_rspec@1', 'sfa_allocate@1', 'sfa_provision@1', SEPSFA,
+        'sfa_discover@1', 'sfa_rspec@1', SEPSFA,
+        'sfa_allocate@1', 'sfa_provision@1', 'sfa_describe@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
         '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


@@ -1770,6 +1771,8 @@ class TestPlc:
     @auth_sfa_mapper
     def sfa_provision_empty(self): pass
     @auth_sfa_mapper
     @auth_sfa_mapper
     def sfa_provision_empty(self): pass
     @auth_sfa_mapper

+    def sfa_describe(self): pass
+    @auth_sfa_mapper

     def sfa_check_slice_plc(self): pass
     @auth_sfa_mapper
     def sfa_check_slice_plc_empty(self): pass
     def sfa_check_slice_plc(self): pass
     @auth_sfa_mapper
     def sfa_check_slice_plc_empty(self): pass

diff --git a/system/TestSliceSfa.py b/system/TestSliceSfa.py
index d230e5b..6621a44 100644 (file)
--- a/system/TestSliceSfa.py
+++ b/system/TestSliceSfa.py
@@ -105,11 +105,18 @@ class TestSliceSfa:
     def reqfile (self): return self._resname("req", "rspec")
     def empty_reqfile (self): return "empty-rspec.xml"
     def nodefile (self): return self._resname("nodes", "txt")
     def reqfile (self): return self._resname("req", "rspec")
     def empty_reqfile (self): return "empty-rspec.xml"
     def nodefile (self): return self._resname("nodes", "txt")

+    def describfile (self): return self._resname("describ", "rspec")

     
     

+    def sfa_describe(self, options):
+        "run sfi describe into described.rspec"
+        return self.test_plc.run_in_guest(self.sfi_user(
+            "describe {} -o {}/{}"
+            .format(self.hrn(), self.sfi_path(), self.describfile()))) == 0
+

     # run as user
     def sfa_discover(self, options):
     # run as user
     def sfa_discover(self, options):

-        "discover resources into resouces_in.rspec"
-        return self.test_plc.run_in_guest(self.sfi_user(\
+        "discover resources into ad.rspec"
+        return self.test_plc.run_in_guest(self.sfi_user(

                 "resources {} -o {}/{}"\
                     .format(self.discover_option(),self.sfi_path(),self.adfile()))) == 0
 
                 "resources {} -o {}/{}"\
                     .format(self.discover_option(),self.sfi_path(),self.adfile()))) == 0
 


@@ -195,12 +202,12 @@ class TestSliceSfa:
         # locate a key
         private_key=self.locate_private_key()
         if not private_key :
         # locate a key
         private_key=self.locate_private_key()
         if not private_key :

-            utils.header("WARNING: Cannot find a valid key for slice {}".format(self.name()))
+            utils.header("WARNING: Cannot find a valid key for slice {}".format(self.hrn()))

             return False
         command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
         
             return False
         command="echo hostname ; hostname; echo id; id; echo uname -a ; uname -a"
         

-        tasks=[]
-        slicename=self.plc_name()
+        tasks = []
+        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)
         dry_run = getattr(options,'dry_run',False)
         for nodename in self.slice_spec['nodenames']:
             (site_spec,node_spec) = self.test_plc.locate_node(nodename)