December 2013 - Kimchi-devel - oVirt List Archives

Open Discussion for jQuery Widget Adoption
by Yu Xin Huo 26 Dec '13

26 Dec '13

Hi, All I reviewed current kimchi UI content and found generic UI components below that should be jquery plugins or widgets Button/Menu/Dialog/AlertBox/Accordion/Chart/DataGrid... These widgets fall into 2 categories: 1. basic form control component like Button/Menu and container widgets like Dialog/Accordion 2. functional widget like Chart/DataGrid _For the 1st category_, jquery ui contains most of them, refer to link below http://jqueryui.com/ If any widget we need that does not exist in jquery-ui, we should create a jquery widget which is common enough for reuse. _For the 2nd category_, as jquery ui does not contain any of them, we need to discuss to use jquery plugin from 3rd party. jquery has a widget registry, we can search the needed plugin/widget there. http://plugins.jquery.com/ for chart: http://plugins.jquery.com/?s=chart for datagrid: http://plugins.jquery.com/?s=datagrid As they are from 3rd party, not created by jquery team, we need to evaluate its features, quality, maintenance, license. Team, this is definitely strategic which impact long-term development, please feel free to popup your idea.

1 0

[RFC 2/2] Add the translate messages
by zhoumeina 26 Dec '13

26 Dec '13

Add the nfs server messages in po files Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- po/en_US.po | 16 ++++++++++++++-- po/kimchi.pot | 15 +++++++++++++-- po/pt_BR.po | 18 +++++++++++++++--- po/zh_CN.po | 16 ++++++++++++++-- 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index f2810db..79b095b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_US\n" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -407,6 +407,9 @@ msgstr "" "It will format your disk and you will loose any data in there, are you sure " "to continue? " +msgid "Please choose" +msgstr "Please choose" + msgid "Log out" msgstr "Log out" @@ -459,9 +462,18 @@ msgstr "" msgid "NFS server IP" msgstr "NFS server IP" +msgid "I want to input the server myself." +msgstr "I want to input the server myself." + +msgid "I want to choose a server I used before." +msgstr "I want to choose a server I used before." + msgid "NFS server IP or hostname. It should not be empty." msgstr "NFS server IP or hostname. It should not be empty." +msgid "Please choose the nfs server you want to create storage pool." +msgstr "Please choose the nfs server you want to create storage pool." + msgid "NFS Path" msgstr "NFS Path" diff --git a/po/kimchi.pot b/po/kimchi.pot index 762f4e4..78fd77b 100644 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -392,6 +391,9 @@ msgid "" "to continue? " msgstr "" +msgid "Please choose" +msgstr "" + msgid "Log out" msgstr "" @@ -439,9 +441,18 @@ msgstr "" msgid "NFS server IP" msgstr "" +msgid "I want to input the server myself." +msgstr "" + +msgid "I want to choose a server I used before." +msgstr "" + msgid "NFS server IP or hostname. It should not be empty." msgstr "" +msgid "Please choose the nfs server you want to create storage pool." +msgstr "" + msgid "NFS Path" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d59503..f790154 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: Alexandre Hirata <hirata(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: Brazil\n" "X-Poedit-Language: Portuguese\n" @@ -424,6 +424,9 @@ msgstr "" "Isso formatará seu disco e você perderá toda informação, você tem certeza " "que quer continuar?" +msgid "Please choose" +msgstr "" + msgid "Log out" msgstr "Sair" @@ -475,8 +478,17 @@ msgstr "" msgid "NFS server IP" msgstr "Endereço IP do servidor NFS" +msgid "I want to input the server myself." +msgstr "" + +msgid "I want to choose a server I used before." +msgstr "" + msgid "NFS server IP or hostname. It should not be empty." -msgstr "Endereço IP ou nome do servidor NFS. Não deve ser vazio. " +msgstr "" + +msgid "Please choose the nfs server you want to create storage pool." +msgstr "" msgid "NFS Path" msgstr "Caminho do NFS" diff --git a/po/zh_CN.po b/po/zh_CN.po index de759ef..890bfb6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -408,6 +408,9 @@ msgid "" "to continue? " msgstr "你的磁盘将会格式化，磁盘上的数据会丢失，你确定要继续吗？" +msgid "Please choose" +msgstr "请选择" + msgid "Log out" msgstr "登出" @@ -457,9 +460,18 @@ msgstr "存储池的路径.每个存储池的路径是唯一的。" msgid "NFS server IP" msgstr "NFS服务器IP" +msgid "I want to input the server myself." +msgstr "我想自己输入服务器" + +msgid "I want to choose a server I used before." +msgstr "我想选择一个我曾经用过的服务器" + msgid "NFS server IP or hostname. It should not be empty." msgstr "NFS服务器IP或者主机名，不能为空。" +msgid "Please choose the nfs server you want to create storage pool." +msgstr "请选择想要创建存储池的服务器" + msgid "NFS Path" msgstr "NFS 路径" -- 1.7.1

1 0

[RFC 0/2] Add the nfs pool server and target select UI
by zhoumeina 26 Dec '13

26 Dec '13

This patch is working adding a select box in create nfs pool, when user don't want to input the server ip or name, he can simply select "used the server I have used before" and choose a server in a select box, this is more convinent. zhoumeina (2): Add nfs server and target UI in create storage pool Add the translate messages po/en_US.po | 16 ++++++++++- po/kimchi.pot | 15 +++++++++- po/pt_BR.po | 18 ++++++++++-- po/zh_CN.po | 16 ++++++++++- ui/css/theme-default/button.css | 11 +++---- ui/css/theme-default/form.css | 6 ++++ ui/css/theme-default/storage.css | 4 +- ui/js/src/kimchi.api.js | 26 +++++++++++++++++- ui/js/src/kimchi.storagepool_add_main.js | 42 ++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 3 +- ui/pages/storagepool-add.html.tmpl | 39 +++++++++++++++++++++------ 11 files changed, 168 insertions(+), 28 deletions(-)

1 0

[PATCH V3] spec: Open 8000 and 8001 port by default
by taget＠linux.vnet.ibm.com 26 Dec '13

26 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> V3 - V2 changes: 1.Rename kimchid.xml to firewalld.xml (Mark) 2.Remove firewalld from serivce require (Mark) 3.Fix typo V2 - V1 changes: 1.Add firewalld sevice configure file kimchid.xml to help open iptables port (Mark) 2.Add Ubuntu iptables rule (Royce) Add iptable rules to open 8000 and 8001 port. 1. For fedora, ubuntu and RHEL7, add a firewalld.xml to use firewalld daemon to open port 8000 and 8001. 2. For suse and RHEL6.x, add iptables static rules to open port 8000 and 8001. Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 3 ++- contrib/DEBIAN/postinst | 2 ++ contrib/DEBIAN/postrm | 2 ++ contrib/kimchi.spec.fedora.in | 19 +++++++++++++++++++ contrib/kimchi.spec.suse.in | 10 ++++++++-- src/Makefile.am | 1 + src/firewalld.xml | 7 +++++++ 7 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/firewalld.xml diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 380584c..c0ea1f1 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -17,7 +17,8 @@ Depends: python-cherrypy3 (>= 3.2.0), python-psutil (>= 0.6.0), python-ethtool, sosreport, - python-ipaddr + python-ipaddr, + firewalld Build-Depends: Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/DEBIAN/postinst b/contrib/DEBIAN/postinst index c1fc22e..b27205c 100755 --- a/contrib/DEBIAN/postinst +++ b/contrib/DEBIAN/postinst @@ -19,3 +19,5 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA service kimchid start +/usr/bin/firewall-cmd --reload +/usr/bin/firewall-cmd --add-service kimchid diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm index ef90b49..3c70584 100755 --- a/contrib/DEBIAN/postrm +++ b/contrib/DEBIAN/postrm @@ -26,3 +26,5 @@ case "$1" in rm -rf /var/log/kimchi /var/run/kimchi.pid /usr/share/kimchi/ ;; esac + +/usr/bin/firewall-cmd --remove-service kimchid diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 14ec359..57baead 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -34,6 +34,7 @@ BuildRequires: python-unittest2 %if 0%{?with_systemd} Requires: systemd +Requires: firewalld Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -63,6 +64,7 @@ make DESTDIR=%{buildroot} install %if 0%{?with_systemd} # Install the systemd scripts install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service +install -Dm 0640 src/firewalld.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 @@ -83,16 +85,32 @@ fi %if 0%{?rhel} == 6 start kimchid +# Add defult iptable rules to open 8000 and 8001 port +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %else service kimchid start +# Add firewalld rules to open 8000 and 8001 port +/usr/bin/firewall-cmd --reload +/usr/bin/firewall-cmd --add-service kimchid %endif %preun +%if 0%{?rhel} == 6 +iptables -D INPUT -p tcp --dport 8000 -j ACCEPT +iptables -D INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save +%else +/usr/bin/firewall-cmd --remove-service kimchid +%endif + if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || : /bin/systemctl stop kimchid.service > /dev/null 2>&1 || : fi + exit 0 @@ -153,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_systemd} %{_unitdir}/kimchid.service +%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 /etc/init/kimchid.conf diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 9051284..dde9dae 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -46,10 +46,16 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid %post service kimchid start chkconfig kimchid on - +# Add iptables rules to open 8000 and 8001 port +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %preun service kimchid stop - +# Remove iptables rules to open 8000 and 8001 port +iptables -D INPUT -p tcp --dport 8000 -j ACCEPT +iptables -D INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %clean rm -rf $RPM_BUILD_ROOT diff --git a/src/Makefile.am b/src/Makefile.am index 7d29e28..7514870 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = kimchi distros.d EXTRA_DIST = kimchid.in \ kimchi.conf.in \ + firewalld.xml \ $(NULL) bin_SCRIPTS = kimchid diff --git a/src/firewalld.xml b/src/firewalld.xml new file mode 100644 index 0000000..dee4599 --- /dev/null +++ b/src/firewalld.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<service> + <short>kimchid</short> + <description>Kimchid is a daemon service for kimchi whichi is a HTML5 based management tool for KVM. It is designed to make it as easy as possible to get started with KVM and create your first guest.</description> + <port protocol="tcp" port="8000"/> + <port protocol="tcp" port="8001"/> +</service> -- 1.7.1

4 3

Resend logical pool fixes patch to new mail list
by Zhou Zheng Sheng 25 Dec '13

25 Dec '13

Hi, As we moved to new mail list, resend the patch to the new list. Sorry to disturb you!

2 5

[PATCH V3 0/5] Add spice backend support for kimchi
by apporc 24 Dec '13

24 Dec '13

v3-v2: 1. Rebase to upstream 2. Improve/simplify some code according to reviewers' advice. 3. Reimplement parameters validation using jsonschema. 4. Remove unnecessary test code in model.py. 5. Split patch to several smaller commits according to logic. v2-v1: Rebased to upstream and resend v1: Add spice backend support for kimchi apporc (5): Add spice backend support for kimchi Update mockmodel for spice support Validate graphics parameters input by users Update test case for graphics support Add graphics parameters description in API.md docs/API.md | 43 ++++++++++++++++++++++- src/kimchi/API.json | 33 ++++++++++++++++++ src/kimchi/controller.py | 14 +++++--- src/kimchi/mockmodel.py | 49 ++++++++++++++++++--------- src/kimchi/model.py | 41 +++++++++++++--------- src/kimchi/osinfo.py | 5 +-- src/kimchi/vmtemplate.py | 32 ++++++++++++++++-- tests/test_mockmodel.py | 2 ++ tests/test_model.py | 27 ++++++++++++++- tests/test_rest.py | 88 +++++++++++++++++++++++++++++++++++++++++++++--- tests/test_vmtemplate.py | 42 ++++++++++++++++++++--- 11 files changed, 325 insertions(+), 51 deletions(-) -- 1.8.1.2

3 8

[PATCH] Add support for Gentoo Linux
by Crístian Viana 24 Dec '13

24 Dec '13

Identify images of Gentoo Linux inside storage pools and local files, and add a remote template for the latest version of Gentoo. According to http://www.gentoo.org/main/en/name-logo.xml, some sentences were added to Kimchi's terms of services regarding Gentoo trademark and media ownership. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- COPYING | 5 +++++ contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + src/distros.d/gentoo.json | 8 ++++++++ src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 9 +++++++++ ui/css/theme-default/template_add.css | 4 ++++ ui/images/icon-gentoo.png | Bin 0 -> 15307 bytes 8 files changed, 29 insertions(+) create mode 100644 src/distros.d/gentoo.json create mode 100644 ui/images/icon-gentoo.png diff --git a/COPYING b/COPYING index 3e59c4d..6129b48 100644 --- a/COPYING +++ b/COPYING @@ -4,3 +4,8 @@ the Apache License version 2.0. The rest of this distribution is governed by the GNU Lesser General Public License version 2.1. See COPYING.LGPL and COPYING.ASL2. + +The name "Gentoo" and the "g" logo are trademarks of Gentoo Foundation, Inc. +The content, project, site, product or any other type of item with which the +"Gentoo" name is associated is not part of the Gentoo project and is not +directed or managed by Gentoo Foundation, Inc. diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 14ec359..577516c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -150,6 +150,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/fedora.json %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json +%{_sysconfdir}/kimchi/distros.d/gentoo.json %if 0%{?with_systemd} %{_unitdir}/kimchid.service diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 9051284..12d02ec 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -97,6 +97,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/kimchi/distros.d/fedora.json %{_sysconfdir}/kimchi/distros.d/opensuse.json %{_sysconfdir}/kimchi/distros.d/ubuntu.json +%{_sysconfdir}/kimchi/distros.d/gentoo.json %{_initrddir}/kimchid %changelog diff --git a/src/distros.d/gentoo.json b/src/distros.d/gentoo.json new file mode 100644 index 0000000..dffeadf --- /dev/null +++ b/src/distros.d/gentoo.json @@ -0,0 +1,8 @@ +[ + { + "name": "gentoo-20131010", + "os_distro": "gentoo", + "os_version": "20131010", + "path": "http://distfiles.gentoo.org/releases/amd64/autobuilds/current-iso/install-a…" + } +] diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index 219fda0..f76fd90 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -113,6 +113,7 @@ iso_dir = [ ('ubuntu', lambda m: m.group(2), '[Uu]buntu(-Server)? (\d+\.\d+)'), ('fedora', lambda m: m.group(1), 'Fedora[ -](\d+)'), ('fedora', lambda m: m.group(1), 'Fedora.*-(\d+)-'), + ('gentoo', lambda m: m.group(1), 'Gentoo Linux \w+ (\d+)'), ] diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 20a93a6..da70b30 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -140,6 +140,15 @@ osinfo = [ 'disk_bus': 'ide', 'nic_model': 'e1000', 'cdrom_bus': 'ide', 'cdrom_index': 2, }), + ('gentoo', { + 'version': lambda d,v: bool(d == 'gentoo'), + 'icon': 'images/icon-gentoo.png', + 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, + 'memory': 1024, + 'disks': [{'index': 0, 'size': 10}], + 'disk_bus': 'virtio', 'nic_model': 'virtio', + 'cdrom_bus': 'ide', 'cdrom_index': 2, + }), ('unknown', { 'version': lambda d,v: True, 'icon': 'images/icon-vm.png', diff --git a/ui/css/theme-default/template_add.css b/ui/css/theme-default/template_add.css index 38fa375..2167ff1 100644 --- a/ui/css/theme-default/template_add.css +++ b/ui/css/theme-default/template_add.css @@ -194,6 +194,10 @@ background-image: url(../../images/icon-ubuntu.png); } +.iso-icon.gentoo { + background-image: url(../../images/icon-gentoo.png); +} + .list-iso { overflow: hidden; margin: 5px; diff --git a/ui/images/icon-gentoo.png b/ui/images/icon-gentoo.png new file mode 100644 index 0000000000000000000000000000000000000000..50d928fbfa30560fe873cf3de438a8f0c10a8f96 GIT binary patch literal 15307 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 literal 0 HcmV?d00001 -- 1.8.3.1

4 8

Scrum meetings during the holidays
by Aline Manera 24 Dec '13

24 Dec '13

Hi all, Specially this week and the next one, the scrum meeting will be on Thursday instead of on Wednesday because of the Christmas and New Year holidays. So, we will have scrum meeting on Dec 26th (instead of Dec 25th) and Jan 2nd (instead of Jan 1st). Merry Christmas and Happy New Year! Aline Manera

2 1

[PATCH] PEP 8: Fix an alignment issue in src/kimchi/auth.py
by Zhou Zheng Sheng 24 Dec '13

24 Dec '13

According to PEP 8 [1], continuation lines should align wrapped elements vertically. [1] http://www.python.org/dev/peps/pep-0008/#indentation Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index f38d3d6..242fdcf 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -52,7 +52,7 @@ def authenticate(username, password, service="passwd"): resp.append((password, 0)) elif qtype == PAM.PAM_PROMPT_ERROR_MSG: cherrypy.log.error_log.error("PAM authenticate prompt error " - "message: %s" % query) + "message: %s" % query) resp.append(('', 0)) elif qtype == PAM.PAM_PROMPT_TEXT_INFO: resp.append(('', 0)) -- 1.7.11.7

4 3

[PATCH V3 0/3] check and set search permission for a directory
by shaohef＠linux.vnet.ibm.com 24 Dec '13

24 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 read the quem process pid from pid file instead of from iterating the process list. V1 -> V2 resend: qemu user tests rebase: add a method to fix search permissions ShaoHe Feng (3): move RollbackContext from tests/utils to src/kimchi/utils qemu user tests: probe the username of qemu process started by libvirt add a method to fix search permissions src/kimchi/kvmusertests.py | 66 ++++++++++++++++++ src/kimchi/utils.py | 162 ++++++++++++++++++++++++++++++++++++++++++++- tests/utils.py | 47 +------------ 3 files changed, 229 insertions(+), 46 deletions(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

2 6

[V2] spec: Open 8000 and 8001 port by default
by taget＠linux.vnet.ibm.com 24 Dec '13

24 Dec '13

From: Eli Qiao <taget(a)linux.vnet.ibm.com> V2 - V1 changes: 1.Add firewalld sevice configure file kimchid.xml to help open iptables port (Mark) 2.Add Ubuntu iptables rule (Royce) Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> --- contrib/DEBIAN/control.in | 3 ++- contrib/DEBIAN/postinst | 2 ++ contrib/DEBIAN/postrm | 2 ++ contrib/kimchi.spec.fedora.in | 19 +++++++++++++++++++ contrib/kimchi.spec.suse.in | 10 ++++++++-- contrib/kimchid.service.fedora | 1 + src/Makefile.am | 1 + src/kimchid.xml | 7 +++++++ 8 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 src/kimchid.xml diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in index 380584c..c0ea1f1 100644 --- a/contrib/DEBIAN/control.in +++ b/contrib/DEBIAN/control.in @@ -17,7 +17,8 @@ Depends: python-cherrypy3 (>= 3.2.0), python-psutil (>= 0.6.0), python-ethtool, sosreport, - python-ipaddr + python-ipaddr, + firewalld Build-Depends: Maintainer: Aline Manera <alinefm(a)br.ibm.com> Description: Kimchi web server diff --git a/contrib/DEBIAN/postinst b/contrib/DEBIAN/postinst index c1fc22e..b27205c 100755 --- a/contrib/DEBIAN/postinst +++ b/contrib/DEBIAN/postinst @@ -19,3 +19,5 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA service kimchid start +/usr/bin/firewall-cmd --reload +/usr/bin/firewall-cmd --add-service kimchid diff --git a/contrib/DEBIAN/postrm b/contrib/DEBIAN/postrm index ef90b49..3c70584 100755 --- a/contrib/DEBIAN/postrm +++ b/contrib/DEBIAN/postrm @@ -26,3 +26,5 @@ case "$1" in rm -rf /var/log/kimchi /var/run/kimchi.pid /usr/share/kimchi/ ;; esac + +/usr/bin/firewall-cmd --remove-service kimchid diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 14ec359..3a3ca4c 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -34,6 +34,7 @@ BuildRequires: python-unittest2 %if 0%{?with_systemd} Requires: systemd +Requires: firewalld Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -63,6 +64,7 @@ make DESTDIR=%{buildroot} install %if 0%{?with_systemd} # Install the systemd scripts install -Dm 0644 contrib/kimchid.service.fedora %{buildroot}%{_unitdir}/kimchid.service +install -Dm 0640 src/kimchid.xml %{buildroot}%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 @@ -83,16 +85,32 @@ fi %if 0%{?rhel} == 6 start kimchid +# Add defult iptable rules to open 8000 and 8001 port +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %else service kimchid start +# Add firewalld rull to open 8000 and 8001 port +/usr/bin/firewall-cmd --reload +/usr/bin/firewall-cmd --add-service kimchid %endif %preun +%if 0%{?rhel} == 6 +iptables -D INPUT -p tcp --dport 8000 -j ACCEPT +iptables -D INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save +%else +/usr/bin/firewall-cmd --remove-service kimchid +%endif + if [ $1 -eq 0 ] ; then # Package removal, not upgrade /bin/systemctl --no-reload disable kimchid.service > /dev/null 2>&1 || : /bin/systemctl stop kimchid.service > /dev/null 2>&1 || : fi + exit 0 @@ -153,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?with_systemd} %{_unitdir}/kimchid.service +%{_prefix}/lib/firewalld/services/kimchid.xml %endif %if 0%{?rhel} == 6 /etc/init/kimchid.conf diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 9051284..dde9dae 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -46,10 +46,16 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid %post service kimchid start chkconfig kimchid on - +# Add iptables rules to open 8000 and 8001 port +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %preun service kimchid stop - +# Remove iptables rules to open 8000 and 8001 port +iptables -D INPUT -p tcp --dport 8000 -j ACCEPT +iptables -D INPUT -p tcp --dport 8001 -j ACCEPT +service iptables save %clean rm -rf $RPM_BUILD_ROOT diff --git a/contrib/kimchid.service.fedora b/contrib/kimchid.service.fedora index 7abe49b..e39f86b 100644 --- a/contrib/kimchid.service.fedora +++ b/contrib/kimchid.service.fedora @@ -1,6 +1,7 @@ [Unit] Description=Kimchi server Requires=libvirtd.service +Requires=firewalld.service After=libvirtd.service [Service] diff --git a/src/Makefile.am b/src/Makefile.am index 7d29e28..e3938a7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -24,6 +24,7 @@ SUBDIRS = kimchi distros.d EXTRA_DIST = kimchid.in \ kimchi.conf.in \ + kimchid.xml \ $(NULL) bin_SCRIPTS = kimchid diff --git a/src/kimchid.xml b/src/kimchid.xml new file mode 100644 index 0000000..dee4599 --- /dev/null +++ b/src/kimchid.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<service> + <short>kimchid</short> + <description>Kimchid is a daemon service for kimchi whichi is a HTML5 based management tool for KVM. It is designed to make it as easy as possible to get started with KVM and create your first guest.</description> + <port protocol="tcp" port="8000"/> + <port protocol="tcp" port="8001"/> +</service> -- 1.7.1

6 7

[PATCH V2 0/2] check and set search permission for a directory
by shaohef＠linux.vnet.ibm.com 24 Dec '13

24 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 resend: qemu user tests rebase: add a method to fix search permissions ShaoHe Feng (2): qemu user tests: probe the username of qemu process started by libvirt add a method to fix search permissions src/kimchi/kvmusertests.py | 63 ++++++++++++++++++++++++ src/kimchi/utils.py | 116 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/kvmusertests.py -- 1.8.4.2

3 4

[PATCH 0/2] Add the iscsi pool UI support
by zhoumeina 23 Dec '13

23 Dec '13

Include create storage pool UI and translation files. zhoumeina (2): Add UI support of iscsi Add the ISCSI translation po files po/en_US.po | 31 +++++++++++++---- po/kimchi.pot | 30 ++++++++++++---- po/pt_BR.po | 31 +++++++++++++---- po/zh_CN.po | 31 +++++++++++++---- ui/js/src/kimchi.storagepool_add_main.js | 54 ++++++++++++++++++++++++----- ui/pages/i18n.html.tmpl | 7 ++-- ui/pages/storagepool-add.html.tmpl | 19 ++++++++++ 7 files changed, 158 insertions(+), 45 deletions(-) mode change 100644 => 100755 po/kimchi.pot

3 5

[PATCH 2/2] Add the translate messages
by zhoumeina 23 Dec '13

23 Dec '13

Add the nfs server messages in po files Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> --- po/en_US.po | 16 ++++++++++++++-- po/kimchi.pot | 15 +++++++++++++-- po/pt_BR.po | 18 +++++++++++++++--- po/zh_CN.po | 16 ++++++++++++++-- 4 files changed, 56 insertions(+), 9 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index f2810db..79b095b 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: en_US\n" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -407,6 +407,9 @@ msgstr "" "It will format your disk and you will loose any data in there, are you sure " "to continue? " +msgid "Please choose" +msgstr "Please choose" + msgid "Log out" msgstr "Log out" @@ -459,9 +462,18 @@ msgstr "" msgid "NFS server IP" msgstr "NFS server IP" +msgid "I want to input the server myself." +msgstr "I want to input the server myself." + +msgid "I want to choose a server I used before." +msgstr "I want to choose a server I used before." + msgid "NFS server IP or hostname. It should not be empty." msgstr "NFS server IP or hostname. It should not be empty." +msgid "Please choose the nfs server you want to create storage pool." +msgstr "Please choose the nfs server you want to create storage pool." + msgid "NFS Path" msgstr "NFS Path" diff --git a/po/kimchi.pot b/po/kimchi.pot index 762f4e4..78fd77b 100644 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,11 +8,10 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -392,6 +391,9 @@ msgid "" "to continue? " msgstr "" +msgid "Please choose" +msgstr "" + msgid "Log out" msgstr "" @@ -439,9 +441,18 @@ msgstr "" msgid "NFS server IP" msgstr "" +msgid "I want to input the server myself." +msgstr "" + +msgid "I want to choose a server I used before." +msgstr "" + msgid "NFS server IP or hostname. It should not be empty." msgstr "" +msgid "Please choose the nfs server you want to create storage pool." +msgstr "" + msgid "NFS Path" msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index 7d59503..f790154 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: Alexandre Hirata <hirata(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" -"Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: pt_BR\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: Brazil\n" "X-Poedit-Language: Portuguese\n" @@ -424,6 +424,9 @@ msgstr "" "Isso formatará seu disco e você perderá toda informação, você tem certeza " "que quer continuar?" +msgid "Please choose" +msgstr "" + msgid "Log out" msgstr "Sair" @@ -475,8 +478,17 @@ msgstr "" msgid "NFS server IP" msgstr "Endereço IP do servidor NFS" +msgid "I want to input the server myself." +msgstr "" + +msgid "I want to choose a server I used before." +msgstr "" + msgid "NFS server IP or hostname. It should not be empty." -msgstr "Endereço IP ou nome do servidor NFS. Não deve ser vazio. " +msgstr "" + +msgid "Please choose the nfs server you want to create storage pool." +msgstr "" msgid "NFS Path" msgstr "Caminho do NFS" diff --git a/po/zh_CN.po b/po/zh_CN.po index de759ef..890bfb6 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-12-18 16:04-0200\n" +"POT-Creation-Date: 2013-12-24 10:17+0800\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" -"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -408,6 +408,9 @@ msgid "" "to continue? " msgstr "你的磁盘将会格式化，磁盘上的数据会丢失，你确定要继续吗？" +msgid "Please choose" +msgstr "请选择" + msgid "Log out" msgstr "登出" @@ -457,9 +460,18 @@ msgstr "存储池的路径.每个存储池的路径是唯一的。" msgid "NFS server IP" msgstr "NFS服务器IP" +msgid "I want to input the server myself." +msgstr "我想自己输入服务器" + +msgid "I want to choose a server I used before." +msgstr "我想选择一个我曾经用过的服务器" + msgid "NFS server IP or hostname. It should not be empty." msgstr "NFS服务器IP或者主机名，不能为空。" +msgid "Please choose the nfs server you want to create storage pool." +msgstr "请选择想要创建存储池的服务器" + msgid "NFS Path" msgstr "NFS 路径" -- 1.7.1

1 0

Strategy to leverage jquery UI
by Yu Xin Huo 23 Dec '13

23 Dec '13

Hi, Adam and Aline For my workitem below in sprint one, as I am not sure whether the title is exactly reflecting the content, I want to clarify the scope of it. Originally, we have discussed our strategy to leverage jquery ui and we got below initiatives. 1. Make use of jquery ui widgets wherever it is possible in kimchi. 2. For any reusable common UI component in Kimchi, make it a jquery widget. Whether this workitem is just the one to execute our jquery-ui strategy above or it means some special content for some other narrow-defined scope?

2 1

[PATCH 1/2] Bug #265 fix: Avoid remove 'default' storagepool
by Rodrigo Trujillo 23 Dec '13

23 Dec '13

This patch disables the "undefine" button if the storagepool is the 'default'. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 169e32a..70ea9a3 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -113,6 +113,8 @@ kimchi.storageBindClick = function() { var deleteButton = storage_action.find('.pool-delete'); if ('active' === deleteButton.data('stat')) { deleteButton.attr('disabled', 'disabled'); + } else if ('default' === $(this).data('name')) { + deleteButton.attr('disabled', 'disabled'); } else { deleteButton.removeAttr('disabled'); } -- 1.8.1.4

2 2

[PATCH] pep8 cleanup for auth.py
by Aline Manera 23 Dec '13

23 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> This patch cleans up pep8 style issue in auth.py Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- Makefile.am | 1 + src/kimchi/auth.py | 10 ++++++---- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index e57d3b6..7770ba7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ EXTRA_DIST = \ # So it will be checked from now on. PEP8_WHITELIST = \ src/kimchi/asynctask.py \ + src/kimchi/auth.py \ src/kimchi/config.py.in \ src/kimchi/disks.py \ src/kimchi/server.py \ diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index b665f21..f38d3d6 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -20,7 +20,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import base64 import cherrypy @@ -53,9 +53,9 @@ def authenticate(username, password, service="passwd"): elif qtype == PAM.PAM_PROMPT_ERROR_MSG: cherrypy.log.error_log.error("PAM authenticate prompt error " "message: %s" % query) - resp.append(('', 0)); + resp.append(('', 0)) elif qtype == PAM.PAM_PROMPT_TEXT_INFO: - resp.append(('', 0)); + resp.append(('', 0)) else: return None return resp @@ -72,6 +72,7 @@ def authenticate(username, password, service="passwd"): return True + def from_browser(): # Enable Basic Authentication for REST tools. # Ajax request sent from jQuery in browser will have "X-Requested-With" @@ -79,6 +80,7 @@ def from_browser(): requestHeader = cherrypy.request.headers.get("X-Requested-With", None) return (requestHeader == "XMLHttpRequest") + def check_auth_session(): """ A user is considered authenticated if we have an established session open @@ -99,7 +101,7 @@ def check_auth_httpba(): """ REST API users may authenticate with HTTP Basic Auth. This is not allowed for the UI because web browsers would cache the credentials and make it - impossible for the user to log out without closing their browser completely. + impossible for the user to log out without closing their browser completely """ if from_browser() or not template.can_accept('application/json'): return False -- 1.7.10.4

2 3

[PATCH] pep8 cleanup for cachebust.py
by Aline Manera 23 Dec '13

23 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> This patch cleans up pep8 style issue in cachebust.py Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- Makefile.am | 1 + src/kimchi/cachebust.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index e57d3b6..2c390c4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -39,6 +39,7 @@ EXTRA_DIST = \ # So it will be checked from now on. PEP8_WHITELIST = \ src/kimchi/asynctask.py \ + src/kimchi/cachebust.py \ src/kimchi/config.py.in \ src/kimchi/disks.py \ src/kimchi/server.py \ diff --git a/src/kimchi/cachebust.py b/src/kimchi/cachebust.py index 4dcfb56..9a71f4f 100644 --- a/src/kimchi/cachebust.py +++ b/src/kimchi/cachebust.py @@ -18,7 +18,7 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import os @@ -28,6 +28,6 @@ from kimchi.config import get_prefix def href(url): # for error.html, url is absolute path - f = os.path.join(get_prefix(),'ui', url.lstrip("/")) + f = os.path.join(get_prefix(), 'ui', url.lstrip("/")) mtime = os.path.getmtime(f) return "%s?cacheBust=%s" % (url, mtime) -- 1.7.10.4

2 2

[PATCH V4 (rebase) ] Bug fix: Kimchi will try to create directory for 'DIR' storagepool
by Rodrigo Trujillo 23 Dec '13

23 Dec '13

When you create a 'DIR' storagepool, kimchi does not check if the path exists, returning errors when you try to activate the SP. This path makes kimchi check the path and created the directory, if it does not exist. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 8 ++++---- ui/pages/storagepool-add.html.tmpl | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index d5d0dd8..a6790b8 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1009,16 +1009,16 @@ class Model(object): return name pool = conn.storagePoolDefineXML(xml, 0) - if params['type'] == 'logical': - pool.setAutostart(1) + if params['type'] in ['logical', 'dir']: pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) - if params['type'] == 'dir': - # autostart dir storage pool created from kimchi + # autostart dir and logical storage pool created from kimchi pool.setAutostart(1) else: # disable autostart for others pool.setAutostart(0) except libvirt.libvirtError as e: + msg = "Problem creating Storage Pool: %s" + kimchi_log.error(msg, e) raise OperationFailed(e.get_error_message()) return name diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 3ab9ae5..5a2dd45 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -63,6 +63,8 @@ <div class="field"> <p class="text-help"> $_("The path of the Storage Pool. Each Storage Pool must have a unique path.")</p> + <p class="text-help"> + $_("Kimchi will try to create the directory when it does not already exist in your system.")</p> <input id="pathId" type="text" class="text" style="width: 300px"> </div> <div class="clear"></div> @@ -116,4 +118,4 @@ </div> </script> </body> -</html> \ No newline at end of file +</html> -- 1.8.1.4

2 2

[RFC] FIBRE CHANNEL StoragePool
by Rodrigo Trujillo 23 Dec '13

23 Dec '13

Hi all, continuing the discussion: So, what to do ? Create/Enable SCSI StoragePool ?, then list FC devices on it ? ############## from previous emails ################ - Fibre Channel is used as a subtype of SCSI - FC LUNs will be mapped as /dev/sdX devices - Those devices can be used as PV in a VG , or as a Logical StoragePool - LUNs can also be mapped as /dev/disk/by-id/wwn-0x600507680280865df800000000000060 Links: http://wiki.libvirt.org/page/NPIV_in_libvirt#NPIV_in_libvirt http://libvirt.org/formatstorage.html (search for 'fc_host') ##############################################

3 2

Re: [Kimchi-devel] [project-kimchi][PATCHv3 3/5] Storage server: Update API.md
by Royce Lv 23 Dec '13

23 Dec '13

On 2013年12月06日 22:30, Mark Wu wrote: > On 12/06/2013 06:12 PM, lvroyce(a)linux.vnet.ibm.com wrote: >> From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> >> Update API.md to specify storage server api. >> >> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> --- >> docs/API.md | 13 +++++++++++++ >> 1 file changed, 13 insertions(+) >> >> diff --git a/docs/API.md b/docs/API.md >> index f60d0b0..42a5cd5 100644 >> --- a/docs/API.md >> +++ b/docs/API.md >> @@ -436,6 +436,19 @@ creation. >> not tested yet >> * **POST**: *See Configuration Actions* >> >> +**Actions (POST):** >> + >> +*No actions defined* >> + >> +### Collection: Storage Servers >> + >> +**URI:** /storageservers >> + >> +**Methods:** >> + >> +* **GET**: Retrieve a summarized list of used storage servers. >> + * type: Filter server list with given type, currently support 'netfs'. > You could claim that it's a param in url. And it seems it's > inconsistent with what you define in API.json for it. type is better > for me. I will fix inconsistency between API.json and doc. For GET request its param cannot put in body, and just in url. >> + >> ### Collection: Distros >> >> **URI:** /config/distros >

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH v1 0/4] Stroage Pool: refactor and add iSCSI support
by Sheldon 23 Dec '13

