May 2016 - Kimchi-devel - oVirt List Archives

[PATCH V2][Wok 06/12] FVT: Install all the dependencies from requirements.txt and runs FVT testcases
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Script to run FVT test cases which also take care of installing all dependencies from requirements.txt. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/fvt/run_tests.sh.in | 92 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100755 tests/fvt/run_tests.sh.in diff --git a/tests/fvt/run_tests.sh.in b/tests/fvt/run_tests.sh.in new file mode 100755 index 0000000..ee31b95 --- /dev/null +++ b/tests/fvt/run_tests.sh.in @@ -0,0 +1,92 @@ +#!/bin/bash +# +# 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 + +mkdir -p venv + +HAVE_UNITTEST=@HAVE_PYMOD_UNITTEST@ +PYTHON_VER=@PYTHON_VERSION@ + +# Verify if the required commands exists on the system +command -v virtualenv >/dev/null 2>&1 || { echo >&2 "virtualenv must be installed for your distribution. Aborting."; exit 1; } +command -v pip >/dev/null 2>&1 || { echo >&2 "pip must be installed for your distribution. Aborting."; exit 1; } + +# Get absolute path of this script +pushd `dirname $0` > /dev/null +SCRIPTPATH=`pwd -P` +reqfile=$SCRIPTPATH'/requirements.txt' + +# Start the virtual environment +virtualenv venv --no-site-packages + + +# Actiate the virtual environment +source venv/bin/activate + +while read line; do + + case "$line" in + \#*) + continue ;; # skip comments + "") + continue ;; # skip empty lines + *) + venv/bin/python$PYTHON_VER -c "import $line" > /dev/null 2>&1 + status=$? + if [ $status -ne 0 ]; then + pip install -r $reqfile # Install the required modules to run tests + break + fi + esac +done < $reqfile + +# Execute the test suite +#python registered_tests.py +#nosetests --with-html --html-file=test_report.html registered_tests.py + +if [ "$1" = "-v" ]; then + OPTS="-v" + shift +else + OPTS="" +fi + +if [ $# -ne 0 ]; then + ARGS="$@" +else + ARGS=`find -name "fvt_*.py" | xargs -I @ basename @ .py` +fi + +if [ "$HAVE_UNITTEST" != "yes" -o "$PYTHON_VER" == "2.6" ]; then + CMD="unit2" +else + CMD="python -m unittest" +fi + +LIST=($ARGS) +FVT_LIST=() +for ((i=0;i<${#LIST[@]};i++)); do + FVT_LIST+=(${LIST[$i]}) +done +PYTHONPATH=../ $CMD $OPTS ${FVT_LIST[@]} + +# Deativate the virtual environment +deactivate + +rm -fr venv -- 2.5.0

1 0

[PATCH V2][Wok 05/12] FVT: Base test class, takes care common actions required for any FVT test cases.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Common action methods like creating/destoring session, authorization using wok level fvt config file, creating JSON validator and logging. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/fvt/fvt_base.py | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 tests/fvt/fvt_base.py diff --git a/tests/fvt/fvt_base.py b/tests/fvt/fvt_base.py new file mode 100644 index 0000000..8d152a5 --- /dev/null +++ b/tests/fvt/fvt_base.py @@ -0,0 +1,92 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# 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 unittest +import os +from restapilib import APISession, APIError, APIRequestError +from restapilib import Validator + +DEFAULT_CONF = os.path.dirname(os.path.abspath(__file__)) + 'config' + + +class TestBase(unittest.TestCase): + """Represents an API session setup with the host Web Services API""" + + session = None + + def __init__(self, method='runTest'): + """init with default method as runTest""" + super(TestBase, self).__init__(method) + + @classmethod + def setUpClass(cls): + """ + Hook method for setting up class fixture + before running tests in the class. + Create session and set auth to the session + """ + print '--> TestBase.setUpClass(): Create session ' + cls.session = APISession() + # Log on to the API. An exception will be raised if this fails. + cls.logging = cls.session.logging + cls.logging.debug('--> TestBase.setUpClass()') + cls.validator = Validator(cls.logging) + cls.logging.debug('TestBase.setUpClass(): Setting auth to session') + try: + cls.session.auth() + cls.logging.debug('TestBase.setUpClass(): Auth details set to ' + 'session and base URI created as %s' + % cls.session._base_uri) + except APIError, err: + print 'ERROR %s' % err + print err.__str__() + if cls.session is not None: + cls.logging.error('TestBase.setUpClass(): Ending session' + ' as API error happened') + cls.session.end_session() + finally: + cls.logging.debug('<-- TestBase.setUpClass()') + + def setUp(self): + """Hook method for setting up the test fixture before exercising it.""" + pass + + def tearDown(self): + """Hook method for deconstructing the test fixture after testing it.""" + pass + + @classmethod + def tearDownClass(cls): + """ + Hook method for deconstructing the class + fixture after running all tests in the class. + """ + if cls.session is not None: + print 'TestBase.tearDownClass(): Ending session' + cls.session.end_session() + + def get(self): + try: + resp_net = self.session.request_get_json('/') + print resp_net + except APIRequestError as err: + print 'ERROR %s' % err + print err.__str__() -- 2.5.0

1 0

