July 2016 - Kimchi-devel - oVirt List Archives

Re: [Kimchi-devel] [PATCH V2][Wok 04/12] FVT: Common classes/methods for API calls as per config file configuration.
by Aline Manera 19 Jul '16

19 Jul '16

On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Wrapper classes/methods for making API calls by reading > the config file configuration. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/restapilib.py | 738 ++++++++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 738 insertions(+) > create mode 100644 tests/fvt/restapilib.py > > diff --git a/tests/fvt/restapilib.py b/tests/fvt/restapilib.py > new file mode 100644 > index 0000000..19634f1 > --- /dev/null > +++ b/tests/fvt/restapilib.py > @@ -0,0 +1,738 @@ > +#!/usr/bin/python > +# -*- coding: utf-8 -*- You only need to add this header when the source code file has non-ASCII characters which seems to not be the case. So you can remove it. > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# 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-1301USA > + > +import ConfigParser > +import jsonschema > +import json > +import requests > +import logging > +import os > + > +requests.packages.urllib3.disable_warnings() > + Why disable warning message? Aren't they important for debug? > +__all__ = ['APIError', 'APIRequestError', 'APISession', 'SessionParameters'] > + > +DEFAULT_CONF = os.path.dirname(os.path.abspath(__file__)) + os.sep + 'config' > + > +_HTTP_SUCCESS_STATUS_RANGE = range(200, 299) # All of the 2XX status codes > + > + > +class APIError(Exception): > + """Base class for exceptions raised by this module.""" > + > + pass > + Could you elaborate on the proposal of this class? Why do not use Exception directly as this class does not add anything to Exception class? > + > +class APISession(object): > + """Represents an API session with the host Web Services API""" > + > + def __init__(self, conffile=DEFAULT_CONF): > + """ Creates an APISession object for use with the specified Host. > + """ > + self._session = None > + self._base_uri = None > + self.username = None > + self.passwd = None I am not comfortable to store password values in the application. Is it really needed? What are the other possibilities? > + self.host = None > + self.port = None > + # Holds the session from requests if self._session is None. > + self.session() > + self.sessionparams = SessionParameters(conffile=conffile) > + self.logging = self.sessionparams.getLogger() > + # base URI of connected machine > + self._base_uri = self.create_base_uri() > + > + def session(self): > + """ > + Create the session object for API Request if no existing session. > + """ > + if self._session is not None: > + raise APIError('Already have a session') > + > + self._session = requests.Session() > + return self._session > + How is this session different from the Wok session? Why do we need to handle 2 types of session? > + def auth(self): > + """ > + Set authentication to API session. > + """ > + > + if self._session is None: > + self.session() > + > + self.username, self.passwd = self.sessionparams.getCredentials() > + > + if self.username is None: > + raise APIError('Username is None') > + if self.passwd is None: > + raise APIError('password is None') > + # Set auth at session level > + self._session.auth = (self.username, self.passwd) > + > + # set password expiration currently it default value > + # self._session.expires = '1432091741' > + # For now keeping it False to disable SSL verification > + self._session.verify = False > + return > + > + def create_base_uri(self): > + """ > + Create the base URI using host and port. > + if no host is provided _base_uri is None. > + if port is None then _base_uri is just host > + if both is provided then append port to host. > + """ > + > + if self._base_uri is not None: > + return self._base_uri > + > + self.host, self.port = self.sessionparams.getUrlParams() > + if self.host is None: > + return None > + if self.port is None: > + return self.host > + > + self._base_uri = 'https://' + self.host + ':' + self.port > + return self._base_uri > + > + def end_session(self): > + """Ends an API session""" > + > + if self._session is None: > + return None # Silently ignore > + # The session to be terminated by setting None in session object we > + # have. > + self._session = None > + return > + Same I asked about that Session. > + def request( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, ): > + """ Use one line up to 80 characters. > + Issue an WS API request and return the response body, if any. > + > + \param method > + The HTTP method to issue (eg. GET, PUT, POST, DELETE). > + > + \param uri > + The URI path and query parameter string for the request. > + > + \param body > + The request body that is input to the request, as a Unicode > + or String, or None if there is no input body. > + > + \param expected_status_values > + The HTTP status code that is expected on completion of the request. > + If this parameter is specified, the function raises an exception > + if the HTTP status from the request was not exactly as specified. > + Otherwise, it raises an error if the HTTP status is not 2XX. > + > + \param headers > + Request headers for this request, in the form of a Python Dict. > + Optional. This function automatically augments these headers > + with the headers needed to specify the API session. Note that if > + input headers are provided, the supplied Dict object will be > + modified by this function. > + """ I like the documentation. But we need to agree on a format to be used overall. Do you mind to write a github wiki page with the instructions? (how to doc parameters and return function, etc) > + > + # Start with the headers supplied by caller, if any > + > + if headers is not None: > + hdrs = headers # Use caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If no session then throw error. > + > + if self._session is None: > + raise APIError('You have no session') > + > + resp = self._session.request(method, uri, data=body, headers=hdrs) > + > + # If an expected status was specified, check that the status exactly > + # matches wbat was expected, otherwise check that the status is one of > + # the success Statuses. > + > + if expected_status_values is not None: > + raise_exc = resp.status_code not in expected_status_values > + else: > + raise_exc = resp.status_code not in _HTTP_SUCCESS_STATUS_RANGE > + > + # Raise an exceptoin if the result is not as intended. > + > + if raise_exc: > + > + # If the request fails in some way WEb Services API response > + # will usually include a standard error response body > + # in JSON format that includes a more detailed reason > + # code (and message) for the failure. It provides this data > + # in JSON format even if the request would return some other > + # format if the request had been successful. > + # So if the request has failed, grab that additional info > + # for use in raising exceptions below. > + > + failure_reason = 0 > + failure_code = None > + # if response.status_code not in _HTTP_SUCCESS_STATUS_RANGE: > + > + # The API provides the JSON error response in all usual error > + # cases. But for certain less common errors this does not occur > + # because the error is caught higher in the processing stack. > + # So try to interpret the response as a JSON response body, but > + # just silently ignore problems if we can't do this. > + > + try: > + error_resp = json.loads(resp.text) > + failure_reason = error_resp['reason'] > + failure_code = error_resp['code'] > + except (ValueError, KeyError): > + pass > + > + raise APIRequestError(resp.status_code, failure_reason, > + failure_code) > + > + # Return the response > + return resp > + > + def request_octet( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + Use one line up to 80 characters. It applies to all the other functions/methods you created like above. > + # Start with the request headers the caller supplied if any, > + # otherwise start with an empty set of headers. > + > + if headers is not None: > + hdrs = headers # Using caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for not not set.) > + > + body_json = body > + if body is not None: > + body_json = json.dumps(body) > + > + # Supply an HTTP Accepts header indicating we accept/expect that any > + # response body be JSON. The Accepts header is optional, and the API > + # will defautl to supplying JSON for any operation defined in API V1.1 > + # to return JSON (even if in the future support for other formats would > + # be added). But its a good idea to specify this header as a safeguard > + # in case this function were called for an URI that is not capable of > + # returning JSON, as this function as currently coded would choke on > + # non-JSON responses. > + > + hdrs['Accept'] = 'application/json' > + > + # Now issue the request, and retrieve the response object and the > + # response body if provided. > + > + resp = self.request( > + method, > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=hdrs, > + ) > + > + return resp > + > + def request_json( > + self, > + method, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): Use one line up to 80 characters. > + """ > + Issue an WS API request that is defined to take JSON input and > + produce JSON output. (Nearly all WS API requests are like this.) > + > + Input and output bodies are specified as Python Dict or List objects, > + which are converted to/from JSON by this function. > + > + \param method > + The HTTP method to issue (eg. GET, PUT, POST, DELETE). > + > + \param uri > + The URI path and query parameter string for the request. > + > + \param body > + The request body that is input to the request, in the form of a > + Python Dict or List object. This object is automatically converted > + to corresponding JSON by this function. Optional. > + > + \param expected_status_values > + The HTTP status code that is expected on completion of the request. > + See corresponding parameter on request() method for more details. > + > + \param headers > + Request headers for this request, in the form of a Python Dict. > + Optional. This function automatically augments these headers > + with the headers needed to specify the JSON content type for input > + and output, and to specify the API session. Note that if input > + headers are provided, the supplied Dict object will be modified > + by this function. > + > + """ > + > + # Start with the request headers the caller supplied if any, > + # otherwise start with an empty set of headers. > + > + if headers is not None: > + hdrs = headers # Using caller's dict, not a copy > + else: > + hdrs = dict() > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for now have not set.) > + > + body_json = None > + if body is not None: > + body_json = json.dumps(body) > + hdrs['Content-Type'] = 'application/json' > + > + # Supply an HTTP Accepts header indicating we accept/expect that any > + # response body be JSON. The Accepts header is optional, and the API > + # will default to supplying JSON for any operation defined in API V1.1 > + # to return JSON (even if in the future support for other formats would > + # be added). But its a good idea to specify this header as a safeguard > + # in case this function were called for an URI that is not capable of > + # returning JSON, as this function as currently coded would choke on > + # non-JSON responses. > + > + hdrs['Accept'] = 'application/json' > + > + # Now issue the request, and retrieve the response object and the > + # response body if provided. > + > + response_body = self.request( > + method, > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=hdrs, > + ) > + > + # If a response body was returned, we presume it is JSON and > + # convert it into a Python dict we will return. > + > + resp_json = None > + if response_body is not None: > + try: > + resp_json = response_body.json() > + except ValueError, err: > + print 'response_body %s' % response_body > + print 'response_body headers %s' % response_body.headers > + raise APIError('Response body expected to be JSON but is' > + + 'not valid %s', err) > + return resp_json > + > + def request_get_json( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request that returns JSON.""" > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json('GET', uri, > + expected_status_values=expected_status_values, > + headers=headers) > + > + def request_put_json( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request that returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'PUT', > + uri, > + body=body, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_post_json( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a POST request that > + provides/returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'POST', > + uri, > + body=body, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_delete_json( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a DELETE request that returns JSON.""" > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + return self.request_json( > + 'DELETE', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + Those methods request_json_X() have duplicated code. Why do not use only self.request_json() with the required parameters? > + def request_get( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a GET request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request('GET', uri, > + expected_status_values=expected_status_values, > + headers=headers) > + > + def request_put( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a PUT request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'PUT', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_post( > + self, > + uri, > + body=None, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a POST request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + # If a request body was specified, convert it from its assumed Dict > + # or List form into JSON using the Python JSON library. Also, add in > + # the required Content-Type HTTP message header to let the API know > + # that we are supplying input in JSON form. (A Content-Length header > + # is also needed to specify the body length, but for now have not set.) > + > + body_json = None > + if body is not None: > + body_json = json.dumps(body) > + > + if headers is None: > + headers = dict() > + headers['Content-Type'] = 'application/json' > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'POST', > + uri, > + body=body_json, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + def request_delete( > + self, > + uri, > + expected_status_values=None, > + headers=None, > + ): > + """Convenience function to do a DELETE request with header['Accept'] > + as application/json that returns the response. > + Does not convert the response to JSON > + """ > + > + if self._base_uri is not None: > + uri = self._base_uri + uri > + > + if headers is None: > + headers = dict() > + headers['Accept'] = 'application/json' > + > + return self.request( > + 'DELETE', > + uri, > + expected_status_values=expected_status_values, > + headers=headers, > + ) > + > + Same I commented above. Those methods request_X() have duplicated code. Why do not use only self.request_json() with the required parameters? Having only one method to do a request would be better for maintenance and testing development. self.request() and self.request_json() should handle all the methods and do the right decision on which to do. So I don't see why specific methods are required. > +class APIRequestError(APIError): > + """ > + Raised when an API request ends in error or not as expected. > + > + Attributes: > + \param status > + HTTP status code from the request > + > + \param reason > + API reason code from the request > + > + \param message > + API diagnostic message from the request > + > + \param stack > + Internal diagnostic info for selected Status 500 errors > + """ > + > + def __init__( > + self, > + status, > + reason=None, > + code=None, > + ): Use one line up to 80 characters. > + self.status = status > + self.reason = reason > + self.code = code > + > + def __str__(self): > + if self.code is not None: > + s = 'Request ended with status %s-%s (%s)' \ > + % (self.status, self.reason, self.code) > + else: > + s = 'Request ended with status %s-%s' % (self.status, > + self.reason) > + return s > + > + > +class BadJSONResponse(APIError): > + """exceptions raised for Bad Json Response.""" > + > + def __init__( > + self, > + error, > + ): > + self.error = error > + > + def __str__(self): > + s = 'Bad response: %s' % self.error > + return s > + > + > +class InvalidInput(APIError): > + """exceptions raised for Invalid Input.""" > + > + def __init__( > + self, > + error, > + ): > + self.error = error > + > + def __str__(self): > + s = 'Bad response: %s' % self.error > + return s > + > + Why do we need specific error exception? Each request, when on error, will raise a WokException. Why do we need other exceptions types? > +class SessionParameters(object): > + """ > + Represents functionalities that could help in getting the > + session information. > + """ > + > + def __init__( > + self, > + conffile=DEFAULT_CONF): Use one line up to 80 characters. > + """ > + Attributes: > + \param conffile > + config file which contains all configuration > + information with sections > + """ > + self.conffile = conffile > + self.username = None > + self.passwd = None > + self.host = '127.0.0.1' > + self.port = '8001' > + self.params = 'config' > + self.logfile = 'wok-api-test-suite.log' > + self.session_section = 'Session' > + self.logging = logging > + self.loglevel = 'ERROR' > + self.LEVELS = {'INFO': self.logging.INFO, > + 'DEBUG': self.logging.DEBUG, > + 'WARNING': self.logging.WARNING, > + 'ERROR': self.logging.ERROR, > + 'CRITICAL': self.logging.CRITICAL} > + if self.conffile is None: > + print 'Configuration file required %s' \ > + % self.conffile It should raise an exception if it is required to run the tests. > + else: > + print 'Reading configuration file %s' % self.conffile > + self.params = ConfigParser.ConfigParser() > + print self.params.read(self.conffile) > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'logfile'): > + self.logfile = self.params.get( > + self.session_section, 'logfile') > + > + if self.params.has_option(self.session_section, 'loglevel'): > + self.loglevel = self.params.get( > + self.session_section, 'loglevel') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + Why happens on that case? Default values are assumed? > + self.logging.basicConfig(format='%(asctime)s %(levelname)s: \ > + %(message)s', > + filename=self.logfile, > + level=self.LEVELS[self.loglevel]) > + > + def getCredentials(self): > + """ > + Returns user and password details for a session obtained from config > + file > + """ > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'user'): > + self.username = self.params.get(self.session_section, 'user') > + > + if self.params.has_option(self.session_section, 'passwd'): > + self.passwd = self.params.get(self.session_section, 'passwd') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + raise APIError('Session section not present in config') > + > + return self.username, self.passwd > + > + def getUrlParams(self): > + """ > + Returns host and port details for a session obtained from config file > + """ > + if self.params.has_section(self.session_section): > + if self.params.has_option(self.session_section, 'host'): > + self.host = self.params.get(self.session_section, 'host') > + > + if self.params.has_option(self.session_section, 'port'): > + self.port = self.params.get(self.session_section, 'port') > + else: > + print "Section %s is not available in the config file " \ > + % self.session_section > + > + return self.host, self.port > + > + def getLogger(self): > + return self.logging > + > + > +class Validator(object): > + """ > + validator class having different validate methods > + """ > + > + def __init__(self, logger=None): > + """ > + :param logger: > + :return: > + """ > + if logger is not None: > + self.logging = logger > + > + def validate_json(self, jsn, schma): > + """ > + validates json against schema using jsonschema.validate library > + > + :param jsn: JSON to validate > + :param schma: Schema against which JSON should get validated > + :return: > + """ > + if self.logging is not None: > + self.logging.info('--> validate_json()') > + self.logging.debug( > + 'validate_json(): jsn:%s' % jsn) > + self.logging.debug( > + 'validate_json(): schma:%s' % schma) > + jsonschema.validate(jsn, schma) > + if self.logging is not None: > + self.logging.debug( > + 'validate_json(): jsn is valid') > + self.logging.info('<-- validate_json()')

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 02/12] FVT: Wok level config file to have 'sectionsi required for fvt common across plugins.
by Aline Manera 19 Jul '16

