November 2015 - Kimchi-devel - oVirt List Archives

[PATCH V3] Issue #737: Wok base framework calls resource model's lookup twice
by archus＠linux.vnet.ibm.com 23 Nov '15

23 Nov '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> In case of GET lookup was called twice. Once before is_authorized() and then in self.get(). This added overhead to system when lookup() is called for each value in list from get_list() of Collection. So to avoid this, removed lookup() call from get(). Also updated code to call self.lookup() before self.get() in resource's update() and collection's create(). Archana Singh (1): Issue #737: Wok base framework calls resource model's lookup twice src/wok/control/base.py | 5 ++--- src/wok/plugins/kimchi/control/storagepools.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.1.4

2 2

[PATCH V2] #748 Sosreport generation.
by mesmriti＠linux.vnet.ibm.com 23 Nov '15

23 Nov '15

From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> The reveiw comments have been taken care of and changes were made to keep a separate sosreport method and the path where the sosreport will be generated will be specified in the sosreport command. Ex: path_sosreport = '/var/tmp/' command = ['sosreport', '--batch', '--name=%s' % name, '--tmp-dir=%s' % path_sosreport] Megha Smriti (1): model/debugreports.py Rodrigo Trujillo (1): Allow listStorageVolumes ajax call be synchronized src/wok/plugins/gingerbase/model/debugreports.py | 103 ++++++++++++--------- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 +- .../ui/js/src/kimchi.guest_storage_add.main.js | 2 +- .../kimchi/ui/js/src/kimchi.storage_main.js | 2 +- 4 files changed, 67 insertions(+), 47 deletions(-) -- 2.4.3

2 5

[PATCH v3] Create logical pool from existing VG
by Aline Manera 23 Nov '15

23 Nov '15

V2 - V3: - Address Rodrigo's comments Aline Manera (1): Create logical pool from existing VG src/wok/plugins/kimchi/API.json | 5 + src/wok/plugins/kimchi/control/host.py | 22 ++++ src/wok/plugins/kimchi/disks.py | 123 +++++++++++++++++++++ src/wok/plugins/kimchi/docs/API.md | 25 ++++- src/wok/plugins/kimchi/i18n.py | 5 + src/wok/plugins/kimchi/mockmodel.py | 27 +++++ src/wok/plugins/kimchi/model/host.py | 27 +++++ src/wok/plugins/kimchi/model/libvirtstoragepool.py | 9 +- src/wok/plugins/kimchi/model/storagepools.py | 30 +++-- .../plugins/kimchi/tests/test_mock_storagepool.py | 8 +- 10 files changed, 264 insertions(+), 17 deletions(-) -- 2.5.0

2 3

[PATCH] Gingerbase: adapting unit tests to use WoK /tests/utils.py
by dhbarboza82＠gmail.com 23 Nov '15

23 Nov '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> As a follow up of the recent changes in the WoK /tests/utils.py module in Kimchi, the same procedure is now being done in Gingerbase: - unit tests now points to tests.utils - Gingerbase tests/utils.py module was deleted Signed-off-by: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> --- src/wok/plugins/ginger | 2 +- src/wok/plugins/gingerbase/tests/run_tests.sh.in | 3 +- .../plugins/gingerbase/tests/test_authorization.py | 3 +- src/wok/plugins/gingerbase/tests/test_host.py | 4 +- src/wok/plugins/gingerbase/tests/test_rest.py | 6 +- src/wok/plugins/gingerbase/tests/utils.py | 262 --------------------- 6 files changed, 11 insertions(+), 269 deletions(-) delete mode 100644 src/wok/plugins/gingerbase/tests/utils.py diff --git a/src/wok/plugins/ginger b/src/wok/plugins/ginger index 84f36db..a0cc2a3 160000 --- a/src/wok/plugins/ginger +++ b/src/wok/plugins/ginger @@ -1 +1 @@ -Subproject commit 84f36dbbfe63869fa97cd68e9abdeaffdf1846d9 +Subproject commit a0cc2a369abf5ec93068924c3b681957d1c82cb3 diff --git a/src/wok/plugins/gingerbase/tests/run_tests.sh.in b/src/wok/plugins/gingerbase/tests/run_tests.sh.in index 3b08fa6..ab3de12 100644 --- a/src/wok/plugins/gingerbase/tests/run_tests.sh.in +++ b/src/wok/plugins/gingerbase/tests/run_tests.sh.in @@ -52,6 +52,7 @@ for ((i=0;i<${#LIST[@]};i++)); do fi done +# ../../../../../ refers to wok root # ../../../../ refers to wok directory # ../../../ refers to plugins directory -PYTHONPATH=../../../../:../../../ $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} +PYTHONPATH=../../../../../:../../../../:../../../ $CMD $OPTS ${MODEL_LIST[@]} ${MOCK_LIST[@]} diff --git a/src/wok/plugins/gingerbase/tests/test_authorization.py b/src/wok/plugins/gingerbase/tests/test_authorization.py index d0fc57c..0650f0a 100644 --- a/src/wok/plugins/gingerbase/tests/test_authorization.py +++ b/src/wok/plugins/gingerbase/tests/test_authorization.py @@ -23,9 +23,10 @@ import os import unittest from functools import partial +from tests.utils import get_free_port, patch_auth, request, run_server + from wok.plugins.gingerbase import mockmodel -from utils import get_free_port, patch_auth, request, run_server test_server = None model = None diff --git a/src/wok/plugins/gingerbase/tests/test_host.py b/src/wok/plugins/gingerbase/tests/test_host.py index 4f3e848..5d158bb 100644 --- a/src/wok/plugins/gingerbase/tests/test_host.py +++ b/src/wok/plugins/gingerbase/tests/test_host.py @@ -29,8 +29,10 @@ import time import unittest from functools import partial +from tests.utils import get_free_port, patch_auth, request +from tests.utils import run_server, wait_task + from wok.plugins.gingerbase.mockmodel import MockModel -from utils import get_free_port, patch_auth, request, run_server, wait_task test_server = None diff --git a/src/wok/plugins/gingerbase/tests/test_rest.py b/src/wok/plugins/gingerbase/tests/test_rest.py index a8138c6..c723a0e 100644 --- a/src/wok/plugins/gingerbase/tests/test_rest.py +++ b/src/wok/plugins/gingerbase/tests/test_rest.py @@ -26,13 +26,13 @@ import time import unittest from functools import partial +from tests.utils import get_free_port, patch_auth, request +from tests.utils import run_server, wait_task + from wok.rollbackcontext import RollbackContext from wok.plugins.gingerbase import mockmodel -from utils import get_free_port, patch_auth, request -from utils import run_server, wait_task - test_server = None model = None diff --git a/src/wok/plugins/gingerbase/tests/utils.py b/src/wok/plugins/gingerbase/tests/utils.py deleted file mode 100644 index 111cb02..0000000 --- a/src/wok/plugins/gingerbase/tests/utils.py +++ /dev/null @@ -1,262 +0,0 @@ -# -# Project Ginger Base -# -# Copyright IBM, Corp. 2013-2015 -# -# Code derived from Project Kimchi -# -# 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 -# - -import base64 -import cherrypy -import grp -import httplib -import inspect -import json -import os -import socket -import ssl -import sys -import threading -import time -import unittest -from contextlib import closing -from lxml import etree - -import wok.server -from wok.config import config, PluginPaths -from wok.auth import User, USER_NAME, USER_GROUPS, USER_ROLES, tabs -from wok.exception import NotFoundError, OperationFailed -from wok.utils import wok_log - -from wok.plugins.gingerbase import mockmodel - - -_ports = {} - -# provide missing unittest decorators and API for python 2.6; these decorators -# do not actually work, just avoid the syntax failure -if sys.version_info[:2] == (2, 6): - def skipUnless(condition, reason): - if not condition: - sys.stderr.write('[expected failure] ') - raise Exception(reason) - return lambda obj: obj - - unittest.skipUnless = skipUnless - unittest.expectedFailure = lambda obj: obj - - def assertGreater(self, a, b, msg=None): - if not a > b: - self.fail('%s not greater than %s' % (repr(a), repr(b))) - - def assertGreaterEqual(self, a, b, msg=None): - if not a >= b: - self.fail('%s not greater than or equal to %s' - % (repr(a), repr(b))) - - def assertIsInstance(self, obj, cls, msg=None): - if not isinstance(obj, cls): - self.fail('%s is not an instance of %r' % (repr(obj), cls)) - - def assertIn(self, a, b, msg=None): - if a not in b: - self.fail("%s is not in %b" % (repr(a), repr(b))) - - def assertNotIn(self, a, b, msg=None): - if a in b: - self.fail("%s is in %b" % (repr(a), repr(b))) - - unittest.TestCase.assertGreaterEqual = assertGreaterEqual - unittest.TestCase.assertGreater = assertGreater - unittest.TestCase.assertIsInstance = assertIsInstance - unittest.TestCase.assertIn = assertIn - unittest.TestCase.assertNotIn = assertNotIn - - -def get_free_port(name='http'): - global _ports - if _ports.get(name) is not None: - return _ports[name] - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - with closing(sock): - try: - sock.bind(("0.0.0.0", 0)) - except: - raise Exception("Could not find a free port") - _ports[name] = sock.getsockname()[1] - return _ports[name] - - -def run_server(host, port, ssl_port, test_mode, cherrypy_port=None, - model=None, environment='development'): - - if cherrypy_port is None: - cherrypy_port = get_free_port('cherrypy_port') - - if ssl_port is None: - ssl_port = get_free_port('https') - - args = type('_', (object,), - {'host': host, 'port': port, 'ssl_port': ssl_port, - 'cherrypy_port': cherrypy_port, 'max_body_size': '4*1024', - 'ssl_cert': '', 'ssl_key': '', - 'test': test_mode, 'access_log': '/dev/null', - 'error_log': '/dev/null', 'environment': environment, - 'log_level': 'debug'})() - if model is not None: - setattr(args, 'model', model) - - s = wok.server.Server(args) - t = threading.Thread(target=s.start) - t.setDaemon(True) - t.start() - cherrypy.engine.wait(cherrypy.engine.states.STARTED) - return s - - -def silence_server(): - """ - Silence server status messages on stdout - """ - cherrypy.config.update({"environment": "embedded"}) - - -def running_as_root(): - return os.geteuid() == 0 - - -def _request(conn, path, data, method, headers): - if headers is None: - headers = {'Content-Type': 'application/json', - 'Accept': 'application/json'} - if 'AUTHORIZATION' not in headers.keys(): - user, pw = mockmodel.fake_user.items()[0] - hdr = "Basic " + base64.b64encode("%s:%s" % (user, pw)) - headers['AUTHORIZATION'] = hdr - conn.request(method, path, data, headers) - return conn.getresponse() - - -def request(host, port, path, data=None, method='GET', headers=None): - # verify if HTTPSConnection has context parameter - if "context" in inspect.getargspec(httplib.HTTPSConnection.__init__).args: - context = ssl._create_unverified_context() - conn = httplib.HTTPSConnection(host, port, context=context) - else: - conn = httplib.HTTPSConnection(host, port) - - return _request(conn, path, data, method, headers) - - -def get_remote_iso_path(): - """ - Get a remote iso with the right arch from the distro files shipped - with gingerbase. - """ - host_arch = os.uname()[4] - remote_path = '' - with open(os.path.join(PluginPaths('gingerbase').conf_dir, 'distros.d', - 'fedora.json')) as fedora_isos: - # Get a list of dicts - json_isos_list = json.load(fedora_isos) - for iso in json_isos_list: - if (iso.get('os_arch')) == host_arch: - remote_path = iso.get('path') - break - - return remote_path - - -class FakeUser(User): - auth_type = "fake" - sudo = True - - def __init__(self, username): - self.user = {} - self.user[USER_NAME] = username - self.user[USER_GROUPS] = None - self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') - - def get_groups(self): - return sorted([group.gr_name for group in grp.getgrall()])[0:3] - - def get_roles(self): - if self.sudo: - self.user[USER_ROLES] = dict.fromkeys(tabs, 'admin') - return self.user[USER_ROLES] - - def get_user(self): - return self.user - - @staticmethod - def authenticate(username, password, service="passwd"): - try: - return mockmodel.fake_user[username] == password - except KeyError, e: - raise OperationFailed("GGBAUTH0001E", {'username': 'username', - 'code': e.message}) - - -def patch_auth(sudo=True): - """ - Override the authenticate function with a simple test against an - internal dict of users and passwords. - """ - config.set("authentication", "method", "fake") - FakeUser.sudo = sudo - - -def normalize_xml(xml_str): - return etree.tostring(etree.fromstring(xml_str, - etree.XMLParser(remove_blank_text=True))) - - -def wait_task(task_lookup, taskid, timeout=10): - for i in range(0, timeout): - task_info = task_lookup(taskid) - if task_info['status'] == "running": - wok_log.info("Waiting task %s, message: %s", - taskid, task_info['message']) - time.sleep(1) - else: - return - wok_log.error("Timeout while process long-run task, " - "try to increase timeout value.") - - -# The action functions in model backend raise NotFoundError exception if the -# element is not found. But in some tests, these functions are called after -# the element has been deleted if test finishes correctly, then NofFoundError -# exception is raised and rollback breaks. To avoid it, this wrapper ignores -# the NotFoundError. -def rollback_wrapper(func, resource, *args): - try: - func(resource, *args) - except NotFoundError: - # VM has been deleted already - return - - -# This function is used to test storage volume upload. -# If we use self.request, we may encode multipart formdata by ourselves -# requests lib take care of encode part, so use this lib instead -def fake_auth_header(): - headers = {'Accept': 'application/json'} - user, pw = mockmodel.fake_user.items()[0] - hdr = "Basic " + base64.b64encode("%s:%s" % (user, pw)) - headers['AUTHORIZATION'] = hdr - return headers -- 2.4.3

2 1

[PATCH 0/4 V2] Upgrade ObjectStore data to Kimchi-2.0
by pvital＠linux.vnet.ibm.com 23 Nov '15

23 Nov '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> This patch-set contains some fixes and changes related to upgrade process of objectstore data from Kimchi-1.5.1 (or older) to the new Wok and Kimchi-2.0 structure. This is a V2 submission completely different from V1, since it's solving the problem using a different approach, common to all supported distros, during the startup of Kimchi plugin. The patch-set was tested on Fedora 22 and Ubuntu-14.04 distros. Paulo Vital (4): Add version to objectstore information. Add Kimchi version to objectstore entries. Upgrade Kimchi objectstore content. Change Kimchi version. src/wok/objectstore.py | 20 +++++-- src/wok/plugins/kimchi/VERSION | 2 +- src/wok/plugins/kimchi/config.py.in | 5 ++ src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/diskutils.py | 7 ++- src/wok/plugins/kimchi/model/storagepools.py | 4 +- src/wok/plugins/kimchi/model/templates.py | 4 +- src/wok/plugins/kimchi/model/vms.py | 20 ++++--- src/wok/plugins/kimchi/root.py | 10 ++++ src/wok/plugins/kimchi/tests/test_model.py | 4 +- src/wok/plugins/kimchi/utils.py | 80 +++++++++++++++++++++++++++- tests/test_objectstore.py | 5 ++ 12 files changed, 143 insertions(+), 19 deletions(-) -- 2.4.3

