From 0c474d35a3c41656b522ea36c9e707dff4c77418 Mon Sep 17 00:00:00 2001
From: Ahmed Bilal Khalid <ahmedbilal96@gmail.com>
Date: Wed, 4 Sep 2019 18:02:37 +0500
Subject: [PATCH] a

---
 config.py         |  1 +
 virtualmachine.py | 73 ++++++++++++++++++++++++++++++-----------------
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/config.py b/config.py
index dc2155f..7c8ee07 100755
--- a/config.py
+++ b/config.py
@@ -6,6 +6,7 @@ from ucloud_common.host import HostPool
 from ucloud_common.request import RequestPool
 from decouple import config
 
+WITHOUT_CEPH = config("WITHOUT_CEPH", False)
 
 logging.basicConfig(
     level=logging.DEBUG,
diff --git a/virtualmachine.py b/virtualmachine.py
index befcc16..580bcdf 100755
--- a/virtualmachine.py
+++ b/virtualmachine.py
@@ -11,9 +11,11 @@ import qmp
 import tempfile
 import bitmath
 import time
+import os
 
+from config import (vm_pool, request_pool, etcd_client,
+                    logging, running_vms, WITHOUT_CEPH)
 from ucloud_common.vm import VMStatus, VMEntry
-from config import (vm_pool, request_pool, etcd_client, logging, running_vms)
 from typing import Union
 from functools import wraps
 from dataclasses import dataclass
@@ -41,10 +43,15 @@ def get_start_command_args(vm_entry, vnc_sock_filename: str, migration=False, mi
     vm_cpus = int(vm_entry.specs["cpu"])
     vm_uuid = vm_entry.uuid
     threads_per_core = 1
-    command = (f"-drive file=rbd:uservms/{vm_uuid},format=raw,if=virtio,cache=none"
-               f" -device virtio-rng-pci -vnc unix:{vnc_sock_filename}"
-               f" -m {vm_memory} -smp cores={vm_cpus},threads={threads_per_core}"
-               f" -name {vm_uuid}")
+
+    if WITHOUT_CEPH:
+        command = f"-drive file={os.path.join('/var/vm', vm_uuid)},format=raw,if=virtio,cache=none"
+    else:
+        command = f"-drive file=rbd:uservms/{vm_uuid},format=raw,if=virtio,cache=none"
+
+    command += (f" -device virtio-rng-pci -vnc unix:{vnc_sock_filename}"
+                f" -m {vm_memory} -smp cores={vm_cpus},threads={threads_per_core}"
+                f" -name {vm_uuid}")
     if migration:
         command += f" -incoming tcp:0:{migration_port}"
 
@@ -97,25 +104,38 @@ def need_running_vm(func):
 
 def create(vm_entry: VMEntry):
     vm_hdd = int(bitmath.Byte(int(vm_entry.specs["hdd"])).to_MB())
-    _command_to_create = f"rbd clone images/{vm_entry.image_uuid}@protected uservms/{vm_entry.uuid}"
-    _command_to_extend = f"rbd resize uservms/{vm_entry.uuid} --size {vm_hdd}"
+
+    if WITHOUT_CEPH:
+        _command_to_create = ["cp",
+                              os.path.join("/var/image", vm_entry.image_uuid),
+                              os.path.join("/var/vm", vm_entry.uuid)]
+
+        _command_to_extend = ["qemu-img", "resize", os.path.join("/var/vm", vm_entry.uuid), vm_entry.specs["hdd"]]
+    else:
+        _command_to_create = ["rbd", "clone",
+                              f"images/{vm_entry.image_uuid}@protected",
+                              f"uservms/{vm_entry.uuid}"]
+
+        _command_to_extend = ["rbd", "resize", f"uservms/{vm_entry.uuid}", "--size", vm_hdd]
 
     try:
-        subprocess.check_call(_command_to_create.split(" "))
+        subprocess.check_output(_command_to_create)
     except subprocess.CalledProcessError as e:
         if e.returncode == errno.EEXIST:
             logging.debug(f"Image for vm {vm_entry.uuid} exists")
             # File Already exists. No Problem Continue
             return
-        else:
-            # This exception catches all other exceptions
-            # i.e FileNotFound (BaseImage), pool Does Not Exists etc.
-            logging.exception(f"Can't clone image - {e}")
+
+        # This exception catches all other exceptions
+        # i.e FileNotFound (BaseImage), pool Does Not Exists etc.
+        logging.exception(e)
     else:
-        # TODO: Check whether the below suprocess.check_call
-        #       is executed successfully
-        subprocess.check_call(_command_to_extend.split(" "))
-        logging.info("New VM Created")
+        try:
+            subprocess.check_output(_command_to_extend)
+        except Exception as e:
+            logging.exception(e)
+        else:
+            logging.info("New VM Created")
 
 
 def start(vm_entry: VMEntry):
@@ -159,17 +179,18 @@ def delete(vm_entry):
     logging.info(f"Deleting VM {vm_entry}")
     stop(vm_entry)
     path_without_protocol = vm_entry.path[vm_entry.path.find(":") + 1:]
-    try:
-        rc = subprocess.call(f"rbd rm {path_without_protocol}".split(" "))
-    except FileNotFoundError as e:
-        logging.exception(e)
-    except Exception as e:
-        logging.exception(f"Unknown error occurred - {e}")
+
+    if WITHOUT_CEPH:
+        vm_deletion_command = ["rm", os.path.join("/var/vm", vm_entry.uuid)]
     else:
-        if rc == 0:
-            etcd_client.client.delete(vm_entry.key)
-        else:
-            logging.info("Some unknown problem occur while deleting vm file")
+        vm_deletion_command = ["rbd", "rm", path_without_protocol]
+
+    try:
+        subprocess.check_output(vm_deletion_command)
+    except Exception as e:
+        logging.exception(e)
+    else:
+        etcd_client.client.delete(vm_entry.key)
 
 
 def transfer(request_event):