[PATCH V2][Wok 04/12] FVT: Common classes/methods for API calls as per config file configuration.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

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 -*- +# +# 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() + +__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 + + +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 + 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 + + 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 + + def request( + self, + method, + uri, + body=None, + expected_status_values=None, + headers=None, ): + """ + 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. + """ + + # 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, + ): + + # 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, + ): + """ + 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, + ) + + 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, + ) + + +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, + ): + 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 + + +class SessionParameters(object): + """ + Represents functionalities that could help in getting the + session information. + """ + + def __init__( + self, + conffile=DEFAULT_CONF): + """ + 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 + 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 + + 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()') -- 2.5.0

1 0

[PATCH V2][Wok 03/12] FVT: Lists all dependecies for fvt testcases.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> All the dependecies to be installed which is required by fvt testcases should be added here. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/fvt/requirements.txt | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/fvt/requirements.txt diff --git a/tests/fvt/requirements.txt b/tests/fvt/requirements.txt new file mode 100644 index 0000000..9941793 --- /dev/null +++ b/tests/fvt/requirements.txt @@ -0,0 +1,23 @@ +# This requirements file lists all dependecies for fvt testcases. +# Run 'pip install -r requirements.txt' to install these dependencies +# +# 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 + +jsonschema +requests -- 2.5.0

1 0

[PATCH V2][Wok 02/12] FVT: Wok level config file to have 'sectionsi required for fvt common across plugins.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

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 : +host : localhost +port : 8001 +logfile : wok-api-test-suite.log +loglevel : DEBUG -- 2.5.0

1 0

[PATCH V2][Wok 01/12] FVT: Package for functional verification testcases.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

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 -- 2.5.0

1 0

[PATCH][Wok 04/11] FVT: Common classes/methods for API calls as per config file configuration.
by archus＠linux.vnet.ibm.com 30 May '16

30 May '16

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 | 760 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 760 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..dec7c43 --- /dev/null +++ b/tests/fvt/restapilib.py @@ -0,0 +1,760 @@ +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# 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() + +__all__ = ['APIError', 'APIRequestError', 'APISession', 'SessionParameters'] + +# DEFAULT_CONNECTION_TIMEOUT = 5 # Default connection timeout, in secs +# DEFAULT_REQUEST_TIMEOUT = 300 # Default request timeout, in secs +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 + + +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 + self.host = None + self.port = None + self._session = self.session() # Holds the session from requests + 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 + + def auth(self): + """ + Set authentication to API session. + + \param username + The username name to use for this session. + + \param password + The password associated with username. + + """ + + 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 + + def request( + self, + method, + uri, + body=None, + expected_status_values=None, + headers=None, ): + """ + 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 expected_reason + The API reason code tha tis expected on completion of the request. + If this parameter is specified in addition to the + expected_status_values patameter, this function raises an exception + if either the status or reason is not as specified. + Otherwise, the reason code from the request is not considered. + + \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. + """ + + # 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, + ): + + # 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, + ): + """ + 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 expected_reason + The API reason 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, + ) + + 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, + ) + + +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, + ): + 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 + + +class SessionParameters(object): + """ + Represents functionalities that could help in getting the + session information. + """ + + def __init__( + self, + conffile=DEFAULT_CONF): + """ + 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 = 'kimchi-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 + 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 + + self.logging.basicConfig(format='%(asctime)s %(levelname)s: \ + %(message)s', + datefmt='%m-%d-%Y %I:%M:%S %p', + 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 logging is not None: + self.logging.info('--> validate_json()') + if logging is not None: + self.logging.debug( + 'validate_json(): jsn:%s' % jsn) + self.logging.debug( + 'validate_json(): schma:%s' % schma) + jsonschema.validate(jsn, schma) + if logging is not None: + self.logging.debug( + 'validate_json(): jsn is valid') + if logging is not None: + self.logging.info('<-- validate_json()') -- 2.5.0

3 2

[PATCH][Wok] Expose delete notification function
by Rodrigo Trujillo 28 May '16

28 May '16

This patch exposes the delete notifications operation, then plugins can use the function directly instead of import and instanciate the model to make this operation. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/model/notifications.py | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/wok/model/notifications.py b/src/wok/model/notifications.py index 79bed03..55bd178 100644 --- a/src/wok/model/notifications.py +++ b/src/wok/model/notifications.py @@ -44,6 +44,15 @@ def add_notification(code, args={}, plugin_name=None): notificationsStore[code] = args +def del_notification(code): + global notificationsStore + + try: + del notificationsStore[str(code)] + except Exception as e: + raise OperationFailed("WOKNOT0002E", {'id': str(code), 'msg': e.msg()}) + + class NotificationsModel(object): def __init__(self, **kargs): pass @@ -71,10 +80,4 @@ class NotificationModel(object): raise NotFoundError("WOKNOT0001E", {'id': str(id)}) def delete(self, id): - global notificationsStore - - try: - del notificationsStore[str(id)] - except Exception as e: - raise OperationFailed("WOKNOT0002E", {'id': str(id), - 'msg': e.msg()}) + del_notification(id) -- 2.1.0

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Improve Kimchi feature tests output
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] [Kimchi] Fixed Clone Guest modal window
by sguimaraes943＠gmail.com 27 May '16

27 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> Fixed a minor issue with a <div> tag not closed in Clone Guest modal window. Samuel Guimarães (1): Fixed Clone Guest modal window ui/pages/guest-clone.html.tmpl | 1 + 1 file changed, 1 insertion(+) -- 1.9.3

3 3