19 Jul '16

On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > Wok level config file to have 'sections' required for functional verification > test common across plugins. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/config | 7 +++++++ > 1 file changed, 7 insertions(+) > create mode 100644 tests/fvt/config > > diff --git a/tests/fvt/config b/tests/fvt/config > new file mode 100644 > index 0000000..13acc0b > --- /dev/null > +++ b/tests/fvt/config > @@ -0,0 +1,7 @@ > +[Session] > +user : > +passwd : It is not good to have passwd in a text configuration file. Any other possibility on that? > +host : localhost > +port : 8001 > +logfile : wok-api-test-suite.log > +loglevel : DEBUG It is good to list the valid values. So user can proper change the configuration for his/her needs.

1 0

Re: [Kimchi-devel] [PATCH V2][Wok 01/12] FVT: Package for functional verification testcases.
by Aline Manera 19 Jul '16

19 Jul '16

Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> On 05/30/2016 04:10 AM, archus(a)linux.vnet.ibm.com wrote: > From: Archana Singh <archus(a)linux.vnet.ibm.com> > > init python file for fvt package. > > Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> > --- > tests/fvt/__init__.py | 18 ++++++++++++++++++ > 1 file changed, 18 insertions(+) > create mode 100644 tests/fvt/__init__.py > > diff --git a/tests/fvt/__init__.py b/tests/fvt/__init__.py > new file mode 100644 > index 0000000..9316f95 > --- /dev/null > +++ b/tests/fvt/__init__.py > @@ -0,0 +1,18 @@ > +# > +# Project Wok > +# > +# Copyright IBM Corp, 2016 > +# > +# 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

