From 914c18c6ffecc12026c8eb8838c719e6105bbcc1 Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Sat, 20 Feb 2016 13:08:30 +0900 Subject: test: fix bugs (ssh args and force-down in cleanup) This patch fixes two bugs: - ssh target hostname is wrong (it trailing by ':') - novaclient cannot execute 'force-down' since it tries to use v2.0 endpoint which doesn't spport the new API, Change-Id: I5ef3a8eda5fa7a6730b4eb456d0441d40718a010 Signed-off-by: Ryota MIBU (cherry picked from commit e891316ac35f062c66b15a7ee7981016c6edcc9e) --- tests/clean.py | 45 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 tests/clean.py (limited to 'tests/clean.py') diff --git a/tests/clean.py b/tests/clean.py new file mode 100644 index 00000000..af966aed --- /dev/null +++ b/tests/clean.py @@ -0,0 +1,45 @@ +############################################################################## +# Copyright (c) 2016 NEC Corporation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +import argparse +import json +import os + +import novaclient.client as novaclient + + +nova_api_version = 2.11 + +def enable_compute_host(hostname): + self.nova = novaclient.Client(self.nova_api_version, + os.environ['OS_USERNAME'], + os.environ['OS_PASSWORD'], + os.environ['OS_TENANT_NAME'], + os.environ['OS_AUTH_URL'], + connection_pool=True) + opts = {'all_tenants': True, 'host': hostname} + for server in self.nova.servers.list(detailed=False, search_opts=opts): + self.nova.servers.reset_state(server, 'active') + self.nova.services.force_down(hostname, 'nova-compute', False) + + +def get_args(): + parser = argparse.ArgumentParser(description='Doctor Test Cleaner') + parser.add_argument('hostname', metavar='HOSTNAME', type=str, nargs='?', + help='a hostname to be re-enable') + return parser.parse_args() + + +def main(): + args = get_args() + enable_compute_host(args.hostname) + + +if __name__ == '__main__': + main() -- cgit 1.2.3-korg