4 8

[PATCH V2] Add OVS bridges recognition support
by Lucio Correia 20 Nov '15

20 Nov '15

Allow bridged networks to be created from OVS bridges, and adapt VM XML to work with OVS networks. In some distributions, i.e. Fedora, the directories "bridge" and "brif" are not created for OVS bridges, and they are the method Kimchi uses to detect bridges. This patch also fixes that by recognizing OVS bridges through OVS commands, allowing networks to be created using OVS bridges in those distributions. Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/networks.py | 4 +++ src/wok/plugins/kimchi/netinfo.py | 53 ++++++++++++++++++++++++++++-- src/wok/plugins/kimchi/xmlutils/network.py | 5 +++ 3 files changed, 60 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/model/networks.py b/src/wok/plugins/kimchi/model/networks.py index 54cb0ea..5cd33e7 100644 --- a/src/wok/plugins/kimchi/model/networks.py +++ b/src/wok/plugins/kimchi/model/networks.py @@ -176,9 +176,13 @@ class NetworksModel(object): # User specified bridge interface, simply use it self._ensure_iface_up(iface) + params['ovs'] = False if netinfo.is_bridge(iface): params['bridge'] = iface + if netinfo.is_ovs_bridge(iface): + params['ovs'] = True + # User wants Linux bridge network, but didn't specify bridge interface elif params['connection'] == "bridge": # create Linux bridge interface first and use it as actual iface diff --git a/src/wok/plugins/kimchi/netinfo.py b/src/wok/plugins/kimchi/netinfo.py index c5746d7..ff91489 100644 --- a/src/wok/plugins/kimchi/netinfo.py +++ b/src/wok/plugins/kimchi/netinfo.py @@ -21,6 +21,9 @@ import ethtool import glob import os +from distutils.spawn import find_executable +from wok.utils import run_command +from wok.utils import wok_log NET_PATH = '/sys/class/net' NIC_PATH = '/sys/class/net/*/device' @@ -73,13 +76,51 @@ def is_vlan(iface): def bridges(): - return [b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + return list(set([b.split('/')[-2] for b in glob.glob(BRIDGE_PATH)] + + ovs_bridges())) def is_bridge(iface): return iface in bridges() +# In some distributions, like Fedora, the files bridge and brif are not created +# under /sys/class/net/<ovsbridge> for OVS bridges. These specific functions +# allows one to differentiate OVS bridges from other types of bridges. +def ovs_bridges(): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-br']) + if rc != 0: + wok_log.info("Error listing OVS bridges") + return [] + + return list(set(out.split('\n')) - set([''])) + + +def is_ovs_bridge(iface): + return iface in ovs_bridges() + + +def ovs_bridge_ports(ovsbr): + ovs_cmd = find_executable("ovs-vsctl") + + # openvswitch not installed: there is no OVS bridge configured + if ovs_cmd is None: + return [] + + out, error, rc = run_command([ovs_cmd, '--oneline', 'list-ports', ovsbr]) + if rc != 0: + wok_log.info("Error listing OVS bridge ports for %s" % str(ovsbr)) + return [] + + return list(set(out.split('\n')) - set([''])) + + def all_interfaces(): return [d.rsplit("/", 1)[-1] for d in glob.glob(NET_PATH + '/*')] @@ -91,11 +132,19 @@ def slaves(bonding): def ports(bridge): + if bridge in ovs_bridges(): + return ovs_bridge_ports(bridge) + return os.listdir(BRIDGE_PORTS % bridge) def is_brport(nic): - return os.path.exists(NET_BRPORT % nic) + ovs_brports = [] + + for ovsbr in ovs_bridges(): + ovs_brports += ovs_bridge_ports(ovsbr) + + return os.path.exists(NET_BRPORT % nic) or nic in ovs_brports def is_bondlave(nic): diff --git a/src/wok/plugins/kimchi/xmlutils/network.py b/src/wok/plugins/kimchi/xmlutils/network.py index 14c7e13..f9594e6 100644 --- a/src/wok/plugins/kimchi/xmlutils/network.py +++ b/src/wok/plugins/kimchi/xmlutils/network.py @@ -95,6 +95,11 @@ def to_network_xml(**kwargs): if bridge: network.append(E.bridge(name=bridge)) + # Add virtualport element for openvswitch bridges + ovs = kwargs.get('ovs') + if ovs: + network.append(E.virtualport(type='openvswitch')) + # None means is Isolated network, {} means default mode nat params = kwargs.get('forward', {"mode": None}) forward = _get_forward_elem(**params) -- 1.9.1

1 1

[PATCH 0/3 - v2] Checks memory alignment to 256 MiB and number of slots in PPC
by Rodrigo Trujillo 19 Nov '15

19 Nov '15

V2: - Created global variable to hold PPC Memory aligment value: 256 currently - Fix missing platform import - Changed mathematical operators by bitwise operators when manipulate memory values V1: This patchset makes necessary changes to check and change in PPC: - memory and maxMemory must be aligned to 256 MiB - Number of slots must be <= 32 Rodrigo Trujillo (3): Check memory alignment in PowerPC to 256MiB Check and align number of memory slot to 32 in PowerPC Change memory multipliers/divisors by bitwise operators src/wok/plugins/kimchi/i18n.py | 3 ++ src/wok/plugins/kimchi/model/vms.py | 38 ++++++++++++++++++++-- src/wok/plugins/kimchi/osinfo.py | 7 ++++ src/wok/plugins/kimchi/tests/test_livemigration.py | 2 +- src/wok/plugins/kimchi/vmtemplate.py | 8 ++++- 5 files changed, 54 insertions(+), 4 deletions(-) -- 2.1.0

3 10

[PATCH 0/2] Github #760: Enabling the import of WoK module /test/utils.py
by dhbarboza82＠gmail.com 19 Nov '15

19 Nov '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch set makes changes in WoK and Kimchi to allow the unit tests of all WoK plugins access to the /tests/utils.py module of WoK. This module is replicated at /plugins/kimchi/tests/utils.py and it was deleted. See https://github.com/kimchi-project/kimchi/issues/760 for further info Daniel Henrique Barboza (2): WoK: making /tests/utils.py available to all WoK plug-ins Kimchi: updating unit tests to use WoK /test/utils.py src/wok/plugins/kimchi/tests/run_tests.sh.in | 3 +- src/wok/plugins/kimchi/tests/test_authorization.py | 9 +- src/wok/plugins/kimchi/tests/test_host.py | 4 +- src/wok/plugins/kimchi/tests/test_livemigration.py | 21 +- src/wok/plugins/kimchi/tests/test_mock_network.py | 3 +- .../plugins/kimchi/tests/test_mock_storagepool.py | 4 +- .../kimchi/tests/test_mock_storagevolume.py | 3 +- src/wok/plugins/kimchi/tests/test_mockmodel.py | 5 +- src/wok/plugins/kimchi/tests/test_model.py | 3 +- src/wok/plugins/kimchi/tests/test_model_network.py | 6 +- .../plugins/kimchi/tests/test_model_storagepool.py | 4 +- .../kimchi/tests/test_model_storagevolume.py | 7 +- src/wok/plugins/kimchi/tests/test_networkxml.py | 7 +- src/wok/plugins/kimchi/tests/test_rest.py | 5 +- src/wok/plugins/kimchi/tests/test_template.py | 4 +- src/wok/plugins/kimchi/tests/utils.py | 259 --------------------- tests/__init__.py | 18 ++ tests/utils.py | 6 +- 18 files changed, 72 insertions(+), 299 deletions(-) delete mode 100644 src/wok/plugins/kimchi/tests/utils.py create mode 100644 tests/__init__.py -- 2.4.3

3 6

[PATCH] Issue #755 : Action's states are showing in correctly for Repositories
by atreyee＠linux.vnet.ibm.com 19 Nov '15

19 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> Fix Action enable/disable functionality of the repositories. --- .../plugins/gingerbase/ui/js/src/gingerbase.host.js | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js index 24a4aa6..6a6e690 100644 --- a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js +++ b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js @@ -161,11 +161,21 @@ gingerbase.host_main = function() { if (!repository) { return; } - $('#repositories-grid-remove-button').prop('disabled', false); - $('#repositories-grid-edit-button').prop('disabled', false); + var selectedRow = $('tr',repositoriesGrid.bodyContainer); + $('#repositories-grid-remove-button',selectedRow).prop('disabled', false); + $('#repositories-grid-edit-button',selectedRow).prop('disabled', false); var enabled = repository['enabled']; - $('#repositories-grid-enable-button') - .text(i18n[enabled ? 'GGBREPO6017M' : 'GGBREPO6016M']) + var actionHtml,actionText,actionIcon =''; + if(enabled){ + actionText= i18n['GGBREPO6017M']; + actionIcon = 'fa-pause'; + }else{ + actionText= i18n['GGBREPO6016M']; + actionIcon = 'fa-play-circle-o'; + } + actionHtml = ['<i class="fa',' ',actionIcon,'"></i>','',actionText].join(''); + $('#repositories-grid-enable-button',selectedRow) + .html(actionHtml) .prop('disabled', false); }, frozenFields: [], -- 2.1.0

2 1

[PATCH 0/3 - v3] Checks memory alignment to 256 MiB and number of slots in PPC
by Rodrigo Trujillo 19 Nov '15

19 Nov '15

V3: - Make modifications asked by Aline - Rebase with latest master code V2: - Created global variable to hold PPC Memory aligment value: 256 currently - Fix missing platform import - Changed mathematical operators by bitwise operators when manipulate memory values V1: This patchset makes necessary changes to check and change in PPC: - memory and maxMemory must be aligned to 256 MiB - Number of slots must be <= 32 Rodrigo Trujillo (3): Check memory alignment in PowerPC to 256MiB Check and align number of memory slot to 32 in PowerPC Change memory multipliers/divisors by bitwise operators src/wok/plugins/kimchi/i18n.py | 3 +- src/wok/plugins/kimchi/model/vms.py | 38 ++++++++++++++++++++-- src/wok/plugins/kimchi/osinfo.py | 7 ++++ src/wok/plugins/kimchi/tests/test_livemigration.py | 2 +- src/wok/plugins/kimchi/vmtemplate.py | 8 ++++- 5 files changed, 52 insertions(+), 6 deletions(-) -- 2.1.0

2 4

[PATCH] New Navigation bar
by atreyee＠linux.vnet.ibm.com 18 Nov '15

18 Nov '15

From: Atreyee Mukhopadhyay <atreyee(a)linux.vnet.ibm.com> This patch is to implement new feature mentioned in issue #746. First level navigation bar with Host and Virtualization tabs. Second level tab navigation based on first level navigation. Atreyee Mukhopadhyay (1): Issue #746 : New navigation bar. src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 1 + src/wok/plugins/kimchi/ui/config/tab-ext.xml | 1 + ui/css/src/modules/_toolbar.scss | 9 ++- ui/css/src/modules/_wok-variables.scss | 7 +- ui/js/src/wok.main.js | 81 +++++++++++++++++++++--- ui/pages/wok-ui.html.tmpl | 6 +- 6 files changed, 91 insertions(+), 14 deletions(-) -- 2.1.0

4 8

[PATCH 0/4] Live migration backend: additional features
by dhbarboza82＠gmail.com 18 Nov '15

18 Nov '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> *** REQUIRES THE FOLLOWING PATCH TO APPLY *** 'Live migration backend: non-shared storage VM migration' This patchset implements the remaining features of the live migration backend to be shipped in Kimchi 2.0: - password-less root setup: if provided with a user/password that has SUDO ALL access in the remote host, the backend will set the password-less environment automatically. - added same remote hypervisor verification - added same remote architecture verification - (ppc64 only): if applicable, verify subcores-per-core This is the usage after this patchset: - migrating a VM without any credentials: if the password less root login isn't set, it will simply abort the operation: $ curl -k -u user -H "Content-Type: application/json" -H "Accept: application/json" "https://localhost:8001/plugins/kimchi/vms/<vm_name>/migrate" -X POST -d '{"remote_host":"a_remote_host" }' - migrating a vm with credentials: same thing as above, but will set up the password less root login if it's not set yet: $ curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" "https://localhost:8001/plugins/kimchi/vms/<vm_name>/migrate" -X POST -d '{"remote_host":"a_remote_host", "user":"a_sudoall_user", "password":"passwd_of_user" }' Note that 'sudoall_user' can be the root of the remote host. *** NOTE *** First patch is a change in WoK necessary to make the 'user' and 'password' fields optional. Daniel Henrique Barboza (4): WoK: control/base.py: _generate_action_handler_base changes Live migration: new features changes in docs/API/i18n Live migration: model changes for the new features Live migration: unit tests for the new features src/wok/control/base.py | 5 +- src/wok/plugins/kimchi/API.json | 6 + src/wok/plugins/kimchi/control/vms.py | 3 +- src/wok/plugins/kimchi/docs/API.md | 3 +- src/wok/plugins/kimchi/docs/README.md | 6 +- src/wok/plugins/kimchi/i18n.py | 8 + src/wok/plugins/kimchi/model/vms.py | 177 +++++++++++++++++++-- src/wok/plugins/kimchi/tests/test_livemigration.py | 81 +++++++++- 8 files changed, 270 insertions(+), 19 deletions(-) -- 2.4.3

4 11

[PATCH] Add "io"="native" when creating a disk on Kimchi
by Ramon Medeiros 18 Nov '15

18 Nov '15

When running complex workloads with NFS servers, some machines hang when power off is pressed. With io=native, servers can poweroff correctly. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/xmlutils/disk.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/wok/plugins/kimchi/xmlutils/disk.py b/src/wok/plugins/kimchi/xmlutils/disk.py index 84be91d..2ed2ef4 100644 --- a/src/wok/plugins/kimchi/xmlutils/disk.py +++ b/src/wok/plugins/kimchi/xmlutils/disk.py @@ -53,6 +53,7 @@ def get_disk_xml(params): driver = E.driver(name='qemu', type=params['format']) if params['type'] != 'cdrom': driver.set('cache', 'none') + driver.set("io", "native") disk.append(driver) -- 2.1.0

3 2