1 0

[RFC] Issue 976 - Make able Ginger's 'Virt User' profile users manage Kimchi guests.
by Paulo Ricardo Paz Vital 14 Jul '16

14 Jul '16

Current implementation of Kimchi enables only users with root access (sudo ALL) to create and manage virtual machines. Once the virtual machine is created, 'normal users' access to the guest created can be granted by changing the virtual machine permission configuration. There are two different use cases (one of them related in [1]) which 'normal' users or users with virtualization permission can be able to create and manage virtual machines. Since Ginger's User Management feature provides a schema to add users in one of fours different profiles (Regular, Regular (No shell), Virt User and Administrator) this RFC comes to propose a change in the implementation to make 'Virt User's (user added to system's kvm group) be able to: 1. create new virtual machines, based in already created templates (templates creation/edition continue only granted to admin users); and 2. use/edit guests which the user was added in guest's permission list. Any comments and suggestions are welcome. Best regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

2 1

[PATCH v3][Kimchi 0/6] Make Kimchi able to change guest's boot order
by Ramon Medeiros 13 Jul '16

13 Jul '16

Changes: v3: Update test on test_model to keep working v2: Do not manipulate xml on model Improve parameters checking at API.json Increase test cases Ramon Medeiros (6): Add function get_bootorder_node Create method to change bootorder of a guest Update documentation about bootorder on vm update Update REST API Add function to retrieve bootorder on vm lookup Add test to check bootorder API.json | 23 +++++++++++++++++++++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 32 ++++++++++++++++++++++++++++++-- tests/test_model.py | 15 ++++++++++++++- xmlutils/bootorder.py | 19 +++++++++++++------ 6 files changed, 82 insertions(+), 9 deletions(-) -- 2.5.5

1 7

[PATCH V2] [Wok 0/2] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 13 Jul '16

13 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set works on Fedora 23, Ubuntu 16.04, Debian 8.5 and OpenSUSE 42.1 Due to issues with semanage in Fedora 24, it's not able to allow port 8001 in SELinux. A bug was opened against Fedora community to investigate this: https://bugzilla.redhat.com/show_bug.cgi?id=1355811 V2: - fixed PEP8 errors V1: This patch removes the code that executes a dedicated nginx proxy, making Wok to use the system's nginx service. This is a requirement to make Wok acceptable in community repositories. It also make sure that a Wok executed from path different than installed (from a cloned and builded source code, for example) will create a symbolic link in system's nginx config dir to the running configuration file. This patch solves part of issue #25 Paulo Vital (2): Use system's nginx proxy service. Update troubleshooting documentation docs/troubleshooting.md | 3 +- src/nginx/wok.conf.in | 95 ++++++++++++++++++++----------------------------- src/wok/config.py.in | 6 +++- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 28 ++++++++------- src/wok/server.py | 6 +--- 6 files changed, 65 insertions(+), 75 deletions(-) -- 2.7.4

1 2

[PATCH v2][Kimchi 0/6] Make Kimchi able to change guest's boot order
by Ramon Medeiros 13 Jul '16

13 Jul '16

Changes: v2: Do not manipulate xml on model Improve parameters checking at API.json Increase test cases Ramon Medeiros (6): Add function get_bootorder_node Create method to change bootorder of a guest Update documentation about bootorder on vm update Update REST API Add function to retrieve bootorder on vm lookup Add test to check bootorder API.json | 23 +++++++++++++++++++++++ docs/API.md | 1 + i18n.py | 1 + model/vms.py | 32 ++++++++++++++++++++++++++++++-- tests/test_model.py | 13 +++++++++++++ xmlutils/bootorder.py | 19 +++++++++++++------ 6 files changed, 81 insertions(+), 8 deletions(-) -- 2.5.5

2 7

[PATCH] [Wok] Use system's nginx proxy service.
by pvital＠linux.vnet.ibm.com 11 Jul '16

