From 9385eabe5ac58244848c08805f0bec15c7e11009 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Mon, 13 Apr 2015 15:02:01 +0200 Subject: [PATCH] renamed qemu_nodeflavour into more proper qemu_nodefamily --- system/TestNode.py | 2 +- system/TestPlc.py | 4 ++-- system/macros.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/system/TestNode.py b/system/TestNode.py index ab876d2..7461929 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -274,7 +274,7 @@ class TestNode: return test_box.run_in_buildname("echo {:d} > {}/timestamp"\ .format(now, self.nodedir()), dry_run=self.dry_run()) == 0 - def qemu_nodeflavour(self): + def qemu_nodefamily(self): auth = self.test_plc.auth_root() hostname = self.node_spec['node_fields']['hostname'] nodeflavour = self.test_plc.apiserver.GetNodeFlavour(auth, hostname) diff --git a/system/TestPlc.py b/system/TestPlc.py index b24aa62..2f994f2 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, @@ -1354,7 +1354,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): diff --git a/system/macros.py b/system/macros.py index af65174..411d5d1 100644 --- a/system/macros.py +++ b/system/macros.py @@ -185,7 +185,7 @@ sequences['node'] = [ 'nodes' ] sequences['restart_node'] = sequences['start_node'] = """ qemu_kill_mine nodestate_reinstall qemu_local_init bootcd qemu_local_config -qemu_clean_mine qemu_export qemu_start qemu_timestamp qemu_nodeflavour +qemu_clean_mine qemu_export qemu_start qemu_timestamp qemu_nodefamily """.split() sequences['bonding_node'] = 'node start-node'.split() -- 2.43.0