Fix authorizete servers and add new vm on non kvm

Author: retspen

locale/ru/LC_MESSAGES/django.mo

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-17 10:10+0300\n"
+"POT-Creation-Date: 2012-07-19 18:30+0300\n"
 "PO-Revision-Date: 2012-05-06 14:41+0300\n"
 "Last-Translator: Anatoliy Guskov <[email protected]>\n"
 "Language-Team: RU <[email protected]>\n"
@@ -136,47 +136,51 @@ msgstr ""
 msgid "Enter the name of the virtual machine"
 msgstr "Введите название виртуальной машины"
 
-#: newvm/views.py:362
+#: newvm/views.py:356
+msgid "Hardware acceleration is not found"
+msgstr "Аппаратная акселерация отсутствует"
+
+#: newvm/views.py:359
 msgid "Creating a virtual machine: "
 msgstr "Создание виртуальной машины: "
 
-#: overview/views.py:157 vm/views.py:387
+#: overview/views.py:155 vm/views.py:387
 msgid "Suspend VM: "
 msgstr "Приостановка ВМ: "
 
-#: overview/views.py:162 vm/views.py:392
+#: overview/views.py:160 vm/views.py:392
 msgid "Error: VM alredy suspended"
 msgstr "Ошибка: возможно виртуальная машина уже приостановлена"
 
-#: overview/views.py:167 vm/views.py:397
+#: overview/views.py:165 vm/views.py:397
 msgid "Resume VM: "
 msgstr "Возобновление ВМ: "
 
-#: overview/views.py:172 vm/views.py:402
+#: overview/views.py:170 vm/views.py:402
 msgid "Error: VM alredy resume"
 msgstr "Ошибка: возможно виртуальная машина уже возобновлена"
 
-#: overview/views.py:177 vm/views.py:407
+#: overview/views.py:175 vm/views.py:407
 msgid "Start VM: "
 msgstr "Запуск ВМ: "
 
-#: overview/views.py:182 vm/views.py:412
+#: overview/views.py:180 vm/views.py:412
 msgid "Error: VM alredy start"
 msgstr "Ошибка: возможно виртуальная машина уже запущена"
 
-#: overview/views.py:187 vm/views.py:417
+#: overview/views.py:185 vm/views.py:417
 msgid "Shutdown VM: "
 msgstr "Выключить ВМ: "
 
-#: overview/views.py:192 overview/views.py:202 vm/views.py:422 vm/views.py:432
+#: overview/views.py:190 overview/views.py:200 vm/views.py:422 vm/views.py:432
 msgid "Error: VM alredy shutdown"
 msgstr "Ошибка: возможно виртуальная машина уже выключена"
 
-#: overview/views.py:197 vm/views.py:427
+#: overview/views.py:195 vm/views.py:427
 msgid "Force shutdown VM: "
 msgstr "Принудительно выключение ВМ: "
 
-#: overview/views.py:219
+#: overview/views.py:217
 msgid "Error connecting: Check the KVM login and KVM password"
 msgstr "Ошибка подключения: проверьте KVM логин и KVM пароль"
 

locale/ru/LC_MESSAGES/django.po

@@ -352,17 +352,21 @@ def add_vm(name, mem, cpus, machine, emul, img, iso, bridge):
 			msg = _('Enter the name of the virtual machine')
 			errors.append(msg)
 		if not errors:
-			if request.POST.get('hdd',''):
-				size = request.POST.get('hdd','')
-				stg_pool = request.POST.get('stg_pool','')
-				create_volume(stg_pool, name, size)
-				img = name + '.img'
-				hdd = get_img_path(img)
-			add_vm(name, setmem, cpus, machine, emul, hdd, cdrom, netbr)
-			msg = _('Creating a virtual machine: ')
-			msg = msg + name
-			add_error(msg,'user')
-			return HttpResponseRedirect('/vm/%s/%s/' % (host_id, name))
+			if add_vm(name, setmem, cpus, machine, emul, hdd, cdrom, netbr) is 'error':
+				msg = _('Hardware acceleration is not found')
+				errors.append(msg)
+			else:
+				msg = _('Creating a virtual machine: ')
+				msg = msg + name
+				add_error(msg,'user')
+				if request.POST.get('hdd',''):
+						size = request.POST.get('hdd','')
+						stg_pool = request.POST.get('stg_pool','')
+						create_volume(stg_pool, name, size)
+						img = name + '.img'
+						hdd = get_img_path(img)
+				return HttpResponseRedirect('/vm/%s/%s/' % (host_id, name))
+
 
 	conn.close()
 

newvm/views.py

@@ -8,8 +8,6 @@
 
 def index(request, host_id):
 
-	""" Overview block """
-
 	if not request.user.is_authenticated():
 		return HttpResponseRedirect('/user/login/')
 

overview/views.py

@@ -22,7 +22,7 @@ <h2>{% trans "Dashboard" %}</h2>
                   <td>{{ info.1 }}</td>
                   <td>{% if info.4 == 1 %}<font color="green">{% trans "available" %}</font>{% else %}<font color="red">{% trans "not available" %}</font>{% endif %}</td>
                   <td style="width:30px;">{% if not info.3 and info.4 == 1 %}
-                     <div id="myModalkvm" class="modal hide fade">
+                     <div id="myModalkvm{{info.0}}" class="modal hide fade">
                         <div class="modal-header">
                           <button class="close" data-dismiss="modal">&times;</button>
                             <h3>{% trans "Authorization" %}</h3>
@@ -50,7 +50,7 @@ <h3>{% trans "Authorization" %}</h3>
                          </form>
                         </div>
                       </div>   
-                    <a data-toggle="modal" href="#myModalkvm" class="btn btn-primary">{% trans "Authorization" %}</a>{% else %}{% if info.4 == 1 and info.3 %}<button class="btn btn-primary" onclick="location.href='/overview/{{ info.0 }}/'">{% trans "Manage" %}</button>{% else %}<a href="#" class="btn btn-primary disabled">{% trans "Manage" %}</a>{% endif %}{% endif %}
+                    <a data-toggle="modal" href="#myModalkvm{{info.0}}" class="btn btn-primary">{% trans "Authorization" %}</a>{% else %}{% if info.4 == 1 and info.3 %}<button class="btn btn-primary" onclick="location.href='/overview/{{ info.0 }}/'">{% trans "Manage" %}</button>{% else %}<a href="#" class="btn btn-primary disabled">{% trans "Manage" %}</a>{% endif %}{% endif %}
                   </td>
                   <td style="width:30px;">
                     <form action="/dashboard/" method="post" style="height:10px;">