11 Jul '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch removes the code that executes a dedicated nginx proxy, making Wok to use the system's nginx service. This is a requirement to make Wok acceptable in community repositories. It also make sure that a Wok executed from path different than installed (from a cloned and built source code, for example) will create a symbolic link in system's nginx config dir to the running configuration file. This patch solves part of issue #25 Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/nginx/wok.conf.in | 95 +++++++++++++++++++++------------------------------ src/wok/config.py.in | 6 +++- src/wok/i18n.py | 2 ++ src/wok/proxy.py | 27 +++++++++------ src/wok/server.py | 6 +--- 5 files changed, 63 insertions(+), 73 deletions(-) diff --git a/src/nginx/wok.conf.in b/src/nginx/wok.conf.in index cb05e4d..823d94d 100644 --- a/src/nginx/wok.conf.in +++ b/src/nginx/wok.conf.in @@ -22,71 +22,54 @@ # This is a template file to be used to generate a nginx # proxy config file at wokd script. -user ${user}; -worker_processes 1; +client_max_body_size ${max_body_size}k; -error_log /var/log/nginx/error.log; +# Timeout set to 10 minutes to avoid the 504 Gateway Timeout +# when Wok is processing a request. +proxy_connect_timeout 600; +proxy_send_timeout 600; +proxy_read_timeout 600; +send_timeout 600; -events { - worker_connections 1024; +map $http_upgrade $connection_upgrade { + default upgrade; + '' close; } -http { - log_format main '$remote_addr - $remote_user [$time_local] "$request" ' - '$status $body_bytes_sent "$http_referer" ' - '"$http_user_agent" "$http_x_forwarded_for"'; - - access_log /var/log/nginx/access.log main; - sendfile on; +upstream websocket { + server 127.0.0.1:${websockets_port}; +} - client_max_body_size ${max_body_size}k; +server { + listen ${host_addr}:${proxy_ssl_port} ssl; - # Timeout set to 10 minutes to avoid the 504 Gateway Timeout - # when Wok is processing a request. - proxy_connect_timeout 600; - proxy_send_timeout 600; - proxy_read_timeout 600; - send_timeout 600; + ssl_certificate ${cert_pem}; + ssl_certificate_key ${cert_key}; + ssl_protocols TLSv1.1 TLSv1.2; + ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; + ssl_prefer_server_ciphers on; + ssl_dhparam ${dhparams_pem}; + ssl_session_timeout ${session_timeout}m; - map $http_upgrade $connection_upgrade { - default upgrade; - '' close; - } + add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; + add_header X-Frame-Options DENY; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; - upstream websocket { - server 127.0.0.1:${websockets_port}; + location / { + proxy_pass http://127.0.0.1:${cherrypy_port}; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_redirect http://127.0.0.1:${cherrypy_port}/ https://$host:${proxy_ssl_port}/; } - server { - listen ${host_addr}:${proxy_ssl_port} ssl; - - ssl_certificate ${cert_pem}; - ssl_certificate_key ${cert_key}; - ssl_protocols TLSv1.1 TLSv1.2; - ssl_ciphers 'ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-GCM-SHA384:DHE-RSA-AES128-GCM-SHA256:DHE-DSS-AES128-GCM-SHA256:kEDH+AESGCM:ECDHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES256-SHA384:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA:ECDHE-ECDSA-AES256-SHA:DHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA:DHE-DSS-AES128-SHA256:DHE-RSA-AES256-SHA256:DHE-DSS-AES256-SHA:DHE-RSA-AES256-SHA:AES128-GCM-SHA256:AES256-GCM-SHA384:AES128-SHA256:AES256-SHA256:AES128-SHA:AES256-SHA:AES:CAMELLIA:DES-CBC3-SHA:!aNULL:!eNULL:!EXPORT:!DES:!RC4:!MD5:!PSK:!aECDH:!EDH-DSS-DES-CBC3-SHA:!EDH-RSA-DES-CBC3-SHA:!KRB5-DES-CBC3-SHA:@STRENGTH'; - ssl_prefer_server_ciphers on; - ssl_dhparam ${dhparams_pem}; - ssl_session_timeout ${session_timeout}m; - - add_header Strict-Transport-Security "max-age=31536000; includeSubdomains;"; - add_header X-Frame-Options DENY; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - - location / { - proxy_pass http://127.0.0.1:${cherrypy_port}; - proxy_set_header Host $host; - proxy_set_header X-Real-IP $remote_addr; - proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; - proxy_redirect http://127.0.0.1:${cherrypy_port}/ https://$host:${proxy_ssl_port}/; - } - - location /websockify { - proxy_pass http://websocket; - proxy_http_version 1.1; - proxy_set_header Upgrade $http_upgrade; - proxy_set_header Connection $connection_upgrade; - } + location /websockify { + proxy_pass http://websocket; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection $connection_upgrade; } - ${http_config} } + +${http_config} diff --git a/src/wok/config.py.in b/src/wok/config.py.in index 1ca6f73..d0bca9b 100644 --- a/src/wok/config.py.in +++ b/src/wok/config.py.in @@ -76,9 +76,10 @@ class Paths(object): self.prefix = self.get_prefix() self.installed = (self.prefix == '@pkgdatadir@') self.ui_dir = self.add_prefix('ui') + self.sys_nginx_conf_dir = '@sysconfdir@/nginx/conf.d' if self.installed: - self.nginx_conf_dir = '@sysconfdir@/nginx/conf.d' + self.nginx_conf_dir = self.sys_nginx_conf_dir self.state_dir = '@localstatedir@/lib/wok' self.log_dir = '@localstatedir@/log/wok' self.conf_dir = '@sysconfdir@/wok' @@ -119,6 +120,9 @@ class Paths(object): def get_template_path(self, resource): return os.path.join(self.ui_dir, 'pages/%s.tmpl' % resource) + def is_wok_installed(self): + return self.installed + paths = Paths() diff --git a/src/wok/i18n.py b/src/wok/i18n.py index d6cb17c..33107ee 100644 --- a/src/wok/i18n.py +++ b/src/wok/i18n.py @@ -55,6 +55,8 @@ messages = { "WOKUTILS0004E": _("Invalid data value '%(value)s'"), "WOKUTILS0005E": _("Invalid data unit '%(unit)s'"), + "WOKPROXY0001E": _("Unable to (re)start system's nginx.service. Details: '%(error)s'"), + # These messages (ending with L) are for user log purposes "WOKCOL0001L": _("Request made on collection"), "WOKRES0001L": _("Request made on resource"), diff --git a/src/wok/proxy.py b/src/wok/proxy.py index a74e88a..ab959e1 100644 --- a/src/wok/proxy.py +++ b/src/wok/proxy.py @@ -31,6 +31,8 @@ from string import Template from wok import sslcert from wok.config import paths +from wok.exception import OperationFailed +from wok.utils import run_command HTTP_CONFIG = """ @@ -110,18 +112,21 @@ def _create_proxy_config(options): config_file.write(data) config_file.close() + # If not running from the installed path (from a cloned and builded source + # code), create a symbolic link in system's dir to prevent errors on read + # SSL certifications. + if not paths.is_wok_installed(): + dst = os.path.join(paths.sys_nginx_conf_dir, "wok.conf") + if os.path.isfile(dst): + os.remove(dst) + os.symlink(os.path.join(nginx_config_dir, "wok.conf"), dst) + def start_proxy(options): """Start nginx reverse proxy.""" _create_proxy_config(options) - nginx_config_dir = paths.nginx_conf_dir - config_file = "%s/wok.conf" % nginx_config_dir - cmd = ['nginx', '-c', config_file] - subprocess.call(cmd) - - -def terminate_proxy(): - """Stop nginx process.""" - config_file = "%s/wok.conf" % paths.nginx_conf_dir - term_proxy_cmd = ['nginx', '-s', 'stop', '-c', config_file] - subprocess.call(term_proxy_cmd) + # Restart system's nginx service to reload wok configuration + cmd = ['systemctl', 'restart', 'nginx.service'] + output, error, retcode = run_command(cmd, silent=True) + if retcode != 0: + raise OperationFailed('WOKPROXY0001E', {'error': error}) diff --git a/src/wok/server.py b/src/wok/server.py index 8a02596..b1185e3 100644 --- a/src/wok/server.py +++ b/src/wok/server.py @@ -33,7 +33,7 @@ from wok.config import config as configParser from wok.config import paths, PluginConfig, WokConfig from wok.control import sub_nodes from wok.model import model -from wok.proxy import start_proxy, terminate_proxy +from wok.proxy import start_proxy from wok.reqlogger import RequestLogger from wok.root import WokRoot from wok.safewatchedfilehandler import SafeWatchedFileHandler @@ -180,10 +180,6 @@ class Server(object): self.app = cherrypy.tree.mount(WokRoot(model_instance, dev_env), config=self.configObj) self._load_plugins(options) - - # Terminate proxy when cherrypy server is terminated - cherrypy.engine.subscribe('exit', terminate_proxy) - cherrypy.lib.sessions.init() def _load_plugins(self, options): -- 2.7.4

4 5

[PATCH v2] [Kimchi 0/9] Virt-Viewer launcher backend
by dhbarboza82＠gmail.com 08 Jul '16