Re: [Kimchi-devel] [PATCH V4] [Kimchi] Handle Libvirt host ENOSPC event
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH v2] [Kimchi] Decrease the sleep time for libvirt event timout
by Aline Manera 27 May '16

27 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH v2] [Kimchi 2/2] Implement multi-function pci hotplug support
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 100 +++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 91 insertions(+), 9 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 7051324..2130ac4 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -97,6 +97,22 @@ class VMHostDevsModel(object): return self.task.lookup(taskid) + def _get_pci_devices_xml(self, pci_infos, slot, driver): + hostdevs = '' + # all devices included in the xml will be sorted in reverse (the + # function 0 will be the last one) and will include the guest + # address details + for dev_info in sorted(pci_infos, + key=itemgetter('function'), + reverse=True): + + dev_info['detach_driver'] = driver + hostdevs += self._get_pci_device_xml(dev_info, + slot, + True) + + return '<devices>%s</devices>' % hostdevs + def _get_pci_device_xml(self, dev_info, slot, is_multifunction): if 'detach_driver' not in dev_info: dev_info['detach_driver'] = 'kvm' @@ -108,12 +124,6 @@ class VMHostDevsModel(object): driver = E.driver(name=dev_info['detach_driver']) if is_multifunction: - multi = E.address(type='pci', - domain='0', - bus='0', - slot=str(slot), - function=str(dev_info['function'])) - if dev_info['function'] == 0: multi = E.address(type='pci', domain='0', @@ -122,6 +132,13 @@ class VMHostDevsModel(object): function=str(dev_info['function']), multifunction='on') + else: + multi = E.address(type='pci', + domain='0', + bus='0', + slot=str(slot), + function=str(dev_info['function'])) + host_dev = E.hostdev(source, driver, multi, mode='subsystem', type='pci', managed='yes') @@ -168,7 +185,7 @@ class VMHostDevsModel(object): if free < slot: return free - return free+1 + return free + 1 def _attach_pci_device(self, cb, params): cb('Attaching PCI device') @@ -198,8 +215,7 @@ class VMHostDevsModel(object): pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] pci_infos.append(dev_info) - is_multifunction = len(pci_infos) > 1 and \ - DOM_STATE_MAP[dom.info()[0]] == "shutoff" + is_multifunction = len(pci_infos) > 1 pci_infos = sorted(pci_infos, key=itemgetter('name')) # does not allow hot-plug of 3D graphic cards @@ -234,8 +250,32 @@ class VMHostDevsModel(object): slot = 0 if is_multifunction: + # search for the first available slot in guest xml slot = self._available_slot(dom) + with RollbackContext() as rollback: + # multifunction hotplug is a special case where all functions + # must be attached together within one xml file, the same does + # not happen to multifunction coldplug - where each function is + # attached individually + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and is_multifunction: + xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) + + try: + dom.attachDeviceFlags(xmlstr, device_flags) + + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach mutifunction device VM %s: \n%s', + vmid, xmlstr) + raise + + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + cb('OK', True) + return + for pci_info in pci_infos: pci_info['detach_driver'] = driver cb('Reading source device XML') @@ -486,6 +526,14 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): + if is_3D_device: + cb('Updating MMIO from VM...') + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) + cb('OK', True) + return + for e in hostdev: if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: xmlstr = etree.tostring(e) @@ -506,6 +554,40 @@ class VMHostDevModel(object): cb('OK', True) + def _get_devices_same_addr(self, hostdev, domain, bus, slot): + devices = [] + for device in hostdev: + if device.attrib['type'] != 'pci': + continue + + address = device.source.address + if int(address.attrib['domain'], 16) != domain or \ + int(address.attrib['bus'], 16) != bus or \ + int(address.attrib['slot'], 16) != slot: + continue + + devices.append(etree.tostring(device)) + + return devices + + def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): + domain, bus, slot, _ = dev_name.split('_')[1:] + # get all devices attached to the guest in the same domain+bus+slot + # that the one we are going to detach because they must be detached + # together + devices = self._get_devices_same_addr(hostdev, + int(domain, 16), + int(bus, 16), + int(slot, 16)) + if len(devices) <= 1: + return False + + devices_xml = '<devices>%s</devices>' % ''.join(devices) + dom.detachDeviceFlags(devices_xml, + get_vm_config_flag(dom, mode='all')) + + return True + def _delete_affected_pci_devices(self, dom, dev_name, pci_devs): dev_model = DeviceModel(conn=self.conn) try: -- 2.7.4

1 0

