From eaa61c20e8af06cdfc4267fa155bcf4ef357e9b0 Mon Sep 17 00:00:00 2001 From: Vladimir Khlyunev Date: Tue, 20 Apr 2021 19:25:29 +0400 Subject: [PATCH] Some cleaner improvements Change-Id: I6665ece042267acb59f652ebd9271331e6ae233d --- os_cloud_cleaner/cleaner.py | 2 ++ os_cloud_cleaner/shell.py | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/os_cloud_cleaner/cleaner.py b/os_cloud_cleaner/cleaner.py index 0ab740a..8b61206 100644 --- a/os_cloud_cleaner/cleaner.py +++ b/os_cloud_cleaner/cleaner.py @@ -259,3 +259,5 @@ class Cleaner: self.os_conn.cleanup_network_batch(arg) elif self.os_conn.check_stack_exists(uuid): self.cleanup_stack_parallel(uuid) + else: + logger.info("Can't find anything with is {}".format(uuid)) diff --git a/os_cloud_cleaner/shell.py b/os_cloud_cleaner/shell.py index e7d391b..85d7856 100644 --- a/os_cloud_cleaner/shell.py +++ b/os_cloud_cleaner/shell.py @@ -50,7 +50,7 @@ subparsers = parser.add_subparsers(dest='action') cleanup_subparser = subparsers.add_parser('cleanup') cleanup_subparser.add_argument('resource_type', type=str, - help="allowed: stack") + help="allowed: stack, misc") cleanup_subparser.add_argument('ids', nargs='*', type=str, help="uuids or names, error if name duplicates") # cleanup_subparser.add_argument('--force', '-f', default=False, @@ -65,10 +65,15 @@ search_subparser.add_argument('--only-uuids', '-i', # args = parser.parse_args("cleanup stack bm-cicd-pike-ovs-maas".split(" ")) # args = parser.parse_args("search -i -n bm-cicd-pike-ovs-maas".split(" ")) -# args = parser.parse_args("cleanup misc c32eade8-78a2-4cb2-a6a5-9b692a979620 0e429566-4566-41b3-8767-4d157aa90e38 37a8cdf7-0684-4fe8-860a-4ed7eedbe07c".split(" ")) +# args = parser.parse_args("cleanup misc 6637ecb1-661f-4d6e-a160-b05ee8b81cd0".split(" ")) # args = parser.parse_args("search -i".split(" ")) # args = parser.parse_args("search".split(" ")) + +# debug_args = "cleanup stack heat-cicd-queens-dvr-sl" +# debug_args = "search -n vkhlyunev" +# args = parser.parse_args(debug_args.split(" ")) args = parser.parse_args() + auth_data = {} auth_data['auth_url'] = args.os_auth_url or os.environ.get('OS_AUTH_URL') auth_data['username'] = args.os_username or os.environ.get('OS_USERNAME') @@ -112,7 +117,11 @@ if args.action == "cleanup": else: logger.info("Stack not found, nothing to delete") if args.resource_type == "misc": - for os_id in args.ids: + os_ids = args.ids + if not os_ids: + data = sys.stdin.read() + os_ids = data.split(" ") + for os_id in os_ids: if os_id: logger.info("Processing {}...".format(os_id)) cleaner.process_resource(os_id) -- 2.45.2