08 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - fixed typo and capital letters in i18n.py - fixed 'double dict' error in virtviewer module - added tests with virtual machine containing utf-8 characters This patch set adds the Virt-Viewer launcher backend to Kimchi. This feature consists of a new resource located in: **URI:** /plugins/kimchi/vms/*:name*/snapshots/current that retrieves a download link to a .vv file to be used by a Virt-Viewer compatible desktop app to connect to the remote virtual machine. This backend takes cares of handling firewall rules to allow the connection to be succesfull. Note that no firewall port will be opened unless a download is made - if the user decides to use noVNC or spice-html5 instead Kimchi will not touch the host firewall. Example: [danielhb@arthas kimchi]$ curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/plugins/kimchi/vms/OpenSUSE-Leap-42.1/virtviewerfile" Enter host password for user 'root': [virt-viewer] type=vnc host=localhost port=5904 After this call, port 5904 was opened in the host to allow for a virt-viewer connection. When shutting down the virtual machine or WoK, a cleanup is made to close any ports left opened. Daniel Henrique Barboza (9): Virt-Viewer launcher: docs and i18n changes Virt-Viewer launcher: Makefile and config changes Virt-Viewer launcher: control/vms.py and model/vms.py changes Virt-Viewer launcher: virtviewerfile module Virt-Viewer launcher: test changes Virt-Viewer launcher: adding FirewallManager class Virt-Viewer launcher: test changes for firewall manager Virt-Viewer launcher: libvirt events to control firewall Virt-Viewer launcher: changes after adding libvirt event listening Makefile.am | 2 + config.py.in | 10 ++- control/vms.py | 12 +++ docs/API.md | 6 ++ i18n.py | 2 + model/virtviewerfile.py | 234 ++++++++++++++++++++++++++++++++++++++++++++++++ model/vms.py | 9 +- tests/test_config.py.in | 6 ++ tests/test_model.py | 228 +++++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 503 insertions(+), 6 deletions(-) create mode 100644 model/virtviewerfile.py -- 2.5.5

5 14

Plans for next releases (Wok 2.3 and Kimchi 2.3)
by Aline Manera 08 Jul '16

08 Jul '16

Hi all, Below are the links for the plans for the next release: Wok: https://github.com/kimchi-project/wok/milestone/5 Kimchi: https://github.com/kimchi-project/kimchi/milestone/22 Feel free to take any unassigned task but make sure to add a comment you are work on it so I can proper assign it to you later. Also, more and more ideas and suggestions are welcome. You can send it directly to the ML or open an issue on github. Regards, Aline Manera

1 0

[PATCH] [Kimchi 0/9] Virt-Viewer launcher backend
by dhbarboza82＠gmail.com 08 Jul '16

08 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set adds the Virt-Viewer launcher backend to Kimchi. This feature consists of a new resource located in: **URI:** /plugins/kimchi/vms/*:name*/snapshots/current that retrieves a download link to a .vv file to be used by a Virt-Viewer compatible desktop app to connect to the remote virtual machine. This backend takes cares of handling firewall rules to allow the connection to be succesfull. Note that no firewall port will be opened unless a download is made - if the user decides to use noVNC or spice-html5 instead Kimchi will not touch the host firewall. Example: [danielhb@arthas kimchi]$ curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -X GET "http://localhost:8010/plugins/kimchi/vms/OpenSUSE-Leap-42.1/virtviewerfile" Enter host password for user 'root': [virt-viewer] type=vnc host=localhost port=5904 After this call, port 5904 was opened in the host to allow for a virt-viewer connection. When shutting down the virtual machine or WoK, a cleanup is made to close any ports left opened. Daniel Henrique Barboza (9): Virt-Viewer launcher: docs and i18n changes Virt-Viewer launcher: Makefile and config changes Virt-Viewer launcher: control/vms.py and model/vms.py changes Virt-Viewer launcher: virtviewerfile module Virt-Viewer launcher: test changes Virt-Viewer launcher: adding FirewallManager class Virt-Viewer launcher: test changes for firewall manager Virt-Viewer launcher: libvirt events to control firewall Virt-Viewer launcher: changes after adding libvirt event listening Makefile.am | 2 + config.py.in | 10 ++- control/vms.py | 12 +++ docs/API.md | 6 ++ i18n.py | 2 + model/virtviewerfile.py | 234 ++++++++++++++++++++++++++++++++++++++++++++++++ model/vms.py | 9 +- tests/test_config.py.in | 6 ++ tests/test_model.py | 219 +++++++++++++++++++++++++++++++++++++++++++- 9 files changed, 494 insertions(+), 6 deletions(-) create mode 100644 model/virtviewerfile.py -- 2.5.5

3 19

[PATCH v2] [Wok] Use callback instead of log file for run_command output
by Lucio Correia 06 Jul '16

06 Jul '16

* Ignore empty messages * Simplify exception message Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/asynctask.py | 13 +++++-------- src/wok/utils.py | 42 +++++++++++++----------------------------- 2 files changed, 18 insertions(+), 37 deletions(-) Changes in V2: * removed unnecessary line diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index ec3fbc1..fb614a2 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -46,15 +46,12 @@ class AsyncTask(object): self.thread.start() def _status_cb(self, message, success=None): - if success is None: - self.message = message - self._save_helper() - return - if success is not None: self.status = 'finished' if success else 'failed' - self.message = message - self._save_helper() + + if message.strip(): + self.message = message + self._save_helper() def _save_helper(self): obj = {} @@ -73,4 +70,4 @@ class AsyncTask(object): except Exception, e: cherrypy.log.error_log.error("Error in async_task %s " % self.id) cherrypy.log.error_log.error(traceback.format_exc()) - cb("Unexpected exception: %s" % e.message, False) + cb(e.message, False) diff --git a/src/wok/utils.py b/src/wok/utils.py index 4b3b0ac..c78a77a 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -175,16 +175,21 @@ def import_module(module_name, class_name=''): return __import__(module_name, globals(), locals(), [class_name]) -def run_command(cmd, timeout=None, silent=False, tee=None, - env_vars=None): +def run_command(cmd, timeout=None, silent=False, out_cb=None, env_vars=None): """ cmd is a sequence of command arguments. timeout is a float number in seconds. timeout default value is None, means command run without timeout. silent is bool, it will log errors using debug handler not error. silent default value is False. - tee is a file path to store the output of the command, like 'tee' command. - tee default value is None, means output will not be logged. + out_cb is a callback that receives the whole command output every time a + new line is thrown by command. Default value is None, meaning that whole + output will be returned at the end of execution. + + Returns a tuple (out, error, returncode) where: + out is the output thrown by command + error is an error message if applicable + returncode is an integer equal to the result of command execution """ # subprocess.kill() can leave descendants running # and halting the execution. Using psutil to @@ -202,24 +207,6 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: timeout_flag[0] = True - # function to append the given msg into the log_file - def tee_log(msg=None, log_file=None): - if (msg is None) or (log_file is None): - return - - try: - f = open(log_file, 'a') - except IOError as e: - msg = "Failed to open file %s: " % log_file - wok_log.error("%s %s", msg, e) - return - msg += '\n' - try: - f.write(msg) - except TypeError: - f.write(msg.encode('utf_8')) - f.close() - proc = None timer = None timeout_flag = [False] @@ -239,9 +226,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, timer.start() wok_log.debug("Run command: '%s'", " ".join(cmd)) - if tee is not None: - if os.path.exists(tee): - os.remove(tee) + if out_cb is not None: output = [] while True: line = "" @@ -259,8 +244,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, output.append(line) if not line: break - line = line.rstrip('\n\r') - tee_log(line, tee) + out_cb(''.join(output)) out = ''.join(output) error = proc.stderr.read() returncode = proc.poll() @@ -281,8 +265,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) - if tee is not None: - tee_log(msg, tee) + if out_cb is not None: + out_cb(msg) elif error: wok_log.debug("error: %s returned from cmd: %s", decode_value(error), decode_value(' '.join(cmd))) -- 1.9.1

2 1

[PATCH] [Wok] Use callback instead of log file for run_command output
by Lucio Correia 06 Jul '16

06 Jul '16

