[PATCH] Fix issue #340: Show error message when server fails to list host partitions
by Aline Manera
Add error handlers to kimchi.listHostPartitions() to properly display
error message when an error occurs while trying to list host partitions.
Also update .po files as a new message was added.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
po/en_US.po | 47 +++++++++++++++++++++---------
po/kimchi.pot | 33 ++++++++++++++-------
po/pt_BR.po | 49 +++++++++++++++++++++++---------
po/zh_CN.po | 45 +++++++++++++++++++++--------
ui/js/src/kimchi.storage_main.js | 4 +++
ui/js/src/kimchi.storagepool_add_main.js | 3 ++
ui/pages/i18n.json.tmpl | 1 +
7 files changed, 132 insertions(+), 50 deletions(-)
diff --git a/po/en_US.po b/po/en_US.po
index f85d982..a34da3a 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 15:52-0300\n"
+"POT-Creation-Date: 2014-08-08 15:27-0300\n"
"PO-Revision-Date: 2013-07-11 17:32-0400\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: English\n"
@@ -136,6 +136,16 @@ msgstr ""
"'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x "
"'path_to_iso'.Details: %(err)s"
+msgid "Error occurs when probing image os information."
+msgstr ""
+
+msgid "No OS information found in given image."
+msgstr ""
+
+#, python-format
+msgid "Unable to find/read image file %(filename)s"
+msgstr ""
+
#, python-format
msgid "Virtual machine %(name)s already exists"
msgstr "Virtual machine %(name)s already exists"
@@ -337,8 +347,8 @@ msgstr "Template CDROM must be a local or remote ISO file"
msgid "Invalid storage pool URI %(value)s specified for template"
msgstr "Invalid storage pool URI %(value)s specified for template"
-msgid "Specify an ISO image as CDROM to create a template"
-msgstr "Specify an ISO image as CDROM to create a template"
+msgid "Specify an ISO image as CDROM or a base image to create a template"
+msgstr ""
msgid "All networks for the template must be specified in a list."
msgstr "All networks for the template must be specified in a list."
@@ -362,6 +372,13 @@ msgstr "Unable to delete template due error: %(err)s"
msgid "Disk size must be greater than 1GB."
msgstr "Disk size must be greater than 1GB."
+msgid "Template base image must be a valid local image file"
+msgstr ""
+
+#, python-format
+msgid "Cannot identify base image %(path)s format"
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr "Storage pool %(name)s already exists"
@@ -791,10 +808,6 @@ msgstr "The path '%(value)s' is not valid local/remote path for the device"
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr "Device name %(dev_name)s already exists in vm %(vm_name)s"
-msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
-msgstr ""
-"Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
-
msgid "Just support cdrom path update"
msgstr "Just support cdrom path update"
@@ -1102,9 +1115,6 @@ msgstr "Device Type"
msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr "The device type. Currently, \"cdrom\" and \"disk\" are supported."
-msgid "Device Bus"
-msgstr "Device Bus"
-
msgid "Storage Pool"
msgstr "Storage Pool"
@@ -1276,9 +1286,6 @@ msgstr "Add"
msgid "Remove"
msgstr "Remove"
-msgid "Failed."
-msgstr "Failed."
-
msgid "Enable"
msgstr "Enable"
@@ -1489,6 +1496,9 @@ msgstr ""
"This storage pool is not persistent. Instead of deactivate, this action will "
"permanently delete it. Would you like to continue?"
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
msgid "CDROM path need to be a valid local path and cannot be blank."
msgstr "CDROM path need to be a valid local path and cannot be blank."
@@ -1843,3 +1853,14 @@ msgstr "No templates found."
msgid "Clone"
msgstr "Clone"
+
+#~ msgid ""
+#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+#~ msgstr ""
+#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+
+#~ msgid "Device Bus"
+#~ msgstr "Device Bus"
+
+#~ msgid "Failed."
+#~ msgstr "Failed."
diff --git a/po/kimchi.pot b/po/kimchi.pot
index e869e3a..d8354fa 100755
--- a/po/kimchi.pot
+++ b/po/kimchi.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 15:52-0300\n"
+"POT-Creation-Date: 2014-08-08 15:27-0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL(a)li.org>\n"
@@ -130,6 +130,16 @@ msgid ""
"'path_to_iso'.Details: %(err)s"
msgstr ""
+msgid "Error occurs when probing image os information."
+msgstr ""
+
+msgid "No OS information found in given image."
+msgstr ""
+
+#, python-format
+msgid "Unable to find/read image file %(filename)s"
+msgstr ""
+
#, python-format
msgid "Virtual machine %(name)s already exists"
msgstr ""
@@ -324,7 +334,7 @@ msgstr ""
msgid "Invalid storage pool URI %(value)s specified for template"
msgstr ""
-msgid "Specify an ISO image as CDROM to create a template"
+msgid "Specify an ISO image as CDROM or a base image to create a template"
msgstr ""
msgid "All networks for the template must be specified in a list."
@@ -348,6 +358,13 @@ msgstr ""
msgid "Disk size must be greater than 1GB."
msgstr ""
+msgid "Template base image must be a valid local image file"
+msgstr ""
+
+#, python-format
+msgid "Cannot identify base image %(path)s format"
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr ""
@@ -744,9 +761,6 @@ msgstr ""
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr ""
-msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
-msgstr ""
-
msgid "Just support cdrom path update"
msgstr ""
@@ -1041,9 +1055,6 @@ msgstr ""
msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
-msgid "Device Bus"
-msgstr ""
-
msgid "Storage Pool"
msgstr ""
@@ -1209,9 +1220,6 @@ msgstr ""
msgid "Remove"
msgstr ""
-msgid "Failed."
-msgstr ""
-
msgid "Enable"
msgstr ""
@@ -1401,6 +1409,9 @@ msgid ""
"permanently delete it. Would you like to continue?"
msgstr ""
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
msgid "CDROM path need to be a valid local path and cannot be blank."
msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index b38ff3f..452e778 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 15:52-0300\n"
+"POT-Creation-Date: 2014-08-08 15:27-0300\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n"
"Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n"
@@ -156,6 +156,16 @@ msgstr ""
"do caminho da ISO, ou (não recomendado) 'chmod -R o+x 'caminho_para_iso'. "
"Detalhes: %(err)s"
+msgid "Error occurs when probing image os information."
+msgstr ""
+
+msgid "No OS information found in given image."
+msgstr ""
+
+#, python-format
+msgid "Unable to find/read image file %(filename)s"
+msgstr ""
+
#, python-format
msgid "Virtual machine %(name)s already exists"
msgstr "Máquina virtual %(name)s já existe"
@@ -367,8 +377,8 @@ msgstr "Modelo do CDROM deve ser um arquivo ISO local ou remoto"
msgid "Invalid storage pool URI %(value)s specified for template"
msgstr "Storage pool URI inválido %(value)s especificado para modelo"
-msgid "Specify an ISO image as CDROM to create a template"
-msgstr "Especifique uma imagem ISO como CDROM para criar o modelo"
+msgid "Specify an ISO image as CDROM or a base image to create a template"
+msgstr ""
msgid "All networks for the template must be specified in a list."
msgstr "Todas redes para o modelo devem ser especificadas em lista"
@@ -393,6 +403,13 @@ msgstr "Não foi possível remover o modelo devido a um erro: %(err)s"
msgid "Disk size must be greater than 1GB."
msgstr "Tamanho do disco deve ser maior do que 1GB"
+msgid "Template base image must be a valid local image file"
+msgstr ""
+
+#, python-format
+msgid "Cannot identify base image %(path)s format"
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr "Storage pool %(name)s já existe"
@@ -842,11 +859,6 @@ msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr ""
"Nome do dispositivo %(dev_name)s já existe na máquina virtual %(vm_name)s"
-msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
-msgstr ""
-"Tipo de barramento do dispositivo de destino inválido, tipos suportados: "
-"'ide', 'scsi', 'virtio'"
-
msgid "Just support cdrom path update"
msgstr "Apenas a atualização do caminho do CDROM é suportada"
@@ -1164,9 +1176,6 @@ msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr ""
"O tipo do dispositivo. Atualmente, \"cdrom\" e \"disco\" são suportados."
-msgid "Device Bus"
-msgstr "Barramento do dispositivo"
-
msgid "Storage Pool"
msgstr "Nome do Storage Pool"
@@ -1340,9 +1349,6 @@ msgstr "Adicionar"
msgid "Remove"
msgstr "Remover"
-msgid "Failed."
-msgstr "Falhou."
-
msgid "Enable"
msgstr "Ativar"
@@ -1552,6 +1558,9 @@ msgstr ""
"O storage pool não é persistente. Ao invés de desativar, essa ação vai "
"removê-lo permanentemente. Deseja continuar?"
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
msgid "CDROM path need to be a valid local path and cannot be blank."
msgstr ""
"Caminho do CDROM precisa ser um caminho local válido e não pode ser vazio."
@@ -1907,3 +1916,15 @@ msgstr "Nenhum modelo encontrado."
msgid "Clone"
msgstr "Clonar"
+
+#~ msgid ""
+#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+#~ msgstr ""
+#~ "Tipo de barramento do dispositivo de destino inválido, tipos suportados: "
+#~ "'ide', 'scsi', 'virtio'"
+
+#~ msgid "Device Bus"
+#~ msgstr "Barramento do dispositivo"
+
+#~ msgid "Failed."
+#~ msgstr "Falhou."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index aa3032a..83c7018 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -20,7 +20,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kimchi 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-07-29 15:52-0300\n"
+"POT-Creation-Date: 2014-08-08 15:27-0300\n"
"PO-Revision-Date: 2013-06-27 10:48+0000\n"
"Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
"Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n"
@@ -149,6 +149,16 @@ msgstr ""
"录下；或为'%(user)s'用户设置访问权限；或将'%(user)s'用户增加到ISO路径的属组；"
"或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s"
+msgid "Error occurs when probing image os information."
+msgstr ""
+
+msgid "No OS information found in given image."
+msgstr ""
+
+#, python-format
+msgid "Unable to find/read image file %(filename)s"
+msgstr ""
+
#, python-format
msgid "Virtual machine %(name)s already exists"
msgstr "虚拟机%(name)s已经存在"
@@ -344,8 +354,8 @@ msgstr "模板的CDROM必须是一个本地或者远程的ISO文件"
msgid "Invalid storage pool URI %(value)s specified for template"
msgstr "给模板指定了无效的存储池URI %(value)s"
-msgid "Specify an ISO image as CDROM to create a template"
-msgstr "为新模版的CDROM指定一个ISO的镜像"
+msgid "Specify an ISO image as CDROM or a base image to create a template"
+msgstr ""
msgid "All networks for the template must be specified in a list."
msgstr "为模板指定的网络必须在一个列表中"
@@ -368,6 +378,13 @@ msgstr "由于错误：%(err)s，未能删除模板"
msgid "Disk size must be greater than 1GB."
msgstr "磁盘大小必须大于1GB。"
+msgid "Template base image must be a valid local image file"
+msgstr ""
+
+#, python-format
+msgid "Cannot identify base image %(path)s format"
+msgstr ""
+
#, python-format
msgid "Storage pool %(name)s already exists"
msgstr "存储池%(name)s已经存在"
@@ -764,9 +781,6 @@ msgstr "设备路径'%(value)s'不是一个有效的本地/远程路径"
msgid "Device name %(dev_name)s already exists in vm %(vm_name)s"
msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在"
-msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
-msgstr "无效的目标设备总线类型。支持类型为：'ide'，'scsi'，'virtio'"
-
msgid "Just support cdrom path update"
msgstr "仅支持cdrom路径更新"
@@ -1061,9 +1075,6 @@ msgstr "设备类型"
msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported."
msgstr "设备类型。目前支持设备类型：\"cdrom\"和\"disk\"。 "
-msgid "Device Bus"
-msgstr "设备总线"
-
msgid "Storage Pool"
msgstr "存储池"
@@ -1230,9 +1241,6 @@ msgstr "增加"
msgid "Remove"
msgstr "删除"
-msgid "Failed."
-msgstr "失败"
-
msgid "Enable"
msgstr "使能"
@@ -1424,6 +1432,9 @@ msgid ""
"permanently delete it. Would you like to continue?"
msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？"
+msgid "Unable to retrieve partitions information."
+msgstr ""
+
msgid "CDROM path need to be a valid local path and cannot be blank."
msgstr "CDROM的路径必须是有效本地路径且不能为空"
@@ -1773,3 +1784,13 @@ msgstr "没有发现模板"
msgid "Clone"
msgstr "制作副本"
+
+#~ msgid ""
+#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'"
+#~ msgstr "无效的目标设备总线类型。支持类型为：'ide'，'scsi'，'virtio'"
+
+#~ msgid "Device Bus"
+#~ msgstr "设备总线"
+
+#~ msgid "Failed."
+#~ msgstr "失败"
diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js
index 0ebdd59..ae3f963 100644
--- a/ui/js/src/kimchi.storage_main.js
+++ b/ui/js/src/kimchi.storage_main.js
@@ -223,6 +223,10 @@ kimchi.initLogicalPoolExtend = function() {
$('.host-partition').html(i18n['KCHPOOL6011M']);
$('.host-partition').addClass('text-help');
}
+ }, function(err) {
+ $('#loading-info', '#logicalPoolExtend').addClass('hidden');
+ $('.host-partition').html(i18n['KCHPOOL6013M'] + '<br/>(' + err.responseJSON.reason + ')');
+ $('.host-partition').addClass('text-help');
});
},
beforeClose : function() { $('.host-partition', '#logicalPoolExtend').empty(); },
diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js
index 629a37b..ecbc682 100644
--- a/ui/js/src/kimchi.storagepool_add_main.js
+++ b/ui/js/src/kimchi.storagepool_add_main.js
@@ -50,6 +50,9 @@ kimchi.initStorageAddPage = function() {
$('.host-partition').html(i18n['KCHPOOL6011M']);
$('.host-partition').addClass('text-help');
}
+ }, function(err) {
+ $('.host-partition').html(i18n['KCHPOOL6013M'] + '<br/>(' + err.responseJSON.reason + ')');
+ $('.host-partition').addClass('text-help');
});
kimchi.getHostPCIDevices(function(data){
diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl
index f1478a7..697f946 100644
--- a/ui/pages/i18n.json.tmpl
+++ b/ui/pages/i18n.json.tmpl
@@ -162,6 +162,7 @@
"KCHPOOL6010M": "$_("Looking for available partitions ...")",
"KCHPOOL6011M": "$_("No available partitions found.")",
"KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")",
+ "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")",
"KCHVMSTOR0001E": "$_("CDROM path need to be a valid local path and cannot be blank.")",
"KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")"
--
1.9.3
9 years, 8 months
[PATCH v3 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana
Changelog from v2:
- Rename one last occurrence of "_validate_repo_url" to the correct name.
Crístian Viana (3):
Issue #377: Validate repository URLs
typo: Fix "repositorie"
repository: Remove error message prefix
src/kimchi/mockmodel.py | 25 ++++++++++++++++---
src/kimchi/repositories.py | 11 +++++++++
src/kimchi/utils.py | 15 ++++++++++++
tests/test_model.py | 42 ++++++++++++++++++++++++++++++--
tests/test_rest.py | 41 +++++++++++++++++++++++++++++--
ui/js/src/kimchi.repository_add_main.js | 3 +--
ui/js/src/kimchi.repository_edit_main.js | 3 +--
ui/pages/i18n.json.tmpl | 1 -
8 files changed, 129 insertions(+), 12 deletions(-)
--
1.9.3
9 years, 8 months
[PATCH V2] UI enhancement: Request /config/capabilities as soon as possible
by Aline Manera
V1 - V2:
- Make sure kimchi.capabilities is properly set before using its value (Cristian)
I prefered to do it this way because making a sync request will prevent the
full UI to load even for some seconds.
Aline Manera (1):
UI enhancement: Request /config/capabilities as soon as possible
ui/js/src/kimchi.main.js | 8 ++++++++
ui/js/src/kimchi.template_add_main.js | 37 ++++++++++++++++++++--------------
ui/js/src/kimchi.template_edit_main.js | 20 ++++++++++--------
3 files changed, 42 insertions(+), 23 deletions(-)
--
1.9.3
9 years, 8 months
[PATCH v2 0/3] Update remote CD ROM
by Christy Perez
This patchset adds changes to allow a user to update a CD ROM created
with a remote ISO. It fixes a KeyError issue, improves the way a remote
ISO file is verified, and adds unit tests.
Note: Currently updating a CD ROM created with a local iso using a remote
ISO is not supported. This patchset does not address that issue,
but does add a test for it. This patchset is primarily to correct the
KeyError and prevent a regression when trying to update a remote ISO's
file.
Christy Perez (3):
Fix Key Error when editing CD ROM path
Fix verification of remote ISO
Add unit tests for remote-backed CD ROM updates.
src/kimchi/model/vmstorages.py | 2 +-
src/kimchi/utils.py | 21 +++++++++++-----
tests/test_model.py | 55 +++++++++++++++++++++++++++++++++++++++++-
tests/utils.py | 21 +++++++++++++++-
4 files changed, 90 insertions(+), 9 deletions(-)
--
1.9.3
9 years, 8 months
[PATCH v2] Increasing nginx + cherrypy connection timeout
by Daniel Henrique Barboza
v1->v2:
- changed the timeout of cherrypy to 10 minutes
Daniel Henrique Barboza (1):
Increasing nginx proxy timeout
src/kimchi/server.py | 5 +++++
src/nginx.conf.in | 7 +++++++
2 files changed, 12 insertions(+)
--
1.8.3.1
9 years, 8 months
[PATCH v4 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana
Changelog from v3:
- Fix code style errors
Crístian Viana (3):
Issue #377: Validate repository URLs
typo: Fix "repositorie"
repository: Remove error message prefix
src/kimchi/mockmodel.py | 25 +++++++++++++++++---
src/kimchi/repositories.py | 11 +++++++++
src/kimchi/utils.py | 16 +++++++++++++
tests/test_model.py | 39 ++++++++++++++++++++++++++++++--
tests/test_rest.py | 39 ++++++++++++++++++++++++++++++--
ui/js/src/kimchi.repository_add_main.js | 3 +--
ui/js/src/kimchi.repository_edit_main.js | 3 +--
ui/pages/i18n.json.tmpl | 1 -
8 files changed, 125 insertions(+), 12 deletions(-)
--
1.9.3
9 years, 8 months
[PATCH] bug fix: Allow kimchi runs in multiple platforms
by Aline Manera
Do not hard coded x86_64 while running feature tests.
It prevents kimchi to run in different platforms.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
src/kimchi/featuretests.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py
index e401c23..8964098 100644
--- a/src/kimchi/featuretests.py
+++ b/src/kimchi/featuretests.py
@@ -59,7 +59,7 @@ SIMPLE_VM_XML = """
<name>A_SIMPLE_VM</name>
<memory unit='KiB'>10240</memory>
<os>
- <type arch='x86_64' machine='pc'>hvm</type>
+ <type>hvm</type>
<boot dev='hd'/>
</os>
</domain>"""
--
1.9.3
9 years, 8 months
[PATCH] bug fix: Add spice.css to Makefile and spec files
by Aline Manera
spice.css was added to source code but the build process was not updated
accordingly.
Fix it.
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
configure.ac | 1 +
contrib/kimchi.spec.fedora.in | 1 +
contrib/kimchi.spec.suse.in | 1 +
ui/css/Makefile.am | 2 +-
ui/css/spice/Makefile.am | 20 ++++++++++++++++++++
5 files changed, 24 insertions(+), 1 deletion(-)
create mode 100644 ui/css/spice/Makefile.am
diff --git a/configure.ac b/configure.ac
index a260f7d..d9b991a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,7 @@ AC_CONFIG_FILES([
ui/Makefile
ui/css/Makefile
ui/css/novnc/Makefile
+ ui/css/spice/Makefile
ui/css/fonts/Makefile
ui/css/fonts/novnc/Makefile
ui/images/Makefile
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index acc9bc0..0c6f934 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
%endif
%{_datadir}/kimchi/ui/css/novnc/base.css
+%{_datadir}/kimchi/ui/css/spice/spice.css
%{_datadir}/kimchi/ui/css/theme-default.min.css
%{_datadir}/kimchi/ui/images/*.png
%{_datadir}/kimchi/ui/images/*.ico
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 7e082dc..2d3d271 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT
%{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.*
%endif
%{_datadir}/kimchi/ui/css/novnc/base.css
+%{_datadir}/kimchi/ui/css/spice/spice.css
%{_datadir}/kimchi/ui/css/theme-default.min.css
%{_datadir}/kimchi/ui/images/*.png
%{_datadir}/kimchi/ui/images/*.ico
diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am
index 9a2a29f..a4f575d 100644
--- a/ui/css/Makefile.am
+++ b/ui/css/Makefile.am
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SUBDIRS = novnc
+SUBDIRS = novnc spice
if FONTS
SUBDIRS += fonts
diff --git a/ui/css/spice/Makefile.am b/ui/css/spice/Makefile.am
new file mode 100644
index 0000000..1271663
--- /dev/null
+++ b/ui/css/spice/Makefile.am
@@ -0,0 +1,20 @@
+#
+# Kimchi
+#
+# Copyright IBM, Corp. 2014
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+cssdir = $(datadir)/kimchi/ui/css/spice
+
+dist_css_DATA = spice.css
--
1.9.3
9 years, 8 months
[PATCH V4 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com
From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>
V3 -> V4:
test case not pass. fix it.
V2 -> V3:
do not make ticket as sub-resource of a VM
V1 -> V2:
make ticket as sub-resource of a VM
A ticket is the credential to access VM.
Only who get the ticket can access a VM.
test this patch set:
set the ticket
$ sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \
"Accept: application/json" https://localhost:8001/vms/test-vm-8/ \
-X PUT -d '{"ticket": {"passwd": "abcd"}}'
get the ticket
$ sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \
"Accept: application/json" https://localhost:8001/vms/test-vm-8/
ShaoHe Feng (5):
vm ticket in backend: update API.md
vm ticket in backend: update controller and API.json
vm ticket in backend: update model
vm ticket in backend: update mockmodel
vm ticket in backend: update test case
docs/API.md | 7 +++++
src/kimchi/API.json | 16 +++++++++++
src/kimchi/control/vms.py | 3 +-
src/kimchi/i18n.py | 2 ++
src/kimchi/mockmodel.py | 14 +++++++++
src/kimchi/model/vms.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++
tests/test_mockmodel.py | 2 +-
tests/test_model.py | 17 ++++++++++-
tests/test_rest.py | 12 ++++++++
9 files changed, 143 insertions(+), 3 deletions(-)
--
1.9.3
9 years, 8 months
[PATCHv6 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com
From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
v5>v6,
Delete wrong volume type parameter in to_volume_list to avoid breaking volume filtering
v4>v5,
Because '/tmp' used tmpfs, but kimchi used 'cache=none' when create vm, so when create image
on '/tmp' result in create vm fails, fix this error.
Also clear some files created in test. (Aline)
v3>v4,
Aggreated image scanning and name generate logic to vmtemplate.py
to avoid duplicate code.
Updated testcases accordingly.
v2>v3,
Clear unused iso link,
Adding mockmodel and tests
How to test:
create a image using:
POST /templates {'name':'mytemp', 'disks':[{'base':'a_base_img_path'}]}
create a vm using:
POST /vms {'template': '/templates/mytemp', 'pool'....}
Royce Lv (7):
Add image probe function
Change doc and api specification
Change 'cdrom' to a optional param
Fix: Prevent iso links filling in osinfo.py
Create volume based on backing store image
Update mockmodel of base img vm
Add tests for image based template
Makefile.am | 1 +
contrib/DEBIAN/control.in | 4 +-
contrib/kimchi.spec.fedora.in | 2 +
contrib/kimchi.spec.suse.in | 2 +
docs/API.md | 3 +-
docs/README.md | 9 ++-
src/kimchi/API.json | 8 ++-
src/kimchi/control/storagevolumes.py | 2 +-
src/kimchi/control/templates.py | 2 +-
src/kimchi/exception.py | 4 ++
src/kimchi/i18n.py | 8 ++-
src/kimchi/imageinfo.py | 66 ++++++++++++++++++++++
src/kimchi/mockmodel.py | 23 ++++----
src/kimchi/model/templates.py | 12 +---
src/kimchi/model/vms.py | 1 +
src/kimchi/osinfo.py | 24 +-------
src/kimchi/vmtemplate.py | 105 +++++++++++++++++++++++++----------
tests/test_mockmodel.py | 12 ++--
tests/test_model.py | 31 +++++++++++
tests/test_osinfo.py | 8 ---
tests/test_rest.py | 44 +++++++++++++--
tests/test_vmtemplate.py | 25 ++++++---
22 files changed, 288 insertions(+), 108 deletions(-)
create mode 100644 src/kimchi/imageinfo.py
--
1.8.3.2
9 years, 8 months