[PATCH v2] [Kimchi 1/2] Enable hot-plug multi-function pci on front-end
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 66edbcb..4cee8fe 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -486,7 +486,7 @@ kimchi.guest_edit_main = function() { $('.body', '#form-guest-edit-pci').append(itemNode); pciEnabled || $('button', itemNode).remove(); $('button i', itemNode).addClass(iconClass); - if (kimchi.thisVMState === "running" && (arrPCIDevices[i].multifunction || arrPCIDevices[i].vga3d)) { + if (kimchi.thisVMState === "running" && arrPCIDevices[i].vga3d) { $('button', itemNode).prop("disabled", true); } $('button', itemNode).on('click', function(event) { -- 2.7.4

1 0

[PATCH] [Kimchi 0/2] Implement multi-function pci hotplug
by Jose Ricardo Ziviani 27 May '16

27 May '16

This patchset implements multi-function pci hotplug for Kimchi. The special point in it is the need to attach all functions at once (one xml containing all devices) sorted (in reverse, the function 0 is the last one). This logic also applies to hot unplug. How to test the backend: - hotplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs -X POST -d '{"name": "pci_0001_05_00_1"}' - hotunplug curl -u username -H "Content-Type: application/json" -H "Accept: application/json" https://host:8001/plugins/kimchi/vms/0fed23/hostdevs/pci_0001_05_00_0 -X DELETE Note: it doesn't matter the function is chosen (pci_0001_05_00_0 or pci_0001_05_00_1 in this case), both functions will be attached/detached accordingly. Note2: attach/detach are async methods but UI is not reflecting it, it's necessary to close/reopen the Edit window to see the PCI list updated. Jose Ricardo Ziviani (2): Enable hot-plug multi-function pci on front-end Implement multi-function pci hotplug support model/vmhostdevs.py | 96 +++++++++++++++++++++++++++++++++++-- ui/js/src/kimchi.guest_edit_main.js | 2 +- 2 files changed, 94 insertions(+), 4 deletions(-) -- 2.7.4

3 2

[PATCH V4] [Kimchi] Handle Libvirt host ENOSPC event
by Lucio Correia 27 May '16

27 May '16

When storage pool is out of space and guest requires more, guest is paused and nothing is told to the user. This patch uses Libvirt Event handling and Asynchronous Notifications mechanism to tell web users about what happened. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- i18n.py | 1 + model/libvirtevents.py | 28 ++++++++++++++++++++++++++++ model/model.py | 3 +++ 3 files changed, 32 insertions(+) V4: try/except added for libvirt event callback registration diff --git a/i18n.py b/i18n.py index 3a5a9d1..2d8390f 100644 --- a/i18n.py +++ b/i18n.py @@ -335,6 +335,7 @@ messages = { "KCHEVENT0001E": _("Failed to register the default event implementation."), "KCHEVENT0002E": _("Failed to register timeout event."), "KCHEVENT0003E": _("Failed to Run the default event implementation."), + "KCHEVENT0004W": _("I/O error on guest '%(vm)s': storage pool out of space for %(devAlias)s (%(srcPath)s)."), # These messages (ending with L) are for user log purposes "KCHNET0001L": _("Created %(connection)s virtual network '%(name)s'"), diff --git a/model/libvirtevents.py b/model/libvirtevents.py index ab5c17d..6425f9b 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -22,6 +22,9 @@ import libvirt import time from wok.exception import OperationFailed +from wok.message import WokMessage +from wok.model.notifications import add_notification +from wok.utils import wok_log class LibvirtEvents(object): @@ -57,3 +60,28 @@ class LibvirtEvents(object): # Event loop handler used to limit length of waiting for any other event. def _kimchi_EventTimeout(self, timer, opaque): time.sleep(1) + + def event_enospc_cb(self, conn, dom, path, dev, action, reason, args): + if reason == "enospc": + info = { + "vm": dom.name(), + "srcPath": path, + "devAlias": dev, + } + add_notification("KCHEVENT0004W", info, '/plugins/kimchi') + msg = WokMessage("KCHEVENT0004W", info, '/plugins/kimchi') + wok_log.warning(msg.get_text()) + + def handleEnospc(self, conn): + """ + Register Libvirt IO_ERROR_REASON event to handle host ENOSPC + """ + try: + conn.get().domainEventRegisterAny( + None, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON, + self.event_enospc_cb, + libvirt.VIR_DOMAIN_EVENT_ID_IO_ERROR_REASON + ) + except libvirt.libvirtError as e: + wok_log.error("Register of ENOSPC event failed: %s" % e.message) diff --git a/model/model.py b/model/model.py index ed474d2..327d5a7 100644 --- a/model/model.py +++ b/model/model.py @@ -50,6 +50,9 @@ class Model(BaseModel): 'eventsloop': self.events} models = [] + # Register for Libvirt's host ENOSPC event and notify UI if it happens + self.events.handleEnospc(self.conn) + # Import task model from Wok instances = get_instances('wok.model.tasks') for instance in instances: -- 1.9.1

2 2

[PATCH] [Kimchi 2/2] Implement multi-function pci hotplug support
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/vmhostdevs.py | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 93 insertions(+), 3 deletions(-) diff --git a/model/vmhostdevs.py b/model/vmhostdevs.py index 7051324..f643b6e 100644 --- a/model/vmhostdevs.py +++ b/model/vmhostdevs.py @@ -97,6 +97,24 @@ class VMHostDevsModel(object): return self.task.lookup(taskid) + def _get_pci_devices_xml(self, pci_infos, slot, driver): + hostdevs = '' + # all devices included in the xml will be sorted in reverse (the + # function 0 will be the last one) and will include the guest + # address details + for dev_info in sorted(pci_infos, + key=itemgetter('function'), + reverse=True): + + has_multif_flag = True if dev_info['function'] == 0 else False + + dev_info['detach_driver'] = driver + hostdevs += self._get_pci_device_xml(dev_info, + slot, + has_multif_flag) + + return '<devices>%s</devices>' % hostdevs + def _get_pci_device_xml(self, dev_info, slot, is_multifunction): if 'detach_driver' not in dev_info: dev_info['detach_driver'] = 'kvm' @@ -122,6 +140,13 @@ class VMHostDevsModel(object): function=str(dev_info['function']), multifunction='on') + else: + multi = E.address(type='pci', + domain='0', + bus='0', + slot=str(slot), + function=str(dev_info['function'])) + host_dev = E.hostdev(source, driver, multi, mode='subsystem', type='pci', managed='yes') @@ -168,7 +193,7 @@ class VMHostDevsModel(object): if free < slot: return free - return free+1 + return free + 1 def _attach_pci_device(self, cb, params): cb('Attaching PCI device') @@ -198,8 +223,7 @@ class VMHostDevsModel(object): pci_infos = [dev_model.lookup(dev_name) for dev_name in group_names] pci_infos.append(dev_info) - is_multifunction = len(pci_infos) > 1 and \ - DOM_STATE_MAP[dom.info()[0]] == "shutoff" + is_multifunction = len(pci_infos) > 1 pci_infos = sorted(pci_infos, key=itemgetter('name')) # does not allow hot-plug of 3D graphic cards @@ -234,8 +258,32 @@ class VMHostDevsModel(object): slot = 0 if is_multifunction: + # search for the first available slot in guest xml slot = self._available_slot(dom) + with RollbackContext() as rollback: + # multifunction hotplug is a special case where all functions + # must be attached together within one xml file, the same does + # not happen to multifunction coldplug - where each function is + # attached individually + if DOM_STATE_MAP[dom.info()[0]] != 'shutoff' and is_multifunction: + xmlstr = self._get_pci_devices_xml(pci_infos, slot, driver) + + try: + dom.attachDeviceFlags(xmlstr, device_flags) + + except libvirt.libvirtError: + wok_log.error( + 'Failed to attach mutifunction device VM %s: \n%s', + vmid, xmlstr) + raise + + rollback.prependDefer(dom.detachDeviceFlags, xmlstr, + device_flags) + rollback.commitAll() + cb('OK', True) + return + for pci_info in pci_infos: pci_info['detach_driver'] = driver cb('Reading source device XML') @@ -486,6 +534,14 @@ class VMHostDevModel(object): raise InvalidOperation('KCHVMHDEV0006E', {'name': dev_info['name']}) + if self._hotunplug_multifunction_pci(dom, hostdev, dev_name): + if is_3D_device: + cb('Updating MMIO from VM...') + devsmodel = VMHostDevsModel(conn=self.conn) + devsmodel.update_mmio_guest(vmid, False) + cb('OK', True) + return + for e in hostdev: if DeviceModel.deduce_dev_name(e, self.conn) == dev_name: xmlstr = etree.tostring(e) @@ -506,6 +562,40 @@ class VMHostDevModel(object): cb('OK', True) + def _get_devices_same_addr(self, hostdev, domain, bus, slot): + devices = [] + for device in hostdev: + if device.attrib['type'] != 'pci': + continue + + address = device.source.address + if int(address.attrib['domain'], 16) != domain or \ + int(address.attrib['bus'], 16) != bus or \ + int(address.attrib['slot'], 16) != slot: + continue + + devices.append(etree.tostring(device)) + + return devices + + def _hotunplug_multifunction_pci(self, dom, hostdev, dev_name): + domain, bus, slot, _ = dev_name.split('_')[1:] + # get all devices attached to the guest in the same domain+bus+slot + # that the one we are going to detach because they must be detached + # together + devices = self._get_devices_same_addr(hostdev, + int(domain, 16), + int(bus, 16), + int(slot, 16)) + if len(devices) <= 1: + return False + + devices_xml = '<devices>%s</devices>' % ''.join(devices) + dom.detachDeviceFlags(devices_xml, + get_vm_config_flag(dom, mode='all')) + + return True + def _delete_affected_pci_devices(self, dom, dev_name, pci_devs): dev_model = DeviceModel(conn=self.conn) try: -- 2.7.4

1 0

[PATCH] [Kimchi 1/2] Enable hot-plug multi-function pci on front-end
by Jose Ricardo Ziviani 27 May '16

27 May '16

Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 66edbcb..4cee8fe 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -486,7 +486,7 @@ kimchi.guest_edit_main = function() { $('.body', '#form-guest-edit-pci').append(itemNode); pciEnabled || $('button', itemNode).remove(); $('button i', itemNode).addClass(iconClass); - if (kimchi.thisVMState === "running" && (arrPCIDevices[i].multifunction || arrPCIDevices[i].vga3d)) { + if (kimchi.thisVMState === "running" && arrPCIDevices[i].vga3d) { $('button', itemNode).prop("disabled", true); } $('button', itemNode).on('click', function(event) { -- 2.7.4

1 0

[PATCH] [Wok] Added extended locale list arranged it in alphabetic order.
by archus＠linux.vnet.ibm.com 26 May '16

26 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 194 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 22 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 52b81fd..81b4e7a 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -138,28 +138,178 @@ <div class="form-group"> <label for="userLocale">$_("Locale")</label> <select id="userLocale" class="selectpicker col-md-12 col-lg-12"> - <option value="af-NA">Afrikaans (Namibia)</option> - <option value="ar-DZ">Arabic (Algeria)</option> - <option value="az-AZ">Azerbaijani (Azerbaijan)</option> - <option value="en-US">English (US)</option> - <option value="hy-AM">Armenian (Armenia)</option> - <option value="hi-IN">Hindi (India)</option> - <option value="nl-BE">Dutch (Belgium)</option> - <option value="ms-MY">Malay (Malaysia)</option> - <option value="no-NO">Norwegian (Norway)</option> - <option value="sq-AL">Albanian (Albania)</option> - <option value="sv-SE">Swedish (Sweden)</option> - <option value="uz-UZ">Uzbek (Uzbekistan)</option> - <option value="zh-CN">中文（简体）</option> - <option value="pt-BR">Português (Brasil)</option> - <option value="de-DE">Deutsch (Deutschland)</option> - <option value="es-ES">Español (España)</option> - <option value="fr-FR">Français (France)</option> - <option value="it-IT">Italiano (Italia)</option> - <option value="ja-JP">日本語 (日本)</option> - <option value="ko-KR">한국어 (대한민국)</option> - <option value="ru-RU">Русский (Россия)</option> - <option value="zh-TW">中文（繁體）</option> + <option value="af-ZA">Afrikaans (South Africa)</option> + <option value="sq-AL">Albanian (Albania)</option> + <option value="am-ET">Amharic (Ethiopia)</option> + <option value="ar-DZ">Arabic (Algeria)</option> + <option value="ar-BH">Arabic (Bahrain)</option> + <option value="ar-EG">Arabic (Egypt)</option> + <option value="ar-IQ">Arabic (Iraq)</option> + <option value="ar-JO">Arabic (Jordan)</option> + <option value="ar-KW">Arabic (Kuwait)</option> + <option value="ar-LB">Arabic (Lebanon)</option> + <option value="ar-LY">Arabic (Libya)</option> + <option value="ar-MR">Arabic (Mauritania)</option> + <option value="ar-MA">Arabic (Morocco)</option> + <option value="ar-OM">Arabic (Oman)</option> + <option value="ar-QA">Arabic (Qatar)</option> + <option value="ar-SA">Arabic (Saudi Arabia)</option> + <option value="ar-SY">Arabic (Syria)</option> + <option value="ar-TN">Arabic (Tunisia)</option> + <option value="ar-AE">Arabic (United Arab Emirates)</option> + <option value="ar-YE">Arabic (Yemen)</option> + <option value="hy-AM">Armenian (Armenia)</option> + <option value="as-IN">Assamese (India)</option> + <option value="az-AZ">Azerbaijani (Azerbaijan)</option> + <option value="eu-ES">Basque (Spain)</option> + <option value="be-BY">Belarusian (Belarus)</option> + <option value="bn-BD">Bengali (Bangladesh)</option> + <option value="bn-IN">Bengali (India)</option> + <option value="bs-BA">Bosnian (Bosnia)</option> + <option value="bg-BG">Bulgarian (Bulgaria)</option> + <option value="my-MM">Burmese (Myanmar)</option> + <option value="ca-ES">Catalan (Spain)</option> + <option value="zh-CN">Chinese-simplified (China)</option> + <option value="zh-SG">Chinese-simplified (Singapore)</option> + <option value="zh-HK">Chinese-traditional (Hong Kong S.A.R. of China)</option> + <option value="zh-MO">Chinese-traditional (Macao)</option> + <option value="zh-TW">Chinese-traditional (Taiwan)</option> + <option value="hr-HR">Croatian (Croatia)</option> + <option value="cs-CZ">Czech (Czech Republic)</option> + <option value="da-DK">Danish (Denmark)</option> + <option value="nl-BE">Dutch (Belgium)</option> + <option value="nl-NL">Dutch (The Netherlands)</option> + <option value="en-AU">English (Australia)</option> + <option value="en-BE">English (Belgium)</option> + <option value="en-CM">English (Cameroon)</option> + <option value="en-CA">English (Canada)</option> + <option value="en-GH">English (Ghana)</option> + <option value="en-HK">English (Hong Kong S.A.R. of China)</option> + <option value="en-IN">English (India)</option> + <option value="en-IE">English (Ireland)</option> + <option value="en-KE">English (Kenya)</option> + <option value="en-MU">English (Mauritius)</option> + <option value="en-NZ">English (New Zealand)</option> + <option value="en-NG">English (Nigeria)</option> + <option value="en-PH">English (Philippines)</option> + <option value="en-SG">English (Singapore)</option> + <option value="en-ZA">English (South Africa)</option> + <option value="en-TZ">English (Tanzania)</option> + <option value="en-GB">English (United Kingdom)</option> + <option value="en-US">English (United States)</option> + <option value="en-ZM">English (Zambia)</option> + <option value="et-EE">Estonian (Estonia)</option> + <option value="tl-PH">Filipino (Philippines)</option> + <option value="fi-FI">Finnish (Finland)</option> + <option value="fr-DZ">French (Algeria)</option> + <option value="fr-CM">French (Cameroon)</option> + <option value="fr-CD">French (Democratic Republic of the Congo)</option> + <option value="fr-BE">French (Belgium)</option> + <option value="fr-CA">French (Canada)</option> + <option value="fr-FR">French (France)</option> + <option value="fr-CI">French (Ivory Coast [Côte d’Ivoire])</option> + <option value="fr-LU">French (Luxembourg)</option> + <option value="fr-MR">French (Mauritania)</option> + <option value="fr-MU">French (Mauritius)</option> + <option value="fr-MA">French (Morocco)</option> + <option value="fr-SN">French (Senegal)</option> + <option value="fr-CH">French (Switzerland)</option> + <option value="fr-TN">French (Tunisia)</option> + <option value="gl-ES">Galician (Spain)</option> + <option value="lg-UG">Ganda (Uganda)</option> + <option value="ka-GE">Georgian (Georgia)</option> + <option value="de-AT">German (Austria)</option> + <option value="de-DE">German (Germany)</option> + <option value="de-LU">German (Luxembourg)</option> + <option value="de-CH">German (Switzerland)</option> + <option value="el-GR">Greek (Greece)</option> + <option value="gu-IN">Gujarati (India)</option> + <option value="ha-NG">Hausa (Nigeria)</option> + <option value="he-IL">Hebrew (Israel)</option> + <option value="hi-IN">Hindi (India)</option> + <option value="hu-HU">Hungarian (Hungary)</option> + <option value="is-IS">Icelandic (Iceland)</option> + <option value="ig-NG">Igbo (Nigeria)</option> + <option value="id-ID">Indonesian (Indonesia)</option> + <option value="it-IT">Italian (Italy)</option> + <option value="it-CH">Italian (Switzerland)</option> + <option value="ja-JP">Japanese (Japan)</option> + <option value="kn-IN">Kannada (India)</option> + <option value="kk-KZ">Kazakh (Kazakhstan)</option> + <option value="km-KH">Khmer (Cambodia)</option> + <option value="rw-RW">Kinyarwanda (Rwanda)</option> + <option value="kok-IN">Konkani (India)</option> + <option value="ko-KR">Korean (India)</option> + <option value="lo-LA">Lao (Korea, South)</option> + <option value="lv-LV">Latvian (Latvia)</option> + <option value="lt-LT">Lithuanian (Lithuania)</option> + <option value="mk-MK">Macedonian (Macedonia)</option> + <option value="ms-MY">Malay-Latin (Malaysia)</option> + <option value="ml-IN">Malayalam (India)</option> + <option value="mt-MT">Maltese (Malta)</option> + <option value="mr-IN">Marathi (India)</option> + <option value="mn-Cyrl-MN">Mongolian-Cyrillic (Mongolia)</option> + <option value="ne-IN">Nepali (India)</option> + <option value="ne-NP">Nepali (Nepal)</option> + <option value="nb-NO">Norwegian Bokmål (Norway)</option> + <option value="nn-NO">Norwegian Nynorsk (Norway)</option> + <option value="or-IN">Oriya [aka, Odia] (India)</option> + <option value="om-ET">Oromo (Ethiopia)</option> + <option value="pl-PL">Polish (Poland)</option> + <option value="pt-AO">Portuguese Bokmål (Angola)</option> + <option value="pt-BR">Portuguese Nynorsk (Brazil)</option> + <option value="pt-MO">Portuguese (Macao)</option> + <option value="pt-MZ">Portuguese (Mozambique)</option> + <option value="pt-PT">Portuguese (Portugal)</option> + <option value="pa-IN">Punjabi (India)</option> + <option value="ro-RO">Romanian (Romania)</option> + <option value="ru-RU">Russian (Russia)</option> + <option value="sr-RS">Serbian-Cyrillic (Serbia)</option> + <option value="sr-ME">Serbian-Latin (Montenegro)</option> + <option value="sr-Latn-RS">Serbian-Latin (Serbia)</option> + <option value="si-LK">Sinhala (Sri Lanka)</option> + <option value="sk-SK">Slovak (Slovakia)</option> + <option value="sl-SI">Slovenian (Slovenia)</option> + <option value="es-AR">Spanish (Argentina)</option> + <option value="es-BO">Spanish (Bolivia)</option> + <option value="es-CL">Spanish (Chile)</option> + <option value="es-CO">Spanish (Colombia)</option> + <option value="en-CR">Spanish (Costa Rica)</option> + <option value="es-DO">Spanish (Dominican Republic)</option> + <option value="es-EC">Spanish (Ecuador)</option> + <option value="es-SV">Spanish (El Salvador)</option> + <option value="es-GT">Spanish (Guatemala)</option> + <option value="en-HN">Spanish (Honduras)</option> + <option value="es-MX">Spanish (Mexico)</option> + <option value="es-NI">Spanish (Nicaragua)</option> + <option value="es-PA">Spanish (Panama)</option> + <option value="es-PY">Spanish (Paraguay)</option> + <option value="en-PE">Spanish (Peru)</option> + <option value="es-PR">Spanish (Puerto Rico)</option> + <option value="es-ES">Spanish (Spain)</option> + <option value="es-US">Spanish (United States)</option> + <option value="es-UY">Spanish (Uruguay)</option> + <option value="es-VE">Spanish (Venezuela)</option> + <option value="sw-KE">Swahili (Kenya)</option> + <option value="sw-TZ">Swahili (Tanzania)</option> + <option value="sv-SE">Swedish (Sweden)</option> + <option value="ta-IN">Tamil (India)</option> + <option value="te-IN">Telugu (Venezuela)</option> + <option value="th-TH">Thai (Thailand)</option> + <option value="tr-TR">Turkish (Turkey)</option> + <option value="uk-UA">Ukrainian (Ukraine)</option> + <option value="ur-IN">Urdu (India)</option> + <option value="ur-PK">Urdu (Pakistan)</option> + <option value="uz-Cyrl-UZ">Uzbek-Cyrillic (Uzbekistan)</option> + <option value="uz-Latn-UZ">Uzbek-Latin (Uzbekistan)</option> + <option value="vi-VN">Vietnamese (Vietnam)</option> + <option value="cy-GB">Welsh (United Kingdom)</option> + <option value="yo-NG">Yoruba (Nigeria)</option> + <option value="ZU-ZA">Zulu (South Africa)</option> + <option value="az-AZ">Azerbaijani-Latin (Azerbaijan)</option> + <option value="sr-CS">Serbian-Cyrillic ()</option> + <option value="sr-Cyrl-CS">Serbian-Cyrillic (Serbia and Montenegro)</option> + <option value="sr-Latn-CS">Serbian-Latin (Serbia and Montenegro)</option> </select> </div> </form> -- 1.8.3.1

2 1

[PATCH v2] [Kimchi] Decrease the sleep time for libvirt event timout
by Jose Ricardo Ziviani 25 May '16

25 May '16

- The current 1 second of sleeping time for libvirt event timeout causes impact in the webserial console because the event is blocked here for 1sec before arriving there. This commit decreases this value to a smaller arbitrary value. Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- model/libvirtevents.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/libvirtevents.py b/model/libvirtevents.py index ab5c17d..813d727 100644 --- a/model/libvirtevents.py +++ b/model/libvirtevents.py @@ -56,4 +56,4 @@ class LibvirtEvents(object): # Event loop handler used to limit length of waiting for any other event. def _kimchi_EventTimeout(self, timer, opaque): - time.sleep(1) + time.sleep(0.01) -- 2.7.4

3 2

Re: [Kimchi-devel] [PATCH V4] [Kimchi] Handle Libvirt host ENOSPC event
by Lucio Correia 25 May '16

25 May '16

On 24-05-2016 17:39, joserz(a)linux.vnet.ibm.com wrote: > Hello Lucio, > > Can I ask you to test your patch using my patch "[Kimchi] Decrease the > sleep time for libvirt event timout" as base to see if you > get any side effect? > > Thank you That patch broke this fix. The fix works without that patch, but doesn't work with it. The enospc event simply is not caught. -- Lucio Correia Software Engineer IBM LTC Brazil

1 0

[PATCH][Wok 11/11] FVT: Added Readme instruction for running fvt testcases.
by archus＠linux.vnet.ibm.com 25 May '16

25 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added Readme instruction for running fvt testcases. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- docs/README.md | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/docs/README.md b/docs/README.md index 8e14672..56e8144 100644 --- a/docs/README.md +++ b/docs/README.md @@ -74,6 +74,14 @@ Build and Install # Optional if running from the source tree $ sudo make install +FVT Testing +----------------- + + $ sudo pip install virtualenv + $ make check-fvt + +After all fvt tests are executed, a summary will be displayed containing any errors/failures which might have occurred. + Starting up Wok --------------- -- 2.5.0

1 0

[PATCH][Wok 10/11] FVT: Added check-fvt to run FVT testcases using make and venv dir to be cleaned.
by archus＠linux.vnet.ibm.com 25 May '16

25 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added check-fvt to run FVT testcases using make and venv dir to be cleaned. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- Makefile.am | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Makefile.am b/Makefile.am index 325d0c9..9827e66 100644 --- a/Makefile.am +++ b/Makefile.am @@ -52,6 +52,7 @@ check-local: find . -path './.git' -prune -o \ -name '*.py' -o -name '*.py.in' | \ xargs $(PYFLAKES) | \ + grep -w -v "venv" | \ while read LINE; do echo "$$LINE"; false; done \ else \ find . -name '*.py' -o -name '*.py.in' | \ @@ -70,6 +71,10 @@ check-local: /bin/bash check-IBM-license-header.sh ; \ fi +check-fvt: + tests/fvt/run_tests.sh + rm -fr venv + # Link built mo files in the source tree to enable use of translations from # within the source tree all-local: @@ -185,5 +190,6 @@ VERSION: clean-local: rm -rf mo rpm + rm -rf mo rpm tests/fvt/venv CLEANFILES = wok.spec `find "$(top_srcdir)" -type f -name "*.pyc" -print` -- 2.5.0

1 0

[PATCH][Wok 09/11] FVT: Added FVT Makefile path in AC_CONFIG_FILES list.
by archus＠linux.vnet.ibm.com 25 May '16

25 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added fvt's Makefile path in AC_CONFIG_FILES list. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- configure.ac | 1 + 1 file changed, 1 insertion(+) diff --git a/configure.ac b/configure.ac index 002774d..1c64367 100644 --- a/configure.ac +++ b/configure.ac @@ -153,6 +153,7 @@ AC_CONFIG_FILES([ contrib/wok.spec.fedora contrib/wok.spec.suse tests/Makefile + tests/fvt/Makefile ],[ chmod +x po/gen-pot ]) -- 2.5.0

1 0

[PATCH][Wok 08/11] FVT: Added fvt as subdirs and check-fvt to run fvt testcases using make.
by archus＠linux.vnet.ibm.com 25 May '16

25 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Added fvt as subdirs and check-fvt to run fvt testcases using make. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- tests/Makefile.am | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tests/Makefile.am b/tests/Makefile.am index 9ead666..656cfae 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +SUBDIRS = fvt + EXTRA_DIST = \ Makefile.am \ run_tests.sh.in \ @@ -46,5 +48,10 @@ check-local: $(MKDIR_P) $(top_srcdir)/data/screenshots ./run_tests.sh +check-fvt: + fvt/run_tests.sh + rm -fr venv + + BUILT_SOURCES = test_config.py CLEANFILES = run_tests.sh test_config.py -- 2.5.0

1 0