* Ignore empty messages * Simplify exception message Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/asynctask.py | 13 +++++-------- src/wok/utils.py | 41 +++++++++++++---------------------------- 2 files changed, 18 insertions(+), 36 deletions(-) diff --git a/src/wok/asynctask.py b/src/wok/asynctask.py index ec3fbc1..fb614a2 100644 --- a/src/wok/asynctask.py +++ b/src/wok/asynctask.py @@ -46,15 +46,12 @@ class AsyncTask(object): self.thread.start() def _status_cb(self, message, success=None): - if success is None: - self.message = message - self._save_helper() - return - if success is not None: self.status = 'finished' if success else 'failed' - self.message = message - self._save_helper() + + if message.strip(): + self.message = message + self._save_helper() def _save_helper(self): obj = {} @@ -73,4 +70,4 @@ class AsyncTask(object): except Exception, e: cherrypy.log.error_log.error("Error in async_task %s " % self.id) cherrypy.log.error_log.error(traceback.format_exc()) - cb("Unexpected exception: %s" % e.message, False) + cb(e.message, False) diff --git a/src/wok/utils.py b/src/wok/utils.py index 4b3b0ac..d532f96 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -175,16 +175,21 @@ def import_module(module_name, class_name=''): return __import__(module_name, globals(), locals(), [class_name]) -def run_command(cmd, timeout=None, silent=False, tee=None, - env_vars=None): +def run_command(cmd, timeout=None, silent=False, out_cb=None, env_vars=None): """ cmd is a sequence of command arguments. timeout is a float number in seconds. timeout default value is None, means command run without timeout. silent is bool, it will log errors using debug handler not error. silent default value is False. - tee is a file path to store the output of the command, like 'tee' command. - tee default value is None, means output will not be logged. + out_cb is a callback that receives the whole command output every time a + new line is thrown by command. Default value is None, meaning that whole + output will be returned at the end of execution. + + Returns a tuple (out, error, returncode) where: + out is the output thrown by command + error is an error message if applicable + returncode is an integer equal to the result of command execution """ # subprocess.kill() can leave descendants running # and halting the execution. Using psutil to @@ -202,24 +207,6 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: timeout_flag[0] = True - # function to append the given msg into the log_file - def tee_log(msg=None, log_file=None): - if (msg is None) or (log_file is None): - return - - try: - f = open(log_file, 'a') - except IOError as e: - msg = "Failed to open file %s: " % log_file - wok_log.error("%s %s", msg, e) - return - msg += '\n' - try: - f.write(msg) - except TypeError: - f.write(msg.encode('utf_8')) - f.close() - proc = None timer = None timeout_flag = [False] @@ -239,9 +226,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, timer.start() wok_log.debug("Run command: '%s'", " ".join(cmd)) - if tee is not None: - if os.path.exists(tee): - os.remove(tee) + if out_cb is not None: output = [] while True: line = "" @@ -260,7 +245,7 @@ def run_command(cmd, timeout=None, silent=False, tee=None, if not line: break line = line.rstrip('\n\r') - tee_log(line, tee) + out_cb(''.join(output)) out = ''.join(output) error = proc.stderr.read() returncode = proc.poll() @@ -281,8 +266,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) - if tee is not None: - tee_log(msg, tee) + if out_cb is not None: + out_cb(msg) elif error: wok_log.debug("error: %s returned from cmd: %s", decode_value(error), decode_value(' '.join(cmd))) -- 1.9.1

2 2

[PATCH v4] [Wok 0/3] Adding DataTables.net plugin and Moment.js to Wok
by sguimaraes943＠gmail.com 04 Jul '16

04 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Some files are minified. Let me know if they were corrupted by git send-email --no-validate This commit adds DataTables.net jQuery plugin and Moment.js library to Wok. DataTables.net is a table plugin that supports pagination, instance search and multi-column ordering. It also has a responsive module and it is compatible with many different CSS libraries. In this commit it is included a customization for its Bootstrap integration and a default initialization script pre-loaded with Wok styles. Moment.js is a lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates. It is required in order to filter and sort dates properly in Wok User Logs and Ginger Configuration Backup. v2 - Added minified files that were ignored by .gitignore v3 - Included DataTables plugins and separated files in different commits. v4 - Fixed white-space and CSS errors Samuel Guimarães (3): Initial commit for Datatables.net and Moment.JS Added Moment.JS file with locales Added DataTables.net JS minified files configure.ac | 3 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 255 +++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 302 ++++++++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 42 +++++ ui/libs/Makefile.am | 2 +- ui/libs/datatables/Makefile.am | 23 +++ ui/libs/datatables/css/Makefile.am | 21 +++ ui/libs/datatables/css/datatables.min.css | 24 +++ ui/libs/datatables/datatables.min.js | 273 +++++++++++++++++++++++++++ ui/libs/moment/LICENSE | 22 +++ ui/libs/moment/Makefile.am | 21 +++ ui/libs/moment/moment-with-locales.min.js | 76 ++++++++ ui/pages/login.html.tmpl | 4 + ui/pages/wok-ui.html.tmpl | 4 + 15 files changed, 1077 insertions(+), 3 deletions(-) create mode 100644 ui/css/datatables.bootstrap.css create mode 100644 ui/css/src/datatables.bootstrap.scss create mode 100644 ui/js/src/wok.datatables.js create mode 100644 ui/libs/datatables/Makefile.am create mode 100644 ui/libs/datatables/css/Makefile.am create mode 100644 ui/libs/datatables/css/datatables.min.css create mode 100644 ui/libs/datatables/datatables.min.js create mode 100644 ui/libs/moment/LICENSE create mode 100644 ui/libs/moment/Makefile.am create mode 100644 ui/libs/moment/moment-with-locales.min.js -- 1.9.3

2 4

[PATCH v5 0/3] [Wok] Initial commit for Datatables.net and Moment.JS
by sguimaraes943＠gmail.com 04 Jul '16

04 Jul '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Some files are minified. Let me know if they were corrupted by git send-email --no-validate This commit adds DataTables.net jQuery plugin and Moment.js library to Wok. DataTables.net is a table plugin that supports pagination, instance search and multi-column ordering. It also has a responsive module and it is compatible with many different CSS libraries. In this commit it is included a customization for its Bootstrap integration and a default initialization script pre-loaded with Wok styles. Moment.js is a lightweight JavaScript date library for parsing, validating, manipulating, and formatting dates. It is required in order to filter and sort dates properly in Wok User Logs and Ginger Configuration Backup. v2 - Added minified files that were ignored by .gitignore v3 - Included DataTables plugins and separated files in different commits. v4 - Fixed white-space and CSS errors v5 - Included license for Datatables files in libs folder and CSS Samuel Guimarães (3): Initial commit for Datatables.net and Moment.JS Added Moment.JS file with locales Added DataTables.net JS minified files configure.ac | 4 + ui/css/Makefile.am | 8 +- ui/css/datatables.bootstrap.css | 262 +++++++++++++++++++++++++ ui/css/src/datatables.bootstrap.scss | 310 ++++++++++++++++++++++++++++++ ui/js/src/wok.datatables.js | 42 ++++ ui/libs/Makefile.am | 2 +- ui/libs/datatables/LICENSE | 22 +++ ui/libs/datatables/Makefile.am | 19 ++ ui/libs/datatables/css/Makefile.am | 21 ++ ui/libs/datatables/css/datatables.min.css | 24 +++ ui/libs/datatables/js/Makefile.am | 21 ++ ui/libs/datatables/js/datatables.min.js | 273 ++++++++++++++++++++++++++ ui/libs/moment/LICENSE | 22 +++ ui/libs/moment/Makefile.am | 21 ++ ui/libs/moment/moment-with-locales.min.js | 76 ++++++++ ui/pages/login.html.tmpl | 4 + ui/pages/wok-ui.html.tmpl | 4 + 17 files changed, 1132 insertions(+), 3 deletions(-) create mode 100644 ui/css/datatables.bootstrap.css create mode 100644 ui/css/src/datatables.bootstrap.scss create mode 100644 ui/js/src/wok.datatables.js create mode 100644 ui/libs/datatables/LICENSE create mode 100644 ui/libs/datatables/Makefile.am create mode 100644 ui/libs/datatables/css/Makefile.am create mode 100644 ui/libs/datatables/css/datatables.min.css create mode 100644 ui/libs/datatables/js/Makefile.am create mode 100644 ui/libs/datatables/js/datatables.min.js create mode 100644 ui/libs/moment/LICENSE create mode 100644 ui/libs/moment/Makefile.am create mode 100644 ui/libs/moment/moment-with-locales.min.js -- 1.9.3

