From 4541ac13bff5fe47cc7a2eec21126d1cca2598c0 Mon Sep 17 00:00:00 2001 From: Ahmad Bilal Khalid Date: Thu, 25 Jul 2019 16:14:18 +0500 Subject: [PATCH] convert enums.VMStatus.running_vm_statuses to tuple + capture rbd failing --- main.py | 9 ++++++--- ucloud_common/enums.py | 11 ++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/main.py b/main.py index c413fbd..2a66d07 100644 --- a/main.py +++ b/main.py @@ -67,7 +67,7 @@ def goodbye(host): for vm in vms: vm.value["hostname"] = "" - if vm.value["status"] in RUNNING_VM_STATUES: + if vm.value["status"] in VMStatus.running_vm_statuses: vm.value["status"] = VMStatus.requested_start client.put(vm.key, vm.value, value_in_json=True) @@ -105,8 +105,11 @@ def create_vm(vm_uuid, e): logging.info("Creating New VM...") _command_to_create = f"rbd clone images/{image_uuid}@protected uservms/{vm_uuid}" - subprocess.call(_command_to_create.split(" ")) - + try: + subprocess.call(_command_to_create.split(" ")) + # TODO: Make it specific + except: + pass e.value["status"] = "REQUESTED_START" client.put(e.key, json.dumps(e.value)) diff --git a/ucloud_common/enums.py b/ucloud_common/enums.py index 18fe8ac..adebb31 100644 --- a/ucloud_common/enums.py +++ b/ucloud_common/enums.py @@ -23,12 +23,9 @@ class VMStatus(Enum): running = "RUNNING" suspended = "SUSPENDED" - + running_vm_statuses = (requested_shutdown, requested_suspend, + requested_resume, requested_migrate, + running, suspended) class HostStatus(Enum): alive = "ALIVE" - dead = "DEAD" - - -RUNNING_VM_STATUES = [VMStatus.requested_shutdown, VMStatus.requested_suspend, - VMStatus.requested_resume, VMStatus.requested_migrate, - VMStatus.running, VMStatus.suspended] \ No newline at end of file + dead = "DEAD" \ No newline at end of file