- Kimchi-devel - oVirt List Archives

Aline is out on vacations, Daniel is taking temp maintainership ***use the temp repo*** !
by Daniel Henrique Barboza 07 Jan '16

07 Jan '16

Hello everyone, Aline is out on well deserved vacations. I'll be her replacement while she's out. As we did earlier this year, I'll resume her duties in the community reviewing and applying patches, but I'll do it so in my fork @ github: WoK temp repo: https://github.com/danielhb/wok.git Kimchi temp repo: https://github.com/danielhb/kimchi.git So, in these 2-3 weeks she's out, use these temp repos to get the latest changes in Wok and Kimchi. Aline will merge this fork with the official WoK/Kimchi repo when she comes back. All coding standards and best practices she enforces in WoK/Kimchi contributions will be enforced by me as well. So no need to worry, but no reason to get lazy either! So, long story short, use those 2 temp repos and keep doing the same thing as always. Happy coding! Daniel

2 1

[PATCH] [Wok] Added disabled and readonly states to Bootstrap Select
by sguimaraes943＠gmail.com 04 Jan '16

04 Jan '16

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patch fixes readonly and disabled states for Bootstrap Select elements initialized by selectpicker() in the UI. You can spot this changes in action when editing a Template if you apply "Fixed minor UI issues when saving edited template". samhenri (1): Added disabled and readonly states to Bootstrap Select ui/css/src/bootstrap-select.custom.scss | 12 ++++++++++++ 1 file changed, 12 insertions(+) -- 1.9.3

3 3

[PATCH] [Kimchi] Fixed minor UI issues when saving edited template
by sguimaraes943＠gmail.com 04 Jan '16

04 Jan '16

From: samhenri <samuel.guimaraes(a)eldorado.org.br> samhenri (1): Fixed minor UI issues when saving edited template ui/js/src/kimchi.template_edit_main.js | 11 +++++++++++ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/template-edit.html.tmpl | 4 ++-- 3 files changed, 15 insertions(+), 2 deletions(-) -- 1.9.3

3 3

Re: [Kimchi-devel] [PATCH] Fixed the comments for debugreports in report tool and removed the check for platform s390x and introduced wok_log errors in log_errors.
by Megha Smriti 29 Dec '15

29 Dec '15

