X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=system%2FTestPlc.py;h=8d2138cedf9b2c3e1f4269d02c9d739fe5149d63;hb=bf4f961d90d5305e8d1ce3ecfb5bd2ed5e3d0dc5;hp=b24aa6230baaad7579a28260073b458a95216f33;hpb=6f9cfa7ae380b6582f2ef85b39d01399093baf11;p=tests.git

diff --git a/system/TestPlc.py b/system/TestPlc.py
index b24aa62..8d2138c 100644
--- a/system/TestPlc.py
+++ b/system/TestPlc.py
@@ -162,7 +162,7 @@ class TestPlc:
         'check_vsys_defaults_ignore', SEP,
 # run this first off so it's easier to re-run on another qemu box        
         'qemu_kill_mine', 'nodestate_reinstall', 'qemu_local_init','bootcd', 'qemu_local_config', SEP,
-        'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 'qemu_nodeflavour', SEP,
+        'qemu_clean_mine', 'qemu_export', 'qemu_start', 'qemu_timestamp', 'qemu_nodefamily', SEP,
         'sfa_install_all', 'sfa_configure', 'cross_sfa_configure', 'sfa_start', 'sfa_import', SEPSFA,
         'sfi_configure@1', 'sfa_register_site@1','sfa_register_pi@1', SEPSFA,
         'sfa_register_user@1', 'sfa_update_user@1', 'sfa_register_slice@1', 'sfa_renew_slice@1', SEPSFA,
@@ -195,7 +195,7 @@ class TestPlc:
         'delete_sites', 'delete_nodes', 'delete_slices', 'keys_clean', SEP,
         'delete_leases', 'list_leases', SEP,
         'populate', SEP,
-        'nodestate_show','nodestate_safeboot','nodestate_boot', SEP,
+        'nodestate_show','nodestate_safeboot','nodestate_boot', 'nodestate_upgrade', SEP,
         'qemu_list_all', 'qemu_list_mine', 'qemu_kill_all', SEP,
         'sfa_install_core', 'sfa_install_sfatables', 'sfa_install_plc', 'sfa_install_client', SEPSFA,
         'sfa_plcclean', 'sfa_dbclean', 'sfa_stop','sfa_uninstall', 'sfi_clean', SEPSFA,
@@ -204,7 +204,7 @@ class TestPlc:
         'check_netflow','check_drl', SEP,
         'debug_nodemanager', 'slice_fs_present', SEP,
         'standby_1_through_20','yes','no',SEP,
-        'install_syslinux6', 'installed_bonds', SEP,
+        'install_syslinux6', 'bonding_builds', 'bonding_nodes', SEP,
         ]
     default_bonding_steps = [
         'bonding_init_partial',
@@ -724,6 +724,7 @@ class TestPlc:
         pkgs_list.append("slicerepo-{}".format(nodefamily))
         pkgs_list.append("myplc")
         pkgs_list.append("noderepo-{}".format(nodefamily))
+        pkgs_list.append("nodeimage-{}-plain".format(nodefamily))
         pkgs_string=" ".join(pkgs_list)
         return self.yum_install(pkgs_list)
 
@@ -742,13 +743,24 @@ class TestPlc:
         self.run_in_guest("rpm --import {key}".format(**locals()))
         return self.run_in_guest("yum -y localinstall {}".format(" ".join(rpms))) == 0
 
-    def installed_bonds(self):
+    def bonding_builds(self):
         """
         list /etc/yum.repos.d on the myplc side
         """
         self.run_in_guest("ls /etc/yum.repos.d/*partial.repo")
         return True
-        
+
+    def bonding_nodes(self):
+        """
+        List nodes known to the myplc together with their nodefamiliy
+        """
+        print("---------------------------------------- nodes")
+        for node in self.apiserver.GetNodes(self.auth_root()):
+            print("{} -> {}".format(node['hostname'],
+                                    self.apiserver.GetNodeFlavour(self.auth_root(),node['hostname'])['nodefamily']))
+        print("---------------------------------------- nodes")
+            
+    
     ###
     def mod_python(self):
         """yum install mod_python, useful on f18 and above so as to avoid broken wsgi"""
@@ -1180,6 +1192,8 @@ class TestPlc:
     @node_mapper
     def nodestate_reinstall(self): pass
     @node_mapper
+    def nodestate_upgrade(self): pass
+    @node_mapper
     def nodestate_safeboot(self): pass
     @node_mapper
     def nodestate_boot(self): pass
@@ -1354,7 +1368,7 @@ class TestPlc:
     def qemu_timestamp(self) : pass
 
     @node_mapper
-    def qemu_nodeflavour(self): pass
+    def qemu_nodefamily(self): pass
 
     # when a spec refers to a node possibly on another plc
     def locate_sliver_obj_cross(self, nodename, slicename, other_plcs):