November 2016 - Kimchi-devel - oVirt List Archives

RFC – Hypervisor Performance Manager for s390x (KVM IBM z Systems)
by Chandra Shekhar Reddy Potula 02 Dec '16

02 Dec '16

Proposal of introducing a new plugin – Hypervisor Performance Manager(HPM) for s390x (KVM IBM z Systems). *Abstract* z Systems Hypervisor Performance Manager (zHPM) can be used to bring a goal-oriented approach to the performance management of a hypervisor. zHPM dynamically manages resource allocation when contention occurs based on user-specified policies associated with performance objectives. *Introduction about HPM:* zHPM provides the following capabilities: ·APIs to enable a virtualization management solution for fully operating zHPM. ·These APIs are provided using RESTful web services. The zHPM APIs provide the following functions: –Definition of workload resource groups and performance policy. –Collection of virtual server and hypervisor performance metrics related to understanding of performance goal achievement. –Operational controls. ·A command line interface that provides similar functions as the zHPM APIs. ·Collection of hypervisor level and virtual server level performance metrics to help set up performance goals, and support virtual server CPU management. ·Management of CPU resource allocation to virtual servers in order to meet goals Workload resource groups A workload resource group is a collection of virtual servers that host a business application. The workload resource group provides a "management view" of these virtual servers. By defining a workload resource group you can manage hypervisor resources based on the requirements of the business applications deployed on the KVM for IBM z Systems hypervisor. Performance policies In zHPM, a performance policy defines goals for virtual servers in a workload resource group. You can define performance policies and express a business goal and an importance level for the virtual servers that are part of a workload resource group. zHPM then monitors and manages hypervisor resources allocated to the virtual servers based on these performance policies. Service class the service class a virtual server is associated with. *Use Cases:* New plugin Hypervisor Performance Manager(HPM) UI toprovide the following operations support: 1.Performance Policies a.List b.Add/Update/Remove c.Import/Export 2.Workload Resource Group (WRG) configuration a.List WRG’s b.Get/Create/Edit/Delete WRG c.Add/Remove Virtual Server from WRG 3.Service Classes a.Details of Service Class b.Fetch or update Virtual Server information 4.Virtual Server CPU Management a.Get/Enable/Disable CPU management b.Report dynamic CPU resource adjustments REST API’s Supported by HPM. 1.Workload Resource Group a.GET /zhpm/wsapi/v1/workload-resource-groups b.GET /zhpm/wsapi/v1/workload-resource-groups/detail c.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} d.POST /zhpm/wsapi/v1/workload-resource-groups e.DELETE /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} f.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id}/actions 2.Performance Policies a.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} b.POST /zhpm/wsapi/v1/workload-resource-groups/default c.POST /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-ids d.GET /zhpm/wsapi/v1/workload-resource-groups/{wrg-resource-id} e.GET /zhpm/wsapi/v1/workload-resource-groups/detail 3.Virtual Servers a.GET /zhpm/wsapi/v1/virtual-servers b.GET /zhpm/wsapi/v1/virtual-servers/{vs-resource-id} c.POST /zhpm/wsapi/v1/virtual-servers/{vs-resource-id} d.GET /zhpm/wsapi/v1/virtual-servers/detail 4.Metrics a.GET /zhpm/wsapi/v1/metrics/raw/hypervisor b.GET /zhpm/wsapi/v1/metrics/calculated/hypervisor c.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups d.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups e.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/default f.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/default g.GET /zhpm/wsapi/v1/metrics/raw/workload-resource-groups/{wrg-resource-id} a.GET /zhpm/wsapi/v1/metrics/calculated/workload-resource-groups/{wrg-resource-id} 5.CPU Management a.GET /zhpm/wsapi/v1/mgmt-levels b.POST /zhpm/wsapi/v1/mgmt-levels c.GET /zhpm/wsapi/v1/dynamic-resource-adjustments 6.Memory Management TBD The following code changes will be made in support of plugin: 1.Plugin infrastructure 2.Backend python code support for Kimchi/Ginger for the REST API development 3.Frontend HTML5/JavaScript code. More details to be followed like detailed use cases, REST API and mock-ups ... Further documentation can be found @ http://www.ibm.com/support/knowledgecenter/SSNW54_1.1.1/com.ibm.kvm.v111.ad… Please feel free to comment !!! Thanks and Regards Chandra

2 1

[PATCH] [Wok] Fix to provide date convertion as per locale
by jkatta＠linux.vnet.ibm.com 01 Dec '16

01 Dec '16

From: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> This fix provides template and utils methods for the date convertion as per the locale settings from UI login page Signed-off-by: Jayavardhan Katta <jkatta(a)linux.vnet.ibm.com> --- src/wok/template.py | 26 +++++++++++++++++++++++++- src/wok/utils.py | 10 ++++++++++ 2 files changed, 35 insertions(+), 1 deletion(-) diff --git a/src/wok/template.py b/src/wok/template.py index 43a34db..e8d083e 100644 --- a/src/wok/template.py +++ b/src/wok/template.py @@ -22,10 +22,13 @@ import cherrypy import errno import json +import threading import time +import locale + from Cheetah.Template import Template from glob import iglob - +from contextlib import contextmanager from wok import config as config from wok.config import paths @@ -133,3 +136,24 @@ def render(resource, data): return render_cheetah_file(resource, data) else: raise cherrypy.HTTPError(406) + + +def get_locale(): + cookie = cherrypy.request.cookie + if "wokLocale" in cookie.keys(): + return [cookie["wokLocale"].value] + langs = get_lang() + return langs + + +LOCALE_LOCK = threading.Lock() + + +@contextmanager +def setlocale(name): + with LOCALE_LOCK: + saved = locale.setlocale(locale.LC_TIME) + try: + yield locale.setlocale(locale.LC_TIME, name) + finally: + locale.setlocale(locale.LC_TIME, saved) diff --git a/src/wok/utils.py b/src/wok/utils.py index 9a08001..807893d 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -42,6 +42,7 @@ from threading import Timer from wok.config import paths, PluginPaths from wok.exception import InvalidParameter, TimeoutExpired from wok.stringutils import decode_value +from wok.template import get_locale, setlocale wok_log = cherrypy.log.error_log @@ -619,3 +620,12 @@ def upgrade_objectstore_schema(objstore=None, field=None): wok_log.error("Cannot upgrade objectstore schema: %s" % e.args[0]) return False return True + + +def dateNtime_to_locale(dateNtime): + dt = datetime.strptime(dateNtime, "%Y-%m-%d %H:%M:%S") + cokies_locale = get_locale() + cokies_locale = cokies_locale[0].replace("-", "_") + with setlocale(cokies_locale): + dt_locale = (dt.strftime('%c')) + return dt_locale -- 2.7.4