[PATCH V2] Create logical pool from existing VG
by Aline Manera 18 Nov '15

18 Nov '15

Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> Signed-off-by: Jose Ricardo Ziviani <joserz(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/API.json | 5 + src/wok/plugins/kimchi/control/host.py | 22 ++++ src/wok/plugins/kimchi/disks.py | 123 +++++++++++++++++++++ src/wok/plugins/kimchi/docs/API.md | 25 ++++- src/wok/plugins/kimchi/i18n.py | 4 + src/wok/plugins/kimchi/mockmodel.py | 27 +++++ src/wok/plugins/kimchi/model/host.py | 29 +++++ src/wok/plugins/kimchi/model/libvirtstoragepool.py | 9 +- src/wok/plugins/kimchi/model/storagepools.py | 30 +++-- .../plugins/kimchi/tests/test_mock_storagepool.py | 8 +- 10 files changed, 265 insertions(+), 17 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index 961f35f..7daa2a9 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -141,6 +141,11 @@ "error": "KCHPOOL0025E" } } + }, + "from_vg": { + "description": "Use an existing VG or create a new one", + "type": "boolean", + "error": "KCHPOOL0026E" } } } diff --git a/src/wok/plugins/kimchi/control/host.py b/src/wok/plugins/kimchi/control/host.py index 9bc703a..39df0d0 100644 --- a/src/wok/plugins/kimchi/control/host.py +++ b/src/wok/plugins/kimchi/control/host.py @@ -35,12 +35,34 @@ class Host(Resource): self.devices = Devices(self.model) self.cpuinfo = CPUInfo(self.model) self.partitions = Partitions(self.model) + self.vgs = VolumeGroups(self.model) @property def data(self): return {} +class VolumeGroups(Collection): + def __init__(self, model): + super(VolumeGroups, self).__init__(model) + self.role_key = 'host' + self.uri_fmt = "/host/vgs" + self.admin_methods = ['GET'] + self.resource = VolumeGroup + + +class VolumeGroup(Resource): + def __init__(self, model, id=None): + super(VolumeGroup, self).__init__(model, id) + self.role_key = 'host' + self.uri_fmt = "/host/vgs/%s" + self.admin_methods = ['GET'] + + @property + def data(self): + return self.info + + class VMHolders(SimpleCollection): def __init__(self, model, device_id): super(VMHolders, self).__init__(model) diff --git a/src/wok/plugins/kimchi/disks.py b/src/wok/plugins/kimchi/disks.py index eb40e3a..0ac792e 100644 --- a/src/wok/plugins/kimchi/disks.py +++ b/src/wok/plugins/kimchi/disks.py @@ -194,3 +194,126 @@ def get_partition_details(name): dev['path'] = dev_path dev['name'] = name return dev + + +def vgs(): + """ + lists all volume groups in the system. All size units are in bytes. + + [{'vgname': 'vgtest', 'size': 999653638144L, 'free': 0}] + """ + cmd = ['vgs', + '--units', + 'b', + '--nosuffix', + '--noheading', + '--unbuffered', + '--options', + 'vg_name,vg_size,vg_free'] + + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + out, err = proc.communicate() + + if proc.returncode != 0: + raise OperationFailed("KCHDISKS0003E", {'err': err}) + + if not out: + return [] + + # remove blank spaces and create a list of VGs + vgs = map(lambda v: v.strip(), out.strip('\n').split('\n')) + + # create a dict based on data retrieved from vgs + return map(lambda l: {'vgname': l[0], + 'size': long(l[1]), + 'free': long(l[2])}, + [fields.split() for fields in vgs]) + + +def lvs(vgname=None): + """ + lists all logical volumes found in the system. It can be filtered by + the volume group. All size units are in bytes. + + [{'lvname': 'lva', 'path': '/dev/vgtest/lva', 'size': 12345L}, + {'lvname': 'lvb', 'path': '/dev/vgtest/lvb', 'size': 12345L}] + """ + cmd = ['lvs', + '--units', + 'b', + '--nosuffix', + '--noheading', + '--unbuffered', + '--options', + 'lv_name,lv_path,lv_size,vg_name'] + + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + out, err = proc.communicate() + + if proc.returncode != 0: + raise OperationFailed("KCHDISKS0003E", {'err': err}) + + if not out: + return [] + + # remove blank spaces and create a list of LVs filtered by vgname, if + # provided + lvs = filter(lambda f: vgname is None or vgname in f, + map(lambda v: v.strip(), out.strip('\n').split('\n'))) + + # create a dict based on data retrieved from lvs + return map(lambda l: {'lvname': l[0], + 'path': l[1], + 'size': long(l[2])}, + [fields.split() for fields in lvs]) + + +def pvs(vgname=None): + """ + lists all physical volumes in the system. It can be filtered by the + volume group. All size units are in bytes. + + [{'pvname': '/dev/sda3', + 'size': 469502001152L, + 'uuid': 'kkon5B-vnFI-eKHn-I5cG-Hj0C-uGx0-xqZrXI'}, + {'pvname': '/dev/sda2', + 'size': 21470642176L, + 'uuid': 'CyBzhK-cQFl-gWqr-fyWC-A50Y-LMxu-iHiJq4'}] + """ + cmd = ['pvs', + '--units', + 'b', + '--nosuffix', + '--noheading', + '--unbuffered', + '--options', + 'pv_name,pv_size,pv_uuid,vg_name'] + + proc = subprocess.Popen(cmd, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE) + + out, err = proc.communicate() + + if proc.returncode != 0: + raise OperationFailed("KCHDISKS0003E", {'err': err}) + + if not out: + return [] + + # remove blank spaces and create a list of PVs filtered by vgname, if + # provided + pvs = filter(lambda f: vgname is None or vgname in f, + map(lambda v: v.strip(), out.strip('\n').split('\n'))) + + # create a dict based on data retrieved from pvs + return map(lambda l: {'pvname': l[0], + 'size': long(l[1]), + 'uuid': l[2]}, + [fields.split() for fields in pvs]) diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 52368b7..14f014d 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -444,7 +444,8 @@ A interface represents available network interface on VM. * **GET**: Retrieve a summarized list of all defined Storage Pools * **POST**: Create a new Storage Pool - * name: The name of the Storage Pool. + * name: The name of the Storage Pool. It corresponds to the VG name while + creating a logical storage pool from an existing VG. * type: The type of the defined Storage Pool. Supported types: 'dir', 'kimchi-iso', 'netfs', 'logical', 'iscsi', 'scsi' * path: The path of the defined Storage Pool. @@ -466,6 +467,8 @@ A interface represents available network interface on VM. * username: Login username of the iSCSI target. * password: Login password of the iSCSI target. * adapter_name: SCSI host name. + * from_vg: Indicate if a logical pool will be created from an + existing VG or not. ### Resource: Storage Pool @@ -897,6 +900,26 @@ List of available groups. Otherwise blank. * available: false, if the partition is in use by system; true, otherwise. +### Collection: Volume Groups + +**URI:** /plugins/kimchi/host/vgs + +**Methods:** + +* **GET**: Retrieves a detailed list of all volume groups in the host. + +### Resource: Volume Group + +**URI:** /plugins/kimchi/host/vgs/*:name* + +**Methods:** + +* **GET**: Retrieve the description of a single Volume Group: + * name: The volume group name. Used to identify it in this API. + * lvs: The logical volumes associated to this volume group. + * pvs: The phisical volumes associated to this volume group. + * free: Amount of free space in the volume group. + * size: Total size of the volume group. ### Collection: Peers diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index 59b61de..a4092e7 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -29,6 +29,7 @@ messages = { "KCHDISKS0001E": _("Error while getting block devices. Details: %(err)s"), "KCHDISKS0002E": _("Error while getting block device information for %(device)s."), + "KCHDISKS0003E": _("Unable to retrieve LVM information. Details: %(err)s"), "KCHPART0001E": _("Partition %(name)s does not exist in the host"), @@ -199,6 +200,7 @@ messages = { "KCHPOOL0035E": _("Unable to delete pool %(name)s as it is associated with some templates"), "KCHPOOL0036E": _("A volume group named '%(name)s' already exists. Please, choose another name to create the logical pool."), "KCHPOOL0037E": _("Unable to update database with deep scan information due error: %(err)s"), + "KCHPOOL0038E": _("No volume group '%(name)s' found. Please, specify an existing volume group to create the logical pool from."), "KCHVOL0001E": _("Storage volume %(name)s already exists"), "KCHVOL0002E": _("Storage volume %(name)s does not exist in storage pool %(pool)s"), @@ -294,4 +296,6 @@ messages = { "KCHCPUINF0002E": _("Invalid vCPU/topology combination."), "KCHCPUINF0003E": _("This host (or current configuration) does not allow CPU topology."), + "KCHLVMS0001E": _("Invalid volume group name parameter: %(name)s."), + } diff --git a/src/wok/plugins/kimchi/mockmodel.py b/src/wok/plugins/kimchi/mockmodel.py index 895401e..9186f78 100644 --- a/src/wok/plugins/kimchi/mockmodel.py +++ b/src/wok/plugins/kimchi/mockmodel.py @@ -39,6 +39,7 @@ from wok.plugins.kimchi.model.libvirtstoragepool import NetfsPoolDef from wok.plugins.kimchi.model.libvirtstoragepool import StoragePoolDef from wok.plugins.kimchi.model.model import Model from wok.plugins.kimchi.model.storagepools import StoragePoolModel +from wok.plugins.kimchi.model.storagepools import StoragePoolsModel from wok.plugins.kimchi.model.storagevolumes import StorageVolumeModel from wok.plugins.kimchi.model.storagevolumes import StorageVolumesModel from wok.plugins.kimchi.model import storagevolumes @@ -73,6 +74,7 @@ class MockModel(Model): defaults.update(mockmodel_defaults) osinfo.defaults = dict(defaults) + self._mock_vgs = MockVolumeGroups() self._mock_partitions = MockPartitions() self._mock_devices = MockDevices() self._mock_storagevolumes = MockStorageVolumes() @@ -113,6 +115,7 @@ class MockModel(Model): setattr(self, m, mock_method) DeviceModel.lookup = self._mock_device_lookup + StoragePoolsModel._check_lvm = self._check_lvm StoragePoolModel._update_lvm_disks = self._update_lvm_disks StorageVolumesModel.get_list = self._mock_storagevolumes_get_list StorageVolumeModel.doUpload = self._mock_storagevolume_doUpload @@ -252,6 +255,10 @@ class MockModel(Model): return MockModel._libvirt_get_vol_path(pool, vol) + def _check_lvm(self, name, from_vg): + # do not do any verification while using MockModel + pass + def _update_lvm_disks(self, pool_name, disks): conn = self.conn.get() pool = conn.storagePoolLookupByName(pool_name.encode('utf-8')) @@ -334,6 +341,12 @@ class MockModel(Model): def _mock_partition_lookup(self, name): return self._mock_partitions.partitions[name] + def _mock_volumegroups_get_list(self): + return self._mock_vgs.data.keys() + + def _mock_volumegroup_lookup(self, name): + return self._mock_vgs.data[name] + def _mock_vm_clone(self, name): new_name = get_next_clone_name(self.vms_get_list(), name) snapshots = MockModel._mock_snapshots.get(name, []) @@ -418,6 +431,20 @@ class MockStorageVolumes(object): 'isvalid': True}} +class MockVolumeGroups(object): + def __init__(self): + self.data = {"hostVG": {"lvs": [], + "name": "hostVG", + "pvs": ["/dev/vdx"], + "free": 5347737600, + "size": 5347737600}, + "kimchiVG": {"lvs": [], + "name": "kimchiVG", + "pvs": ["/dev/vdz", "/dev/vdw"], + "free": 10695475200, + "size": 10695475200}} + + class MockPartitions(object): def __init__(self): self.partitions = {"vdx": {"available": True, "name": "vdx", diff --git a/src/wok/plugins/kimchi/model/host.py b/src/wok/plugins/kimchi/model/host.py index 96f4bea..4a37dc8 100644 --- a/src/wok/plugins/kimchi/model/host.py +++ b/src/wok/plugins/kimchi/model/host.py @@ -241,3 +241,32 @@ class PartitionModel(object): def lookup(self, name): return disks.get_partition_details(name) + + +class VolumeGroupsModel(object): + def __init__(self, **kargs): + pass + + def get_list(self): + if not disks.vgs(): + return [] + return [vg['vgname'] for vg in disks.vgs()] + + +class VolumeGroupModel(object): + def __init__(self, **kargs): + pass + + def lookup(self, name): + def _format(vg): + return {'name': vg['vgname'], + 'size': vg['size'], + 'free': vg['free'], + 'pvs': [pv['pvname'] for pv in disks.pvs(vg['vgname'])], + 'lvs': [lv['lvname'] for lv in disks.lvs(vg['vgname'])]} + + vgs = [_format(vg) for vg in disks.vgs() if vg['vgname'] == name] + if not vgs: + raise InvalidParameter("KCHLVMS0001E", {'name': name}) + + return vgs[0] diff --git a/src/wok/plugins/kimchi/model/libvirtstoragepool.py b/src/wok/plugins/kimchi/model/libvirtstoragepool.py index 5da0b3b..0fa8ce0 100644 --- a/src/wok/plugins/kimchi/model/libvirtstoragepool.py +++ b/src/wok/plugins/kimchi/model/libvirtstoragepool.py @@ -144,11 +144,12 @@ class LogicalPoolDef(StoragePoolDef): pool = E.pool(type='logical') pool.append(E.name(self.poolArgs['name'])) - source = E.source() - for device_path in self.poolArgs['source']['devices']: - source.append(E.device(path=device_path)) + if not self.poolArgs['source'].get('from_vg', False): + source = E.source() + for device_path in self.poolArgs['source']['devices']: + source.append(E.device(path=device_path)) + pool.append(source) - pool.append(source) pool.append(E.target(E.path(self.path))) return ET.tostring(pool, encoding='unicode', pretty_print=True) diff --git a/src/wok/plugins/kimchi/model/storagepools.py b/src/wok/plugins/kimchi/model/storagepools.py index cc0bc7c..ec866c5 100644 --- a/src/wok/plugins/kimchi/model/storagepools.py +++ b/src/wok/plugins/kimchi/model/storagepools.py @@ -142,9 +142,27 @@ class StoragePoolsModel(object): raise OperationFailed("KCHPOOL0006E", {'err': e.get_error_message()}) + def _check_lvm(self, name, from_vg): + vgdisplay_cmd = ['vgdisplay', name.encode('utf-8')] + output, error, returncode = run_command(vgdisplay_cmd) + # From vgdisplay error codes: + # 1 error reading VGDA + # 2 volume group doesn't exist + # 3 not all physical volumes of volume group online + # 4 volume group not found + # 5 no volume groups found at all + # 6 error reading VGDA from lvmtab + if from_vg and returncode in [2, 4, 5]: + raise InvalidOperation("KCHPOOL0038E", {'name': name}) + + if not from_vg and returncode not in [2, 4, 5]: + raise InvalidOperation("KCHPOOL0036E", {'name': name}) + def create(self, params): task_id = None conn = self.conn.get() + from_vg = params.get('source', {}).get('from_vg', False) + try: name = params['name'] if name == ISO_POOL_NAME: @@ -154,17 +172,7 @@ class StoragePoolsModel(object): # used before but a volume group will already exist with this name # So check the volume group does not exist to create the pool if params['type'] == 'logical': - vgdisplay_cmd = ['vgdisplay', name.encode('utf-8')] - output, error, returncode = run_command(vgdisplay_cmd) - # From vgdisplay error codes: - # 1 error reading VGDA - # 2 volume group doesn't exist - # 3 not all physical volumes of volume group online - # 4 volume group not found - # 5 no volume groups found at all - # 6 error reading VGDA from lvmtab - if returncode not in [2, 4, 5]: - raise InvalidOperation("KCHPOOL0036E", {'name': name}) + self._check_lvm(name, from_vg) if params['type'] == 'kimchi-iso': task_id = self._do_deep_scan(params) diff --git a/src/wok/plugins/kimchi/tests/test_mock_storagepool.py b/src/wok/plugins/kimchi/tests/test_mock_storagepool.py index ea9843b..a2609eb 100644 --- a/src/wok/plugins/kimchi/tests/test_mock_storagepool.py +++ b/src/wok/plugins/kimchi/tests/test_mock_storagepool.py @@ -65,6 +65,10 @@ class MockStoragepoolTests(unittest.TestCase): ) def test_storagepool(self): + # MockModel always returns 2 VGs (hostVG, kimchiVG) + vgs = json.loads(self.request('/plugins/kimchi/host/vgs').read()) + vg_names = [vg['name'] for vg in vgs] + # MockModel always returns 2 partitions (vdx, vdz) partitions = json.loads( self.request('/plugins/kimchi/host/partitions').read() @@ -89,7 +93,9 @@ class MockStoragepoolTests(unittest.TestCase): 'source': {'host': '127.0.0.1', 'target': 'iqn.2015-01.localhost.kimchiUnitTest'}}, {'type': 'logical', 'name': u'kīмсhīUnitTestLogicalPool', - 'source': {'devices': [devs[0]]}}] + 'source': {'devices': [devs[0]]}}, + {'type': 'logical', 'name': vg_names[0], + 'source': {'from_vg': True}}] def _do_test(params): name = params['name'] -- 2.5.0

