diff options
author | James Bowes <jbowes@redhat.com> | 2007-09-29 14:08:37 -0400 |
---|---|---|
committer | James Bowes <jbowes@redhat.com> | 2007-09-29 14:08:37 -0400 |
commit | e153b175bff255b9af212f6d969cb75503ab2f14 (patch) | |
tree | af340f21b7eefcbd59662680410c8c736caba3a3 /overlord | |
parent | 99069f42f71f00cd0b44b59e6627657409569b6b (diff) | |
download | third_party-func-e153b175bff255b9af212f6d969cb75503ab2f14.tar.gz third_party-func-e153b175bff255b9af212f6d969cb75503ab2f14.tar.xz third_party-func-e153b175bff255b9af212f6d969cb75503ab2f14.zip |
Fix bad indentation in minion, modules and overlord
Diffstat (limited to 'overlord')
-rwxr-xr-x | overlord/client.py | 2 | ||||
-rw-r--r-- | overlord/test_func.py | 38 |
2 files changed, 20 insertions, 20 deletions
diff --git a/overlord/client.py b/overlord/client.py index d9d5f4f..e0a0801 100755 --- a/overlord/client.py +++ b/overlord/client.py @@ -147,7 +147,7 @@ class Client(): for server in self.servers: - conn = sslclient.FuncServer(server, self.key, self.cert, self.ca ) + conn = sslclient.FuncServer(server, self.key, self.cert, self.ca ) # conn = xmlrpclib.ServerProxy(server) if self.interactive: diff --git a/overlord/test_func.py b/overlord/test_func.py index 59e92a0..4850675 100644 --- a/overlord/test_func.py +++ b/overlord/test_func.py @@ -14,13 +14,13 @@ TEST_HARDWARE = False TEST_SMART = True if TEST_GETATTR: - import func.overlord.client as func_client - print func_client.Client("*").hardware.pci_info() - #print func_client.Client("*").test.add(1,2) - #print func_client.Client("*").hardware.info() - #print func_client.Client("*").run("hardware","info",[]) - #print func_client.Client(socket.gethostname(),noglobs=True).test.add("1","2") - sys.exit(1) + import func.overlord.client as func_client + print func_client.Client("*").hardware.pci_info() + #print func_client.Client("*").test.add(1,2) + #print func_client.Client("*").hardware.info() + #print func_client.Client("*").run("hardware","info",[]) + #print func_client.Client(socket.gethostname(),noglobs=True).test.add("1","2") + sys.exit(1) # get a connecton (to be replaced by client lib logic) s = xmlrpclib.ServerProxy("http://127.0.0.1:51234") @@ -45,18 +45,18 @@ if TEST_HARDWARE: # this is so I can remember how the virt module works if TEST_VIRT: - # example of using koan to install a virtual machine - #s.virt_install("mdehaan.rdu.redhat.com","profileX") - - # wait ... - vms = s.virt.list_vms() - # example of stopping all stopped virtual machines - print "list of virtual instances = %s" % vms - for vm in vms: - status = s.virt.status(vm) - print status - if status == "shutdown": - s.virt.start(vm) + # example of using koan to install a virtual machine + #s.virt_install("mdehaan.rdu.redhat.com","profileX") + + # wait ... + vms = s.virt.list_vms() + # example of stopping all stopped virtual machines + print "list of virtual instances = %s" % vms + for vm in vms: + status = s.virt.status(vm) + print status + if status == "shutdown": + s.virt.start(vm) # add more tests here |