23 Dec '13

wow. cool, Bing Bu. You should send out this patch easily, then we can avoid so many repetitions work. To Aline: Bing Bu not only implement iscsi and nfs pool, but also implement a test case for iscsi and nfs pool. On 12/20/2013 06:54 AM, Bing Bu Cao wrote: > On 12/16/2013 04:01 PM, Zhou Zheng Sheng wrote: >> Hi all! >> >> I'm implementing iSCSI storage pool support in kimchi. I found that the >> current design and implementation is not very flexible to add new >> type of >> pool. >> >> Firstly it uses "if ... elif" to inspect the requested pool type and >> go into >> the corresponding branch and create XML. This could be turn into a >> dispatching >> dict, with the pool type as the key, and XML generating function as >> the value. >> >> Secondly I think a few arguments for various type of pool can be >> re-used if >> they are for the same purpose. For example, both NFS pool and iSCSI >> pool need >> a remote host argument, so I renamed the "nfsserver" to "srcHost", >> and use >> "srcHost" in both NFS and iSCSI pool. I also change the relative >> front end >> code. >> >> After the refactoring, I add the iSCSI support. I've tested all the >> code on >> Fedora 19 by defining various types of storage pool with various >> argument. >> >> Zhou Zheng Sheng (4): >> storagepool: dispatch _get_pool_xml() to respective >> _get_XXX_storagepool_xml() function >> storagepool: rename and consolidate arguments of creating (back end) >> storagepool: rename and consolidate arguments of creating (front end) >> storagepool: Support Creating iSCSI storagepool in model.py >> >> docs/API.md | 21 ++-- >> src/kimchi/model.py | 158 >> +++++++++++++++++++++---------- >> ui/js/src/kimchi.storagepool_add_main.js | 9 +- >> 3 files changed, 128 insertions(+), 60 deletions(-) >> > Before I leave kimchi, I written one patch set which refactoring the > storage pool part. > But Adam did not allow me to send this patch out because he thought it > is not important at that moment. > Whatever, I hope this can give you some other ideas for storage pool > refactoring. But I am afraid you should make a big rebase because they > are really so old... > >From 6cd5a7900a4f9794c97a1cf86f32128f046bf526 Mon Sep 17 00:00:00 2001 From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> Date: Thu, 22 Aug 2013 10:00:00 +0800 Subject: [PATCH 1/4] Generate the storage object XML in storage.py Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/kimchi/Makefile.am | 1 + src/kimchi/storage.py | 168 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 169 insertions(+), 0 deletions(-) create mode 100644 src/kimchi/storage.py diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index c5cf5cc..b4e92d4 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -36,6 +36,7 @@ kimchi_PYTHON = \ screenshot.py \ server.py \ sslcert.py \ + storage.py \ template.py \ vmtemplate.py \ vnc.py \ diff --git a/src/kimchi/storage.py b/src/kimchi/storage.py new file mode 100644 index 0000000..1114756 --- /dev/null +++ b/src/kimchi/storage.py @@ -0,0 +1,168 @@ +# +# Project Burnet +# +# Copyright IBM, Corp. 2013 +# +# Authors: +# Bing Bu Cao <mars(a)linux.vnet.ibm.com> +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import copy +import os +from kimchi.exception import * + +STOR_TYPE_POOL = 'pool' +STOR_TYPE_VOLUME = 'volume' +STOR_TYPE_LIST = [STOR_TYPE_POOL, STOR_TYPE_VOLUME] + +DIR = "dir" +NETFS = "netfs" +ISCSI = "iscsi" +POOL_TYPE_LIST = [DIR, NETFS, ISCSI] + +DEFAULT_DIR_TARGET_BASE = "/var/lib/libvirt/images/" +DEFAULT_SCSI_TARGET = "/dev/disk/by-path" + + +class storage(object): + def __init__(self, storage_type, pool_type=None, **kwargs): + """ + @param storage_type: 'pool' or 'volume' + @param pool_type: 'pool' or 'volume' + @param kwargs: + """ + if storage_type not in STOR_TYPE_LIST: + raise InvalidParameter( + "Unknown Storage Type: %s" % storage_type) + if storage_type == 'volume' and pool_type not in POOL_TYPE_LIST: + raise InvalidParameter( + "Invalid Pool Type: %s" % pool_type) + + self.pool_type = pool_type + self.params = copy.copy(kwargs) + self.type = storage_type + + def dumpxml(self): + return getattr(self, "_get_%s_xml" % self.type)(self.pool_type) + + def _get_pool_xml(self, pool_type): + return getattr(self, "_get_%(type)s_pool_xml" % self.params)() + + def _get_dir_pool_xml(self): + # Required parameters + # name: + # type: + # Optional parameters + # path: + kwargs = self.params + kwargs.setdefault('path', DEFAULT_DIR_TARGET_BASE) + xml = """ + <pool type='%(type)s'> + <name>%(name)s</name> + <target> + <path>%(path)s</path> + </target> + </pool> + """ % kwargs + return xml + + def _get_netfs_pool_xml(self): + # Required parameters + # name: + # type: + # Optional parameters + # path: + kwargs = self.params + formats = ["auto", "nfs", "glusterfs"] + kwargs.setdefault('path', os.path.join(DEFAULT_DIR_TARGET_BASE, + kwargs['name'])) + kwargs.setdefault('format', "auto") + format = kwargs['format'] + if not format in formats: + raise InvalidParameter( + "Unknown Network Filesystem format: %s" % format) + xml = """ + <pool type='%(type)s'> + <name>%(name)s</name> + <source> + <host name='%(host)s'/> + <dir path='%(src_path)s'/> + <format type='%(format)s'/> + </source> + <target> + <path>%(path)s</path> + </target> + </pool> + """ % kwargs + return xml + + def _get_iscsi_pool_xml(self): + # Required parameters + # name: + # type: + # Optional parameters + # path: + kwargs = self.params + kwargs.setdefault('path', DEFAULT_SCSI_TARGET) + xml = """ + <pool type='%(type)s'> + <name>%(name)s</name> + <source> + <host name='%(host)s'/> + <device path='%(src_path)s'/> + </source> + <target> + <path>%(path)s</path> + </target> + </pool> + """ % kwargs + return xml + + def _get_volume_xml(self, pool_type): + # Required parameters + # name: + # capacity: + # path: + # Optional parameters + # allocation: + # format(not used for iscsi pool): + if pool_type == ISCSI: + raise InvalidOperation( + "Creating volume is not supported for iscsi pool") + kwargs = self.params + kwargs.setdefault('allocation', 0) + kwargs.setdefault('format', 'qcow2') + target = self._get_vol_target_xml(kwargs.get('format')) + kwargs.update({'target': target}) + xml = """ + <volume> + <name>%(name)s</name> + <allocation unit="MiB">%(allocation)s</allocation> + <capacity unit="MiB">%(capacity)s</capacity> + <source> + </source>%(target)s + </volume> + """ % kwargs + return xml + + def _get_vol_target_xml(self, format): + target_xml = "" + if self.pool_type == DIR: + target_xml = """ + <target> + <format type='%s'/> + </target>""" % format + return target_xml -- 1.7.7.6 >From 93dd8c5d78706d7444ad54cf52845812aa8d7173 Mon Sep 17 00:00:00 2001 From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> Date: Thu, 22 Aug 2013 10:02:02 +0800 Subject: [PATCH 2/4] Use new xml generator in model for StoragePool and StorageVolume operation Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 53 +++++++------------------------------------------- 1 files changed, 8 insertions(+), 45 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index f05b532..670fb7e 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -54,6 +54,7 @@ from kimchi.exception import * from kimchi.utils import kimchi_log, is_digit from kimchi.distroloader import DistroLoader +from kimchi.storage import storage ISO_POOL_NAME = u'kimchi_isos' STATS_INTERVAL = 5 @@ -581,7 +582,8 @@ class Model(object): name = params['name'] if name in (ISO_POOL_NAME, ): raise InvalidOperation("StoragePool already exists") - xml = _get_pool_xml(**params) + storpool = storage('pool', **params) + xml = storpool.dumpxml() except KeyError, key: raise MissingParameter(key) if name in self.storagepools_get_list(): @@ -689,10 +691,13 @@ class Model(object): raise def storagevolumes_create(self, pool, params): - info = self.storagepool_lookup(pool) + pool_obj = self._get_storagepool(pool) + pooltype = xmlutils.xpath_get_text(pool_obj.XMLDesc(0), + "/pool/@type")[0] try: name = params['name'] - xml = _get_volume_xml(**params) + storvol = storage('volume', pool_type=pooltype, **params) + xml = storvol.dumpxml() except KeyError, key: raise MissingParameter(key) pool = self._get_storagepool(pool) @@ -826,48 +831,6 @@ class LibvirtVMScreenshot(VMScreenshot): os.close(fd) -def _get_pool_xml(**kwargs): - # Required parameters - # name: - # type: - # path: - xml = """ - <pool type='%(type)s'> - <name>%(name)s</name> - <target> - <path>%(path)s</path> - </target> - </pool> - """ % kwargs - return xml - - -def _get_volume_xml(**kwargs): - # Required parameters - # name: - # capacity: - # - # Optional: - # allocation: - # format: - kwargs.setdefault('allocation', 0) - kwargs.setdefault('format', 'qcow2') - - xml = """ - <volume> - <name>%(name)s</name> - <allocation unit="MiB">%(allocation)s</allocation> - <capacity unit="MiB">%(capacity)s</capacity> - <source> - </source> - <target> - <format type='%(format)s'/> - </target> - </volume> - """ % kwargs - return xml - - class LibvirtConnection(object): def __init__(self, uri): self.uri = uri -- 1.7.7.6 >From 21433a52d1b135d696e187d0e29b68d5954749f5 Mon Sep 17 00:00:00 2001 From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> Date: Thu, 22 Aug 2013 10:03:39 +0800 Subject: [PATCH 3/4] Add testcases in test_model.py to test the ISCSI and NFS storagepool Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- tests/test_model.py | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 123 insertions(+), 0 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index dcabbcb..3f6a10e 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -26,6 +26,10 @@ import threading import os import time import tempfile +import shlex +import subprocess +import random +import shutil import kimchi.model import kimchi.objectstore @@ -256,6 +260,125 @@ class ModelTests(unittest.TestCase): for key in params.keys(): self.assertEquals(params[key], info[key]) + def _execute_cmd(self, cmd): + print cmd + args = shlex.split(cmd) + p = subprocess.Popen(args, close_fds=True, stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + out, err = p.communicate() + print out, err + + def _create_iscsi_target(self, path, iqn, capacity): + self._execute_cmd("dd if=/dev/zero of=%s bs=1M count=%i" % (path, capacity)) + conf = """ + <target %s> + backing-store %s + </target> + """ % (iqn, path) + conf_file = '/etc/tgt/targets.conf' + with open(conf_file, 'a') as file: + file.write(conf) + + self._execute_cmd("tgt-admin --update %s" % iqn) + + def _get_target(self, iqn): + self._execute_cmd("tgt-admin --show") + + def _clean_iscsi_target(self, iqn): + self._execute_cmd("tgt-admin --delete %s" % iqn) + #remove the lines added before + conf = open('/etc/tgt/targets.conf') + lines = conf.readlines() + conf.close() + conf = open('/etc/tgt/targets.conf', 'w') + lines = lines[:-4] + conf.writelines(lines) + conf.close() + self._execute_cmd("exportfs -rf") + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_iscsi_pool(self): + inst = kimchi.model.Model('qemu:///system', self.tmp_store) + path = '/srv/images' + name = 'iscsi-test-pool' + img = 'kimchi-%s.img' % random.getrandbits(16) + iqn = 'iqn.2013.08.org.foo.bar:%s' % random.getrandbits(16) + cap = random.getrandbits(8) + if not os.path.exists(path): + os.makedirs(path) + + self._create_iscsi_target(os.path.join(path, img), iqn, cap) + self._get_target(iqn) + + with utils.RollbackContext() as rollback: + args = {'name': name, + 'type': 'iscsi', + 'host': '127.0.0.1', + 'src_path': iqn} + inst.storagepools_create(args) + rollback.prependDefer(inst.storagepool_delete, name) + inst.storagepool_activate(name) + rollback.prependDefer(inst.storagepool_deactivate, name) + poolinfo = inst.storagepool_lookup(name) + self.assertEquals(cap, poolinfo['capacity']) + + self._clean_iscsi_target(iqn) + shutil.rmtree(path) + + def _create_nfs(self, path): + conf = '%s 127.0.0.1(rw,sync,root_squash)\n' % path + conf_file = '/etc/exports' + with open(conf_file, 'a') as file: + file.write(conf) + + self._execute_cmd("exportfs -rv") + + def _clean_nfs(self, path): + #remove the line added in _create_nfs() + conf = open('/etc/exports') + output = [] + for line in conf: + if not path in line: + output.append(line) + conf.close() + conf = open('/etc/exports', 'w') + conf.writelines(output) + conf.close() + self._execute_cmd("exportfs -rf") + + @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') + def test_nfs_pool(self): + inst = kimchi.model.Model('qemu:///system', self.tmp_store) + src_path = '/tmp/nfs-%s' % random.getrandbits(16) + src_file = 'kimchi-%s.img' % random.getrandbits(16) + name = "pool-nfs-test" + cap = 32 * 1024 * 1024 + if not os.path.exists(src_path): + os.makedirs(src_path) + fd = open(os.path.join(src_path, src_file), 'w') + fd.truncate(cap) + self._create_nfs(src_path) + + dst_path = '/mnt/nfs' + if not os.path.exists(dst_path): + os.makedirs(dst_path) + with utils.RollbackContext() as rollback: + args = {"type": "netfs", + "name": name, + "host": "127.0.0.1", + "format": "nfs", + "src_path": src_path, + "path": dst_path} + inst.storagepools_create(args) + rollback.prependDefer(inst.storagepool_delete, name) + inst.storagepool_activate(name) + rollback.prependDefer(inst.storagepool_deactivate, name) + volinfo = inst.storagevolume_lookup(name, src_file) + self.assertEquals(cap >> 20, volinfo['capacity']) + + self._clean_nfs(src_path) + shutil.rmtree(src_path) + def test_multithreaded_connection(self): def worker(): for i in xrange(100): -- 1.7.7.6 >From 74c089a3a8174e16f2b03795b5c759334f4ce2ec Mon Sep 17 00:00:00 2001 From: Bing Bu Cao <mars(a)linux.vnet.ibm.com> Date: Thu, 22 Aug 2013 10:17:00 +0800 Subject: [PATCH 4/4] Redefine the storagepool 'POST' description in API.md Signed-off-by: Bing Bu Cao <mars(a)linux.vnet.ibm.com> --- docs/API.md | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/docs/API.md b/docs/API.md index 0c187e0..73d3396 100644 --- a/docs/API.md +++ b/docs/API.md @@ -163,8 +163,12 @@ Represents a snapshot of the Virtual Machine's primary monitor. * **GET**: Retrieve a summarized list of all defined Storage Pools * **POST**: Create a new Storage Pool * name: The name of the Storage Pool - * path: The path of the defined Storage Pool + * path: The target path of the defined Storage Pool + * src_path: The source path of the defined Storage pool * type: The type of the defined Storage Pool + * host: The remote server which provide the pool source + Only and necessary for netfs and iscsi storage pool + * format: The format of the pool, only valid for netfs storage pool ### Resource: Storage Pool -- 1.7.7.6 -- Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

1 0

[PATCH] Organize python imports
by Rodrigo Trujillo 20 Dec '13

20 Dec '13