2 2

[PATCH v2] Display guest IP address
by Socorro Stoppler 18 Nov '15

18 Nov '15

Display guest IP address for each network interface configured This is based off of Samuel's master branch v1 - first version v2 - display 'unavailable' in the UI if IP is not available for the guest Socorro Stoppler (1): Display guest IP address for each network interface configured src/wok/plugins/ginger | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js | 9 ++++++++- src/wok/plugins/kimchi/ui/pages/guest-edit.html.tmpl | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) -- 1.9.1

2 2

Display guest IP addressFrom 8651c8cc40fe963f24534464aa2b9ebf1715fdbb Mon Sep 17 00:00:00 2001
by Socorro Stoppler 17 Nov '15

17 Nov '15

Display guest IP address for each network interface configured Socorro Stoppler (1): Display guest IP address for each network interface configured src/wok/plugins/ginger | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.guest_edit_main.js | 6 ++++-- src/wok/plugins/kimchi/ui/pages/guest-edit.html.tmpl | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) -- 1.9.1

3 7

[PATCH v5] shutdown and reboot actions on plain linux vs linux with KVM
by chandra＠linux.vnet.ibm.com 17 Nov '15

17 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> UI was using REST API 'plugins/kimchi/vms' to get the vms prior ginger base Ginger Base should handle on both plain linux vs linux with KVM capabilities. Changes made to take care shutdown or reboot actions triggered: 1. send error message in case vms are running. 2. send success in case vms are not running on KVM or plain linux will trigger shutdown or reboot action in this case. chandrureddy (1): shutdown and reboot actions on plain linux vs linux with KVM src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/model/host.py | 47 +++++++++++++++------- .../gingerbase/ui/js/src/gingerbase.host.js | 27 +++++++------ src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl | 3 ++ 4 files changed, 51 insertions(+), 27 deletions(-) -- 2.1.0

2 3

[PATCH] Issue #757 : clean generated css files when 'make clean' executed
by chandra＠linux.vnet.ibm.com 17 Nov '15

