- Kimchi-devel - oVirt List Archives

[PATCH V1 0/2] Add the nfs pool server and target select UI(new jquery widget)
by zhoumeina 27 Dec '13

27 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 a new jquery filter-select widget ui/css/theme-default/button.css | 11 ++-- ui/css/theme-default/form.css | 6 ++ ui/css/theme-default/storage.css | 4 +- ui/js/Makefile.am | 4 +- ui/js/src/kimchi.api.js | 26 +++++++- ui/js/src/kimchi.storagepool_add_main.js | 43 ++++++++++++ ui/js/widgets/filter-select.js | 110 ++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 4 +- ui/pages/storagepool-add.html.tmpl | 39 ++++++++--- 9 files changed, 226 insertions(+), 21 deletions(-) create mode 100644 ui/js/widgets/filter-select.js

1 0

[PATCH 00/16] Reorganize controller module
by Aline Manera 26 Dec '13

26 Dec '13

From: Aline Manera <alinefm(a)br.ibm.com> The current implemenation put all resources implementation into controller.py file. That way this file tends to increase to infinity as more resources are added to Kimchi. This patch splits controller module (controller.py) into small modules. So each resource will have its own controller implementation under /control It will make maintenance easier and anyone can easily identify where any resource is implemented. This patch set does not change any logic - just move classes from controller to a new module. Aline Manera (16): Move generate_action_handler() function to Resource() class Move common functions for Resource and Collection to control/utils.py Move login() and logout() functions from controller.py to root.py Move basic controller resources to control/base.py Move all resources related to vms to control/vms.py Move all resources related to templates to control/templates.py Move all resources related to debug reports to control/debugreports.py Move all resources related to storage pools to control/storagepools.py Move all resources related to storage volume to control/storagevolumes.py Move all resources related to interfaces to control/interfaces.py Move all resources related to networks to control/networks.py Move all resources related to config to control/config.py Move all resources related to host to control/host.py Move all resources related to plugins to control/plugins.py Move all resources related to tasks to control/tasks.py Use new control modules in root.py Makefile.am | 13 + src/kimchi/control/__init__.py | 21 + src/kimchi/control/base.py | 290 +++++++++++++ src/kimchi/control/config.py | 65 +++ src/kimchi/control/debugreports.py | 52 +++ src/kimchi/control/host.py | 61 +++ src/kimchi/control/interfaces.py | 44 ++ src/kimchi/control/networks.py | 48 +++ src/kimchi/control/plugins.py | 44 ++ src/kimchi/control/storagepools.py | 125 ++++++ src/kimchi/control/storagevolumes.py | 79 ++++ src/kimchi/control/tasks.py | 41 ++ src/kimchi/control/templates.py | 51 +++ src/kimchi/control/utils.py | 103 +++++ src/kimchi/control/vms.py | 64 +++ src/kimchi/controller.py | 755 ---------------------------------- src/kimchi/root.py | 61 ++- 17 files changed, 1147 insertions(+), 770 deletions(-) create mode 100644 src/kimchi/control/__init__.py create mode 100644 src/kimchi/control/base.py create mode 100644 src/kimchi/control/config.py create mode 100644 src/kimchi/control/debugreports.py create mode 100644 src/kimchi/control/host.py create mode 100644 src/kimchi/control/interfaces.py create mode 100644 src/kimchi/control/networks.py create mode 100644 src/kimchi/control/plugins.py create mode 100644 src/kimchi/control/storagepools.py create mode 100644 src/kimchi/control/storagevolumes.py create mode 100644 src/kimchi/control/tasks.py create mode 100644 src/kimchi/control/templates.py create mode 100644 src/kimchi/control/utils.py create mode 100644 src/kimchi/control/vms.py delete mode 100644 src/kimchi/controller.py -- 1.7.10.4

6 73

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

26 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

RFC: If we want to import third-part widgets to enhance kimchi UI
by zhoumeina 26 Dec '13

26 Dec '13

As we know that as the development of kimchi UI, more and more new feature merged. And we need more UI widgets to support our feature. Just like charts, tooltips, filter select and so on. and also will be more complex. And our way to solve this problem is trying to make a widget by css, do we want to continue this way? or trying to find some common jquery third-part widget? Appreciate anycomments. <http://fanyi.baidu.com/###> Appreciate anycomments

2 1

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 26 Dec '13

26 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