2 5

[PATCH] [Kimchi] Disable ISOs with wrong permission and add mouse hover message
by peterpnns＠gmail.com 04 Jul '16

04 Jul '16

From: peterpennings <peterpnns(a)gmail.com> This patch turns impossible to select an ISO which does not have user's permission. Including so, a message and an icon to show it. peterpennings (1): Disable ISOs templates with wrong permission ui/css/kimchi.css | 11 +++++++++++ ui/css/src/modules/_templates.scss | 9 +++++++++ ui/js/src/kimchi.template_add_main.js | 12 +++++++++++- ui/pages/template-add.html.tmpl | 3 ++- 4 files changed, 33 insertions(+), 2 deletions(-) -- 2.5.0

3 3

[PATCHv2] [Kimchi] Add UI netboot support for adding templates; add loading icon when switching back to image src
by Socorro Stoppler 04 Jul '16

04 Jul '16

v2: Add loading icon when switching back to image src radio button per feedback from pvital v1: Add UI netboot support for adding templates Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 74 ++++++++++++++++++++++++++++++++--- ui/pages/template-add.html.tmpl | 29 +++++++++----- 2 files changed, 89 insertions(+), 14 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index 948f710..28057a7 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -17,6 +17,7 @@ */ kimchi.template_add_main = function() { "use strict"; + var currentPage = 'iso-local-box'; $('#loading-isos').removeClass('hidden'); kimchi.deepScanHandler = null; var isos = []; @@ -53,6 +54,7 @@ kimchi.template_add_main = function() { $('#local-iso-field').hide(); $('#select-all-local-iso').prop('checked', false); $('#btn-template-local-iso-create').attr('disabled', 'disabled'); + $('#btn-template-netboot-create').attr('disabled', 'disabled'); $('#iso-search').hide(); $('#iso-more').hide(); $('#iso-search-loading').hide(); @@ -64,6 +66,7 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); // 4 - Remote folder path text $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'inline-block'); // 1 - Folder path $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -98,6 +101,7 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'inline-block'); $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -116,6 +120,7 @@ kimchi.template_add_main = function() { } else { $('#btn-template-file-create').attr('disabled', 'disabled'); } + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot }); initLocalIsoField(); @@ -222,12 +227,11 @@ kimchi.template_add_main = function() { $('#iso-file').parent().removeClass('has-error'); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path - $('#btn-template-local-iso-create').removeAttr('disabled').css('display', 'inline-block'); // 2 - Selected ISOs - } else { $('#btn-template-local-iso-create').attr('disabled', 'disabled'); } + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot }); $('#list-local-iso').on('click', '[type="checkbox"]', function() { @@ -238,6 +242,7 @@ kimchi.template_add_main = function() { $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'inline-block'); // 2 - Selected ISOs + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot if (checkedLength) { $('#btn-template-local-iso-create').removeAttr('disabled'); @@ -250,6 +255,16 @@ kimchi.template_add_main = function() { } }); + $('#btn-template-netboot-create').click(function() { + var data = { + "source_media": {"type": "netboot"} + }; + addTemplate(data, function() { + $('#btn-template-netboot-create').text(i18n['KCHAPI6005M']); + $('#btn-template-netboot-create').prop('disabled', false); + }); + }); + $('#btn-template-local-iso-create').click(function() { $('input', '#iso-file-box').prop('disabled', true); $('#btn-template-local-iso-create').text(i18n['KCHAPI6008M']); @@ -299,11 +314,9 @@ kimchi.template_add_main = function() { $('#iso-url').val(''); $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path - $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs - + $('#btn-template-netboot-create').attr('disabled', 'disabled').css('display', 'none'); // 3 - Netboot $('#select-all-local-iso, #select-all-remote-iso').prop('checked', false); // False to all select-all checkboxes - $('#list-local-iso [type="checkbox"], #list-remote-iso [type="checkbox"]').prop('checked', false); // False to all list checkboxes }; @@ -340,6 +353,57 @@ kimchi.template_add_main = function() { $('input#iso-url').parent().toggleClass('has-error', !isValid); }, 0); }); + + $('#image-src').change(function() { + if (this.checked) { + if (currentPage === 'netboot-path') { + kimchi.switchPage(currentPage, 'iso-local-box', 'right'); + } + currentPage = 'iso-local-box'; + $('#template-add-window .modal-body .template-pager').animate({ + height: "635px" + }, 400); + initLocalIsoField(); + initIsoFileField(); + $('#loading-isos').removeClass('hidden'); + kimchi.listIsos(function(local_isos) { //local ISOs + kimchi.listDistros(function(remote_isos) { //remote ISOs + + isos = local_isos.concat(remote_isos); //all isos + if (isos && isos.length) { + showLocalIsoField(isos); + $('#iso-more').show(); + } else { + $('#iso-search').show(); + } + $('#loading-isos').fadeOut(100, function() {}); + }); + }, function(err) { + wok.message.error(err.responseJSON.reason, '#local-iso-error-container'); + $('#loading-isos').fadeOut(300, function() { + $('#loading-isos').addClass('hidden'); + }); + }); + setupFilters(); + enabledRemoteIso(); + } + }); + + $('#netboot-src').change(function() { + if (this.checked) { + if (currentPage === 'iso-local-box') { + kimchi.switchPage(currentPage, 'netboot-path', 'left'); + } + currentPage = 'netboot-path'; + $('#template-add-window .modal-body .template-pager').animate({ + height: "300px" + }, 400); + $('#btn-template-file-create').attr('disabled', 'disabled').css('display', 'none'); // 1 - Folder path + $('#btn-template-local-iso-create').attr('disabled', 'disabled').css('display', 'none'); // 2 - Selected ISOs + $('#btn-template-netboot-create').removeAttr('disabled').css('display', 'inline-block'); // 3 - Netboot + } + }); + //do create var addTemplate = function(data, callback) { kimchi.createTemplate(data, function() { diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index 4226a8f..87d6cb4 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -30,11 +30,18 @@ <div class="modal-body"> <div class="template-modal-container"> <div id="alert-modal-container"></div> + <div> + <h5>$_("Where is the source media for this template? ")</h5> + <input type="radio" checked="checked" name="iso-source" id="image-src" value="image-src" class="wok-radio"> + <label for="image-src">$_("Image Template")</label> + <input type="radio" name="iso-source" id="netboot-src" value="netboot-src" class="wok-radio"> + <label for="netboot-src">$_("Netboot Template")</label> + </div> </div> <div class="template-pager"> <div class="page-list"> <div class="page" id="iso-local-box"> - <div id="loading-isos"> + <div id="loading-isos hidden"> <div class="wok-mask-loader-container"> <div class="wok-mask-loading"> <div class="wok-mask-loading-icon"></div> @@ -103,16 +110,20 @@ </div> </div> </div> - </div> - </div> - <div class="modal-footer"> - <button class="btn btn-default" id="btn-template-file-create" disabled="disabled">$_("Create")</button> - <button class="btn btn-default" id="btn-template-local-iso-create" disabled="disabled">$_("Create")</button> - <button class="btn btn-default" data-dismiss="modal" type="button">$_("Cancel")</button> - </div> -</div> + <div class="page" id="netboot-path"> + </div> + </div> + </div> + <div class="modal-footer"> + <button class="btn btn-default" id="btn-template-file-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" id="btn-template-local-iso-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" id="btn-template-netboot-create" disabled="disabled">$_("Create")</button> + <button class="btn btn-default" data-dismiss="modal" type="button">$_("Cancel")</button> + </div> + </div> <script> kimchi.template_add_main(); </script> +</div> </body> </html> -- 2.5.0

3 2

[PATCH] [Kimchi] Save last view for templates - fix for issue# 799
by Socorro Stoppler 04 Jul '16

04 Jul '16

This patch addresses github issue# 799. The last view of the Templates tab is not being remembered either after switching tabs or exiting Kimchi. When switching view from List to Gallery (or vice versa), the next time the user goes back to the Templates tab, whatever view it was last on should be what is shown when going back to the Templates tab. Thanks to samhenri in helping resolve the last issue. Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_main.js | 63 +++++++++++++++++++++++++++++++++++---- 1 file changed, 57 insertions(+), 6 deletions(-) diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 22a3509..ed49246 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -30,7 +30,7 @@ kimchi.doListTemplates = function() { } listHtml += wok.substitute(templateHtml, value); }); - $('.wok-vm-list').removeClass('hidden'); + $('ul#templates-grid').removeClass('hidden'); $('#templates-container').removeClass('hidden'); $('#templateList').html(listHtml); kimchi.templateBindClick(); @@ -39,7 +39,7 @@ kimchi.doListTemplates = function() { } else { $('#templateList').html(''); $('#noTemplates').show(); - $('.wok-vm-list').addClass('hidden'); + $('ul#templates-grid').addClass('hidden'); $('#templates-container').addClass('hidden'); $('.wok-mask').fadeOut(300, function() {}); } @@ -58,10 +58,47 @@ kimchi.doListTemplates = function() { }; kimchi.toggleTemplatesGallery = function() { - $(".wok-vm-list, .wok-vm-gallery").toggleClass("wok-vm-list wok-vm-gallery"); - $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); - var text = $('#gallery-table-button span.text').text(); - $('#gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + $(".wok-vm-list, .wok-vm-gallery").toggleClass("wok-vm-list wok-vm-gallery"); + $(".wok-list, .wok-gallery").toggleClass("wok-list wok-gallery"); + var text = $('#gallery-table-button span.text').text(); + $('#gallery-table-button span.text').text(text == i18n['KCHTMPL6005M'] ? i18n['KCHTMPL6004M'] : i18n['KCHTMPL6005M']); + var buttonText = $('#gallery-table-button span.text').text(); + if (buttonText.indexOf("Gallery") !== -1) { + // Currently in list view + kimchi.setTemplateView("templateView", "list"); + } else { + // Currently in gallery + kimchi.setTemplateView("templateView", "gallery"); + } +}; + +kimchi.setTemplateView = function(name, value) { + window.localStorage.setItem(name, value); +}; + +kimchi.readTemplateView = function(name) { + var viewName = window.localStorage.getItem(name); + if (viewName !== "") { + return viewName; + } else { + return null; + } +}; + +kimchi.showTemplateGallery = function() { + $(".wok-vm-list").addClass("wok-vm-gallery"); + $(".wok-list").addClass("wok-gallery"); + $(".wok-vm-gallery").removeClass("wok-vm-list"); + $(".wok-gallery").removeClass("wok-list"); + $('#gallery-table-button span.text').text(i18n['KCHTMPL6004M']); +}; + +kimchi.showTemplateList = function() { + $(".wok-vm-gallery").addClass("wok-vm-list"); + $(".wok-gallery").addClass("wok-list"); + $(".wok-vm-list").removeClass("wok-vm-gallery"); + $(".wok-list").removeClass("wok-gallery"); + $('#gallery-table-button span.text').text(i18n['KCHTMPL6005M']); }; kimchi.templateBindClick = function() { @@ -117,6 +154,20 @@ kimchi.hideTitle = function() { kimchi.template_main = function() { $('body').addClass('wok-list'); + var viewFound = kimchi.readTemplateView("templateView"); + if (viewFound) { + if(viewFound === "gallery") { + // should be showing gallery + kimchi.showTemplateGallery(); + } else { + // Should be showing list + kimchi.showTemplateList(); + } + } else { + // Default to showing list + kimchi.showTemplateList(); + } + if (wok.tabMode['templates'] === 'admin') { $('.tools').attr('style', 'display'); $("#template-add").on("click", function(event) { -- 2.5.0

2 1

[PATCH] [Kimchi] model/vms.py: changing all interfaces VM
by dhbarboza82＠gmail.com 04 Jul '16

04 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch changes XPATH_DOMAIN_MAC and XPATH_DOMAIN_MAC_BY_ADDRESS to include search and replace of all mac addresses, not just those that belongs to type='network' interfaces. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- model/vms.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/model/vms.py b/model/vms.py index 7745027..6a309fc 100644 --- a/model/vms.py +++ b/model/vms.py @@ -86,9 +86,8 @@ VM_OFFLINE_UPDATE_PARAMS = ['cpu_info', 'graphics', 'groups', 'memory', XPATH_DOMAIN_DISK = "/domain/devices/disk[@device='disk']/source/@file" XPATH_DOMAIN_DISK_BY_FILE = "./devices/disk[@device='disk']/source[@file='%s']" XPATH_DOMAIN_NAME = '/domain/name' -XPATH_DOMAIN_MAC = "/domain/devices/interface[@type='network']/mac/@address" -XPATH_DOMAIN_MAC_BY_ADDRESS = "./devices/interface[@type='network']/"\ - "mac[@address='%s']" +XPATH_DOMAIN_MAC = "/domain/devices/interface/mac/@address" +XPATH_DOMAIN_MAC_BY_ADDRESS = "./devices/interface/mac[@address='%s']" XPATH_DOMAIN_MEMORY = '/domain/memory' XPATH_DOMAIN_MEMORY_UNIT = '/domain/memory/@unit' XPATH_DOMAIN_UUID = '/domain/uuid' -- 2.5.5

3 2

[PATCH] [Kimchi] Github #972: spice-html5 dir incorrect
by dhbarboza82＠gmail.com 04 Jul '16

04 Jul '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> Before this patch, spice_dir was given by: self.spice_dir = self.add_prefix('ui/spice-html5') This results in the '/usr/share/wok/ui/spice-html5' dir when installing Kimchi in an Opensuse Leap system, which is not where the spice-html5 files are located. This is probably a remnant of the Kimchi -> WoK transition. This patch changes it to: self.spice_dir = os.path.join(self.ui_dir, 'spice-html5') That will give us '/usr/share/wok/plugins/kimchi/ui/spice-html5' instead, making spice-html5 work as intended in Opensuse or any other distro that requires the --with-spice-html5 flag in autogen.sh. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- config.py.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.py.in b/config.py.in index e645d5d..937f1ec 100644 --- a/config.py.in +++ b/config.py.in @@ -102,7 +102,7 @@ class KimchiPaths(PluginPaths): 'spice-html5/pages/spice_auto.html') if __with_spice__ == 'yes': - self.spice_dir = self.add_prefix('ui/spice-html5') + self.spice_dir = os.path.join(self.ui_dir, 'spice-html5') elif os.path.exists('@datadir@/spice-html5'): self.spice_dir = '@datadir@/spice-html5' else: -- 2.5.5

3 2

Kimchi 2.2 pre-installed images available.
by Paulo Ricardo Paz Vital 01 Jul '16

01 Jul '16

It's a pleasure to announce the availability of the Kimchi 2.2 pre-installed images. A Kimchi pre-installed image is a QCOW2 image with Wok, Gingerbase and Kimchi 2.2 on top of a fresh install distro. The images with Kimchi 2.2 are available on top of: * Fedora 23 * Ubuntu 16.04 * opensSUSE Leap 42.1 and you can easily grab the images from the following links: * http://bit.ly/kimchi22_on_f23 * http://bit.ly/kimchi22_on_xenial * http://bit.ly/kimchi22_on_leap To use them, just decompress the images and create a VM pointing the default storage to the image. All images have the user 'kimchi' added with the password 'k1mch1' (same password for root). Don't forget to set up nested virtualization to be able to start up Kimchi on the VM. Once running, point your browser to the IP address of the VM on port 8000 (http) or 8001 (https) and log in using 'kimchi' user. Go ahead! Download the image with your preferred distro and test Kimchi NOW! Best regards, -- Paulo Ricardo Paz Vital Linux Technology Center, IBM Systems http://www.ibm.com/linux/ltc/

1 0