- Kimchi-devel - oVirt List Archives

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

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

18 Dec '13

Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> On 12/18/2013 12:34 AM, zhoumeina wrote: > Add a confirm box to create logical pool, because it is a quite > dangerous action. > > Make device path number to "3" > Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com> > --- > ui/js/src/kimchi.storagepool_add_main.js | 30 ++++++++++++++++++++++++------ > ui/pages/i18n.html.tmpl | 4 +++- > ui/pages/storagepool-add.html.tmpl | 2 +- > 3 files changed, 28 insertions(+), 8 deletions(-) > > diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js > index 7efbfa0..66500f3 100644 > --- a/ui/js/src/kimchi.storagepool_add_main.js > +++ b/ui/js/src/kimchi.storagepool_add_main.js > @@ -157,11 +157,29 @@ kimchi.addPool = function(event) { > formData.nfspath = $('#nfspathId').val(); > formData.nfsserver = $('#nfsserverId').val(); > } > - kimchi.createStoragePool(formData, function() { > - kimchi.doListStoragePools(); > - kimchi.window.close(); > - }, function(err) { > - kimchi.message.error(err.responseJSON.reason); > - }); > + if (poolType === 'logical') { > + var settings = { > + title : i18n['msg.confirm.delete.title'], > + content : i18n['msg.logicalpool.confirm.delete'], > + confirm : i18n['msg.confirm.delete.confirm'], > + cancel : i18n['msg.confirm.delete.cancel'] > + }; > + kimchi.confirm(settings, function() { > + kimchi.createStoragePool(formData, function() { > + kimchi.doListStoragePools(); > + kimchi.window.close(); > + }, function(err) { > + kimchi.message.error(err.responseJSON.reason); > + }); > + }, function() { > + }); > + } else { > + kimchi.createStoragePool(formData, function() { > + kimchi.doListStoragePools(); > + kimchi.window.close(); > + }, function(err) { > + kimchi.message.error(err.responseJSON.reason); > + }); > + } > } > }; > diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl > index 3d0dfff..54bfada 100644 > --- a/ui/pages/i18n.html.tmpl > +++ b/ui/pages/i18n.html.tmpl > @@ -119,7 +119,9 @@ var i18n = { > 'network_dialog_ok': "$_("OK")", > 'network_dialog_cancel': "$_("Cancel")", > 'action_create': "$_("Create")", > - 'msg_warning': "$_("Warning")" > + 'msg_warning': "$_("Warning")", > + 'msg.logicalpool.confirm.delete': "$_("It will format your disk and you will loose any data in" > + "there, are you sure to continue? ")" > }; > </script> > </body> > diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl > index 55cb6e8..d7b046d 100644 > --- a/ui/pages/storagepool-add.html.tmpl > +++ b/ui/pages/storagepool-add.html.tmpl > @@ -92,7 +92,7 @@ > </div> > <div class="logical-section tmpl-html"> > <section class="form-section storageType"> > - <h2>4. $_("Device Path")</h2> > + <h2>3. $_("Device Path")</h2> > <div class="host-partition"></div> > </section> > </div> -- 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 Sheldon 18 Dec '13

18 Dec '13

subject is too long. it should be like this. subject: spec: Open 8000 and 8001 port by default in spec.in post section. commit message: kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section. 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 > in src/kimchi.conf.in [server] # Hostname or IP address to listen on #host = 0.0.0.0 # Port to listen on #port = 8000 # If present, start an SSL-enabled server on the given port #ssl_port = 8001 we can change port. Such the port is 9000 and the ssl_port is 9001 we have already file a wiki about this: https://github.com/kimchi-project/kimchi/wiki/Firewall-configure It is possible that the Kimchi is started at different ports other than the default ports 8000, 8001, that requires the firewall configuration scripts to know the Kimchi's port configuration. 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 Royce Lv 18 Dec '13

18 Dec '13