Follow this rule: 1) Import common modules import ... import ... from ... import ... from ... import ... 2) Import kimchi modules import kimchi.<mod> import kimchi.<mod> from kimchi import ... from kimchi import ... Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- plugins/sample/__init__.py | 8 ++++++-- plugins/sample/model.py | 2 +- src/kimchi/model.py | 4 ++-- src/kimchi/server.py | 2 +- src/kimchi/sslcert.py | 2 +- src/kimchi/websocket.py | 17 ++++++++++++++--- src/kimchi/websockify.py | 15 +++++++++++++-- tests/test_exception.py | 6 ++++-- tests/test_mockmodel.py | 5 +++-- tests/test_model.py | 18 ++++++++++-------- tests/test_networkxml.py | 4 +++- tests/test_osinfo.py | 3 +++ tests/test_plugin.py | 4 +++- tests/test_rest.py | 10 +++++++--- tests/test_server.py | 4 ++-- tests/test_vmtemplate.py | 2 ++ tests/utils.py | 15 +++++++++------ 17 files changed, 84 insertions(+), 37 deletions(-) diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index a20f5e6..7064904 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -22,12 +22,16 @@ import json import os + + from cherrypy import expose -from kimchi.controller import Resource, Collection + + +from kimchi.controller import Collection, Resource from model import Model -model = Model() +model = Model() class Drawings(Resource): def __init__(self): diff --git a/plugins/sample/model.py b/plugins/sample/model.py index f6da5d0..9a2f22f 100644 --- a/plugins/sample/model.py +++ b/plugins/sample/model.py @@ -20,7 +20,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from kimchi.exception import NotFoundError, InvalidOperation +from kimchi.exception import InvalidOperation, NotFoundError class Model(object): diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 73c18ac..1e4dac2 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -42,9 +42,9 @@ import time import uuid -from collections import defaultdict from cherrypy.process.plugins import BackgroundTask from cherrypy.process.plugins import SimplePlugin +from collections import defaultdict from xml.etree import ElementTree @@ -69,7 +69,7 @@ from kimchi.networkxml import to_network_xml from kimchi.objectstore import ObjectStore from kimchi.scan import Scanner from kimchi.screenshot import VMScreenshot -from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins +from kimchi.utils import get_enabled_plugins, is_digit, kimchi_log from kimchi.vmtemplate import VMTemplate diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 6ff6fa0..114a3a0 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -33,7 +33,7 @@ from kimchi import config from kimchi import model from kimchi import mockmodel from kimchi.root import Root -from kimchi.utils import import_class, get_enabled_plugins +from kimchi.utils import get_enabled_plugins, import_class LOGGING_LEVEL = {"debug": logging.DEBUG, diff --git a/src/kimchi/sslcert.py b/src/kimchi/sslcert.py index 70441f2..529699d 100644 --- a/src/kimchi/sslcert.py +++ b/src/kimchi/sslcert.py @@ -28,7 +28,7 @@ import time -from M2Crypto import X509, EVP, RSA, ASN1 +from M2Crypto import ASN1, EVP, RSA, X509 class SSLCert(object): diff --git a/src/kimchi/websocket.py b/src/kimchi/websocket.py index a98fc6d..945676d 100644 --- a/src/kimchi/websocket.py +++ b/src/kimchi/websocket.py @@ -16,9 +16,20 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' -import os, sys, time, errno, signal, socket, traceback, select -import array, struct -from base64 import b64encode, b64decode +import array +import errno +import os +import select +import signal +import socket +import struct +import sys +import time +import traceback + + +from base64 import b64decode, b64encode + # Imports that vary by python version diff --git a/src/kimchi/websockify.py b/src/kimchi/websockify.py index 1154d92..2857e7c 100755 --- a/src/kimchi/websockify.py +++ b/src/kimchi/websockify.py @@ -11,15 +11,26 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' -import signal, socket, optparse, time, os, sys, subprocess +import optparse +import os +import signal +import socket +import subprocess +import sys +import time + + from select import select -import websocket try: from urllib.parse import parse_qs, urlparse except: from cgi import parse_qs from urlparse import urlparse + +import websocket + + class WebSocketProxy(websocket.WebSocketServer): """ Proxy traffic to and from a WebSockets client to a normal TCP diff --git a/tests/test_exception.py b/tests/test_exception.py index 9b5355a..cb60995 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -20,14 +20,16 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest -import os import json +import os +import unittest + import kimchi.mockmodel import kimchi.server from utils import * + test_server = None model = None host = None diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index b819172..0830a24 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -20,16 +20,17 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import cherrypy import json import os +import unittest + import kimchi.mockmodel import kimchi.controller - from utils import * + #utils.silence_server() test_server = None model = None diff --git a/tests/test_model.py b/tests/test_model.py index fb7d6dd..07b68b1 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -21,21 +21,23 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest -import threading import os -import time -import tempfile -import psutil import platform +import psutil +import tempfile +import threading +import time +import unittest import uuid + +import iso_gen import kimchi.model import kimchi.objectstore -from kimchi.exception import * -from kimchi import netinfo import utils -import iso_gen +from kimchi import netinfo +from kimchi.exception import * + class ModelTests(unittest.TestCase): def setUp(self): diff --git a/tests/test_networkxml.py b/tests/test_networkxml.py index 4eeeaa2..3073bce 100644 --- a/tests/test_networkxml.py +++ b/tests/test_networkxml.py @@ -20,10 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import ipaddr import unittest + + import kimchi.networkxml as nxml from kimchi.xmlutils import xpath_get_text -import ipaddr class NetworkXmlTests(unittest.TestCase): diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index f92567d..1dcfdaf 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -21,8 +21,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import unittest + + from kimchi.osinfo import * + class OSInfoTests(unittest.TestCase): def test_default_lookup(self): name, entry = lookup(None, None) diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 20cc598..f12b11f 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -20,17 +20,19 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json import os import sys +import unittest from functools import partial + import kimchi.mockmodel import kimchi.server import utils from kimchi import config + test_server = None model = None host = None diff --git a/tests/test_rest.py b/tests/test_rest.py index 73b5243..61369c3 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -20,16 +20,20 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json -import time import os +import time +import unittest + + from functools import partial + import kimchi.mockmodel import kimchi.server -from utils import * from kimchi.asynctask import AsyncTask +from utils import * + test_server = None model = None diff --git a/tests/test_server.py b/tests/test_server.py index 9bb0034..734a618 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -20,12 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json import os +import unittest -import utils +import utils import kimchi.mockmodel #utils.silence_server() diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 81382c7..92c7385 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -23,9 +23,11 @@ import unittest import uuid + from kimchi.vmtemplate import * from kimchi.xmlutils import xpath_get_text + class VMTemplateTests(unittest.TestCase): def test_minimal_construct(self): fields = (('name', 'test'), ('os_distro', 'unknown'), diff --git a/tests/utils.py b/tests/utils.py index c114813..a7596e8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -21,16 +21,19 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -import httplib +import base64 import cherrypy -import threading -import time +import httplib import os -import sys import socket -from contextlib import closing +import sys +import threading +import time import unittest -import base64 + + +from contextlib import closing + import kimchi.server import kimchi.model -- 1.8.1.4

2 2

[PATCH V3] Bug fix: Kimchi will try to create directory for 'DIR' storagepool
by Rodrigo Trujillo 20 Dec '13

20 Dec '13

When you create a 'DIR' storagepool, kimchi does not check if the path exists, returning errors when you try to activate the SP. This path makes kimchi check the path and created the directory, if it does not exist. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/model.py | 8 ++++---- ui/pages/storagepool-add.html.tmpl | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 73c18ac..3a4e20e 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1006,16 +1006,16 @@ class Model(object): return name pool = conn.storagePoolDefineXML(xml, 0) - if params['type'] == 'logical': - pool.setAutostart(1) + if params['type'] in ['logical', 'dir']: pool.build(libvirt.VIR_STORAGE_POOL_BUILD_NEW) - if params['type'] == 'dir': - # autostart dir storage pool created from kimchi + # autostart dir and logical storage pool created from kimchi pool.setAutostart(1) else: # disable autostart for others pool.setAutostart(0) except libvirt.libvirtError as e: + msg = "Problem creating Storage Pool: %s" + kimchi_log.error(msg, e) raise OperationFailed(e.get_error_message()) return name diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index d7b046d..792744c 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -63,6 +63,8 @@ <div class="field"> <p class="text-help"> $_("The path of the Storage Pool. Each Storage Pool must have a unique path.")</p> + <p class="text-help"> + $_("Kimchi will try to create the directory when it does not already exist in your system.")</p> <input id="pathId" type="text" class="text" style="width: 300px"> </div> <div class="clear"></div> @@ -116,4 +118,4 @@ </div> </script> </body> -</html> \ No newline at end of file +</html> -- 1.8.1.4

2 2

[PATCH] Replace tab to 4 spaces
by Aline Manera 20 Dec '13

20 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> All py, css, js, tmpl and json files created by us must use 4 space for indentation. Imported files must keep as they are (such as those for jquery, novnc) This patch was generated by the following command: find . -name \*.py -o -name \*.json -o -name \*.css -o -name \*.js -o \ -name \*.tmpl | xargs -I @ sed -i s/\\t/" "/g @ Then imported files had changes reverted. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- plugins/sample/API.json | 90 +++--- src/kimchi/API.json | 416 +++++++++++++-------------- ui/css/theme-default/button.css | 490 ++++++++++++++++---------------- ui/css/theme-default/circle.css | 8 +- ui/css/theme-default/form.css | 26 +- ui/css/theme-default/framework.css | 10 +- ui/css/theme-default/guest-edit.css | 48 ++-- ui/css/theme-default/list.css | 244 ++++++++-------- ui/css/theme-default/login-window.css | 8 +- ui/css/theme-default/message.css | 158 +++++----- ui/css/theme-default/nav-tree.css | 104 +++---- ui/css/theme-default/navbar.css | 50 ++-- ui/css/theme-default/popover.css | 124 ++++---- ui/css/theme-default/reset.css | 28 +- ui/css/theme-default/storage.css | 40 +-- ui/css/theme-default/template-edit.css | 58 ++-- ui/css/theme-default/template.css | 78 ++--- ui/css/theme-default/template_add.css | 288 +++++++++---------- ui/css/theme-default/template_list.css | 288 +++++++++---------- ui/css/theme-default/tile-check.css | 22 +- ui/css/theme-default/toolbar.css | 42 +-- ui/css/theme-default/topbar.css | 166 +++++------ ui/css/theme-default/window.css | 140 ++++----- ui/js/dev.main.js | 8 +- ui/js/src/kimchi.template_main.js | 2 +- ui/pages/guest-add.html.tmpl | 120 ++++---- ui/pages/guest.html.tmpl | 78 ++--- ui/pages/kimchi-ui.html.tmpl | 40 +-- ui/pages/report-add.html.tmpl | 52 ++-- ui/pages/storagepool-add.html.tmpl | 144 +++++----- ui/pages/tabs/guests.html.tmpl | 42 +-- ui/pages/tabs/host.html.tmpl | 220 +++++++------- ui/pages/template-edit.html.tmpl | 182 ++++++------ 33 files changed, 1907 insertions(+), 1907 deletions(-) diff --git a/plugins/sample/API.json b/plugins/sample/API.json index 58b6162..58d0969 100644 --- a/plugins/sample/API.json +++ b/plugins/sample/API.json @@ -1,47 +1,47 @@ { - "$schema": "http://json-schema.org/draft-03/schema#", - "title": "Plugin Sample API", - "description": "Json schema for Kimchi's Sample Plugin API", - "type": "object", - "properties": { - "rectangles_create": { - "type": "object", - "properties": { - "name": { - "description": "The name of the new rectangle instance", - "type": "string", - "required": true - }, - "length": { - "$ref": "#/definitions/positiveNumber", - "required": true - }, - "width": { - "$ref": "#/definitions/positiveNumber", - "required": true - } - } - } - }, - "circles_create": { - "type": "object", - "properties": { - "name": { - "description": "The name of the new circle instance", - "type": "string", - "required": true - }, - "radius": { - "$ref": "#/definitions/positiveNumber", - "required": true - } - } - }, - "definitions": { - "positiveNumber": { - "type": "number", - "minimum": 0, - "exclusiveMinimum": true - } - } + "$schema": "http://json-schema.org/draft-03/schema#", + "title": "Plugin Sample API", + "description": "Json schema for Kimchi's Sample Plugin API", + "type": "object", + "properties": { + "rectangles_create": { + "type": "object", + "properties": { + "name": { + "description": "The name of the new rectangle instance", + "type": "string", + "required": true + }, + "length": { + "$ref": "#/definitions/positiveNumber", + "required": true + }, + "width": { + "$ref": "#/definitions/positiveNumber", + "required": true + } + } + } + }, + "circles_create": { + "type": "object", + "properties": { + "name": { + "description": "The name of the new circle instance", + "type": "string", + "required": true + }, + "radius": { + "$ref": "#/definitions/positiveNumber", + "required": true + } + } + }, + "definitions": { + "positiveNumber": { + "type": "number", + "minimum": 0, + "exclusiveMinimum": true + } + } } diff --git a/src/kimchi/API.json b/src/kimchi/API.json index e364bcd..7b90826 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -1,210 +1,210 @@ { - "$schema": "http://json-schema.org/draft-03/schema#", - "title": "Kimchi API", - "description": "Json schema for Kimchi API", - "type": "object", - "properties": { - "vms_create": { - "type": "object", - "properties": { - "name": { - "description": "The name of the new VM", - "type": "string" - }, - "template": { - "description": "The URI of a template to use when building a VM", - "type": "string", - "pattern": "^/templates/[^/]+/?$", - "required": true - }, - "storagepool": { - "description": "Assign a specefic Storage Pool to the new VM", - "type": "string", - "pattern": "^/storagepools/[^/]+/?$" - } - } - }, - "vm_update": { - "type": "object", - "properties": { - "name": { - "description": "New name of VM", - "type": "string", - "minLength": 1 - } - } - }, - "networks_create": { - "type": "object", - "properties": { - "name": { - "description": "The name of the new network", - "type": "string", - "minLength": 1, - "required": true - }, - "connection": { - "description": "Specifies how this network should be connected to the other networks", - "type": "string", - "pattern": "^isolated|nat|bridge$", - "required": true - }, - "subnet": { - "description": "Network segment in slash-separated format with ip address and prefix or netmask", - "type": "string" - }, - "interface": { - "description": "The name of a network interface on the host", - "type": "string" - } - } - }, - "templates_create": { - "type": "object", - "properties": { - "name": { - "description": "The name of the template", - "type": "string", - "pattern": "^[^ ]+( +[^ ]+)*$", - "minLength": 1 - }, - "icon": { - "description": "The template icon path", - "type": "string", - "pattern": "^images/" - }, - "os_distro": { - "description": "Distribution name of the Operating System", - "type": "string", - "minLength": 1 - }, - "os_version": { - "description": "Version of the Operating System", - "type": "string", - "minLength": 1 - }, - "cpus": { - "description": "Number of CPUs for the template", - "type": "integer", - "minimum": 1 - }, - "memory": { - "description": "Memory (MB) for the template", - "type": "integer", - "minimum": 512 - }, - "cdrom": { - "description": "Path for cdrom", - "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", - "required": true - }, - "disks": { - "description": "List of disks", - "type": "array", - "items": { - "type": "object", - "properties": { - "index": { - "description": "Index of the disk", - "type": "integer", - "minimum": 0 - }, - "size": { - "description": "Size (GB) of the disk", - "type": "number", - "minimum": 1 - } - } - }, - "minItems": 1, - "uniqueItems": true - }, - "storagepool": { - "description": "Location of the storage pool", - "type": "string", - "pattern": "^/storagepools/[^/]+/?$" - }, - "folder": { - "description": "Folder", - "type": "array", - "items": { "type": "string" } - } - }, - "additionalProperties": false - }, - "template_update": { - "type": "object", - "properties": { - "name": { - "description": "The name of the template", - "type": "string", - "pattern": "^[^ ]+( +[^ ]+)*$", - "minLength": 1 - }, - "icon": { - "description": "The template icon path", - "type": "string", - "pattern": "^images/" - }, - "os_distro": { - "description": "Distribution name of the Operating System", - "type": "string", - "minLength": 1 - }, - "os_version": { - "description": "Version of the Operating System", - "type": "string", - "minLength": 1 - }, - "cpus": { - "description": "Number of CPUs for the template", - "type": "integer", - "minimum": 1 - }, - "memory": { - "description": "Memory (MB) for the template", - "type": "integer", - "minimum": 512 - }, - "cdrom": { - "description": "Path for cdrom", - "type": "string", - "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$" - }, - "disks": { - "description": "List of disks", - "type": "array", - "items": { - "type": "object", - "properties": { - "index": { - "description": "Index of the disk", - "type": "integer", - "minimum": 0 - }, - "size": { - "description": "Size (GB) of the disk", - "type": "number", - "minimum": 1 - } - } - }, - "minItems": 1, - "uniqueItems": true - }, - "storagepool": { - "description": "Location of the storage pool", - "type": "string", - "pattern": "^/storagepools/[^/]+/?$" - }, - "folder": { - "description": "Folder", - "type": "array", - "items": { "type": "string" } - } - }, - "additionalProperties": false - } - } + "$schema": "http://json-schema.org/draft-03/schema#", + "title": "Kimchi API", + "description": "Json schema for Kimchi API", + "type": "object", + "properties": { + "vms_create": { + "type": "object", + "properties": { + "name": { + "description": "The name of the new VM", + "type": "string" + }, + "template": { + "description": "The URI of a template to use when building a VM", + "type": "string", + "pattern": "^/templates/[^/]+/?$", + "required": true + }, + "storagepool": { + "description": "Assign a specefic Storage Pool to the new VM", + "type": "string", + "pattern": "^/storagepools/[^/]+/?$" + } + } + }, + "vm_update": { + "type": "object", + "properties": { + "name": { + "description": "New name of VM", + "type": "string", + "minLength": 1 + } + } + }, + "networks_create": { + "type": "object", + "properties": { + "name": { + "description": "The name of the new network", + "type": "string", + "minLength": 1, + "required": true + }, + "connection": { + "description": "Specifies how this network should be connected to the other networks", + "type": "string", + "pattern": "^isolated|nat|bridge$", + "required": true + }, + "subnet": { + "description": "Network segment in slash-separated format with ip address and prefix or netmask", + "type": "string" + }, + "interface": { + "description": "The name of a network interface on the host", + "type": "string" + } + } + }, + "templates_create": { + "type": "object", + "properties": { + "name": { + "description": "The name of the template", + "type": "string", + "pattern": "^[^ ]+( +[^ ]+)*$", + "minLength": 1 + }, + "icon": { + "description": "The template icon path", + "type": "string", + "pattern": "^images/" + }, + "os_distro": { + "description": "Distribution name of the Operating System", + "type": "string", + "minLength": 1 + }, + "os_version": { + "description": "Version of the Operating System", + "type": "string", + "minLength": 1 + }, + "cpus": { + "description": "Number of CPUs for the template", + "type": "integer", + "minimum": 1 + }, + "memory": { + "description": "Memory (MB) for the template", + "type": "integer", + "minimum": 512 + }, + "cdrom": { + "description": "Path for cdrom", + "type": "string", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$", + "required": true + }, + "disks": { + "description": "List of disks", + "type": "array", + "items": { + "type": "object", + "properties": { + "index": { + "description": "Index of the disk", + "type": "integer", + "minimum": 0 + }, + "size": { + "description": "Size (GB) of the disk", + "type": "number", + "minimum": 1 + } + } + }, + "minItems": 1, + "uniqueItems": true + }, + "storagepool": { + "description": "Location of the storage pool", + "type": "string", + "pattern": "^/storagepools/[^/]+/?$" + }, + "folder": { + "description": "Folder", + "type": "array", + "items": { "type": "string" } + } + }, + "additionalProperties": false + }, + "template_update": { + "type": "object", + "properties": { + "name": { + "description": "The name of the template", + "type": "string", + "pattern": "^[^ ]+( +[^ ]+)*$", + "minLength": 1 + }, + "icon": { + "description": "The template icon path", + "type": "string", + "pattern": "^images/" + }, + "os_distro": { + "description": "Distribution name of the Operating System", + "type": "string", + "minLength": 1 + }, + "os_version": { + "description": "Version of the Operating System", + "type": "string", + "minLength": 1 + }, + "cpus": { + "description": "Number of CPUs for the template", + "type": "integer", + "minimum": 1 + }, + "memory": { + "description": "Memory (MB) for the template", + "type": "integer", + "minimum": 512 + }, + "cdrom": { + "description": "Path for cdrom", + "type": "string", + "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*([.]iso)$" + }, + "disks": { + "description": "List of disks", + "type": "array", + "items": { + "type": "object", + "properties": { + "index": { + "description": "Index of the disk", + "type": "integer", + "minimum": 0 + }, + "size": { + "description": "Size (GB) of the disk", + "type": "number", + "minimum": 1 + } + } + }, + "minItems": 1, + "uniqueItems": true + }, + "storagepool": { + "description": "Location of the storage pool", + "type": "string", + "pattern": "^/storagepools/[^/]+/?$" + }, + "folder": { + "description": "Folder", + "type": "array", + "items": { "type": "string" } + } + }, + "additionalProperties": false + } + } } diff --git a/ui/css/theme-default/button.css b/ui/css/theme-default/button.css index e9354cf..c7ed3f6 100644 --- a/ui/css/theme-default/button.css +++ b/ui/css/theme-default/button.css @@ -21,57 +21,57 @@ /* Generated at http://colorzilla.com/gradient-editor/ */ .btn { - display: inline-block; - height: 42px; - margin: 3px; - vertical-align: top; - border: 1px solid #aaa; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -moz-box-sizing: content-box; - box-sizing: content-box; - box-shadow: -2px -2px 2px #eaeaea, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - line-height: 42px; - color: #333; - font-size: 13px; - text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #fff; - text-align: center; - text-overflow: ellipsis; - white-space: nowrap; - cursor: pointer; + display: inline-block; + height: 42px; + margin: 3px; + vertical-align: top; + border: 1px solid #aaa; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -moz-box-sizing: content-box; + box-sizing: content-box; + box-shadow: -2px -2px 2px #eaeaea, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + line-height: 42px; + color: #333; + font-size: 13px; + text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #fff; + text-align: center; + text-overflow: ellipsis; + white-space: nowrap; + cursor: pointer; } .btn:not([disabled]):hover { - box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; - background: #d5d5d5; - background: -moz-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d5d5d5), color-stop(100%, #eeeeee)); - background: -webkit-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); - background: -o-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); - background: -ms-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); - background: linear-gradient(to bottom, #d5d5d5 0%, #eeeeee 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d5d5d5', endColorstr='#eeeeee', GradientType=0); + box-shadow: -2px -2px 2px #dadada, 2px 2px 2px #fff, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; + background: #d5d5d5; + background: -moz-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #d5d5d5), color-stop(100%, #eeeeee)); + background: -webkit-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); + background: -o-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); + background: -ms-linear-gradient(top, #d5d5d5 0%, #eeeeee 100%); + background: linear-gradient(to bottom, #d5d5d5 0%, #eeeeee 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#d5d5d5', endColorstr='#eeeeee', GradientType=0); } .btn:not([disabled]):active { - box-shadow: -2px -2px 2px #eaeaea, 2px 2px 2px #fff, 3px 3px 3px rgba(0, 0, 0, .25) inset, -3px -3px 3px white inset; - background: #ffffff; - background: -moz-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #ffffff)); - background: -webkit-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -o-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -ms-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: linear-gradient(to bottom, #e5e5e5 0%, #ffffff 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e5e5e5', endColorstr='#ffffff', GradientType=0); + box-shadow: -2px -2px 2px #eaeaea, 2px 2px 2px #fff, 3px 3px 3px rgba(0, 0, 0, .25) inset, -3px -3px 3px white inset; + background: #ffffff; + background: -moz-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -o-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -ms-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: linear-gradient(to bottom, #e5e5e5 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e5e5e5', endColorstr='#ffffff', GradientType=0); } .btn.loading { @@ -84,321 +84,321 @@ } .btn .text { - padding: 0 10px; + padding: 0 10px; } .btn .icon { - display: block; - width: 42px; - height: 42px; + display: block; + width: 42px; + height: 42px; } .btn.dropdown { - text-align: left; - position: relative; - padding-right: 25px; + text-align: left; + position: relative; + padding-right: 25px; } .btn.dropdown .arrow { - position: absolute; - width: 15px; - height: 42px; - line-height: 42px; - top: 0; - right: 10px; - background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; - right: 10px; + position: absolute; + width: 15px; + height: 42px; + line-height: 42px; + top: 0; + right: 10px; + background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; + right: 10px; } /* Generated at http://colorzilla.com/gradient-editor/ */ .btn-tool { - display: inline-block; - height: 38px; - margin: 6px 3px; - vertical-align: top; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -moz-box-sizing: content-box; - box-sizing: content-box; - box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px #ddd inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; - background: #f3f3f3; - background: -moz-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f3f3f3), color-stop(50%, #dddddd), - color-stop(51%, #d8d8d8), color-stop(100%, #cccccc)); - background: -webkit-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); - background: -o-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); - background: -ms-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); - background: linear-gradient(to bottom, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3f3f3', endColorstr='#cccccc', GradientType=0); - overflow: hidden; - cursor: pointer; + display: inline-block; + height: 38px; + margin: 6px 3px; + vertical-align: top; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -moz-box-sizing: content-box; + box-sizing: content-box; + box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px #ddd inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; + background: #f3f3f3; + background: -moz-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #f3f3f3), color-stop(50%, #dddddd), + color-stop(51%, #d8d8d8), color-stop(100%, #cccccc)); + background: -webkit-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); + background: -o-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); + background: -ms-linear-gradient(top, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); + background: linear-gradient(to bottom, #f3f3f3 0%, #dddddd 50%, #d8d8d8 51%, #cccccc 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#f3f3f3', endColorstr='#cccccc', GradientType=0); + overflow: hidden; + cursor: pointer; } .btn-tool:hover { - box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px rgba(0, 0, 0, .25) inset, -3px -3px 3px rgba(0, 0, 0, .25) - inset; + box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 2px 2px 2px rgba(0, 0, 0, .25) inset, -3px -3px 3px rgba(0, 0, 0, .25) + inset; } /* Generated at http://colorzilla.com/gradient-editor/ */ .btn-tool.left,.btn-tool.right { - -webkit-border-radius: 0; - -moz-border-radius: 0; - border-radius: 0; - background: #dddddd; - background: -moz-linear-gradient(top, #dddddd 0%, #999999 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #999999)); - background: -webkit-linear-gradient(top, #dddddd 0%, #999999 100%); - background: -o-linear-gradient(top, #dddddd 0%, #999999 100%); - background: -ms-linear-gradient(top, #dddddd 0%, #999999 100%); - background: linear-gradient(to bottom, #dddddd 0%, #999999 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#999999', GradientType=0); + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + background: #dddddd; + background: -moz-linear-gradient(top, #dddddd 0%, #999999 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #dddddd), color-stop(100%, #999999)); + background: -webkit-linear-gradient(top, #dddddd 0%, #999999 100%); + background: -o-linear-gradient(top, #dddddd 0%, #999999 100%); + background: -ms-linear-gradient(top, #dddddd 0%, #999999 100%); + background: linear-gradient(to bottom, #dddddd 0%, #999999 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#dddddd', endColorstr='#999999', GradientType=0); } .btn-tool:active,.btn-tool.active { - box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 3px 3px 3px rgba(0, 0, 0, .35) inset; + box-shadow: -1px -1px 1px #777, 1px 1px 1px #eee, 3px 3px 3px rgba(0, 0, 0, .35) inset; } .btn-tool.left { - -webkit-border-top-left-radius: 5px; - -moz-border-top-left-radius: 5px; - border-top-left-radius: 5px; - -webkit-border-bottom-left-radius: 5px; - -moz-border-bottom-left-radius: 5px; - border-bottom-left-radius: 5px; + -webkit-border-top-left-radius: 5px; + -moz-border-top-left-radius: 5px; + border-top-left-radius: 5px; + -webkit-border-bottom-left-radius: 5px; + -moz-border-bottom-left-radius: 5px; + border-bottom-left-radius: 5px; } .btn-tool.right { - -webkit-border-top-right-radius: 5px; - -moz-border-top-right-radius: 5px; - border-top-right-radius: 5px; - -webkit-border-bottom-right-radius: 5px; - -moz-border-bottom-right-radius: 5px; - border-bottom-right-radius: 5px; + -webkit-border-top-right-radius: 5px; + -moz-border-top-right-radius: 5px; + border-top-right-radius: 5px; + -webkit-border-bottom-right-radius: 5px; + -moz-border-bottom-right-radius: 5px; + border-bottom-right-radius: 5px; } .btn-tool .icon { - display: block; - width: 48px; - height: 38px; + display: block; + width: 48px; + height: 38px; } .icon.reset { - background: url(../images/theme-default/icon-reset.png) center center no-repeat; + background: url(../images/theme-default/icon-reset.png) center center no-repeat; } .icon.power-up { - background: url(../images/theme-default/icon-power-up.png) center center no-repeat; + background: url(../images/theme-default/icon-power-up.png) center center no-repeat; } .icon.power-down { - background: url(../images/theme-default/icon-power-down.png) center center no-repeat; + background: url(../images/theme-default/icon-power-down.png) center center no-repeat; } .icon.search { - background: url(../images/theme-default/icon-search.png) no-repeat center center; + background: url(../images/theme-default/icon-search.png) no-repeat center center; } .icon.sort { - background: url(../images/theme-default/icon-sort.png) no-repeat center center; + background: url(../images/theme-default/icon-sort.png) no-repeat center center; } .icon.design { - background: url(../images/theme-default/icon-design.png) no-repeat center center; + background: url(../images/theme-default/icon-design.png) no-repeat center center; } .icon.list { - background: url(../images/theme-default/icon-list.png) no-repeat center center; + background: url(../images/theme-default/icon-list.png) no-repeat center center; } .icon.detail { - background: url(../images/theme-default/icon-detail.png) no-repeat center center; + background: url(../images/theme-default/icon-detail.png) no-repeat center center; } .icon.add { - line-height: 32px; - text-align: center; - text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #eee; - font-size: 38px; - font-weight: bold; - color: #7cae0a; + line-height: 32px; + text-align: center; + text-shadow: -1px -1px 1px #aaa, 1px 1px 1px #eee; + font-size: 38px; + font-weight: bold; + color: #7cae0a; } .icon.tree { - width: 42px; - background: url(../images/theme-default/icon-tree.png) no-repeat center center; + width: 42px; + background: url(../images/theme-default/icon-tree.png) no-repeat center center; } /* Generated at http://colorzilla.com/gradient-editor/ */ .btn-tool.tree { - width: 42px; - margin: 5px 10px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - box-shadow: -1px -1px 1px #03385c, 1px 1px 1px #09F, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; + width: 42px; + margin: 5px 10px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + box-shadow: -1px -1px 1px #03385c, 1px 1px 1px #09F, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, .25) inset; } .btn-select { - display: inline-block; - position: relative; - height: 38px; - padding-right: 20px; - margin: 5px; - vertical-align: top; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - background: #eee; - box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 2px 2px 2px rgba(0, 0, 0, .15) inset; - font-size: 13px; - line-height: 38px; - text-align: left; - cursor: pointer; + display: inline-block; + position: relative; + height: 38px; + padding-right: 20px; + margin: 5px; + vertical-align: top; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background: #eee; + box-shadow: -1px -1px 1px #666, 1px 1px 1px #fff, 2px 2px 2px rgba(0, 0, 0, .15) inset; + font-size: 13px; + line-height: 38px; + text-align: left; + cursor: pointer; } .btn-select .text { - padding: 0 10px; + padding: 0 10px; } .btn-select .arrow { - position: absolute; - width: 15px; - height: 38px; - line-height: 38px; - top: 0; - right: 5px; - background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; + position: absolute; + width: 15px; + height: 38px; + line-height: 38px; + top: 0; + right: 5px; + background: url(../images/theme-default/arrow-down-black.png) no-repeat center center; } /* Generated at http://colorzilla.com/gradient-editor/ */ .button-big { - display: block; - margin-bottom: 10px; - border: 1px solid #ccc; - box-shadow: -1px -1px 1px #ccc, 1px 1px 1px #eee; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; - -webkit-border-radius: 05px; - -moz-border-radius: 05px; - border-radius: 05px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - text-align: center; - font-size: 13px; - line-height: 38px; - width: 100%; + display: block; + margin-bottom: 10px; + border: 1px solid #ccc; + box-shadow: -1px -1px 1px #ccc, 1px 1px 1px #eee; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + -webkit-border-radius: 05px; + -moz-border-radius: 05px; + border-radius: 05px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + text-align: center; + font-size: 13px; + line-height: 38px; + width: 100%; } .button-big:not([disabled]):hover { - box-shadow: -1px -1px 1px #bbb, 1px 1px 1px #ddd; - background: #eeeeee; - background: -moz-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #d5d5d5)); - background: -webkit-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); - background: -o-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); - background: -ms-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); - background: linear-gradient(to bottom, #eeeeee 0%, #d5d5d5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#d5d5d5', GradientType=0); + box-shadow: -1px -1px 1px #bbb, 1px 1px 1px #ddd; + background: #eeeeee; + background: -moz-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #eeeeee), color-stop(100%, #d5d5d5)); + background: -webkit-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); + background: -o-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); + background: -ms-linear-gradient(top, #eeeeee 0%, #d5d5d5 100%); + background: linear-gradient(to bottom, #eeeeee 0%, #d5d5d5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#eeeeee', endColorstr='#d5d5d5', GradientType=0); } .button-big:not([disabled]):active { - box-shadow: -1px -1px 1px #eee, 1px 1px 1px #ccc, 2px 2px 2px #ccc inset, -2px -2px 2px #aaa inset; - background: -moz-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #ffffff)); - background: -webkit-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -o-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: -ms-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); - background: linear-gradient(to bottom, #e5e5e5 0%, #ffffff 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e5e5e5', endColorstr='#ffffff', GradientType=0); + box-shadow: -1px -1px 1px #eee, 1px 1px 1px #ccc, 2px 2px 2px #ccc inset, -2px -2px 2px #aaa inset; + background: -moz-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #ffffff)); + background: -webkit-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -o-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: -ms-linear-gradient(top, #e5e5e5 0%, #ffffff 100%); + background: linear-gradient(to bottom, #e5e5e5 0%, #ffffff 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#e5e5e5', endColorstr='#ffffff', GradientType=0); } /* Generated at http://colorzilla.com/gradient-editor/ */ .button-big.red:not([disabled]) { - text-shadow: -1px -1px 1px #9e0505, 1px 1px 1px #fc5d4c; - border: 1px solid #b10f14; - background: #ff3019; - background: -moz-linear-gradient(top, #ff3019 0%, #cf0404 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ff3019), color-stop(100%, #cf0404)); - background: -webkit-linear-gradient(top, #ff3019 0%, #cf0404 100%); - background: -o-linear-gradient(top, #ff3019 0%, #cf0404 100%); - background: -ms-linear-gradient(top, #ff3019 0%, #cf0404 100%); - background: linear-gradient(to bottom, #ff3019 0%, #cf0404 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff3019', endColorstr='#cf0404', GradientType=0); - color: #fff; + text-shadow: -1px -1px 1px #9e0505, 1px 1px 1px #fc5d4c; + border: 1px solid #b10f14; + background: #ff3019; + background: -moz-linear-gradient(top, #ff3019 0%, #cf0404 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ff3019), color-stop(100%, #cf0404)); + background: -webkit-linear-gradient(top, #ff3019 0%, #cf0404 100%); + background: -o-linear-gradient(top, #ff3019 0%, #cf0404 100%); + background: -ms-linear-gradient(top, #ff3019 0%, #cf0404 100%); + background: linear-gradient(to bottom, #ff3019 0%, #cf0404 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff3019', endColorstr='#cf0404', GradientType=0); + color: #fff; } .button-big.red:not([disabled]):hover { - background: #ef2009; - background: -moz-linear-gradient(top, #ef2009 0%, #bf0404 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ef2009), color-stop(100%, #bf0404)); - background: -webkit-linear-gradient(top, #ef2009 0%, #bf0404 100%); - background: -o-linear-gradient(top, #ef2009 0%, #bf0404 100%); - background: -ms-linear-gradient(top, #ef2009 0%, #bf0404 100%); - background: linear-gradient(to bottom, #ef2009 0%, #bf0404 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef2009', endColorstr='#bf0404', GradientType=0); - color: #fff; + background: #ef2009; + background: -moz-linear-gradient(top, #ef2009 0%, #bf0404 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ef2009), color-stop(100%, #bf0404)); + background: -webkit-linear-gradient(top, #ef2009 0%, #bf0404 100%); + background: -o-linear-gradient(top, #ef2009 0%, #bf0404 100%); + background: -ms-linear-gradient(top, #ef2009 0%, #bf0404 100%); + background: linear-gradient(to bottom, #ef2009 0%, #bf0404 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ef2009', endColorstr='#bf0404', GradientType=0); + color: #fff; } .button-big.red:not([disabled]):active { - background: -moz-linear-gradient(top, #cf0404 0%, #ff3019 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cf0404), color-stop(100%, #ff3019)); - background: -webkit-linear-gradient(top, #cf0404 0%, #ff3019 100%); - background: -o-linear-gradient(top, #cf0404 0%, #ff3019 100%); - background: -ms-linear-gradient(top, #cf0404 0%, #ff3019 100%); - background: linear-gradient(to bottom, #cf0404 0%, #ff3019 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0404', endColorstr='#ff3019', GradientType=0); + background: -moz-linear-gradient(top, #cf0404 0%, #ff3019 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #cf0404), color-stop(100%, #ff3019)); + background: -webkit-linear-gradient(top, #cf0404 0%, #ff3019 100%); + background: -o-linear-gradient(top, #cf0404 0%, #ff3019 100%); + background: -ms-linear-gradient(top, #cf0404 0%, #ff3019 100%); + background: linear-gradient(to bottom, #cf0404 0%, #ff3019 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#cf0404', endColorstr='#ff3019', GradientType=0); } .button-big.disable { - display: none; + display: none; } .btn-normal { - display: inline-block; - height: 38px; - margin: 9px 3px; - vertical-align: top; - background: #06F; - line-height: 38px; - padding: 0 20px; - color: #EEE; + display: inline-block; + height: 38px; + margin: 9px 3px; + vertical-align: top; + background: #06F; + line-height: 38px; + padding: 0 20px; + color: #EEE; border-radius: 8px; font-size: 13px; } .btn-normal:not([disabled]):hover { - background: #04D; + background: #04D; } .btn-normal:not([disabled]):active { - box-shadow: -1px -1px 1px #eee, 1px 1px 1px #ccc, 2px 2px 2px #ccc inset, -2px -2px 2px #aaa inset; - background: -moz-linear-gradient(top, #04d 0%, #06f 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #04d), color-stop(100%, #06f)); - background: -webkit-linear-gradient(top, #04d 0%, #ff3019 100%); - background: -o-linear-gradient(top, #04d 0%, #06f 100%); - background: -ms-linear-gradient(top, #04d 0%, #06f 100%); - background: linear-gradient(to bottom, #04d 0%, #06f 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#04d', endColorstr='#06f', GradientType=0); + box-shadow: -1px -1px 1px #eee, 1px 1px 1px #ccc, 2px 2px 2px #ccc inset, -2px -2px 2px #aaa inset; + background: -moz-linear-gradient(top, #04d 0%, #06f 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #04d), color-stop(100%, #06f)); + background: -webkit-linear-gradient(top, #04d 0%, #ff3019 100%); + background: -o-linear-gradient(top, #04d 0%, #06f 100%); + background: -ms-linear-gradient(top, #04d 0%, #06f 100%); + background: linear-gradient(to bottom, #04d 0%, #06f 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#04d', endColorstr='#06f', GradientType=0); } .btn-normal[disabled] { - background-color: silver; + background-color: silver; } .btn-group { - float: right; - padding: 0 10px; + float: right; + padding: 0 10px; } .btn-small { diff --git a/ui/css/theme-default/circle.css b/ui/css/theme-default/circle.css index 0cd7909..8008219 100644 --- a/ui/css/theme-default/circle.css +++ b/ui/css/theme-default/circle.css @@ -19,8 +19,8 @@ * limitations under the License. */ .circle { - position: relative; - margin: 30px 10px 10px 10px; - width: 70px; - height: 70px; + position: relative; + margin: 30px 10px 10px 10px; + width: 70px; + height: 70px; } diff --git a/ui/css/theme-default/form.css b/ui/css/theme-default/form.css index 9b7fd68..c24b277 100644 --- a/ui/css/theme-default/form.css +++ b/ui/css/theme-default/form.css @@ -19,29 +19,29 @@ * limitations under the License. */ .form-section { - padding: 10px; + padding: 10px; } .form-section>h2 { - font-size: 14px; - padding: 5px; + font-size: 14px; + padding: 5px; } .form-section .field { - padding: 5px 5px 5px 20px; - overflow: hidden; + padding: 5px 5px 5px 20px; + overflow: hidden; } .form-section .field .text-help { - font-size: 12px; - color: #333; - margin: 0 0 5px 5px; + font-size: 12px; + color: #333; + margin: 0 0 5px 5px; } .form-section .field input.text { - border: 1px solid #ccc; - font-size: 16px; - height: 30px; - line-height: 30px; - padding: 0 5px; + border: 1px solid #ccc; + font-size: 16px; + height: 30px; + line-height: 30px; + padding: 0 5px; } diff --git a/ui/css/theme-default/framework.css b/ui/css/theme-default/framework.css index 200dd6b..d904527 100644 --- a/ui/css/theme-default/framework.css +++ b/ui/css/theme-default/framework.css @@ -19,18 +19,18 @@ * limitations under the License. */ body { - background: url(../images/theme-default/bg.png); + background: url(../images/theme-default/bg.png); } .tmpl-html { - display: none; + display: none; } .container { - margin: 0 auto; - width: 1024px; + margin: 0 auto; + width: 1024px; } .hidden { - display: none; + display: none; } diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 5f97a12..79fca83 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -19,49 +19,49 @@ * limitations under the License. */ #guest-edit-window { - font-size: 13px; - height: 380px; - width: 420px; + font-size: 13px; + height: 380px; + width: 420px; } .guest-edit-fieldset { - float: left; - padding: 1em; + float: left; + padding: 1em; } .guest-edit-wrapper-label, .guest-edit-wrapper-controls { - display: inline-block; + display: inline-block; } .guest-edit-wrapper-controls input[type="text"][disabled] { - color: #bbb; - background-color: #fafafa; - cursor: not-allowed; + color: #bbb; + background-color: #fafafa; + cursor: not-allowed; } .guest-edit-wrapper-label { - width: 10em; + width: 10em; } .guest-edit-wrapper-controls { - width: 18em; + width: 18em; } .guest-edit-wrapper-controls input[type="text"] { - height: 38px; - line-height: 38px; - background: #fff; - -webkit-border-radius: 5px; - border-radius: 5px; - box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - padding-left: 10px; - width: 100%; + height: 38px; + line-height: 38px; + background: #fff; + -webkit-border-radius: 5px; + border-radius: 5px; + box-shadow: 2px 2px 2px #eee inset; + border-top: 1px solid #bbb; + border-left: 1px solid #bbb; + padding-left: 10px; + width: 100%; } .guest-edit-wrapper-controls input[type="text"][disabled] { - color: #bbb; - background-color: #fafafa; - cursor: not-allowed; + color: #bbb; + background-color: #fafafa; + cursor: not-allowed; } diff --git a/ui/css/theme-default/list.css b/ui/css/theme-default/list.css index e34772f..468361f 100644 --- a/ui/css/theme-default/list.css +++ b/ui/css/theme-default/list.css @@ -19,232 +19,232 @@ * limitations under the License. */ .list-vm { - margin: 10px; + margin: 10px; } /* Generated at http://colorzilla.com/gradient-editor/ */ .list-vm>li { - margin-bottom: 10px; - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - border: 1px solid #ccc; - color: #333; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; + margin-bottom: 10px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + border: 1px solid #ccc; + color: #333; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; } .list-vm li>* { - height: 130px; - display: table-cell; - vertical-align: top; - position: relative; - border-left: 1px solid #ccc; - border-right: 1px solid #fff; + height: 130px; + display: table-cell; + vertical-align: top; + position: relative; + border-left: 1px solid #ccc; + border-right: 1px solid #fff; } .list-vm li>*:FIRST-CHILD { - border-left: none; + border-left: none; } .list-vm li>*:LAST-CHILD { - border-right: none; + border-right: none; } .list-vm li>.guest-tile{ - text-align: center; - vertical-align: middle; + text-align: center; + vertical-align: middle; } .list-vm .handle { - display: block; - width: 50px; - height: 130px; - box-sizing: border-box; - box-shadow: inset 4px 4px 4px #0289e2, inset -4px -4px 4px #04385d; - background: #0b6bad url(../images/theme-default/arrow_out.png) center center no-repeat; - border-top-right: 1px solid #CCC; - -webkit-border-top-right-radius: 8px; - -moz-border-top-right-radius: 8px; - border-top-right-radius: 8px; - border-bottom-right: 1px solid #CCC; - -webkit-border-bottom-right-radius: 8px; - -moz-border-bottom-right-radius: 8px; - border-bottom-right-radius: 8px; + display: block; + width: 50px; + height: 130px; + box-sizing: border-box; + box-shadow: inset 4px 4px 4px #0289e2, inset -4px -4px 4px #04385d; + background: #0b6bad url(../images/theme-default/arrow_out.png) center center no-repeat; + border-top-right: 1px solid #CCC; + -webkit-border-top-right-radius: 8px; + -moz-border-top-right-radius: 8px; + border-top-right-radius: 8px; + border-bottom-right: 1px solid #CCC; + -webkit-border-bottom-right-radius: 8px; + -moz-border-bottom-right-radius: 8px; + border-bottom-right-radius: 8px; } .list-vm .subtitle { - color: #666; - font-size: 13px; - text-align: center; - line-height: 10px; - font-weight: bold; + color: #666; + font-size: 13px; + text-align: center; + line-height: 10px; + font-weight: bold; } .list-vm .tile .imgload { - display: none; - max-height: 110px; - max-width: 170px; - height: auto; - width: auto; + display: none; + max-height: 110px; + max-width: 170px; + height: auto; + width: auto; } .list-vm .tile .imgactive { - max-height: 110px; - max-width: 170px; - height: auto; - width: auto; + max-height: 110px; + max-width: 170px; + height: auto; + width: auto; } .guest-type { - width: 257px; + width: 257px; } .guest-cpu { - width: 91px; + width: 91px; } .guest-network { - width: 91px; + width: 91px; } .guest-storage { - width: 91px; + width: 91px; } .guest-tile { - width: 190px; + width: 190px; } .guest-users { - width: 93px; + width: 93px; } .guest-actions { - width: 125px; - min-width: 125px; + width: 125px; + min-width: 125px; } .guest-handle { - width: 50px; + width: 50px; } .guest-general { - padding: 10px; - border-bottom: 1px solid #ccc; - width: 237px; + padding: 10px; + border-bottom: 1px solid #ccc; + width: 237px; } .guest-ip { - padding: 0 10px; - border-top: 1px solid #fff; + padding: 0 10px; + border-top: 1px solid #fff; } .guest-general .title { - color: #666; - font-size: 16px; - font-weight: normal; - height: 25px; - line-height: 25px; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; - max-width: 237px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + color: #666; + font-size: 16px; + font-weight: normal; + height: 25px; + line-height: 25px; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + max-width: 237px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .guest-general .text { - font-weight: bold; - color: #999; - font-size: 11px; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + font-weight: bold; + color: #999; + font-size: 11px; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; } .guest-users .top { - border-bottom: 1px solid #ccc; - padding: 3px 10px; + border-bottom: 1px solid #ccc; + padding: 3px 10px; } .guest-users .bottom { - border-top: 1px solid #fff; - padding: 3px 10px; + border-top: 1px solid #fff; + padding: 3px 10px; } .guest-users .users { - height: 45px; - line-height: 45px; - background: url(../images/theme-default/icon-user.png) left center no-repeat; - padding-left: 50px; - font-size: 36px; - font-weight: bold; + height: 45px; + line-height: 45px; + background: url(../images/theme-default/icon-user.png) left center no-repeat; + padding-left: 50px; + font-size: 36px; + font-weight: bold; } .guest-users .snapshots { - height: 40px; - line-height: 40px; - background: url(../images/theme-default/icon-camera.png) left center no-repeat; - padding-left: 50px; - font-size: 36px; - font-weight: bold; + height: 40px; + line-height: 40px; + background: url(../images/theme-default/icon-camera.png) left center no-repeat; + padding-left: 50px; + font-size: 36px; + font-weight: bold; } .guest-users .mini-text { - font-size: 11px; - font-weight: normal; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + font-size: 11px; + font-weight: normal; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; } .guest-actions .top { - padding: 7px 10px; + padding: 7px 10px; } .guest-actions .bottom { - padding: 0 10px; + padding: 0 10px; } .list-vm .tile { - max-width: 170px; - max-height: 110px; - width: auto; - height: auto; - margin: 10px; + max-width: 170px; + max-height: 110px; + width: auto; + height: auto; + margin: 10px; } .list-vm .tile:not(.shutoff) img { - box-shadow: -1px -1px 2px rgb(0, 0, 0, .25), 3px 3px 3px #fff; + box-shadow: -1px -1px 2px rgb(0, 0, 0, .25), 3px 3px 3px #fff; } .list-vm .shutoff { - box-shadow: none !important; + box-shadow: none !important; } .list-vm .shutoff img { - opacity: 0.4; + opacity: 0.4; } .list-title { - color: #666; - font-weight: bold; - font-size: 12px; - overflow: hidden; - margin: 10px; + color: #666; + font-weight: bold; + font-size: 12px; + overflow: hidden; + margin: 10px; } .list-title li { - display: table-cell; - padding: 0 1px; + display: table-cell; + padding: 0 1px; } .list-no-result { - font-size: 16px; - height: 48px; - line-height: 48px; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; - padding-left: 10px; + font-size: 16px; + height: 48px; + line-height: 48px; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + padding-left: 10px; } diff --git a/ui/css/theme-default/login-window.css b/ui/css/theme-default/login-window.css index c2f445d..a5a2729 100644 --- a/ui/css/theme-default/login-window.css +++ b/ui/css/theme-default/login-window.css @@ -26,10 +26,10 @@ #login-window>header>.title-text { front: #000000; font-size: 18px; - height: 48px; - line-height: 48px; - font-weight: bold; - text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; + height: 48px; + line-height: 48px; + font-weight: bold; + text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; } #login-window footer #form-language { diff --git a/ui/css/theme-default/message.css b/ui/css/theme-default/message.css index d2c7192..46d1a55 100644 --- a/ui/css/theme-default/message.css +++ b/ui/css/theme-default/message.css @@ -19,120 +19,120 @@ * limitations under the License. */ #messageField { - position: fixed; - margin: auto; - left: 0; - right: 0; - top: 0; - width: 1024px; - max-width: 100%; - z-index: 200; + position: fixed; + margin: auto; + left: 0; + right: 0; + top: 0; + width: 1024px; + max-width: 100%; + z-index: 200; } .message { - background-color: #FFF68F; - position: relative; - margin-bottom: 5px; + background-color: #FFF68F; + position: relative; + margin-bottom: 5px; } .message.warn { - background-color: #FFF68F; + background-color: #FFF68F; } .message.error { - background-color: #FFAEB9; + background-color: #FFAEB9; } .message.success { - background-color: #90EE90; + background-color: #90EE90; } .message .close { - position: absolute; - width: 30px; - height: 30px; - top: 0; - right: 0; - color: #545454; - font-size: 12px; - text-align: center; - line-height: 30px; - cursor: pointer; + position: absolute; + width: 30px; + height: 30px; + top: 0; + right: 0; + color: #545454; + font-size: 12px; + text-align: center; + line-height: 30px; + cursor: pointer; } .message .content { - padding: 0 30px 0 10px; - line-height: 30px; + padding: 0 30px 0 10px; + line-height: 30px; } .confirmbox { - position: absolute; - margin: auto; - left: 0; - right: 0; - top: 0; - bottom: 0; - box-shadow: 2px 2px 6px #000; - border: 2px solid #0f71b4; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - background-color: black; - box-sizing: border-box; - max-width: 100%; - max-height: 100%; - width: 350px; - height: 170px; - z-index: 9999; + position: absolute; + margin: auto; + left: 0; + right: 0; + top: 0; + bottom: 0; + box-shadow: 2px 2px 6px #000; + border: 2px solid #0f71b4; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + background-color: black; + box-sizing: border-box; + max-width: 100%; + max-height: 100%; + width: 350px; + height: 170px; + z-index: 9999; } .confirmbox>footer { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 48px; - box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.15); + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 48px; + box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.15); } .confirmbox .title { - display: inline-block; - padding: 10px 10px 0 10px; - line-height: 20px; - color: white; + display: inline-block; + padding: 10px 10px 0 10px; + line-height: 20px; + color: white; } .confirmbox .content { - padding: 20px 10px 0px 100px; - line-height: 16px; - font-size: 13px; - color: white; - background: url(../images/theme-default/alert.png) no-repeat 20px center; - height: 41px; - vertical-align: middle; + padding: 20px 10px 0px 100px; + line-height: 16px; + font-size: 13px; + color: white; + background: url(../images/theme-default/alert.png) no-repeat 20px center; + height: 41px; + vertical-align: middle; } .confirmbox .close { - position: absolute; - width: 13px; - height: 13px; - top: 7px; - right: 7px; - -webkit-border-radius: 13px; - -moz-border-radius: 13px; - border-radius: 13px; - border: 2px solid #ccc; - color: #ccc; - font-size: 13px; - text-align: center; - line-height: 13px; - font-weight: bold; - background: #4a4a4a;; - cursor: pointer; + position: absolute; + width: 13px; + height: 13px; + top: 7px; + right: 7px; + -webkit-border-radius: 13px; + -moz-border-radius: 13px; + border-radius: 13px; + border: 2px solid #ccc; + color: #ccc; + font-size: 13px; + text-align: center; + line-height: 13px; + font-weight: bold; + background: #4a4a4a;; + cursor: pointer; } .confirmbox>header>.close:hover { - border: 2px solid #444; - color: #444; + border: 2px solid #444; + color: #444; } \ No newline at end of file diff --git a/ui/css/theme-default/nav-tree.css b/ui/css/theme-default/nav-tree.css index 7a9356a..52c0506 100644 --- a/ui/css/theme-default/nav-tree.css +++ b/ui/css/theme-default/nav-tree.css @@ -19,98 +19,98 @@ * limitations under the License. */ .nav-tree { - overflow: hidden; - border-bottom: 1px solid #000; + overflow: hidden; + border-bottom: 1px solid #000; } .nav-tree .item { - overflow: hidden; - border-top: 1px solid #000; - border-bottom: 1px solid #444; - background: #222; - *vertical-align: top; + overflow: hidden; + border-top: 1px solid #000; + border-bottom: 1px solid #444; + background: #222; + *vertical-align: top; } .nav-tree .item .arrow { - float: left; - width: 42px; - height: 48px; - border-right: 1px solid #000; - background: transparent url("../images/theme-default/folder-arrow-right.png") center center no-repeat; + float: left; + width: 42px; + height: 48px; + border-right: 1px solid #000; + background: transparent url("../images/theme-default/folder-arrow-right.png") center center no-repeat; } .nav-tree .item.on .arrow { - background: transparent url("../images/theme-default/folder-arrow-down.png") center center no-repeat; + background: transparent url("../images/theme-default/folder-arrow-down.png") center center no-repeat; } .nav-tree .item.nochild .arrow { - background: none; + background: none; } .nav-tree .item .arrow+.item-link { - border-left: 1px solid #444; + border-left: 1px solid #444; } .nav-tree .sub { - display: none; + display: none; } .nav-tree .item.on+.sub { - display: block; + display: block; } .nav-tree .sub .item { - padding-left: 44px; + padding-left: 44px; } .nav-tree .item-link { - display: block; - position: relative; - height: 48px; - overflow: hidden; - line-height: 48px; - color: #eee; + display: block; + position: relative; + height: 48px; + overflow: hidden; + line-height: 48px; + color: #eee; } .nav-tree .item-link .count { - position: absolute; - height: 24px; - right: 10px; - margin: 12px 0; - padding: 0 9px; - background: #900; - box-shadow: 1px 1px 1px #333, -1px -1px 1px #000, 1px 1px 1px #600 inset; - -webkit-border-radius: 24px; - -moz-border-radius: 24px; - border-radius: 24px; - text-align: center; - color: #fff; - font-size: 10px; - line-height: 24px; + position: absolute; + height: 24px; + right: 10px; + margin: 12px 0; + padding: 0 9px; + background: #900; + box-shadow: 1px 1px 1px #333, -1px -1px 1px #000, 1px 1px 1px #600 inset; + -webkit-border-radius: 24px; + -moz-border-radius: 24px; + border-radius: 24px; + text-align: center; + color: #fff; + font-size: 10px; + line-height: 24px; } .nav-tree .item-link .title { - position: absolute; - left: 42px; - right: 42px; - overflow: hidden; - color: #fff; - font-size: 13px; - text-overflow: ellipsis; - white-space: nowrap; - overflow: hidden; + position: absolute; + left: 42px; + right: 42px; + overflow: hidden; + color: #fff; + font-size: 13px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; } .nav-tree .item-link .thumb { - position: absolute; - width: 42px; - height: 48px; + position: absolute; + width: 42px; + height: 48px; } .nav-tree .item-link .thumb.host { - background: url("../images/theme-default/thumb-host.png") center center no-repeat; + background: url("../images/theme-default/thumb-host.png") center center no-repeat; } .nav-tree .item-link .thumb.guest { - background: url("../images/theme-default/thumb-guest.png") center center no-repeat; + background: url("../images/theme-default/thumb-guest.png") center center no-repeat; } diff --git a/ui/css/theme-default/navbar.css b/ui/css/theme-default/navbar.css index efd08aa..7ecfcf1 100644 --- a/ui/css/theme-default/navbar.css +++ b/ui/css/theme-default/navbar.css @@ -19,44 +19,44 @@ * limitations under the License. */ .navbar { - height: 48px; - border-top: 1px solid #2c85c3; - border-bottom: 1px solid #04385d; - background: #0769ac url(../images/theme-default/nav-bg.png) repeat-x; + height: 48px; + border-top: 1px solid #2c85c3; + border-bottom: 1px solid #04385d; + background: #0769ac url(../images/theme-default/nav-bg.png) repeat-x; } .nav-menu { - height: 48px; - position: relative; + height: 48px; + position: relative; } .nav-menu li { - float: left; - height: 48px; + float: left; + height: 48px; } .nav-menu .item { - display: block; - width: 100px; - height: 48px; - line-height: 48px; - padding: 0 10px; - text-align: center; - font-size: 13px; - color: #eee; - outline: none; + display: block; + width: 100px; + height: 48px; + line-height: 48px; + padding: 0 10px; + text-align: center; + font-size: 13px; + color: #eee; + outline: none; } .nav-menu .item.current:focus { - outline: white dotted thin; + outline: white dotted thin; } .menu-arrow { - position: absolute; - width: 0; - bottom: -1px; - left: 50px; - border: 10px solid transparent; - border-top: none; - border-bottom-color: #e4e4e4; + position: absolute; + width: 0; + bottom: -1px; + left: 50px; + border: 10px solid transparent; + border-top: none; + border-bottom-color: #e4e4e4; } diff --git a/ui/css/theme-default/popover.css b/ui/css/theme-default/popover.css index 65ec3a2..95eb183 100644 --- a/ui/css/theme-default/popover.css +++ b/ui/css/theme-default/popover.css @@ -19,102 +19,102 @@ * limitations under the License. */ .popover { - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - background: #eee; - border: 2px solid #096aad; - box-shadow: 1px 1px 2px rgba(0, 0, 0, .5); - z-index: 9999; - position: absolute; - top: 125%; - left: 0; - display: none; - cursor: default; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + background: #eee; + border: 2px solid #096aad; + box-shadow: 1px 1px 2px rgba(0, 0, 0, .5); + z-index: 9999; + position: absolute; + top: 125%; + left: 0; + display: none; + cursor: default; } .popover:BEFORE { - content: ""; - display: block; - border: 12px solid transparent; - border-bottom-color: #096aad; - position: absolute; - top: -24px; - left: 20px; + content: ""; + display: block; + border: 12px solid transparent; + border-bottom-color: #096aad; + position: absolute; + top: -24px; + left: 20px; } .popover:AFTER { - content: ""; - display: block; - border: 10px solid transparent; - border-bottom-color: #eee; - position: absolute; - top: -20px; - left: 22px; + content: ""; + display: block; + border: 10px solid transparent; + border-bottom-color: #eee; + position: absolute; + top: -20px; + left: 22px; } .popover.right-side { - left: auto; - right: 0; + left: auto; + right: 0; } .popover.right-side:BEFORE { - left: auto; - right: 20px; + left: auto; + right: 20px; } .popover.right-side:AFTER { - left: auto; - right: 22px; + left: auto; + right: 22px; } .open>.popover { - display: block; + display: block; } /* Generated at http://colorzilla.com/gradient-editor/ */ .actionsheet { - background: rgb(238, 238, 238); - background: -moz-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(238, 238, 238, 1)), - color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)), - color-stop(100%, rgba(165, 165, 165, 1))); - background: -webkit-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) - 96%, rgba(165, 165, 165, 1) 100%); - background: -o-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); - background: -ms-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, - rgba(165, 165, 165, 1) 100%); - background: linear-gradient(to bottom, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) - 96%, rgba(165, 165, 165, 1) 100%); - padding: 10px 10px 0 10px; + background: rgb(238, 238, 238); + background: -moz-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, + rgba(165, 165, 165, 1) 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, rgba(238, 238, 238, 1)), + color-stop(10px, rgba(204, 204, 204, 1)), color-stop(96%, rgba(204, 204, 204, 1)), + color-stop(100%, rgba(165, 165, 165, 1))); + background: -webkit-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) + 96%, rgba(165, 165, 165, 1) 100%); + background: -o-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, + rgba(165, 165, 165, 1) 100%); + background: -ms-linear-gradient(top, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) 96%, + rgba(165, 165, 165, 1) 100%); + background: linear-gradient(to bottom, rgba(238, 238, 238, 1) 0%, rgba(204, 204, 204, 1) 10px, rgba(204, 204, 204, 1) + 96%, rgba(165, 165, 165, 1) 100%); + padding: 10px 10px 0 10px; } .select-list { - max-height: 195px; - overflow: auto; + max-height: 195px; + overflow: auto; } .select-list>li { - height: 48px; - padding: 0 20px 0 40px; - border-bottom: 1px solid #ccc; - box-shadow: 0px 1px 1px #fff; - text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; - color: #222; - font-size: 12px; - line-height: 48px; + height: 48px; + padding: 0 20px 0 40px; + border-bottom: 1px solid #ccc; + box-shadow: 0px 1px 1px #fff; + text-shadow: -1px -1px 1px #ddd, 1px 1px 1px #fff; + color: #222; + font-size: 12px; + line-height: 48px; } .select-list>li:LAST-CHILD { - border-bottom: none; - box-shadow: inherit; + border-bottom: none; + box-shadow: inherit; } .select-list>li:hover { - background: #f8f8f8 url(../images/theme-default/check-grey.png) no-repeat 10px center; + background: #f8f8f8 url(../images/theme-default/check-grey.png) no-repeat 10px center; } .select-list>li.active { - background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat 10px center; + background: #f8f8f8 url(../images/theme-default/check-green.png) no-repeat 10px center; } diff --git a/ui/css/theme-default/reset.css b/ui/css/theme-default/reset.css index b956119..05b4836 100644 --- a/ui/css/theme-default/reset.css +++ b/ui/css/theme-default/reset.css @@ -19,39 +19,39 @@ * limitations under the License. */ html,body,div,span,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,b,u,i,center,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td,article,aside,canvas,details,embed,figure,figcaption,footer,header,hgroup,menu,nav,output,ruby,section,summary,time,mark,audio,video,button - { - margin: 0; - padding: 0; - border: 0; - font-family: Tahoma, Geneva, sans-serif; + { + margin: 0; + padding: 0; + border: 0; + font-family: Tahoma, Geneva, sans-serif; } article,aside,details,figcaption,figure,footer,header,hgroup,menu,nav,section - { - display: block; + { + display: block; } ol,ul { - list-style: none; + list-style: none; } table { - border-collapse: collapse; - border-spacing: 0; + border-collapse: collapse; + border-spacing: 0; } img { - border: none; + border: none; } a { - text-decoration: none; + text-decoration: none; } a:active,a:hover { - outline: none; + outline: none; } a label { - cursor: pointer; + cursor: pointer; } diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 6ac7d10..d81dc75 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -526,33 +526,33 @@ } .storage-type-wrapper-controls { - width: 300px; - display: inline-block; - vertical-align: top; - padding: 5px 5px 5px 20px; + width: 300px; + display: inline-block; + vertical-align: top; + padding: 5px 5px 5px 20px; } .storage-type-wrapper-controls input[type="text"] { - height: 38px; - line-height: 38px; - background: #fff; - -webkit-border-radius: 5px; - border-radius: 5px; - box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - padding: 0 10px; - margin-top: 5px; - width: 250px; + height: 38px; + line-height: 38px; + background: #fff; + -webkit-border-radius: 5px; + border-radius: 5px; + box-shadow: 2px 2px 2px #eee inset; + border-top: 1px solid #bbb; + border-left: 1px solid #bbb; + padding: 0 10px; + margin-top: 5px; + width: 250px; } .storage-type-wrapper-controls > .dropdown { - margin: 5px 0 0 1px; - width: 250px; + margin: 5px 0 0 1px; + width: 250px; } .storage-type-wrapper-controls input[type="text"][disabled] { - color: #bbb; - background-color: #fafafa; - cursor: not-allowed; + color: #bbb; + background-color: #fafafa; + cursor: not-allowed; } \ No newline at end of file diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 1a049c0..e61b2fb 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -19,57 +19,57 @@ * limitations under the License. */ #template-edit-window { - font-size: 13px; - height: 400px; - width: 1000px; + font-size: 13px; + height: 400px; + width: 1000px; } .template-edit-fieldset { - float: left; - padding: 1em; + float: left; + padding: 1em; } .template-edit-wrapper-label, .template-edit-wrapper-controls { - display: inline-block; - vertical-align: top; + display: inline-block; + vertical-align: top; } .template-edit-wrapper-label { - width: 150px; - height: 38px; - line-height: 38px; - margin-top: 5px; + width: 150px; + height: 38px; + line-height: 38px; + margin-top: 5px; } .template-edit-wrapper-controls { - width: 300px; + width: 300px; } .template-edit-wrapper-controls input[type="text"] { - height: 38px; - line-height: 38px; - background: #fff; - -webkit-border-radius: 5px; - border-radius: 5px; - box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - padding: 0 10px; - margin-top: 5px; - width: 250px; + height: 38px; + line-height: 38px; + background: #fff; + -webkit-border-radius: 5px; + border-radius: 5px; + box-shadow: 2px 2px 2px #eee inset; + border-top: 1px solid #bbb; + border-left: 1px solid #bbb; + padding: 0 10px; + margin-top: 5px; + width: 250px; } .template-edit-wrapper-controls > .dropdown { - margin: 5px 0 0 1px; - width: 250px; + margin: 5px 0 0 1px; + width: 250px; } .template-edit-wrapper-controls input[type="text"][disabled] { - color: #bbb; - background-color: #fafafa; - cursor: not-allowed; + color: #bbb; + background-color: #fafafa; + cursor: not-allowed; } .hidden-area { - display: none; + display: none; } diff --git a/ui/css/theme-default/template.css b/ui/css/theme-default/template.css index 8629183..0962926 100644 --- a/ui/css/theme-default/template.css +++ b/ui/css/theme-default/template.css @@ -19,70 +19,70 @@ * limitations under the License. */ .tile-template>li>label:hover .summary { - opacity: 0.1; + opacity: 0.1; } .tile-template>li>label:hover .list-info { - top: 0; + top: 0; } .tile-template .summary { - -webkit-transition: opacity 0.25s; - -moz-transition: opacity 0.25s; - transition: opacity 0.25s; + -webkit-transition: opacity 0.25s; + -moz-transition: opacity 0.25s; + transition: opacity 0.25s; } .tile-template .list-info { - -webkit-transition: top 0.25s; - -moz-transition: top 0.25s; - transition: top 0.25s; - position: absolute; - top: 100%; - width: 100%; + -webkit-transition: top 0.25s; + -moz-transition: top 0.25s; + transition: top 0.25s; + position: absolute; + top: 100%; + width: 100%; } .tile-template .list-info>li { - border-bottom: 1px dotted #ccc; - padding: 5px; - font-size: 12px; - line-height: 20px; - overflow: hidden; - width: 96%; + border-bottom: 1px dotted #ccc; + padding: 5px; + font-size: 12px; + line-height: 20px; + overflow: hidden; + width: 96%; } .tile-template .list-info>li>label { - display: inline-block; - color: #111; - width: auto; - text-align: left; - cursor: pointer; + display: inline-block; + color: #111; + width: auto; + text-align: left; + cursor: pointer; } .tile-template .list-info>li>span { - float: right; - color: #444693; - width: auto; - text-align: right; + float: right; + color: #444693; + width: auto; + text-align: right; } .os-icon { - text-align: center; + text-align: center; } .os-icon .title { - display: block; - font-size: 14px; - margin-bottom: 5px; - overflow: hidden; - width: 260px; - word-break: break-all; - word-wrap: break-word; - height: 50px; - line-height: 25px; + display: block; + font-size: 14px; + margin-bottom: 5px; + overflow: hidden; + width: 260px; + word-break: break-all; + word-wrap: break-word; + height: 50px; + line-height: 25px; } .os-icon img { - margin-top: 7px; - width: 64px; - height: 64px; + margin-top: 7px; + width: 64px; + height: 64px; } diff --git a/ui/css/theme-default/template_add.css b/ui/css/theme-default/template_add.css index 38fa375..511dd98 100644 --- a/ui/css/theme-default/template_add.css +++ b/ui/css/theme-default/template_add.css @@ -19,264 +19,264 @@ * limitations under the License. */ .page-list { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - overflow: hidden; + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + overflow: hidden; } .page { - position: absolute; - left: 100%; - width: 100%; - height: 100%; - overflow: auto; + position: absolute; + left: 100%; + width: 100%; + height: 100%; + overflow: auto; } .page>header { - position: relative; - overflow: hidden; + position: relative; + overflow: hidden; } .back { - float: left; display : block; - width: 50px; - height: 52px; - background: url(../../images/theme-default/icon-back.png) center center no-repeat; - cursor: pointer; - display: block; + float: left; display : block; + width: 50px; + height: 52px; + background: url(../../images/theme-default/icon-back.png) center center no-repeat; + cursor: pointer; + display: block; } .step-title { - color: #333; - font-size: 18px; - font-weight: normal; - padding: 15px 10px; + color: #333; + font-size: 18px; + font-weight: normal; + padding: 15px 10px; } .step-choose>li>a { - display: block; - margin: 0 10px 10px; - padding: 20px 10px 20px 65px; - border: 2px solid #ccc; - background: url(../../images/theme-default/icon-local.png) 15px center no-repeat; - cursor: pointer; + display: block; + margin: 0 10px 10px; + padding: 20px 10px 20px 65px; + border: 2px solid #ccc; + background: url(../../images/theme-default/icon-local.png) 15px center no-repeat; + cursor: pointer; } .step-choose>li>a.local { - background-image: url(../../images/theme-default/icon-local.png); + background-image: url(../../images/theme-default/icon-local.png); } .step-choose>li>a.remote { - background-image: url(../../images/theme-default/icon-remote.png); + background-image: url(../../images/theme-default/icon-remote.png); } .step-choose>li>a:HOVER { - border: 2px solid #06C; + border: 2px solid #06C; } .step-subtitle { - font-size: 16px; - height: 48px; - line-height: 48px; - color: #06C; - margin: 0 10px; - font-weight: bold; - text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; + font-size: 16px; + height: 48px; + line-height: 48px; + color: #06C; + margin: 0 10px; + font-weight: bold; + text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; } .custom-iso-field { - position: relative; - padding: 0 10px 10px; + position: relative; + padding: 0 10px 10px; } .custom-iso-field>.input-wrapper { - margin-right: 110px; + margin-right: 110px; } .custom-iso-field>.input-wrapper>input.text { - padding: 10px; - color: #333; - font-size: 13px; - background: #fff; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - box-shadow: 2px 2px 2px #eee inset; - border-top: 1px solid #bbb; - border-left: 1px solid #bbb; - width: 100%; + padding: 10px; + color: #333; + font-size: 13px; + background: #fff; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + box-shadow: 2px 2px 2px #eee inset; + border-top: 1px solid #bbb; + border-left: 1px solid #bbb; + width: 100%; } .custom-iso-field>button { - position: absolute; - top: -6px; - right: 8px; + position: absolute; + top: -6px; + right: 8px; } .iso-field .button-field { - padding: 0 20px; - text-align: right; + padding: 0 20px; + text-align: right; } .check-all { - display: inline-block; - position: relative; - height: 38px; - line-height: 38px; - margin: 5px; - font-size: 13px; + display: inline-block; + position: relative; + height: 38px; + line-height: 38px; + margin: 5px; + font-size: 13px; } .check-all input { - margin: 0 5px 0 0; + margin: 0 5px 0 0; } .box { - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - border: 1px solid #ccc; - color: #333; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + border: 1px solid #ccc; + color: #333; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; } .box:HOVER { - border: 1px solid #aaa; - -webkit-box-shadow: #bbb 0px 0px 5px; - box-shadow: #bbb 0px 0px 5px; + border: 1px solid #aaa; + -webkit-box-shadow: #bbb 0px 0px 5px; + box-shadow: #bbb 0px 0px 5px; } .box-iso { - padding: 10px; - margin: 5px; - overflow: hidden; + padding: 10px; + margin: 5px; + overflow: hidden; } .iso-icon { - float: left; - width: 58px; - height: 58px; - margin: 0 5px 0 0; - border: 1px solid #CCCCCC; - border-radius: 8px; - background: url(../../images/icon-vm.png) center center no-repeat; - background-size: 58px; + float: left; + width: 58px; + height: 58px; + margin: 0 5px 0 0; + border: 1px solid #CCCCCC; + border-radius: 8px; + background: url(../../images/icon-vm.png) center center no-repeat; + background-size: 58px; } .iso-icon.centos { - background-image: url(../../images/icon-centos.png); + background-image: url(../../images/icon-centos.png); } .iso-icon.debian { - background-image: url(../../images/icon-debian.png); + background-image: url(../../images/icon-debian.png); } .iso-icon.fedora { - background-image: url(../../images/icon-fedora.png); + background-image: url(../../images/icon-fedora.png); } .iso-icon.opensuse { - background-image: url(../../images/icon-opensuse.png); + background-image: url(../../images/icon-opensuse.png); } .iso-icon.ubuntu { - background-image: url(../../images/icon-ubuntu.png); + background-image: url(../../images/icon-ubuntu.png); } .list-iso { - overflow: hidden; - margin: 5px; + overflow: hidden; + margin: 5px; } .list-iso li { - float: left; - width: 320px; + float: left; + width: 320px; } .list-iso>li>label { - display: block; - cursor: pointer; + display: block; + cursor: pointer; } .list-iso>li>label>input[type="checkbox"] { - display: none; + display: none; } .list-iso>li>label>input[type="checkbox"]:CHECKED+.box-iso { - border: 1px solid rgb(11, 107, 173); - -webkit-box-shadow: rgb(11, 107, 173) 0px 0px 4px; - box-shadow: rgb(11, 107, 173) 0px 0px 4px; + border: 1px solid rgb(11, 107, 173); + -webkit-box-shadow: rgb(11, 107, 173) 0px 0px 4px; + box-shadow: rgb(11, 107, 173) 0px 0px 4px; } .iso-title { - margin: 0; - display: block; - position: relative; - height: 23px; - line-height: 23px; - font-size: 14px; - font-weight: normal; - max-width: 100%; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + margin: 0; + display: block; + position: relative; + height: 23px; + line-height: 23px; + font-size: 14px; + font-weight: normal; + max-width: 100%; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } .iso-title>label>input { - display: block; - position: absolute; - top: 0; - right: 2px; + display: block; + position: absolute; + top: 0; + right: 2px; } .iso-info { - margin-top: 5px; - overflow: hidden; + margin-top: 5px; + overflow: hidden; } .iso-info-col { - float: left; - width: 50%; - -moz-box-sizing: border-box; - box-sizing: border-box; - padding: 0 0 0 5px; + float: left; + width: 50%; + -moz-box-sizing: border-box; + box-sizing: border-box; + padding: 0 0 0 5px; } .iso-info-col:FIRST-CHILD { - padding: 0 5px 0 0; - border-right: 1px solid #999; + padding: 0 5px 0 0; + border-right: 1px solid #999; } .iso-info-item { - font-weight: bold; - color: #999; - font-size: 11px; - line-height: 18px; - max-width: 106px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + font-weight: bold; + color: #999; + font-size: 11px; + line-height: 18px; + max-width: 106px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } #iso-search { - margin: 10px 15px; + margin: 10px 15px; } #iso-search-loading { - margin: 10px 15px; - background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center no-repeat; - padding: 0 20px 0 26px; + margin: 10px 15px; + background: #C0C0C0 url(../../images/theme-default/loading.gif) 7px center no-repeat; + padding: 0 20px 0 26px; } #iso-more-loading { diff --git a/ui/css/theme-default/template_list.css b/ui/css/theme-default/template_list.css index 8bf5d4c..bd250a9 100644 --- a/ui/css/theme-default/template_list.css +++ b/ui/css/theme-default/template_list.css @@ -19,232 +19,232 @@ * limitations under the License. */ .list-template.framework { - float: left; - clear: both; + float: left; + clear: both; } .template-box { - border-radius: 8px 8px 8px 8px; - box-shadow: none; - color: #666666; - float: left; - height: auto; - margin: 10px 11px 10px 0; - padding: 10px; - width: 308px; + border-radius: 8px 8px 8px 8px; + box-shadow: none; + color: #666666; + float: left; + height: auto; + margin: 10px 11px 10px 0; + padding: 10px; + width: 308px; } .template-title { - font-size: 16px; - height: 25px; - line-height: 25px; + font-size: 16px; + height: 25px; + line-height: 25px; } .template-icon { - border: 1px solid #CCCCCC; - border-radius: 8px 8px 8px 8px; - height: 58px; - margin: 0 10px 10px 0; - width: 48px; + border: 1px solid #CCCCCC; + border-radius: 8px 8px 8px 8px; + height: 58px; + margin: 0 10px 10px 0; + width: 48px; } .template-icon img { - width: 58px; + width: 58px; } .template-text { - color: #999999; - float: left; - font-size: 11px; - font-weight: bold; - height: 18px; - line-height: 18px; - width: 142px; - display: table; + color: #999999; + float: left; + font-size: 11px; + font-weight: bold; + height: 18px; + line-height: 18px; + width: 142px; + display: table; } .white-box { - background: #ffffff; - background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); - background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); - background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); - border: 1px solid #CCCCCC; - color: #333333; - text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; + background: #ffffff; + background: -moz-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #ffffff), color-stop(100%, #e5e5e5)); + background: -webkit-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -o-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: -ms-linear-gradient(top, #ffffff 0%, #e5e5e5 100%); + background: linear-gradient(to bottom, #ffffff 0%, #e5e5e5 100%); + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e5e5e5', GradientType=0); + border: 1px solid #CCCCCC; + color: #333333; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; } .row-select { - -moz-border-bottom-colors: none; - -moz-border-left-colors: none; - -moz-border-right-colors: none; - -moz-border-top-colors: none; - background: linear-gradient(to bottom, #FFFFFF 0%, #E5E5E5 100%) repeat scroll 0 0 transparent; - border-color: #999999 #AAAAAA #AAAAAA #999999; - border-image: none; - border-radius: 5px 5px 5px 5px; - border-right: 1px solid #AAAAAA; - border-style: solid; - border-width: 1px; - float: left; - font-size: 13px; - height: 42px; - line-height: 42px; - margin: 5px 0 0 10px; - padding-left: 10px; - text-align: left; - text-shadow: -1px -1px 1px #AAAAAA, 1px 1px 1px #FFFFFF; - width: 100px; + -moz-border-bottom-colors: none; + -moz-border-left-colors: none; + -moz-border-right-colors: none; + -moz-border-top-colors: none; + background: linear-gradient(to bottom, #FFFFFF 0%, #E5E5E5 100%) repeat scroll 0 0 transparent; + border-color: #999999 #AAAAAA #AAAAAA #999999; + border-image: none; + border-radius: 5px 5px 5px 5px; + border-right: 1px solid #AAAAAA; + border-style: solid; + border-width: 1px; + float: left; + font-size: 13px; + height: 42px; + line-height: 42px; + margin: 5px 0 0 10px; + padding-left: 10px; + text-align: left; + text-shadow: -1px -1px 1px #AAAAAA, 1px 1px 1px #FFFFFF; + width: 100px; } .bevel3 { - box-shadow: -2px -2px 2px #EAEAEA, 2px 2px 2px #FFFFFF, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, 0.25) inset; - color: #333333; + box-shadow: -2px -2px 2px #EAEAEA, 2px 2px 2px #FFFFFF, 3px 3px 3px white inset, -3px -3px 3px rgba(0, 0, 0, 0.25) inset; + color: #333333; } .row-drop { - left: 10px; - position: relative; - top: 50px; + left: 10px; + position: relative; + top: 50px; } .template-action-hidden { - visibility: hidden; + visibility: hidden; } .template-action-show { - visibility: visible; - display: block; + visibility: visible; + display: block; } template-hidden { - display: none; + display: none; } .select-drop { - background: none repeat scroll 0 0 #EEEEEE; - border: 2px solid #096AAD; - border-radius: 5px 5px 5px 5px; - box-shadow: 6px 6px 6px; - height: 147px; - left: 0; - position: absolute; - top: 8px; - width: 250px; - z-index: 2147483647; + background: none repeat scroll 0 0 #EEEEEE; + border: 2px solid #096AAD; + border-radius: 5px 5px 5px 5px; + box-shadow: 6px 6px 6px; + height: 147px; + left: 0; + position: absolute; + top: 8px; + width: 250px; + z-index: 2147483647; } .button-drop { - background: linear-gradient(to bottom, #EEEEEE 0%, #CCCCCC 10px, #CCCCCC 96%, #A5A5A5 100%) repeat scroll 0 0 transparent; + background: linear-gradient(to bottom, #EEEEEE 0%, #CCCCCC 10px, #CCCCCC 96%, #A5A5A5 100%) repeat scroll 0 0 transparent; } .action-bevel { - box-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #EEEEEE; + box-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #EEEEEE; } .template-border { - border: 1px solid rgb(204, 204, 204); + border: 1px solid rgb(204, 204, 204); } .template-button-position { - position: relative; - left: 250px; - top: 55px; - z-index: 5555; + position: relative; + left: 250px; + top: 55px; + z-index: 5555; } .tempate-action-position { - float: right; - width: 83px; - margin: 0; + float: right; + width: 83px; + margin: 0; } .template-actiontext-position { - width: 250px; - height: 160px; + width: 250px; + height: 160px; } .template-line { - left: 200px; + left: 200px; } .template-os-position { - padding-right: 10px; - clear: both; - width: 142px; - border-right: 1px solid #999; - float: left; + padding-right: 10px; + clear: both; + width: 142px; + border-right: 1px solid #999; + float: left; } .template-cpu-position { - border-left: 1px solid #eee; - padding-left: 10px; - float: left; - width: 132px; + border-left: 1px solid #eee; + padding-left: 10px; + float: left; + width: 132px; } .template-icon-position { - float: left; - height: 58px; - width: 58px; + float: left; + height: 58px; + width: 58px; } .template-title-position { - float: left; - width: 120px; + float: left; + width: 120px; } .template-results { - background: linear-gradient(to bottom, #FFFFFF 35px, rgba(255, 255, 255, 0) 100%) repeat scroll 0 0 transparent; - float: left; - height: 60px; - margin-bottom: -22px; - padding-left: 10px; - width: 1014px; + background: linear-gradient(to bottom, #FFFFFF 35px, rgba(255, 255, 255, 0) 100%) repeat scroll 0 0 transparent; + float: left; + height: 60px; + margin-bottom: -22px; + padding-left: 10px; + width: 1014px; } .select-row-action { - background: linear-gradient(to bottom, #FFFFFF 0%, #E5E5E5 100%) repeat scroll 0 0 transparent; - border: 1px solid #CCCCCC; - border-radius: 5px 5px 5px 5px; - float: left; - font-size: 13px; - height: 38px; - line-height: 38px; - margin: 10px 10px 0; - text-align: center; - text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; - width: 230px; + background: linear-gradient(to bottom, #FFFFFF 0%, #E5E5E5 100%) repeat scroll 0 0 transparent; + border: 1px solid #CCCCCC; + border-radius: 5px 5px 5px 5px; + float: left; + font-size: 13px; + height: 38px; + line-height: 38px; + margin: 10px 10px 0; + text-align: center; + text-shadow: -1px -1px 1px #CCCCCC, 1px 1px 1px #FFFFFF; + width: 230px; } .select-row-delete { - background: linear-gradient(to bottom, #FF3019 0%, #CF0404 100%) repeat scroll 0 0 transparent; - border: 1px solid #B10F14; - border-radius: 5px 5px 5px 5px; - color: #FFFFFF; - float: left; - font-size: 13px; - font-weight: bold; - height: 38px; - line-height: 38px; - margin: 10px 10px 0; - text-align: center; - text-shadow: -1px -1px 1px #9E0505, 1px 1px 1px #FC5D4C; - width: 230px; + background: linear-gradient(to bottom, #FF3019 0%, #CF0404 100%) repeat scroll 0 0 transparent; + border: 1px solid #B10F14; + border-radius: 5px 5px 5px 5px; + color: #FFFFFF; + float: left; + font-size: 13px; + font-weight: bold; + height: 38px; + line-height: 38px; + margin: 10px 10px 0; + text-align: center; + text-shadow: -1px -1px 1px #9E0505, 1px 1px 1px #FC5D4C; + width: 230px; } .template-general .title { - color: black; - font-size: 16px; - font-weight: normal; - height: 25px; - line-height: 25px; - text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; - max-width: 130px; - overflow: hidden; - text-overflow: ellipsis; - white-space: nowrap; + color: black; + font-size: 16px; + font-weight: normal; + height: 25px; + line-height: 25px; + text-shadow: -1px -1px 1px #ccc, 1px 1px 1px #fff; + max-width: 130px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; } diff --git a/ui/css/theme-default/tile-check.css b/ui/css/theme-default/tile-check.css index 0e41010..e30e173 100644 --- a/ui/css/theme-default/tile-check.css +++ b/ui/css/theme-default/tile-check.css @@ -19,30 +19,30 @@ * limitations under the License. */ .tile-check { - overflow: hidden; + overflow: hidden; } .tile-check>li { - float: left; - padding: 5px; + float: left; + padding: 5px; } .tile-check>li>label { - display: block; - cursor: pointer; + display: block; + cursor: pointer; } .tile-check>li>label>input[type="radio"] { - display: none; + display: none; } .tile-check>li>label>.info { - display: block; - position: relative; - overflow: hidden; - border: 4px solid #ccc; + display: block; + position: relative; + overflow: hidden; + border: 4px solid #ccc; } .tile-check>li>label>input[type="radio"]:CHECKED+.info { - border: 4px solid #06C; + border: 4px solid #06C; } diff --git a/ui/css/theme-default/toolbar.css b/ui/css/theme-default/toolbar.css index 6bd1037..5f47ed8 100644 --- a/ui/css/theme-default/toolbar.css +++ b/ui/css/theme-default/toolbar.css @@ -21,34 +21,34 @@ /* Generated at http://colorzilla.com/gradient-editor/ */ .toolbar { - position: relative; - height: 48px; - padding: 0 5px; - overflow: hidden; - background: #e5e5e5; - background: -moz-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #c4c4c4)); - background: -webkit-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); - background: -o-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); - background: -ms-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); - background: linear-gradient(to bottom, #e5e5e5 0%, #c4c4c4 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e5e5', endColorstr='#c4c4c4', GradientType=0); - border-bottom: 1px solid #aaa; + position: relative; + height: 48px; + padding: 0 5px; + overflow: hidden; + background: #e5e5e5; + background: -moz-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #e5e5e5), color-stop(100%, #c4c4c4)); + background: -webkit-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); + background: -o-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); + background: -ms-linear-gradient(top, #e5e5e5 0%, #c4c4c4 100%); + background: linear-gradient(to bottom, #e5e5e5 0%, #c4c4c4 100%); + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e5e5e5', endColorstr='#c4c4c4', GradientType=0); + border-bottom: 1px solid #aaa; } .toolbar .filters { - float: left; + float: left; } .toolbar .tools { - float: right; + float: right; } .toolbar .divide { - display: inline-block; - height: 42px; - margin: 3px; - vertical-align: top; - border-left: 1px solid #999; - border-right: 1px solid #eee; + display: inline-block; + height: 42px; + margin: 3px; + vertical-align: top; + border-left: 1px solid #999; + border-right: 1px solid #eee; } diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index 42859cc..6a5aec6 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -21,147 +21,147 @@ /* Generated at http://colorzilla.com/gradient-editor/ */ .topbar { - height: 48px; - background: #4a4a4a; /* Old browsers */ - background: -moz-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #4a4a4a), color-stop(100%, #272727)); - /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* Opera 11.10+ */ - background: -ms-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* IE10+ */ - background: linear-gradient(to bottom, #4a4a4a 0%, #272727 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4a4a4a', endColorstr='#272727', GradientType=0); - border-top: 1px solid #6b6868; - boder-bottom: 1px solid #151718; - position: relative; + height: 48px; + background: #4a4a4a; /* Old browsers */ + background: -moz-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%, #4a4a4a), color-stop(100%, #272727)); + /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #4a4a4a 0%, #272727 100%); /* IE10+ */ + background: linear-gradient(to bottom, #4a4a4a 0%, #272727 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#4a4a4a', endColorstr='#272727', GradientType=0); + border-top: 1px solid #6b6868; + boder-bottom: 1px solid #151718; + position: relative; } #logo { - height: 48px; - line-height: 48px; - padding: 0 10px; - font-size: 20px; - font-weight: normal; - color: #eee; - text-shadow: -1px -1px 1px #000, 1px 1px 1px #555; - vertical-align: top; - max-width: 250px; - overflow: hidden; + height: 48px; + line-height: 48px; + padding: 0 10px; + font-size: 20px; + font-weight: normal; + color: #eee; + text-shadow: -1px -1px 1px #000, 1px 1px 1px #555; + vertical-align: top; + max-width: 250px; + overflow: hidden; } .nav-top { - position: absolute; - right: 0; - top: 0; - border-left: 1px solid #000; - border-right: 1px solid #585858; + position: absolute; + right: 0; + top: 0; + border-left: 1px solid #000; + border-right: 1px solid #585858; } .nav-top>li { - float: left; - border-left: 1px solid #585858; - border-right: 1px solid #000; + float: left; + border-left: 1px solid #585858; + border-right: 1px solid #000; } .nav-top .icon { - display: block; - position: relative; - width: 58px; - height: 48px; + display: block; + position: relative; + width: 58px; + height: 48px; } .nav-top .icon .count { - position: absolute; - top: 3px; - right: 3px; - height: 16px; - line-height: 17px; - padding: 0 5px; - -webkit-border-radius: 12px; - -moz-border-radius: 12px; - border-radius: 12px; - font-size: 10px; - color: #fff; - text-align: center; - background: #06C; - text-shadow: none; + position: absolute; + top: 3px; + right: 3px; + height: 16px; + line-height: 17px; + padding: 0 5px; + -webkit-border-radius: 12px; + -moz-border-radius: 12px; + border-radius: 12px; + font-size: 10px; + color: #fff; + text-align: center; + background: #06C; + text-shadow: none; } .icon.setting { - background: url(../images/theme-default/icon-setting.png) no-repeat center center; + background: url(../images/theme-default/icon-setting.png) no-repeat center center; } .icon.tool { - background: url(../images/theme-default/icon-tool.png) no-repeat center center; + background: url(../images/theme-default/icon-tool.png) no-repeat center center; } .icon.event { - background: url(../images/theme-default/icon-event.png) no-repeat center center; + background: url(../images/theme-default/icon-event.png) no-repeat center center; } .icon.alert { - background: url(../images/theme-default/icon-alert.png) no-repeat center center; + background: url(../images/theme-default/icon-alert.png) no-repeat center center; } #user { - color: white; - cursor: pointer; - display: block; - position: relative; - height: 48px; - margin: 0 12px; + color: white; + cursor: pointer; + display: block; + position: relative; + height: 48px; + margin: 0 12px; } #user span { - display: inline-block; - margin-top: 16px; + display: inline-block; + margin-top: 16px; } #user:hover #user-name { - border-bottom: 1px solid white; + border-bottom: 1px solid white; } #user.not-logged-in { - display: none; + display: none; } #user-icon { - background: url("/images/theme-default/user-icon.png") no-repeat left top; - height: 16px; - width: 16px; + background: url("/images/theme-default/user-icon.png") no-repeat left top; + height: 16px; + width: 16px; } #user-name { - height: 16px; - line-height: 16px; + height: 16px; + line-height: 16px; } #user .arrow { - border: 6px solid transparent; - border-bottom: none; - border-top-color: white; - display: inline-block; - width: 0; + border: 6px solid transparent; + border-bottom: none; + border-top-color: white; + display: inline-block; + width: 0; } #user .action-panel { - top: 45px; - color: black; - padding: 12px 18px; - white-space: nowrap; + top: 45px; + color: black; + padding: 12px 18px; + white-space: nowrap; } #btn-logout { - color: black; - font-size: 14px; + color: black; + font-size: 14px; } a#btn-logout:hover { - text-decoration: underline; + text-decoration: underline; } @media ( max-width : 640px) { - #logo { - display: none; - } + #logo { + display: none; + } } diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 712bdb7..0a95dce 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -20,98 +20,98 @@ */ /* Hide the "Build Me" warning */ #buildme { - display: none; + display: none; } .bgmask { - position: fixed; - left: 0; - right: 0; - top: 0; - bottom: 0; - background: url(../images/theme-default/bg-mask.png); - z-index: 100; - overflow: hidden; + position: fixed; + left: 0; + right: 0; + top: 0; + bottom: 0; + background: url(../images/theme-default/bg-mask.png); + z-index: 100; + overflow: hidden; } .window { - position: absolute; - margin: auto; - left: 0; - right: 0; - top: 0; - bottom: 0; - box-shadow: 2px 2px 6px #000; - border: 2px solid #0f71b4; - -webkit-border-radius: 8px; - -moz-border-radius: 8px; - border-radius: 8px; - background-color: #eee; - box-sizing: border-box; - max-width: 100%; - max-height: 100%; + position: absolute; + margin: auto; + left: 0; + right: 0; + top: 0; + bottom: 0; + box-shadow: 2px 2px 6px #000; + border: 2px solid #0f71b4; + -webkit-border-radius: 8px; + -moz-border-radius: 8px; + border-radius: 8px; + background-color: #eee; + box-sizing: border-box; + max-width: 100%; + max-height: 100%; } .window>header { - position: absolute; - left: 0; - right: 0; - top: 0; - height: 48px; - z-index: 100; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.05); + position: absolute; + left: 0; + right: 0; + top: 0; + height: 48px; + z-index: 100; + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.15), inset 0 -1px 0 rgba(0, 0, 0, 0.05); } .window footer { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 56px; - z-index: 100; - box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.15); + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 56px; + z-index: 100; + box-shadow: 0 -1px 1px rgba(0, 0, 0, 0.15); } .window .content { - position: absolute; - left: 0; - right: 0; - top: 0; - bottom: 0; - overflow: auto; - margin: 48px 0; + position: absolute; + left: 0; + right: 0; + top: 0; + bottom: 0; + overflow: auto; + margin: 48px 0; } .window .close { - position: absolute; - width: 30px; - height: 30px; - top: 7px; - right: 7px; - -webkit-border-radius: 30px; - -moz-border-radius: 30px; - border-radius: 30px; - border: 2px solid #ccc; - color: #ccc; - font-size: 24px; - text-align: center; - line-height: 30px; - font-weight: bold; - background: #eee; - cursor: pointer; + position: absolute; + width: 30px; + height: 30px; + top: 7px; + right: 7px; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + border-radius: 30px; + border: 2px solid #ccc; + color: #ccc; + font-size: 24px; + text-align: center; + line-height: 30px; + font-weight: bold; + background: #eee; + cursor: pointer; } .window>header>.close:HOVER { - border: 2px solid #444; - color: #444; + border: 2px solid #444; + color: #444; } .window>header>.title { - font-size: 18px; - height: 48px; - line-height: 48px; - color: #06C; - margin: 0 10px; - font-weight: bold; - text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; + font-size: 18px; + height: 48px; + line-height: 48px; + color: #06C; + margin: 0 10px; + font-weight: bold; + text-shadow: -1px -1px 1px #eaeaea, 1px 1px 1px #fff; } diff --git a/ui/js/dev.main.js b/ui/js/dev.main.js index 23546e5..8a68989 100644 --- a/ui/js/dev.main.js +++ b/ui/js/dev.main.js @@ -232,13 +232,13 @@ function load(data) { console.log("load"); $.ajax({ - url: "/vms", - dataType: "json" + url: "/vms", + dataType: "json" }).done(load_vms); $.ajax({ - url: "/templates", - dataType: "json" + url: "/templates", + dataType: "json" }).done(load_templates); $.ajax({ diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 932fa70..ffc7306 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -10,7 +10,7 @@ * 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 + * 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, diff --git a/ui/pages/guest-add.html.tmpl b/ui/pages/guest-add.html.tmpl index e91d57d..36a0f35 100644 --- a/ui/pages/guest-add.html.tmpl +++ b/ui/pages/guest-add.html.tmpl @@ -28,68 +28,68 @@ <html> <body> <div class="window" style="width: 900px;height: 580px;"> - <header> - <h1 class="title">$_("Create a New Virtual Machine")</h1> - <div class="close">X</div> - </header> - <div class="content"> - <form id="form-vm-add"> - <section class="form-section"> - <h2>1. $_("Virtual Machine Name")</h2> - <div class="field"> - <p class="text-help"> - $_("The name used to identify the VM. If omitted, a name will be chosen based on the template used.") - </p> - <input type="text" class="text" style="width: 300px" name="name"> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Template")</h2> - <div class="field"> - <div class="text-help"> - <div id="prompt-create-template" class="hidden"> - <div>$_("Please create a template first.")</div> - <a id="btn-create-template" class="btn-normal" href="templates.html"> - <span class="text">$_("Create a Template")</span> - </a> - </div> - <div id="prompt-choose-template" class="hidden"> - <span>$_("Please choose a template.")</span> - </div> - </div> - <ul id="templateTile" class="tile-check tile-template"> - </ul> - <script type="html/text" id="tmpl-template" class="tmpl-html"> - <li> - <label> - <input type="radio" name="template" value="/templates/{name}"> - <div class="info"> - <div class="summary os-icon"> - <img src="{icon}"> - <span class="title">{name}</span> - </div> - <ul class="list-info"> - <li><label>$_("OS")</label><span>{os_distro}</span></li> - <li><label>$_("OS Version")</label><span>{os_version}</span></li> - <li><label>$_("CPUS")</label><span>{cpus}</span></li> - <li><label>$_("Memory")</label><span>{memory}M</span></li> - </ul> - </div> - </label> - </li> - </script> - </div> - </section> - </form> - </div> - <footer> - <div class="btn-group"> - <button id="vm-doAdd" class="btn-normal" disabled="disabled" href="javascript:void(0);"><span class="text">$_("Create")</span></button> - </div> - </footer> + <header> + <h1 class="title">$_("Create a New Virtual Machine")</h1> + <div class="close">X</div> + </header> + <div class="content"> + <form id="form-vm-add"> + <section class="form-section"> + <h2>1. $_("Virtual Machine Name")</h2> + <div class="field"> + <p class="text-help"> + $_("The name used to identify the VM. If omitted, a name will be chosen based on the template used.") + </p> + <input type="text" class="text" style="width: 300px" name="name"> + </div> + </section> + <section class="form-section"> + <h2>2. $_("Template")</h2> + <div class="field"> + <div class="text-help"> + <div id="prompt-create-template" class="hidden"> + <div>$_("Please create a template first.")</div> + <a id="btn-create-template" class="btn-normal" href="templates.html"> + <span class="text">$_("Create a Template")</span> + </a> + </div> + <div id="prompt-choose-template" class="hidden"> + <span>$_("Please choose a template.")</span> + </div> + </div> + <ul id="templateTile" class="tile-check tile-template"> + </ul> + <script type="html/text" id="tmpl-template" class="tmpl-html"> + <li> + <label> + <input type="radio" name="template" value="/templates/{name}"> + <div class="info"> + <div class="summary os-icon"> + <img src="{icon}"> + <span class="title">{name}</span> + </div> + <ul class="list-info"> + <li><label>$_("OS")</label><span>{os_distro}</span></li> + <li><label>$_("OS Version")</label><span>{os_version}</span></li> + <li><label>$_("CPUS")</label><span>{cpus}</span></li> + <li><label>$_("Memory")</label><span>{memory}M</span></li> + </ul> + </div> + </label> + </li> + </script> + </div> + </section> + </form> + </div> + <footer> + <div class="btn-group"> + <button id="vm-doAdd" class="btn-normal" disabled="disabled" href="javascript:void(0);"><span class="text">$_("Create")</span></button> + </div> + </footer> </div> <script> - kimchi.guest_add_main(); + kimchi.guest_add_main(); </script> </body> </html> diff --git a/ui/pages/guest.html.tmpl b/ui/pages/guest.html.tmpl index 3ae1687..6bd6853 100644 --- a/ui/pages/guest.html.tmpl +++ b/ui/pages/guest.html.tmpl @@ -24,44 +24,44 @@ #silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) #silent _ = t.gettext #silent _t = t.gettext - <li id="{name}"> - <div class="sortable guest-type"> - <div class="guest-general"> - <h2 class="title" title="{name}">{name}</h2> - </div> - </div> - <div class="sortable guest-cpu"> - <div class="circle" data-value="{stats}"></div> - </div> - <div class="sortable guest-network"> - <div class="circle" data-value="{stats}"></div> + <li id="{name}"> + <div class="sortable guest-type"> + <div class="guest-general"> + <h2 class="title" title="{name}">{name}</h2> + </div> + </div> + <div class="sortable guest-cpu"> + <div class="circle" data-value="{stats}"></div> + </div> + <div class="sortable guest-network"> + <div class="circle" data-value="{stats}"></div> <div class="subtitle">KB/s</div> - </div> - <div class="sortable guest-storage"> - <div class="circle" data-value="{stats}"></div> + </div> + <div class="sortable guest-storage"> + <div class="circle" data-value="{stats}"></div> <div class="subtitle">KB/s</div> - </div> - <div class="sortable guest-tile"> - <div class="tile {state}"> - <img class="imgactive" alt="" src="{tile-src}"> - <img class="imgload" alt="" src="{load-src}"> - </div> - </div> - <div class="sortable guest-actions"> - <div class="top"> - <a class="btn vm-reset" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></a> - <a class="btn vm-start" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></a> - <a class="btn vm-stop" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Stop")"><span class="icon power-up"></span></a> - </div> - <div class="bottom"> - <div class="btn dropdown popable vm-action" data-vmstate="{state}" data-graphics="{graphics.type}" data-vm="{name}" style="width: 70px"> - <span class="text">$_("Actions")</span><span class="arrow"></span> - <div class="popover actionsheet right-side" style="width: 250px"> - <button class="button-big vm-vnc" data-vm="{name}"><span class="text">VNC</span></button> - <button class="button-big vm-edit" data-vm="{name}"><span class="text">$_("Edit")</span></button> - <a class="button-big red vm-delete" data-vm="{name}">$_("Delete")</a> - </div> - </div> - </div> - </div> - </li> + </div> + <div class="sortable guest-tile"> + <div class="tile {state}"> + <img class="imgactive" alt="" src="{tile-src}"> + <img class="imgload" alt="" src="{load-src}"> + </div> + </div> + <div class="sortable guest-actions"> + <div class="top"> + <a class="btn vm-reset" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Reset")"><span class="icon reset"></span></a> + <a class="btn vm-start" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Start")"><span class="icon power-down"></span></a> + <a class="btn vm-stop" data-vmstate="{state}" data-vm="{name}" href="javascript:void(0);" title="$_("Stop")"><span class="icon power-up"></span></a> + </div> + <div class="bottom"> + <div class="btn dropdown popable vm-action" data-vmstate="{state}" data-graphics="{graphics.type}" data-vm="{name}" style="width: 70px"> + <span class="text">$_("Actions")</span><span class="arrow"></span> + <div class="popover actionsheet right-side" style="width: 250px"> + <button class="button-big vm-vnc" data-vm="{name}"><span class="text">VNC</span></button> + <button class="button-big vm-edit" data-vm="{name}"><span class="text">$_("Edit")</span></button> + <a class="button-big red vm-delete" data-vm="{name}">$_("Delete")</a> + </div> + </div> + </div> + </div> + </li> diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 5d8f583..8e234e2 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -65,28 +65,28 @@ <body> <div class="container"> <header class="topbar"> - <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> - <ul class="nav-top"> - <li> - <div id="user" class="popable"> - <span id="user-icon"></span> - <span id="user-name"></span> - <span class="arrow"></span> - <div class="action-panel popover right-side"> - <a id="btn-logout" href="javascript: void(0);">$_("Log out")</a> - </div> - </div> - </li> - </ul> + <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> + <ul class="nav-top"> + <li> + <div id="user" class="popable"> + <span id="user-icon"></span> + <span id="user-name"></span> + <span class="arrow"></span> + <div class="action-panel popover right-side"> + <a id="btn-logout" href="javascript: void(0);">$_("Log out")</a> + </div> + </div> + </li> + </ul> </header> <div class="content"> - <nav class="navbar"> - <ul id="nav-menu" class="nav-menu"> - <li class="menu-arrow"></li> - </ul> - </nav> - <div id="main"> - </div> + <nav class="navbar"> + <ul id="nav-menu" class="nav-menu"> + <li class="menu-arrow"></li> + </ul> + </nav> + <div id="main"> + </div> </div> </div> <script src="$href("libs/jquery-1.10.0.min.js")"></script> diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index c9214ce..2a962d4 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -26,32 +26,32 @@ #silent _t = t.gettext <!DOCTYPE html> <div id="report-add-window" class="window"> - <header> - <h1 class="title">$_("Generate a New Debug Report")</h1> - <div class="close">X</div> - </header> - <div class="content"> - <form id="form-report-add"> - <section class="form-section"> - <h2> - <label for="report-name-textbox">$_("Report Name")</label> - </h2> - <div class="field"> - <span> - $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, \"-\", \"_\", or \".\".") - </span> - <input type="text" class="text" id="report-name-textbox" name="name" /> - <span id="report-error-message"></span> - </div> - </section> - </form> - </div> - <footer> - <div class="btn-group"> - <button id="button-report-add" class="btn-normal"><span class="text">$_("Generate")</span></button> - </div> - </footer> + <header> + <h1 class="title">$_("Generate a New Debug Report")</h1> + <div class="close">X</div> + </header> + <div class="content"> + <form id="form-report-add"> + <section class="form-section"> + <h2> + <label for="report-name-textbox">$_("Report Name")</label> + </h2> + <div class="field"> + <span> + $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, \"-\", \"_\", or \".\".") + </span> + <input type="text" class="text" id="report-name-textbox" name="name" /> + <span id="report-error-message"></span> + </div> + </section> + </form> + </div> + <footer> + <div class="btn-group"> + <button id="button-report-add" class="btn-normal"><span class="text">$_("Generate")</span></button> + </div> + </footer> </div> <script> - kimchi.report_add_main(); + kimchi.report_add_main(); </script> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index d7b046d..3ab9ae5 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -27,89 +27,89 @@ <!DOCTYPE html> <html> <body> - <div class="window" style="width: 600px; height: 600px;"> - <header> - <h1 class="title">$_("Define a New Storage Pool")</h1> - <div class="close">X</div> - </header> - <div class="content"> - <form id="form-pool-add"> - <section class="form-section"> - <h2>1. $_("Storage Pool Name")</h2> - <div class="field"> - <p class="text-help"> + <div class="window" style="width: 600px; height: 600px;"> + <header> + <h1 class="title">$_("Define a New Storage Pool")</h1> + <div class="close">X</div> + </header> + <div class="content"> + <form id="form-pool-add"> + <section class="form-section"> + <h2>1. $_("Storage Pool Name")</h2> + <div class="field"> + <p class="text-help"> $_("The name used to identify the storage pools, and it should not be empty.") </p> - <input id="poolId" type="text" class="text" style="width: 300px" - name="name"> - </div> - </section> - <section class="form-section"> - <h2>2. $_("Storage Pool Type")</h2> - <div class="storage-type-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="poolType" name="type" type="hidden" value="dir"/> - <span class="text" id="pool-type-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"> - </ul> - </div> - </div> + <input id="poolId" type="text" class="text" style="width: 300px" + name="name"> </div> - </section> + </section> + <section class="form-section"> + <h2>2. $_("Storage Pool Type")</h2> + <div class="storage-type-wrapper-controls"> + <div class="btn dropdown popable"> + <input id="poolType" name="type" type="hidden" value="dir"/> + <span class="text" id="pool-type-label"></span><span class="arrow"></span> + <div class="popover" style="width: 100%"> + <ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"> + </ul> + </div> + </div> + </div> + </section> <div class="path-section"> - <section class="form-section"> - <h2>3. $_("Storage Path")</h2> - <div class="field"> - <p class="text-help"> + <section class="form-section"> + <h2>3. $_("Storage Path")</h2> + <div class="field"> + <p class="text-help"> $_("The path of the Storage Pool. Each Storage Pool must have a unique path.")</p> - <input id="pathId" type="text" class="text" style="width: 300px"> - </div> - <div class="clear"></div> - </section> + <input id="pathId" type="text" class="text" style="width: 300px"> + </div> + <div class="clear"></div> + </section> </div> <div class="nfs-section tmpl-html"> - <section class="form-section"> - <h2>3. $_("NFS server IP")</h2> - <div class="field"> - <p class="text-help"> + <section class="form-section"> + <h2>3. $_("NFS server IP")</h2> + <div class="field"> + <p class="text-help"> $_("NFS server IP or hostname. It should not be empty.")</p> - <input id="nfsserverId" type="text" class="text" - style="width: 300px"> - </div> - </section> - <section class="form-section"> - <h2>4. $_("NFS Path")</h2> - <div class="field"> - <p class="text-help">$_("The nfs exported path on nfs server")</p> - <input id="nfspathId" type="text" class="text" - style="width: 300px"> + <input id="nfsserverId" type="text" class="text" + style="width: 300px"> + </div> + </section> + <section class="form-section"> + <h2>4. $_("NFS Path")</h2> + <div class="field"> + <p class="text-help">$_("The nfs exported path on nfs server")</p> + <input id="nfspathId" type="text" class="text" + style="width: 300px"> <input type="hidden" id="localpathId" class="text" - value="none"> - </div> - <div class="clear"></div> - </section> - </div> - <div class="logical-section tmpl-html"> - <section class="form-section storageType"> - <h2>3. $_("Device Path")</h2> - <div class="host-partition"></div> - </section> - </div> - </form> - </div> - <footer> - <div class="btn-group"> - <button id="pool-doAdd" class="btn-normal"> - <span class="text">$_("Create")</span> - </button> - </div> - </footer> - </div> - <script> + value="none"> + </div> + <div class="clear"></div> + </section> + </div> + <div class="logical-section tmpl-html"> + <section class="form-section storageType"> + <h2>3. $_("Device Path")</h2> + <div class="host-partition"></div> + </section> + </div> + </form> + </div> + <footer> + <div class="btn-group"> + <button id="pool-doAdd" class="btn-normal"> + <span class="text">$_("Create")</span> + </button> + </div> + </footer> + </div> + <script> kimchi.storagepool_add_main(); </script> - <script id="partitionTmpl" type="html/text"> + <script id="partitionTmpl" type="html/text"> <div> <input type="checkbox" value="{path}" name="devices"> <label>{path}</label> diff --git a/ui/pages/tabs/guests.html.tmpl b/ui/pages/tabs/guests.html.tmpl index 36da9f1..d73eb39 100644 --- a/ui/pages/tabs/guests.html.tmpl +++ b/ui/pages/tabs/guests.html.tmpl @@ -30,29 +30,29 @@ <html> <body> <div id="guests-root-container"> - <div class="toolbar"> - <div class="tools"> - <a id="vm-add" class="btn-tool" href="javascript:void(0);"><span class="icon add">+</span></a> - </div> - </div> - <div id="guestListField" style="display: none;"> - <ul class="list-title"> - <li class="guest-type">$_("Name")</li> - <li class="guest-cpu">$_("CPU")</li> - <li class="guest-network">$_("Network I/O")</li> - <li class="guest-storage">$_("Disk I/O")</li> - <li class="guest-tile">$_("Livetile")</li> - <li class="guest-actions">$_("Actions")</li> - </ul> - <ul id="guestList" class="list-vm"> - </ul> - </div> - <div id="noGuests" class="list-no-result" style="display: none;"> - $_("No guests found.") - </div> + <div class="toolbar"> + <div class="tools"> + <a id="vm-add" class="btn-tool" href="javascript:void(0);"><span class="icon add">+</span></a> + </div> + </div> + <div id="guestListField" style="display: none;"> + <ul class="list-title"> + <li class="guest-type">$_("Name")</li> + <li class="guest-cpu">$_("CPU")</li> + <li class="guest-network">$_("Network I/O")</li> + <li class="guest-storage">$_("Disk I/O")</li> + <li class="guest-tile">$_("Livetile")</li> + <li class="guest-actions">$_("Actions")</li> + </ul> + <ul id="guestList" class="list-vm"> + </ul> + </div> + <div id="noGuests" class="list-no-result" style="display: none;"> + $_("No guests found.") + </div> </div> <script> - kimchi.guest_main(); + kimchi.guest_main(); </script> </body> </html> diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index 01c817f..aa4ecfb 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -26,121 +26,121 @@ #silent _ = t.gettext #silent _t = t.gettext <div id="host-root-container"> - <div class="toolbar"> - <div class="tools"> - </div> - </div> - <div id="host-content-container"></div> + <div class="toolbar"> + <div class="tools"> + </div> + </div> + <div id="host-content-container"></div> </div> <script id="host-tmpl" type="kimchi/template"> - <div class="host-panel"> - <div class="logo-container"> - <div class="logo" style="background-image: url({logo});"></div> - </div> - <div id="host-info-container" class="info-container"> - <h2 class="hostname">{hostname}</h2> - <div class="action-panel"> - <button id="host-button-shutdown" class="btn-normal stop"> - <div class="button-icon action-icon-stop"></div> - $_("Shut down") - </button> - <button id="host-button-restart" class="btn-normal restart"> - <div class="button-icon action-icon-restart"></div> - $_("Restart") - </button> - <button class="btn-normal connect" disabled="disabled"> - <div class="button-icon action-icon-connect"></div> - $_("Connect") - </button> - </div> - <div class="host-section"> - <h3 class="section-header" - aria-expanded="false" - aria-controls="content-sys-info"> - $_("Basic Information") - </h3> - <div id="content-sys-info" class="section-content"> - <div class="section-row"> - <div class="section-label">$_("OS Distro")</div> - <div class="section-value">{os_distro}</div> - </div> - <div class="section-row"> - <div class="section-label">$_("OS Version")</div> - <div class="section-value">{os_version}</div> - </div> - <div class="section-row"> - <div class="section-label">$_("OS Code Name")</div> - <div class="section-value">{os_codename}</div> - </div> - <div class="section-row"> - <div class="section-label">$_("Processor")</div> - <div class="section-value">{cpu}</div> - </div> - <div class="section-row"> - <div class="section-label">$_("Memory")</div> - <div class="section-value">{memory}</div> - </div> - </div> - </div> - <div class="host-section"> - <h3 class="section-header" - aria-controls="content-sys-statistics"> - $_("System Statistics") - </h3> - <div id="content-sys-statistics" class="section-content"> - <div class="section-row"> - <div class="section-label"></div> - <div class="section-value"> - <input id="keep-monitoring-checkbox" type="checkbox" value="" /> - <label for="keep-monitoring-checkbox">$_("Collecting data after leaving this page")</label> - </div> - </div> + <div class="host-panel"> + <div class="logo-container"> + <div class="logo" style="background-image: url({logo});"></div> + </div> + <div id="host-info-container" class="info-container"> + <h2 class="hostname">{hostname}</h2> + <div class="action-panel"> + <button id="host-button-shutdown" class="btn-normal stop"> + <div class="button-icon action-icon-stop"></div> + $_("Shut down") + </button> + <button id="host-button-restart" class="btn-normal restart"> + <div class="button-icon action-icon-restart"></div> + $_("Restart") + </button> + <button class="btn-normal connect" disabled="disabled"> + <div class="button-icon action-icon-connect"></div> + $_("Connect") + </button> + </div> + <div class="host-section"> + <h3 class="section-header" + aria-expanded="false" + aria-controls="content-sys-info"> + $_("Basic Information") + </h3> + <div id="content-sys-info" class="section-content"> + <div class="section-row"> + <div class="section-label">$_("OS Distro")</div> + <div class="section-value">{os_distro}</div> + </div> + <div class="section-row"> + <div class="section-label">$_("OS Version")</div> + <div class="section-value">{os_version}</div> + </div> + <div class="section-row"> + <div class="section-label">$_("OS Code Name")</div> + <div class="section-value">{os_codename}</div> + </div> + <div class="section-row"> + <div class="section-label">$_("Processor")</div> + <div class="section-value">{cpu}</div> + </div> + <div class="section-row"> + <div class="section-label">$_("Memory")</div> + <div class="section-value">{memory}</div> + </div> + </div> + </div> + <div class="host-section"> + <h3 class="section-header" + aria-controls="content-sys-statistics"> + $_("System Statistics") + </h3> + <div id="content-sys-statistics" class="section-content"> + <div class="section-row"> + <div class="section-label"></div> + <div class="section-value"> + <input id="keep-monitoring-checkbox" type="checkbox" value="" /> + <label for="keep-monitoring-checkbox">$_("Collecting data after leaving this page")</label> + </div> + </div> - <div class="section-row"> - <div class="section-label">$_("CPU")</div> - <div class="section-value"> - <div id="container-chart-cpu" class="inline-block"></div> - </div> - </div> - <div class="section-row"> - <div class="section-label">$_("Memory")</div> - <div class="section-value"> - <div id="container-chart-memory" class="inline-block"></div> - </div> - </div> - <div class="section-row"> - <div class="section-label">$_("Disk I/O")</div> - <div class="section-value"> - <div id="container-chart-disk-io" class="inline-block"></div> - </div> - </div> - <div class="section-row"> - <div class="section-label">$_("Network I/O")</div> - <div class="section-value"> - <div id="container-chart-network-io" class="inline-block"></div> - </div> - </div> - </div> - </div> - <div id="debug-report-section" class="host-section hidden"> - <h3 class="section-header" - aria-controls="content-sys-reports"> - $_("Debug Reports") - </h3> - <div id="content-sys-reports" class="section-content"> - <div class="section-row"> - <div class="section-label"></div> - <div class="section-value"> - <div id="available-reports-grid-container"></div> - </div> - </div> - </div> - </div> - </div> - </div> + <div class="section-row"> + <div class="section-label">$_("CPU")</div> + <div class="section-value"> + <div id="container-chart-cpu" class="inline-block"></div> + </div> + </div> + <div class="section-row"> + <div class="section-label">$_("Memory")</div> + <div class="section-value"> + <div id="container-chart-memory" class="inline-block"></div> + </div> + </div> + <div class="section-row"> + <div class="section-label">$_("Disk I/O")</div> + <div class="section-value"> + <div id="container-chart-disk-io" class="inline-block"></div> + </div> + </div> + <div class="section-row"> + <div class="section-label">$_("Network I/O")</div> + <div class="section-value"> + <div id="container-chart-network-io" class="inline-block"></div> + </div> + </div> + </div> + </div> + <div id="debug-report-section" class="host-section hidden"> + <h3 class="section-header" + aria-controls="content-sys-reports"> + $_("Debug Reports") + </h3> + <div id="content-sys-reports" class="section-content"> + <div class="section-row"> + <div class="section-label"></div> + <div class="section-value"> + <div id="available-reports-grid-container"></div> + </div> + </div> + </div> + </div> + </div> + </div> </script> <script type="text/javascript"> - kimchi.host_main(); + kimchi.host_main(); </script> diff --git a/ui/pages/template-edit.html.tmpl b/ui/pages/template-edit.html.tmpl index ea21875..fe7314d 100644 --- a/ui/pages/template-edit.html.tmpl +++ b/ui/pages/template-edit.html.tmpl @@ -27,97 +27,97 @@ #silent _t = t.gettext <div id="template-edit-window" class="window"> - <header> - <h1 class="title">$_("Edit Template")</h1> - <div class="close">X</div> - </header> - <div class="content"> - <form id="form-template-edit"> - <input type="hidden" id="template-name" name="templateName" /> - <fieldset class="template-edit-fieldset"> - <div> - <div class="template-edit-wrapper-label"> - <label for="template-edit-id-textbox">$_("Name")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-id-textbox" name="name" type="text" /> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label for="template-edit-vendor-textbox">$_("Vendor")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label for="template-edit-version-textbox">$_("Version")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label for="template-edit-cpu-textbox">$_("CPU Number")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-cpu-textbox" name="cpus" type="text" /> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label for="template-edit-memory-textbox">$_("Memory")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-memory-textbox" name="memory" type="text" /> - </div> - </div> - </fieldset> - <fieldset class="template-edit-fieldset"> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Disk (GB)")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="disks" type="text" /> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("CDROM")</label> - </div> - <div class="template-edit-wrapper-controls"> - <input id="template-edit-version-textbox" name="cdrom" type="text" disabled="disabled"/> - </div> - </div> - <div> - <div class="template-edit-wrapper-label"> - <label>$_("Storage Pool")</label> - </div> - <div class="template-edit-wrapper-controls"> - <div class="btn dropdown popable"> - <input id="template-edit-storagePool" name="storagepool" type="hidden" /> - <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> - <div class="popover" style="width: 100%"> - <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> - </ul> - </div> - </div> - </div> - </div> - </fieldset> - </form> - </div> - <footer> - <div class="btn-group"> - <a id="tmpl-edit-button-cancel" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Cancel")</span></a> - <a id="tmpl-edit-button-save" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Save")</span></a> - </div> - </footer> + <header> + <h1 class="title">$_("Edit Template")</h1> + <div class="close">X</div> + </header> + <div class="content"> + <form id="form-template-edit"> + <input type="hidden" id="template-name" name="templateName" /> + <fieldset class="template-edit-fieldset"> + <div> + <div class="template-edit-wrapper-label"> + <label for="template-edit-id-textbox">$_("Name")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-id-textbox" name="name" type="text" /> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label for="template-edit-vendor-textbox">$_("Vendor")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-vendor-textbox" name="os_distro" type="text" disabled="disabled" /> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label for="template-edit-version-textbox">$_("Version")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-version-textbox" name="os_version" type="text" disabled="disabled" /> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label for="template-edit-cpu-textbox">$_("CPU Number")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-cpu-textbox" name="cpus" type="text" /> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label for="template-edit-memory-textbox">$_("Memory")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-memory-textbox" name="memory" type="text" /> + </div> + </div> + </fieldset> + <fieldset class="template-edit-fieldset"> + <div> + <div class="template-edit-wrapper-label"> + <label>$_("Disk (GB)")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-version-textbox" name="disks" type="text" /> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label>$_("CDROM")</label> + </div> + <div class="template-edit-wrapper-controls"> + <input id="template-edit-version-textbox" name="cdrom" type="text" disabled="disabled"/> + </div> + </div> + <div> + <div class="template-edit-wrapper-label"> + <label>$_("Storage Pool")</label> + </div> + <div class="template-edit-wrapper-controls"> + <div class="btn dropdown popable"> + <input id="template-edit-storagePool" name="storagepool" type="hidden" /> + <span class="text" id="template-edit-storage-label"></span><span class="arrow"></span> + <div class="popover" style="width: 100%"> + <ul class="select-list" id="template-edit-storagePool-list" data-target="template-edit-storagePool" data-label="template-edit-storage-label"> + </ul> + </div> + </div> + </div> + </div> + </fieldset> + </form> + </div> + <footer> + <div class="btn-group"> + <a id="tmpl-edit-button-cancel" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Cancel")</span></a> + <a id="tmpl-edit-button-save" class="btn-normal" href="javascript:void(0);"><span class="text">$_("Save")</span></a> + </div> + </footer> </div> <script> - kimchi.template_edit_main(); + kimchi.template_edit_main(); </script> -- 1.7.10.4

1 1

Re: [Kimchi-devel] [PATCH] Replace tab to 4 spaces
by Crístian Viana 20 Dec '13

20 Dec '13

Reviewed-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> On 20-12-2013 11:42, Aline Manera wrote: > > > From: Aline Manera <alinefm(a)br.ibm.com> > > All py, css, js, tmpl and json files created by us must use 4 space for > indentation. > Imported files must keep as they are (such as those for jquery, novnc) > > This patch was generated by the following command: > > find . -name \*.py -o -name \*.json -o -name \*.css -o -name \*.js -o \ > -name \*.tmpl | xargs -I @ sed -i s/\\t/" "/g @ > > Then imported files had changes reverted. > > Signed-off-by: Aline Manera <alinefm(a)br.ibm.com>

2 1

[PATCH] Issue #290: correct the log usage
by shaohef＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> It is recommended that the log message should use comma. Arguments should be separated by comma. and they should not be in a tuple. Before this patch: Kimchi throws an exception as follow: TypeError: not enough arguments for format string Logged from file disks.py, line 117 After use the log correctly: Kimchi log works well: Error getting partition info for 35000c5002eaa8392p2: Error executing lsblk: lsblk: dm-2: unknown device name Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 991bb4a..a054961 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -114,7 +114,7 @@ def get_partition_details(name): dev = _get_lsblk_devs(keys, [dev_path])[0] except OperationFailed as e: kimchi_log.error( - "Error getting partition info for %s: %s", (name, e)) + "Error getting partition info for %s: %s", name, e) return {} if dev['mountpoint']: -- 1.7.11.7

2 2

[project-kimchi][PATCHv2] screenshot: fix problem on Power of truncated picture
by lvroyce＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> PIL lib will report error because of picture information inconsistency, this error may because of qemu screenshot generation, work around this problem by load this image in advance to prevent it raise error in thumbnail generation. REF: http://stackoverflow.com/questions/12984426/ \ python-pil-ioerror-image-file-truncated-with-big-images Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/screenshot.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/kimchi/screenshot.py b/src/kimchi/screenshot.py index b17a3ce..5cfea96 100644 --- a/src/kimchi/screenshot.py +++ b/src/kimchi/screenshot.py @@ -174,6 +174,12 @@ class VMScreenshot(object): self._create_black_image(thumbnail) else: im = Image.open(thumbnail) + try: + # Prevent Image lib from lazy load, + # work around pic truncate validation in thumbnail generation + im.load() + except Exception as e: + kimchi_log.warning("Image load with warning: %s." % e) im.thumbnail(self.THUMBNAIL_SIZE) im.save(thumbnail, "PNG") -- 1.8.1.2

2 2

[project-kimchi][PATCHv4] Return source information for storage pool
by lvroyce＠linux.vnet.ibm.com 20 Dec '13

20 Dec '13

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v4, Delete logical pool source because UI just care VG name. Add update controller. For netfs storage pool, remote export path and addr will make more sense than local mount point. Report storage source information in pool info. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/API.md | 3 +++ src/kimchi/controller.py | 1 + src/kimchi/mockmodel.py | 1 + src/kimchi/model.py | 16 ++++++++++++++++ tests/test_rest.py | 1 + 5 files changed, 22 insertions(+) diff --git a/docs/API.md b/docs/API.md index 74bc1b5..9edc551 100644 --- a/docs/API.md +++ b/docs/API.md @@ -215,6 +215,9 @@ Represents a snapshot of the Virtual Machine's primary monitor. * nr_volumes: The number of storage volumes for active pools, 0 for inactive pools * autostart: Whether the storage pool will be enabled automatically when the system boots + * source: Source of the storage pool, + * addr: mount address of this storage pool(for 'netfs' pool) + * path: export path of this storage pool(for 'netfs' pool) * **PUT**: Set whether the Storage Pool should be enabled automatically when the system boots * autostart: Toggle the autostart flag of the VM diff --git a/src/kimchi/controller.py b/src/kimchi/controller.py index 3b27c27..2940278 100644 --- a/src/kimchi/controller.py +++ b/src/kimchi/controller.py @@ -533,6 +533,7 @@ class StoragePool(Resource): 'allocated': self.info['allocated'], 'available': self.info['available'], 'path': self.info['path'], + 'source': self.info['source'], 'type': self.info['type'], 'nr_volumes': self.info['nr_volumes'], 'autostart': self.info['autostart']} diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 4839d4c..348127a 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -639,6 +639,7 @@ class MockStoragePool(object): 'allocated': 512 << 20, 'available': 512 << 20, 'path': '/var/lib/libvirt/images', + 'source': {}, 'type': 'dir', 'nr_volumes': 0, 'autostart': 0} diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 73c18ac..3bc5d6d 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -78,6 +78,9 @@ GUESTS_STATS_INTERVAL = 5 HOST_STATS_INTERVAL = 1 VM_STATIC_UPDATE_PARAMS = {'name': './name'} VM_LIVE_UPDATE_PARAMS = {} +STORAGE_SOURCES = {'netfs': {'addr': '/pool/source/host/@name', + 'path': '/pool/source/dir/@path'}} + def _uri_to_name(collection, uri): expr = '/%s/(.*?)/?$' % collection @@ -1019,6 +1022,17 @@ class Model(object): raise OperationFailed(e.get_error_message()) return name + def _get_storage_source(self, pool_type, pool_xml): + source = {} + if pool_type not in STORAGE_SOURCES: + return source + + for key, val in STORAGE_SOURCES[pool_type].items(): + res = xmlutils.xpath_get_text(pool_xml, val) + source[key] = res[0] if len(res) == 1 else res + + return source + def storagepool_lookup(self, name): pool = self._get_storagepool(name) info = pool.info() @@ -1027,8 +1041,10 @@ class Model(object): xml = pool.XMLDesc(0) path = xmlutils.xpath_get_text(xml, "/pool/target/path")[0] pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] + source = self._get_storage_source(pool_type, xml) res = {'state': Model.pool_state_map[info[0]], 'path': path, + 'source': source, 'type': pool_type, 'autostart': autostart, 'capacity': info[1], diff --git a/tests/test_rest.py b/tests/test_rest.py index 73b5243..f597796 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -417,6 +417,7 @@ class RestTests(unittest.TestCase): storagepool = json.loads(resp.read()) self.assertEquals('storagepool-1', storagepool['name']) self.assertEquals('inactive', storagepool['state']) + self.assertIn('source', storagepool) def test_storagepool_action(self): # Create a storage pool -- 1.8.1.2

3 3

[project-kimchi] [PATCH 0/4] Use one weksockify instance as all vms' vnc proxy.
by Mark Wu 20 Dec '13

20 Dec '13

It resolves two problems: A fixed port for firewall rule. Race between client and server. It happens on every first connection after the host running kimchi reboot. Mark Wu (4): Move configuration parsing to config.py Add a configuration for vnc websocket proxy Use one weksockify instance as all vms' vnc proxy. Remove vnc related code in mockmodel docs/API.md | 1 + src/kimchi.conf.in | 3 +++ src/kimchi/config.py.in | 24 +++++++++++++++++++++--- src/kimchi/controller.py | 5 ++++- src/kimchi/mockmodel.py | 19 ------------------- src/kimchi/model.py | 18 +++++------------- src/kimchi/server.py | 5 +++++ src/kimchi/vnc.py | 42 +++++++++++++++++++++++------------------- src/kimchid.in | 20 +------------------- ui/js/src/kimchi.api.js | 14 +++++--------- 10 files changed, 68 insertions(+), 83 deletions(-) -- 1.8.3.1 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 15

[project-kimchi] [PATCH 0/3 V2] Logical pool fixes
by Aline Manera 19 Dec '13

19 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> V1 -> V2: - Get device name from sysfs uevent file and assume its path is /dev/<devname> Zhou Zheng Sheng (3): PEP 8: cleanup src/kimchi/disks.py Issue #276: logical pool: a quick fix for the device listing rules, back-end Issue #276, logical pool: a quick fix for the device listing rules, front-end Makefile.am | 1 + src/kimchi/disks.py | 177 ++++++++++++++++-------------- ui/js/src/kimchi.storagepool_add_main.js | 2 +- 3 files changed, 94 insertions(+), 86 deletions(-) -- 1.7.10.4 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 9

[project-kimchi] [PATCH] logical pool fixes: only list leaf devices, and read file instead of run "cat"
by Zhou Zheng Sheng 19 Dec '13

19 Dec '13

Some devices are parent of other devices. We should just list the leaf devices but not parent devices. For example, if a disk contains partitions, we should only list the partitions. If a disk is held by multipath device, we should not list the disk. Currently we strip the last charactter from "vda1" to get "vda" and ignore the parent "vda" device. This may fails on disk contains lots of logical partitions, for example "vda10"'s parent is not "vda1". Another problem is this method can not find the parent-child relation ship between a multipath device and its slaves. The most accurate information is on sysfs, and lsblk lists all children device of the requested device based on sysfs. So when "lsblk -P devices" prints only one line, it's the device itself, when it prints more lines, they are the children devices. This patch use this method to detect if a device a leaf one. This patch also avoids start new "cat" process to read uevent file, it opens the uevent file and read it directly. Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 45 ++++++++++++++++++++++++++++----------------- 1 file changed, 28 insertions(+), 17 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 991bb4a..9ab9263 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -29,7 +29,6 @@ from kimchi.utils import kimchi_log def _get_partition_path(name): """ Returns device path given a partition name """ - dev_path = None maj_min = None keys = ["NAME", "MAJ:MIN"] @@ -39,15 +38,14 @@ def _get_partition_path(name): if dev['name'] == name: maj_min = dev['maj:min'] break + else: + raise OperationFailed( + "Failed to find major and minor number for %s", name) - uevent_cmd = "cat /sys/dev/block/%s/uevent" % maj_min - uevent = subprocess.Popen(uevent_cmd, stdout=subprocess.PIPE, - stderr=subprocess.PIPE, shell=True) - out, err = uevent.communicate() - if uevent.returncode != 0: - raise OperationFailed("Error getting partition path for %s", name) + with open("/sys/dev/block/%s/uevent" % maj_min) as ueventf: + content = ueventf.read() - data = dict(re.findall(r'(\S+)=(".*?"|\S+)', out.replace("\n", " "))) + data = dict(re.findall(r'(\S+)=(".*?"|\S+)', content.replace("\n", " "))) return "/dev/%s" % data["DEVNAME"] @@ -63,6 +61,22 @@ def _get_lsblk_devs(keys, devs=[]): return _parse_lsblk_output(out, keys) +def _is_dev_leaf(name): + try: + # By default, lsblk prints a device information followed by children + # device information + childrenCount = len( + _get_lsblk_devs(["NAME"], [_get_partition_path(name)])) - 1 + except OperationFailed as e: + # lsblk is known to fail on multipath devices + # Assume these devices contain children + kimchi_log.error( + "Error getting device info for %s: %s", (name, e)) + return False + else: + return childrenCount == 0 + + def _parse_lsblk_output(output, keys): # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, SIZE, MOUNTPOINT, etc @@ -82,7 +96,6 @@ def _parse_lsblk_output(output, keys): def get_partitions_names(): names = [] - ignore_names = [] keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT"] # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT @@ -90,20 +103,18 @@ def get_partitions_names(): # split()[0] to avoid the second part of the name, after the # whiteline name = dev['name'].split()[0] - # Only list unmounted and unformated partition or disk. + # Only list unmounted and unformated and leaf and (partition or disk) + # leaf means a partition, a disk has no partition, or a disk not held + # by any multipath device. if not all([dev['type'] in ['part', 'disk'], dev['fstype'] == "", - dev['mountpoint'] == ""]): - - # the whole disk must be ignored in it has at least one - # mounted/formatted partition - if dev['type'] == 'part': - ignore_names.append(name[:-1]) + dev['mountpoint'] == "", + _is_dev_leaf(name)]): continue names.append(name) - return list(set(names) - set(ignore_names)) + return names def get_partition_details(name): -- 1.7.11.7 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH v1 4/4] storagepool: Support Creating iSCSI storagepool in model.py
by Sheldon 19 Dec '13

19 Dec '13

On 12/16/2013 04:01 PM, Zhou Zheng Sheng wrote: > This patch implements creating iSCSI storagepool for libvirt. > Each LUN in iSCSI storagepool can be used as a volume, but iSCSI > storagepool does not provide ability to create volume. For now in kimchi > we create volume for each newly created VM. Next is to implement > attaching existing volume to a new VM. > > How to test > > Create: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '{"srcTarget": > "targetIQN", > "srcHost": "10.0.0.X", > "type": "iscsi", > "name": "iscsipool"}' \ > http://127.0.0.1:8000/storagepools > > Show Info: > curl -u root -H 'Accept: application/json' \ > http://127.0.0.1:8000/storagepools/iscsipool > > Activate: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '' http://127.0.0.1:8000/storagepools/iscsipool/activate > > Examine: > iscsiadm -m session > > Deactivate: > curl -u root -H 'Content-type: application/json' \ > -H 'Accept: application/json' \ > -d '' http://127.0.0.1:8000/storagepools/iscsipool/deactivate > > Delete: > curl -u root -X DELETE -H 'Accept: application/json' \ > http://127.0.0.1:8000/storagepools/iscsipool > > Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> > --- > docs/API.md | 6 ++++-- > src/kimchi/model.py | 34 ++++++++++++++++++++++++++++++++++ > 2 files changed, 38 insertions(+), 2 deletions(-) > > diff --git a/docs/API.md b/docs/API.md > index dd3d7f1..342c583 100644 > --- a/docs/API.md > +++ b/docs/API.md > @@ -182,16 +182,18 @@ Represents a snapshot of the Virtual Machine's primary monitor. > * **POST**: Create a new Storage Pool > * name: The name of the Storage Pool. > * type: The type of the defined Storage Pool. > - Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical' > + Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical', 'iscsi' > * path: The path of the defined Storage Pool. > For 'kimchi-iso' pool refers to targeted deep scan path. > Pool types: 'dir', 'kimchi-iso'. > * srcHost: IP or hostname of server for a pool backed from a remote host. > - Pool types: 'nfs'. > + Pool types: 'nfs', 'iscsi'. > * srcPath: Export path on NFS server for NFS pool. > Pool types: 'nfs'. > * srcDevices: Array of devices to be used in the Storage Pool > Pool types: 'logical'. > + * srcTarget: Target IQN of an iSCSI pool. > + Pool types: 'iscsi'. > > ### Resource: Storage Pool > > diff --git a/src/kimchi/model.py b/src/kimchi/model.py > index af0d728..3888903 100644 > --- a/src/kimchi/model.py > +++ b/src/kimchi/model.py > @@ -1475,11 +1475,45 @@ def _get_logical_storagepool_xml(poolArgs): > return xml > > > +def _get_iscsi_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # srcHost: > + # srcTarget: > + # > + # Optional parameters > + # srcPort: > + > + try: > + portAttr = "port='%s'" % poolArgs['srcPort'] > + except KeyError: > + portAttr = "" > + > + poolArgs.update({'srcPort': portAttr, > + 'path': '/dev/disk/by-id'}) > + > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + <host name='%(srcHost)s' %(srcPort)s/> > + <device path='%(srcTarget)s'/> > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + http://libvirt.org/formatstorage.html#exampleISCSI iSCSI based storage pool <pool type="iscsi"> <name>virtimages</name> <source> <host name="iscsi.example.com"/> <device path="iqn.2013-06.com.example:iscsi-pool"/> <auth type='chap' username='myuser'> <secret usage='libvirtiscsi'/> </auth> </source> <target> <path>/dev/disk/by-path</path> </target> </pool> auth tag? > def _get_pool_xml(**kwargs): > getPoolXml = { > 'dir': _get_dir_storagepool_xml, > 'netfs': _get_netfs_storagepool_xml, > 'logical': _get_logical_storagepool_xml, > + 'iscsi': _get_iscsi_storagepool_xml, > }[kwargs['type']] > return getPoolXml(kwargs) > Sheldon Feng(???) IBM Linux Technology Center -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH] spec: Open 8000 and 8001 port by default in spec.in post section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section.
by Mark Wu 19 Dec '13

19 Dec '13

On 12/17/2013 02:36 PM, taget(a)linux.vnet.ibm.com wrote: > From: Eli Qiao <taget(a)linux.vnet.ibm.com> > > Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> > --- > contrib/kimchi.spec.fedora.in | 5 +++++ > contrib/kimchi.spec.suse.in | 5 +++++ > 2 files changed, 10 insertions(+), 0 deletions(-) > > diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in > index 14ec359..f21ae49 100644 > --- a/contrib/kimchi.spec.fedora.in > +++ b/contrib/kimchi.spec.fedora.in > @@ -81,6 +81,11 @@ if [ $1 -eq 1 ] ; then > /bin/systemctl daemon-reload >/dev/null 2>&1 || : > fi > > +# open 8000 and 8001 port for firewall > + > +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT > +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT > + > %if 0%{?rhel} == 6 > start kimchid > %else > diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in > index 9051284..5209e03 100644 > --- a/contrib/kimchi.spec.suse.in > +++ b/contrib/kimchi.spec.suse.in > @@ -47,6 +47,11 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid > service kimchid start > chkconfig kimchid on > > +# open 8000 and 8001 port for firewall > + > +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT > +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT > + > %preun > service kimchid stop > Eli, Thanks for the patch. But it's not a reliable configuration. This rule will be lost after reboot. And shipping a configuration file is better than running commands in spec file. Please take a look at firewalld and firewalld.service http://manpages.ubuntu.com/manpages/raring/man5/firewalld.service.5.html It could be a better solution for the platforms where firewalld is available. -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

4 6

[project-kimchi] Re: [PATCH v1 1/4] storagepool: dispatch _get_pool_xml() to respective _get_XXX_storagepool_xml() function
by Sheldon 19 Dec '13

19 Dec '13

As Pradeep mentioned: we will add more storage pools, how about split these xml to a new file? On 12/16/2013 04:01 PM, Zhou Zheng Sheng wrote: > In src/kimchi/model.py, _get_pool_xml() is to generate libvirt storage > pool XML definition from arguments provided by the POST data (a JSON > dict). It has to support various types of pool such as dir, netfs and > logical. Now it uses "if ... elif ... elif" to check the requested type > of pool and go in to the respective branch and generates the correct > XML. > > This is OK for now but in future we'll have more types of pool, so in > this patch we turn "if ... elif" into a dispatching dict, and put the > respective XML generating code to separated functions. > > Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> > --- > src/kimchi/model.py | 121 +++++++++++++++++++++++++++++++--------------------- > 1 file changed, 73 insertions(+), 48 deletions(-) > > diff --git a/src/kimchi/model.py b/src/kimchi/model.py > index 90a9a1b..d22e02d 100644 > --- a/src/kimchi/model.py > +++ b/src/kimchi/model.py > @@ -1403,60 +1403,85 @@ class LibvirtVMScreenshot(VMScreenshot): > finally: > os.close(fd) > > -def _get_pool_xml(**kwargs): > + > +def _get_dir_storagepool_xml(poolArgs): > # Required parameters > # name: > # type: > # path: > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_netfs_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # nfsserver: > # nfspath: > - if kwargs['type'] == 'dir': > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - elif kwargs['type'] == 'netfs': > - path = '/var/lib/kimchi/nfs_mount/' + kwargs['name']; > - if not os.path.exists(path): > - os.makedirs(path) > - kwargs.update({'path': path}) > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <source> > - <host name='%(nfsserver)s'/> > - <dir path='%(nfspath)s'/> > - </source> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - elif kwargs['type'] == 'logical': > - path = '/var/lib/kimchi/logical_mount/' + kwargs['name']; > - if not os.path.exists(path): > - os.makedirs(path) > - xml = """ > - <pool type='%(type)s'> > - <name>%(name)s</name> > - <source> > - %(devices)s > - </source> > - <target> > - <path>%(path)s</path> > - </target> > - </pool> > - """ > - devices = '' > - for device_path in kwargs['devices']: > - devices += "<device path=\""+device_path+"\" />" > + path = '/var/lib/kimchi/nfs_mount/' + poolArgs['name'] > + if not os.path.exists(path): > + os.makedirs(path) > + poolArgs['path'] = path > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + <host name='%(nfsserver)s'/> > + <dir path='%(nfspath)s'/> > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_logical_storagepool_xml(poolArgs): > + # Required parameters > + # name: > + # type: > + # devices: > + path = '/var/lib/kimchi/logical_mount/' + poolArgs['name'] > + if not os.path.exists(path): > + os.makedirs(path) > + > + devices = [] > + for device_path in poolArgs['devices']: > + devices.append('<device path="%s" />' % device_path) > + > + poolArgs.update({'devices': ''.join(devices), > + 'path': path}) > + xml = """ > + <pool type='%(type)s'> > + <name>%(name)s</name> > + <source> > + %(devices)s > + </source> > + <target> > + <path>%(path)s</path> > + </target> > + </pool> > + """ % poolArgs > + return xml > + > + > +def _get_pool_xml(**kwargs): > + getPoolXml = { > + 'dir': _get_dir_storagepool_xml, > + 'netfs': _get_netfs_storagepool_xml, > + 'logical': _get_logical_storagepool_xml, > + }[kwargs['type']] > + return getPoolXml(kwargs) > > - kwargs.update({'devices': devices}) > - kwargs.update({'path': path}) > - return xml % kwargs > > def _get_volume_xml(**kwargs): > # Required parameters Sheldon Feng(???) IBM Linux Technology Center -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[PATCH 0/2] Add the iscsi pool UI support
by zhoumeina 19 Dec '13

19 Dec '13

Include create storage pool UI and translation files. zhoumeina (2): Add UI support of iscsi Add the ISCSI translation po files po/en_US.po | 31 +++++++++++++---- po/kimchi.pot | 30 ++++++++++++---- po/pt_BR.po | 31 +++++++++++++---- po/zh_CN.po | 31 +++++++++++++---- ui/js/src/kimchi.storagepool_add_main.js | 54 ++++++++++++++++++++++++----- ui/pages/i18n.html.tmpl | 7 ++-- ui/pages/storagepool-add.html.tmpl | 19 ++++++++++ 7 files changed, 158 insertions(+), 45 deletions(-) mode change 100644 => 100755 po/kimchi.pot

1 2

Re: [Kimchi-devel] [project-kimchi] [PATCH v1 2/4] storagepool: rename and consolidate arguments of creating (back end)
by Zhou Zheng Sheng 19 Dec '13

19 Dec '13

于 2013年12月18日 09:47, Shu Ming 写道: > 于 2013/12/16 16:01, Zhou Zheng Sheng 写道: >> As we are adding support to new type of storage pool, the current naming >> scheme of the storage pool creating arguments should be rearranged to be >> more extendable. This patch renames some arguments and consolidates the >> argument of the same purposes as follow. >> >> nfsserver -> srcHost >> This is because in future patches, iSCSI pool can use this srcHost as >> well. Other network backed storage pool can also make use of this >> argument. >> >> nfspath -> srcPath >> This is because other netfs pool can also make use of this argument. >> >> devices -> srcDevices >> To differentiate source arguments from the target arguments, we can add >> a "src" prefix to source arguments. >> --- >> docs/API.md | 19 +++++++++++-------- >> src/kimchi/model.py | 17 +++++++++-------- >> 2 files changed, 20 insertions(+), 16 deletions(-) >> >> diff --git a/docs/API.md b/docs/API.md >> index 74bc1b5..dd3d7f1 100644 >> --- a/docs/API.md >> +++ b/docs/API.md >> @@ -180,15 +180,18 @@ Represents a snapshot of the Virtual Machine's >> primary monitor. >> >> * **GET**: Retrieve a summarized list of all defined Storage Pools >> * **POST**: Create a new Storage Pool >> - * name: The name of the Storage Pool >> - * path: The path of the defined Storage Pool, >> + * name: The name of the Storage Pool. >> + * type: The type of the defined Storage Pool. >> + Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical' >> + * path: The path of the defined Storage Pool. >> For 'kimchi-iso' pool refers to targeted deep scan path. >> - * type: The type of the defined Storage Pool, >> - Supported types: 'dir', 'kimchi-iso', 'netfs' >> - * nfsserver: IP or hostname of NFS server to create NFS pool. >> - * nfspath: export path on nfs server for NFS pool. >> - * devices: Array of devices to be used in the Storage Pool >> - Exclusive to the 'logical' storage pool type. >> + Pool types: 'dir', 'kimchi-iso'. >> + * srcHost: IP or hostname of server for a pool backed from a >> remote host. >> + Pool types: 'nfs'. > > Let's keep the name style as the others in this file, like "src_host" or > "srchost". > >> + * srcPath: Export path on NFS server for NFS pool. >> + Pool types: 'nfs'. > The same as the above. > >> + * srcDevices: Array of devices to be used in the Storage Pool >> + Pool types: 'logical'. > > The same as the above. > Thanks for the suggestion. I will change the style. >> >> ### Resource: Storage Pool >> >> diff --git a/src/kimchi/model.py b/src/kimchi/model.py >> index d22e02d..af0d728 100644 >> --- a/src/kimchi/model.py >> +++ b/src/kimchi/model.py >> @@ -1424,8 +1424,8 @@ def _get_netfs_storagepool_xml(poolArgs): >> # Required parameters >> # name: >> # type: >> - # nfsserver: >> - # nfspath: >> + # srcHost: >> + # srcPath: >> path = '/var/lib/kimchi/nfs_mount/' + poolArgs['name'] >> if not os.path.exists(path): >> os.makedirs(path) >> @@ -1434,8 +1434,8 @@ def _get_netfs_storagepool_xml(poolArgs): >> <pool type='%(type)s'> >> <name>%(name)s</name> >> <source> >> - <host name='%(nfsserver)s'/> >> - <dir path='%(nfspath)s'/> >> + <host name='%(srcHost)s'/> >> + <dir path='%(srcPath)s'/> >> </source> >> <target> >> <path>%(path)s</path> >> @@ -1449,22 +1449,23 @@ def _get_logical_storagepool_xml(poolArgs): >> # Required parameters >> # name: >> # type: >> - # devices: >> + # srcDevices: >> path = '/var/lib/kimchi/logical_mount/' + poolArgs['name'] >> if not os.path.exists(path): >> os.makedirs(path) >> >> devices = [] >> - for device_path in poolArgs['devices']: >> + for device_path in poolArgs['srcDevices']: >> devices.append('<device path="%s" />' % device_path) >> >> - poolArgs.update({'devices': ''.join(devices), >> + poolArgs.update({'srcDevices': ''.join(devices), >> 'path': path}) >> + >> xml = """ >> <pool type='%(type)s'> >> <name>%(name)s</name> >> <source> >> - %(devices)s >> + %(srcDevices)s >> </source> >> <target> >> <path>%(path)s</path> > -- Thanks and best regards! Zhou Zheng Sheng / 周征晟 E-mail: zhshzhou(a)linux.vnet.ibm.com Telephone: 86-10-82454397 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

Re: [Kimchi-devel] [project-kimchi] [PATCH v1 1/4] storagepool: dispatch _get_pool_xml() to respective _get_XXX_storagepool_xml() function
by Zhou Zheng Sheng 19 Dec '13

19 Dec '13

on 2013/12/18/ 09:44, Shu Ming wrote: > 于 2013/12/16 16:01, Zhou Zheng Sheng 写道: >> In src/kimchi/model.py, _get_pool_xml() is to generate libvirt storage >> pool XML definition from arguments provided by the POST data (a JSON >> dict). It has to support various types of pool such as dir, netfs and >> logical. Now it uses "if ... elif ... elif" to check the requested type >> of pool and go in to the respective branch and generates the correct >> XML. >> >> This is OK for now but in future we'll have more types of pool, so in >> this patch we turn "if ... elif" into a dispatching dict, and put the >> respective XML generating code to separated functions. >> >> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> >> --- >> src/kimchi/model.py | 121 >> +++++++++++++++++++++++++++++++--------------------- >> 1 file changed, 73 insertions(+), 48 deletions(-) >> >> diff --git a/src/kimchi/model.py b/src/kimchi/model.py >> index 90a9a1b..d22e02d 100644 >> --- a/src/kimchi/model.py >> +++ b/src/kimchi/model.py >> @@ -1403,60 +1403,85 @@ class LibvirtVMScreenshot(VMScreenshot): >> finally: >> os.close(fd) >> >> -def _get_pool_xml(**kwargs): >> + >> +def _get_dir_storagepool_xml(poolArgs): >> # Required parameters >> # name: >> # type: >> # path: >> + xml = """ >> + <pool type='%(type)s'> >> + <name>%(name)s</name> >> + <target> >> + <path>%(path)s</path> >> + </target> >> + </pool> >> + """ % poolArgs >> + return xml >> + >> + >> +def _get_netfs_storagepool_xml(poolArgs): >> + # Required parameters >> + # name: >> + # type: >> + # nfsserver: >> # nfspath: >> - if kwargs['type'] == 'dir': >> - xml = """ >> - <pool type='%(type)s'> >> - <name>%(name)s</name> >> - <target> >> - <path>%(path)s</path> >> - </target> >> - </pool> >> - """ >> - elif kwargs['type'] == 'netfs': >> - path = '/var/lib/kimchi/nfs_mount/' + kwargs['name']; >> - if not os.path.exists(path): >> - os.makedirs(path) >> - kwargs.update({'path': path}) >> - xml = """ >> - <pool type='%(type)s'> >> - <name>%(name)s</name> >> - <source> >> - <host name='%(nfsserver)s'/> >> - <dir path='%(nfspath)s'/> >> - </source> >> - <target> >> - <path>%(path)s</path> >> - </target> >> - </pool> >> - """ >> - elif kwargs['type'] == 'logical': >> - path = '/var/lib/kimchi/logical_mount/' + kwargs['name']; >> - if not os.path.exists(path): >> - os.makedirs(path) >> - xml = """ >> - <pool type='%(type)s'> >> - <name>%(name)s</name> >> - <source> >> - %(devices)s >> - </source> >> - <target> >> - <path>%(path)s</path> >> - </target> >> - </pool> >> - """ >> - devices = '' >> - for device_path in kwargs['devices']: >> - devices += "<device path=\""+device_path+"\" />" >> + path = '/var/lib/kimchi/nfs_mount/' + poolArgs['name'] >> + if not os.path.exists(path): >> + os.makedirs(path) >> + poolArgs['path'] = path >> + xml = """ >> + <pool type='%(type)s'> >> + <name>%(name)s</name> >> + <source> >> + <host name='%(nfsserver)s'/> > Is it not the intention to replace "nfsserver" with "src_host"? > >> + <dir path='%(nfspath)s'/> > > Is it not the intention to replace "nfspath" with "src_path"? > Yes. This is in another patch, "storagepool: rename and consolidate arguments of creating (back end)" >> + </source> >> + <target> >> + <path>%(path)s</path> >> + </target> >> + </pool> >> + """ % poolArgs >> + return xml >> + >> + >> +def _get_logical_storagepool_xml(poolArgs): >> + # Required parameters >> + # name: >> + # type: >> + # devices: >> + path = '/var/lib/kimchi/logical_mount/' + poolArgs['name'] > Can we make the path configurable? and make > > '/var/lib/kimchi/*" as the default setting. > > I agree, let's do it in another patch. >> + if not os.path.exists(path): >> + os.makedirs(path) >> + >> + devices = [] >> + for device_path in poolArgs['devices']: >> + devices.append('<device path="%s" />' % device_path) >> + >> + poolArgs.update({'devices': ''.join(devices), >> + 'path': path}) >> + xml = """ >> + <pool type='%(type)s'> >> + <name>%(name)s</name> >> + <source> >> + %(devices)s >> + </source> >> + <target> >> + <path>%(path)s</path> >> + </target> >> + </pool> >> + """ % poolArgs >> + return xml >> + >> + >> +def _get_pool_xml(**kwargs): >> + getPoolXml = { >> + 'dir': _get_dir_storagepool_xml, >> + 'netfs': _get_netfs_storagepool_xml, >> + 'logical': _get_logical_storagepool_xml, >> + }[kwargs['type']] >> + return getPoolXml(kwargs) >> >> - kwargs.update({'devices': devices}) >> - kwargs.update({'path': path}) >> - return xml % kwargs >> >> def _get_volume_xml(**kwargs): >> # Required parameters > -- Thanks and best regards! Zhou Zheng Sheng / 周征晟 E-mail: zhshzhou(a)linux.vnet.ibm.com Telephone: 86-10-82454397 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] Switch to new mail list
by Aline Manera 18 Dec '13

18 Dec '13

Hi all, As I mentioned during the last scrum meeting we have a new mail list now. For developers: kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org> For users feedback: kimchi-users(a)ovirt.org <mailto:kimchi-users@ovirt.org> Subscribe to mail lists: kimchi-devel: http://lists.ovirt.org/mailman/listinfo/kimchi-devel kimchi-users: http://lists.ovirt.org/mailman/listinfo/kimchi-users All outstanding patches will need to be resent to kimchi-devel(a)ovirt.org <mailto:kimchi-devel@ovirt.org> for consideration. This Google Groups mail will be discontinued. See you there ;-) Thanks, Aline Manera -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] Kimchi 1.1 is released!
by Aline Manera 18 Dec '13

18 Dec '13

On behalf of everyone who has worked hard on this release, I am pleased to announce the availability of Kimchi 1.1! This release adds many new features including: * Easy Template creation from Remote ISO images * Template customization * Basic guest customization * NSF and logical Pool support * Basic network management * Basic host management * Support for Kimchi plugins We have worked hard to ensure that Kimchi runs well on the most popular Linux distributions including: Fedora 19, Ubuntu 13.10, openSUSE 13.1, and RHEL 6.5. Kimchi uses standard Linux interfaces so it should run well on many other distributions too. You can easily grab this release in tarball format or via git: *https://github.com/kimchi-project/kimchi/archive/kimchi-1.1.0.tar.gz * git clonehttps://github.com/kimchi-project/kimchi.git Go ahead and give it a try and let us know what you think! Regards, ---- Aline Manera -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] [PATCH] Organize python imports
by Rodrigo Trujillo 18 Dec '13

18 Dec '13

Follow this rule: 1) Import common modules import ... import ... from ... import ... from ... import ... 2) Import kimchi modules import kimchi.<mod> import kimchi.<mod> from kimchi import ... from kimchi import ... Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- plugins/sample/__init__.py | 8 ++++++-- plugins/sample/model.py | 2 +- src/kimchi/model.py | 4 ++-- src/kimchi/server.py | 2 +- src/kimchi/sslcert.py | 2 +- src/kimchi/websocket.py | 17 ++++++++++++++--- src/kimchi/websockify.py | 15 +++++++++++++-- tests/test_exception.py | 6 ++++-- tests/test_mockmodel.py | 5 +++-- tests/test_model.py | 18 ++++++++++-------- tests/test_networkxml.py | 4 +++- tests/test_osinfo.py | 3 +++ tests/test_plugin.py | 4 +++- tests/test_rest.py | 10 +++++++--- tests/test_server.py | 4 ++-- tests/test_vmtemplate.py | 2 ++ tests/utils.py | 15 +++++++++------ 17 files changed, 84 insertions(+), 37 deletions(-) diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index a20f5e6..7064904 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -22,12 +22,16 @@ import json import os + + from cherrypy import expose -from kimchi.controller import Resource, Collection + + +from kimchi.controller import Collection, Resource from model import Model -model = Model() +model = Model() class Drawings(Resource): def __init__(self): diff --git a/plugins/sample/model.py b/plugins/sample/model.py index f6da5d0..9a2f22f 100644 --- a/plugins/sample/model.py +++ b/plugins/sample/model.py @@ -20,7 +20,7 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -from kimchi.exception import NotFoundError, InvalidOperation +from kimchi.exception import InvalidOperation, NotFoundError class Model(object): diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 73c18ac..1e4dac2 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -42,9 +42,9 @@ import time import uuid -from collections import defaultdict from cherrypy.process.plugins import BackgroundTask from cherrypy.process.plugins import SimplePlugin +from collections import defaultdict from xml.etree import ElementTree @@ -69,7 +69,7 @@ from kimchi.networkxml import to_network_xml from kimchi.objectstore import ObjectStore from kimchi.scan import Scanner from kimchi.screenshot import VMScreenshot -from kimchi.utils import kimchi_log, is_digit, get_enabled_plugins +from kimchi.utils import get_enabled_plugins, is_digit, kimchi_log from kimchi.vmtemplate import VMTemplate diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 6ff6fa0..114a3a0 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -33,7 +33,7 @@ from kimchi import config from kimchi import model from kimchi import mockmodel from kimchi.root import Root -from kimchi.utils import import_class, get_enabled_plugins +from kimchi.utils import get_enabled_plugins, import_class LOGGING_LEVEL = {"debug": logging.DEBUG, diff --git a/src/kimchi/sslcert.py b/src/kimchi/sslcert.py index 70441f2..529699d 100644 --- a/src/kimchi/sslcert.py +++ b/src/kimchi/sslcert.py @@ -28,7 +28,7 @@ import time -from M2Crypto import X509, EVP, RSA, ASN1 +from M2Crypto import ASN1, EVP, RSA, X509 class SSLCert(object): diff --git a/src/kimchi/websocket.py b/src/kimchi/websocket.py index a98fc6d..945676d 100644 --- a/src/kimchi/websocket.py +++ b/src/kimchi/websocket.py @@ -16,9 +16,20 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' -import os, sys, time, errno, signal, socket, traceback, select -import array, struct -from base64 import b64encode, b64decode +import array +import errno +import os +import select +import signal +import socket +import struct +import sys +import time +import traceback + + +from base64 import b64decode, b64encode + # Imports that vary by python version diff --git a/src/kimchi/websockify.py b/src/kimchi/websockify.py index 1154d92..2857e7c 100755 --- a/src/kimchi/websockify.py +++ b/src/kimchi/websockify.py @@ -11,15 +11,26 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates ''' -import signal, socket, optparse, time, os, sys, subprocess +import optparse +import os +import signal +import socket +import subprocess +import sys +import time + + from select import select -import websocket try: from urllib.parse import parse_qs, urlparse except: from cgi import parse_qs from urlparse import urlparse + +import websocket + + class WebSocketProxy(websocket.WebSocketServer): """ Proxy traffic to and from a WebSockets client to a normal TCP diff --git a/tests/test_exception.py b/tests/test_exception.py index 9b5355a..cb60995 100644 --- a/tests/test_exception.py +++ b/tests/test_exception.py @@ -20,14 +20,16 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest -import os import json +import os +import unittest + import kimchi.mockmodel import kimchi.server from utils import * + test_server = None model = None host = None diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index b819172..0830a24 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -20,16 +20,17 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import cherrypy import json import os +import unittest + import kimchi.mockmodel import kimchi.controller - from utils import * + #utils.silence_server() test_server = None model = None diff --git a/tests/test_model.py b/tests/test_model.py index fb7d6dd..07b68b1 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -21,21 +21,23 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest -import threading import os -import time -import tempfile -import psutil import platform +import psutil +import tempfile +import threading +import time +import unittest import uuid + +import iso_gen import kimchi.model import kimchi.objectstore -from kimchi.exception import * -from kimchi import netinfo import utils -import iso_gen +from kimchi import netinfo +from kimchi.exception import * + class ModelTests(unittest.TestCase): def setUp(self): diff --git a/tests/test_networkxml.py b/tests/test_networkxml.py index 4eeeaa2..3073bce 100644 --- a/tests/test_networkxml.py +++ b/tests/test_networkxml.py @@ -20,10 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +import ipaddr import unittest + + import kimchi.networkxml as nxml from kimchi.xmlutils import xpath_get_text -import ipaddr class NetworkXmlTests(unittest.TestCase): diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index f92567d..1dcfdaf 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -21,8 +21,11 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import unittest + + from kimchi.osinfo import * + class OSInfoTests(unittest.TestCase): def test_default_lookup(self): name, entry = lookup(None, None) diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 20cc598..f12b11f 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -20,17 +20,19 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json import os import sys +import unittest from functools import partial + import kimchi.mockmodel import kimchi.server import utils from kimchi import config + test_server = None model = None host = None diff --git a/tests/test_rest.py b/tests/test_rest.py index 73b5243..61369c3 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -20,16 +20,20 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json -import time import os +import time +import unittest + + from functools import partial + import kimchi.mockmodel import kimchi.server -from utils import * from kimchi.asynctask import AsyncTask +from utils import * + test_server = None model = None diff --git a/tests/test_server.py b/tests/test_server.py index 9bb0034..734a618 100644 --- a/tests/test_server.py +++ b/tests/test_server.py @@ -20,12 +20,12 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import unittest import json import os +import unittest -import utils +import utils import kimchi.mockmodel #utils.silence_server() diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 81382c7..92c7385 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -23,9 +23,11 @@ import unittest import uuid + from kimchi.vmtemplate import * from kimchi.xmlutils import xpath_get_text + class VMTemplateTests(unittest.TestCase): def test_minimal_construct(self): fields = (('name', 'test'), ('os_distro', 'unknown'), diff --git a/tests/utils.py b/tests/utils.py index c114813..a7596e8 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -21,16 +21,19 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # -import httplib +import base64 import cherrypy -import threading -import time +import httplib import os -import sys import socket -from contextlib import closing +import sys +import threading +import time import unittest -import base64 + + +from contextlib import closing + import kimchi.server import kimchi.model -- 1.8.1.4 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 1

[project-kimchi] Brazilian language translations V2
by Alexandre Tanaka Hirata 18 Dec '13

18 Dec '13

This patch added some extra translations suggested by Aline and new translations added in Kimchi. The change in chinese was done by make command. -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 2

[project-kimchi] [PATCH] do Chinese translation for release 1.1
by shaohef＠linux.vnet.ibm.com 18 Dec '13

18 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Update en_US.po, kimchi.pot and zh_CN.po. Do not touch pt_BR.po Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- po/en_US.po | 357 +++++++++++++++++++++++++++++++++++++++------------------ po/kimchi.pot | 271 +++++++++++++++++++++++++++++++------------ po/zh_CN.po | 361 +++++++++++++++++++++++++++++++++++++++------------------- 3 files changed, 690 insertions(+), 299 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 86d7c81..7b6b1d7 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,14 +6,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-25 16:33+0800\n" +"POT-Creation-Date: 2013-12-18 23:43+0800\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" +"Language: en_US\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: en_US\n" "Generated-By: pygettext.py 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" @@ -144,6 +144,24 @@ msgstr "Memory" msgid "Create" msgstr "Create" +msgid "Edit Guest" +msgstr "Edit Guest" + +msgid "Name" +msgstr "Name" + +msgid "CPUs" +msgstr "CPUs" + +msgid "Icon" +msgstr "Icon" + +msgid "Cancel" +msgstr "Cancel" + +msgid "Save" +msgstr "Save" + msgid "Reset" msgstr "Reset" @@ -156,20 +174,8 @@ msgstr "Stop" msgid "Actions" msgstr "Actions" -msgid "Name" -msgstr "Name" - -msgid "CPU" -msgstr "CPU" - -msgid "Network I/O" -msgstr "Network I/O" - -msgid "Disk I/O" -msgstr "Disk I/O" - -msgid "Livetile" -msgstr "Livetile" +msgid "Edit" +msgstr "Edit" msgid "Failed to list the template" msgstr "Failed to list the template" @@ -213,6 +219,9 @@ msgstr "Failed to list guests" msgid "Failed to create template" msgstr "Failed to create template" +msgid "Create template successfully" +msgstr "Create template successfully" + msgid "No iso found" msgstr "No iso found" @@ -228,8 +237,70 @@ msgstr "Delete Confirmation" msgid "OK" msgstr "OK" -msgid "Cancel" -msgstr "Cancel" +msgid "Max:" +msgstr "Max:" + +msgid "Utilization" +msgstr "Utilization" + +msgid "Available" +msgstr "Available" + +msgid "Read Rate" +msgstr "Read Rate" + +msgid "Write Rate" +msgstr "Write Rate" + +msgid "Received" +msgstr "Received" + +msgid "Sent" +msgstr "Sent" + +msgid "Confirm" +msgstr "Confirm" + +msgid "" +"Debug report will be removed permanently and can't be recovered. Do you want " +"to continue?" +msgstr "" +"Debug report will be removed permanently and can't be recovered. Do you want " +"to continue?" + +msgid "Debug Reports" +msgstr "Debug Reports" + +msgid "File Path" +msgstr "File Path" + +msgid "Generated Time" +msgstr "Generated Time" + +msgid "Generate" +msgstr "Generate" + +msgid "Generating..." +msgstr "Generating..." + +msgid "Rename" +msgstr "Rename" + +msgid "Remove" +msgstr "Remove" + +msgid "Download" +msgstr "Download" + +msgid "Some VM(s) are running!" +msgstr "Some VM(s) are running!" + +msgid "" +"Shutting down or restarting host will cause unsaved work lost. Continue to " +"shut down/restarting?" +msgstr "" +"Shutting down or restarting host will cause unsaved work lost. Continue to " +"shut down/restarting?" msgid "" "This will delete the VM and its virtual disks. This operation cannot be " @@ -298,6 +369,12 @@ msgstr "The storage pool is not active now." msgid "Failed to delete template." msgstr "Failed to delete template." +msgid "unavailable" +msgstr "unavailable" + +msgid "Network" +msgstr "Network" + msgid "isolated" msgstr "isolated" @@ -323,15 +400,16 @@ msgstr "Create a network" msgid "Warning" msgstr "Warning" +msgid "" +"It will format your disk and you will loose any data in there, are you sure " +"to continue? " +msgstr "" +"It will format your disk and you will loose any data in there, are you sure " +"to continue? " + msgid "Log out" msgstr "Log out" -msgid "unavailable" -msgstr "unavailable" - -msgid "Network" -msgstr "Network" - msgid "Log In" msgstr "Log In" @@ -341,9 +419,136 @@ msgstr "Name" msgid "Password" msgstr "Password" +msgid "Generate a New Debug Report" +msgstr "Generate a New Debug Report" + +msgid "Report Name" +msgstr "Report Name" + +msgid "" +"The name used to identify the report. If omitted, a name will be chosen " +"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " +"\".\"." +msgstr "" +"The name used to identify the report. If omitted, a name will be chosen " +"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " +"\".\"." + +msgid "Define a New Storage Pool" +msgstr "Define a New Storage Pool" + +msgid "Storage Pool Name" +msgstr "Storage Pool Name" + +msgid "" +"The name used to identify the storage pools, and it should not be empty." +msgstr "" +"The name used to identify the storage pools, and it should not be empty." + +msgid "Storage Pool Type" +msgstr "Storage Pool Type" + +msgid "Storage Path" +msgstr "Storage Path" + +msgid "" +"The path of the Storage Pool. Each Storage Pool must have a unique path." +msgstr "" +"The path of the Storage Pool. Each Storage Pool must have a unique path." + +msgid "NFS server IP" +msgstr "NFS server IP" + +msgid "NFS server IP or hostname. It should not be empty." +msgstr "NFS server IP or hostname. It should not be empty." + +msgid "NFS Path" +msgstr "NFS Path" + +msgid "The nfs exported path on nfs server" +msgstr "The nfs exported path on nfs server" + +msgid "Device Path" +msgstr "Device Path" + +msgid "CPU" +msgstr "CPU" + +msgid "Network I/O" +msgstr "Network I/O" + +msgid "Disk I/O" +msgstr "Disk I/O" + +msgid "Livetile" +msgstr "Livetile" + +msgid "No guests found." +msgstr "No guests found." + +msgid "Shut down" +msgstr "Shut down" + +msgid "Restart" +msgstr "Restart" + +msgid "Connect" +msgstr "Connect" + +msgid "Basic Information" +msgstr "Basic Information" + +msgid "OS Distro" +msgstr "OS Distro" + +msgid "OS Code Name" +msgstr "OS Code Name" + +msgid "Processor" +msgstr "Processor" + +msgid "System Statistics" +msgstr "System Statistics" + +msgid "Collecting data after leaving this page" +msgstr "Collecting data after leaving this page" + +msgid "Network Name" +msgstr "Network Name" + msgid "State" msgstr "State" +msgid "Network Type" +msgstr "Network Type" + +msgid "Interface" +msgstr "Interface" + +msgid "Address Space" +msgstr "Address Space" + +msgid "Alphanumeric and '_' characters only." +msgstr "Alphanumeric and '_' characters only." + +msgid "Isolated: no physical network connection" +msgstr "Isolated: no physical network connection" + +msgid "NAT: outbound physical network connection only" +msgstr "NAT: outbound physical network connection only" + +msgid "Bridged: VMs are connected to physical network directly" +msgstr "Bridged: VMs are connected to physical network directly" + +msgid "Destination" +msgstr "Destination" + +msgid "No templates found." +msgstr "No templates found." + +msgid "Version" +msgstr "Version" + msgid "Location" msgstr "Location" @@ -377,25 +582,6 @@ msgstr "Format" msgid "Allocation" msgstr "Allocation" -msgid "Define a New Storage Pool" -msgstr "Define a New Storage Pool" - -msgid "Storage Pool Name" -msgstr "Storage Pool Name" - -msgid "" -"The name used to identify the storage pools, and it should not be empty." -msgstr "" -"The name used to identify the storage pools, and it should not be empty." - -msgid "Storage Path" -msgstr "Storage Path" - -msgid "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." -msgstr "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." - msgid "Add Template" msgstr "Add Template" @@ -408,6 +594,12 @@ msgstr "Local ISO Image" msgid "Remote ISO Image" msgstr "Remote ISO Image" +msgid "Search ISOs" +msgstr "Search ISOs" + +msgid "Please, wait..." +msgstr "Please, wait..." + msgid "The following ISOs are available:" msgstr "The following ISOs are available:" @@ -423,6 +615,9 @@ msgstr "Version: " msgid "Size: " msgstr "Size: " +msgid "Search more ISOs" +msgstr "Search more ISOs" + msgid "Create Templates from Selected ISO" msgstr "Create Templates from Selected ISO" @@ -438,74 +633,14 @@ msgstr "Edit Template" msgid "Vendor" msgstr "Vendor" -msgid "Version" -msgstr "Version" - -msgid "Icon" -msgstr "Icon" - -msgid "Default" -msgstr "Default" - -msgid "Background Color" -msgstr "Background Color" - -msgid "Overlay Type" -msgstr "Overlay Type" +msgid "CPU Number" +msgstr "CPU Number" -msgid "Overlay Type Icon" -msgstr "Overlay Type Icon" +msgid "Disk (GB)" +msgstr "Disk (GB)" -msgid "Overlay Type Text" -msgstr "Overlay Type Text" +msgid "CDROM" +msgstr "CDROM" -msgid "Button Finish Style" -msgstr "Button Finish Style" - -msgid "Button Finish Style Gloss" -msgstr "Button Finish Style Gloss" - -msgid "Button Finish Style Gradient" -msgstr "Button Finish Style Gradient" - -msgid "Save" -msgstr "Save" - -msgid "No templates found." -msgstr "No templates found." - -msgid "Edit" -msgstr "Edit" - -msgid "Default Settings" -msgstr "Default Settings" - -msgid "CPUs" -msgstr "CPUs" - -msgid "Network Name" -msgstr "Network Name" - -msgid "Network Type" -msgstr "Network Type" - -msgid "Interface" -msgstr "Interface" - -msgid "Address Space" -msgstr "Address Space" - -msgid "Alphanumeric and '_' characters only." -msgstr "Alphanumeric and '_' characters only." - -msgid "Isolated: no physical network connection" -msgstr "Isolated: no physical network connection" - -msgid "NAT: outbound physical network connection only" -msgstr "NAT: outbound physical network connection only" - -msgid "Bridged: VMs are connected to physical network directly" -msgstr "Bridged: VMs are connected to physical network directly" - -msgid "Destination" -msgstr "Destination" +msgid "Storage Pool" +msgstr "Storage Pool" diff --git a/po/kimchi.pot b/po/kimchi.pot index 1d2c688..c83f089 100644 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,10 +8,11 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-25 16:33+0800\n" +"POT-Creation-Date: 2013-12-18 23:43+0800\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" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" @@ -141,31 +142,37 @@ msgstr "" msgid "Create" msgstr "" -msgid "Reset" +msgid "Edit Guest" msgstr "" -msgid "Start" +msgid "Name" msgstr "" -msgid "Stop" +msgid "CPUs" msgstr "" -msgid "Actions" +msgid "Icon" msgstr "" -msgid "Name" +msgid "Cancel" msgstr "" -msgid "CPU" +msgid "Save" msgstr "" -msgid "Network I/O" +msgid "Reset" msgstr "" -msgid "Disk I/O" +msgid "Start" msgstr "" -msgid "Livetile" +msgid "Stop" +msgstr "" + +msgid "Actions" +msgstr "" + +msgid "Edit" msgstr "" msgid "Failed to list the template" @@ -210,6 +217,9 @@ msgstr "" msgid "Failed to create template" msgstr "" +msgid "Create template successfully" +msgstr "" + msgid "No iso found" msgstr "" @@ -225,7 +235,65 @@ msgstr "" msgid "OK" msgstr "" -msgid "Cancel" +msgid "Max:" +msgstr "" + +msgid "Utilization" +msgstr "" + +msgid "Available" +msgstr "" + +msgid "Read Rate" +msgstr "" + +msgid "Write Rate" +msgstr "" + +msgid "Received" +msgstr "" + +msgid "Sent" +msgstr "" + +msgid "Confirm" +msgstr "" + +msgid "" +"Debug report will be removed permanently and can't be recovered. Do you want " +"to continue?" +msgstr "" + +msgid "Debug Reports" +msgstr "" + +msgid "File Path" +msgstr "" + +msgid "Generated Time" +msgstr "" + +msgid "Generate" +msgstr "" + +msgid "Generating..." +msgstr "" + +msgid "Rename" +msgstr "" + +msgid "Remove" +msgstr "" + +msgid "Download" +msgstr "" + +msgid "Some VM(s) are running!" +msgstr "" + +msgid "" +"Shutting down or restarting host will cause unsaved work lost. Continue to " +"shut down/restarting?" msgstr "" msgid "" @@ -290,6 +358,12 @@ msgstr "" msgid "Failed to delete template." msgstr "" +msgid "unavailable" +msgstr "" + +msgid "Network" +msgstr "" + msgid "isolated" msgstr "" @@ -313,13 +387,12 @@ msgstr "" msgid "Warning" msgstr "" -msgid "Log out" -msgstr "" - -msgid "unavailable" +msgid "" +"It will format your disk and you will loose any data in there, are you sure " +"to continue? " msgstr "" -msgid "Network" +msgid "Log out" msgstr "" msgid "Log In" @@ -331,169 +404,223 @@ msgstr "" msgid "Password" msgstr "" -msgid "State" +msgid "Generate a New Debug Report" msgstr "" -msgid "Location" +msgid "Report Name" msgstr "" -msgid "Type" +msgid "" +"The name used to identify the report. If omitted, a name will be chosen " +"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " +"\".\"." msgstr "" -msgid "Capacity" +msgid "Define a New Storage Pool" msgstr "" -msgid "Allocated" +msgid "Storage Pool Name" msgstr "" -msgid "active" +msgid "" +"The name used to identify the storage pools, and it should not be empty." msgstr "" -msgid "inactive" +msgid "Storage Pool Type" msgstr "" -msgid "Deactivate" +msgid "Storage Path" msgstr "" -msgid "Activate" +msgid "" +"The path of the Storage Pool. Each Storage Pool must have a unique path." msgstr "" -msgid "Undefine" +msgid "NFS server IP" msgstr "" -msgid "Format" +msgid "NFS server IP or hostname. It should not be empty." msgstr "" -msgid "Allocation" +msgid "NFS Path" msgstr "" -msgid "Define a New Storage Pool" +msgid "The nfs exported path on nfs server" msgstr "" -msgid "Storage Pool Name" +msgid "Device Path" msgstr "" -msgid "" -"The name used to identify the storage pools, and it should not be empty." +msgid "CPU" msgstr "" -msgid "Storage Path" +msgid "Network I/O" msgstr "" -msgid "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." +msgid "Disk I/O" msgstr "" -msgid "Add Template" +msgid "Livetile" msgstr "" -msgid "Where is the source media for this template? " +msgid "No guests found." msgstr "" -msgid "Local ISO Image" +msgid "Shut down" msgstr "" -msgid "Remote ISO Image" +msgid "Restart" msgstr "" -msgid "The following ISOs are available:" +msgid "Connect" msgstr "" -msgid "All" +msgid "Basic Information" msgstr "" -msgid "OS: " +msgid "OS Distro" msgstr "" -msgid "Version: " +msgid "OS Code Name" msgstr "" -msgid "Size: " +msgid "Processor" msgstr "" -msgid "Create Templates from Selected ISO" +msgid "System Statistics" msgstr "" -msgid "I want to use a specific ISO file" +msgid "Collecting data after leaving this page" msgstr "" -msgid "I want to use a custom URL" +msgid "Network Name" msgstr "" -msgid "Edit Template" +msgid "State" msgstr "" -msgid "Vendor" +msgid "Network Type" +msgstr "" + +msgid "Interface" +msgstr "" + +msgid "Address Space" +msgstr "" + +msgid "Alphanumeric and '_' characters only." +msgstr "" + +msgid "Isolated: no physical network connection" +msgstr "" + +msgid "NAT: outbound physical network connection only" +msgstr "" + +msgid "Bridged: VMs are connected to physical network directly" +msgstr "" + +msgid "Destination" +msgstr "" + +msgid "No templates found." msgstr "" msgid "Version" msgstr "" -msgid "Icon" +msgid "Location" msgstr "" -msgid "Default" +msgid "Type" msgstr "" -msgid "Background Color" +msgid "Capacity" msgstr "" -msgid "Overlay Type" +msgid "Allocated" msgstr "" -msgid "Overlay Type Icon" +msgid "active" msgstr "" -msgid "Overlay Type Text" +msgid "inactive" msgstr "" -msgid "Button Finish Style" +msgid "Deactivate" msgstr "" -msgid "Button Finish Style Gloss" +msgid "Activate" msgstr "" -msgid "Button Finish Style Gradient" +msgid "Undefine" msgstr "" -msgid "Save" +msgid "Format" msgstr "" -msgid "No templates found." +msgid "Allocation" msgstr "" -msgid "Edit" +msgid "Add Template" msgstr "" -msgid "Default Settings" +msgid "Where is the source media for this template? " msgstr "" -msgid "CPUs" +msgid "Local ISO Image" msgstr "" -msgid "Network Name" +msgid "Remote ISO Image" msgstr "" -msgid "Network Type" +msgid "Search ISOs" msgstr "" -msgid "Interface" +msgid "Please, wait..." msgstr "" -msgid "Address Space" +msgid "The following ISOs are available:" msgstr "" -msgid "Alphanumeric and '_' characters only." +msgid "All" msgstr "" -msgid "Isolated: no physical network connection" +msgid "OS: " msgstr "" -msgid "NAT: outbound physical network connection only" +msgid "Version: " msgstr "" -msgid "Bridged: VMs are connected to physical network directly" +msgid "Size: " msgstr "" -msgid "Destination" +msgid "Search more ISOs" +msgstr "" + +msgid "Create Templates from Selected ISO" +msgstr "" + +msgid "I want to use a specific ISO file" +msgstr "" + +msgid "I want to use a custom URL" +msgstr "" + +msgid "Edit Template" +msgstr "" + +msgid "Vendor" +msgstr "" + +msgid "CPU Number" +msgstr "" + +msgid "Disk (GB)" +msgstr "" + +msgid "CDROM" +msgstr "" + +msgid "Storage Pool" msgstr "" diff --git a/po/zh_CN.po b/po/zh_CN.po index 2a34051..6d13f4e 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,14 +20,14 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-11-25 16:33+0800\n" +"POT-Creation-Date: 2013-12-18 23:43+0800\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" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" "Generated-By: pygettext.py 1.5\n" "X-Poedit-Country: CHINA\n" "X-Poedit-Language: Chinese\n" @@ -158,6 +158,24 @@ msgstr "内存" msgid "Create" msgstr "创建" +msgid "Edit Guest" +msgstr "修改客户机" + +msgid "Name" +msgstr "名称" + +msgid "CPUs" +msgstr "中央处理器" + +msgid "Icon" +msgstr "图标" + +msgid "Cancel" +msgstr "取消" + +msgid "Save" +msgstr "保存" + msgid "Reset" msgstr "重置" @@ -170,20 +188,8 @@ msgstr "停止" msgid "Actions" msgstr "操作" -msgid "Name" -msgstr "名称" - -msgid "CPU" -msgstr "处理器" - -msgid "Network I/O" -msgstr "网络I/O" - -msgid "Disk I/O" -msgstr "磁盘I/O" - -msgid "Livetile" -msgstr "屏幕" +msgid "Edit" +msgstr "编辑" msgid "Failed to list the template" msgstr "展示模板列表失败" @@ -227,6 +233,9 @@ msgstr "客户机列表加载失败" msgid "Failed to create template" msgstr "模板创建失败" +msgid "Create template successfully" +msgstr "创建模板成功" + msgid "No iso found" msgstr "没有发现ISO文件" @@ -242,8 +251,66 @@ msgstr "删除确认" msgid "OK" msgstr "确定" -msgid "Cancel" -msgstr "取消" +msgid "Max:" +msgstr "最大：" + +msgid "Utilization" +msgstr "利用率" + +msgid "Available" +msgstr "可利用的" + +msgid "Read Rate" +msgstr "读速率" + +msgid "Write Rate" +msgstr "写速率" + +msgid "Received" +msgstr "接收" + +msgid "Sent" +msgstr "发送" + +msgid "Confirm" +msgstr "确认" + +msgid "" +"Debug report will be removed permanently and can't be recovered. Do you want " +"to continue?" +msgstr "诊断报告将被永久删除，并且不能恢复。继续？" + +msgid "Debug Reports" +msgstr "主机诊断报告" + +msgid "File Path" +msgstr "文件路径" + +msgid "Generated Time" +msgstr "生成时间" + +msgid "Generate" +msgstr "生成" + +msgid "Generating..." +msgstr "正在生成..." + +msgid "Rename" +msgstr "重命名" + +msgid "Remove" +msgstr "删除" + +msgid "Download" +msgstr "下载" + +msgid "Some VM(s) are running!" +msgstr "有虚拟机在运行！" + +msgid "" +"Shutting down or restarting host will cause unsaved work lost. Continue to " +"shut down/restarting?" +msgstr "关闭或者重启主机会导致没有保存的工作丢失。继续关机/重启？" msgid "" "This will delete the VM and its virtual disks. This operation cannot be " @@ -263,7 +330,7 @@ msgid "This is not a valid url." msgstr "这不是一个有效的URL" msgid "This is not a valid ISO file." -msgstr "" +msgstr "这不是一个有效的ISO文件" msgid "" "This will permanently delete the Storage Pool. Would you like to continue?" @@ -276,10 +343,10 @@ msgid "The storage pool path can not be blank." msgstr "存储池的路径不能为空" msgid "NFS server can not be blank." -msgstr "" +msgstr "NFS服务器不能为空" msgid "NFS server mount path can not be blank." -msgstr "" +msgstr "NFS服务器挂载路径不能为空" msgid "" "Invalid Storage Pool name. It may only contain letters, numbers, " @@ -290,10 +357,10 @@ msgid "This is not a real linux path." msgstr "这不是一个符合要求的LINUX路径" msgid "This is not a valid NFS server." -msgstr "" +msgstr "这不是一个有效的NFS服务器" msgid "Invalid nfs mount path." -msgstr "" +msgstr "无效的nfs挂载路径" msgid "This storage pool is empty." msgstr "这个存储池为空" @@ -305,7 +372,13 @@ msgid "The storage pool is not active now." msgstr "存储池没有被启用" msgid "Failed to delete template." -msgstr "" +msgstr "删除模版失败" + +msgid "unavailable" +msgstr "无法获取" + +msgid "Network" +msgstr "网络" msgid "isolated" msgstr "隔离" @@ -330,15 +403,15 @@ msgstr "创建一个网络" msgid "Warning" msgstr "警告" +msgid "" +"It will format your disk and you will loose any data in there, are you sure " +"to continue? " +msgstr "" +"你的磁盘将会格式化，磁盘上的数据会丢失，你确定要继续吗？" + msgid "Log out" msgstr "登出" -msgid "unavailable" -msgstr "无法获取" - -msgid "Network" -msgstr "网络" - msgid "Log In" msgstr "登录" @@ -348,9 +421,133 @@ msgstr "用户名" msgid "Password" msgstr "密码" +msgid "Generate a New Debug Report" +msgstr "产生一个新的诊断报告" + +msgid "Report Name" +msgstr "诊断报告名" + +msgid "" +"The name used to identify the report. If omitted, a name will be chosen " +"based on current time. Name can contain: letters, digits, \"-\", \"_\", or " +"\".\"." +msgstr "" +"该名称用来唯一标识报告，如果不指定，将会基于当前时间自动生成一个名称。名称可" +"以包含: 字母、数字、\"-\"、\"_\" 或者 \".\"" + +msgid "Define a New Storage Pool" +msgstr "定义一个新的存储池" + +msgid "Storage Pool Name" +msgstr "存储池名称" + +msgid "" +"The name used to identify the storage pools, and it should not be empty." +msgstr "该名称用来唯一标识存储池，该名称不能为空。" + +msgid "Storage Pool Type" +msgstr "存储池类型" + +msgid "Storage Path" +msgstr "存储路径" + +msgid "" +"The path of the Storage Pool. Each Storage Pool must have a unique path." +msgstr "存储池的路径.每个存储池的路径是唯一的。" + +msgid "NFS server IP" +msgstr "NFS服务器IP" + +msgid "NFS server IP or hostname. It should not be empty." +msgstr "NFS服务器IP或者主机名，不能为空。" + +msgid "NFS Path" +msgstr "NFS 路径" + +msgid "The nfs exported path on nfs server" +msgstr "nfs服务器上导出的路径" + +msgid "Device Path" +msgstr "设备路径" + +msgid "CPU" +msgstr "处理器" + +msgid "Network I/O" +msgstr "网络I/O" + +msgid "Disk I/O" +msgstr "磁盘I/O" + +msgid "Livetile" +msgstr "屏幕" + +msgid "No guests found." +msgstr "没有发现客户机" + +msgid "Shut down" +msgstr "关机" + +msgid "Restart" +msgstr "重启" + +msgid "Connect" +msgstr "连接到" + +msgid "Basic Information" +msgstr "基本信息" + +msgid "OS Distro" +msgstr "操作系统发布版本" + +msgid "OS Code Name" +msgstr "操作系统代码" + +msgid "Processor" +msgstr "处理器" + +msgid "System Statistics" +msgstr "系统统计信息" + +msgid "Collecting data after leaving this page" +msgstr "离开该页面继续收集数据" + +msgid "Network Name" +msgstr "网络名称" + msgid "State" msgstr "状态" +msgid "Network Type" +msgstr "网络类型" + +msgid "Interface" +msgstr "网络接口" + +msgid "Address Space" +msgstr "地址空间" + +msgid "Alphanumeric and '_' characters only." +msgstr "字母，数字和下划线。" + +msgid "Isolated: no physical network connection" +msgstr "隔离: 同物理网络不连通" + +msgid "NAT: outbound physical network connection only" +msgstr "NAT: 从虚拟机到物理网络单向连接" + +msgid "Bridged: VMs are connected to physical network directly" +msgstr "桥接: 虚拟机直接接入物理网络" + +msgid "Destination" +msgstr "目标设备" + +msgid "No templates found." +msgstr "没有发现模板" + +msgid "Version" +msgstr "版本" + msgid "Location" msgstr "路径" @@ -384,23 +581,6 @@ msgstr "格式" msgid "Allocation" msgstr "分配" -msgid "Define a New Storage Pool" -msgstr "定义一个新的存储池" - -msgid "Storage Pool Name" -msgstr "存储池名称" - -msgid "" -"The name used to identify the storage pools, and it should not be empty." -msgstr "该名称用来唯一标识存储池，如果不指定，将会基于模板自动生成一个名称。" - -msgid "Storage Path" -msgstr "存储路径" - -msgid "" -"The path of the Storage Pool. Each Storage Pool must have a unique path." -msgstr "存储池的路径.每个存储池的路径是唯一的。" - msgid "Add Template" msgstr "创建模板" @@ -413,6 +593,12 @@ msgstr "本地ISO镜像" msgid "Remote ISO Image" msgstr "远程ISO镜像" +msgid "Search ISOs" +msgstr "搜索ISO" + +msgid "Please, wait..." +msgstr "请等待..." + msgid "The following ISOs are available:" msgstr "可用ISO文件如下" @@ -428,11 +614,14 @@ msgstr "版本： " msgid "Size: " msgstr "大小：" +msgid "Search more ISOs" +msgstr "搜索更多ISO" + msgid "Create Templates from Selected ISO" msgstr "从选中的ISO中创建模板" msgid "I want to use a specific ISO file" -msgstr "" +msgstr "指定一个ISO文件" msgid "I want to use a custom URL" msgstr "我想用一个自定义的URL" @@ -443,74 +632,14 @@ msgstr "编辑模板" msgid "Vendor" msgstr "厂商" -msgid "Version" -msgstr "版本" - -msgid "Icon" -msgstr "图标" - -msgid "Default" -msgstr "默认" - -msgid "Background Color" -msgstr "背景颜色" - -msgid "Overlay Type" -msgstr "叠层类型" - -msgid "Overlay Type Icon" -msgstr "叠层型图标" - -msgid "Overlay Type Text" -msgstr "叠层型文本" - -msgid "Button Finish Style" -msgstr "完成按钮样式" - -msgid "Button Finish Style Gloss" -msgstr "纯色" - -msgid "Button Finish Style Gradient" -msgstr "渐变色" - -msgid "Save" -msgstr "保存" - -msgid "No templates found." -msgstr "没有发现模板" - -msgid "Edit" -msgstr "编辑" - -msgid "Default Settings" -msgstr "默认设置" - -msgid "CPUs" -msgstr "中央处理器" +msgid "CPU Number" +msgstr "CPU个数" -msgid "Network Name" -msgstr "网络名称" +msgid "Disk (GB)" +msgstr "磁盘（GB）" -msgid "Network Type" -msgstr "网络类型" - -msgid "Interface" -msgstr "网络接口" - -msgid "Address Space" -msgstr "地址空间" +msgid "CDROM" +msgstr "光驱" -msgid "Alphanumeric and '_' characters only." -msgstr "字母，数字和下划线。" - -msgid "Isolated: no physical network connection" -msgstr "隔离: 同物理网络不连通" - -msgid "NAT: outbound physical network connection only" -msgstr "NAT: 从虚拟机到物理网络单向连接" - -msgid "Bridged: VMs are connected to physical network directly" -msgstr "桥接: 虚拟机直接接入物理网络" - -msgid "Destination" -msgstr "目标设备" +msgid "Storage Pool" +msgstr "存储池" -- 1.7.11.7 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

3 2

[project-kimchi] Use sysfs to list all block device paths
by Zhou Zheng Sheng 18 Dec '13

18 Dec '13

Hi all, I find block device information in sysfs is accurate and complete. Firstly run lsblk -bPo NAME,MAJ:MIN It shows NAME="vda" MAJ:MIN="253:0" NAME="vda1" MAJ:MIN="253:1" When there is multipath, it shows NAME="35000cca68ac8e2fd" MAJ:MIN="253:0" NAME="35000cca68ac8e2fdp1" MAJ:MIN="253:1" Then we parse the major and min, and cat the related sysfs uevent file cat /sys/dev/block/253\:0/uevent It shows MAJOR=253 MINOR=0 DEVNAME=vda DEVTYPE=disk When there is multipath, it shows MAJOR=253 MINOR=0 DEVNAME=dm-0 DEVTYPE=disk The "DEVNAME=vda" or "DEVNAME=dm-0" is the device node name under the "/dev/" So there can be /dev/vda or /dev/dm-0 In fact, on my machine, the multipath device node is a link to dm-0 /dev/mapper/35000cca68ac8e2fd -> ../dm-0 So we can show in front-end like following. vda1 (/dev/vda1) 35000cca68ac8e2fd (/dev/dm-0) The use mostly cares the name, the path is just supplement information. User just asks front-end to use "vda1" or "35000cca68ac8e2fd" to create pool, then we map the names to path. In this way we don't need to blkid to determine the path, and can drop the check on" blkid path being not None". Test on Fedora and Ubuntu. Generally speaking, I also can accept a temp solution just assuming all NAME listed by lsblk can be mapped to "/dev/NAME". We just need to check if "/dev/NAME" does exist or not, if not, skip this device. I'm afraid I have no time to finish a second version of the patch. Maybe Aline or Daniel can help me. I feel very sorry to not have time to finish the patch I started. Thanks very much! -- Thanks and best regards! Zhou Zheng Sheng / 周征晟 E-mail: zhshzhou(a)linux.vnet.ibm.com Telephone: 86-10-82454397 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] [PATCH v1 1/3] PEP 8: cleanup src/kimchi/disks.py
by Zhou Zheng Sheng 18 Dec '13

18 Dec '13

Make this file PEP 8 clean Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 1 + src/kimchi/disks.py | 37 ++++++++++++++++++++----------------- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index b79919c..e57d3b6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ EXTRA_DIST = \ PEP8_WHITELIST = \ src/kimchi/asynctask.py \ src/kimchi/config.py.in \ + src/kimchi/disks.py \ src/kimchi/server.py \ plugins/__init__.py \ plugins/sample/__init__.py \ diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 93d5dbc..874f669 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -18,26 +18,26 @@ # # You should have received a copy of the GNU Lesser General Public # License along with this library; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import collections -import os import re import subprocess -import sys from kimchi.exception import OperationFailed + def get_partitions_paths(): try: """ Returns all available partitions path of the host """ - blkid = subprocess.Popen(["blkid", "-o", "device" ], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + blkid = subprocess.Popen( + ["blkid", "-o", "device"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) dev_paths = blkid.communicate()[0].rstrip("\n").split("\n") except: raise OperationFailed("Unable to retrieve partitions' full path.") return dev_paths + def get_partition_path(name, dev_paths): """ Returns device path given a partition name """ dev_path = None @@ -49,11 +49,13 @@ def get_partition_path(name, dev_paths): if dev_path: return dev_path + def get_partitions_names(): try: """ Returns all the names of available partitions """ - lsblk = subprocess.Popen(["lsblk", "-Pbo","NAME,TYPE" ], - stdout=subprocess.PIPE, stderr=subprocess.PIPE) + lsblk = subprocess.Popen( + ["lsblk", "-Pbo", "NAME,TYPE"], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) output = lsblk.communicate()[0] lines_output = output.rstrip("\n").split("\n") # Will be used later to double check the partition @@ -67,11 +69,12 @@ def get_partitions_names(): expression = r"%s=\".*?\"" % key match = re.search(expression, line) field = match.group() - k, v = field.split('=',1) + k, v = field.split('=', 1) d[k.lower()] = v[1:-1] - if d['type'] not in ['part','lvm']: + if d['type'] not in ['part', 'lvm']: continue - # split()[0] to avoid the second part of the name, after the whiteline + # split()[0] to avoid the second part of the name, + # after the whiteline name = d['name'].split()[0] # There are special cases where lsblk reports # a partition that does not exist in blkid and fdisk (Extended @@ -84,18 +87,18 @@ def get_partitions_names(): except: raise OperationFailed("Unable to retrieve partitions' full path.") + def get_partition_details(name): try: # Find device path - dev_path = get_partition_path(name, - get_partitions_paths()) + dev_path = get_partition_path(name, get_partitions_paths()) # Couldn't find dev_path. if not dev_path: return # Executing lsblk to get partition/disk info - lsblk = subprocess.Popen(["lsblk", "-Pbo", - "TYPE,FSTYPE,SIZE,MOUNTPOINT", dev_path ], - stdout=subprocess.PIPE,stderr=subprocess.PIPE) + lsblk = subprocess.Popen( + ["lsblk", "-Pbo", "TYPE,FSTYPE,SIZE,MOUNTPOINT", dev_path], + stdout=subprocess.PIPE, stderr=subprocess.PIPE) # single line output output = lsblk.communicate()[0].rstrip("\n") # output is on format key="value", where key = NAME, TYPE, FSTYPE, @@ -106,7 +109,7 @@ def get_partition_details(name): expression = r"%s=\".*?\"" % key match = re.search(expression, output) field = match.group() - k, v = field.split('=',1) + k, v = field.split('=', 1) d[k.lower()] = v[1:-1] if d['mountpoint']: # Sometimes the mountpoint comes with [SWAP] or other -- 1.7.11.7 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 4

[project-kimchi][PATCHv2 0/2] NFS prevalidation
by lvroyce＠linux.vnet.ibm.com 18 Dec '13

18 Dec '13

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, move nfs checking to util to avoid misunderstanding. This patchset solves following problem: 1. libvirt uses local directory when nfs target path is not accessible, this patch denies this unaccessible path instead. 2. libvirt storage subsystem hang for a long period, with a quick checking, storage pool operation will not hang if pre-checked. 3. Future access control check will do in prevalidation, this prevents qemu manipulate storage pool of no read access to make early warning. Royce Lv (2): utils: Add nfs prevalication Integrate nfs path check before create nfs pool src/kimchi/model.py | 7 ++++++- src/kimchi/utils.py | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 1 deletion(-) -- 1.8.1.2 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 4

Re: [Kimchi-devel] [project-kimchi][PATCH 1/3] utils: Add a helper function to parse cmd result
by Royce Lv 18 Dec '13

18 Dec '13

On 2013年12月17日 20:50, Ramon Medeiros wrote: > On 12/17/2013 10:10 AM, lvroyce0210(a)gmail.com wrote: >> From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> >> Abstract a helper function to parse cmd result. >> Usage: >> (1)get cmd result with subprocess.call or subprocess.Popen >> (2) call pass_cmd_output to get formated outputs >> Example: >> blkid = subprocess.Popen(["cat", "/proc/mounts"], >> stdout=subprocess.PIPE, stderr=subprocess.PIPE) >> outs = blkid.communicate()[0] >> output_items= ['path', 'mnt_point', 'type', 'option'] >> utils.pass_cmd_output(outs, output_items) >> Sample output: >> [{'path': '/dev/sda8', 'type': 'ext4', >> 'option': 'rw,relatime,data=ordered', 'mnt_point': '/home'}, >> {'path': 'localhost:/home/royce/isorepo', 'type': 'nfs4', >> 'option': 'rw...addr=127.0.0.1', 'mnt_point': '/mnt'}] >> >> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> --- >> src/kimchi/utils.py | 7 +++++++ >> 1 file changed, 7 insertions(+) >> >> diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py >> index f7eda93..1890a28 100644 >> --- a/src/kimchi/utils.py >> +++ b/src/kimchi/utils.py >> @@ -84,3 +84,10 @@ def import_class(class_path): >> >> def import_module(module_name): >> return __import__(module_name, fromlist=['']) >> + >> +def parse_cmd_output(output, output_items): >> + res = [] >> + for line in output.split("\n"): > can you get the Popen result and use readlines, to get a array with > the lines, instead of striping it? Hi Ramon, Thanks for your review, I think for file read result it is OK, but seems for popen.communicate just pull out the raw output , and only stdout provide readlines interface, which official doc does not recommend because of deadlock problem. (http://docs.python.org/3.3/library/subprocess.html#subprocess.Popen.communi…) >> + res.append(dict(zip(output_items, line.split()))) >> + >> + return res > > -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

3 4

[project-kimchi] Re: [PATCH] [Issue #287] Confirm box will be hidden by the window dialog
by Aline Manera 18 Dec '13

18 Dec '13

Applied. Thanks. Regards, Aline Manera -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] Re: [PATCH V2] Add confirm box to create logical pool, and modify device path number
by Aline Manera 18 Dec '13

18 Dec '13

Applied. Thanks. Regards, Aline Manera -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

1 0

[project-kimchi] [PATCH] Use spacewalk repo to get python-ethtool on suse.
by shaohef＠linux.vnet.ibm.com 18 Dec '13

18 Dec '13

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Discuss with aline, use spacewalk to get python-ethtool on suse. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- docs/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/README.md b/docs/README.md index cf190ab..e7599ec 100644 --- a/docs/README.md +++ b/docs/README.md @@ -78,8 +78,8 @@ for more information on how to configure your system to access this repository. *Note for openSUSE users*: Some of the above packages are located in the openSUSE Systems Management repository. See -[this FAQ](http://download.opensuse.org/repositories/systemsmanagement/) to get -the correct repository based on your openSUSE version. And +[this FAQ](http://download.opensuse.org/repositories/systemsmanagement:/spacewalk… +to get the correct repository based on your openSUSE version. And [this FAQ](http://en.opensuse.org/SDB:Add_package_repositories) for more information on how configure your system to access this repository. -- 1.7.11.7 -- project-kimchi mailing list <project-kimchi(a)googlegroups.com> https://groups.google.com/forum/#!forum/project-kimchi --- You received this message because you are subscribed to the Google Groups "project-kimchi" group. To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com. For more options, visit https://groups.google.com/groups/opt_out.

2 2