Răsfoiți Sursa

修正 guest_xml get_disk 存储模式bug

James Iter 9 ani în urmă
părinte
comite
d82eee844f
2 a modificat fișierele cu 13 adăugiri și 9 ștergeri
  1. 12 8
      models/guest_xml.py
  2. 1 1
      views/config.py

+ 12 - 8
models/guest_xml.py

@@ -91,8 +91,18 @@ class GuestXML(object):
 
         from initialize import dev_table
 
-        if self.config.jimv_edition == status.JimVEdition.hyper_convergence.value:
+        if self.config.storage_mode in [status.StorageMode.local.value, status.StorageMode.shared_mount.value]:
+            disk_xml = """
+                <disk type='file' device='disk'>
+                    <driver name='qemu' type='{0}' cache='none'/>
+                    <source file='{1}'/>
+                    <target dev='{2}' bus='virtio'/>
+                </disk>
+            """.format(self.disk.format, self.disk.path, dev_table[self.disk.sequence])
+
+        elif self.config.storage_mode in [status.StorageMode.ceph.value, status.StorageMode.glusterfs.value]:
             dfs_protocol = 'ceph'
+
             if self.config.storage_mode == status.StorageMode.glusterfs.value:
                 dfs_protocol = 'gluster'
 
@@ -108,13 +118,7 @@ class GuestXML(object):
                        dev_table[self.disk.sequence])
 
         else:
-            disk_xml = """
-                <disk type='file' device='disk'>
-                    <driver name='qemu' type='{0}' cache='none'/>
-                    <source file='{1}'/>
-                    <target dev='{2}' bus='virtio'/>
-                </disk>
-            """.format(self.disk.format, self.disk.path, dev_table[self.disk.sequence])
+            disk_xml = ''
 
         return disk_xml
 

+ 1 - 1
views/config.py

@@ -107,7 +107,7 @@ def create():
 
     if request.method == 'POST':
         payload = {
-            'jimv_edition': request.form.get('jimv_edition', 0),
+            'jimv_edition': int(request.form.get('jimv_edition', 0)),
             'storage_mode': int(request.form.get('storage_mode')),
             'dfs_volume': request.form.get('dfs_volume'),
             'storage_path': request.form.get('storage_path'),