Răsfoiți Sursa

走通创建虚拟机流程

James Iter 9 ani în urmă
părinte
comite
edf960d7a1
5 a modificat fișierele cu 4 adăugiri și 7 ștergeri
  1. 1 1
      misc/init.sql
  2. 1 1
      models/guest.py
  3. 0 1
      models/rules.py
  4. 1 2
      tests/test_guest.py
  5. 1 2
      views/guest.py

+ 1 - 1
misc/init.sql

@@ -1,4 +1,4 @@
-# DROP DATABASE IF EXISTS jimv;
+DROP DATABASE IF EXISTS jimv;
 CREATE DATABASE IF NOT EXISTS jimv CHARACTER SET utf8;
 USE jimv;
 

+ 1 - 1
models/guest.py

@@ -31,7 +31,7 @@ class Guest(ORM):
         self.remark = ''
         self.os_template_id = None
         self.create_time = ji.Common.tus()
-        self.status = GuestState.shutdown.value
+        self.status = GuestState.no_state.value
         self.on_host = ''
         self.cpu = None
         self.memory = None

+ 0 - 1
models/rules.py

@@ -44,7 +44,6 @@ class Rules(Enum):
     CPU = (int, 'cpu')
     MEMORY = (int, 'memory')
     OS_TEMPLATE_ID = (int, 'os_template_id')
-    DISKS = (list, 'disks')
     QUANTITY = (int, 'quantity')
     NAME = (basestring, 'name')
     PASSWORD = (basestring, 'password')

+ 1 - 2
tests/test_guest.py

@@ -29,8 +29,7 @@ class TestGuest(unittest.TestCase):
         payload = {
             "cpu": 4,
             "memory": 4,
-            "os_template_id": 5,
-            "disks": [],
+            "os_template_id": 1,
             "quantity": 2,
             "name": "",
             "password": "pswd.com",

+ 1 - 2
views/guest.py

@@ -47,7 +47,6 @@ def r_create():
         Rules.CPU.value,
         Rules.MEMORY.value,
         Rules.OS_TEMPLATE_ID.value,
-        Rules.DISKS.value,
         Rules.QUANTITY.value,
         Rules.NAME.value,
         Rules.PASSWORD.value,
@@ -68,7 +67,7 @@ def r_create():
         os_template.id = request.json.get('os_template_id')
         if not os_template.exist():
             ret['state'] = ji.Common.exchange_state(40450)
-            ret['state']['sub']['zh-cn'] = ''.join([ret['state']['sub']['zh-cn'], ': ', os_template.id])
+            ret['state']['sub']['zh-cn'] = ''.join([ret['state']['sub']['zh-cn'], ': ', os_template.id.__str__()])
             return ret
 
         os_template.get()