17 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Delete the following generated files when 'make clean' executed. 1. wok.css 2. bootstrap.custom.css 3. bootstrap-select.custom.css --- ui/css/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index c67bb0e..d137c3b 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -31,4 +31,4 @@ dist_css_DATA = theme-default.min.css jquery-ui.custom.css wok.css bootstrap.cu theme-default.min.css: theme-default/*.css cat $^ > $@ -CLEANFILES = theme-default.min.css +CLEANFILES = theme-default.min.css wok.css bootstrap.custom.css bootstrap-select.custom.css -- 2.1.0

2 2

[PATCH] Live migration - non shared storagen support
by dhbarboza82＠gmail.com 17 Nov '15

17 Nov '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> This patch implements non shared storage for the live migration backend. No API changes were made. To test it (WoK running with default ports): curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -k "https://localhost:8001/plugins/kimchi/vms/migrate_test/migrate" -X POST -d '{"remote_host": "remote_host_ip", "user":"root"}' Daniel Henrique Barboza (1): Live migration backend: non-shared storage VM migration src/wok/plugins/kimchi/i18n.py | 4 + src/wok/plugins/kimchi/model/vms.py | 105 +++++++++++++++++++- src/wok/plugins/kimchi/tests/test_livemigration.py | 107 ++++++++++++++++----- 3 files changed, 190 insertions(+), 26 deletions(-) -- 2.4.3

2 3

[PATCH v2] Live migration - non shared storage support
by dhbarboza82＠gmail.com 17 Nov '15

17 Nov '15

From: Daniel Henrique Barboza <dhbarboza82(a)gmail.com> Changes in v2: - using libvirt API to get the disk size as suggested by Aline This patch implements non shared storage for the live migration backend. No API changes were made. To test it (WoK running with default ports): curl -u root -H "Content-Type: application/json" -H "Accept: application/json" -k "https://localhost:8001/plugins/kimchi/vms/migrate_test/migrate" -X POST -d '{"remote_host": "remote_host_ip", "user":"root"}' Daniel Henrique Barboza (1): Live migration backend: non-shared storage VM migration src/wok/plugins/kimchi/i18n.py | 4 + src/wok/plugins/kimchi/model/vms.py | 104 +++++++++++++++++++- src/wok/plugins/kimchi/tests/test_livemigration.py | 107 ++++++++++++++++----- 3 files changed, 189 insertions(+), 26 deletions(-) -- 2.4.3

2 3

[PATCH 0/2 - v2] Implement front-end support to add multiple disks in Template
by Rodrigo Trujillo 16 Nov '15

16 Nov '15

V2 - Rebase over latest new UI patches V1 - Initial version Rodrigo Trujillo (2): Allow listStorageVolumes ajax call be synchronized UI - Implement multiple disks support in Template edit window src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 +- .../ui/js/src/kimchi.guest_storage_add.main.js | 2 +- .../kimchi/ui/js/src/kimchi.storage_main.js | 2 +- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 246 ++++++++++----------- .../kimchi/ui/pages/template-edit.html.tmpl | 5 +- 5 files changed, 130 insertions(+), 132 deletions(-) -- 2.1.0

2 7

RFC - #728 - Processor Info in s390 architecture
by Suresh Babu Angadi 16 Nov '15

16 Nov '15

Hi Team, With the current implementation of gingerbase, the processor information is empty for s390 architecture. O/p of /plugins/gingerbase/host on one of the lpar with KVM for IBM z systems: { "os_distro":"KVM for IBM z Systems", "os_codename":"Z", "os_version":"1.1.1", "cpus":3, "memory":4000559104 } Note: cpu_model is not fetched for s390x architecture. Additional Information which can be provided for benefit of end users: Architecture Details: "architecture": "x86 or s390x or ppc etc" CPU details(for x86 and s390x): Showing online cpus count and offline cpus count(planned to use lscpu for x86 and s390x, not sure how to fetch these details in power pc). Display offline CPUs only if any processors are offline. "cpus": {"online": <integer(online_cpus_count)> "offline": <integer(offline_cpus_count)>} Processor Type(s390x): shared and dedicated cpus "cpus": {"online": <integer(online_cpus_count)> "offline": <integer(offline_cpus_count)> "shared": <integer(shared_cpus_count)> "dedicated": <integer(dedicated_cpus_count)>} Host Name(for all architecture): Currently IP address is displayed in the new UI (below kimchi logo). Displaying host name would be more meaningful. Memory Details(s390x specific): In s390x architecture, we can have online and offline memory. example: [root@ ~]# lsmem Address Range Size (MB) State Removable Device =============================================================================== 0x0000000000000000-0x000000000fffffff 256 online no 0 0x0000000010000000-0x000000002fffffff 512 online yes 1-2 0x0000000030000000-0x000000007fffffff 1280 online no 3-7 0x0000000080000000-0x00000000ffffffff 2048 offline - 8-15 Memory device size : 256 MB Memory block size : 256 MB* **Total online memory : 2048 MB** **Total offline memory: 2048 MB* so memory would be split to include total online and total offline memory. memory: {"online": <total_online_memory>, "offline":<total offline memory>} Virtualization Details(s390x specific): Providing Hypervisor and Hypervisor Vendor details when virtualized. Example Hypervisor: PR/SM , Hypervisor vendor: IBM. Lpar Details: Lpar name and Lpar ID "virtualization": {"hypervisor":"PR/SM", "hypervisor_vendor": "IBM", "lpar_name": "LP6", "lpar_number":"22"} So the o/p json of /plugins/gingerbase/host would look like below: for x86: { "os_distro":"Fedora", "architecture":"x86_64" "cpu_model":"Intel(R) Core(TM) i5-3320M CPU @ 2.60GHz", "cpus":{"online":3, "offline":2}, "os_version":"21", "os_codename":"Twenty One", "memory":7933894656 "host":<host_name> } for power: Only change, addition of "architecture" and "host" information, unless we decide to show offline cpus for s390x: { "os_distro":"KVM for IBM z Systems", "os_codename":"Z", "os_version":"1.1.1", "architecture": "s390x" "cpu_model": "IBM / 2827 / 743 H43" cpus: {"online":2, "offline":2, "shared":2, "dedicated":0} memory : {"online" : 2147483628, "offline" : 2147483628} "virtualization": {"hypervisor":"PR/SM", "hypervisor_vendor": "IBM", "lpar_name": "LP6", "lpar_number":"22"}, "host":"zfwpc160" } -- Regards, Suresh Babu Angadi

2 2

[RFC] UI - Live migration UI design
by Daniel Henrique Barboza 16 Nov '15

16 Nov '15

Hi, The backend for this feature is almost completed and the API is defined, so let's talk about the UI. This is the API (note: the upstream version is outdated, will be updated in an incoming patch): **URI:** /plugins/kimchi/vms/*:name* * **POST**: *See Virtual Machine Actions* **Actions (POST):** * migrate: Migrate a virtual machine to a remote server, only support live mode without block migration. * remote_host: IP address or hostname of the remote server. * user *(optional)*: User to log on at the remote server. * password *(optional)*: password of the user in the remote server This API will return a task ID for the UI to track its progress, pretty much like it is done with the 'clone' feature. This is how I imagine the UI: - a button called "migrate" at the same submenu as clone VM. - when pressed, a new window appears with the following content: -------- "Disclaimer: this process cannot be stopped after started, can take a long time to complete and will turn off this current VM when it is over." * textfield to input the remote_server, name "remote server" * checkbox with text: "Delete this VM when the migration is completed" Text: "The following fields are optional. Fill them if you want Kimchi to setup a password-less ssh session between the localhost and the remote host. The setup process will only be successful if the user has 'SUDO ALL' permission in the remote machine" * textfield to input the username of the remote host * password field to input the password of the user in the remote host * "Cancel" and "Start" buttons at the bottom ------------- This is the workflow/behavior I would expect of it: - clicking "Cancel" at any time will dismiss the window and nothing happens; - clicking "Start" without remote_host field will issue an error "remote host field cannot be blank" or something like that - clicking "Start" with a remote host field will start the process - clicking "Start" with remote host and only one of the user or password filled will raise an error "both user and password fields must be filled". - if, **and only if **, the user checks the checkbox "Delete VM ....", the UI will delete the VM after the migration process is completed by using the proper API (I believe it is DELETE /vms/name). This is all I have for the UI for this feature ATM. I'll update this RFC if required. Please provide comments and suggestions. The final backend for this feature will be submitted to the ML at the start of the next week. Let me know if there's any doubts about how Kimchi's live migration backend works. Daniel

4 4

[RFC] Add support for guest serial console
by Ramon Medeiros 16 Nov '15

16 Nov '15

Hi, i want to discuss about the support of guest serial console. To access a serial console, i need to add the xml of the device (http://wiki.libvirt.org/page/Unable_to_connect_to_console_of_a_running_doma…) <serial type='pty'> <target port='0'/> </serial> <console type='pty'> <target type='serial' port='0'/> </console> And, the operation system of the VM need to point to the serial: console=ttyS0,115200 So, how we can make sure that the user can access the machine by serial console: 1) Just add the xml and let the user add the statement above? 2) Use libvirt to add this parameters (https://libvirt.org/formatdomain.html#elementsOSKernel) -- Ramon Nunes Medeiros Kimchi Developer Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH 1/2] Allow listStorageVolumes ajax call be synchronized
by Rodrigo Trujillo 13 Nov '15

13 Nov '15

This patch changes kimchi.listStorageVolumes function to receive a new parameter 'sync' in order to set it as synchronous call. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 7 ++++--- src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js | 2 +- src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js index b1acdb9..d5e9ddd 100644 --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.api.js @@ -393,12 +393,13 @@ var kimchi = { }); }, - listStorageVolumes : function(poolName, suc, err) { + listStorageVolumes : function(poolName, suc, err, sync) { $.ajax({ url : 'plugins/kimchi/storagepools/' + encodeURIComponent(poolName) + '/storagevolumes', type : 'GET', contentType : 'application/json', dataType : 'json', + async : !sync, success : suc, error : err }); @@ -452,7 +453,7 @@ var kimchi = { return; } suc(isos, true); - }, err); + }, err, false); } else if (status === "running") { if (deepScanHandler.stop) { return; @@ -463,7 +464,7 @@ var kimchi = { } suc(isos, false); setTimeout(monitorTask, 2000); - }, err); + }, err, false); } else if (status === "failed") { if (deepScanHandler.stop) { return; diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js index ec07cf0..d6606ee 100644 --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.guest_storage_add.main.js @@ -94,7 +94,7 @@ kimchi.guest_storage_add_main = function() { } } $('#guest-disk').selectMenu("setData", options); - }); + }, null, false); }); diff --git a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js index 40a43f6..cba8fb4 100644 --- a/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js +++ b/src/wok/plugins/kimchi/ui/js/src/kimchi.storage_main.js @@ -282,7 +282,7 @@ kimchi.doListVolumes = function(poolObj) { slide.slideDown('slow'); }, function(err) { wok.message.error(err.responseJSON.reason); - }); + }, false); } kimchi.initLogicalPoolExtend = function() { -- 2.1.0

2 3

[PATCH 0/4] Ginger Base stabilization
by Aline Manera 13 Nov '15

13 Nov '15

Aline Manera (4): Remove Kimchi references from Ginger Base Update gingerbase po files Update COPYING file for Ginger Base Fix make check-local for Ginger Base src/wok/plugins/gingerbase/COPYING | 10 +- src/wok/plugins/gingerbase/model/host.py | 4 +- src/wok/plugins/gingerbase/model/model.py | 4 +- src/wok/plugins/gingerbase/po/Makevars | 2 +- src/wok/plugins/gingerbase/po/de_DE.po | 1687 +----------------- src/wok/plugins/gingerbase/po/en_US.po | 1884 +++---------------- src/wok/plugins/gingerbase/po/es_ES.po | 1708 +----------------- src/wok/plugins/gingerbase/po/fr_FR.po | 1737 +----------------- src/wok/plugins/gingerbase/po/gingerbase.pot | 1885 +++----------------- src/wok/plugins/gingerbase/po/it_IT.po | 1673 +---------------- src/wok/plugins/gingerbase/po/ja_JP.po | 1683 +---------------- src/wok/plugins/gingerbase/po/ko_KR.po | 1613 +---------------- src/wok/plugins/gingerbase/po/pt_BR.po | 1749 +----------------- src/wok/plugins/gingerbase/po/ru_RU.po | 1603 +---------------- src/wok/plugins/gingerbase/po/zh_CN.po | 1644 ++--------------- src/wok/plugins/gingerbase/po/zh_TW.po | 1572 +--------------- src/wok/plugins/gingerbase/swupdate.py | 6 +- src/wok/plugins/gingerbase/tests/test_host.py | 4 +- src/wok/plugins/gingerbase/tests/test_model.py | 2 +- src/wok/plugins/gingerbase/tests/utils.py | 6 +- .../plugins/gingerbase/ui/js/src/gingerbase.api.js | 14 +- .../gingerbase/ui/js/src/gingerbase.host.js | 126 +- .../gingerbase/ui/js/src/gingerbase.main.js | 10 +- .../ui/js/src/gingerbase.report_add_main.js | 10 +- .../ui/js/src/gingerbase.report_rename_main.js | 10 +- .../ui/js/src/gingerbase.repository_add_main.js | 6 +- .../ui/js/src/gingerbase.repository_edit_main.js | 12 +- src/wok/plugins/gingerbase/ui/pages/host.html.tmpl | 4 +- .../gingerbase/ui/pages/report-add.html.tmpl | 2 +- .../gingerbase/ui/pages/report-rename.html.tmpl | 2 +- .../gingerbase/ui/pages/repository-add.html.tmpl | 2 +- .../gingerbase/ui/pages/repository-edit.html.tmpl | 2 +- 32 files changed, 1366 insertions(+), 19310 deletions(-) -- 2.5.0

3 7

[PATCH 0/3] Some fixes for Kimchi
by Aline Manera 13 Nov '15

13 Nov '15

Aline Manera (3): Fix issue #734: Update test case as libvirt issue was fixed Fix test case: Delete directory associated to the storage pool Kimchi: Add m4/pkg.m4 to .gitignore src/wok/plugins/kimchi/.gitignore | 1 + src/wok/plugins/kimchi/tests/test_model_storagepool.py | 6 ++++-- .../plugins/kimchi/tests/test_model_storagevolume.py | 17 +++++------------ 3 files changed, 10 insertions(+), 14 deletions(-) -- 2.5.0

2 5

[PATCH 0/2] Checks memory alignment to 256 MiB and number of slots in PPC
by Rodrigo Trujillo 12 Nov '15

12 Nov '15

This patchset makes necessary changes to check and change in PPC: - memory and maxMemory must be aligned to 256 MiB - Number of slots must be <= 32 Rodrigo Trujillo (2): Check memory alignment in PowerPC to 256MiB Check and align number of memory slot to 32 in PowerPC src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/vms.py | 33 +++++++++++++++++++++++++++++++++ src/wok/plugins/kimchi/osinfo.py | 4 ++++ src/wok/plugins/kimchi/vmtemplate.py | 7 ++++++- 4 files changed, 44 insertions(+), 1 deletion(-) -- 2.1.0

4 11

[PATCH 0/2] UI fixes for guest creation/cloning
by Aline Manera 11 Nov '15

11 Nov '15

Aline Manera (2): Bug fix: Properly define kimchi.trackTask() Bug fix: Properly get the new guest name while creating or cloning a guest src/wok/plugins/kimchi/ui/js/src/kimchi.api.js | 26 ++++++++++++++++++++++ .../plugins/kimchi/ui/js/src/kimchi.guest_main.js | 4 ++-- 2 files changed, 28 insertions(+), 2 deletions(-) -- 2.5.0

2 4

[PATCH] Bug fix: Use qxl video model for Fedora 22+ guests
by Aline Manera 11 Nov '15

11 Nov '15

After creating a Fedora 23 guest, the login screen was not displayed due the wrong video model configured by Kimchi. Since qxl video model is the default for Fedora 22, update Kimchi to set it to every Fedora guests newer than 22 version. For reference: https://github.com/kimchi-project/kimchi/issues/647 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/osinfo.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/wok/plugins/kimchi/osinfo.py b/src/wok/plugins/kimchi/osinfo.py index 75a21ff..7f8ace9 100644 --- a/src/wok/plugins/kimchi/osinfo.py +++ b/src/wok/plugins/kimchi/osinfo.py @@ -216,7 +216,10 @@ def lookup(distro, version): params.update(template_specs[arch]['old']) # Get custom specifications - params.update(custom_specs.get(distro, {}).get(version, {})) + specs = custom_specs.get(distro, {}) + for v, config in specs.iteritems(): + if LooseVersion(version) >= LooseVersion(v): + params.update(config) if distro in icon_available_distros: params['icon'] = 'plugins/kimchi/images/icon-%s.png' % distro -- 2.5.0

2 2

[PATCH 00/10] Adding new-ui to Wok, Kimchi and Gingerbase
by sguimaraes943＠gmail.com 11 Nov '15

11 Nov '15

From: samhenri <samuel.guimaraes(a)eldorado.org.br> This patchset adds the new-ui to Hosts (Gingerbase), Templates, Storages and Network tabs, including all modal windows. Guests tab is still not finished but some elements were already ported to the new-ui. samhenri (10): [new-ui] Deleting unused files [new-ui] Updated widgets [new-ui] Updated images and distro icons [new-ui] Updated SCSS files [new-ui] Base template files [new-ui] Gingerbase / Hosts tab [new-ui] Kimchi config and Guests tab [new-ui] Network tab [new-ui] Storage tab [new-ui] Templates tab src/wok/plugins/gingerbase/.gitignore | 2 +- src/wok/plugins/gingerbase/configure.ac | 1 - src/wok/plugins/gingerbase/ui/config/tab-ext.xml | 2 +- src/wok/plugins/gingerbase/ui/css/Makefile.am | 11 +- .../plugins/gingerbase/ui/css/src/gingerbase.scss | 29 + .../gingerbase/ui/css/src/modules/_host.scss | 227 ++++++++ .../gingerbase/ui/css/theme-default/host.css | 289 --------- .../gingerbase/ui/css/theme-default/report-add.css | 39 -- .../ui/css/theme-default/report-rename.css | 41 -- .../ui/css/theme-default/repository-add.css | 44 -- .../ui/css/theme-default/repository-edit.css | 90 --- src/wok/plugins/gingerbase/ui/images/Makefile.am | 2 - src/wok/plugins/gingerbase/ui/images/logo.ico | Bin 1214 -> 15086 bytes .../gingerbase/ui/images/theme-default/Makefile.am | 20 - .../ui/images/theme-default/host-icon-sprite.png | Bin 1034 -> 0 bytes .../images/theme-default/kimchi-loading15x15.gif | Bin 1653 -> 0 bytes .../gingerbase/ui/js/src/gingerbase.host.js | 645 +++++++++++---------- src/wok/plugins/gingerbase/ui/pages/host.html.tmpl | 213 +++---- .../gingerbase/ui/pages/report-add.html.tmpl | 46 +- .../gingerbase/ui/pages/report-rename.html.tmpl | 42 +- .../gingerbase/ui/pages/repository-add.html.tmpl | 124 ++-- .../gingerbase/ui/pages/repository-edit.html.tmpl | 138 ++--- src/wok/plugins/kimchi/ui/config/tab-ext.xml | 8 +- .../kimchi/ui/css/theme-default/guest-edit.css | 8 +- .../kimchi/ui/css/theme-default/network.css | 267 --------- .../kimchi/ui/css/theme-default/storage.css | 502 +--------------- .../css/theme-default/storagepool-add-volume.css | 36 -- .../kimchi/ui/css/theme-default/template-edit.css | 175 ------ .../kimchi/ui/css/theme-default/template.css | 85 --- .../kimchi/ui/css/theme-default/template_add.css | 317 ---------- .../kimchi/ui/css/theme-default/template_list.css | 267 --------- .../kimchi/ui/js/src/kimchi.guest_add_main.js | 10 +- .../kimchi/ui/js/src/kimchi.guest_edit_main.js | 63 +- src/wok/plugins/kimchi/ui/js/src/kimchi.network.js | 318 +--------- .../kimchi/ui/js/src/kimchi.network_add_main.js | 166 ++++++ .../kimchi/ui/js/src/kimchi.storage_main.js | 191 ++++-- .../ui/js/src/kimchi.storagepool_add_main.js | 36 +- .../js/src/kimchi.storagepool_add_volume_main.js | 1 + .../kimchi/ui/js/src/kimchi.template_add_main.js | 406 +++++++++---- .../kimchi/ui/js/src/kimchi.template_edit_main.js | 48 +- .../kimchi/ui/js/src/kimchi.template_main.js | 59 +- .../plugins/kimchi/ui/pages/guest-add.html.tmpl | 114 ++-- .../plugins/kimchi/ui/pages/guest-edit.html.tmpl | 97 +--- .../kimchi/ui/pages/guest-storage-add.html.tmpl | 21 +- src/wok/plugins/kimchi/ui/pages/guests.html.tmpl | 61 +- .../plugins/kimchi/ui/pages/network-add.html.tmpl | 70 +++ src/wok/plugins/kimchi/ui/pages/network.html.tmpl | 148 ++--- src/wok/plugins/kimchi/ui/pages/storage.html.tmpl | 210 ++++--- .../ui/pages/storagepool-add-volume.html.tmpl | 73 +-- .../kimchi/ui/pages/storagepool-add.html.tmpl | 245 ++++---- .../plugins/kimchi/ui/pages/template-add.html.tmpl | 344 +++++------ .../kimchi/ui/pages/template-edit.html.tmpl | 266 ++++----- .../plugins/kimchi/ui/pages/templates.html.tmpl | 139 +++-- ui/css/src/bootstrap-select.custom.scss | 4 + ui/css/src/modules/_administration.scss | 0 ui/css/src/modules/_datagrid.scss | 72 +++ ui/css/src/modules/_guests.scss | 92 +++ ui/css/src/modules/_host.scss | 169 ------ ui/css/src/modules/_iso-list.scss | 126 ++++ ui/css/src/modules/_jqueryui.scss | 0 ui/css/src/modules/_menu-flat.scss | 16 +- ui/css/src/modules/_modal-flat.scss | 2 +- ui/css/src/modules/_navbar-flat.scss | 12 +- ui/css/src/modules/_network.scss | 122 ++++ ui/css/src/modules/_storage.scss | 393 +++++++++++++ ui/css/src/modules/_templates.scss | 304 ++++++++++ ui/css/src/modules/_toolbar.scss | 29 +- ui/css/src/modules/_wok-confirm.scss | 42 ++ ui/css/src/modules/_wok-grid.scss | 25 +- ui/css/src/modules/_wok-variables.scss | 11 +- ui/css/src/wok.scss | 132 +++-- ui/images/theme-default/Makefile.am | 2 +- ui/images/theme-default/alert.png | Bin 3537 -> 0 bytes ui/images/theme-default/arrow-down-black.png | Bin 2942 -> 0 bytes ui/images/theme-default/arrow-down.png | Bin 537 -> 0 bytes ui/images/theme-default/bg-mask.png | Bin 2899 -> 0 bytes ui/images/theme-default/bg.png | Bin 35585 -> 0 bytes ui/images/theme-default/check-green.png | Bin 3501 -> 0 bytes ui/images/theme-default/check-grey.png | Bin 3535 -> 0 bytes ui/images/theme-default/folder-arrow-down.png | Bin 2956 -> 0 bytes ui/images/theme-default/folder-arrow-right.png | Bin 2958 -> 0 bytes ui/images/theme-default/high.png | Bin 0 -> 532 bytes ui/images/theme-default/high_disabled.png | Bin 0 -> 513 bytes ui/images/theme-default/icon-alert.png | Bin 3545 -> 0 bytes ui/images/theme-default/icon-centos.png | Bin 0 -> 1801 bytes ui/images/theme-default/icon-debian.png | Bin 0 -> 3318 bytes ui/images/theme-default/icon-event.png | Bin 3791 -> 0 bytes ui/images/theme-default/icon-fedora.png | Bin 0 -> 3552 bytes ui/images/theme-default/icon-gentoo.png | Bin 0 -> 1880 bytes ui/images/theme-default/icon-opensuse.png | Bin 0 -> 945 bytes ui/images/theme-default/icon-red_hat.png | Bin 0 -> 3352 bytes ui/images/theme-default/icon-setting.png | Bin 3664 -> 0 bytes ui/images/theme-default/icon-tool.png | Bin 4466 -> 0 bytes ui/images/theme-default/icon-ubuntu.png | Bin 0 -> 611 bytes ui/images/theme-default/icon-unknown.png | Bin 0 -> 761 bytes ui/images/theme-default/logo-flat.svg | 113 ++++ ui/images/theme-default/logo-plain.gif | Bin 1601 -> 0 bytes ui/images/theme-default/logo-white.png | Bin 9879 -> 7583 bytes ui/images/theme-default/low.png | Bin 0 -> 532 bytes ui/images/theme-default/low_disabled.png | Bin 0 -> 515 bytes ui/images/theme-default/med.png | Bin 0 -> 581 bytes ui/images/theme-default/med_disabled.png | Bin 0 -> 534 bytes ui/images/theme-default/nav-bg.png | Bin 3043 -> 0 bytes ui/images/theme-default/thumb-guest.png | Bin 3896 -> 0 bytes ui/images/theme-default/thumb-host.png | Bin 5069 -> 0 bytes ui/images/theme-default/user-icon.png | Bin 269 -> 0 bytes ui/images/theme-default/wok-loading.gif | Bin 6181 -> 0 bytes ui/js/src/wok.confirm.js | 91 +++ ui/js/src/wok.datagrid.js | 123 ++++ ui/js/src/wok.grid.js | 416 ++++--------- ui/js/src/wok.line-chart.js | 74 ++- ui/js/src/wok.list.js | 302 ++++++++++ ui/js/src/wok.login.js | 9 +- ui/js/src/wok.main.js | 61 +- ui/js/src/wok.message.js | 100 +--- ui/js/src/wok.window.js | 31 +- ui/js/widgets/grid.js | 123 ---- ui/js/widgets/samples/grid.html | 4 +- ui/pages/login.html.tmpl | 186 +++--- ui/pages/wok-ui.html.tmpl | 222 +++---- 120 files changed, 4865 insertions(+), 5299 deletions(-) create mode 100644 src/wok/plugins/gingerbase/ui/css/src/gingerbase.scss create mode 100644 src/wok/plugins/gingerbase/ui/css/src/modules/_host.scss delete mode 100644 src/wok/plugins/gingerbase/ui/css/theme-default/host.css delete mode 100644 src/wok/plugins/gingerbase/ui/css/theme-default/report-add.css delete mode 100644 src/wok/plugins/gingerbase/ui/css/theme-default/report-rename.css delete mode 100644 src/wok/plugins/gingerbase/ui/css/theme-default/repository-add.css delete mode 100644 src/wok/plugins/gingerbase/ui/css/theme-default/repository-edit.css delete mode 100644 src/wok/plugins/gingerbase/ui/images/theme-default/Makefile.am delete mode 100644 src/wok/plugins/gingerbase/ui/images/theme-default/host-icon-sprite.png delete mode 100644 src/wok/plugins/gingerbase/ui/images/theme-default/kimchi-loading15x15.gif delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/network.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/storagepool-add-volume.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/template-edit.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/template.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/template_add.css delete mode 100644 src/wok/plugins/kimchi/ui/css/theme-default/template_list.css create mode 100644 src/wok/plugins/kimchi/ui/js/src/kimchi.network_add_main.js create mode 100644 src/wok/plugins/kimchi/ui/pages/network-add.html.tmpl create mode 100644 ui/css/src/modules/_administration.scss create mode 100644 ui/css/src/modules/_datagrid.scss create mode 100644 ui/css/src/modules/_guests.scss delete mode 100644 ui/css/src/modules/_host.scss create mode 100644 ui/css/src/modules/_iso-list.scss create mode 100644 ui/css/src/modules/_jqueryui.scss create mode 100644 ui/css/src/modules/_network.scss create mode 100644 ui/css/src/modules/_storage.scss create mode 100644 ui/css/src/modules/_templates.scss create mode 100644 ui/css/src/modules/_wok-confirm.scss delete mode 100644 ui/images/theme-default/alert.png delete mode 100644 ui/images/theme-default/arrow-down-black.png delete mode 100644 ui/images/theme-default/arrow-down.png delete mode 100644 ui/images/theme-default/bg-mask.png delete mode 100644 ui/images/theme-default/bg.png delete mode 100644 ui/images/theme-default/check-green.png delete mode 100644 ui/images/theme-default/check-grey.png delete mode 100644 ui/images/theme-default/folder-arrow-down.png delete mode 100644 ui/images/theme-default/folder-arrow-right.png create mode 100644 ui/images/theme-default/high.png create mode 100644 ui/images/theme-default/high_disabled.png delete mode 100644 ui/images/theme-default/icon-alert.png create mode 100644 ui/images/theme-default/icon-centos.png create mode 100644 ui/images/theme-default/icon-debian.png delete mode 100644 ui/images/theme-default/icon-event.png create mode 100644 ui/images/theme-default/icon-fedora.png create mode 100644 ui/images/theme-default/icon-gentoo.png create mode 100644 ui/images/theme-default/icon-opensuse.png create mode 100644 ui/images/theme-default/icon-red_hat.png delete mode 100644 ui/images/theme-default/icon-setting.png delete mode 100644 ui/images/theme-default/icon-tool.png create mode 100644 ui/images/theme-default/icon-ubuntu.png create mode 100644 ui/images/theme-default/icon-unknown.png create mode 100644 ui/images/theme-default/logo-flat.svg delete mode 100644 ui/images/theme-default/logo-plain.gif create mode 100644 ui/images/theme-default/low.png create mode 100644 ui/images/theme-default/low_disabled.png create mode 100644 ui/images/theme-default/med.png create mode 100644 ui/images/theme-default/med_disabled.png delete mode 100644 ui/images/theme-default/nav-bg.png delete mode 100644 ui/images/theme-default/thumb-guest.png delete mode 100644 ui/images/theme-default/thumb-host.png delete mode 100644 ui/images/theme-default/user-icon.png delete mode 100644 ui/images/theme-default/wok-loading.gif create mode 100644 ui/js/src/wok.confirm.js create mode 100644 ui/js/src/wok.datagrid.js create mode 100644 ui/js/src/wok.list.js delete mode 100644 ui/js/widgets/grid.js -- 1.9.3

2 11

[PATCH] Create new storage volume when attaching disk to a guest.
by pvital＠linux.vnet.ibm.com 10 Nov '15

10 Nov '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Add back-end support to create new storage volume (new virtual disk) when attaching disk to a guest created before. There are three essential parameters to create the new volume: * vol: Storage volume name of disk image, that should be 'new_vol'. * capacity: The total space which can be used to store new volumes. The unit is bytes. * format: The format of the defined Storage Volume. Only used when creating a storage volume with 'capacity'. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/API.json | 12 ++++++++++++ src/wok/plugins/kimchi/docs/API.md | 6 +++++- src/wok/plugins/kimchi/i18n.py | 1 + src/wok/plugins/kimchi/model/vmstorages.py | 28 +++++++++++++++++++++++++++- 4 files changed, 45 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/kimchi/API.json b/src/wok/plugins/kimchi/API.json index 961f35f..8822520 100644 --- a/src/wok/plugins/kimchi/API.json +++ b/src/wok/plugins/kimchi/API.json @@ -564,6 +564,18 @@ "type": "string", "pattern": "^((/)|(http)[s]?:|[t]?(ftp)[s]?:)+.*$", "error": "KCHVMSTOR0003E" + }, + "capacity": { + "description": "The total size (MiB) of the storage volume", + "type": "number", + "minimum": 1, + "error": "KCHVOL0020E" + }, + "format": { + "description": "The format of the volume", + "type": "string", + "pattern": "^(|bochs|cloop|cow|dmg|qcow|qcow2|qed|raw|vmdk|vpc)$", + "error": "KCHVOL0015E" } } }, diff --git a/src/wok/plugins/kimchi/docs/API.md b/src/wok/plugins/kimchi/docs/API.md index 52368b7..d00c2fe 100644 --- a/src/wok/plugins/kimchi/docs/API.md +++ b/src/wok/plugins/kimchi/docs/API.md @@ -205,7 +205,11 @@ Represents a snapshot of the Virtual Machine's primary monitor. * type: The type of the storage (currently support 'cdrom' and 'disk'). * path: Path of cdrom iso. * pool: Storage pool which disk image file locate in. - * vol: Storage volume name of disk image. + * vol: Storage volume name of disk image ('new_vol' for create a new volume). + * capacity: The total space which can be used to store new volumes. + The unit is bytes. + * format: The format of the defined Storage Volume. Only used when creating + a storage volume with 'capacity'. ### Sub-resource: storage **URI:** /plugins/kimchi/vms/*:name*/storages/*:dev* diff --git a/src/wok/plugins/kimchi/i18n.py b/src/wok/plugins/kimchi/i18n.py index 42a5e16..53a0b6b 100644 --- a/src/wok/plugins/kimchi/i18n.py +++ b/src/wok/plugins/kimchi/i18n.py @@ -278,6 +278,7 @@ messages = { "KCHVMSTOR0016E": _("Volume already in use by other virtual machine."), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), "KCHVMSTOR0018E": _("Volume chosen with format %(format)s does not fit in the storage type %(type)s"), + "KCHVMSTOR0019E": _("The format msust be used only when creating a new storage volume with 'capacity'."), "KCHSNAP0001E": _("Virtual machine '%(vm)s' must be stopped before creating a snapshot of it."), "KCHSNAP0002E": _("Unable to create snapshot '%(name)s' on virtual machine '%(vm)s'. Details: %(err)s"), diff --git a/src/wok/plugins/kimchi/model/vmstorages.py b/src/wok/plugins/kimchi/model/vmstorages.py index 23db0a6..f6b3918 100644 --- a/src/wok/plugins/kimchi/model/vmstorages.py +++ b/src/wok/plugins/kimchi/model/vmstorages.py @@ -22,12 +22,14 @@ from lxml import etree from wok.exception import InvalidOperation, InvalidParameter, NotFoundError from wok.exception import OperationFailed +from wok.model.tasks import TaskModel from wok.utils import wok_log from wok.plugins.kimchi.model.config import CapabilitiesModel from wok.plugins.kimchi.model.diskutils import get_disk_used_by from wok.plugins.kimchi.model.diskutils import set_disk_used_by from wok.plugins.kimchi.model.storagevolumes import StorageVolumeModel +from wok.plugins.kimchi.model.storagevolumes import StorageVolumesModel from wok.plugins.kimchi.model.utils import get_vm_config_flag from wok.plugins.kimchi.model.vms import DOM_STATE_MAP, VMModel from wok.plugins.kimchi.osinfo import lookup @@ -51,6 +53,7 @@ class VMStoragesModel(object): self.conn = kargs['conn'] self.objstore = kargs['objstore'] self.caps = CapabilitiesModel(**kargs) + self.task = TaskModel(**kargs) def _get_available_bus_address(self, bus_type, vm_name): if bus_type not in ['ide']: @@ -85,9 +88,12 @@ class VMStoragesModel(object): if not ('vol' in params) ^ ('path' in params): raise InvalidParameter("KCHVMSTOR0017E") + if ('format' in params) and ('capacity' not in params): + raise InvalidParameter("KCHVMSTOR0019E") + dom = VMModel.get_vm(vm_name, self.conn) params['bus'] = _get_device_bus(params['type'], dom) - params['format'] = 'raw' + params['format'] = params['format'] if 'format' in params else 'raw' dev_list = [dev for dev, bus in get_vm_disks(dom).iteritems() if bus == params['bus']] @@ -102,6 +108,26 @@ class VMStoragesModel(object): DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') + if params.get('capacity'): + # If 'capacity' is in the parameters a new storage volume will + # be created and allocated to the VM. + if params['vol'] == 'new_vol': + # Set the name of the volume as the same pattern used when + # creating a VM based on Template (VM UUID + disk index). + # Otherwise, use the name provided by the user. + params['vol'] = "%s-%s.img" % (dom.UUIDString(), + params['index']) + vol_info = dict(name=params['vol'], + type=params['type'], + capacity=params['capacity'], + allocation=params['capacity'], + format=params['format'], + ) + storage_volumes = StorageVolumesModel(conn=self.conn, + objstore=self.objstore) + mytask = storage_volumes.create(params['pool'], vol_info) + self.task.wait(mytask['id']) + if params.get('vol'): try: pool = params['pool'] -- 2.4.3

3 2

[PATCH v4] shutdown and reboot actions on linux vs linux with KVM
by chandra＠linux.vnet.ibm.com 06 Nov '15

06 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Review Comments taken care --- src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/model/host.py | 47 +++++++++++++++------- .../gingerbase/ui/js/src/gingerbase.host.js | 25 ++++++------ src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl | 3 ++ 4 files changed, 49 insertions(+), 27 deletions(-) diff --git a/src/wok/plugins/gingerbase/i18n.py b/src/wok/plugins/gingerbase/i18n.py index 8596f17..ef97266 100644 --- a/src/wok/plugins/gingerbase/i18n.py +++ b/src/wok/plugins/gingerbase/i18n.py @@ -39,6 +39,7 @@ messages = { "GGBHOST0001E": _("Unable to shutdown host machine as there are running virtual machines"), "GGBHOST0002E": _("Unable to reboot host machine as there are running virtual machines"), + "GGBHOST0003E": _("There may be vms running on the host"), "GGBHOST0005E": _("When specifying CPU topology, each element must be an integer greater than zero."), "GGBPKGUPD0001E": _("No packages marked for update"), diff --git a/src/wok/plugins/gingerbase/model/host.py b/src/wok/plugins/gingerbase/model/host.py index 670fec5..766d6c7 100644 --- a/src/wok/plugins/gingerbase/model/host.py +++ b/src/wok/plugins/gingerbase/model/host.py @@ -39,6 +39,14 @@ from wok.plugins.gingerbase.repositories import Repositories from wok.plugins.gingerbase.swupdate import SoftwareUpdate HOST_STATS_INTERVAL = 1 +DOM_STATE_MAP = {0: 'nostate', + 1: 'running', + 2: 'blocked', + 3: 'paused', + 4: 'shutdown', + 5: 'shutoff', + 6: 'crashed', + 7: 'pmsuspended'} class HostModel(object): @@ -142,29 +150,40 @@ class HostModel(object): def shutdown(self, args=None): # Check for running vms before shutdown - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0001E") + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0001E") wok_log.info('Host is going to shutdown.') os.system('shutdown -h now') def reboot(self, args=None): - # Find running VMs - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0002E") + # Check for running vms before reboot + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0002E") wok_log.info('Host is going to reboot.') os.system('reboot') - # def _get_vms_list_by_state(self, state): - # conn = self.conn.get() - # return [dom.name().decode('utf-8') - # for dom in conn.listAllDomains(0) - # if (DOM_STATE_MAP[dom.info()[0]]) == state] + def get_vmlist_bystate(self, state='running'): + try: + libvirt_mod = __import__('libvirt') + except Exception, e: + wok_log.info("Unable to import libvirt module. Details:", + e.message) + # Ignore any error and assume there is no vm running in the host + return [] + + try: + conn = libvirt_mod.open(None) + return [dom.name().decode('utf-8') + for dom in conn.listAllDomains(0) + if (DOM_STATE_MAP[dom.info()[0]] == state)] + except Exception, e: + wok_log.info("Unable to get virtual machines information. " + "Details:", e.message) + raise OperationFailed("GGBHOST0003E") class SoftwareUpdateProgressModel(object): diff --git a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js index 0d52b92..77ee736 100644 --- a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js +++ b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js @@ -496,22 +496,21 @@ kimchi.host_main = function() { }; wok.confirm(settings, function() { - kimchi.shutdown(params); $(shutdownButtonID).prop('disabled', true); $(restartButtonID).prop('disabled', true); // Check if there is any VM is running. - // FIXME : Find alternative way to figure out if any vms running - // kimchi.listVMs(function(vms) { - // for(var i = 0; i < vms.length; i++) { - // if(vms[i]['state'] === 'running') { - // wok.message.error.code('GGBHOST6001E'); - // $(shutdownButtonID).prop('disabled', false); - // $(restartButtonID).prop('disabled', false); - // return; - // } - // } - // - // }); + // Based on the success will shutdown/reboot + kimchi.shutdown(params, function(success) { + wok.message.success(i18n['GGBHOST6009M']) + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + return; + }, function(error) { + // Looks like VMs are running. + wok.message.error.code('GGBHOST6001E'); + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + }); }, function() { }); }; diff --git a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl index f6228ab..3f3b662 100644 --- a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl +++ b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl @@ -69,6 +69,7 @@ "GGBHOST6006M": "$_("Received")", "GGBHOST6007M": "$_("Sent")", "GGBHOST6008M": "$_("Shutting down or restarting host will cause unsaved work lost. Continue to shut down/restarting?")", + "GGBHOST6009M": "$_("The system is going down")", "GGBREPO6001M": "$_("Confirm")", @@ -113,6 +114,8 @@ "GGBDR6012M": "$_("Pending...")", "GGBDR6013M": "$_("Report name is the same as the original one.")", + "GGBHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", + "GGBVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "GGBVM6002M": "$_("Power off Confirmation")", "GGBVM6003M": "$_("This action may produce undesirable results, " -- 2.1.0

3 2

Failing to import Gingerbase and Kimchi
by Samuel Henrique De Oliveira Guimaraes 05 Nov '15

05 Nov '15

Hi team, I’ve been trying to run Kimchi on a CentOS 7 virtual machine but the plug-ins are failing to load. Check out the log: ➜ kimchi git:(master) ✗ sudo python src/wokd --host=0.0.0.0 --environment=development /usr/lib64/python2.7/site-packages/psutil/_pslinux.py:154: RuntimeWarning: couldn't determine platform's TOTAL_PHYMEM warnings.warn("couldn't determine platform's TOTAL_PHYMEM", RuntimeWarning) Failed to import plugin plugins.gingerbase.GingerBase, error: Class plugins.gingerbase.GingerBase can not be imported, error: cannot import name config Failed to import plugin plugins.kimchi.KimchiRoot, error: Class plugins.kimchi.KimchiRoot can not be imported, error: 'module' object has no attribute 'get_sysinfo' [05/Nov/2015:14:10:25] ENGINE Listening for SIGHUP. [05/Nov/2015:14:10:25] ENGINE Listening for SIGTERM. [05/Nov/2015:14:10:25] ENGINE Listening for SIGUSR1. [05/Nov/2015:14:10:25] ENGINE Bus STARTING CherryPy Checker: '/root/kimchi_master/kimchi/src/wok/plugins/ginger/ui/images' (root + dir) is not an existing filesystem path. section: [/images] root: None dir: '/root/kimchi_master/kimchi/src/wok/plugins/ginger/ui/images' [05/Nov/2015:14:10:25] ENGINE Started monitor thread 'Autoreloader'. [05/Nov/2015:14:10:25] ENGINE Serving on 127.0.0.1:8010 [05/Nov/2015:14:10:25] ENGINE Bus STARTED [05/Nov/2015:14:32:43] ENGINE Started monitor thread 'Session cleanup'. Any ideas? BTW, Ginger does get imported but the tab is empty. Thanks, Samuel

2 1

Help with Device Path in Storages / listHostPartitions() response (new-ui)
by Samuel Henrique De Oliveira Guimaraes 05 Nov '15

05 Nov '15

Hi team, I've finished adding the new-ui to Storage main page but I'm blocked with the "Add Device Path" dialog. I've successfully converted jQuery-UI dialog to a Bootstrap modal + made the action button call the window and look up for the volume to find any partition. The problem is that my server doesn't have any other storage device left and I'm unable to run Kimchi inside a VM. Could somebody grab the partitions json response for me? Just go to Chrome Dev Tools (Ctrl + Shift + I), browse to Storage Tab in Kimchi (any revision) and select Network tab in Chrome Dev Tools, press the "Record" button and filter the XHR requests, click on a logical Storage Pool in Kimchi and then "Extend" in the Action Button. The panel should look like the attached image. I think the "Extend Device Path" validation is working but If I don't get a VM running Kimchi I won't be able to test it and I need a full listHostPartitions() result to check if {name} is actualyl a device name and {path} is full path + device name or just the device path. Thanks, Samuel

1 0

[PATCH v3] shutdown and reboot actions on linux vs linux with KVM
by chandra＠linux.vnet.ibm.com 05 Nov '15

05 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Review Comments taken care --- src/wok/plugins/gingerbase/model/host.py | 47 +++++++++++++++------- .../gingerbase/ui/js/src/gingerbase.host.js | 25 ++++++------ src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl | 3 ++ 3 files changed, 48 insertions(+), 27 deletions(-) diff --git a/src/wok/plugins/gingerbase/model/host.py b/src/wok/plugins/gingerbase/model/host.py index 670fec5..9cbef47 100644 --- a/src/wok/plugins/gingerbase/model/host.py +++ b/src/wok/plugins/gingerbase/model/host.py @@ -39,6 +39,14 @@ from wok.plugins.gingerbase.repositories import Repositories from wok.plugins.gingerbase.swupdate import SoftwareUpdate HOST_STATS_INTERVAL = 1 +DOM_STATE_MAP = {0: 'nostate', + 1: 'running', + 2: 'blocked', + 3: 'paused', + 4: 'shutdown', + 5: 'shutoff', + 6: 'crashed', + 7: 'pmsuspended'} class HostModel(object): @@ -142,29 +150,40 @@ class HostModel(object): def shutdown(self, args=None): # Check for running vms before shutdown - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0001E") + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0001E") wok_log.info('Host is going to shutdown.') os.system('shutdown -h now') def reboot(self, args=None): - # Find running VMs - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0002E") + # Check for running vms before reboot + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0002E") wok_log.info('Host is going to reboot.') os.system('reboot') - # def _get_vms_list_by_state(self, state): - # conn = self.conn.get() - # return [dom.name().decode('utf-8') - # for dom in conn.listAllDomains(0) - # if (DOM_STATE_MAP[dom.info()[0]]) == state] + def get_vmlist_bystate(self, state='running'): + try: + libvirt_mod = __import__('libvirt') + except Exception, e: + wok_log.info("Unable to import libvirt module. Details:", + e.message) + # Ignore any error and assume there is no vm running in the host + return [] + + try: + conn = libvirt_mod.open(None) + return [dom.name().decode('utf-8') + for dom in conn.listAllDomains(0) + if (DOM_STATE_MAP[dom.info()[0]] == state)] + except Exception, e: + wok_log.info("Unable to get virtual machines information. " + "Details:", e.message) + raise OperationFailed("There may be vms running on the host") class SoftwareUpdateProgressModel(object): diff --git a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js index 0d52b92..77ee736 100644 --- a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js +++ b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js @@ -496,22 +496,21 @@ kimchi.host_main = function() { }; wok.confirm(settings, function() { - kimchi.shutdown(params); $(shutdownButtonID).prop('disabled', true); $(restartButtonID).prop('disabled', true); // Check if there is any VM is running. - // FIXME : Find alternative way to figure out if any vms running - // kimchi.listVMs(function(vms) { - // for(var i = 0; i < vms.length; i++) { - // if(vms[i]['state'] === 'running') { - // wok.message.error.code('GGBHOST6001E'); - // $(shutdownButtonID).prop('disabled', false); - // $(restartButtonID).prop('disabled', false); - // return; - // } - // } - // - // }); + // Based on the success will shutdown/reboot + kimchi.shutdown(params, function(success) { + wok.message.success(i18n['GGBHOST6009M']) + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + return; + }, function(error) { + // Looks like VMs are running. + wok.message.error.code('GGBHOST6001E'); + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + }); }, function() { }); }; diff --git a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl index f6228ab..3f3b662 100644 --- a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl +++ b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl @@ -69,6 +69,7 @@ "GGBHOST6006M": "$_("Received")", "GGBHOST6007M": "$_("Sent")", "GGBHOST6008M": "$_("Shutting down or restarting host will cause unsaved work lost. Continue to shut down/restarting?")", + "GGBHOST6009M": "$_("The system is going down")", "GGBREPO6001M": "$_("Confirm")", @@ -113,6 +114,8 @@ "GGBDR6012M": "$_("Pending...")", "GGBDR6013M": "$_("Report name is the same as the original one.")", + "GGBHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", + "GGBVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "GGBVM6002M": "$_("Power off Confirmation")", "GGBVM6003M": "$_("This action may produce undesirable results, " -- 2.1.0

2 1

[PATCH] Issue #751: Fix guest memory utilization calculation.
by pvital＠linux.vnet.ibm.com 05 Nov '15

05 Nov '15

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> The return of Pyhton's function memoryStats() returns the guest's memory utilization statistcs by the Libvirt API virDomainMemoryStats. However, the content of the return (a dictionary) depends on the combination of host and guest OS. This patch fix the issue of not returning the curent utilization of guest memory when host and guest are running different OS and not all statistics are returned. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/plugins/kimchi/model/vms.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/wok/plugins/kimchi/model/vms.py b/src/wok/plugins/kimchi/model/vms.py index 63681c7..0641ae8 100644 --- a/src/wok/plugins/kimchi/model/vms.py +++ b/src/wok/plugins/kimchi/model/vms.py @@ -919,13 +919,15 @@ class VMModel(object): def _get_percentage_mem_usage(self, vm_uuid, dom, seconds): # Get the guest's memory stats memStats = dom.memoryStats() - if memStats: + if ('available' in memStats) and ('unused' in memStats): memUsed = memStats.get('available') - memStats.get('unused') + percentage = ((memUsed * 100.0) / memStats.get('available')) + elif ('rss' in memStats) and ('actual' in memStats): + percentage = memStats.get('rss') * 100.0 / memStats.get('actual') else: - wok_log.debug('Failed to measure memory usage of the guest.') + wok_log.error('Failed to measure memory usage of the guest.') - percentage = max(0.0, min(100.0, ((memUsed * 100.0) / - memStats.get('available')))) + percentage = max(0.0, min(100.0, percentage)) self.stats[vm_uuid].update({'mem_usage': percentage}) -- 2.4.3

2 1

[PATCH v2] shutdown and reboot actions on linux vs linux with KVM
by chandra＠linux.vnet.ibm.com 05 Nov '15

05 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> --- src/wok/plugins/gingerbase/model/host.py | 47 +++++++++++++++------- .../gingerbase/ui/js/src/gingerbase.host.js | 27 +++++++------ src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl | 3 ++ 3 files changed, 50 insertions(+), 27 deletions(-) diff --git a/src/wok/plugins/gingerbase/model/host.py b/src/wok/plugins/gingerbase/model/host.py index 670fec5..8c5ca5f 100644 --- a/src/wok/plugins/gingerbase/model/host.py +++ b/src/wok/plugins/gingerbase/model/host.py @@ -39,6 +39,14 @@ from wok.plugins.gingerbase.repositories import Repositories from wok.plugins.gingerbase.swupdate import SoftwareUpdate HOST_STATS_INTERVAL = 1 +DOM_STATE_MAP = {0: 'nostate', + 1: 'running', + 2: 'blocked', + 3: 'paused', + 4: 'shutdown', + 5: 'shutoff', + 6: 'crashed', + 7: 'pmsuspended'} class HostModel(object): @@ -142,29 +150,40 @@ class HostModel(object): def shutdown(self, args=None): # Check for running vms before shutdown - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0001E") + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0001E") wok_log.info('Host is going to shutdown.') os.system('shutdown -h now') def reboot(self, args=None): - # Find running VMs - # FIXME : Find alternative way to figure out if any vms running - # running_vms = self._get_vms_list_by_state('running') - # if len(running_vms) > 0: - # raise OperationFailed("GGBHOST0002E") + # Check for running vms before reboot + running_vms = self.get_vmlist_bystate('running') + if len(running_vms) > 0: + raise OperationFailed("GGBHOST0002E") wok_log.info('Host is going to reboot.') os.system('reboot') - # def _get_vms_list_by_state(self, state): - # conn = self.conn.get() - # return [dom.name().decode('utf-8') - # for dom in conn.listAllDomains(0) - # if (DOM_STATE_MAP[dom.info()[0]]) == state] + def get_vmlist_bystate(self, state='running'): + try: + libvirt_mod = __import__('libvirt') + except Exception, e: + wok_log.info("Unable to import libvirt module. Details:", + e.message) + # Ignore any error and assume there is no vm running in the host + return [] + + try: + conn = libvirt_mod.open("qemu:///system") + return [dom.name().decode('utf-8') + for dom in conn.listAllDomains(0) + if (DOM_STATE_MAP[dom.info()[0]] == state)] + except Exception, e: + wok_log.info("Unable to get virtual machines information. " + "Details:", e.message) + raise OperationFailed("There may be vms running on the host") class SoftwareUpdateProgressModel(object): diff --git a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js index 0d52b92..e07b2bd 100644 --- a/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js +++ b/src/wok/plugins/gingerbase/ui/js/src/gingerbase.host.js @@ -496,22 +496,23 @@ kimchi.host_main = function() { }; wok.confirm(settings, function() { - kimchi.shutdown(params); $(shutdownButtonID).prop('disabled', true); $(restartButtonID).prop('disabled', true); // Check if there is any VM is running. - // FIXME : Find alternative way to figure out if any vms running - // kimchi.listVMs(function(vms) { - // for(var i = 0; i < vms.length; i++) { - // if(vms[i]['state'] === 'running') { - // wok.message.error.code('GGBHOST6001E'); - // $(shutdownButtonID).prop('disabled', false); - // $(restartButtonID).prop('disabled', false); - // return; - // } - // } - // - // }); + // Based on the success will shutdown/reboot + kimchi.shutdown(params, function(success) { + wok.message.success(i18n['GGBHOST6009M']) + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + return; + }, function(error) { + if (error['status'] == 500) { + // Looks like VMs are running. + wok.message.error.code('GGBHOST6001E'); + } + $(shutdownButtonID).prop('disabled', false); + $(restartButtonID).prop('disabled', false); + }); }, function() { }); }; diff --git a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl index f6228ab..3f3b662 100644 --- a/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl +++ b/src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl @@ -69,6 +69,7 @@ "GGBHOST6006M": "$_("Received")", "GGBHOST6007M": "$_("Sent")", "GGBHOST6008M": "$_("Shutting down or restarting host will cause unsaved work lost. Continue to shut down/restarting?")", + "GGBHOST6009M": "$_("The system is going down")", "GGBREPO6001M": "$_("Confirm")", @@ -113,6 +114,8 @@ "GGBDR6012M": "$_("Pending...")", "GGBDR6013M": "$_("Report name is the same as the original one.")", + "GGBHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", + "GGBVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", "GGBVM6002M": "$_("Power off Confirmation")", "GGBVM6003M": "$_("This action may produce undesirable results, " -- 2.1.0

3 2

[PATCH 0/2] *** Sosreport accepts underscore and support for s390x platform ***
by mesmriti＠linux.vnet.ibm.com 05 Nov '15

05 Nov '15

From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> #748: Sosreport accepts underscore in name #749: Added debug report for plaform s390x along with sosreport Megha Smriti (2): Modified code to parse the output of sosreport command using regular expression which gives the name and location of sosreport present in command output, instead of searching the sosreport file with regular pattern "sosreport-<name>*" in /tmp and /var/tmp Modified code to check platform and if its s390x then collect dbginfo tar along with sosreport and create new tar having both the above tar and move to /var/lib/kimchi/debugreports. Also added i18n error messages required for dbginfo. src/wok/plugins/gingerbase/i18n.py | 9 +- src/wok/plugins/gingerbase/model/debugreports.py | 135 +++++++++++++++++------ 2 files changed, 106 insertions(+), 38 deletions(-) -- 2.4.0

3 8

Second level navigation code changes
by Chandra Shehkhar Reddy Potula 05 Nov '15

05 Nov '15

Hi Samuel, On behalf of Atreye (she is on vacation) I am sending you the code she worked on the second level navigation. Instructions: 1. place wok.main.js in the folder kimchi/ui/js/src folder 2. place wok-ui.html.tmpl in the folder kimchi/ui/pages folder 3. place tab-ext-gingerbase.xml in the folder kimchi/src/wok/plugins/gingerbase/ui/config folder (make sure you rename to tab-ext.xml) 4. place tab-ext-kimchi.xml in the folder kimchi/src/wok/plugins/kimchi/ui/config folder (make sure you rename to tab-ext.xml) I know this piece of code is at the initial stage and have the following issues; 1. Tab focus is not working 2. browsing other tabs than default was failing. For example click on template tab on the Virtualization tab not work and so on... If you have any quick solution let us know but this is where now second level tab navigation stands at. Thanks in advance for your help !!! Regards Chjandra

3 3

[PATCH V2] Issue #737: Fix to remove twice calls of resource lookup on GET OPERATION
by archus＠linux.vnet.ibm.com 05 Nov '15

05 Nov '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Incase of GET lookup was called twice. Once lookup() before is_authorized() and then in self.get(). This added overhead to system when lookup() is called for each value in list from get_list() of Collection. So to avoid this overhead, lookup() should not be called before self.get(). 1) Added lookup() call from Resource's update(), delete(). 2) Removed lookup() call from Resource's index(). 2) As is_authorized() calls self.data which calls self.info. Added check to make sure that self.data only get called if self.info is not None. And intialized self.info as None in __init__. As its value is getting assigned in lookup(). 3) In _generate_action_handler_base(), lookup() was getting called before is_authorized(), move its call after is_authorized(). Archana Singh (1): Issue #737: Fix to remove twice calls of resource lookup on GET OPERATION src/wok/control/base.py | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) -- 2.1.4

3 7

[PATCH] Ginger Base: Fix DEBIAN/control.in
by Aline Manera 05 Nov '15

05 Nov '15

The package name for Ginger Base plugin is ginger-base, and @PACKAGE_NAME@ refers to the directory name, so explicity set the right package name. Also remove extra colon and fix Description text that must be in done in one line. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/wok/plugins/gingerbase/contrib/DEBIAN/control.in | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/wok/plugins/gingerbase/contrib/DEBIAN/control.in b/src/wok/plugins/gingerbase/contrib/DEBIAN/control.in index aacf946..6bf6631 100644 --- a/src/wok/plugins/gingerbase/contrib/DEBIAN/control.in +++ b/src/wok/plugins/gingerbase/contrib/DEBIAN/control.in @@ -1,14 +1,12 @@ -Package: @PACKAGE_NAME@ +Package: ginger-base Version: @PACKAGE_VERSION@ Section: base Priority: optional Architecture: all Depends: wok, python-psutil (>= 0.6.0), - sosreport, + sosreport Build-Depends: libxslt, python-lxml Maintainer: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> -Description: Ginger Base is an open source base host management plugin for Wok -(Webserver Originated from Kimchi), that provides an intuitive web panel with -common tools for configuring and managing the Linux systems. +Description: Ginger Base is an open source base host management plugin for Wok (Webserver Originated from Kimchi), that provides an intuitive web panel with common tools for configuring and managing the Linux systems. -- 2.1.0

2 2

How to Work with Wok Submodules
by Paulo Ricardo Paz Vital 05 Nov '15

05 Nov '15

Hello. I just added a little wiki page about how to work with Wok's submodules at [1]. Hope this can help about updates and tests of the full enviornment. Please, feel free to make changes and update the documentation. [1] https://github.com/kimchi-project/kimchi/wiki/How-to-Work-with-Wok- Submodules Thanks and best regards, -- Paulo Ricardo Paz Vital IBM Linux Technology Center

1 0

[PATCH] Display guest memory utilization in UI
by Socorro Stoppler 04 Nov '15

04 Nov '15

Add support for displaying guest memory utilization. This patch is created on top of Samuel's branch. Socorro Stoppler (1): Add support for displaying guest memory utilization src/wok/plugins/kimchi/ui/css/theme-default/list.css | 10 +++++++--- src/wok/plugins/kimchi/ui/js/src/kimchi.guest_main.js | 3 +++ src/wok/plugins/kimchi/ui/pages/guest.html.tmpl | 3 +++ src/wok/plugins/kimchi/ui/pages/guests.html.tmpl | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) -- 1.9.1

2 2

[PATCH 0/2 v4] Fix Issues #743 and #744
by chandra＠linux.vnet.ibm.com 04 Nov '15

04 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Fix Issue #744 - gingerbase: objectstore issues Ginger Base : Plugin path changes Plug in path for gingerbase been changed to /var/lib/gingerbase Fix issue #744 : 'unable to open database file' in root.py and gingerbase.py Fix Issue #743 : gingerbase: fail to create RPM. Changed the following files: gingerbase.spec.fedora.in gignerbase.spec.suse.in make-deb.sh.in Correct the rpm instructions RPM name changed from gingerbase to ginger-base Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 chandrureddy (2): Ginger Base : Plugin path changes Fix Issue #743 : gingerbase: fail to create RPM. src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 18 +++++++------ src/wok/plugins/gingerbase/VERSION | 2 +- src/wok/plugins/gingerbase/config.py.in | 6 ++--- .../gingerbase/contrib/gingerbase.spec.fedora.in | 24 ++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 28 +++++++++---------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 +++++------ 10 files changed, 94 insertions(+), 54 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog -- 2.1.0

2 3

[PATCH]Ginger Base:Take off libvirt to get vms info used before any shutdown and reboot actions
by chandra＠linux.vnet.ibm.com 04 Nov '15

04 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Earlier been used libvirt to fetch the vms information in the back end code UI was using REST API 'plugins/kimchi/vms' to get the vms info. Ginger Base not have this functionality and will not work on plain linux. Ginger Base should handle well on both plain linux with out KVM and with KVM New code provides REST API 'plugins/gingerbase/vms' 1. to get the vms information on KVM mahcine (virsh way) For ex: [root@chandra wok]# curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" \ -X "GET" https://127.0.0.1:8001/plugins/gingerbase/vms Enter host password for user 'root': [ { "state":"shut off", "id":"-", "name":"a8Sr0LzRgWjEqy3iiKjQvA" }, { "state":"shut off", "id":"-", "name":"Fedora21" }, { "state":"shut off", "id":"-", "name":"kimchi-cdrom" }, { "state":"shut off", "id":"-", "name":"kimchi-ifaces" } ] 2. return empty json in case of plain linux machine For ex: [root@chandra wok]# curl -k -u root -H "Content-Type: application/json" -H "Accept: application/json" \ -X "GET" https://127.0.0.1:8001/plugins/gingerbase/vms Enter host password for user 'root': [ ] chandrureddy (1): Take off libvirt to get vms info used before any shutdown and reboot actions src/wok/plugins/gingerbase/control/vmsinfo.py | 34 +++++++++++++ src/wok/plugins/gingerbase/i18n.py | 1 + src/wok/plugins/gingerbase/model/host.py | 23 +++------ src/wok/plugins/gingerbase/model/vmsinfo.py | 32 ++++++++++++ .../plugins/gingerbase/ui/js/src/gingerbase.api.js | 12 +++++ .../gingerbase/ui/js/src/gingerbase.host.js | 23 ++++----- src/wok/plugins/gingerbase/ui/pages/i18n.json.tmpl | 2 + src/wok/plugins/gingerbase/utils.py | 59 +++++++++++++++++++++- 8 files changed, 157 insertions(+), 29 deletions(-) create mode 100644 src/wok/plugins/gingerbase/control/vmsinfo.py create mode 100644 src/wok/plugins/gingerbase/model/vmsinfo.py -- 2.1.0

4 8

[PATCH] Ginger Base : Fix Minor Issues with the test cases.
by chandra＠linux.vnet.ibm.com 03 Nov '15

03 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> 1. Fix import statement in test_autorization.py 2. Fix object store location in test_yumparser.py --- src/wok/plugins/gingerbase/tests/test_authorization.py | 2 +- src/wok/plugins/gingerbase/tests/test_yumparser.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/wok/plugins/gingerbase/tests/test_authorization.py b/src/wok/plugins/gingerbase/tests/test_authorization.py index 7460679..d0fc57c 100644 --- a/src/wok/plugins/gingerbase/tests/test_authorization.py +++ b/src/wok/plugins/gingerbase/tests/test_authorization.py @@ -23,7 +23,7 @@ import os import unittest from functools import partial -from wok.plugins.kimchi import mockmodel +from wok.plugins.gingerbase import mockmodel from utils import get_free_port, patch_auth, request, run_server diff --git a/src/wok/plugins/gingerbase/tests/test_yumparser.py b/src/wok/plugins/gingerbase/tests/test_yumparser.py index caf7c27..1695208 100644 --- a/src/wok/plugins/gingerbase/tests/test_yumparser.py +++ b/src/wok/plugins/gingerbase/tests/test_yumparser.py @@ -37,7 +37,7 @@ TEMP_REPO_FILE = '' def _is_yum_distro(): - inst = model.Model() + inst = model.Model("/tmp/objectstore") repo_type = inst.capabilities_lookup()['repo_mngt_tool'] return repo_type == 'yum' -- 2.1.0

2 1

[PATCH 0/2 v3] Fix Issues #743 and #744
by chandra＠linux.vnet.ibm.com 03 Nov '15

03 Nov '15

From: chandrureddy <chandra(a)linux.vnet.ibm.com> Fix Issue #744 - gingerbase: objectstore issues plug in path for gingerbase been changed to /var/lib/gingerbase Fix issue 'unable to open database file' and gingerbase.py Fix Issue #743 - gingerbase: fail to create RPM. In files gingerbase.spec.fedora.in and gignerbase.spec.suse.in and make-deb.sh.in add setup instruction correct the file section day correction Name changed from gingerbase to ginger-base Added files ChangeLog and CONTRIBUTE.md VERSION changed to 2.0.0 Review Comments taken care. chandrureddy (2): Plug in path for gingerbase been changed to /var/lib/gingerbase Fix issue 'unable to open database file' in root.py and gingerbase.py In files gingerbase.spec.fedora.in and gignerbase.spec.suse.in and make-deb.sh.in add setup instruction correct the file section day correction Name changed from gingerbase to ginger-base src/wok/plugins/gingerbase/CONTRIBUTE.md | 19 +++++++++++++ src/wok/plugins/gingerbase/ChangeLog | 31 ++++++++++++++++++++++ src/wok/plugins/gingerbase/Makefile.am | 18 +++++++------ src/wok/plugins/gingerbase/VERSION | 2 +- src/wok/plugins/gingerbase/config.py.in | 6 ++--- .../gingerbase/contrib/gingerbase.spec.fedora.in | 24 ++++++----------- .../gingerbase/contrib/gingerbase.spec.suse.in | 28 +++++++++---------- src/wok/plugins/gingerbase/contrib/make-deb.sh.in | 2 +- src/wok/plugins/gingerbase/gingerbase.conf | 2 +- src/wok/plugins/gingerbase/gingerbase.py | 16 +++++------ 10 files changed, 94 insertions(+), 54 deletions(-) create mode 100644 src/wok/plugins/gingerbase/CONTRIBUTE.md create mode 100644 src/wok/plugins/gingerbase/ChangeLog -- 2.1.0

3 4

[PATCH 0/2] *** Sosreport accepts underscore and support for s390x platform ***
by archus＠linux.vnet.ibm.com 02 Nov '15

02 Nov '15

From: Megha Smriti <mesmriti(a)linux.vnet.ibm.com> #748: Sosreport accepts underscore in name #749: Added debug report for plaform s390x along with sosreport Megha Smriti (2): Modified code to parse the output of sosreport command using regular expression which gives the name and location of sosreport present in command output, instead of searching the sosreport file with regular pattern "sosreport-<name>*" in /tmp and /var/tmp Modified code to check platform and if its s390x then collect dbginfo tar along with sosreport and create new tar having both the above tar and move to /var/lib/kimchi/debugreports. Also added i18n error messages required for dbginfo. src/wok/plugins/gingerbase/i18n.py | 9 +- src/wok/plugins/gingerbase/model/debugreports.py | 135 +++++++++++++++++------ 2 files changed, 106 insertions(+), 38 deletions(-) -- 2.4.0

2 3