From 079fcad2d535401d0f078c2b52c928ecec7a2799 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 14 Sep 2011 09:48:48 +0200 Subject: [PATCH] rename TestQemu into TestQemuBox --- system/{TestBox.py => TestBoxQemu.py} | 2 +- system/TestNode.py | 6 +++--- system/TestPlc.py | 6 +++--- system/TestResources.py | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) rename system/{TestBox.py => TestBoxQemu.py} (98%) diff --git a/system/TestBox.py b/system/TestBoxQemu.py similarity index 98% rename from system/TestBox.py rename to system/TestBoxQemu.py index 7622d9e..e2527e7 100644 --- a/system/TestBox.py +++ b/system/TestBoxQemu.py @@ -8,7 +8,7 @@ import utils from TestSsh import TestSsh # xxx this should probably inherit TestSsh -class TestBox: +class TestBoxQemu: def __init__(self,hostname,buildname,key=None): self.hostname_value=hostname diff --git a/system/TestNode.py b/system/TestNode.py index 7f5c469..4b499e7 100644 --- a/system/TestNode.py +++ b/system/TestNode.py @@ -6,7 +6,7 @@ import xmlrpclib import utils from TestUser import TestUser -from TestBox import TestBox +from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh class TestNode: @@ -51,12 +51,12 @@ class TestNode: utils.header("WARNING : qemu nodes need a host box") return 'localhost' - # this returns a TestBox instance - cached in .test_box_value + # this returns a TestBoxQemu instance - cached in .test_box_value def test_box (self): try: return self.test_box_value except: - self.test_box_value = TestBox (self.host_box(),self.buildname()) + self.test_box_value = TestBoxQemu (self.host_box(),self.buildname()) return self.test_box_value def create_node (self): diff --git a/system/TestPlc.py b/system/TestPlc.py index 398708e..1ccdc80 100644 --- a/system/TestPlc.py +++ b/system/TestPlc.py @@ -16,7 +16,7 @@ from TestUser import TestUser from TestKey import TestKey from TestSlice import TestSlice from TestSliver import TestSliver -from TestBox import TestBox +from TestBoxQemu import TestBoxQemu from TestSsh import TestSsh from TestApiserver import TestApiserver from TestSliceSfa import TestSliceSfa @@ -302,7 +302,7 @@ class TestPlc: for (box,nodes) in self.gather_hostBoxes().iteritems(): # pass the first nodename, as we don't push template-qemu on testboxes nodedir=nodes[0].nodedir() - TestBox(box,self.options.buildname).qemu_kill_all(nodedir) + TestBoxQemu(box,self.options.buildname).qemu_kill_all(nodedir) return True # make this a valid step @@ -310,7 +310,7 @@ class TestPlc: 'list all qemu instances on the qemu boxes involved by this setup' for (box,nodes) in self.gather_hostBoxes().iteritems(): # this is the brute force version, kill all qemus on that host box - TestBox(box,self.options.buildname).qemu_list_all() + TestBoxQemu(box,self.options.buildname).qemu_list_all() return True # kill only the right qemus diff --git a/system/TestResources.py b/system/TestResources.py index 7b14544..71b9fc5 100644 --- a/system/TestResources.py +++ b/system/TestResources.py @@ -11,7 +11,7 @@ from Trackers import TrackerPlc, TrackerQemu class TestResources: - # need more specialization, see an example in OnelabTestResources + # need more specialization, see an example in LocalTestResources.sample.inria ########## def localize (self,plcs,options): -- 2.43.0