From 8dd867dc1579ed28b5bcbd6287f5a07cc12700fd Mon Sep 17 00:00:00 2001
From: deflax <daniel@deflax.net>
Date: Mon, 31 Jul 2017 04:15:14 +0300
Subject: [PATCH] vmcreate phase 3

---
 plugin.py     | 19 +++++++++----------
 proxmaster.py |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/plugin.py b/plugin.py
index feed6de..0f5182b 100644
--- a/plugin.py
+++ b/plugin.py
@@ -85,13 +85,13 @@ def vmcreate(req):
     real_slave_name = proxobject.cluster.status.get()[0]['name']
     description = vm_name + ' (' + str(cubeid) + '/' + str(vm_id) + ')\n' + 'owned by ' + req['clientname'] + ' (' + req['clientid'] + ')\n'
     
-    if req['vps_type'] == 'kvm':
+    if req['type'] == 'kvm':
         #create partition
         image_name = 'vm-' + str(vm_id) + '-disk-1'
         try:
             local_storage = proxobject.nodes(real_slave_name).storage('lvm')
-            storage_create_result = local_storage.content.post(vmid=vm_id, filename=image_name, size=req['vps_hdd'] + 'G')
-            ioconfig.logger.info('slave[%s]> allocated %s as %s' % (slave_name, req['vps_hdd'], image_name))
+            storage_create_result = local_storage.content.post(vmid=vm_id, filename=image_name, size=req['hdd'] + 'G')
+            ioconfig.logger.info('slave[%s]> allocated %s as %s' % (slave_name, req['hdd'], image_name))
         except:
             ioconfig.logger.info('slave[%s]> unable to allocate %s' % (slave_name, image_name))
             response = { 'status':'FAIL' }
@@ -100,23 +100,22 @@ def vmcreate(req):
         create_result = proxobject.nodes(real_slave_name).qemu.post(vmid=int(vm_id),
                                                                name=vm_name,
                                                                sockets=1,
-                                                               cores=req['vps_cpu'],
-                                                               memory=req['vps_mem'],
+                                                               cores=req['cpu'],
+                                                               memory=req['mem'],
                                                                virtio0='file=lvm:' + image_name,
                                                                onboot=1,
                                                                description=description)
 
-    if req['vps_type'] == 'lxc':
+    if req['type'] == 'lxc':
         create_result = proxobject.nodes(real_slave_name).lxc.post(vmid=int(vm_id),
-                                                              cpus=req['vps_cpu'],
-                                                              memory=req['vps_mem'],
+                                                              cpus=req['cpu'],
+                                                              memory=req['mem'],
                                                               swap=16,
                                                               ostemplate='backup:vztmpl/ubuntu-16.04-standard_16.04-1_amd64.tar.gz',
                                                               hostname=vm_name,
                                                               password=vm_pass,
-                                                              rootfs='lvm:' + req['vps_hdd'], 
+                                                              rootfs='lvm:' + req['hdd'], 
                                                               virtio0='file=lvm:' + image_name,
-                                                              ip_address=req['ipv4'],
                                                               onboot=1,
                                                               description=description)
 
diff --git a/proxmaster.py b/proxmaster.py
index a982712..726c01a 100644
--- a/proxmaster.py
+++ b/proxmaster.py
@@ -140,7 +140,7 @@ class CreateResource(object):
     @falcon.before(max_body(64 * 1024))
     def on_post(self, req, resp):
         """Create a cluster node, returns array of: status, vmid, pass, ipv4, """
-        logger.info('grid> create ' + str(req.params))
+        logger.info('grid> create new cube')
         resp.status, response = selector('vmcreate', req)
         req.context['result'] = response