Hi Aline, Please find my comments below. Regards, Megha > Subject: Re: [Kimchi-devel] [PATCH] Fixed the comments for > debugreports in report tool and removed the check for platform s390x > and introduced wok_log errors in log_errors. > Date: Mon, 30 Nov 2015 12:03:46 -0200 > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > To: mesmriti(a)linux.vnet.ibm.com, Kimchi Devel <kimchi-devel(a)ovirt.org> > > > > Almost there! =) > > Some comments below > > On 19/11/2015 02:56,mesmriti@linux.vnet.ibm.com wrote: > > From: root<root(a)localhost.localdomain> > > > > Signed-off-by:mesmriti@linux.vnet.ibm.com > > --- > > src/wok/plugins/gingerbase/i18n.py | 4 +- > > src/wok/plugins/gingerbase/model/debugreports.py | 181 ++++++++++++++++++----- > > 2 files changed, 143 insertions(+), 42 deletions(-) > > > > diff --git a/src/wok/plugins/gingerbase/i18n.py b/src/wok/plugins/gingerbase/i18n.py > > index af75c70..6ff783b 100644 > > --- a/src/wok/plugins/gingerbase/i18n.py > > +++ b/src/wok/plugins/gingerbase/i18n.py > > @@ -36,7 +36,9 @@ messages = { > > "GGBDR0007E": _("Debug report name must be a string. Only letters, digits, underscore ('_') and " > > "hyphen ('-') are allowed."), > > "GGBDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), > > - > > + "GGBDR0009E": _("Unable to create dbginfo report with %(retcode)s. Details: %(err)s"), > > + "GGBDR0010E": _("Unable to compress the final debug report tar file with %(retcode)s. Details: %(error)s"), > > + "GGBDR0011E": _("Unable to generate final debug report %(name)s. Details: %(err)s"), > > "GGBHOST0001E": _("Unable to shutdown host machine as there are running virtual machines"), > > "GGBHOST0002E": _("Unable to reboot host machine as there are running virtual machines"), > > "GGBHOST0003E": _("There may be virtual machines running on the host"), > > diff --git a/src/wok/plugins/gingerbase/model/debugreports.py b/src/wok/plugins/gingerbase/model/debugreports.py > > index 94ab7fe..c6b60e8 100644 > > --- a/src/wok/plugins/gingerbase/model/debugreports.py > > +++ b/src/wok/plugins/gingerbase/model/debugreports.py > > @@ -19,13 +19,13 @@ > > # 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 fnmatch > > import glob > > import logging > > import os > > import shutil > > import subprocess > > import time > > +import re > > > > from wok.exception import InvalidParameter, NotFoundError, OperationFailed > > from wok.exception import WokException > > @@ -71,54 +71,107 @@ class DebugReportsModel(object): > > raise OperationFailed("GGBDR0002E") > > > > @staticmethod > > - def sosreport_generate(cb, name): > > + def debugreport_generate(cb, name): > > def log_error(e): > > - log = logging.getLogger('Model') > > - log.warning('Exception in generating debug file: %s', e) > > + wok_log = logging.getLogger('Model') > > + wok_log.warning('Exception in generating debug file: %s', e) > > > > try: > > - command = ['sosreport', '--batch', '--name=%s' % name] > > + # Sosreport generation > > + sosreport_file = sosreport_collection(name) > > + md5_report_file = sosreport_file + '.md5' > > + report_file_extension = '.' + sosreport_file.split('.', 1)[1] > > + # If the platform is a system Z machine. > > + path_debugreport = '/var/tmp/' > > + dbgreport_regex = '(\S+\s+)(' + path_debugreport + \ > > + 'DBGINFO-[\d+]{4}-[\d+]{2}' \ > > + '-[\d+]{2}-[\d+]{2}-[\d+]{2}' \ > > + '-[\d+]{2}-\w+-\d+\S+)(\s+\S+)' > > + command = ['/usr/sbin/dbginfo.sh', '-d', path_debugreport] > > output, error, retcode = run_command(command) > > - > > if retcode != 0: > > - raise OperationFailed("GGBDR0003E", {'name': name, > > - 'err': retcode}) > > - > > - # SOSREPORT might create file in /tmp or /var/tmp > > - # FIXME: The right way should be passing the tar.xz file directory > > - # though the parameter '--tmp-dir', but it is failing in Fedora 20 > > - patterns = ['/tmp/sosreport-%s-*', '/var/tmp/sosreport-%s-*'] > > - reports = [] > > - reportFile = None > > - for p in patterns: > > - reports = reports + [f for f in glob.glob(p % name)] > > - for f in reports: > > - if not fnmatch.fnmatch(f, '*.md5'): > > - reportFile = f > > + raise OperationFailed("GGBDR0009E", > > + {'retcode': retcode, 'err': error}) > > > + output = output.splitlines() > > + dbginfo_report = None > > + for line in output: > > + line = line.strip() > > + n = re.match(dbgreport_regex, line) > > + if n: > > + dbginfo_report = n.groups()[1] > > break > > As you know where dbg report will be created, you can change the > dbgreport_regex to be a string pattern and use glob. > > import glob > > file = glob.glob(dgbreport_pattern) > if len(file) == 0: > # error [Megha:] Will incorporate this in my next patch. > I included I more detailed example on how use glob below. > > > - # Some error in sosreport happened > > - if reportFile is None: > > - wok_log.error('Debug report file not found. See sosreport ' > > - 'output for detail:\n%s', output) > > - fname = (patterns[0] % name).split('/')[-1] > > - raise OperationFailed('GGBDR0004E', {'name': fname}) > > - > > - md5_report_file = reportFile + '.md5' > > - report_file_extension = '.' + reportFile.split('.', 1)[1] > > + final_tar_report_name = name + report_file_extension > > + sosreport_tar = sosreport_file.split('/', 3)[3] > > + dbginfo_tar = dbginfo_report.split('/', 3)[3] > > + msg = 'Compressing the sosreport and debug info files into ' \ > > + 'final report file' > > + wok_log.info(msg) > > + # Compressing the sosreport and dbginfo reports into one > > + # tar file > > + command = ['tar', '-cvzf', '%s' % final_tar_report_name, > > + '-C', path_debugreport, dbginfo_tar, > > + sosreport_tar] > > + output, error, retcode = run_command(command) > > + if retcode != 0: > > + raise OperationFailed("GGBDR0010E", > > + {'retcode': retcode, > > + 'error': error}) > > path = config.get_debugreports_path() > > - target = os.path.join(path, name + report_file_extension) > > - # Moving report > > - msg = 'Moving debug report file "%s" to "%s"' % (reportFile, > > - target) > > + dbg_target = os.path.join(path, > > + name + report_file_extension) > > + # Moving final tar file to debugreports path > > + msg = 'Moving final debug report file "%s" to "%s"' % \ > > + (final_tar_report_name, dbg_target) > > + wok_log.info(msg) > > + shutil.move(final_tar_report_name, dbg_target) > > + # Deleting the sosreport md5 file > > + delete_the_sosreport_md5_file(md5_report_file) > > + # Deleting the dbingo report file > > + msg = 'Deleting the dbginfo file "%s" ' \ > > + % dbginfo_report > > wok_log.info(msg) > > - shutil.move(reportFile, target) > > - # Deleting md5 > > - msg = 'Deleting report md5 file: "%s"' % (md5_report_file) > > + os.remove(dbginfo_report) > > + # Deleting the sosreport file > > + msg = 'Deleting the sosreport file "%s" ' % sosreport_file > > wok_log.info(msg) > > - with open(md5_report_file) as f: > > - md5 = f.read().strip() > > - wok_log.info('Md5 file content: "%s"', md5) > > - os.remove(md5_report_file) > > + os.remove(sosreport_file) > > + wok_log.info('The debug report file has been moved') > > + cb('OK', True) > > + return > > + > > > + except WokException as e: > > + log_error(e) > > + raise > > + > > + except OSError as e: > > + log_error(e) > > + raise > > + > > Please, raise an appropriated exception. Otherwise, the user will not be > able to understand what went wrong. > [Megha]: As far as exceptions are concerned These are the exception I think can be thrown back from the try block and it is also similar to what is done in sosreport. Please correct me if I any suggestions. > > + except Exception, e: > > + # No need to call cb to update the task status here. > > + # The task object will catch the exception raised here > > + # and update the task status there > > + log_error(e) > > + raise OperationFailed("GGBDR0011E", {'name': name, 'err': e}) > > + > > + @staticmethod > > + def sosreport_generate(cb, name): > > + def log_error(e): > > + wok_log = logging.getLogger('Model') > > + wok_log.warning('Exception in generating debug file: %s', e) > > + try: > > + # Sosreport collection > > + sosreport_file = sosreport_collection(name) > > + md5_report_file = sosreport_file + '.md5' > > + report_file_extension = '.' + sosreport_file.split('.', 1)[1] > > + path = config.get_debugreports_path() > > + sosreport_target = os.path.join(path, > > + name + report_file_extension) > > + msg = 'Moving debug report file "%s" to "%s"' \ > > + % (sosreport_file, sosreport_target) > > + wok_log.info(msg) > > + shutil.move(sosreport_file, sosreport_target) > > + delete_the_sosreport_md5_file(md5_report_file) > > cb('OK', True) > > return > > > > @@ -142,7 +195,9 @@ class DebugReportsModel(object): > > # Please add new possible debug report command here > > # and implement the report generating function > > # based on the new report command > > - report_tools = ({'cmd': 'sosreport --help', > > + report_tools = ({'cmd': '/usr/sbin/dbginfo.sh --help', > > + 'fn': DebugReportsModel.debugreport_generate}, > > + {'cmd': 'sosreport --help', > > 'fn': DebugReportsModel.sosreport_generate},) > > > > # check if the command can be found by shell one by one > > @@ -213,3 +268,47 @@ class DebugReportContentModel(object): > > > > def lookup(self, name): > > return self._debugreport.lookup(name) > > + > > + > > +def delete_the_sosreport_md5_file(md5_file): > > + """ > > + Deleting md5 file and displaying the contents of the same. > > + """ > > + msg = 'Deleting report md5 file: "%s"' % md5_file > > + wok_log.info(msg) > > + with open(md5_file) as f: > > + md5 = f.read().strip() > > + wok_log.info('Md5 file content: "%s"', md5) > > + os.remove(md5_file) > > + > > + > > +def sosreport_collection(name): > > + """ > > + Code for the collection of sosreport n the path > > + /var/tmp as specified in the command. > > + """ > > + path_sosreport = '/var/tmp/' > > + command = ['sosreport', '--batch', '--name=%s' % name, > > + '--tmp-dir=%s' % path_sosreport] > > + output, error, retcode = run_command(command) > > + if retcode != 0: > > + raise OperationFailed("GGBDR0003E", {'name': name, > > + 'err': retcode}) > > + > > > + sosreport_name_regex = '(\s+)(' + path_sosreport + \ > > + 'sosreport-' +\ > > + name + '-\d+.tar.xz)' > > + sosreport_file = None > > + output = output.splitlines() > > + for line in output: > > + if line: > > + matched_name = re.match(sosreport_name_regex, line) > > + if matched_name: > > + sosreport_file = matched_name.groups()[1] > > + break > > + # Some error in sosreport happened > > + if sosreport_file is None: > > + wok_log.error('Debug report file not found. See sosreport ' > > + 'output for detail:\n%s', output) > > + raise OperationFailed('GGBDR0004E', {'name': name}) > > + return sosreport_file > > You know the sosreport file was created under /var/tmp so you don't need > to query the command output to know the file was created or not. > > If you want to confirm the file was created you can use 'glob' > > import glob > > sosreport_pattern = path_sosreport + 'sosreport-' + name + '.tar.xz' > sosreport_file = glob.glob(sosreport_pattern) > > if len(sosreport_file) == 0: > raise OperationFailed() > > return sosreport_file[0] > > [Megha]: Will incorporate in my next patch > _______________________________________________ > Kimchi-devel mailing list > Kimchi-devel(a)ovirt.org > http://lists.ovirt.org/mailman/listinfo/kimchi-devel > > >

2 1

[Kimchi] Remove pyflakes checking on .git
by Ramon Medeiros 29 Dec '15

29 Dec '15

.git isn't a directory on submodles, it's handler for a directory in Wok. This will avoid this kind of error: ./.git:1:7: invalid syntax gitdir: ../../../../.git/modules/src/wok/plugins/<plugin> ^ Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1c5af68..bb3311b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,7 @@ I18N_FILES = ./i18n.py \ check-local: contrib/check_i18n.py $(I18N_FILES) - find . -path './.git' -prune -type f -o \ + find . -path -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ while read LINE; do echo "$$LINE"; false; done -- 2.1.0

2 1

[Ginger] Remove pyflakes checking on .git
by Ramon Medeiros 28 Dec '15

28 Dec '15

.git isn't a directory on submodles, it's handler for a directory in Wok. This will avoid this kind of error: ./.git:1:7: invalid syntax gitdir: ../../../../.git/modules/src/wok/plugins/<plugin> ^ Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 58abe84..e0c371d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,7 @@ I18N_FILES = ./i18n.py \ # $ git hash-object -t tree /dev/null check-local: contrib/check_i18n.py $(I18N_FILES) - find . -path './.git' -prune -type f -o \ + find . -path -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ while read LINE; do echo "$$LINE"; false; done $(PEP8) --version -- 2.1.0

1 1

[Gingerbase] Remove pyflakes checking on .git
by Ramon Medeiros 28 Dec '15

28 Dec '15

.git isn't a directory on submodles, it's handler for a directory in Wok. This will avoid this kind of error: ./.git:1:7: invalid syntax gitdir: ../../../../.git/modules/src/wok/plugins/<plugin> ^ Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 1f6d703..5e875d1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -58,7 +58,7 @@ I18N_FILES = ./i18n.py \ check-local: contrib/check_i18n.py $(I18N_FILES) - find . -path './.git' -prune -type f -o \ + find . -path -prune -type f -o \ -name '*.py' -o -name '*.py.in' | xargs $(PYFLAKES) | \ while read LINE; do echo "$$LINE"; false; done -- 2.1.0

1 0

[Kimchi 0/4 v2] Use single field to add installation media
by Ramon Medeiros 28 Dec '15

28 Dec '15

Changes: v2: Fix pep8 issues This patch changes how templates are created. Instead of specifying cdrom and disks, add them into a single field and kimchi will identify it. Points to take noteL 1) UI support. Another task will need to change UI for a single entry. 2) Old support for cdrom and disk installation are still available. All tests are running under tests/test*. Ramon Medeiros (4): Create new field to create VM Method to retrieve stored templates at object store Fix checking duplicate template before creating it Identify installation media while creating template API.json | 5 +++ model/templates.py | 9 ++-- utils.py | 30 +++++++++++++ vmtemplate.py | 121 +++++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 149 insertions(+), 16 deletions(-) -- 2.1.0

1 4

[Kimchi 0/4] Use single field to add installation media
by Ramon Medeiros 28 Dec '15

28 Dec '15

This patch changes how templates are created. Instead of specifying cdrom and disks, add them into a single field and kimchi will identify it. Points to take noteL 1) UI support. Another task will need to change UI for a single entry. 2) Old support for cdrom and disk installation are still available. All tests are running under tests/test*. Ramon Medeiros (4): Create new field to create VM Method to retrieve stored templates at object store Fix checking duplicate template before creating it Identify installation media while creating template API.json | 5 +++ model/templates.py | 9 ++-- utils.py | 28 ++++++++++++ vmtemplate.py | 122 +++++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 146 insertions(+), 18 deletions(-) -- 2.1.0

3 10

[PATCH V4] [Wok] Make run_command log its output into a file.
by pvital＠linux.vnet.ibm.com 28 Dec '15

28 Dec '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> V3 -> V4: - PEP8 fixes. V2 -> V3: - Changed the place of the log_file creation control. V1 -> V2: - Removed fixed log file, changing parameter of run_command() method to accept the path of the log file instead of a boolean. V1: Adds the ability of run_command to log the output of a console command into the file /tmp/wok_tee_log_file, like the "tee" command does. Using this patch, a command that takes too many time to execute can be monitored by reading the log file while other tasks are executed. Paulo Vital (1): Make run_command log its output into a file. src/wok/utils.py | 45 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 43 insertions(+), 2 deletions(-) -- 2.5.0

3 3