diff --git a/README.md b/README.md
index a4713c4..f1bb36c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## WebVirtCloud Beta
+## WebVirtCloud
## Features
@@ -266,6 +266,15 @@ pip install -U -r conf/requirements.txt
python manage.py migrate
sudo service supervisor restart
```
+### Screenshots
+Instance Detail:
+
+Instance List:
+
+
+Other:
+
+
### License
diff --git a/doc/images/grouped.PNG b/doc/images/grouped.PNG
new file mode 100644
index 0000000..261b7dd
Binary files /dev/null and b/doc/images/grouped.PNG differ
diff --git a/doc/images/hosts.PNG b/doc/images/hosts.PNG
new file mode 100644
index 0000000..36fdbc1
Binary files /dev/null and b/doc/images/hosts.PNG differ
diff --git a/doc/images/instance.PNG b/doc/images/instance.PNG
new file mode 100644
index 0000000..2bd4382
Binary files /dev/null and b/doc/images/instance.PNG differ
diff --git a/doc/images/log.PNG b/doc/images/log.PNG
new file mode 100644
index 0000000..2302d15
Binary files /dev/null and b/doc/images/log.PNG differ
diff --git a/doc/images/nongrouped.PNG b/doc/images/nongrouped.PNG
new file mode 100644
index 0000000..96353cf
Binary files /dev/null and b/doc/images/nongrouped.PNG differ
diff --git a/doc/images/readme.md b/doc/images/readme.md
new file mode 100644
index 0000000..d703cba
--- /dev/null
+++ b/doc/images/readme.md
@@ -0,0 +1 @@
+IMAGES
diff --git a/doc/readme.md b/doc/readme.md
new file mode 100644
index 0000000..e845566
--- /dev/null
+++ b/doc/readme.md
@@ -0,0 +1 @@
+README
diff --git a/instances/views.py b/instances/views.py
index 7ba7a7c..4312eb3 100644
--- a/instances/views.py
+++ b/instances/views.py
@@ -195,6 +195,8 @@ def instance(request, compute_id, vname):
return msg
def get_new_disk_dev(media, disks, bus):
+ existing_disk_devs = []
+ existing_media_devs = []
if bus == "virtio":
dev_base = "vd"
elif bus == "ide":
@@ -203,9 +205,14 @@ def instance(request, compute_id, vname):
dev_base = "fd"
else:
dev_base = "sd"
- existing_disk_devs = [disk['dev'] for disk in disks]
+
+ if disks:
+ existing_disk_devs = [disk['dev'] for disk in disks]
+
# cd-rom bus could be virtio/sata, because of that we should check it also
- existing_media_devs = [disk['dev'] for disk in media]
+ if media:
+ existing_media_devs = [m['dev'] for m in media]
+
for l in string.lowercase:
dev = dev_base + l
if dev not in existing_disk_devs and dev not in existing_media_devs:
@@ -465,7 +472,7 @@ def instance(request, compute_id, vname):
meta_prealloc = request.POST.get('meta_prealloc', False)
bus = request.POST.get('bus', default_bus)
cache = request.POST.get('cache', default_cache)
- target = get_new_disk_dev(None, disks, bus)
+ target = get_new_disk_dev(media, disks, bus)
path = connCreate.create_volume(storage, name, size, format, meta_prealloc, default_owner)
conn.attach_disk(path, target, subdriver=format, cache=cache, targetbus=bus)
@@ -487,7 +494,7 @@ def instance(request, compute_id, vname):
format = connCreate.get_volume_type(name)
path = connCreate.get_target_path()
- target = get_new_disk_dev(None, disks, bus)
+ target = get_new_disk_dev(media, disks, bus)
source = path + "/" + name;
conn.attach_disk(source, target, subdriver=format, cache=cache, targetbus=bus)
diff --git a/storages/views.py b/storages/views.py
index ba9520e..ea14f5f 100644
--- a/storages/views.py
+++ b/storages/views.py
@@ -222,7 +222,7 @@ def get_volumes(request, compute_id, pool):
compute.type,
pool)
conn.refresh()
- except libvirtError as liberr:
+ except libvirtError:
pass
data['vols'] = sorted(conn.get_volumes())
return HttpResponse(json.dumps(data))
\ No newline at end of file