Hi Eli, Pls add debian iptables rules as well. On 2013年12月17日 14:36, 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 > -- 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] Fwd: [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 Eli Qiao 18 Dec '13

18 Dec '13

hi Mark, Sheldon, Royce please help to review my patch. thanks Eli. -------- 原始消息 -------- 主题: [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. 日期: Tue, 17 Dec 2013 14:36:34 +0800 发件人: taget(a)linux.vnet.ibm.com 收件人: project-kimchi(a)googlegroups.com 抄送: Eli Qiao <taget(a)linux.vnet.ibm.com> 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 -- 1.7.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.

1 0

[project-kimchi] [PATCH] [Issue #242] Edit Template: deleted storage pool shows blank
by Xin Ding 18 Dec '13

18 Dec '13

Fix issue #242. If the storage pool of a template has been deleted, when editing this template, the storage pool field will show blank. Signed-off-by: Xin Ding <xinding(a)linux.vnet.ibm.com> --- ui/css/theme-default/template-edit.css | 4 ++++ ui/js/src/kimchi.template_edit_main.js | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css index 1a049c0..2f8a61a 100644 --- a/ui/css/theme-default/template-edit.css +++ b/ui/css/theme-default/template-edit.css @@ -73,3 +73,7 @@ .hidden-area { display: none; } + +.template-edit-fieldset .error { + color: red; +} diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index efe4a6f..d48b6ba 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -31,6 +31,8 @@ kimchi.template_edit_main = function() { $('input[name="disks"]').val(disks[0].size); kimchi.listStoragePools(function(result) { var options = []; + var storagepoolLabel = template.storagepool.replace(/^\/storagepools\//, ''); + var storagepoolValid = false; if (result && result.length) { $.each(result, function(index, storagePool) { if(storagePool.type !== 'kimchi-iso') { @@ -38,9 +40,15 @@ kimchi.template_edit_main = function() { label: storagePool.name, value: '/storagepools/' + storagePool.name }); + if(storagepoolLabel === storagePool.name) { + storagepoolValid = true; + } } }); } + if(!storagepoolValid) { + $('#template-edit-storage-label').html('<span class="error">' + storagepoolLabel + '</span>'); + } kimchi.select('template-edit-storagePool-list', options); }); }); -- 1.8.3.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.

1 0

Re: [Kimchi-devel] [project-kimchi][PATCH 2/3] NFS prevalidation: try nfs path mount in feature test
by Royce Lv 18 Dec '13

18 Dec '13

On 2013年12月18日 09:41, Aline Manera wrote: > On 12/17/2013 10:10 AM, lvroyce0210(a)gmail.com wrote: >> From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> >> To prevent future mount of nfs path will hang, >> we will try nfs path with a quick mount, >> if this test fails, report warning to user. >> >> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> >> --- >> src/kimchi/featuretests.py | 32 ++++++++++++++++++++++++++++++++ >> 1 file changed, 32 insertions(+) >> >> diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py >> index 4cabdc9..36036e5 100644 >> --- a/src/kimchi/featuretests.py >> +++ b/src/kimchi/featuretests.py >> @@ -23,10 +23,12 @@ >> import libvirt >> import os >> import subprocess >> +import tempfile >> import threading >> >> >> from kimchi import config >> +from kimchi.utils import parse_cmd_output >> >> >> ISO_STREAM_XML = """ >> @@ -111,3 +113,33 @@ class FeatureTests(object): >> return False >> >> return True > > You should put it in utils.py as it isn't a feature test > Independent of the result of this function the NFS pool feature will > continue enable to user. ACK > >> + >> + @staticmethod >> + def check_nfs_export(export_path): >> + res = False >> + outputs = None >> + mnt_point = tempfile.mkdtemp(dir='/tmp') >> + cmd = ["mount", "-o", 'soft,timeo=30,retrans=3,retry=0', >> + export_path, mnt_point] >> + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, >> + stderr=subprocess.PIPE) >> + thread = threading.Thread(target = proc.communicate) >> + thread.start() >> + thread.join(9) >> + >> + if thread.is_alive(): >> + proc.kill() >> + thread.join() >> + >> + with open("/proc/mounts" , "rb") as f: >> + outputs = f.read() > > Here you could use f.readlines() as Ramon suggested I wrote parse function for Popen.communicate result parse and file read result. Popen.communicate result cannot apply readlines as I explained in feed back to Ramon. As http://docs.python.org/3.3/library/io.html suggests, The line terminator is always b'\n' for binary files; literally it is same as my implementation. > >> + output_items = ['dev_path', 'mnt_point', 'type'] >> + mounts = parse_cmd_output(outputs, output_items) >> + for item in mounts: >> + if 'dev_path' in item and item['dev_path'] == export_path: >> + res = True >> + cmd = ["umount", "-f", export_path] >> + subprocess.Popen(cmd, stdout=subprocess.PIPE, >> + stderr=subprocess.PIPE) >> + >> + 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.

1 0