2 1

[PATCH] [Wok] Fix non-relative paths
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/js/wok.user-log.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/wok.user-log.js b/ui/js/wok.user-log.js index bac5439..f7659ee 100644 --- a/ui/js/wok.user-log.js +++ b/ui/js/wok.user-log.js @@ -173,7 +173,7 @@ wok.initUserLog = function() { $(".content-area", "#wokSettings").css("height", "100%"); wok.initUserLogConfig(); $('#advanced-search-button').on('click',function(){ - wok.window.open('/tabs/settings-search.html'); + wok.window.open('tabs/settings-search.html'); }); $("#download-button").on('click',function(){ -- 2.7.4

2 1

[PATCH] [Wok] Fix ip-address.js directory
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- ui/libs/datatables/js/plugins/ip-address/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/libs/datatables/js/plugins/ip-address/Makefile.am b/ui/libs/datatables/js/plugins/ip-address/Makefile.am index f823bae..b48f817 100644 --- a/ui/libs/datatables/js/plugins/ip-address/Makefile.am +++ b/ui/libs/datatables/js/plugins/ip-address/Makefile.am @@ -16,6 +16,6 @@ # See the License for the specific language governing permissions and # limitations under the License. -datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address/ip-address.js +datatablesipaddressjsdir = $(datadir)/wok/ui/libs/datatables/js/plugins/ip-address dist_datatablesipaddressjs_DATA = $(wildcard *.js) $(NULL) -- 2.7.4

2 1

[PATCH] Do not install firewalld conf in Debian
by Lucio Correia 01 Dec '16

01 Dec '16

Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- Makefile.am | 3 --- 1 file changed, 3 deletions(-) diff --git a/Makefile.am b/Makefile.am index e7ab86e..5f91a62 100644 --- a/Makefile.am +++ b/Makefile.am @@ -95,9 +95,6 @@ install-deb: install $(DESTDIR)/etc/init/wokd.conf; \ fi $(MKDIR_P) $(DESTDIR)/$(localstatedir)/lib/wok/ - $(MKDIR_P) $(DESTDIR)/usr/lib/firewalld/services - cp -R $(top_srcdir)/src/firewalld.xml \ - $(DESTDIR)/usr/lib/firewalld/services/wokd.xml deb: contrib/make-deb.sh -- 2.7.4

2 5

[PATCH] [Kimchi] Issue #1063: Upon migrating guest to remote server, password less ssh is permanent
by archus＠linux.vnet.ibm.com 01 Dec '16

01 Dec '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Changes to ensure that password less login is removed if its setup by kimchi. It also provide option for user to specify if user want to keep the password less login setup by kimchi, if not specified password less login setup by kimchi will be removed. However if password less login is not setup by kimchi, code does not remove the password less login. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- model/vms.py | 180 ++++++++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 129 insertions(+), 51 deletions(-) diff --git a/model/vms.py b/model/vms.py index bff7ed2..28aab76 100644 --- a/model/vms.py +++ b/model/vms.py @@ -1747,58 +1747,59 @@ class VMModel(object): if password is None: raise OperationFailed("KCHVM0056E", {'host': remote_host, 'user': user}) - else: - self._set_password_less_login(remote_host, user, password) + return False + return True - def _set_password_less_login(self, remote_host, user, passwd): - home_dir = '/root' if user is 'root' else '/home/%s' % user + def _read_id_rsa_pub_file(self, id_rsa_pub_file): + data = None + with open(id_rsa_pub_file, "r") as id_file: + data = id_file.read() + return data - id_rsa_file = "%s/.ssh/id_rsa" % home_dir - id_rsa_pub_file = id_rsa_file + '.pub' - ssh_port = 22 - ssh_client = None + def _create_root_ssh_key_if_required(self, user, id_rsa_pub_file, + id_rsa_file): + if os.path.isfile(id_rsa_pub_file): + return - def read_id_rsa_pub_file(): - data = None - with open(id_rsa_pub_file, "r") as id_file: - data = id_file.read() - return data + with open("/dev/zero") as zero_input: + cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file] + proc = subprocess.Popen( + cmd, + stdin=zero_input, + stdout=open(os.devnull, 'wb') + ) + out, err = proc.communicate() - def create_root_ssh_key_if_required(): - if os.path.isfile(id_rsa_pub_file): - return + if not os.path.isfile(id_rsa_pub_file): + raise OperationFailed("KCHVM0070E") - with open("/dev/zero") as zero_input: - cmd = ['ssh-keygen', '-q', '-N', '', '-f', id_rsa_file] - proc = subprocess.Popen( - cmd, - stdin=zero_input, - stdout=open(os.devnull, 'wb') + if user != 'root': + id_rsa_content = self._read_id_rsa_pub_file(id_rsa_pub_file) + updated_content = id_rsa_content.replace( + ' root@', ' %s@' % user ) - out, err = proc.communicate() + with open(id_rsa_pub_file, 'w+') as f: + f.write(updated_content) - if not os.path.isfile(id_rsa_pub_file): - raise OperationFailed("KCHVM0070E") + user_uid = pwd.getpwnam(user).pw_uid + user_gid = pwd.getpwnam(user).pw_gid + os.chown(id_rsa_pub_file, user_uid, user_gid) + os.chown(id_rsa_file, user_uid, user_gid) - if user is not 'root': - id_rsa_content = read_id_rsa_pub_file() - updated_content = id_rsa_content.replace( - ' root@', ' %s@' % user - ) - with open(id_rsa_pub_file, 'w+') as f: - f.write(updated_content) + def _get_ssh_client(self, remote_host, user, passwd, ssh_port): + ssh_client = paramiko.SSHClient() + ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) + ssh_client.connect(remote_host, ssh_port, username=user, + password=passwd, timeout=4) + return ssh_client - user_uid = pwd.getpwnam(user).pw_uid - user_gid = pwd.getpwnam(user).pw_gid - os.chown(id_rsa_pub_file, user_uid, user_gid) - os.chown(id_rsa_file, user_uid, user_gid) + def _set_password_less_login(self, remote_host, user, passwd): + home_dir = '/root' if user == 'root' else '/home/%s' % user - def get_ssh_client(remote_host, user, passwd): - ssh_client = paramiko.SSHClient() - ssh_client.set_missing_host_key_policy(paramiko.AutoAddPolicy()) - ssh_client.connect(remote_host, ssh_port, username=user, - password=passwd, timeout=4) - return ssh_client + id_rsa_file = "%s/.ssh/id_rsa" % home_dir + id_rsa_pub_file = id_rsa_file + '.pub' + ssh_port = 22 + ssh_client = None def append_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data): sftp_client = ssh_client.open_sftp() @@ -1824,9 +1825,11 @@ class VMModel(object): sftp_client.close() try: - create_root_ssh_key_if_required() - id_rsa_data = read_id_rsa_pub_file() - ssh_client = get_ssh_client(remote_host, user, passwd) + self._create_root_ssh_key_if_required(user, id_rsa_pub_file, + id_rsa_file) + id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file) + ssh_client = self._get_ssh_client(remote_host, user, passwd, + ssh_port) append_id_rsa_to_remote_authorized_keys( ssh_client, id_rsa_data @@ -1865,17 +1868,21 @@ class VMModel(object): def migration_pre_check(self, remote_host, user, password): self._check_if_host_not_localhost(remote_host) - self._check_if_password_less_login_enabled( + default_passless_status = self._check_if_password_less_login_enabled( remote_host, user, password ) - self._check_remote_libvirt_conn(remote_host, user) + if not default_passless_status: + self._set_password_less_login(remote_host, user, password) + self._check_if_migrating_same_arch_hypervisor(remote_host, user) if platform.machine() in ['ppc64', 'ppc64le']: self._check_ppc64_subcores_per_core(remote_host, user) + return default_passless_status + def _check_if_path_exists_in_remote_host(self, path, remote_host, user): username_host = "%s@%s" % (user, remote_host) cmd = ['ssh', '-oStrictHostKeyChecking=no', username_host, @@ -1957,15 +1964,22 @@ class VMModel(object): user ) - def migrate(self, name, remote_host, user=None, password=None): + def migrate(self, name, remote_host, user=None, password=None, + remove_passless_login=True): name = name.decode('utf-8') remote_host = remote_host.decode('utf-8') if user is None: user = 'root' + user = user.encode('utf-8') + + default_passless_status = self.migration_pre_check(remote_host, user, + password) - self.migration_pre_check(remote_host, user, password) - dest_conn = self._get_remote_libvirt_conn(remote_host, user) + if default_passless_status: + remove_passless_login = False + + dest_conn = self._get_remote_libvirt_conn(remote_host) non_shared = self._check_if_nonshared_migration( name, @@ -1977,18 +1991,80 @@ class VMModel(object): 'dest_conn': dest_conn, 'non_shared': non_shared, 'remote_host': remote_host, - 'user': user} + 'user': user, + 'password': password, + 'remove_passless_login': remove_passless_login} task_id = AsyncTask('/plugins/kimchi/vms/%s/migrate' % name, self._migrate_task, params).id return self.task.lookup(task_id) + def _remove_password_less_login(self, remote_host, user, passwd): + home_dir = '/root' if user == 'root' else '/home/%s' % user + + id_rsa_file = "%s/.ssh/id_rsa" % home_dir + id_rsa_pub_file = id_rsa_file + '.pub' + ssh_port = 22 + ssh_client = None + + def remove_id_rsa_to_remote_authorized_keys(ssh_client, id_rsa_data): + sftp_client = ssh_client.open_sftp() + ssh_dir = '%s/.ssh' % home_dir + + try: + sftp_client.chdir(ssh_dir) + except IOError: + raise OperationFailed( + "KCHVM0089E", + {'host': remote_host, 'user': user, 'sshdir': ssh_dir} + ) + file_handler = sftp_client.file( + '%s/.ssh/authorized_keys' % home_dir, + mode='r', + bufsize=1 + ) + lines = file_handler.readlines() + try: + lines.remove(id_rsa_data) + except ValueError: + pass + file_handler = sftp_client.file( + '%s/.ssh/authorized_keys' % home_dir, + mode='w', + bufsize=1 + ) + file_handler.writelines(lines) + file_handler.flush() + file_handler.close() + sftp_client.close() + + try: + self._create_root_ssh_key_if_required(user, id_rsa_pub_file, + id_rsa_file) + id_rsa_data = self._read_id_rsa_pub_file(id_rsa_pub_file) + ssh_client = self._get_ssh_client(remote_host, user, passwd, + ssh_port) + remove_id_rsa_to_remote_authorized_keys( + ssh_client, + id_rsa_data + ) + except Exception, e: + raise OperationFailed( + "KCHVM0068E", + {'host': remote_host, 'user': user, 'error': e} + ) + finally: + if ssh_client: + ssh_client.close() + def _migrate_task(self, cb, params): name = params['name'].decode('utf-8') dest_conn = params['dest_conn'] non_shared = params['non_shared'] remote_host = params['remote_host'] user = params['user'] + password = params['password'] + remove_passless_login = params['remove_passless_login'] cb('starting a migration') @@ -2022,6 +2098,8 @@ class VMModel(object): raise OperationFailed('KCHVM0058E', {'err': e.message, 'name': name}) finally: + if remove_passless_login: + self._remove_password_less_login(remote_host, user, password) dest_conn.close() cb('Migrate finished', True) -- 2.7.4

2 1

[PATCH v2] [Kimchi 0/4] CPU Hot plug/unplug feature
by dhbarboza82＠gmail.com 25 Nov '16

25 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - standardized i18n messages to use CPUs instead of vCPUs This patch set implements CPU Hot plug/unplug capabilities in Kimchi. To test it, simply add/remove CPUs in a running guest via the 'Edit' menu. Note that all restrictions on the current CPU value (can't exceed max number of CPUs, must be a number that makes sense in the topology if one is set) still applies. For Power systems, the hot unplug requires additional software running in the guest to work: powerpc-utils, ppc64-diag and librtas. The service 'rtas_err' must be running too. *** BLURB HERE *** Daniel Henrique Barboza (4): CPU Hot plug/unplug: i18n changes CPU Hot plug/unplug: model changes CPU Hot plug/unplug: test changes CPU Hot plug/unplug: ui changes i18n.py | 5 +++ model/vms.py | 50 ++++++++++++++++++++++- tests/test_model.py | 80 +++++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 12 +++--- ui/pages/guest-edit.html.tmpl | 1 + ui/pages/help/en_US/guests.dita | 8 ++++ 6 files changed, 148 insertions(+), 8 deletions(-) -- 2.7.4

4 10

[PATCH v2] [Kimchi 0/5] CPU Hot plug/unplug feature
by dhbarboza82＠gmail.com 25 Nov '16

25 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> ** DEPENDS ON 'CPU topology setup enhancements' PATCH SET ** v3: - rebased the patch set with the 'CPU topology setup enhancements' changes - added new test on test_rest.py v2: - standardized i18n messages to use CPUs instead of vCPUs This patch set implements CPU Hot plug/unplug capabilities in Kimchi. To test it, simply add/remove CPUs in a running guest via the 'Edit' menu. Note that all restrictions on the current CPU value (can't exceed max number of CPUs, must be a number that makes sense in the topology if one is set) still applies. For Power systems, the hot unplug requires additional software running in the guest to work: powerpc-utils, ppc64-diag and librtas. The service 'rtas_err' must be running too. Daniel Henrique Barboza (5): CPU Hot plug/unplug: i18n changes CPU Hot plug/unplug: model changes CPU Hot plug/unplug: test changes CPU Hot plug/unplug: ui changes CPU Hot plug/unplug: test_rest.py changes i18n.py | 3 + model/vms.py | 66 ++++++++++++++++++--- tests/test_model.py | 112 ++++++++++++++++++++++++++++++++++++ tests/test_rest.py | 33 +++++++++-- ui/js/src/kimchi.guest_edit_main.js | 44 +++++++++----- ui/pages/guest-edit.html.tmpl | 5 +- ui/pages/help/en_US/guests.dita | 8 +++ 7 files changed, 242 insertions(+), 29 deletions(-) -- 2.7.4

2 6

[PATCH] [Kimchi 0/9] (STABLE-2.3.x VERSION) CPU topology setup enhancements
by dhbarboza82＠gmail.com 25 Nov '16

25 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch set is a backport of the patch set '[PATCH v3] [Kimchi 0/8] CPU topology setup enhancements' that were accepted and pushed to the master branch. Daniel Henrique Barboza (9): Bug fix #1072 - changing vpus verification Adding 'sockets' field in the topology of Templates template_edit_main.js: initProcessor now a global function Adding 'Processor' tab in Edit Guest dialog CPU configuration UI: several improvements Adding CPU setup help text in Edit Guest/Template Edit Guest dialog: fixing 'Save' button on Processor tab Changing 'threads' to be a free number field Edit Guest: block CPU settings when guest is running or paused i18n.py | 3 +- model/cpuinfo.py | 4 +- tests/test_model.py | 12 +-- ui/css/kimchi.css | 36 +++++-- ui/css/src/modules/_edit-guests.scss | 28 ++++- ui/css/src/modules/_templates.scss | 3 - ui/js/src/kimchi.guest_edit_main.js | 109 ++++++++++--------- ui/js/src/kimchi.template_edit_main.js | 187 ++++++++++++++++++++++----------- ui/pages/guest-edit.html.tmpl | 58 ++++++++-- ui/pages/i18n.json.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 27 +++-- 11 files changed, 315 insertions(+), 154 deletions(-) -- 2.7.4

2 10

[PATCH] [Kimchi] Bug fix #1072 - changing vpus verification
by dhbarboza82＠gmail.com 24 Nov '16

24 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch changes the vcpu verification when editing a turned off VM, if the VM has a topology set, to comply with the current libvirt schema: vcpus must be a multiple of the 'threads' value. Unit tests were adapted to reflect these changes. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- i18n.py | 2 +- model/cpuinfo.py | 2 +- tests/test_model.py | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/i18n.py b/i18n.py index 03929e5..2ec0e78 100644 --- a/i18n.py +++ b/i18n.py @@ -357,7 +357,7 @@ messages = { "KCHCPUINF0002E": _("When CPU topology is defined, maximum number of vCPUs must be a product of sockets, cores, and threads."), "KCHCPUINF0003E": _("This host (or current configuration) does not allow CPU topology."), "KCHCPUINF0004E": _("The maximum number of vCPUs is too large for this system."), - "KCHCPUINF0005E": _("When CPU topology is defined, vCPUs must be a multiple of a product of cores and threads."), + "KCHCPUINF0005E": _("When CPU topology is defined, vCPUs must be a multiple of the 'threads' number defined."), "KCHCPUINF0006E": _("The number of threads is too large for this system."), "KCHCPUINF0007E": _("When CPU topology is specified, sockets, cores and threads are required paramaters."), "KCHCPUINF0008E": _("Parameter 'cpu_info' expects an object with fields among: 'vcpus', 'maxvcpus', 'topology'."), diff --git a/model/cpuinfo.py b/model/cpuinfo.py index 3707a02..5f82320 100644 --- a/model/cpuinfo.py +++ b/model/cpuinfo.py @@ -138,7 +138,7 @@ class CPUInfoModel(object): raise InvalidParameter("KCHCPUINF0006E") if maxvcpus != sockets * cores * threads: raise InvalidParameter("KCHCPUINF0002E") - if vcpus % (cores * threads) != 0: + if vcpus % threads != 0: raise InvalidParameter("KCHCPUINF0005E") if maxvcpus > self.get_host_max_vcpus(): diff --git a/tests/test_model.py b/tests/test_model.py index 05d7415..1246be6 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -1298,23 +1298,23 @@ class ModelTests(unittest.TestCase): # define CPU topology inst.vm_update(u'kimchi-vm1', {'cpu_info': {'topology': { - 'sockets': 4, 'cores': 2, 'threads': 1}}}) + 'sockets': 2, 'cores': 2, 'threads': 2}}}) vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals({'sockets': 4, 'cores': 2, 'threads': 1}, + self.assertEquals({'sockets': 2, 'cores': 2, 'threads': 2}, vm_info['cpu_info']['topology']) - # vcpus not a multiple of (cores * threads) + # vcpus not a multiple of threads self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', - {'cpu_info': {'vcpus': 1}}) + {'cpu_info': {'vcpus': 5}}) # maxvcpus different of (sockets * cores * threads) self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', {'cpu_info': {'maxvcpus': 4}}) - # topology does not match maxvcpus (8 != 2 * 2 * 1) + # topology does not match maxvcpus (8 != 3 * 2 * 2) self.assertRaises(InvalidParameter, inst.vm_update, u'kimchi-vm1', {'cpu_info': {'topology': { - 'sockets': 2, 'cores': 2, 'threads': 1}}}) + 'sockets': 3, 'cores': 2, 'threads': 2}}}) # undefine CPU topology inst.vm_update(u'kimchi-vm1', {'cpu_info': {'topology': {}}}) -- 2.7.4

3 4

[PATCH v3] [Kimchi 0/8] CPU topology setup enhancements
by dhbarboza82＠gmail.com 24 Nov '16

24 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> * NOTE: THIS PATCH SET ISN'T COMPATIBLE WITH STABLE-2.3.X BRANCH * v3: - added an extra patch to handle a problem with the 'Save' button in the Edit Guest window - fixed a bug in the patch that turned 'threads' in a number field v2: - added an extra patch to handle the 'threads' field problem * NOTE: THIS PATCH SET IS NOT APPLICABLE IN THE STABLE-2.3.X BRANCH * This patch set contains several patches that enhances the user experience when configuring existing templates and offline guests, allowing current CPU, maximum CPU and CPU topology to be defined at all times. Daniel Henrique Barboza (8): Bug fix #1072 - changing vpus verification Adding 'sockets' field in the topology of Templates template_edit_main.js: initProcessor now a global function Adding 'Processor' tab in Edit Guest dialog CPU configuration UI: several improvements Adding CPU setup help text in Edit Guest/Template Edit Guest dialog: fixing 'Save' button on Processor tab Changing 'threads' to be a free number field i18n.py | 3 +- model/cpuinfo.py | 4 +- tests/test_model.py | 12 +-- ui/css/kimchi.css | 36 +++++-- ui/css/src/modules/_edit-guests.scss | 28 ++++- ui/css/src/modules/_templates.scss | 3 - ui/js/src/kimchi.guest_edit_main.js | 94 ++++++++--------- ui/js/src/kimchi.template_edit_main.js | 187 ++++++++++++++++++++++----------- ui/pages/guest-edit.html.tmpl | 54 ++++++++-- ui/pages/i18n.json.tmpl | 2 +- ui/pages/template-edit.html.tmpl | 27 +++-- 11 files changed, 296 insertions(+), 154 deletions(-) -- 2.7.4

2 9

[PATCH v2] [Kimchi 0/7] CPU topology setup enhancements
by dhbarboza82＠gmail.com 24 Nov '16

24 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> v2: - added an extra patch to handle the 'threads' field problem * NOTE: THIS PATCH SET IS NOT APPLICABLE IN THE STABLE-2.3.X BRANCH * This patch set contains several patches that enhances the user experience when configuring existing templates and offline guests, allowing current CPU, maximum CPU and CPU topology to be defined at all times. Daniel Henrique Barboza (7): Bug fix #1072 - changing vpus verification Adding 'sockets' field in the topology of Templates template_edit_main.js: initProcessor now a global function Adding 'Processor' tab in Edit Guest dialog CPU configuration UI: several improvements Adding CPU setup help text in Edit Guest/Template Changing 'threads' to be a free number field i18n.py | 3 +- model/cpuinfo.py | 4 +- tests/test_model.py | 12 +-- ui/css/kimchi.css | 36 +++++-- ui/css/src/modules/_edit-guests.scss | 28 +++++- ui/css/src/modules/_templates.scss | 3 - ui/js/src/kimchi.guest_edit_main.js | 75 +++++++------- ui/js/src/kimchi.template_edit_main.js | 172 +++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 54 ++++++++--- ui/pages/i18n.json.tmpl | 1 + ui/pages/template-edit.html.tmpl | 27 ++++-- 11 files changed, 271 insertions(+), 144 deletions(-) -- 2.7.4

2 8

[PATCH] [Kimchi 0/6] CPU topology setup enhancements
by dhbarboza82＠gmail.com 24 Nov '16

24 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> * NOTE: THIS PATCH SET IS NOT APPLICABLE IN THE STABLE-2.3.X BRANCH * This patch set contains several patches that enhances the user experience when configuring existing templates and offline guests, allowing current CPU, maximum CPU and CPU topology to be defined at all times. Daniel Henrique Barboza (6): Bug fix #1072 - changing vpus verification Adding 'sockets' field in the topology of Templates template_edit_main.js: initProcessor now a global function Adding 'Processor' tab in Edit Guest dialog CPU configuration UI: several improvements Adding CPU setup help text in Edit Guest/Template i18n.py | 2 +- model/cpuinfo.py | 2 +- tests/test_model.py | 12 +-- ui/css/kimchi.css | 36 +++++-- ui/css/src/modules/_edit-guests.scss | 28 +++++- ui/css/src/modules/_templates.scss | 3 - ui/js/src/kimchi.guest_edit_main.js | 75 +++++++------- ui/js/src/kimchi.template_edit_main.js | 176 +++++++++++++++++++++------------ ui/pages/guest-edit.html.tmpl | 50 +++++++--- ui/pages/template-edit.html.tmpl | 23 +++-- 10 files changed, 266 insertions(+), 141 deletions(-) -- 2.7.4

2 7

[Kimchi] [RFC] Issue #1063: Upon migrating guest to remote server, password less ssh is permanent
by Archana Singh 16 Nov '16

16 Nov '16

*Currently*: Upon migrating guest to remote server, password less ssh is permanent. Due to that, from terminal able to log on to the remote server with out prompting password *Propose*: Upon completion of migration, password-less ssh has to revoke. Option 1: As migration need password-less ssh, without which migration cannot be done, so it should be delete once migration is completed. Option 2: lets update user that on migration password-less ssh will be established till migration is not completed(May be as document or in UI). And ask user if he was to delete the password-less ssh login or not in migration UI panel. Option 3: Using libvirt.openauth. However I was not able to figure out any proper documentation on how to use openauth. As this is kind of security issue, we can go with Option - 1 to fix the issue for now, enhancement is always possible. :) Thanks, Archana Singh

3 3

[PATCH V2] [Kimchi 0/2] Fixed edit template multiple issues
by rajgupta＠linux.vnet.ibm.com 12 Nov '16

12 Nov '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Rajat Gupta (2): Fixed issue #1075 s390x : Edit Template storage tab Storage dropdown shows "default" text Fixed issue #1076 s390x : n/w shows twice same interface while adding for template ui/js/src/kimchi.template_edit_main.js | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) -- 2.1.0

3 4

[PATCH] [Kimchi] Fixed issue #1062 Disk path not taking input properly
by rajgupta＠linux.vnet.ibm.com 12 Nov '16

12 Nov '16

From: Rajat Gupta <rajat.triumph(a)gmail.com> Removed add jquery method. separated event registration for size and path text box Signed-off-by: Rajat Gupta <rajat.triumph(a)gmail.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.guest_storage_add.main.js b/ui/js/src/kimchi.guest_storage_add.main.js index b8e088e..adf4a03 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -595,7 +595,15 @@ kimchi.guest_storage_add_main = function() { if(kimchi.hostarch === s390xArch){ - $(capacityTextbox).add(directorypathTextbox).on('change input propertychange', function(event){ + $(capacityTextbox).on('change input propertychange', function(event){ + if(sourcenewTextbox.val() === 'path'){ + $(submitButton).prop('disabled', $(capacityTextbox).val() === '' || $(directorypathTextbox).val() === ''); + }else{ + $(submitButton).prop('disabled', $(capacityTextbox).val() === ''); + } + }); + + $(directorypathTextbox).on('change input propertychange', function(event){ if(sourcenewTextbox.val() === 'path'){ $(submitButton).prop('disabled', $(capacityTextbox).val() === '' || $(directorypathTextbox).val() === ''); }else{ -- 2.1.0

2 1

[PATCH v2][Wok] Bug fix #151: Wok settings page not working when locale not set
by Ramon Medeiros 12 Nov '16

12 Nov '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- v2: Check if language is available seeing the length of the return ui/js/src/wok.login.js | 24 +++++++++++++++--------- ui/pages/login.html.tmpl | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 0b09508..fa2a98a 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -19,18 +19,24 @@ */ wok.login_main = function() { "use strict"; + + // verify if language is available var selectedLanguage = wok.lang.get(); - $('#userLang').val(selectedLanguage); - $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); - $('.filter-option:first').parent().attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); - $('.filter-option:first').text($('#userLang option[value="'+selectedLanguage+'"]').text()); + if ($('#userLang option[value="'+selectedLanguage+'"]').length == 1) { + $('#userLang').val(selectedLanguage); + $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); + $('.filter-option:first').parent().attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); + $('.filter-option:first').text($('#userLang option[value="'+selectedLanguage+'"]').text()); + } + // verify if locale is available var selectedLocale = wok.lang.get_locale(); - $('#userLocale').val(selectedLocale); - $('#userLocale option[value="'+selectedLocale+'"]').attr("selected", "selected"); - $('.filter-option:last').parent().attr('title',$('#userLocale option[value="'+selectedLocale+'"]').text()); - $('.filter-option:last').text($('#userLocale option[value="'+selectedLocale+'"]').text()); - + if ($('#userLocale option[value="'+selectedLocale+'"]').length == 1) { + $('#userLocale').val(selectedLocale); + $('#userLocale option[value="'+selectedLocale+'"]').attr("selected", "selected"); + $('.filter-option:last').parent().attr('title',$('#userLocale option[value="'+selectedLocale+'"]').text()); + $('.filter-option:last').text($('#userLocale option[value="'+selectedLocale+'"]').text()); + } $('#userLang').on('change', function() { wok.lang.set($(this).val()); diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 431806c..d74b795 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -128,7 +128,7 @@ <div class="form-group"> <label for="userLang">$_("Language")</label> <select id="userLang" class="selectpicker col-md-12 col-lg-12"> - <option value="en_US">English (US)</option> + <option value="en_US" selected="selected">English (US)</option> <option value="zh_CN">中文（简体）</option> <option value="pt_BR">Português (Brasil)</option> <option value="de_DE">Deutsch (Deutschland)</option> @@ -202,7 +202,7 @@ <option value="en-ZA">$_("English (South Africa)")</option> <option value="en-TZ">$_("English (Tanzania)")</option> <option value="en-GB">$_("English (United Kingdom)")</option> - <option value="en-US">$_("English (United States)")</option> + <option value="en-US" selected="selected">$_("English (United States)")</option> <option value="en-ZM">$_("English (Zambia)")</option> <option value="et-EE">$_("Estonian (Estonia)")</option> <option value="tl-PH">$_("Filipino (Philippines)")</option> -- 2.7.4

2 1

[PATCH v2] [Wok] Externalise missed strings in Wok.
by pkulkark＠linux.vnet.ibm.com 12 Nov '16

12 Nov '16

From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> v2: Included space in title field v1: This patch externalises some more static strings missed in Wok and removes tooltip. Signed-off-by: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 6 +++--- ui/pages/wok-ui.html.tmpl | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 170f8fe..431806c 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -111,12 +111,12 @@ <form id="form-login" class="form-horizontal" method="post"> <div class="form-group"> <label for="username" class="sr-only">$_("User Name")</label> - <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" /> + <input type="text" class="form-control" id="username" name="username" required="required" placeholder="$_(" User Name ")" autofocus autocomplete="off" title=" " /> <div id="username-msg" class="msg-required"></div> </div> <div class="form-group"> <label for="password" class="sr-only">$_("Password")</label> - <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" /> + <input type="password" class="form-control" id="password" name="password" required="required" placeholder="$_(" Password ")" autocomplete="off" title=" "/> <div id="password-msg" class="msg-required"></div> </div> <div class="form-group"> @@ -322,7 +322,7 @@ </div> <div class="row"> <div class="col-lg-4 delayed-fadein"> - <p class="text-muted powered hidden">Powered by:</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="wok-logos" class="list-inline"></ul> </div> </div> diff --git a/ui/pages/wok-ui.html.tmpl b/ui/pages/wok-ui.html.tmpl index 22a67e7..9ac7157 100644 --- a/ui/pages/wok-ui.html.tmpl +++ b/ui/pages/wok-ui.html.tmpl @@ -168,8 +168,8 @@ </div> <div id="buildme" style="display:none"> - <div><p>Oops! It looks like I am running from a source tree and you forgot to build! - Please run the following command from the wok and plugins directories and reload this page:</p> + <div><p>$_("Oops! It looks like I am running from a source tree and you forgot to build!") + $_("Please run the following command from the wok and plugins directories and reload this page:")</p> <p><code>make</code></p> </div> </div> @@ -215,10 +215,10 @@ </script> <footer class="footer"> <div class="container"> - <p class="text-muted powered hidden">$_("Powered by"):</p> + <p class="text-muted powered hidden">$_("Powered by:")</p> <ul id="plugins"> </ul> - <span class="wok-version">Wok Version: $get_version()</span> + <span class="wok-version">$_("Wok Version:") $get_version()</span> </div> </footer> </body> -- 2.1.0

2 2

[PATCH] [Wok 0/6] Bug fix #175: Do not generate nginx configuration file on the fly
by Aline Manera 12 Nov '16

12 Nov '16

Aline Manera (6): Fix 'make check' issues Remove log size information from Wok config Add nginx.service as wokd.service dependency Generate SSL self signed certificate on package post installation script Bug fix #175: Do not generate nginx configuration file on the fly Remove nginx-specific parameters from wok.conf file .gitignore | 1 - IBM-license-blacklist | 4 +- Makefile.am | 7 +- contrib/DEBIAN/control.in | 1 + contrib/DEBIAN/postinst | 1 + contrib/DEBIAN/postrm | 1 + contrib/Makefile.am | 2 +- contrib/wok.spec.fedora.in | 11 +-- contrib/wok.spec.suse.in | 41 ++++++---- contrib/wokd.service.fedora | 12 --- contrib/wokd.service.systemd | 14 ++++ docs/API/config.md | 4 +- docs/wokd.8.in | 16 ++-- src/nginx/Makefile.am | 7 +- src/nginx/wok.conf | 82 ++++++++++++++++++++ src/nginx/wok.conf.in | 75 ------------------ src/wok.conf.in | 23 +----- src/wok/config.py.in | 11 +-- src/wok/i18n.py | 2 - src/wok/model/config.py | 2 +- src/wok/plugins/sample/po/update-po | 2 +- src/wok/proxy.py | 147 ++++++++++-------------------------- src/wok/server.py | 6 +- src/wok/sslcert.py | 2 +- src/wokd.in | 18 +---- tests/test_api.py | 14 +--- tests/test_exception.py | 52 +++---------- tests/test_plugin.py | 12 +-- tests/test_server.py | 15 +--- tests/test_server_root.py | 17 ++--- tests/utils.py | 83 ++++---------------- 31 files changed, 242 insertions(+), 443 deletions(-) delete mode 100644 contrib/wokd.service.fedora create mode 100644 contrib/wokd.service.systemd create mode 100644 src/nginx/wok.conf delete mode 100644 src/nginx/wok.conf.in -- 2.7.4

3 11

[PATCH] [Kimchi] po/ja_JP.po: fix trailing whitespace
by dhbarboza82＠gmail.com 11 Nov '16

11 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This file is breaking make check-local of 'master' branch with a trailing whitespace. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- po/ja_JP.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/po/ja_JP.po b/po/ja_JP.po index eea7131..294ea14 100644 --- a/po/ja_JP.po +++ b/po/ja_JP.po @@ -2175,7 +2175,7 @@ msgid "" msgstr "" msgid "Add Network" -msgstr "" +msgstr "" msgid "" "The %1 network is not persistent. Instead of stop, this action will " -- 2.7.4

3 2

[PATCH] [Kimchi] Issue #1050: Rename template with existing template name
by archus＠linux.vnet.ibm.com 11 Nov '16

11 Nov '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> If template name is change to update and the new template name to be updated already exists then exception is raised stating name already exists. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- model/templates.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/model/templates.py b/model/templates.py index c3e24e1..e5663ad 100644 --- a/model/templates.py +++ b/model/templates.py @@ -231,6 +231,14 @@ class TemplateModel(object): def update(self, name, params): edit_template = self.lookup(name) + # If new name is not same as existing name + # and new name already exists: raise exception + with self.objstore as session: + if name != params['name'] \ + and params['name'] in session.get_list('template'): + raise InvalidOperation("KCHTMPL0001E", + {'name': params['name']}) + # Valid interfaces interfaces = params.get('interfaces', []) validate_interfaces(interfaces) -- 2.7.4

4 5

[PATCH] [Kimchi] rpmlint fixes on Fedora and Suse specs
by dhbarboza82＠gmail.com 11 Nov '16

11 Nov '16

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> This patch changes contrib/kimchi.spec.fedora.in and contrib/kimchi.spec.suse.in to comply with the rpm guidelines enforced by the rpmlint tool. After this patch, running check-local or ././check_spec_errors.sh gives only these warnings: contrib/kimchi_fedora.spec: W: invalid-url Source0: kimchi-2.3.0.tar.gz 0 packages and 1 specfiles checked; 0 errors, 1 warnings. contrib/kimchi_suse.spec: W: invalid-url Source0: kimchi-2.3.0.tar.gz 0 packages and 1 specfiles checked; 0 errors, 1 warnings. According to https://bugzilla.redhat.com/show_bug.cgi?id=566978 it is safe to ignore the 'invalid-url Source0' warning. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- contrib/kimchi.spec.fedora.in | 4 ++-- contrib/kimchi.spec.suse.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 29d4463..3b33297 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -46,7 +46,7 @@ Requires: spice-html5 %if 0%{?rhel} == 6 Requires: python-ordereddict Requires: python-imaging -BuildRequires: python-unittest2 +BuildRequires: python-unittest2 %endif %description @@ -54,7 +54,7 @@ Web application to manage KVM/Qemu virtual machines %prep -%setup +%setup -q %build diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 3d0896b..94dc55e 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -36,7 +36,7 @@ BuildRequires: libxslt-tools BuildRequires: python-lxml %if 0%{?suse_version} == 1100 -Requires: python-ordereddict +Requires: python-ordereddict %endif %if 0%{?suse_version} > 1140 @@ -47,7 +47,7 @@ Requires: python-ordereddict Web application to manage KVM/Qemu virtual machines %prep -%setup +%setup -q %build %configure --with-spice-html5 -- 2.7.4

3 2

[PATCH V2] [Kimchi] Issue #1050: Rename template with existing template name
by archus＠linux.vnet.ibm.com 11 Nov '16

11 Nov '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> If template name is change to update and the new template name to be updated already exists then exception is raised stating name already exists. Added unit test case for same. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- model/templates.py | 8 ++++++++ tests/test_template.py | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/model/templates.py b/model/templates.py index c3e24e1..566a20c 100644 --- a/model/templates.py +++ b/model/templates.py @@ -231,6 +231,14 @@ class TemplateModel(object): def update(self, name, params): edit_template = self.lookup(name) + # If new name is not same as existing name + # and new name already exists: raise exception + with self.objstore as session: + if 'name' in params and name != params['name'] \ + and params['name'] in session.get_list('template'): + raise InvalidOperation("KCHTMPL0001E", + {'name': params['name']}) + # Valid interfaces interfaces = params.get('interfaces', []) validate_interfaces(interfaces) diff --git a/tests/test_template.py b/tests/test_template.py index 6845565..f1dbf2b 100644 --- a/tests/test_template.py +++ b/tests/test_template.py @@ -192,6 +192,22 @@ class TemplateTests(unittest.TestCase): self.request('/plugins/kimchi/templates/test').read() ) + # Create another template to test update template name with one of + # existing template name + req = json.dumps({'name': 'test_new', + 'source_media': {'type': 'disk', 'path': MOCK_ISO}}) + resp = self.request('/plugins/kimchi/templates', req, 'POST') + self.assertEquals(201, resp.status) + # Update name with one of existing name should fail with 400 + req = json.dumps({'name': 'test_new'}) + resp = self.request('/plugins/kimchi/templates/test', req, 'PUT') + self.assertEquals(400, resp.status) + + # Delete the test1 template + resp = self.request('/plugins/kimchi/templates/test_new', '{}', + 'DELETE') + self.assertEquals(204, resp.status) + # Update name new_name = u'kīмсhīTmpl' new_tmpl_uri = '/plugins/kimchi/templates/%s' \ -- 2.7.4

2 1

[RFC] Guest/Template CPU setup with topology
by Daniel Henrique Barboza 11 Nov '16

11 Nov '16

Hi there, At this moment Kimchi support for guest and template CPU setup is underwhelming. Here's what I've found that needs improving: - edit template: * calculation of max CPUs is wrong when considering a topology. Max CPU is the value of sockets * cores * threads. At this moment it is considering only cores * threads, defaulting sockets to 1. * There is no way to set or even see the value of sockets. Given that this value is used in the calculation of the max CPUs, it should be at least visible and, in my opinion, editable - edit guest (not running): * If the guest was created with a CPU topology, there is no way to edit it. The only way to edit a topology at this moment is on the template level. My proposal is: edit template: - fix the max CPU calculation to consider the sockets. - add a field to allow the 'sockets' to be set at will. Default value will be retrieved by the kimchi/host/cpuinfo API as a reference (same think as with cores and threads today). edit guest: - if the guest was created with a CPU topology, allow the topology to be edited when the guest is turned OFF. Thoughts? ps: this RFC is also related to the feedback of "Bug fix #1072 - changing vpus verification". Daniel

3 3

[PATCH][Wok] Bug fix #151: Wok settings page not working when locale not set
by Ramon Medeiros 11 Nov '16

11 Nov '16

Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- ui/js/src/wok.login.js | 27 +++++++++++++++++++-------- ui/pages/login.html.tmpl | 4 ++-- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/ui/js/src/wok.login.js b/ui/js/src/wok.login.js index 0b09508..6545858 100644 --- a/ui/js/src/wok.login.js +++ b/ui/js/src/wok.login.js @@ -19,17 +19,28 @@ */ wok.login_main = function() { "use strict"; + + // verify if language is available var selectedLanguage = wok.lang.get(); - $('#userLang').val(selectedLanguage); - $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); - $('.filter-option:first').parent().attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); - $('.filter-option:first').text($('#userLang option[value="'+selectedLanguage+'"]').text()); + for (var i = 0; i < $('#userLang')[0].length; i++ ){ + if ($('#userLang')[0][i] == selectedLanguage) { + $('#userLang').val(selectedLanguage); + $('#userLang option[value="'+selectedLanguage+'"]').attr("selected", "selected"); + $('.filter-option:first').parent().attr('title',$('#userLang option[value="'+selectedLanguage+'"]').text()); + $('.filter-option:first').text($('#userLang option[value="'+selectedLanguage+'"]').text()); + } + } + // verify if locale is available var selectedLocale = wok.lang.get_locale(); - $('#userLocale').val(selectedLocale); - $('#userLocale option[value="'+selectedLocale+'"]').attr("selected", "selected"); - $('.filter-option:last').parent().attr('title',$('#userLocale option[value="'+selectedLocale+'"]').text()); - $('.filter-option:last').text($('#userLocale option[value="'+selectedLocale+'"]').text()); + for (var i = 0; i < $('#userLocale')[0].length; i++ ){ + if ($('#userLocale')[0][i] == selectedLocale) { + $('#userLocale').val(selectedLocale); + $('#userLocale option[value="'+selectedLocale+'"]').attr("selected", "selected"); + $('.filter-option:last').parent().attr('title',$('#userLocale option[value="'+selectedLocale+'"]').text()); + $('.filter-option:last').text($('#userLocale option[value="'+selectedLocale+'"]').text()); + } + } $('#userLang').on('change', function() { diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 431806c..d74b795 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -128,7 +128,7 @@ <div class="form-group"> <label for="userLang">$_("Language")</label> <select id="userLang" class="selectpicker col-md-12 col-lg-12"> - <option value="en_US">English (US)</option> + <option value="en_US" selected="selected">English (US)</option> <option value="zh_CN">中文（简体）</option> <option value="pt_BR">Português (Brasil)</option> <option value="de_DE">Deutsch (Deutschland)</option> @@ -202,7 +202,7 @@ <option value="en-ZA">$_("English (South Africa)")</option> <option value="en-TZ">$_("English (Tanzania)")</option> <option value="en-GB">$_("English (United Kingdom)")</option> - <option value="en-US">$_("English (United States)")</option> + <option value="en-US" selected="selected">$_("English (United States)")</option> <option value="en-ZM">$_("English (Zambia)")</option> <option value="et-EE">$_("Estonian (Estonia)")</option> <option value="tl-PH">$_("Filipino (Philippines)")</option> -- 2.7.4

2 3