August 2014 - Kimchi-devel - oVirt List Archives

[PATCH 0/5] Power (ppc) support patches
by Paulo Vital 23 Oct '14

23 Oct '14

This patch set enables Power(ppc) support by default on Kimchi. Whithout them, the upstream code of Kimchi is not fully compatible with the Power architecture. Eli Qiao (2): Add tablet to vmtemplate,to provides an absolute pointer device which often helps with getting a consistent mouse cursor position in VNC. Fix Bug 110927 - Sosreport throwing kimchi error Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Mark Wu (1): Add sos plugin for kimchi Paulo Vital (2): PowerKVM: Workaround of numpy byte order bug on PowerPC Add PowerKVM information as ISO otpion to installation. contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 5 +++-- src/kimchi/sos.py | 37 +++++++++++++++++++++++++++++++++++++ src/kimchi/vmtemplate.py | 5 +++++ src/kimchi/websocket.py | 7 +++++-- 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/kimchi/sos.py -- 1.9.3

5 13

[PATCH 0/2] PCI Passthrough: Add device to VM
by huoyuxin＠linux.vnet.ibm.com 09 Oct '14

09 Oct '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): Passthrough: Add PCI Devices to VM update po files po/en_US.po | 15 ++++++ po/kimchi.pot | 15 ++++++ po/pt_BR.po | 15 ++++++ po/zh_CN.po | 15 ++++++ ui/css/theme-default/guest-edit.css | 86 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 66 +++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 8 files changed, 293 insertions(+), 2 deletions(-)

3 4

Why do we use mockmodel?
by Crístian Viana 03 Oct '14

03 Oct '14

Hi! After creating a few patches for Kimchi, it occurred to me that the mockmodel design has more cons than pros. So I started wondering why we still use it. I understand - and totally agree - that we should have an extensive test infrastructure to make sure the code runs as designed and to make it very easy to find regression bugs on every new feature we implement. And as Kimchi works very integrated to its host system, it may not be easy to create expected/failed situations for things we don't always have control. But for every new feature we implement, we currently have to: 1) Implement the feature itself 2) Create tests for (1) 3) Implement the feature in a mock environment 4) Create tests for (3) And by looking at some existing code, many of the mock tests don't actually test anything. They're just there so we can say we have a mock implementation and a test for it. Why create a mock function and a test for the mock function if what we need is to test the real code? And a lot of times, the mock implementation (and the tests) are just copy/paste of the original feature. For me, that seems very tedious and useless. Why don't we get rid of the mockmodel and keep only the "real" model? I understand that it's not so simple to remove it right away, that's why I'm starting this discussion so we could see how to do it better - if we're actually going to do it. What would we miss if we didn't have the mockmodel anymore? I believe we'll need to be more careful when writing tests which run on a real environment (i.e. we can't "leak" VMs, networks, templates, or anything else) but at least we'll always test real code and we won't be writing code that won't be used. Please share your opinion with us. Best regards, Crístian.

2 2

[PATCH] Backend support for templates with sockets, cores, and threads
by Christy Perez 03 Oct '14

03 Oct '14

In order to allow a guest to use SMT/hyperthreading, we should enable passing in of the sockets, cores, and threads values when creating a template. All three values must be specified, as per the topology descr at http://libvirt.org/formatdomain.html#elementsCPU Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 7 +++++++ src/kimchi/API.json | 28 ++++++++++++++++++++++++++-- src/kimchi/control/templates.py | 11 ++++++++--- src/kimchi/osinfo.py | 2 +- src/kimchi/vmtemplate.py | 22 ++++++++++++++++++++++ 5 files changed, 64 insertions(+), 6 deletions(-) diff --git a/docs/API.md b/docs/API.md index d75c55f..cb4d541 100644 --- a/docs/API.md +++ b/docs/API.md @@ -200,6 +200,13 @@ Represents a snapshot of the Virtual Machine's primary monitor. Independent Computing Environments * null: Graphics is disabled or type not supported * listen: The network which the vnc/spice server listens on. + * cpu_info *(optional)*: CPU-specific information. + * topology: Specify sockets, threads, and cores to run the virtual CPU + threads on. + All three are required in order to specify cpu topology. + * sockets - The number of sockets to use. + * cores - The number of cores per socket. + * threads - The number of threads per core. ### Sub-Collection: Virtual Machine Network Interfaces diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..d510634 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -26,6 +26,28 @@ ] } } + }, + "cpu_info": { + "description": "Configure CPU specifics for a VM.", + "type": "object", + "properties": { + "topology": { + "description": "Configure the guest CPU topology.", + "type": "object", + "properties": { + "sockets": { + "type": "number" + }, + "cores": { + "type": "number" + }, + "threads": { + "type": "number" + } + }, + "required": [ "sockets", "cores", "threads" ] + } + } } }, "properties": { @@ -438,7 +460,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" @@ -608,7 +631,8 @@ "type": "array", "items": { "type": "string" } }, - "graphics": { "$ref": "#/kimchitype/graphics" } + "graphics": { "$ref": "#/kimchitype/graphics" }, + "cpu_info": { "$ref": "#/kimchitype/cpu_info" } }, "additionalProperties": false, "error": "KCHAPI0001E" diff --git a/src/kimchi/control/templates.py b/src/kimchi/control/templates.py index e17fa54..5ef35ce 100644 --- a/src/kimchi/control/templates.py +++ b/src/kimchi/control/templates.py @@ -38,13 +38,14 @@ def __init__(self, model, ident): self.update_params = ["name", "folder", "icon", "os_distro", "storagepool", "os_version", "cpus", "memory", "cdrom", "disks", "networks", - "graphics"] + "graphics", "cpu_info"] self.uri_fmt = "/templates/%s" self.clone = self.generate_action_handler('clone') @property def data(self): - return {'name': self.ident, + return_data = { + 'name': self.ident, 'icon': self.info['icon'], 'invalid': self.info['invalid'], 'os_distro': self.info['os_distro'], @@ -56,4 +57,8 @@ def data(self): 'storagepool': self.info['storagepool'], 'networks': self.info['networks'], 'folder': self.info.get('folder', []), - 'graphics': self.info['graphics']} + 'graphics': self.info['graphics'] + } + if (self.info.get('cpu_info')): + return_data['cpu_info'] = self.info['cpu_info'] + return return_data diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 1ad353c..8492bb7 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -32,7 +32,7 @@ 'power': ('ppc', 'ppc64')} -common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, +common_spec = {'cpus': 1, 'cpu_sockets': '1', 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024, 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide', 'cdrom_index': 2, 'mouse_bus': 'ps2'} diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..c64e61d 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -359,6 +359,22 @@ def _get_input_output_xml(self): input_output += sound % self.info return input_output + def _get_cpu_xml(self): + + cpu_info = self.info.get('cpu_info') + if cpu_info is not None: + cpu_topo = cpu_info.get('topology') + if cpu_topo is not None: + return """ + <cpu> + <topology sockets='%(sockets)s' + cores='%(cores)s' + threads='%(threads)s'/> + </cpu> + """ % cpu_topo + + return "" + def to_vm_xml(self, vm_name, vm_uuid, **kwargs): params = dict(self.info) params['name'] = vm_name @@ -371,6 +387,11 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): graphics = kwargs.get('graphics') params['graphics'] = self._get_graphics_xml(graphics) + if params.get('cpu_info') is not None: + params['cpu_info'] = self._get_cpu_xml() + else: + params['cpu_info'] = '' + # Current implementation just allows to create disk in one single # storage pool, so we cannot mix the types (scsi volumes vs img file) storage_type = self._get_storage_type() @@ -401,6 +422,7 @@ def to_vm_xml(self, vm_name, vm_uuid, **kwargs): <uuid>%(uuid)s</uuid> <memory unit='MiB'>%(memory)s</memory> <vcpu>%(cpus)s</vcpu> + %(cpu_info)s <os> <type arch='%(arch)s'>hvm</type> <boot dev='hd'/> -- 1.9.3

2 6

[PATCH V2] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 23 Sep '14

23 Sep '14

V1: Kimchi is currently not able to configure and open help pages of any plugin tab. This patch fixes this problem and removes the HELP button if the plugin does not have a help configured properly. Help pages for a plugin tab follow same Kimchi system: - html help file should have the same name of plugin html tab file - html files should be in plugin's " ui/pages/help/<LANG> " path - plugin should add following lines to <PLUGIN_NAME>.conf: * [/help] * tools.staticdir.on = True * tools.nocache.on = True - plugins should add a <help> element with tab help html name in "ui/config/tab-ext.xml", for each configured tab. If this element does not exist, 'Help' will be disabled V2: - Changed the way that tab help html is being checked. - Now, all tabs have the help html file checked (per language) You can check enabling Sample plugin. Go to plugin Sample tab. For en_US, the help button will be enabled. But if you logout and change to other language, the help button will be disabled, because the sample plugin does not have help in other languages. Rodrigo Trujillo (1): Detect and enable help pages for tabs and plugin tabs plugins/sample/sample.conf.in | 4 ++++ plugins/sample/ui/pages/help/en_US/tab.html | 1 + src/kimchi/config.py.in | 1 + src/kimchi/utils.py | 9 ++++++-- ui/js/src/kimchi.main.js | 36 ++++++++++++++++++++++++++++- 5 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/tab.html -- 1.9.3

2 4

[PATCH] [wip-v1] Create template from guest (BACKEND)
by Rodrigo Trujillo 22 Sep '14

22 Sep '14

This patch implements new functionality that allows user to create a template based on a givem virtual machine. Template will have same number of CPUS, amount of Memory, CDROM attached, disks, etc. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/API.json | 6 ++++++ src/kimchi/i18n.py | 1 + src/kimchi/model/templates.py | 34 ++++++++++++++++++++++++++++++++++ 3 files changed, 41 insertions(+) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..e1e0218 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -385,6 +385,12 @@ "minimum": 512, "error": "KCHTMPL0013E" }, + "vm": { + "description": "Virtual Machine which template will be based in", + "type": "string", + "minimum": 1, + "error": "KCHTMPL0025E" + }, "cdrom": { "description": "Path for cdrom", "type": "string", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..8b9c713 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -130,6 +130,7 @@ messages = { "KCHTMPL0022E": _("Disk size must be greater than 1GB."), "KCHTMPL0023E": _("Template base image must be a valid local image file"), "KCHTMPL0024E": _("Cannot identify base image %(path)s format"), + "KCHTMPL0025E": _("Virtual machine name must be a string"), "KCHPOOL0001E": _("Storage pool %(name)s already exists"), "KCHPOOL0002E": _("Storage pool %(name)s does not exist"), diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index bf04304..15296b0 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -36,6 +36,7 @@ class TemplatesModel(object): def __init__(self, **kargs): self.objstore = kargs['objstore'] self.conn = kargs['conn'] + self.kargs = kargs def create(self, params): name = params.get('name', '').strip() @@ -68,6 +69,12 @@ class TemplatesModel(object): except Exception: raise InvalidParameter("KCHTMPL0003E", {'network': net_name, 'template': name}) + + # Template based in a given VM + vm = params.get('vm') + if vm: + params.update(self._get_vm_params(vm)) + # Creates the template class with necessary information # Checkings will be done while creating this class, so any exception # will be raised here @@ -83,6 +90,33 @@ class TemplatesModel(object): return name + def _get_vm_params(self, vm): + from kimchi.model.vms import VMModel + vm_info = VMModel(**self.kargs).lookup(vm) + ret = {} + + # Get CPUs, Memory, Graphics + ret['cpus'] = vm_info['cpus'] + ret['memory'] = vm_info['memory'] + ret['graphics'] = vm_info['graphics'] + + # CDROM + from kimchi.model.vmstorages import VMStoragesModel, VMStorageModel + vmStorages = VMStoragesModel(**self.kargs) + disks = vmStorages.get_list(vm) + vmStorage = VMStorageModel(**self.kargs) + for disk in disks: + disk_info = vmStorage.lookup(vm, disk) + if disk_info['type'] == 'cdrom': + # get first cdrom found + ret['cdrom'] = disk_info['path'] + break + # ToDo: + # Get Disks + # Get StoragePool + # Get Networks + return ret + def get_list(self): with self.objstore as session: return session.get_list('template') -- 1.9.3

3 5

[PATCH 0/4] WIP: Download remote image to storage pool
by Crístian Viana 05 Sep '14

05 Sep '14

This patchset is a work in progress. I'm sending it now so we can get early feedback. The following problems are known: - The previous "create" function (which is now called "_create_volume_with_capacity") should be updated to the Task API. This will cause errors in existing tests. - There is one unfinished error message. - The tests and mockmodel are missing. Any feedback is welcome. Crístian Viana (4): storagevolume: Split "create" function based on the parameters storagevolume: Use a Task to create a new volume storagevolume: Download remote images to a storage pool storagevolume: Add download progress to task src/kimchi/control/storagevolumes.py | 4 +- src/kimchi/model/storagevolumes.py | 71 +++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 3 deletions(-) -- 1.9.3

2 5

[PATCH 0/5] Discover Kimchi peers using openSLP
by Aline Manera 02 Sep '14

02 Sep '14

I haven't add the federation info to /config/capabilities because I thought in always display the same message when any peers were found. "No peers found. More information at: <federation-help-page>" Then we can use README-federation as the federation help page. What do you think? Aline Manera (5): Update kimchi.config values according to command line input Delete http_port from /config API as it is not in use anymore Add federation option to Kimchi config file Discover Kimchi peers using openSLP Add documentation on how to enable federation on Kimchi docs/API.md | 1 - docs/README-federation.md | 27 +++++++++++++++++++++ src/kimchi.conf.in | 4 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/peers.py | 29 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 11 ++++++--- src/kimchi/model/config.py | 3 +-- src/kimchi/model/peers.py | 59 +++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 - src/kimchid.in | 36 +++++++++++++++++---------- tests/test_rest.py | 7 +++++- 11 files changed, 158 insertions(+), 21 deletions(-) create mode 100644 docs/README-federation.md create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

3 17

Mechanism for guest edits
by Brent Baude 02 Sep '14

02 Sep '14

Folks, I'm about to send a patch to you guys that: 1) adds "serial" as a graphics type 2) allows you to edit the graphics type on a cold guest In doing so and talking with Adam and Aline, it seems that a rework of how the guest's xml is edited is in order. When you edit a template, for example, the whole templates xml is basically re-instantiated and only the values that kimchi cares about is added. The rest libvirt fills in. The editing of guest xmls differs from that mechanism. Right now the actual xml is edited and resubmitted. If you think about editing components of a guest (think about changing graphics types), you can see where long-term there is an increased opportunity for the xml to become complicated and maybe even incorrect. XML creep if you will. So, we are thinking that the cold guest edition should more closely follow how the template works, where critical parts that kimchi has fields for is inserted and libvirt does the rest of the work. This will also allow for future growth/change where new components are added. I'll likely start a branch for it and get started on this. In the meanwhile, I'll submit my graphics patches for a start. Brent

2 1

[V2] UI: List Kimchi Peers
by huoyuxin＠linux.vnet.ibm.com 02 Sep '14

02 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/topbar.css | 36 +++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.main.js | 14 ++++++++++++++ ui/pages/kimchi-ui.html.tmpl | 10 ++++++++++ 4 files changed, 73 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index bed4e19..127c56a 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -114,7 +114,7 @@ cursor: pointer; display: block; position: relative; - height: 48px; + height: 52px; margin: 0 12px; } @@ -174,3 +174,37 @@ a#btn-logout:hover { display: none; } } + +.peers { + color: white; + cursor: pointer; + height: 52px; + margin: 0 12px; +} + +.peers span { + margin-top: 25px; +} + +.peers .arrow { + border: 6px solid transparent; + border-bottom: none; + border-top-color: white; + display: inline-block; + width: 0; +} + +.peers .drowdown { + top: 45px; + right: 110px; + color: black; + padding: 10px 15px; + white-space: nowrap; + line-height: 12px; + width: inherit; +} + +.peers .drowdown a { + display: block; + padding: 10px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..8966cff 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getPeers : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'peers', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index ba54b26..21ffca7 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -20,10 +20,24 @@ kimchi.tabMode = {}; kimchi.capabilities = undefined; kimchi.getCapabilities(function(result) { kimchi.capabilities = result; + kimchi.setupPeers(); }, function() { kimchi.capabilities = {}; }); +kimchi.setupPeers = function(){ + if(kimchi.capabilities.federation=="on"){ + $('#peers').removeClass('hide-content'); + kimchi.getPeers(function(data){ + var hints = $('p', $('.drowdown', '#peers')); + data.length==0 ? hints.toggleClass('hide-content'): hints.addClass('hide-content'); + for(var i=0; i<data.length; i++){ + $('.drowdown', '#peers').append("<a href='"+data[i]+"' target='_blank'>"+data[i]+"</a>"); + } + }); + } +}; + kimchi.main = function() { kimchi.popable(); diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 7bdf441..867ee36 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -71,6 +71,16 @@ <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> <ul class="nav-top"> <li> + <div id="peers" class="peers hide-content popable"> + <span>$_("Peers")</span> + <span class="arrow"></span> + <div class="drowdown popover right-side"> + <p>$_("Searching")...</p> + <p class="hide-content">$_("No peers found.")</p> + </div> + </div> + </li> + <li> <div id="user" class="popable"> <span id="user-icon"></span> <span id="user-name" class="empty-when-logged-off"></span> -- 1.7.1

2 2

[PATCH 0/2] Fix attaching iscsi storage volume
by lvroyce＠linux.vnet.ibm.com 01 Sep '14

01 Sep '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Iscsi volume fails to attach to vm because of its path is rejected by previous cdrom validate logic, and type 'unknown' forms wrong vm xml This patchset fix the above bugs and form right vm xml in order to start vm. Royce Lv (2): Guest storage: Fix attaching type judgement Guest storage: fix volume format overwrite src/kimchi/model/vmstorages.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) -- 1.8.3.2

3 8

[PATCH] Fix sample plugin configuration
by Aline Manera 01 Sep '14

01 Sep '14

Since the authorization method changed, kimchiauth() does not accept any parameter. The admin methods should be listed on Collection and Resource elements. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- plugins/sample/__init__.py | 2 ++ plugins/sample/sample.conf.in | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/sample/__init__.py b/plugins/sample/__init__.py index 4aca4e0..10c244c 100644 --- a/plugins/sample/__init__.py +++ b/plugins/sample/__init__.py @@ -64,12 +64,14 @@ class Circles(Collection): def __init__(self, model): super(Circles, self).__init__(model) self.resource = Circle + self.admin_methods = ['POST', 'PUT'] class Rectangles(Collection): def __init__(self, model): super(Rectangles, self).__init__(model) self.resource = Rectangle + self.admin_methods = ['POST', 'PUT'] class Circle(Resource): diff --git a/plugins/sample/sample.conf.in b/plugins/sample/sample.conf.in index 6e0908b..cf42467 100644 --- a/plugins/sample/sample.conf.in +++ b/plugins/sample/sample.conf.in @@ -17,8 +17,6 @@ tools.kimchiauth.on = True [/rectangles] tools.kimchiauth.on = True -tools.kimchiauth.admin_methods = ['POST', 'PUT'] [/circles] tools.kimchiauth.on = True -tools.kimchiauth.admin_methods = ['POST', 'PUT'] -- 1.9.3

2 2

[PATCH 0/6 V2] Discover Kimchi peers using openSLP
by Aline Manera 01 Sep '14

01 Sep '14

v1 -> V2: - Update docs/API.md - Expose federation on /config/capabilities Aline Manera (6): Update kimchi.config values according to command line input Delete http_port from /config API as it is not in use anymore Add federation option to Kimchi config file Discover Kimchi peers using openSLP Add documentation on how to enable federation on Kimchi Expose federation on /config/capabilities docs/API.md | 11 ++++++++- docs/README-federation.md | 27 +++++++++++++++++++++ src/kimchi.conf.in | 4 +++ src/kimchi/config.py.in | 1 + src/kimchi/control/peers.py | 29 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 14 ++++++++--- src/kimchi/model/config.py | 6 ++--- src/kimchi/model/peers.py | 59 +++++++++++++++++++++++++++++++++++++++++++++ src/kimchi/server.py | 1 - src/kimchid.in | 36 +++++++++++++++++---------- tests/test_rest.py | 19 +++++++++------ 11 files changed, 177 insertions(+), 30 deletions(-) create mode 100644 docs/README-federation.md create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

2 8

[PATCH] bug fix: Properly get the graphics expiration time
by Aline Manera 01 Sep '14

01 Sep '14

The data structure to graphics is: { graphics: {'passwd': '12345', 'passwdValidTo': 30} } Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index fb4cf22..8045b1e 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -321,7 +321,7 @@ class VMModel(object): if password is not None: graphics.attrib['passwd'] = password - expire = params.get("passwdValidTo") + expire = params['graphics'].get("passwdValidTo") to = graphics.attrib.get('passwdValidTo') if to is not None: if (time.mktime(time.strptime(to, '%Y-%m-%dT%H:%M:%S')) -- 1.9.3

3 3

[PATCH] model.host: changing listDevices() to listAllDevices()
by Daniel Henrique Barboza 01 Sep '14

01 Sep '14

The method listDevices() has unexpected behavior in certain situations and architectures. According the libvirt API, listAllDevices() delivers more control over the results and it does not present the same problems. For those reasons, this commit changes all the occurences of listDevices() to use listAllDevices() instead. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index 39f45d8..553ad7c 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import grp +import libvirt import os import time import platform @@ -277,31 +278,45 @@ class PartitionModel(object): class DevicesModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] + self.cap_map = \ + {'fc_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_FC_HOST, + 'net': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_NET, + 'pci': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_PCI_DEV, + 'scsi': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI, + 'scsi_host': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_SCSI_HOST, + 'storage': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_STORAGE, + 'usb_device': libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_DEV, + 'usb': + libvirt.VIR_CONNECT_LIST_NODE_DEVICES_CAP_USB_INTERFACE} def get_list(self, _cap=None): + if _cap == 'fc_host': + return self._get_devices_fc_host() + return self._get_devices_with_capability(_cap) + + def _get_devices_with_capability(self, cap): conn = self.conn.get() - if _cap is None: - dev_names = [name.name() for name in conn.listAllDevices(0)] - elif _cap == 'fc_host': - dev_names = self._get_devices_fc_host() + if cap is None: + cap_flag = 0 else: - # Get devices with required capability - dev_names = conn.listDevices(_cap, 0) - return dev_names + cap_flag = self.cap_map.get(cap) + if cap_flag is None: + return [] + return [name.name() for name in conn.listAllDevices(cap_flag)] def _get_devices_fc_host(self): conn = self.conn.get() # Libvirt < 1.0.5 does not support fc_host capability if not CapabilitiesModel().fc_host_support: ret = [] - scsi_hosts = conn.listDevices('scsi_host', 0) + scsi_hosts = self._get_devices_with_capability('scsi_host') for host in scsi_hosts: xml = conn.nodeDeviceLookupByName(host).XMLDesc(0) path = '/device/capability/capability/@type' if 'fc_host' in xmlutils.xpath_get_text(xml, path): ret.append(host) return ret - return conn.listDevices('fc_host', 0) + return self._get_devices_with_capability('fc_host') class DeviceModel(object): -- 1.8.3.1

3 2

[PATCH] bug fix: Auto-generate guest console password when the passed value is an empty string
by Aline Manera 01 Sep '14

01 Sep '14

As the password will be an empty string we need to check if its value is not None, otherwise the password will not be generated. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/model/vms.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index e91c0ed..d8a02cd 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -312,7 +312,7 @@ class VMModel(object): return xml password = params['graphics'].get("passwd") - if password and len(password.strip()) == 0: + if password is not None and len(password.strip()) == 0: password = "".join(random.sample(string.ascii_letters + string.digits, 8)) -- 1.9.3

2 2

[V3] UI: List iSCSI Servers & Targets
by huoyuxin＠linux.vnet.ibm.com 01 Sep '14

01 Sep '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 31 ++++++++++- ui/js/src/kimchi.api.js | 20 +++++++- ui/js/src/kimchi.storagepool_add_main.js | 88 ++++++++++++++++++++++++++++++ ui/pages/storagepool-add.html.tmpl | 12 +++- 4 files changed, 146 insertions(+), 5 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..ab92de2 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -315,7 +315,7 @@ } .hide-content { - display: none; + display: none!important; } .volumeslist { @@ -593,3 +593,32 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +#iscsiportId, .storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + padding: 3px 3px 3px 10px; + height: 30px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +#iSCSIServer input { + width: 410px; +} + +#iscsiportId { + width: 60px; +} + +#iSCSITarget input { + width: 493px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..b657aeb 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -774,7 +774,9 @@ var kimchi = { contentType : 'application/json', dataType : 'json', success : suc, - error : err + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } }); }, @@ -1098,5 +1100,21 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = encodeURIComponent(port); + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi&_server_port='+port, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..dc1b1c6 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,90 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + input.on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + options.children().removeClass("active"); + input.val($(this).text()); + $(this).addClass("active"); + filter(options, ""); + }); + }); +}; + +kimchi.setupISCSI = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").attr("placeholder", "loading targets..."); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").attr("placeholder", "no targets is got, please input one."); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<li>"+data[i].target+"</li>"); + $(".option", "#iSCSITarget").append(itemNode); + } + $('input', "#iSCSITarget").attr("placeholder", ""); + $(".popover", "#iSCSITarget").css("display", "block"); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").trigger("focus"); + callback(); + }, function(data){ + $('input', "#iSCSITarget").attr("placeholder","failed to load targets."); + callback(); + kimchi.message.error(data.responseJSON.reason); + }); + }; + var triggerLoadTarget = function(){ + $('input', "#iSCSITarget").val(""); + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && port!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + }); + } + }; + $("#iscsiserverId").change(function(){ + triggerLoadTarget(); + }); + $("#iscsiportId").change(function(){ + triggerLoadTarget(); + }); + var initISCSIServers = function(){ + kimchi.getStorageServers("iscsi", function(data){ + for(var i=0;i<data.length;i++){ + var itemNode = $.parseHTML("<li>"+data[i].host+"</li>"); + $(".option", "#iSCSIServer").append(itemNode); + $(itemNode).click(function(){ + $("#iscsiportId").val($(this).prop("port")); + $("#iscsiserverId").val($(this).text()); + triggerLoadTarget(); + }).prop("port", data[i].port); + } + kimchi.storageFilterSelect('iSCSIServer', false); + }); + }; + initISCSIServers(); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -160,6 +244,10 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }); + kimchi.setupISCSI(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..6f1861b 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -111,7 +111,10 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSIServer"> + <input id="iscsiserverId" type="text" placeholder="$_("Server")"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> @@ -119,7 +122,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select popable" id="iSCSITarget"> + <input id="iscsiTargetId" type="text"> + <div class="popover"><ul class="option select-list"></ul></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

3 2

[PATCH 0/9] i18n support: Addition of new languages.
by Paulo Vital 29 Aug '14

29 Aug '14

This patch set adds new languages to improve Kimchi's i18n support. The new languages are: German (de_DE), Spanish (es_ES), Franch (fr_FR), Italian (it_IT), Japanese (ja_JP), Korean (ko_KR), Russian (ru_RU) and the Traditional Chinese (zh_TW). Also, the patch set removed the symbolic link of plugins/sample/po/LINGUAS to be a 'real' file containing only the three first languages in the sample plugin. Paulo Vital (9): i18n support: Changed the file type of plugins/sample/po/LINGUAS i18n support: Add German translation files. i18n support: Add Spanish translation files. i18n support: Add French translation files. i18n support: Add Italian translation files. i18n support: Add Japanese translation files. 18n support: Add Korean translation files. i18n support: Add Russian translation files. i18n support: Add Traditional Chinese translation files. plugins/sample/po/LINGUAS | 4 +- po/LINGUAS | 8 + po/de_DE.po | 2256 ++++++++++++++++++++++++++++++++++++++++++++ po/es_ES.po | 2281 ++++++++++++++++++++++++++++++++++++++++++++ po/fr_FR.po | 2285 +++++++++++++++++++++++++++++++++++++++++++++ po/it_IT.po | 2248 ++++++++++++++++++++++++++++++++++++++++++++ po/ja_JP.po | 2229 +++++++++++++++++++++++++++++++++++++++++++ po/ko_KR.po | 2137 ++++++++++++++++++++++++++++++++++++++++++ po/ru_RU.po | 2140 ++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 2105 +++++++++++++++++++++++++++++++++++++++++ 10 files changed, 17692 insertions(+), 1 deletion(-) mode change 120000 => 100644 plugins/sample/po/LINGUAS create mode 100644 po/de_DE.po create mode 100644 po/es_ES.po create mode 100644 po/fr_FR.po create mode 100644 po/it_IT.po create mode 100644 po/ja_JP.po create mode 100644 po/ko_KR.po create mode 100644 po/ru_RU.po create mode 100644 po/zh_TW.po -- 1.9.3

2 11

[PATCH] Centralize graphics information
by Aline Manera 29 Aug '14

29 Aug '14

Recently the ticket information was added to the vm to report the graphics password and its expiration time. That way, graphics information was found in 2 different data structuce: some information under "graphics" and other ones under "ticket". { "graphics":{ "type":"vnc", "port":null, "listen":"127.0.0.1" }, "ticket":{ "passwd":null, "expire":null }, "name":"Ubuntu14.04", "uuid":"8522d82d-d51b-436f-88ff-aff1fed27613", "access":"full", "state":"shutoff", "memory":1024 ... } As "ticket" data structure only contains graphics information it makes more sense to centralize it under "graphics" and also use the same terminology used by libvirt (passwd and passwdValidTo) "graphics":{ "type":"vnc", "port":null, "listen":"127.0.0.1" "passwd":null, "passwdValidTo":null }, Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/API.md | 14 +++--- src/kimchi/API.json | 12 ++--- src/kimchi/control/vms.py | 2 +- src/kimchi/i18n.py | 4 +- src/kimchi/mockmodel.py | 38 +++++++++------- src/kimchi/model/vms.py | 112 ++++++++++++++++++++++------------------------ tests/test_mockmodel.py | 2 +- tests/test_model.py | 19 ++++---- tests/test_rest.py | 13 +++--- 9 files changed, 111 insertions(+), 105 deletions(-) diff --git a/docs/API.md b/docs/API.md index d75c55f..7d5e804 100644 --- a/docs/API.md +++ b/docs/API.md @@ -94,9 +94,8 @@ the following general conventions: * port: The real port number of the graphics, vnc or spice. Users can use this port to connect to the vm with general vnc/spice clients. - * ticket: A ticket represents credentials to access VM. - * password: the password of a ticket. - * expire: lifetime of a ticket. + * passwd: console password + * passwdValidTo: lifetime for the console password. * users: A list of system users who have permission to access the VM. Default is: empty (i.e. only root-users may access). * groups: A list of system groups whose users have permission to access @@ -110,9 +109,12 @@ the following general conventions: will take effect in next reboot) * memory: New amount of memory (MB) for this VM (if VM is running, new value will take effect in next reboot) - * ticket: A ticket represents credentials to access VM. - * password *(optional)*: the password of a ticket. - * expire *(optional)*: lifetime of a ticket. + * graphics: A dict to show detail of VM graphics. + * passwd *(optional)*: console password. When omitted a random password + willbe generated. + * passwdValidTo *(optional)*: lifetime for the console password. When + omitted the password will be valid just + for 30 seconds. * **POST**: *See Virtual Machine Actions* diff --git a/src/kimchi/API.json b/src/kimchi/API.json index c3fc5e3..67612f2 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -235,17 +235,17 @@ "error": "KCHVM0026E" } }, - "ticket": { - "description": "A ticket represents credentials to access VM", + "graphics": { + "description": "Graphics information from guest", "type": "object", "properties": { - "password": { - "description": "the password of a ticket.", + "passwd": { + "description": "New graphics password.", "type": "string", "error": "KCHVM0031E" }, - "size": { - "description": "lifetime of a ticket.", + "passwdValidTo": { + "description": "Life time for the graphics password.", "type": "number", "error": "KCHVM0032E" } diff --git a/src/kimchi/control/vms.py b/src/kimchi/control/vms.py index 6632e52..88d8a81 100644 --- a/src/kimchi/control/vms.py +++ b/src/kimchi/control/vms.py @@ -36,7 +36,7 @@ class VM(Resource): super(VM, self).__init__(model, ident) self.role_key = 'guests' self.update_params = ["name", "users", "groups", "cpus", "memory", - "ticket"] + "graphics"] self.screenshot = VMScreenShot(model, ident) self.uri_fmt = '/vms/%s' for ident, node in sub_nodes.items(): diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..c276b38 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -94,8 +94,8 @@ messages = { "KCHVM0028E": _("Group(s) '%(groups)s' do not exist"), "KCHVM0029E": _("Unable to shutdown virtual machine %(name)s. Details: %(err)s"), "KCHVM0030E": _("Unable to get access metadata of virtual machine %(name)s. Details: %(err)s"), - "KCHVM0031E": _("password of a vm ticket must be a string."), - "KCHVM0032E": _("expire of a vm ticket must be a number."), + "KCHVM0031E": _("The guest console password must be a string."), + "KCHVM0032E": _("The life time for the guest console password must be a number."), "KCHVMIF0001E": _("Interface %(iface)s does not exist in virtual machine %(name)s"), "KCHVMIF0002E": _("Network %(network)s specified for virtual machine %(name)s does not exist"), diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index fc474de..1322def 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -91,15 +91,6 @@ class MockModel(object): def _static_vm_update(self, dom, params): state = dom.info['state'] - if 'ticket' in params: - ticket = params.pop('ticket') - passwd = ticket.get('passwd') - dom.ticket["passwd"] = passwd if passwd is not None else "".join( - random.sample(string.ascii_letters + string.digits, 8)) - expire = ticket.get('expire') - dom.ticket["ValidTo"] = expire if expire is None else round( - time.time()) + expire - for key, val in params.items(): if key == 'name': if state == 'running' or params['name'] in self.vms_get_list(): @@ -126,7 +117,21 @@ class MockModel(object): dom.info[key] = val def _live_vm_update(self, dom, params): - pass + if 'graphics' not in params: + return + + graphics = params.pop('graphics') + passwd = graphics.get('passwd') + if passwd is None: + passwd = "".join(random.sample(string.ascii_letters + + string.digits, 8)) + + expire = graphics.get('passwdValidTo') + if expire is not None: + expire = round(time.time()) + expire + + dom.info['graphics']["passwd"] = passwd + dom.info['graphics']["passwdValidTo"] = expire def vm_update(self, name, params): dom = self._get_vm(name) @@ -141,10 +146,11 @@ class MockModel(object): vm.info['screenshot'] = self.vmscreenshot_lookup(name) else: vm.info['screenshot'] = None - vm.info['ticket'] = {"passwd": vm.ticket["passwd"]} - validTo = vm.ticket["ValidTo"] - vm.info['ticket']["expire"] = (validTo - round(time.time()) - if validTo is not None else None) + + validTo = vm.info['graphics']['passwdValidTo'] + validTo = (validTo - round(time.time()) if validTo is not None + else None) + vm.info['graphics']['passwdValidTo'] = validTo return vm.info def vm_delete(self, name): @@ -1050,7 +1056,6 @@ class MockVM(object): self.networks = template_info['networks'] ifaces = [MockVMIface(net) for net in self.networks] self.storagedevices = {} - self.ticket = {"passwd": "123456", "ValidTo": None} self.ifaces = dict([(iface.info['mac'], iface) for iface in ifaces]) stats = {'cpu_utilization': 20, @@ -1066,7 +1071,8 @@ class MockVM(object): 'cpus': self.cpus, 'icon': None, 'graphics': {'type': 'vnc', 'listen': '127.0.0.1', - 'port': None}, + 'port': None, 'passwd': '123456', + 'passwdValidTo': None}, 'users': ['user1', 'user2', 'root'], 'groups': ['group1', 'group2', 'admin'], 'access': 'full' diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 476e4ac..0a05b76 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -251,12 +251,6 @@ class VMModel(object): self.groups = import_class('kimchi.model.host.GroupsModel')(**kargs) def update(self, name, params): - if 'ticket' in params: - password = params['ticket'].get("passwd") - password = password if password is not None else "".join( - random.sample(string.ascii_letters + string.digits, 8)) - params['ticket']['passwd'] = password - dom = self.get_vm(name, self.conn) dom = self._static_vm_update(dom, params) self._live_vm_update(dom, params) @@ -315,14 +309,15 @@ class VMModel(object): os_elem = E.os({"distro": distro, "version": version}) set_metadata_node(dom, os_elem) - def _set_ticket(self, xml, params, flag=0): + def _set_graphics_passwd(self, xml, params, flag=0): DEFAULT_VALID_TO = 30 password = params.get("passwd") - expire = params.get("expire") + expire = params.get("passwdValidTo") root = objectify.fromstring(xml) graphic = root.devices.find("graphics") if graphic is None: return None + graphic.attrib['passwd'] = password to = graphic.attrib.get('passwdValidTo') if to is not None: @@ -337,27 +332,27 @@ class VMModel(object): return root if flag == 0 else graphic - def _set_persistent_ticket(self, dom, xml, params): - if 'ticket' not in params: - # store the password for copy - ticket = self._get_ticket(dom) - if ticket['passwd'] is None: - return xml - else: - params['ticket'] = ticket - node = self._set_ticket(xml, params['ticket']) - return xml if node is None else ET.tostring(node, encoding="utf-8") + def _update_graphics(self, dom, xml, params): + if 'graphics' not in params: + return xml - def _set_live_ticket(self, dom, params): - if 'ticket' not in params: - return - if dom.isActive(): - xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) - flag = libvirt.VIR_DOMAIN_XML_SECURE - node = self._set_ticket(xml, params['ticket'], flag) - if node is not None: - dom.updateDeviceFlags(etree.tostring(node), - libvirt.VIR_DOMAIN_AFFECT_LIVE) + password = params['graphics'].get("passwd") + if password is None: + password = "".join(random.sample(string.ascii_letters + + string.digits, 8)) + params['graphics']['passwd'] = password + + if not dom.isActive(): + node = self._set_graphics_passwd(xml, params['graphics']) + return xml if node is None else ET.tostring(node, encoding="utf-8") + + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) + flag = libvirt.VIR_DOMAIN_XML_SECURE + node = self._set_graphics_passwd(xml, params['graphics'], flag) + if node is not None: + dom.updateDeviceFlags(etree.tostring(node), + libvirt.VIR_DOMAIN_AFFECT_LIVE) + return xml def _static_vm_update(self, dom, params): state = DOM_STATE_MAP[dom.info()[0]] @@ -374,7 +369,7 @@ class VMModel(object): xpath = VM_STATIC_UPDATE_PARAMS[key] new_xml = xmlutils.xml_item_update(new_xml, xpath, val) - new_xml = self._set_persistent_ticket(dom, new_xml, params) + new_xml = self._update_graphics(dom, new_xml, params) conn = self.conn.get() try: @@ -397,35 +392,19 @@ class VMModel(object): def _live_vm_update(self, dom, params): self._vm_update_access_metadata(dom, params) - self._set_live_ticket(dom, params) def _has_video(self, dom): dom = ElementTree.fromstring(dom.XMLDesc(0)) return dom.find('devices/video') is not None - def _get_ticket(self, dom): - xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) - root = objectify.fromstring(xml) - graphic = root.devices.find("graphics") - if graphic is None: - return {"passwd": None, "expire": None} - passwd = graphic.attrib.get('passwd') - ticket = {"passwd": passwd} - valid_to = graphic.attrib.get('passwdValidTo') - ticket['expire'] = None - if valid_to is not None: - to = time.mktime(time.strptime(valid_to, '%Y-%m-%dT%H:%M:%S')) - ticket['expire'] = to - time.mktime(time.gmtime()) - - return ticket - def lookup(self, name): dom = self.get_vm(name, self.conn) info = dom.info() state = DOM_STATE_MAP[info[0]] screenshot = None + # (type, listen, port, passwd, passwdValidTo) graphics = self._vm_get_graphics(name) - graphics_type, graphics_listen, graphics_port = graphics + graphics_port = graphics[2] graphics_port = graphics_port if state == 'running' else None try: if state == 'running' and self._has_video(dom): @@ -465,10 +444,12 @@ class VMModel(object): 'cpus': info[3], 'screenshot': screenshot, 'icon': icon, - 'graphics': {"type": graphics_type, - "listen": graphics_listen, - "port": graphics_port}, - 'ticket': self._get_ticket(dom), + # (type, listen, port, passwd, passwdValidTo) + 'graphics': {"type": graphics[0], + "listen": graphics[1], + "port": graphics_port, + "passwd": graphics[3], + "passwdValidTo": graphics[4]}, 'users': users, 'groups': groups, 'access': 'full' @@ -567,23 +548,38 @@ class VMModel(object): def _vm_get_graphics(self, name): dom = self.get_vm(name, self.conn) - xml = dom.XMLDesc(0) + xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_SECURE) + expr = "/domain/devices/graphics/@type" res = xmlutils.xpath_get_text(xml, expr) graphics_type = res[0] if res else None + expr = "/domain/devices/graphics/@listen" res = xmlutils.xpath_get_text(xml, expr) graphics_listen = res[0] if res else None - graphics_port = None + + graphics_port = graphics_passwd = graphics_passwdValidTo = None if graphics_type: - expr = "/domain/devices/graphics[@type='%s']/@port" % graphics_type - res = xmlutils.xpath_get_text(xml, expr) + expr = "/domain/devices/graphics[@type='%s']/@port" + res = xmlutils.xpath_get_text(xml, expr % graphics_type) graphics_port = int(res[0]) if res else None - return graphics_type, graphics_listen, graphics_port + + expr = "/domain/devices/graphics[@type='%s']/@passwd" + res = xmlutils.xpath_get_text(xml, expr % graphics_type) + graphics_passwd = res[0] if res else None + + expr = "/domain/devices/graphics[@type='%s']/@passwdValidTo" + res = xmlutils.xpath_get_text(xml, expr % graphics_type) + if res: + to = time.mktime(time.strptime(res[0], '%Y-%m-%dT%H:%M:%S')) + graphics_passwdValidTo = to - time.mktime(time.gmtime()) + + return (graphics_type, graphics_listen, graphics_port, + graphics_passwd, graphics_passwdValidTo) def connect(self, name): - graphics = self._vm_get_graphics(name) - graphics_type, graphics_listen, graphics_port = graphics + # (type, listen, port, passwd, passwdValidTo) + graphics_port = self._vm_get_graphics(name)[2] if graphics_port is not None: vnc.add_proxy_token(name, graphics_port) else: diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index b7e6a48..8de7ce9 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -143,7 +143,7 @@ class MockModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpus', 'screenshot', 'icon', 'graphics', 'users', 'groups', - 'access', 'ticket')) + 'access')) stats_keys = set(('cpu_utilization', 'net_throughput', 'net_throughput_peak', diff --git a/tests/test_model.py b/tests/test_model.py index f5b13d0..5090395 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -65,7 +65,7 @@ class ModelTests(unittest.TestCase): keys = set(('name', 'state', 'stats', 'uuid', 'memory', 'cpus', 'screenshot', 'icon', 'graphics', 'users', 'groups', - 'access', 'ticket')) + 'access')) stats_keys = set(('cpu_utilization', 'net_throughput', 'net_throughput_peak', @@ -764,24 +764,25 @@ class ModelTests(unittest.TestCase): vms = inst.vms_get_list() self.assertTrue('kimchi-vm1' in vms) - # update vm ticket when vm is not running + # update vm graphics when vm is not running inst.vm_update(u'kimchi-vm1', - {"ticket": {"passwd": "123456"}}) + {"graphics": {"passwd": "123456"}}) inst.vm_start('kimchi-vm1') rollback.prependDefer(self._rollback_wrapper, inst.vm_poweroff, 'kimchi-vm1') vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('123456', vm_info['ticket']["passwd"]) - self.assertEquals(None, vm_info['ticket']["expire"]) + self.assertEquals('123456', vm_info['graphics']["passwd"]) + self.assertEquals(None, vm_info['graphics']["passwdValidTo"]) - # update vm ticket when vm is running + # update vm graphics when vm is running inst.vm_update(u'kimchi-vm1', - {"ticket": {"passwd": "abcdef", "expire": 20}}) + {"graphics": {"passwd": "abcdef", + "passwdValidTo": 20}}) vm_info = inst.vm_lookup(u'kimchi-vm1') - self.assertEquals('abcdef', vm_info['ticket']["passwd"]) - self.assertGreaterEqual(20, vm_info['ticket']['expire']) + self.assertEquals('abcdef', vm_info['graphics']["passwd"]) + self.assertGreaterEqual(20, vm_info['graphics']['passwdValidTo']) info = inst.vm_lookup('kimchi-vm1') self.assertEquals('running', info['state']) diff --git a/tests/test_rest.py b/tests/test_rest.py index 2117399..0bf5997 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -221,20 +221,21 @@ class RestTests(unittest.TestCase): resp = self.request('/vms/vm-1', req, 'PUT') self.assertEquals(200, resp.status) - req = json.dumps({"ticket": {'passwd': "abcdef"}}) + req = json.dumps({"graphics": {'passwd': "abcdef"}}) resp = self.request('/vms/vm-1', req, 'PUT') info = json.loads(resp.read()) - self.assertEquals('abcdef', info["ticket"]["passwd"]) - self.assertEquals(None, info["ticket"]["expire"]) + self.assertEquals('abcdef', info["graphics"]["passwd"]) + self.assertEquals(None, info["graphics"]["passwdValidTo"]) resp = self.request('/vms/vm-1/poweroff', '{}', 'POST') self.assertEquals(200, resp.status) - req = json.dumps({"ticket": {'passwd': "123456", "expire": 20}}) + req = json.dumps({"graphics": {'passwd': "123456", + 'passwdValidTo': 20}}) resp = self.request('/vms/vm-1', req, 'PUT') info = json.loads(resp.read()) - self.assertEquals('123456', info["ticket"]["passwd"]) - self.assertGreaterEqual(20, info["ticket"]["expire"]) + self.assertEquals('123456', info["graphics"]["passwd"]) + self.assertGreaterEqual(20, info["graphics"]["passwdValidTo"]) req = json.dumps({'name': 12}) resp = self.request('/vms/vm-1', req, 'PUT') -- 1.9.3

2 3

Support async task query classification
by Royce Lv 29 Aug '14

29 Aug '14

Problems to solve: When we generate the debug reports (or upload/download a storage volume), only the request initiator gets task id, and is able to query task status. We need other users from other browser to have same view as the initiator, which is not possible now. Solution: 1. We add async event information, events will also be classified so that users can subscribe events interest them 2. We enable reverse mapping (task to resource which generate them) query for users. So that user can find tasks related to a collection: GET /tasks?init_collection=debugreports after take a look at current implementation, we can also query taget_uri GET /tasks?target_uri=r(^/debugreports/*) (need to be encoded) Since we currently out of support of async events, we may want to add task query for this purpose. Welcome comments!

2 1

[PATCH] i18n support: Add new languages in login page.
by Paulo Vital 29 Aug '14

29 Aug '14

Adding the 'Deutsch (Deutschland)' German, 'Español (España)' Spanish, 'Français (France)' French, 'Italiano (Italia)' Italian, '日本語 (日本)' Japanese, '한국어 (대한민국)' Korean, 'Русский (Россия)' Russian and '中文（繁體）' Traditional Chinese languages as options in the login page to be selected before use Kimchi. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.lang.js | 10 +++++++++- ui/pages/login.html.tmpl | 8 ++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.lang.js b/ui/js/src/kimchi.lang.js index da55307..1d2de4e 100644 --- a/ui/js/src/kimchi.lang.js +++ b/ui/js/src/kimchi.lang.js @@ -20,7 +20,15 @@ kimchi.lang = { return { 'en_US': 'English (US)', 'zh_CN': '中文（简体）', - 'pt_BR': 'Português (Brasil)' + 'pt_BR': 'Português (Brasil)', + 'de_DE': 'Deutsch (Deutschland)', + 'es_ES': 'Español (España)', + 'fr_FR': 'Français (France)', + 'it_IT': 'Italiano (Italia)', + 'ja_JP': '日本語 (日本)', + 'ko_KR': '한국어 (대한민국)', + 'ru_RU': 'Русский (Россия)', + 'zh_TW': '中文（繁體）' }; }, diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 7d61a6a..d4d5b7e 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -65,6 +65,14 @@ <option value="en_US">English (US)</option> <option value="zh_CN">中文（简体）</option> <option value="pt_BR">Português (Brasil)</option> + <option value="de_DE">Deutsch (Deutschland)</option> + <option value="es_ES">Español (España)</option> + <option value="fr_FR">Français (France)</option> + <option value="it_IT">Italiano (Italia)</option> + <option value="ja_JP">日本語 (日本)</option> + <option value="ko_KR">한국어 (대한민국)</option> + <option value="ru_RU">Русский (Россия)</option> + <option value="zh_TW">中文（繁體）</option> </select> </div> <div id="login-window" class="login-area"> -- 1.9.3

2 1

[PATCH 0/2 V2] Centralize graphics information
by Aline Manera 29 Aug '14

29 Aug '14

V1 -> V2: - Allow user updates the passwd expiration time without changing the passwd Aline Manera (2): Centralize graphics information Allow user updates the passwd expiration time without changing the passwd docs/API.md | 14 +++--- src/kimchi/API.json | 12 ++--- src/kimchi/control/vms.py | 2 +- src/kimchi/i18n.py | 4 +- src/kimchi/mockmodel.py | 38 ++++++++------ src/kimchi/model/vms.py | 124 ++++++++++++++++++++-------------------------- tests/test_mockmodel.py | 2 +- tests/test_model.py | 19 +++---- tests/test_rest.py | 13 ++--- 9 files changed, 112 insertions(+), 116 deletions(-) -- 1.9.3

2 4

[PATCH] Update iSCSI volume XML when creating a VM from an iSCSI pool
by Aline Manera 29 Aug '14

29 Aug '14

When creating a VM using a iSCSI volume, the volume XML was like below: <disk type='volume' device='disk'> <driver name='qemu' type='raw'/> <source pool='TEST-ISCSI1' volume='unit:0:0:2' mode='host'/> <target dev='vda' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x05' function='0x0'/> </disk> But to attach a new iSCSI volume, the XML is: <disk type='block' device='disk'> <driver name='qemu' type='raw'/> <source dev='/dev/disk/by-id/wwn-0x60000000000000000e00000000010001'/> <target dev='vdb' bus='virtio'/> <address type='pci' domain='0x0000' bus='0x00' slot='0x07' function='0x0'/> </disk> We should keep the same XML structure in both cases to avoid problems while listing the storage volumes and getting their information. To solve that, this patch uses the latter XML also while creating a VM from a iSCSI volume. It eliminates the needs to have the authentication setting in the volume, because that the _get_storage_auth() function was replaced by _get_volume_path() Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 3 +++ src/kimchi/model/templates.py | 15 ++++++--------- src/kimchi/model/vms.py | 6 +----- src/kimchi/vmtemplate.py | 16 +++++----------- 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index fc474de..1bd54cc 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -997,6 +997,9 @@ class MockVMTemplate(VMTemplate): pool = self._storage_validate() return pool.info['path'] + def _get_volume_path(self, pool, vol): + return self.model.storagevolume_lookup(pool, vol)['path'] + def fork_vm_storage(self, vm_name): pool = self._storage_validate() volumes = self.to_volume_list(vm_name) diff --git a/src/kimchi/model/templates.py b/src/kimchi/model/templates.py index bf04304..9278cdc 100644 --- a/src/kimchi/model/templates.py +++ b/src/kimchi/model/templates.py @@ -29,7 +29,6 @@ from kimchi.kvmusertests import UserTests from kimchi.utils import pool_name_from_uri from kimchi.utils import probe_file_permission_as_user from kimchi.vmtemplate import VMTemplate -from lxml import objectify class TemplatesModel(object): @@ -243,15 +242,13 @@ class LibvirtVMTemplate(VMTemplate): xml = pool.XMLDesc(0) return xmlutils.xpath_get_text(xml, "/pool/@type")[0] - def _get_storage_auth(self): + def _get_volume_path(self, pool, vol): pool = self._storage_validate() - xml = pool.XMLDesc(0) - root = objectify.fromstring(xml) - auth = root.source.find("auth") - if auth is None: - return auth - au = auth.attrib - return au.update(auth.secret.attrib) + try: + return pool.storageVolLookupByName(vol).path() + except: + raise NotFoundError("KCHVOL0002E", {'name': vol, + 'pool': pool}) def fork_vm_storage(self, vm_uuid): # Provision storage: diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 5721b48..4787840 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -203,11 +203,7 @@ class VMsModel(object): # If storagepool is SCSI, volumes will be LUNs and must be passed by # the user from UI or manually. vol_list = [] - if t._get_storage_type() in ["iscsi", "scsi"]: - # FIXME: iscsi and scsi storage work with base image needs to be - # fixed. - vol_list = [] - else: + if t._get_storage_type() not in ["iscsi", "scsi"]: vol_list = t.fork_vm_storage(vm_uuid) graphics = params.get('graphics') diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index ddb1f35..c5bb7b3 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -251,25 +251,19 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> def _get_iscsi_disks_xml(self): def build_disk_xml(children=[]): - disk = E.disk(type='volume', device='disk') + disk = E.disk(type='block', device='disk') disk.extend(children) return etree.tostring(disk) ret = "" children = [] - auth = self._get_storage_auth() - if auth: - etree_auth = E.auth(username=auth['username']) - etree_auth.append(E.secret(type=auth['type'], - usage=auth['libvirtiscsi'])) - children.append(etree_auth) children.append(E.driver(name='qemu', type='raw')) disk_bus = self.info['disk_bus'] dev_prefix = self._bus_to_dev[disk_bus] pool_name = pool_name_from_uri(self.info['storagepool']) for i, d in enumerate(self.info['disks']): - source = E.source(pool=pool_name, - volume=d.get('volume'), mode='host') + source = E.source(dev=self._get_volume_path(pool_name, + d.get('volume'))) # FIXME if more than 26 disks target = E.target(dev=dev_prefix + string.lowercase[i], bus=disk_bus) @@ -455,8 +449,8 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> def _get_storage_type(self): return '' - def _get_storage_auth(self): - return None + def _get_volume_path(self): + return '' def _get_all_networks_name(self): return [] -- 1.9.3

2 2

[PATCH V2 0/9] i18n support: Addition of new languages.
by Paulo Vital 29 Aug '14

29 Aug '14

V1 -> V2: * fixed wrong python variables in translated strings * removed string without msgid V1: This patch set adds new languages to improve Kimchi's i18n support. The new languages are: German (de_DE), Spanish (es_ES), Franch (fr_FR), Italian (it_IT), Japanese (ja_JP), Korean (ko_KR), Russian (ru_RU) and the Traditional Chinese (zh_TW). Also, the patch set removed the symbolic link of plugins/sample/po/LINGUAS to be a 'real' file containing only the three first languages in the sample plugin. Paulo Vital (9): i18n support: Changed the file type of plugins/sample/po/LINGUAS i18n support: Add German translation files. i18n support: Add Spanish translation files. i18n support: Add French translation files. i18n support: Add Italian translation files. i18n support: Add Japanese translation files. 18n support: Add Korean translation files. i18n support: Add Russian translation files. i18n support: Add Traditional Chinese translation files. plugins/sample/po/LINGUAS | 4 +- po/LINGUAS | 8 + po/de_DE.po | 2256 ++++++++++++++++++++++++++++++++++++++++++++ po/es_ES.po | 2281 ++++++++++++++++++++++++++++++++++++++++++++ po/fr_FR.po | 2285 +++++++++++++++++++++++++++++++++++++++++++++ po/it_IT.po | 2248 ++++++++++++++++++++++++++++++++++++++++++++ po/ja_JP.po | 2227 +++++++++++++++++++++++++++++++++++++++++++ po/ko_KR.po | 2137 ++++++++++++++++++++++++++++++++++++++++++ po/ru_RU.po | 2138 ++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 2054 ++++++++++++++++++++++++++++++++++++++++ 10 files changed, 17637 insertions(+), 1 deletion(-) mode change 120000 => 100644 plugins/sample/po/LINGUAS create mode 100644 po/de_DE.po create mode 100644 po/es_ES.po create mode 100644 po/fr_FR.po create mode 100644 po/it_IT.po create mode 100644 po/ja_JP.po create mode 100644 po/ko_KR.po create mode 100644 po/ru_RU.po create mode 100644 po/zh_TW.po -- 1.9.3

3 12

[PATCH] Fix duplicated message string in en_US.po file.
by Paulo Vital 28 Aug '14

28 Aug '14

The en_US.po file has the same message string to two different message ID's. The two message ID's are used in different situations and linked to different messages codes in i18n.pu file. Changed to use the same content of msgid in msgstr. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- po/en_US.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index ef4b127..1cef680 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -856,8 +856,8 @@ msgid "" "Only one of path or pool/volume can be specified to add a new virtual " "machine disk" msgstr "" -"Specify type and path or type and pool/volume to add a new virtual machine " -"disk" +"Only one of path or pool/volume can be specified to add a new virtual " +"machine disk" msgid "YUM Repository ID must be one word only string." msgstr "YUM Repository ID must be one word only string." -- 1.9.3

3 2

[V2] UI: List iSCSI Servers & Targets
by huoyuxin＠linux.vnet.ibm.com 28 Aug '14

28 Aug '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 69 +++++++++++++++++++++- ui/js/src/kimchi.api.js | 30 ++++++++++ ui/js/src/kimchi.storagepool_add_main.js | 94 ++++++++++++++++++++++++++++++ ui/pages/storagepool-add.html.tmpl | 12 +++- 4 files changed, 201 insertions(+), 4 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..1b71d82 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -315,7 +315,7 @@ } .hide-content { - display: none; + display: none!important; } .volumeslist { @@ -593,3 +593,70 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +#iscsiportId, .storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + padding: 3px 3px 3px 10px; + height: 30px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +.storage-admin .filter-select .arrow { + display: inline-block; + vertical-align: middle; + position: relative; + left: -25px; +} + +.storage-admin .filter-select .option { + border-style: solid; + border-color: #CCCCCC; + border-width: 0px 1px 1px 1px; + border-radius: 1px; + font-size: 14px; + background-color: white; + max-height: 140px; + overflow: auto; + color: #666666; + position: absolute; + z-index: 1000; +} + +.storage-admin .filter-select .option .item { + padding: 5px 10px; + cursor: pointer; +} + +.storage-admin .filter-select .option .item:hover { + background-color: #DDDDDD; +} + +#iSCSIServer input { + width: 410px; +} + +#iSCSIServer .option { + width: 423px; +} + +#iscsiportId { + width: 60px; +} + +#iSCSITarget input { + width: 493px; +} + +#iSCSITarget .option { + width: 506px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..9de1b08 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,35 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSIServers : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'storageservers?_target_type=iscsi', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = encodeURIComponent(port); + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi&_server_port='+port, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..affb714 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,96 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + $('.arrow', '#'+id).toggleClass("hide-content", options.children().length==0); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + $('.arrow', '#'+id).click(function(){ + options.toggleClass("hide-content"); + }); + input.focus(function(){ + options.removeClass("hide-content"); + }).on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + input.val($(this).text()); + $('.option', '#'+id).addClass("hide-content"); + filter(options, ""); + }); + }); +}; + +kimchi.setupISCSI = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").attr("placeholder", "loading targets..."); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").attr("placeholder", "no targets is got, please input one."); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<div class='item'>"+data[i].target+"</div>"); + $(".option", "#iSCSITarget").append(itemNode); + } + $('input', "#iSCSITarget").attr("placeholder", ""); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").trigger("focus"); + callback(); + }, function(data){ + $('input', "#iSCSITarget").attr("placeholder","failed to load targets."); + callback(); + kimchi.message.error(data.responseJSON.reason); + }); + }; + var triggerLoadTarget = function(){ + $('input', "#iSCSITarget").val(""); + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && port!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + $('.arrow', '#iSCSIServer').addClass("hide-content"); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + $('.arrow', '#iSCSIServer').removeClass("hide-content"); + }); + } + }; + $("#iscsiserverId").change(function(){ + triggerLoadTarget(); + }); + $("#iscsiportId").change(function(){ + triggerLoadTarget(); + }); + var initISCSIServers = function(){ + kimchi.getISCSIServers(function(data){ + for(var i=0;i<data.length;i++){ + var itemNode = $.parseHTML("<div class='item'>"+data[i].host+"</div>"); + $(".option", "#iSCSIServer").append(itemNode); + $(itemNode).click(function(){ + $("#iscsiportId").val($(this).prop("port")); + $("#iscsiserverId").val($(this).text()); + triggerLoadTarget(); + }).prop("port", data[i].port); + } + kimchi.storageFilterSelect('iSCSIServer', false); + }); + }; + initISCSIServers(); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -160,6 +250,10 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }); + kimchi.setupISCSI(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..6b526a7 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -111,7 +111,10 @@ <div class="field"> <p class="text-help"> $_("iSCSI server IP or hostname. It should not be empty.")</p> - <input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text storage-base-input-width"> + <span class="filter-select" id="iSCSIServer"> + <div><input id="iscsiserverId" type="text" placeholder="$_("Server")"><a class="ui-icon ui-icon-triangle-1-s arrow hide-content"></a></div> + <div class="option hide-content"></div> + </span> <input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"> </div> </section> @@ -119,7 +122,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select" id="iSCSITarget"> + <div><input id="iscsiTargetId" type="text"><a class="ui-icon ui-icon-triangle-1-s arrow hide-content"></a></div> + <div class="option hide-content"></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

2 1

[PATCH V2 0/4] Power (ppc) support patches
by Paulo Vital 28 Aug '14

28 Aug '14

v1 -> v2: * Re-wrote commit message for patch 2/5 (now 2/4) with 80 characters/line * Joined patches 3/5 and 4/5 in only one (now 3/4) about sosreport support V1: This patch set enables Power(ppc) support by default on Kimchi. Whithout them, the upstream code of Kimchi is not fully compatible with the Power architecture. Eli Qiao (1): Support tablet type as input device in VM's XML. Mark Wu (1): Add sos plugin for kimchi Paulo Vital (2): PowerKVM: Workaround of numpy byte order bug on PowerPC Add PowerKVM information as ISO otpion to installation. contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 5 +++-- src/kimchi/sos.py | 37 +++++++++++++++++++++++++++++++++++++ src/kimchi/vmtemplate.py | 5 +++++ src/kimchi/websocket.py | 7 +++++-- 7 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 src/kimchi/sos.py -- 1.9.3

3 10

[PATCH V3] Add sos plugin for kimchi
by Paulo Vital 28 Aug '14

28 Aug '14

From: Mark Wu <wudxw(a)linux.vnet.ibm.com> This patches adds a sos plugin to collect kimchi's configuration, log files and other information for diagnosis. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com> Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- Makefile.am | 1 + contrib/kimchi.spec.fedora.in | 3 +++ src/kimchi/Makefile.am | 4 +++- src/kimchi/sos.py | 43 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/sos.py diff --git a/Makefile.am b/Makefile.am index 3293d9e..8776760 100644 --- a/Makefile.am +++ b/Makefile.am @@ -69,6 +69,7 @@ PEP8_WHITELIST = \ src/kimchi/root.py \ src/kimchi/scan.py \ src/kimchi/server.py \ + src/kimchi/sos.py \ src/kimchi/swupdate.py \ src/kimchi/template.py \ src/kimchi/utils.py \ diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 5766784..78dd423 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -78,6 +78,8 @@ make %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install +install -Dm 0644 src/kimchi/sos.py \ + %{buildroot}/%{python_sitelib}/sos/plugins/kimchi.py %if 0%{?with_systemd} # Install the systemd scripts @@ -158,6 +160,7 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/kimchi/model/*.py* %{python_sitelib}/kimchi/API.json %{python_sitelib}/kimchi/plugins/*.py* +%{python_sitelib}/sos/plugins/kimchi.py* %{_datadir}/kimchi/doc/API.md %{_datadir}/kimchi/doc/README.md %{_datadir}/kimchi/doc/kimchi-guest.png diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index e2b5bea..a405782 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -19,10 +19,12 @@ SUBDIRS = control model -kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py)) +kimchi_PYTHON = $(filter-out config.py sos.py, $(wildcard *.py)) nodist_kimchi_PYTHON = config.py +dist_noinst_PYTHON = sos.py + EXTRA_DIST = \ API.json \ config.py.in diff --git a/src/kimchi/sos.py b/src/kimchi/sos.py new file mode 100644 index 0000000..5d1fa3f --- /dev/null +++ b/src/kimchi/sos.py @@ -0,0 +1,43 @@ +# +# Project Kimchi +# +# Copyright IBM, Corp. 2014 +# +# 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 + +from sos.plugins import Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin +from sos.utilities import sos_get_command_output + + +class Kimchi(Plugin, RedHatPlugin, UbuntuPlugin, DebianPlugin): + """ + kimchi-related information + """ + + plugin_name = 'kimchi' + + def setup(self): + self.add_copy_specs([ + "/etc/kimchi/", + "/var/log/kimchi*" + ]) + self.add_cmd_output("virsh pool-list --details") + rc, out, _ = sos_get_command_output('virsh pool-list') + if rc == 0: + for pool in out.splitlines()[2:]: + if pool: + pool_name = pool.split()[0] + self.add_cmd_output("virsh vol-list --pool %s --details" + % pool_name) -- 1.9.3

2 1

[PATCH] Fix guest disk return when disk is a iscsi volume
by Rodrigo Trujillo 27 Aug '14

27 Aug '14

When a guest has an ISCSI volume attached as disk, backend is not returning path correctly, it return a blank field. This patch fixes this problem, returning the path = <iscsi pool> - <volume unit>. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/vmdisks.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/kimchi/vmdisks.py b/src/kimchi/vmdisks.py index 6012ada..6835172 100644 --- a/src/kimchi/vmdisks.py +++ b/src/kimchi/vmdisks.py @@ -53,6 +53,9 @@ def get_vm_disk(dom, dev_name): path = (source.attrib['protocol'] + '://' + host.attrib['name'] + ':' + host.attrib['port'] + source.attrib['name']) + # ISCSI, Fibre Channel + elif src_type == 'volume': + path = source.attrib['pool'] + ' - ' + source.attrib['volume'] else: path = source.attrib[DEV_TYPE_SRC_ATTR_MAP[src_type]] # Retrieve storage bus type -- 1.9.3

2 4

Kimchi on Transifex
by Aline Manera 27 Aug '14

27 Aug '14

Hi all, I recently added Kimchi translation file to Transifex. Transifex is a collaborative tool for translation. Its message is clear: "100+ languages? Only a few developers? No problem." I think that way we can support more and more languages in Kimchi once people get involved. https://www.transifex.com/organization/kimchi/dashboard Please, join the Kimchi translation team on Transifex and share it globally. :-D Regards, Aline Manera

2 1

[PATCH] UI: List Kimchi Peers
by huoyuxin＠linux.vnet.ibm.com 27 Aug '14

27 Aug '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/topbar.css | 37 ++++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 14 ++++++++++++++ ui/js/src/kimchi.main.js | 13 +++++++++++++ ui/pages/kimchi-ui.html.tmpl | 7 +++++++ 4 files changed, 70 insertions(+), 1 deletions(-) diff --git a/ui/css/theme-default/topbar.css b/ui/css/theme-default/topbar.css index bed4e19..8f2f79a 100644 --- a/ui/css/theme-default/topbar.css +++ b/ui/css/theme-default/topbar.css @@ -114,7 +114,7 @@ cursor: pointer; display: block; position: relative; - height: 48px; + height: 52px; margin: 0 12px; } @@ -174,3 +174,38 @@ a#btn-logout:hover { display: none; } } + +.peers { + color: white; + cursor: pointer; + height: 52px; + margin: 0 12px; + display: none; +} + +.peers span { + margin-top: 25px; +} + +.peers .arrow { + border: 6px solid transparent; + border-bottom: none; + border-top-color: white; + display: inline-block; + width: 0; +} + +.peers .drowdown { + top: 45px; + right: 110px; + color: black; + padding: 10px 15px; + white-space: nowrap; + line-height: 12px; + width: inherit; +} + +.peers .drowdown a { + display: block; + padding: 10px; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..8966cff 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,19 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getPeers : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'peers', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index ba54b26..ea9951b 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -20,10 +20,23 @@ kimchi.tabMode = {}; kimchi.capabilities = undefined; kimchi.getCapabilities(function(result) { kimchi.capabilities = result; + kimchi.setupPeers(); }, function() { kimchi.capabilities = {}; }); +kimchi.setupPeers = function(){ + if(kimchi.capabilities.federation=="enable"){ + kimchi.getPeers(function(data){ + if(data.length>0) + $('#peers').css("display", "block"); + for(var i=0; i<data.length; i++){ + $('.drowdown', '#peers').append("<a href='"+data[i]+"' target='_blank'>"+data[i]+"</a>"); + } + }); + } +}; + kimchi.main = function() { kimchi.popable(); diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 7bdf441..4e7b3af 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -71,6 +71,13 @@ <h1 id="logo"><img alt="Project Kimchi" src="images/theme-default/logo-white.png"></h1> <ul class="nav-top"> <li> + <div id="peers" class="peers popable"> + <span>$_("Peers")</span> + <span class="arrow"></span> + <div class="drowdown popover right-side"></div> + </div> + </li> + <li> <div id="user" class="popable"> <span id="user-icon"></span> <span id="user-name" class="empty-when-logged-off"></span> -- 1.7.1

3 6

[WIP][PATCH 0/4] Support upload volume to storagepool
by lvroyce0210＠gmail.com 27 Aug '14

27 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Note: The UI patch is just used for testing. Problem remains: 1. POST return 404 because the UI patch does not include accept json 2. task id does not returned in vol data and progress has not been added 3. Haven't tested large file, so not sure whether we need to split large file into peices and call POST multi-times. Royce Lv (3): Storage volume upload: Dispatch volume create to right handler Storage volume upload: Parse params for upload formdata Storage volume upload: add model function of upload ssdxiao (1): Support to upload ISO contrib/kimchi.spec.fedora.in | 3 + contrib/kimchi.spec.suse.in | 3 + po/en_US.po | 2 + po/pt_BR.po | 3 + po/zh_CN.po | 3 + src/kimchi/API.json | 1 - src/kimchi/control/storagepools.py | 4 +- src/kimchi/control/utils.py | 2 + src/kimchi/i18n.py | 1 + src/kimchi/model/storagevolumes.py | 34 ++ src/nginx.conf.in | 1 + ui/css/theme-default/upload.css | 43 ++ ui/js/resumable.js | 816 ++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.template_add_main.js | 27 ++ ui/pages/kimchi-ui.html.tmpl | 1 + ui/pages/template-add.html.tmpl | 13 + 16 files changed, 954 insertions(+), 3 deletions(-) create mode 100644 ui/css/theme-default/upload.css create mode 100644 ui/js/resumable.js -- 1.8.3.2

4 20

[PATCH] Change function that verifies network interface status v2
by Ramon Medeiros 26 Aug '14

26 Aug '14

The old way does just consider if the interface has connectivity, not the interface status. The new file can determine if the interface is up or down and if cable is connected or not. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/netinfo.py | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/kimchi/netinfo.py b/src/kimchi/netinfo.py index 5fd6130..2d5cf29 100644 --- a/src/kimchi/netinfo.py +++ b/src/kimchi/netinfo.py @@ -29,7 +29,7 @@ BONDING_PATH = '/sys/class/net/*/bonding' WLAN_PATH = '/sys/class/net/*/wireless' NET_BRPORT = '/sys/class/net/%s/brport' NET_MASTER = '/sys/class/net/%s/master' -NET_STATE = '/sys/class/net/%s/operstate' +NET_STATE = '/sys/class/net/%s/carrier' PROC_NET_VLAN = '/proc/net/vlan/' BONDING_SLAVES = '/sys/class/net/%s/bonding/slaves' BRIDGE_PORTS = '/sys/class/net/%s/brif' @@ -101,8 +101,18 @@ def is_bondlave(nic): def operstate(dev): - return open(NET_STATE % dev).readline().strip() + + # try to read interface status + try: + open(NET_STATE % dev).readline().strip() + + # when IOError is raised, interface is down + except IOError: + return "down" + # if value is 1, interface up with cable connected + # 0 corresponds to interface up with cable disconnected + return "up" def get_vlan_device(vlan): """ Return the device of the given VLAN. """ -- 1.8.3.1

2 1

[PATCH v2 1/3] Add persistent flag to VM info
by Christy Perez 26 Aug '14

26 Aug '14

Kimchi can manage guests not created by Kimchi. If a user creates a non-persistent domain and uses the Power Off option, it will destroy the user's domain. In order to warn users with non-persistent guests on Power Off, this patch adds a 'persistent' field (like the one for networks and storage pools) to a vm's JSON representation. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- docs/API.md | 2 ++ src/kimchi/model/vms.py | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/API.md b/docs/API.md index d75c55f..ebb6e61 100644 --- a/docs/API.md +++ b/docs/API.md @@ -45,6 +45,8 @@ the following general conventions: * **POST**: Create a new Virtual Machine * name *(optional)*: The name of the VM. Used to identify the VM in this API. If omitted, a name will be chosen based on the template used. + * persistent: If 'true', vm will persist after a Power Off or host reboot. + All virtual machines created by Kimchi are persistent. * template: The URI of a Template to use when building the VM * storagepool *(optional)*: Assign a specific Storage Pool to the new VM * graphics *(optional)*: Specify the graphics paramenter for this vm diff --git a/src/kimchi/model/vms.py b/src/kimchi/model/vms.py index 476e4ac..5721b48 100644 --- a/src/kimchi/model/vms.py +++ b/src/kimchi/model/vms.py @@ -471,7 +471,8 @@ def lookup(self, name): 'ticket': self._get_ticket(dom), 'users': users, 'groups': groups, - 'access': 'full' + 'access': 'full', + 'persistent': True if dom.isPersistent() else False } def _vm_get_disk_paths(self, dom): -- 1.9.3

5 15

[PATCH] Detect and enable help page from plugins tabs
by Rodrigo Trujillo 26 Aug '14

26 Aug '14

Kimchi is currently not able to configure and open help pages of any plugin tab. This patch fixes this problem and removes the HELP button if the plugin does not have a help configured properly. Help pages for a plugin tab follow same Kimchi system: - html help file should have the same name of plugin html tab file - html files should be in plugin's " ui/pages/help/<LANG> " path - plugin should add following lines to <PLUGIN_NAME>.conf: * [/help] * tools.staticdir.on = True * tools.nocache.on = True - plugins should add a <help> element with tab help html name in "ui/config/tab-ext.xml", for each configured tab. If this element does not exist, 'Help' will be disabled Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- plugins/sample/sample.conf.in | 4 ++++ plugins/sample/ui/config/tab-ext.xml | 1 + plugins/sample/ui/pages/help/en_US/tab.html | 1 + src/kimchi/config.py.in | 1 + src/kimchi/utils.py | 9 +++++++-- ui/js/src/kimchi.main.js | 26 ++++++++++++++++++++++++-- 6 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 plugins/sample/ui/pages/help/en_US/tab.html diff --git a/plugins/sample/sample.conf.in b/plugins/sample/sample.conf.in index 6e0908b..181616d 100644 --- a/plugins/sample/sample.conf.in +++ b/plugins/sample/sample.conf.in @@ -22,3 +22,7 @@ tools.kimchiauth.admin_methods = ['POST', 'PUT'] [/circles] tools.kimchiauth.on = True tools.kimchiauth.admin_methods = ['POST', 'PUT'] + +[/help] +tools.staticdir.on = True +tools.nocache.on = True diff --git a/plugins/sample/ui/config/tab-ext.xml b/plugins/sample/ui/config/tab-ext.xml index a1fb1c2..5ca6e6b 100644 --- a/plugins/sample/ui/config/tab-ext.xml +++ b/plugins/sample/ui/config/tab-ext.xml @@ -6,5 +6,6 @@ <title>SampleTab</title> <path>plugins/sample/tab.html</path> + <help>tab</help> </tab> </tabs-ext> diff --git a/plugins/sample/ui/pages/help/en_US/tab.html b/plugins/sample/ui/pages/help/en_US/tab.html new file mode 100644 index 0000000..cd32b47 --- /dev/null +++ b/plugins/sample/ui/pages/help/en_US/tab.html @@ -0,0 +1 @@ +Help page for Kimchi's Sample plugin. diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index fca32ee..e10f1f6 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -145,6 +145,7 @@ class PluginPaths(Paths): self.ui_dir = self.add_prefix(os.path.join(self.plugin_dir, 'ui')) self.mo_dir = self.add_prefix(os.path.join(self.plugin_dir, 'mo')) self.conf_file = os.path.join(self.conf_dir, '%s.conf' % name) + self.help_dir = os.path.join(self.ui_dir + '/pages/help') class UIConfig(dict): diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index 0977b9f..9e80e06 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -82,13 +82,18 @@ def is_digit(value): def _load_plugin_conf(name): - plugin_conf = PluginPaths(name).conf_file + plugin_paths = PluginPaths(name) + plugin_conf = plugin_paths.conf_file if not os.path.exists(plugin_conf): cherrypy.log.error_log.error("Plugin configuration file %s" " doesn't exist." % plugin_conf) return try: - return Parser().dict_from_file(plugin_conf) + plugin_dict = Parser().dict_from_file(plugin_conf) + if (os.path.exists(plugin_paths.help_dir) and '/help' in plugin_dict): + plugin_dict['/help']['tools.staticdir.dir'] = \ + plugin_paths.help_dir + return plugin_dict except ValueError as e: cherrypy.log.error_log.error("Failed to load plugin " "conf from %s: %s" % diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index ba54b26..71a8280 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -34,9 +34,15 @@ kimchi.main = function() { var path = tab['path']; var mode = tab['mode']; if (mode != 'none') { + var disableHelp = ""; + if (/^plugins/.test(path)) { + if (!tab['pluginTabHelp']) { + disableHelp = " disableHelp"; + } + } tabsHtml.push( '<li>', - '<a class="item" href="', path, '">', + '<a class="item', disableHelp,'" href="', path, '">', title, '</a>', '</li>' @@ -53,6 +59,7 @@ kimchi.main = function() { var titleKey = $tab.find('title').text(); var title = i18n[titleKey] ? i18n[titleKey] : titleKey; var path = $tab.find('path').text(); + var pluginTabHelp = $tab.find('help').text(); var roles = kimchi.cookie.get('roles'); if (roles) { var role = JSON.parse(roles)[titleKey.toLowerCase()]; @@ -61,7 +68,8 @@ kimchi.main = function() { tabs.push({ title: title, path: path, - mode: mode + mode: mode, + pluginTabHelp: pluginTabHelp }); } else { document.location.href = 'login.html'; @@ -158,6 +166,15 @@ kimchi.main = function() { $(tab).addClass('current'); $(tab).focus(); + if ($(tab).hasClass("disableHelp")) { + $('#btn-help').prop('disabled', true); + $('#btn-help').hide(); + } + else { + $('#btn-help').prop('disabled', false); + $('#btn-help').show(); + } + // Load page content. loadPage(url); }; @@ -297,6 +314,11 @@ kimchi.getHelp = function(e) { url = url.replace("#tabs", "/help/" + lang); if (url == "/help" + lang) url = url + "/index.html" + else if (/^#plugin/.test(url)) { + var plugin = url.split("/").pop(); + url = url.replace("#", ""); + url = url.replace(plugin, "help/" + lang + "/" + plugin + ".html"); + } else url = url + ".html"; -- 1.9.3

2 4

[PATCH v3] Bug fix: Github #354
by Daniel Henrique Barboza 26 Aug '14

26 Aug '14

v3: - changed the code to be generic (treat both netfs and iscsi targets) v2: - fixed "make check" issue The following patch fixes the issue described in Github #354: "storage: used nfs source path need to be filtered out in creation page" https://github.com/kimchi-project/kimchi/issues/354 *** BLURB HERE *** Daniel Henrique Barboza (1): model/storagetargets: filtering used nfs paths src/kimchi/model/storagetargets.py | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) -- 1.8.3.1

4 4

[PATCH 0/2] Fixes to issue #405
by Rodrigo Trujillo 25 Aug '14

25 Aug '14

https://github.com/kimchi-project/kimchi/issues/405 Patches fixes problem (1) and (3). Problem (2) is caused by libvirt. Error has already been reported to libvirt community. Rodrigo Trujillo (2): Fix cancel button in edit guest storage tab Fix enter hit in storage tab under guest edit window ui/js/src/kimchi.guest_edit_main.js | 1 + ui/pages/guest-edit.html.tmpl | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) -- 1.9.3

4 5

[PATCH] UI: Display iSCSI targets for Selection
by huoyuxin＠linux.vnet.ibm.com 25 Aug '14

25 Aug '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/storage.css | 50 +++++++++++++++++++ ui/js/src/kimchi.api.js | 16 ++++++ ui/js/src/kimchi.storagepool_add_main.js | 76 ++++++++++++++++++++++++++++++ ui/pages/storagepool-add.html.tmpl | 7 ++- 4 files changed, 147 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/storage.css b/ui/css/theme-default/storage.css index 4f439e8..cb0caee 100644 --- a/ui/css/theme-default/storage.css +++ b/ui/css/theme-default/storage.css @@ -593,3 +593,53 @@ center no-repeat; padding: 0 20px 0 26px; } + +.storage-admin .filter-select { + display: inline-block; + position: relative; +} + +.storage-admin .filter-select input { + border: 1px solid #CCCCCC; + border-radius: 1px; + font-size: 14px; + color: #666666; + padding: 3px 3px 3px 10px; + height: 30px; + width: 493px; +} + +.storage-admin .filter-select input::-ms-clear { + display: none; +} + +.storage-admin .filter-select .arrow { + display: inline-block; + vertical-align: middle; + position: relative; + left: -25px; +} + +.storage-admin .filter-select .option { + border-style: solid; + border-color: #CCCCCC; + border-width: 0px 1px 1px 1px; + border-radius: 1px; + font-size: 14px; + background-color: white; + width: 506px; + max-height: 140px; + overflow: auto; + color: #666666; + position: absolute; + z-index: 1000; +} + +.storage-admin .filter-select .option .item { + padding: 5px 10px; + cursor: pointer; +} + +.storage-admin .filter-select .option .item:hover { + background-color: #DDDDDD; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..d89919e 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,21 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getISCSITargets : function(server, port, suc, err) { + server = encodeURIComponent(server); + port = encodeURIComponent(port); + kimchi.requestJSON({ + url : kimchi.url + 'storageservers/'+server+'/storagetargets?_target_type=iscsi&_server_port='+port, + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ecbc682..49ba9e1 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -34,6 +34,78 @@ kimchi.storagepool_add_main = function() { }); }; +kimchi.storageFilterSelect = function(id, isUpdate) { + var input = $('input', '#'+id); + var options = $(".option", '#'+id); + var filter = function(container, key){ + container.children().each(function(){ + $(this).css("display", $(this).text().indexOf(key)==-1 ? "none" : ""); + }); + }; + if(!isUpdate){ + $('.arrow', '#'+id).click(function(){ + options.toggleClass("hide-content"); + }); + input.focus(function(){ + options.removeClass("hide-content"); + }).on("keyup", function(){ + filter(options, input.val()); + }); + } + options.children().each(function(){ + $(this).click(function(){ + input.val($(this).text()); + $('.option', "#iSCSITarget").addClass("hide-content"); + filter(options, ""); + }); + }); +}; + +kimchi.initISCSITargets = function(){ + var loadTargets = function(server, port, callback){ + var isUpdate = $(".option", "#iSCSITarget").children().length > 0; + $(".option", "#iSCSITarget").empty(); + $('input', "#iSCSITarget").val("loading targets..."); + kimchi.getISCSITargets(server, port, function(data){ + if(data.length==0){ + $('input', "#iSCSITarget").val("no targets is got."); + }else{ + for(var i=0; i<data.length; i++){ + var itemNode = $.parseHTML("<div class='item'>"+data[i].target+"</div>"); + $(".option", "#iSCSITarget").append(itemNode); + } + kimchi.storageFilterSelect('iSCSITarget', isUpdate); + $('input', "#iSCSITarget").attr("readonly", false); + $('input', "#iSCSITarget").val(""); + $('input', "#iSCSITarget").trigger("focus"); + } + callback(); + }, function(data){ + $('input', "#iSCSITarget").val("failed to load targets."); + kimchi.message.error(data.responseJSON.reason); + callback(); + }); + }; + var triggerLoadTarget = function(){ + var server = $("#iscsiserverId").val().trim(); + var port = $("#iscsiportId").val().trim(); + if(server!="" && port!="" && !$("#iscsiserverId").hasClass("invalid-field") && !$("#iscsiportId").hasClass("invalid-field")){ + $("#iscsiserverId").attr("disabled", true); + $("#iscsiportId").attr("disabled", true); + loadTargets(server, port, function(){ + $("#iscsiserverId").attr("disabled", false); + $("#iscsiportId").attr("disabled", false); + }); + } + }; + $("#iscsiserverId").change(function(){ + triggerLoadTarget(); + }); + $("#iscsiportId").change(function(){ + triggerLoadTarget(); + }); +}; + kimchi.initStorageAddPage = function() { kimchi.listHostPartitions(function(data) { if (data.length > 0) { @@ -160,6 +232,10 @@ kimchi.initStorageAddPage = function() { $('#iscsiportId').keyup(function(event) { $(this).toggleClass("invalid-field",!/^[0-9]+$/.test($(this).val())); }); + $('#iscsiserverId').keyup(function(event) { + $(this).toggleClass("invalid-field",!kimchi.isServer($(this).val().trim())); + }); + kimchi.initISCSITargets(); }; /* Returns 'true' if all form fields were filled, 'false' if diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl index 1eb2029..ee19ed5 100644 --- a/ui/pages/storagepool-add.html.tmpl +++ b/ui/pages/storagepool-add.html.tmpl @@ -23,7 +23,7 @@ <!DOCTYPE html> <html> <body> - <div class="window storage-window"> + <div class="window storage-window storage-admin"> <header> <h1 class="title">$_("Define a New Storage Pool")</h1> <div class="close">X</div> @@ -119,7 +119,10 @@ <h2>4. $_("Target")</h2> <div class="field"> <p class="text-help">$_("The iSCSI target on iSCSI server")</p> - <input id="iscsiTargetId" type="text" class="text storage-base-input-width"> + <span class="filter-select" id="iSCSITarget"> + <div><input id="iscsiTargetId" type="text" readonly><a class="ui-icon ui-icon-triangle-1-s arrow"></a></div> + <div class="option hide-content"></div> + </span> </div> </section> <section class="form-section"> -- 1.7.1

3 2

[PATCH 0/2] Allow admin user change permission settings when VM is running
by Wen Wang 25 Aug '14

25 Aug '14

Changes: 1) Have the "Manage Media" function deleted from "Action" list 2) Enable "Edit" whether VM is running or off 3) Disable edit function of "General", "Storage", "Interface" except "replace" of the cdrom under "Storage". Wen Wang (2): UI: Delete Manage Media function from action list Allow admin user change permission settings when VM is running ui/js/src/kimchi.guest_edit_main.js | 54 ++++++++++++++++++++++---------- ui/js/src/kimchi.guest_main.js | 14 -------- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/guest-media.html.tmpl | 57 ----------------------------------- ui/pages/guest.html.tmpl | 1 - 5 files changed, 38 insertions(+), 90 deletions(-) delete mode 100644 ui/pages/guest-media.html.tmpl

3 10

[PATCH V2 0/2] Allow admin user change settings when VM is running
by Wen Wang 25 Aug '14

25 Aug '14

Changes: V1 -> V2: 1) Have the "ui/css/theme-default/guest-media.css" deleted 2) Have the "edit" button in interface tab deleted when VM is running 1) Have the "Manage Media" function deleted from "Action" list 2) Enable "Edit" whether VM is running or off 3) Disable edit function of "General", "Storage", "Interface" except "replace" of the cdrom under "Storage". Wen Wang (2): UI: Delete Manage Media function from action list Allow admin user change permission settings when VM is running ui/css/theme-default/guest-media.css | 42 ------------------------- ui/js/src/kimchi.guest_edit_main.js | 56 ++++++++++++++++++++++----------- ui/js/src/kimchi.guest_main.js | 14 -------- ui/pages/guest-edit.html.tmpl | 2 +- ui/pages/guest-media.html.tmpl | 57 ---------------------------------- ui/pages/guest.html.tmpl | 1 - 6 files changed, 39 insertions(+), 133 deletions(-) delete mode 100644 ui/css/theme-default/guest-media.css delete mode 100644 ui/pages/guest-media.html.tmpl

2 7

[PATCH 0/2] Warn before Power Off non-persistent VM
by Christy Perez 21 Aug '14

21 Aug '14

Adding a new field for VM properties, and a new error message. Note: The error message needs Portuguese and Chinese translation. Christy Perez (2): Add persistent flag to VM info Display appropriate warning for Power Off of non-persistent VM docs/API.md | 2 ++ po/en_US.po | 3 +++ po/pt_BR.po | 3 +++ po/zh_CN.po | 3 +++ src/kimchi/model/vms.py | 3 ++- ui/js/src/kimchi.guest_main.js | 6 +++++- ui/pages/i18n.json.tmpl | 1 + 7 files changed, 19 insertions(+), 2 deletions(-) -- 1.9.3

3 9

[PATCH V2] Bugfix UI: Change button text to indicate user network is generating
by Wen Wang 21 Aug '14

21 Aug '14

V1 -> V2: 1)Change the create button from "Creating..." to "Create" when error occurs. 2)Disable input when creating a new network. When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 10 ++++++++++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 11 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..4ee7249 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -207,6 +207,11 @@ kimchi.initNetworkCreation = function() { network.persistent = result.persistent; kimchi.addNetworkItem(network); $("#networkConfig").dialog("close"); + }, function(data) { + kimchi.message.error(data.responseJSON.reason); + $("#networkFormOk").button("enable"); + $("#networkName").removeAttr("readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); }); }); }); @@ -270,6 +275,9 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkName").prop("readonly", "readonly"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +345,8 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); + $("#networkName").removeAttr("readonly"); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")", -- 1.7.1

3 3

[PATCH v2] Bug fix: Github #354
by Daniel Henrique Barboza 21 Aug '14

21 Aug '14

v2: - fixed "make check" issue The following patch fixes the issue described in Github #354: "storage: used nfs source path need to be filtered out in creation page" https://github.com/kimchi-project/kimchi/issues/354 Daniel Henrique Barboza (1): model/storagetargets: filtering used nfs paths src/kimchi/model/storagetargets.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) -- 1.8.3.1

4 4

[PATCH] Change function that verifies network interface status
by Ramon Medeiros 21 Aug '14

21 Aug '14

LTC Bugzilla #115031 - LTCTest: build-8: List interfaces which are active The old way does just consider if the interface has connectivity, not the interface status. The new file can determine if the interface is up or down and if cable is connected or not. Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com> --- src/kimchi/netinfo.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/kimchi/netinfo.py b/src/kimchi/netinfo.py index 5fd6130..276c0b7 100644 --- a/src/kimchi/netinfo.py +++ b/src/kimchi/netinfo.py @@ -29,7 +29,7 @@ BONDING_PATH = '/sys/class/net/*/bonding' WLAN_PATH = '/sys/class/net/*/wireless' NET_BRPORT = '/sys/class/net/%s/brport' NET_MASTER = '/sys/class/net/%s/master' -NET_STATE = '/sys/class/net/%s/operstate' +NET_STATE = '/sys/class/net/%s/carrier' PROC_NET_VLAN = '/proc/net/vlan/' BONDING_SLAVES = '/sys/class/net/%s/bonding/slaves' BRIDGE_PORTS = '/sys/class/net/%s/brif' @@ -101,8 +101,21 @@ def is_bondlave(nic): def operstate(dev): - return open(NET_STATE % dev).readline().strip() + status = None + + # try to read interface status + try: + status = open(NET_STATE % dev).readline().strip() + except IOError: + pass + + # when IOError is raised, interface is down + if status == None: + return "down" + # if value is 1, cable is connected + # 0 corresponds to no interface up with no cable + return "up" def get_vlan_device(vlan): """ Return the device of the given VLAN. """ -- 1.8.3.1

2 2

[PATCH] Bugfix: Log out from Administrator tab raises popup errors
by Wen Wang 21 Aug '14

21 Aug '14

This bug turns out to be caused by we change the login format from login-window to tranditional login format. After the logout, we can no longer and there is no need to update the pages and popup a login window. Now we redirect to login.html after logout. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 613ab41..ba54b26 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -239,7 +239,7 @@ kimchi.main = function() { // Perform logging out via Ajax request. $('#btn-logout').on('click', function() { kimchi.logout(function() { - updatePage(); + document.location.href = "login.html"; }, function(err) { kimchi.message.error(err.responseJSON.reason); }); -- 1.7.1

3 5

[RFC] UI Mockup - ISO Pool: Download from URL and Upload
by Hongliang Wang 21 Aug '14

21 Aug '14

Agree with Aline's proposal to add a button in ISO line of storage pool tab: And then pop out a window: And then show progress. Here we'll have 2 options: progress with percentage indication and only running/finished status. Option 1: Option 2: For option 1, we need back-end support that enables in-time notification of completion percentage when uploading a file with 2 pieces of information: total file size, and received file size.

5 10

[PATCH 0/2] Warn users about non-persistent guests when using Power Off
by Christy Perez 21 Aug '14

21 Aug '14

Someone reported that their guests (not created by Kimchi) were being deleted if they used Kimchi to shut them down. This small patchset adds a warning message and also increases the size of the confirmation dialog in the UI to fit the new text. Note: It still needs the Chinese translation. Christy Perez (2): Add Power-Off warning for non-persistent guests Make the confirmation dialog bigger po/en_US.po | 15 ++++++++++++--- po/kimchi.pot | 10 ++++++++-- po/pt_BR.po | 16 +++++++++++++--- po/zh_CN.po | 10 ++++++++-- ui/css/theme-default/message.css | 4 ++-- ui/pages/i18n.json.tmpl | 1 + 6 files changed, 44 insertions(+), 12 deletions(-) -- 1.9.3

3 5

Libvirt bug ? (Multiple errors in edit guest storage window #405)
by Rodrigo Trujillo 20 Aug '14

20 Aug '14

Hi all, I have worked to fix https://github.com/kimchi-project/kimchi/issues/405 In problem (2) the cause seems to be an error in libvirt, it is saving the device with wrong protocol, which makes kimchi not return the path. Reproduce: 1- Create a virtual machine with a local cdrom iso configure. You will see a device such as ("virsh edit" shows): <disk type='file' device='cdrom'> <driver name='qemu' type='raw'/> <source file='/ISOS/ubuntu-14.04-server-amd64.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> 2- Create a file with new device (same dev name) configuration, such as (/tmp/new-cdrom): <disk device="cdrom" type="network"> <driver type="raw" name="qemu"/> <target bus="ide" dev="hdc"/> <source protocol="http" name="/releases/14.04.1/release/ubuntu-14.04.1-desktop-amd64+mac.iso"> <host port="80" name="cdimages.ubuntu.com"/> </source> </disk> 3- Update the virtual machine device with virsh: sudo virsh update-device <VM-NAME> /tmp/new-cdrom 4- Edit the vm xml and you will see that the device was added with "NBD" protocol and without HOST information!!! : <disk type='network' device='cdrom'> <driver name='qemu' type='raw'/> <source protocol='nbd' name='/releases/14.04.1/release/ubuntu-14.04.1-desktop-amd64+mac.iso'/> <target dev='hdc' bus='ide'/> <readonly/> <address type='drive' controller='0' bus='1' target='0' unit='0'/> </disk> ---------------------- Kimchi uses "dom.updateDeviceFlags", the same API. Notice that this happens when changing from local to remote ISO only. Remote to remote works ... and local to local too. Does anyone have idea why this happens ? As workaround I can detach, then attach the device again. Thoughts ? Rodrigo Trujillo

1 0

[PATCH] Bugfix UI: Change button text to indicate user network is generating
by Wen Wang 20 Aug '14

20 Aug '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> When network is generating, if the network is not up, we bring the network up first, then we create the network. During the time we bring the network up(less than 10s), we change the text as well as the layout of the button to indicate this process is working. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.network.js | 3 +++ ui/pages/i18n.json.tmpl | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c8f983f..cee5864 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -270,6 +270,8 @@ kimchi.openNetworkDialog = function(okCallback) { title : i18n.KCHNET6003M }); $("#networkFormOk").on("click", function() { + $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6008M); okCallback(); }); $("#enableVlan").on("click", function() { @@ -337,6 +339,7 @@ kimchi.cleanNetworkDialog = function() { $("#networkDestinationLabel").text($("#networkDestinationID li:first-child").text()); $("#networkFormOk").off("click"); $("#networkFormOk").button("disable"); + $("#networkFormOk span").text(i18n.KCHAPI6005M); $("#networkVlanID").toggle(false); $("#labelNetworkVlanID").toggle(false); $("#enableVlan").prop("checked", false); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index ccfb081..cbcd077 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -49,6 +49,7 @@ "KCHAPI6005M": "$_("Create")", "KCHAPI6006M": "$_("Warning")", "KCHAPI6007M": "$_("Save")", + "KCHAPI6008M": "$_("Creating...")", "KCHGRD6001M": "$_("Loading...")", "KCHGRD6002M": "$_("An error occurs while checking for packages update.")", -- 1.7.1

4 5

[RFC] ISO pool: Support to download ISO from URL
by Crístian Viana 20 Aug '14

20 Aug '14

The following API changes should be made to implement the remote download ISO feature: 1) POST /storagepools/ISO/storagevolumes/download {'url': <http|https|ftp|ftps>, 'name': <volume name>} Description: Starts downloading a remote ISO image to Kimchi's storage pool. Parameters: 'url': specifies where the image is hosted. Required. 'name': specifies the name of the local file when the download finishes. If this parameter is omitted, Kimchi will try to use the same file name as the remote file. Optional. Return codes: 200: the remote URL is valid and the download started successfully. 400: the remote URL is not valid; the provided 'name' is already in use (this error shouldn't happen if 'name' is omitted). the storage pool doesn't have enough free space to hold the remote file. Return data: {'name': <vol-name>} 2) POST /storagepools/ISO/storagevolumes/download/pause {'name': <volume name>} Description: Pauses a remote ISO download. Parameters: 'name': the remote volume name to be paused. Required. Return codes: 200: 'name' is an ongoing download file and the operation was paused successfully. 400: 'name' is an invalid volume name (doesn't exist / isn't an ongoing download); download referred by 'name' cannot be paused. Return data: {} 3) POST /storagepools/ISO/storagevolumes/download/resume {'name': <volume name>} Description: Resumes a paused remote ISO download. Parameters: 'name': the remote volume name to be resumed. Required. Return codes: 200: 'name' is a paused download file and the operation was resumed successfully. 400: 'name' is an invalid volume name (doesn't exist / isn't a paused download). Return data: {} 4) POST /storagepools/ISO/storagevolumes/download/cancel {'name': <volume name>} Description: Cancels a remote ISO download. Parameters: 'name': the remote volume name to be canceled. Required. Return codes: 200: 'name' is an ongoing download file and the operation was canceled successfully. Whatever data has been downloaded so far should be deleted. 400: 'name' is an invalid volume name (doesn't exist / isn't an ongoing download). Return data: {} 5) POST /storagepools/ISO/storagevolumes/download/status {'name': <volume name>} Description: Provides status of a remote ISO download. Parameters: 'name': the remote volume name. Required. Return codes: 200: 'name' is a download file and its status information was returned successfully. 400: 'name' is an invalid volume name (doesn't exist / isn't a remote download). Return data: {'name': <volume name>, 'status': [downloading|paused], 'total_size': <size in bytes>, 'downloaded_size': <size in bytes>} I tried to put together the feedback given in another e-mail thread, especially by Aline, Royce and Yu Xin Huo, along with some ideas of my own. This RFC doesn't support choosing a different storage pool other than "ISO" to host the downloaded files. If we're doing this, wel need to update this new API accordingly. The implementation details will be discussed later. Please share your feedback with us.

3 10

[PATCH] Bug fix: Github #354
by Daniel Henrique Barboza 19 Aug '14

19 Aug '14

The following patch fixes the issue described in Github #354: "storage: used nfs source path need to be filtered out in creation page" https://github.com/kimchi-project/kimchi/issues/354 Daniel Henrique Barboza (1): model/storagetargets: filtering used nfs paths src/kimchi/model/storagetargets.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) -- 1.8.3.1

4 6

[PATCH] Add hover description to template type icons
by Crístian Viana 19 Aug '14

19 Aug '14

The small icons on each template indicate whether they are local or remote but that may not be obvious to everyone. Show a description when the user hovers the mouse over the template icons indicating what they mean: local or remote template. Also, the same descriptive text will be shown in the icon's place if the browser is not able to load images. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_main.js | 2 ++ ui/pages/i18n.json.tmpl | 2 ++ ui/pages/tabs/templates.html.tmpl | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 3c8421d..ae3f290 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -25,8 +25,10 @@ kimchi.doListTemplates = function() { var isLocal = /^\//.test(value['cdrom']); if(isLocal){ value.location = "images/theme-default/icon-local.png"; + value.iconDescription = i18n['KCHTMPL6004M']; }else{ value.location = "images/theme-default/icon-remote.png"; + value.iconDescription = i18n['KCHTMPL6005M']; } listHtml += kimchi.substitute(templateHtml, value); }); diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index f1478a7..8e6fcd6 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -61,6 +61,8 @@ "KCHTMPL6002M": "$_("It will take long time. Do you want to continue?")", "KCHTMPL6003M": "$_("This will permanently delete the template. Would you like to continue?")", + "KCHTMPL6004M": "$_("Local template")", + "KCHTMPL6005M": "$_("Remote template")", "KCHHOST6001E": "$_("Unable to shut down system as there are some virtual machines running!")", diff --git a/ui/pages/tabs/templates.html.tmpl b/ui/pages/tabs/templates.html.tmpl index 7cf7fcd..4fe1d73 100644 --- a/ui/pages/tabs/templates.html.tmpl +++ b/ui/pages/tabs/templates.html.tmpl @@ -50,7 +50,7 @@ <div class="template-icon template-icon-position"> <img alt="" src="{icon}"> - <img alt="" src="{location}" class="template-type-icon-position"> + <img alt="{iconDescription}" title="{iconDescription}" src="{location}" class="template-type-icon-position"> </div> <div class="template-general template-title template-title-position"> <h2 class="title" title="{name}">{name}</h2> -- 1.9.3

3 3

RFC: Discover Kimchi Peers - UI Mockup
by Yu Xin Huo 19 Aug '14

19 Aug '14

4 6

RFC: Display iSCSI Targets - UI Mockup
by Yu Xin Huo 19 Aug '14

19 Aug '14

4 5

[RFC] Mock for Authorization: Allow admin user change permission settings when VM is running
by Wen Wang 19 Aug '14

19 Aug '14

Hi all, Here is the new design of the "Edit" function. We are going to enable user viewing VM details when VMs are running and "Permission" is always available whether a VM is running or not. Here's the detail of the design: 1) Enable "Edit" in "Action" whether VM is running or not. 2) Delete "Manage Media" button and move it to a tab in "Edit" 3) Enable "Permission" & "Manage Media" and provide read-only privilege of "General", "Storage", "Interface" when a VM is running. 4) Enable "General", "Storage", "Interface", "Permission" and provide read-only privilege of "Manage Media"when a VM is not running. Mocks are added below: Delete "Manage Media" and enable "Edit" all the time. When a VM is running, tabs are presented: When a VM is not running, tabs are presented all like what is right now only with a new tab of "Manage Media" read-only: Any comment is welcomed Best Regards Wang Wen

3 6

RFC: Asynchronous event notify
by Wen Wang 19 Aug '14

19 Aug '14

Hi all, Back-end: STOMP <http://stomp.github.com/> is a simple text-orientated messaging protocol, based on which, we can accomplish the "TCP for the web". What we need is a message server and a client that communicate with the server. We can send messages to server using this protocol and receive messages from server, which needs a subscription to the server first and then server gives the callback. Here are the possible STOMP servers: Apache ActiveMQ the most popular and powerful open source messaging and Integration Patterns server Apache Apollo a redesigned version of ActiveMQ CoilMQ a lightweight pure Python STOMP broker inspired by StompServer Gozirra a lightweight Java STOMP broker HornetQ puts the buzz in messaging MorbidQ a STOMP publish/subscribe server with absolutely no potential to cluster RabbitMQ an Erlang-based, multi-protocol broker with full support for STOMP via a plugin Sprinkle written in Python and runs on Unix type platforms Stampy a Java implementation of the STOMP 1.2 specification StompConnect provides a bridge to any other JMS provider StompServer a lightweight pure Ruby STOMP server And the client: pyactivemq module for communicating with the ActiveMQ message broker stomper a client implementation of the STOMP protocol stompest a full-featured STOMP implementation for Python including both synchronous and asynchronous clients stompy implementation of the STOMP protocol in Python stomp.py a Python client library which can also be run as a standalone, command-line client for testing. Front-end: As I mentioned before. Front-end only change the way that the long time task communicate with the back-end. UI should look just the same with a more enhanced display. Also, more function will be enabled according to this like we can enable actions when generating a debug report, etc. Best Regards Wang Wen

1 0

[RFC] upload ISO to OOTB pool
by Royce Lv 19 Aug '14

19 Aug '14

1. Backend: (1)API definition: POST /storagepools/isos/storagevolumes/upload {'file': fileobject} -- This is from backend view, as cherrypy's embedded support wraps fileobject. REF:http://docs.cherrypy.org/en/latest/pkg/cherrypy.tutorial.html?highlight… (2) implementation: We can get the file handler from cherrypy's embedded scheme, and use it to read and write to a local file, ref: https://groups.google.com/forum/#!topic/cherrypy-users/xGvxBGgQ90k The only thing we need to concern at backend is the file size, cherrypy demo has proposed a example leverage cgi lib: http://tools.cherrypy.org/wiki/DirectToDiskFileUpload 2. For UI, we need to supply user with a form which input type is 'file', or we construct formdata in ajax(for IE only supported in IE10+): REF: http://stackoverflow.com/questions/6974684/how-to-send-formdata-objects-wit… 3. To support the progress bar in UI, we can utilize resumable js: http://github.com/23/resumable.js

2 2

[RFC] Create template from VM
by Rodrigo Trujillo 18 Aug '14

18 Aug '14

Complementing what Aline has already pointed (thanks Aline) === Create template from VM === This will use the same backing storage mechanism used to create a template from a IMG file. POST /templates {'name': <template-name>, 'vm': <vm-name>} ** change 'create' in src/kimchi/models/template.py: - check if template is based on ISO or VM - fetch VM information - create new LibvirtVMTemplate ** change api.json - Documentation ** New error messages UI: 1) When creating a template: Add an option "From guest"; then list all guests to user choose one or multiples and do the requests ** Add the new option in /ui/pages/template-add.html.tmpl <a id="iso-local" class="local">$_("Local ISO Image")</a> ... <a id="iso-remote" class="remote">$_("Remote ISO Image")</a> ---> <a id="guest-template" class="guest">$_("From Guest")</a> <------- NEW ** List VMs and allow select more then one. (use same behaviour like in multiple local or remote isos )

1 0

[PATCH v2 0/1] UI-set-ticket-password
by Simon Jin 18 Aug '14

18 Aug '14

V2-V1: - Put new password input box on 'general' tab instead of being a sperate tab. - Rename the input label as 'Console password'. Simon Jin (1): UI: set ticket password ui/css/theme-default/guest-edit.css | 10 +++++----- ui/js/src/kimchi.guest_edit_main.js | 4 ++++ ui/pages/guest-edit.html.tmpl | 13 +++++++++++++ 3 files changed, 22 insertions(+), 5 deletions(-) -- 1.8.5.3

2 2

Kimchi 1.3 Sprint 2 Overview
by Aline Manera 18 Aug '14

18 Aug '14

Hi all, As agreed in the last scrum meeting (http://kimchi-project.github.io/kimchi/meetings/kimchi.scrum.2014-08-13-13.…) I am sending to you an overview about the sprint 2 tasks. That way everyone can be aware of what is expected in each task and we don't block the UI development. Just to make clear, this is my view on each task! Maybe you - the task owner - have a different view on that. In this case, share your ideas with us. And *don't forget to send a RFC, V1 patch, UI mockup *or something related to your task by *next Monday (08/18)* This email is just a summary to motivate you! ;-) *ISO pool: Support to download ISO from URL (vianac)* The idea here is to provide a way to user download a ISO from URL to the OOTB pool (ISO pool) POST /storagepools/ISO/storagevolumes/ {'name': <vol-name>, 'url': <http|https|ftp://url>} - name can be optional. We can generate one automatically based on ISO path when any name is provided by user. - url is required. Questions: - Which protocols will we support? http, https, ftp? Any other? - About the UI, how do we show this feature to user? Basically we have 2 options: 1) In the storage tab: Add an option "Add ISO" to the ISO pool (or any pool ?); get the URL and display a progress bar. 2) While creating a template: Add an option "Download ISO"; get the URL and display a progress bar. When the download is completed, we create a template using the new ISO. I prefer the first option (storage tab) as it can also be used for upload ISO (see below) *ISO pool: Support to upload ISO* This has a similar idea from downloading ISO from URL, but instead of providing a URL the user will select a local file on client side. POST /storagepools/ISO/storagevolumes/ {'name': <vol-name>, 'filepath': filepath} For the UI we also have the same 2 options from downloading ISO from URL feature I prefer the first one (storage tab) as we can use the same UI for both cases, download and upload. While selection "Add ISO" option, a new dialog will be displayed with a radio box: a browser input box (for upload) and a simple input box for URL (for download). The user can only select one option and confirm the operation. *Create template from VM (rotru)* This will use the same backing storage mechanism used to create a template from a IMG file. POST /templates {'name': <template-name>, 'vm': <vm-name>} About the UI: We have 2 options: 1) When creating a template: Add an option "From guest"; then list all guests to user choose one (or multiples ? ) and do the requests 2) On guests Actions menu Add an option "Create template" and do the request I prefer the first option (while creating a template) *Discover Kimchi peers(alinefm)* This will use openSLP to register and discover Kimchi peers in the same network. GET /peers will return the Kimchi peers [{server: "https://1.2.3.4:8001"}, {server: "https://1.2.3.5:8001"}...] I think this feature should be optional, ie, we will have a config file entry that can be enabled/disabled - as this feature is not critical for virtualization and requires additional software installation (openSLP) and configuration. federation = enable|disable When enabled, the kimchi server will be register in the openSLP tool and when requesting /peers we will search for peers When disabled, /peers will return an empty list. Maybe it would be good to also display a message on UI "Federation feature is disabled for your Kimchi server." To display that message, we need to update /config/capabilities to also return this info. GET /config/capabilities { ... federation: enable|disable } *Migration(Simon Jin)* This task was added after we have finished the 1.3 Plan. So it would be difficult to accommodate the UI for it in out current plan. So I'd say I only expect to have the backend done for 1.3 release. POST /vms/<name>/migrate {server: <other-kimchi-server-ip>} *Asynchronous event notify(Sheldon Feng/Zhengsheng Zhou)[backend]* *Asynchronous event notify(WenWang)[UI]* This is an important and big task. But I am not sure we will be able to finish it on time for 1.3 release. We have already started some discussion on ML "[Kimchi-devel] [RFC] Improve task management for kimchi" (http://lists.ovirt.org/pipermail/kimchi-devel/2014-June/006230.html) *Authorization: Allow admin user change permission settings when VM is running (WenWang) *The idea is display the same "Edit" dialog view when vm is running or not. And when vm is running only enable the information that can be updated with running vm for editing. That way we eliminate the "Manage Media" option and keep the UI consistent. And also provide a way to user checks the vm configuration (https://github.com/kimchi-project/kimchi/issues/387) *VM ticket: update novnc/spice code (sheldon)* POST /vms/<name>/connect will automatically set a random console password for the VM and sets its expiration time to 10 seconds later. When accessing the console URL, we need to pass the password as a parameter (password=...) so noVNC/Spice can do the connection to the guest console. *Display iSCSI targets when iSCSI server is provided (backend done in 3c6c5c) (Yu Xin)* It is similar to what we did for NFS servers. But in this case we will list the iSCSI targets for a given server. GET /storageservers?_target_type=iscsi [ { "host":"127.0.0.1" "port":"3260" } ] GET /storageservers/<server>/storagetargets?_target_type=iscsi&_server_port=<port> [ { "host":"127.0.0.1", "target":"iqn.2003-01.org.linux-iscsi.localhost.x8664:sn.edb1a004dc57", "target_type":"iscsi" } ] ----------- And thanks for your patience if you were reading this line now! :-) I know it is a big email but it could not be different based on the tasks we have for sprint 2. Feel free to use it as base for your RFC email. I am looking forward to see all that done. Regards, Aline Manera

4 9

[PATCH RFC] Discover Kimchi peers using openSLP
by Aline Manera 18 Aug '14

18 Aug '14

GET /peers [ "https://ubuntu-vm:8001", "https://rhel-vm:8001", ] How to test it? - Install openslp and openslp-server - Start opnslp service: servicd slpd start - Make sure to open openSLP port (427 UDP and TCP) on firewall I tested it using VMs as they are in the same host network. TODO: #1: Add option on Kimchi config file to enable/disable this feature #2: Update /config/capabilities to return if federation is enabled or not GET /config/capabilities { ... federation: enable|disable } #3: Create README-federation file to provide details on how to enable this feature #4: Update API.md, mockmodel and test cases Aline Manera (1): Discover Kimchi peers using openSLP src/kimchi/control/peers.py | 29 ++++++++++++++++++++++++++ src/kimchi/model/peers.py | 50 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 src/kimchi/control/peers.py create mode 100644 src/kimchi/model/peers.py -- 1.9.3

2 3

[PATCH] Fix UI: Show proper message when detaching a guest storage
by Rodrigo Trujillo 14 Aug '14

14 Aug '14

Whenever an user tries to detach a storage from a guest, the confirmation message always contains "CDROM". This patch fix this problem, so when the storage type is "disk", it shows the right message. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_edit_main.js | 2 ++ ui/pages/guest-edit.html.tmpl | 4 ++-- ui/pages/i18n.json.tmpl | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 7d24b44..01d8045 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -107,6 +107,8 @@ kimchi.guest_edit_main = function() { confirm : i18n['KCHAPI6002M'], cancel : i18n['KCHAPI6003M'] }; + if ($(this).data('type') == "disk") + settings['content'] = i18n['KCHVMCD6009M']; var dev = $(this).data('dev'); kimchi.confirm(settings, function() { diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index f24f7de..ed7ddeb 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -169,7 +169,7 @@ title='$_("Replace")'> </button> <button class="guest-edit-cdrom-button detach" - data-vm="{vm}" data-dev="{dev}" + data-vm="{vm}" data-dev="{dev}" data-type="{type}" title='$_("Detach")'> </button> <button class="guest-edit-cdrom-button save hidden" @@ -213,7 +213,7 @@ </span> <span class="action-area"> <button class="guest-edit-cdrom-button detach" - data-vm="{vm}" data-dev="{dev}" + data-vm="{vm}" data-dev="{dev}" data-type="{type}" title="$_("Detach")"> </button> </span> diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index 697f946..ccfb081 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -135,6 +135,7 @@ "KCHVMCD6006M": "$_("Successfully attached!")", "KCHVMCD6007M": "$_("Successfully replaced!")", "KCHVMCD6008M": "$_("Successfully detached!")", + "KCHVMCD6009M": "$_("This disk will be detached permanently and you can re-attach it. Continue to detach it?")", "KCHNET6001E": "$_("The VLAN id must be between 1 and 4094.")", -- 1.9.3

3 2

[PATCHv2] Refactor vmstorage name generation
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We generated all storage name with 'hd' prefix, which is not proper for scsi and virtio disk. So refactor name generation to produce proper device name. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..513f756 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -38,6 +38,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +PREFIX_MAP = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} def _get_device_bus(dev_type, dom): @@ -140,17 +141,8 @@ class VMStoragesModel(object): def create(self, vm_name, params): dom = VMModel.get_vm(vm_name, self.conn) - # Use device name passed or pick next - dev_name = params.get('dev', None) - if dev_name is None: - params['dev'] = self._get_storage_device_name(vm_name) - else: - devices = self.get_list(vm_name) - if dev_name in devices: - raise OperationFailed( - 'KCHVMSTOR0004E', - {'dev_name': dev_name, 'vm_name': vm_name}) - + params['bus'] = _get_device_bus(params['type'], dom) + self._get_storage_device_name(vm_name, params) # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' @@ -171,7 +163,6 @@ class VMStoragesModel(object): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) - params['bus'] = _get_device_bus(params['type'], dom) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -187,16 +178,27 @@ class VMStoragesModel(object): raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return params['dev'] - def _get_storage_device_name(self, vm_name): - dev_list = [dev for dev in self.get_list(vm_name) - if dev.startswith('hd')] - if len(dev_list) == 0: - return 'hda' - dev_list.sort() - last_dev = dev_list.pop() - # TODO: Improve to device names "greater then" hdz - next_dev_letter_pos = string.ascii_lowercase.index(last_dev[2]) + 1 - return 'hd' + string.ascii_lowercase[next_dev_letter_pos] + def _get_storage_device_name(self, vm_name, params): + if params.get('dev') is None: + bus_prefix = PREFIX_MAP[params['bus']] + dev_list = [dev for dev in self.get_list(vm_name) + if dev.startswith(bus_prefix)] + if len(dev_list) == 0: + params['dev'] = bus_prefix + 'a' + else: + dev_list.sort() + last_dev = dev_list.pop() + # TODO: Improve to device names "greater then" hdz + next_dev_letter_pos =\ + string.ascii_lowercase.index(last_dev[2]) + 1 + params['dev'] =\ + bus_prefix + string.ascii_lowercase[next_dev_letter_pos] + + devices = self.get_list(vm_name) + if params['dev'] in devices: + raise OperationFailed( + 'KCHVMSTOR0004E', + {'dev_name': params['dev'], 'vm_name': vm_name}) def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) -- 1.8.3.2

2 1

[PATCH] Fix Key Error when editing CD ROM path
by Christy Perez 14 Aug '14

14 Aug '14

lxml only accepts strings as parameters when looking up xml elements. The port for remote ISO was being passed in as an int, and a KeyError was thrown. This patch just casts the ints to strings for the lookups. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index cd985fa..5543f40 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -68,7 +68,8 @@ def _get_storage_xml(params, ignore_source=False): if src_type == 'network': output = urlparse.urlparse(params.get('path')) host = E.host(name=output.hostname, port= - output.port or socket.getservbyname(output.scheme)) + str(output.port) or + str(socket.getservbyname(output.scheme))) source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) -- 1.9.3

3 4

[PATCH] Refactor vmstorage name generation
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We generated all storage name with 'hd' prefix, which is not proper for scsi and virtio disk. So refactor name generation to produce proper device name. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 46 ++++++++++++++++++++++-------------------- 1 file changed, 24 insertions(+), 22 deletions(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..9ae8584 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -38,6 +38,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +prefix_map = {'ide': 'hd', 'virtio': 'vd', 'scsi': 'sd'} def _get_device_bus(dev_type, dom): @@ -140,17 +141,8 @@ class VMStoragesModel(object): def create(self, vm_name, params): dom = VMModel.get_vm(vm_name, self.conn) - # Use device name passed or pick next - dev_name = params.get('dev', None) - if dev_name is None: - params['dev'] = self._get_storage_device_name(vm_name) - else: - devices = self.get_list(vm_name) - if dev_name in devices: - raise OperationFailed( - 'KCHVMSTOR0004E', - {'dev_name': dev_name, 'vm_name': vm_name}) - + params['bus'] = _get_device_bus(params['type'], dom) + self._get_storage_device_name(vm_name, params) # Path will never be blank due to API.json verification. # There is no need to cover this case here. params['format'] = 'raw' @@ -171,7 +163,6 @@ class VMStoragesModel(object): params['format'] = vol_info['format'] params['path'] = vol_info['path'] params['src_type'] = _check_path(params['path']) - params['bus'] = _get_device_bus(params['type'], dom) if (params['bus'] not in HOTPLUG_TYPE and DOM_STATE_MAP[dom.info()[0]] != 'shutoff'): raise InvalidOperation('KCHVMSTOR0011E') @@ -187,16 +178,27 @@ class VMStoragesModel(object): raise OperationFailed("KCHVMSTOR0008E", {'error': e.message}) return params['dev'] - def _get_storage_device_name(self, vm_name): - dev_list = [dev for dev in self.get_list(vm_name) - if dev.startswith('hd')] - if len(dev_list) == 0: - return 'hda' - dev_list.sort() - last_dev = dev_list.pop() - # TODO: Improve to device names "greater then" hdz - next_dev_letter_pos = string.ascii_lowercase.index(last_dev[2]) + 1 - return 'hd' + string.ascii_lowercase[next_dev_letter_pos] + def _get_storage_device_name(self, vm_name, params): + if params.get('dev') is None: + bus_prefix = prefix_map[params['bus']] + dev_list = [dev for dev in self.get_list(vm_name) + if dev.startswith(bus_prefix)] + if len(dev_list) == 0: + params['dev'] = bus_prefix + 'a' + else: + dev_list.sort() + last_dev = dev_list.pop() + # TODO: Improve to device names "greater then" hdz + next_dev_letter_pos =\ + string.ascii_lowercase.index(last_dev[2]) + 1 + params['dev'] =\ + bus_prefix + string.ascii_lowercase[next_dev_letter_pos] + + devices = self.get_list(vm_name) + if params['dev'] in devices: + raise OperationFailed( + 'KCHVMSTOR0004E', + {'dev_name': params['dev'], 'vm_name': vm_name}) def get_list(self, vm_name): dom = VMModel.get_vm(vm_name, self.conn) -- 1.8.3.2

2 2

[PATCHv2] Reject cdrom update when protocol is not supported by libvirt
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, fix pep8. When remote iso protocol is not supported by libvirt, even if we work around by qemu command, it will mess up device list logic. So reject this use case. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 4 ++++ tests/test_model.py | 16 +++++++++++++++- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..f5ef275 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -255,6 +255,7 @@ messages = { "KCHVMSTOR0015E": _("Cannot lookup disk path information by given pool/volume: %(error)s"), "KCHVMSTOR0016E": _("Volume already been used by other vm"), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), + "KCHVMSTOR0018E": _("Remote ISO update/attach is not supported by your libvirt version"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index e5be17c..72bdccc 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError from kimchi.exception import OperationFailed +from kimchi.model.config import CapabilitiesModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag @@ -38,6 +39,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] +caps = CapabilitiesModel() def _get_device_bus(dev_type, dom): @@ -69,6 +71,8 @@ def _get_storage_xml(params, ignore_source=False): output = urlparse.urlparse(params.get('path')) port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) + if output.scheme not in caps.libvirt_stream_protocols: + raise InvalidOperation("KCHVMSTOR0018E") source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) diff --git a/tests/test_model.py b/tests/test_model.py index 7fd0f00..ef0a0e6 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -29,6 +29,7 @@ import tempfile import threading import time import unittest +import urlparse import uuid @@ -38,6 +39,7 @@ import utils from kimchi import netinfo from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.featuretests import FeatureTests from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext @@ -397,13 +399,25 @@ class ModelTests(unittest.TestCase): valid_remote_iso_path = utils.get_remote_iso_path() cdrom_args = {"type": "cdrom", "path": valid_remote_iso_path} + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorages_create, + vm_name, cdrom_args) + return + cdrom_dev = inst.vmstorages_create(vm_name, cdrom_args) storage_list = inst.vmstorages_get_list(vm_name) self.assertEquals(prev_count + 1, len(storage_list)) # Update remote-backed cdrom with the same ISO + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorage_update, + vm_name, cdrom_dev, + {'path': valid_remote_iso_path}) + return inst.vmstorage_update(vm_name, cdrom_dev, - {'path': valid_remote_iso_path}) + {'path': valid_remote_iso_path}) cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev) cur_cdrom_path = re.sub(":80/", '/', cdrom_info['path']) self.assertEquals(valid_remote_iso_path, cur_cdrom_path) -- 1.8.3.2

4 3

[PATCH] Remote ISO attachment: fix UI to accept remote ISO link for cdrom attachment
by lvroyce＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> UI just accept local ISO as cdrom attachment before, enable remote ISO link for it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_storage_add.main.js | 2 +- 1 file changed, 1 insertion(+), 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 1f4c4bd..a8c5acb 100644 --- a/ui/js/src/kimchi.guest_storage_add.main.js +++ b/ui/js/src/kimchi.guest_storage_add.main.js @@ -109,7 +109,7 @@ kimchi.guest_storage_add_main = function() { }); var validateCDROM = function(settings) { - if (/^(\/.*)+$/.test(settings['path'])) + if (/^((https|http|ftp|ftps|tftp|\/).*)+$/.test(settings['path'])) return true; else { kimchi.message.error.code('KCHVMSTOR0001E'); -- 1.8.3.2

2 2

[PATCH v2 0/3] Update remote CD ROM
by Christy Perez 14 Aug '14

14 Aug '14

This patchset adds changes to allow a user to update a CD ROM created with a remote ISO. It fixes a KeyError issue, improves the way a remote ISO file is verified, and adds unit tests. Note: Currently updating a CD ROM created with a local iso using a remote ISO is not supported. This patchset does not address that issue, but does add a test for it. This patchset is primarily to correct the KeyError and prevent a regression when trying to update a remote ISO's file. Christy Perez (3): Fix Key Error when editing CD ROM path Fix verification of remote ISO Add unit tests for remote-backed CD ROM updates. src/kimchi/model/vmstorages.py | 2 +- src/kimchi/utils.py | 21 +++++++++++----- tests/test_model.py | 55 +++++++++++++++++++++++++++++++++++++++++- tests/utils.py | 21 +++++++++++++++- 4 files changed, 90 insertions(+), 9 deletions(-) -- 1.9.3

3 9

[PATCH] UI: refactor guest edit code.
by shaohef＠linux.vnet.ibm.com 14 Aug '14

14 Aug '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> We don not need a special "save" button for permission form. All form in guest edit tab can share the same "save" button. also, we will add a password form, it will also share this button. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 5 ----- ui/js/src/kimchi.guest_edit_main.js | 40 +++++++++++++++++++++---------------- ui/pages/guest-edit.html.tmpl | 3 --- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 1092cc9..74c2237 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -261,8 +261,3 @@ width: 46%; float: right; } - -#form-guest-edit-permission-save { - float: right; - margin-right: 10px; -} diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 38a2bc0..7d24b44 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -19,13 +19,11 @@ kimchi.guest_edit_main = function() { var buttonContainer = $('#action-button-container'); $('#guest-edit-tabs').tabs({ beforeActivate: function(event, ui) { + var display_list = ['form-guest-edit-general', 'form-guest-edit-permission'] $(buttonContainer).addClass('hidden'); - $("#form-guest-edit-permission-save").addClass('hidden'); var deactivated = ui['newPanel']; - if($(deactivated).attr('id') === 'form-guest-edit-general') { + if(display_list.indexOf($(deactivated).attr('id')) >= 0) { $(buttonContainer).removeClass('hidden'); - }else if($(deactivated).attr('id') === 'form-guest-edit-permission'){ - $("#form-guest-edit-permission-save").removeClass('hidden'); } } }); @@ -335,18 +333,6 @@ kimchi.guest_edit_main = function() { filterNodes("", $("#permission-avail-users")); filterNodes("", $("#permission-avail-groups")); }); - $("#form-guest-edit-permission-save").on("click", function(){ - var content = { users: [], groups: [] }; - $("#permission-sel-users").children().each(function(){ - content.users.push($("label", this).text()); - }); - $("#permission-sel-groups").children().each(function(){ - content.groups.push($("label", this).text()); - }); - kimchi.updateVM(kimchi.selectedGuest, content, function(){ - kimchi.window.close(); - }); - }); }; var initContent = function(guest) { @@ -393,7 +379,7 @@ kimchi.guest_edit_main = function() { kimchi.retrieveVM(kimchi.selectedGuest, initContent); - var submitForm = function(event) { + var generalSubmit = function(event) { $(saveButton).prop('disabled', true); var data=$('#form-guest-edit-general').serializeObject(); if(data['memory']!=undefined) { @@ -410,7 +396,27 @@ kimchi.guest_edit_main = function() { kimchi.message.error(err.responseJSON.reason); $(saveButton).prop('disabled', false); }); + } + var permissionSubmit = function(event) { + var content = { users: [], groups: [] }; + $("#permission-sel-users").children().each(function(){ + content.users.push($("label", this).text()); + }); + $("#permission-sel-groups").children().each(function(){ + content.groups.push($("label", this).text()); + }); + kimchi.updateVM(kimchi.selectedGuest, content, function(){ + kimchi.window.close(); + }); + } + + // tap map, "general": 0, "storage": 1, "interface": 2, "permission": 3, "password": 4 + var submit_map = {0: generalSubmit, 3:permissionSubmit}; + var submitForm = function(event) { + var current = $('#guest-edit-tabs').tabs( "option", "active" ); + var submitFun = submit_map[current]; + submitFun && submitFun(event); event.preventDefault(); }; diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 1c1d7d4..f24f7de 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -150,9 +150,6 @@ <span class="text">$_("Save")</span> </button> </div> - <button id="form-guest-edit-permission-save" class="btn-normal hidden"> - <span class="text">$_("Save")</span> - </button> </footer> </div> <script id="cdrom-row-tmpl" type="text/html"> -- 1.9.3

6 10

[PATCH v4 0/3] Update Remote CD ROM
by Christy Perez 14 Aug '14

14 Aug '14

Aline pointed out some test failures I'd assumed were the same as failures on the mater branch, but were actually as result of the changes to check for valid url paths. The fix was causing a false negative to be returned for valid repository URLs. The only change in this patchset versus the previous (v3) version is 2/3: Fix verification of remote ISO. 1/3 and 3/3 are the same as version 3. Christy Perez (3): Fix Key Error when editing CD ROM path Fix verification of remote ISO Add unit tests for remote-backed CD ROM updates. src/kimchi/model/vmstorages.py | 2 +- src/kimchi/utils.py | 26 ++++++++++++++++++++++---- tests/test_model.py | 23 ++++++++++++++++++++++- tests/utils.py | 20 +++++++++++++++++++- 4 files changed, 64 insertions(+), 7 deletions(-) -- 1.9.3

2 6

[PATCH v5 1/3] Fix Key Error when editing CD ROM path
by Christy Perez 14 Aug '14

14 Aug '14

lxml only accepts strings as parameters when looking up xml elements. The port for remote ISO was being passed in as an int, and a KeyError was thrown. This patch just casts the ints to strings for the lookups. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..e5be17c 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -67,7 +67,7 @@ def _get_storage_xml(params, ignore_source=False): # Working with url paths if src_type == 'network': output = urlparse.urlparse(params.get('path')) - port = output.port or socket.getservbyname(output.scheme) + port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) source = E.source(protocol=output.scheme, name=output.path) source.append(host) -- 1.9.3

2 3

[PATCH V3] UI enhancement: Request /config/capabilities as soon as possible
by Aline Manera 13 Aug '14

13 Aug '14

V2 - V3: - Make host tab uses the cached capabilities values (Cristian) V1 - V2: - Make sure kimchi.capabilities is properly set before using its value (Cristian) I prefered to do it this way because making a sync request will prevent the full UI to load even for some seconds. Aline Manera (1): UI enhancement: Request /config/capabilities as soon as possible ui/js/src/kimchi.host.js | 21 +++++++++++-------- ui/js/src/kimchi.main.js | 8 ++++++++ ui/js/src/kimchi.template_add_main.js | 37 ++++++++++++++++++++-------------- ui/js/src/kimchi.template_edit_main.js | 20 ++++++++++-------- 4 files changed, 55 insertions(+), 31 deletions(-) -- 1.9.3

3 4

[PATCH] Change default environment configuration to production mode.
by Paulo Vital 13 Aug '14

13 Aug '14

Changed the default environment configuration present in the final files src/kimchi.conf and src/kimchi.config.py from 'development' to 'production' mode. This modification will prevent that debugging traces be printed in the front-end when something goes wrong. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/kimchi.conf.in | 2 +- src/kimchi/config.py.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/kimchi.conf.in b/src/kimchi.conf.in index 369f2c3..ed0270d 100644 --- a/src/kimchi.conf.in +++ b/src/kimchi.conf.in @@ -24,7 +24,7 @@ #ssl_key = # Running environment of the server -#environment = development +#environment = production [logging] # Log directory diff --git a/src/kimchi/config.py.in b/src/kimchi/config.py.in index 68c8a4d..fca32ee 100644 --- a/src/kimchi/config.py.in +++ b/src/kimchi/config.py.in @@ -253,7 +253,7 @@ def _get_config(): config.set("server", "cherrypy_port", "8010") config.set("server", "ssl_cert", "") config.set("server", "ssl_key", "") - config.set("server", "environment", "development") + config.set("server", "environment", "production") config.add_section("logging") config.set("logging", "log_dir", paths.log_dir) config.set("logging", "log_level", DEFAULT_LOG_LEVEL) -- 1.8.3.1

3 4

[PATCH] Reject cdrom update when protocol is not supported by libvirt
by lvroyce＠linux.vnet.ibm.com 12 Aug '14

12 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Based on Christy's patchset: [Kimchi-devel] [PATCH v3 1/3] Fix Key Error when editing CD ROM path When remote iso protocol is not supported by libvirt, even if we work around by qemu command, it will mess up device list logic. So reject this use case. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/i18n.py | 1 + src/kimchi/model/vmstorages.py | 5 ++++- tests/test_model.py | 13 +++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 2eae7e8..f5ef275 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -255,6 +255,7 @@ messages = { "KCHVMSTOR0015E": _("Cannot lookup disk path information by given pool/volume: %(error)s"), "KCHVMSTOR0016E": _("Volume already been used by other vm"), "KCHVMSTOR0017E": _("Only one of path or pool/volume can be specified to add a new virtual machine disk"), + "KCHVMSTOR0018E": _("Remote ISO update/attach is not supported by your libvirt version"), "KCHREPOS0001E": _("YUM Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index e5be17c..7dc8800 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -29,6 +29,7 @@ from lxml.builder import E from kimchi.exception import InvalidOperation, InvalidParameter, NotFoundError from kimchi.exception import OperationFailed +from kimchi.model.config import CapabilitiesModel from kimchi.model.vms import DOM_STATE_MAP, VMModel from kimchi.model.storagevolumes import StorageVolumeModel from kimchi.model.utils import get_vm_config_flag @@ -38,7 +39,7 @@ from kimchi.vmdisks import get_device_xml, get_vm_disk, get_vm_disk_list from kimchi.vmdisks import DEV_TYPE_SRC_ATTR_MAP HOTPLUG_TYPE = ['scsi', 'virtio'] - +caps = CapabilitiesModel() def _get_device_bus(dev_type, dom): try: @@ -69,6 +70,8 @@ def _get_storage_xml(params, ignore_source=False): output = urlparse.urlparse(params.get('path')) port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) + if output.scheme not in caps.libvirt_stream_protocols: + raise InvalidOperation("KCHVMSTOR0018E") source = E.source(protocol=output.scheme, name=output.path) source.append(host) disk.append(source) diff --git a/tests/test_model.py b/tests/test_model.py index 7fd0f00..dc56676 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -29,6 +29,7 @@ import tempfile import threading import time import unittest +import urlparse import uuid @@ -38,6 +39,7 @@ import utils from kimchi import netinfo from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import NotFoundError, OperationFailed +from kimchi.featuretests import FeatureTests from kimchi.iscsi import TargetClient from kimchi.model import model from kimchi.rollbackcontext import RollbackContext @@ -397,11 +399,22 @@ class ModelTests(unittest.TestCase): valid_remote_iso_path = utils.get_remote_iso_path() cdrom_args = {"type": "cdrom", "path": valid_remote_iso_path} + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorages_create, + vm_name, cdrom_args) + return + cdrom_dev = inst.vmstorages_create(vm_name, cdrom_args) storage_list = inst.vmstorages_get_list(vm_name) self.assertEquals(prev_count + 1, len(storage_list)) # Update remote-backed cdrom with the same ISO + protocol = urlparse.urlparse(valid_remote_iso_path).scheme + if not FeatureTests.libvirt_supports_iso_stream(protocol): + self.assertRaises(InvalidOperation, inst.vmstorage_update, + vm_name, cdrom_dev, {'path': valid_remote_iso_path}) + return inst.vmstorage_update(vm_name, cdrom_dev, {'path': valid_remote_iso_path}) cdrom_info = inst.vmstorage_lookup(vm_name, cdrom_dev) -- 1.8.3.2

3 3

[PATCH] Nit: refactor vm xml format
by lvroyce＠linux.vnet.ibm.com 12 Aug '14

12 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Move qemu namespace from xml top level to cdrom generation, so that future cdrom update can just modify this part without affect top level xml. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/vmtemplate.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py index 761bac5..c2101db 100644 --- a/src/kimchi/vmtemplate.py +++ b/src/kimchi/vmtemplate.py @@ -150,7 +150,7 @@ class VMTemplate(object): """ qemu_stream_cmdline = """ - <qemu:commandline> + <qemu:commandline %(ns)s> <qemu:arg value='-drive'/> <qemu:arg value='file=%(url)s,if=none,id=drive-%(bus)s0-1-0,\ readonly=on,format=raw'/> @@ -179,7 +179,7 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> url = protocol + "://" + hostname + ":" + str(port) + url_path if protocol not in libvirt_stream_protocols: - return qemu_stream_cmdline % {'url': url, 'bus': bus} + return qemu_stream_cmdline % {'url': url, 'bus': bus, 'ns': QEMU_NAMESPACE} params = {'protocol': protocol, 'url_path': url_path, 'hostname': hostname, 'port': port, 'dev': dev, 'bus': bus} @@ -365,7 +365,6 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> params['uuid'] = vm_uuid params['networks'] = self._get_networks_xml() params['input_output'] = self._get_input_output_xml() - params['qemu-namespace'] = '' params['cdroms'] = '' params['qemu-stream-cmdline'] = '' graphics = kwargs.get('graphics') @@ -389,13 +388,12 @@ drive=drive-%(bus)s0-1-0,id=%(bus)s0-1-0'/> if not urlparse.urlparse(self.info.get('cdrom', "")).scheme in \ libvirt_stream_protocols and \ params.get('iso_stream', False): - params['qemu-namespace'] = QEMU_NAMESPACE params['qemu-stream-cmdline'] = cdrom_xml else: params['cdroms'] = cdrom_xml xml = """ - <domain type='%(domain)s' %(qemu-namespace)s> + <domain type='%(domain)s'> %(qemu-stream-cmdline)s <name>%(name)s</name> <uuid>%(uuid)s</uuid> -- 1.8.3.2

2 1

[PATCH] list host user names as less a possible
by shaohef＠linux.vnet.ibm.com 12 Aug '14

12 Aug '14

From: Simon Jin <simonjin(a)linux.vnet.ibm.com> The backend should fitler the user name who can not login the shell. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Simon Jin <simonjin(a)linux.vnet.ibm.com> --- src/kimchi/model/host.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/model/host.py b/src/kimchi/model/host.py index a1f8944..39f45d8 100644 --- a/src/kimchi/model/host.py +++ b/src/kimchi/model/host.py @@ -419,7 +419,8 @@ def __init__(self, **kargs): pass def get_list(self): - return [user.pw_name for user in pwd.getpwall()] + return [user.pw_name for user in pwd.getpwall() + if user.pw_shell.rsplit("/")[-1] not in ["nologin", "false"]] class GroupsModel(object): -- 1.9.3

3 3

[PATCH] bug fix: Properly list host partitions for Ubuntu 14.04 server
by Aline Manera 12 Aug '14

12 Aug '14

While trying to create a logical pool in a Ubuntu 14.04 server I got the following error: [08/Aug/2014:15:52:38] HTTP Traceback (most recent call last): File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 110, in lookup self.info = lookup(*self.model_args) File "/home/alinefm/kimchi/src/kimchi/model/host.py", line 274, in lookup return disks.get_partition_details(name) File "/home/alinefm/kimchi/src/kimchi/disks.py", line 180, in get_partition_details dev_path = _get_dev_node_path(majmin) File "/home/alinefm/kimchi/src/kimchi/disks.py", line 41, in _get_dev_node_path return _get_friendly_dm_path(maj_min) File "/home/alinefm/kimchi/src/kimchi/disks.py", line 33, in _get_friendly_dm_path with open(dm_name) as dm_f: IOError: [Errno 2] No such file or directory: '/sys/dev/block/253:5/dm/name' It is because, even the maj_min starts with '253:', the file does not exist. So check this file exists in order to use it, otherwise get the dev path from uevent file. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 65d3a1d..a092c17 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -17,6 +17,7 @@ # 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 os.path import re import subprocess @@ -27,18 +28,14 @@ from kimchi.exception import OperationFailed from kimchi.utils import kimchi_log -def _get_friendly_dm_path(maj_min): - """ Returns user friendly dm path given the device number 'major:min' """ - dm_name = "/sys/dev/block/%s/dm/name" % maj_min - with open(dm_name) as dm_f: - content = dm_f.read().rstrip('\n') - return "/dev/mapper/" + content - - def _get_dev_node_path(maj_min): """ Returns device node path given the device number 'major:min' """ - if maj_min.startswith('253:'): - return _get_friendly_dm_path(maj_min) + + dm_name = "/sys/dev/block/%s/dm/name" % maj_min + if os.path.exists(dm_name): + with open(dm_name) as dm_f: + content = dm_f.read().rstrip('\n') + return "/dev/mapper/" + content uevent = "/sys/dev/block/%s/uevent" % maj_min with open(uevent) as ueventf: -- 1.9.3

2 2

[PATCH] bug fix: Allow user updates the cdrom from local to remote file
by Aline Manera 12 Aug '14

12 Aug '14

It depends on: - [Kimchi-devel] [PATCH v3 1/3] Fix Key Error when editing CD ROM path - [Kimchi-devel] [PATCH v3 2/3] Fix verification of remote ISO - [Kimchi-devel] [PATCH v3 3/3] Add unit tests for remote-backed CD ROM updates. And I still need to update the test cases accordingly. Aline Manera (1): bug fix: Allow user updates the cdrom from local to remote file src/kimchi/model/vmstorages.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) -- 1.9.3

2 3

[PATCH v3 1/3] Fix Key Error when editing CD ROM path
by Christy Perez 12 Aug '14

12 Aug '14

lxml only accepts strings as parameters when looking up xml elements. The port for remote ISO was being passed in as an int, and a KeyError was thrown. This patch just casts the ints to strings for the lookups. Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index b5311db..e5be17c 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -67,7 +67,7 @@ def _get_storage_xml(params, ignore_source=False): # Working with url paths if src_type == 'network': output = urlparse.urlparse(params.get('path')) - port = output.port or socket.getservbyname(output.scheme) + port = str(output.port or socket.getservbyname(output.scheme)) host = E.host(name=output.hostname, port=port) source = E.source(protocol=output.scheme, name=output.path) source.append(host) -- 1.9.3

1 2

[PATCH] UI enhancement: Request /config/capabilities as soon as possible
by Aline Manera 11 Aug '14

11 Aug '14

/config/capabilities was requested twice for the templates tab: one request to identify if qemu has spice support and other one to identify if the qemu has ISO streaming support. Those requests were made right before using the information, causing a delay on UI until get the server response. For example, for distant servers, while creating a new template the "Remote ISO" option was disabled at the first time and after some time it was enabled. The same behavior was identified while editing a template, as the graphics options blinked to add the spice on it. To fix it, request /config/capabilities when loading the templates tab to have this information prior to edit or create a new template. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.template_add_main.js | 27 ++++++++++++--------------- ui/js/src/kimchi.template_edit_main.js | 12 ++++-------- ui/js/src/kimchi.template_main.js | 6 ++++++ 3 files changed, 22 insertions(+), 23 deletions(-) diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index a24a306..a7421d7 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -222,22 +222,19 @@ kimchi.template_add_main = function() { //1-2 remote iso $('#iso-remote').css('opacity', 0.3).css('cursor', 'not-allowed'); - kimchi.getCapabilities(function(result) { - if (result.qemu_stream == true) { - $('#iso-remote').css('opacity', 1).css('cursor', 'pointer'); - - $('#iso-remote').click(function() { - kimchi.switchPage('iso-type-box', 'iso-remote-box'); - initRemoteIsoField(); - initIsoUrlField(); - kimchi.listDistros(function(isos) { - showRemoteIsoField(isos); - }, function() { - }); + if (kimchi.capabilities.qemu_stream == true) { + $('#iso-remote').css('opacity', 1).css('cursor', 'pointer'); + + $('#iso-remote').click(function() { + kimchi.switchPage('iso-type-box', 'iso-remote-box'); + initRemoteIsoField(); + initIsoUrlField(); + kimchi.listDistros(function(isos) { + showRemoteIsoField(isos); + }, function() { }); - } - }, function() { - }); + }); + } $('#iso-remote-box-back').click(function() { kimchi.switchPage('iso-remote-box', 'iso-type-box', 'right'); diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js index d42108c..281154a 100644 --- a/ui/js/src/kimchi.template_edit_main.js +++ b/ui/js/src/kimchi.template_edit_main.js @@ -39,14 +39,10 @@ kimchi.template_edit_main = function() { } var options = [{label: 'VNC', value: 'vnc'}]; - kimchi.getCapabilities(function(result) { - if (result.qemu_spice == true) { - options.push({label: 'Spice', value: 'spice'}) - } - }, function() { - }, function() { - kimchi.select('template-edit-graphics-list', options); - }); + if (kimchi.capabilities.qemu_spice == true) { + options.push({label: 'Spice', value: 'spice'}) + } + kimchi.select('template-edit-graphics-list', options); var scsipools = {}; kimchi.listStoragePools(function(result) { diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 3c8421d..8a783c3 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -83,6 +83,12 @@ kimchi.hideTitle = function() { }; kimchi.template_main = function() { + kimchi.getCapabilities(function(result) { + kimchi.capabilities = result; + }, function() { + kimchi.capabilities = {}; + }); + if(kimchi.tabMode['templates'] === 'admin') { $('.tools').attr('style','display'); $("#template-add").on("click", function(event) { -- 1.9.3

2 8

[PATCH] Fix issue #340: Show error message when server fails to list host partitions
by Aline Manera 11 Aug '14

11 Aug '14

Add error handlers to kimchi.listHostPartitions() to properly display error message when an error occurs while trying to list host partitions. Also update .po files as a new message was added. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- po/en_US.po | 47 +++++++++++++++++++++--------- po/kimchi.pot | 33 ++++++++++++++------- po/pt_BR.po | 49 +++++++++++++++++++++++--------- po/zh_CN.po | 45 +++++++++++++++++++++-------- ui/js/src/kimchi.storage_main.js | 4 +++ ui/js/src/kimchi.storagepool_add_main.js | 3 ++ ui/pages/i18n.json.tmpl | 1 + 7 files changed, 132 insertions(+), 50 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index f85d982..a34da3a 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-08-08 15:27-0300\n" "PO-Revision-Date: 2013-07-11 17:32-0400\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: English\n" @@ -136,6 +136,16 @@ msgstr "" "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x " "'path_to_iso'.Details: %(err)s" +msgid "Error occurs when probing image os information." +msgstr "" + +msgid "No OS information found in given image." +msgstr "" + +#, python-format +msgid "Unable to find/read image file %(filename)s" +msgstr "" + #, python-format msgid "Virtual machine %(name)s already exists" msgstr "Virtual machine %(name)s already exists" @@ -337,8 +347,8 @@ msgstr "Template CDROM must be a local or remote ISO file" msgid "Invalid storage pool URI %(value)s specified for template" msgstr "Invalid storage pool URI %(value)s specified for template" -msgid "Specify an ISO image as CDROM to create a template" -msgstr "Specify an ISO image as CDROM to create a template" +msgid "Specify an ISO image as CDROM or a base image to create a template" +msgstr "" msgid "All networks for the template must be specified in a list." msgstr "All networks for the template must be specified in a list." @@ -362,6 +372,13 @@ msgstr "Unable to delete template due error: %(err)s" msgid "Disk size must be greater than 1GB." msgstr "Disk size must be greater than 1GB." +msgid "Template base image must be a valid local image file" +msgstr "" + +#, python-format +msgid "Cannot identify base image %(path)s format" +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s already exists" @@ -791,10 +808,6 @@ msgstr "The path '%(value)s' is not valid local/remote path for the device" msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "Device name %(dev_name)s already exists in vm %(vm_name)s" -msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" -msgstr "" -"Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" - msgid "Just support cdrom path update" msgstr "Just support cdrom path update" @@ -1102,9 +1115,6 @@ msgstr "Device Type" msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "The device type. Currently, \"cdrom\" and \"disk\" are supported." -msgid "Device Bus" -msgstr "Device Bus" - msgid "Storage Pool" msgstr "Storage Pool" @@ -1276,9 +1286,6 @@ msgstr "Add" msgid "Remove" msgstr "Remove" -msgid "Failed." -msgstr "Failed." - msgid "Enable" msgstr "Enable" @@ -1489,6 +1496,9 @@ msgstr "" "This storage pool is not persistent. Instead of deactivate, this action will " "permanently delete it. Would you like to continue?" +msgid "Unable to retrieve partitions information." +msgstr "" + msgid "CDROM path need to be a valid local path and cannot be blank." msgstr "CDROM path need to be a valid local path and cannot be blank." @@ -1843,3 +1853,14 @@ msgstr "No templates found." msgid "Clone" msgstr "Clone" + +#~ msgid "" +#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" +#~ msgstr "" +#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" + +#~ msgid "Device Bus" +#~ msgstr "Device Bus" + +#~ msgid "Failed." +#~ msgstr "Failed." diff --git a/po/kimchi.pot b/po/kimchi.pot index e869e3a..d8354fa 100755 --- a/po/kimchi.pot +++ b/po/kimchi.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-08-08 15:27-0300\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -130,6 +130,16 @@ msgid "" "'path_to_iso'.Details: %(err)s" msgstr "" +msgid "Error occurs when probing image os information." +msgstr "" + +msgid "No OS information found in given image." +msgstr "" + +#, python-format +msgid "Unable to find/read image file %(filename)s" +msgstr "" + #, python-format msgid "Virtual machine %(name)s already exists" msgstr "" @@ -324,7 +334,7 @@ msgstr "" msgid "Invalid storage pool URI %(value)s specified for template" msgstr "" -msgid "Specify an ISO image as CDROM to create a template" +msgid "Specify an ISO image as CDROM or a base image to create a template" msgstr "" msgid "All networks for the template must be specified in a list." @@ -348,6 +358,13 @@ msgstr "" msgid "Disk size must be greater than 1GB." msgstr "" +msgid "Template base image must be a valid local image file" +msgstr "" + +#, python-format +msgid "Cannot identify base image %(path)s format" +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "" @@ -744,9 +761,6 @@ msgstr "" msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" -msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" -msgstr "" - msgid "Just support cdrom path update" msgstr "" @@ -1041,9 +1055,6 @@ msgstr "" msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" -msgid "Device Bus" -msgstr "" - msgid "Storage Pool" msgstr "" @@ -1209,9 +1220,6 @@ msgstr "" msgid "Remove" msgstr "" -msgid "Failed." -msgstr "" - msgid "Enable" msgstr "" @@ -1401,6 +1409,9 @@ msgid "" "permanently delete it. Would you like to continue?" msgstr "" +msgid "Unable to retrieve partitions information." +msgstr "" + msgid "CDROM path need to be a valid local path and cannot be blank." msgstr "" diff --git a/po/pt_BR.po b/po/pt_BR.po index b38ff3f..452e778 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-08-08 15:27-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: Crístian Viana <vianac(a)linux.vnet.ibm.com>\n" "Language-Team: Aline Manera <alinefm(a)br.ibm.com>\n" @@ -156,6 +156,16 @@ msgstr "" "do caminho da ISO, ou (não recomendado) 'chmod -R o+x 'caminho_para_iso'. " "Detalhes: %(err)s" +msgid "Error occurs when probing image os information." +msgstr "" + +msgid "No OS information found in given image." +msgstr "" + +#, python-format +msgid "Unable to find/read image file %(filename)s" +msgstr "" + #, python-format msgid "Virtual machine %(name)s already exists" msgstr "Máquina virtual %(name)s já existe" @@ -367,8 +377,8 @@ msgstr "Modelo do CDROM deve ser um arquivo ISO local ou remoto" msgid "Invalid storage pool URI %(value)s specified for template" msgstr "Storage pool URI inválido %(value)s especificado para modelo" -msgid "Specify an ISO image as CDROM to create a template" -msgstr "Especifique uma imagem ISO como CDROM para criar o modelo" +msgid "Specify an ISO image as CDROM or a base image to create a template" +msgstr "" msgid "All networks for the template must be specified in a list." msgstr "Todas redes para o modelo devem ser especificadas em lista" @@ -393,6 +403,13 @@ msgstr "Não foi possível remover o modelo devido a um erro: %(err)s" msgid "Disk size must be greater than 1GB." msgstr "Tamanho do disco deve ser maior do que 1GB" +msgid "Template base image must be a valid local image file" +msgstr "" + +#, python-format +msgid "Cannot identify base image %(path)s format" +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "Storage pool %(name)s já existe" @@ -842,11 +859,6 @@ msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "" "Nome do dispositivo %(dev_name)s já existe na máquina virtual %(vm_name)s" -msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" -msgstr "" -"Tipo de barramento do dispositivo de destino inválido, tipos suportados: " -"'ide', 'scsi', 'virtio'" - msgid "Just support cdrom path update" msgstr "Apenas a atualização do caminho do CDROM é suportada" @@ -1164,9 +1176,6 @@ msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "" "O tipo do dispositivo. Atualmente, \"cdrom\" e \"disco\" são suportados." -msgid "Device Bus" -msgstr "Barramento do dispositivo" - msgid "Storage Pool" msgstr "Nome do Storage Pool" @@ -1340,9 +1349,6 @@ msgstr "Adicionar" msgid "Remove" msgstr "Remover" -msgid "Failed." -msgstr "Falhou." - msgid "Enable" msgstr "Ativar" @@ -1552,6 +1558,9 @@ msgstr "" "O storage pool não é persistente. Ao invés de desativar, essa ação vai " "removê-lo permanentemente. Deseja continuar?" +msgid "Unable to retrieve partitions information." +msgstr "" + msgid "CDROM path need to be a valid local path and cannot be blank." msgstr "" "Caminho do CDROM precisa ser um caminho local válido e não pode ser vazio." @@ -1907,3 +1916,15 @@ msgstr "Nenhum modelo encontrado." msgid "Clone" msgstr "Clonar" + +#~ msgid "" +#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" +#~ msgstr "" +#~ "Tipo de barramento do dispositivo de destino inválido, tipos suportados: " +#~ "'ide', 'scsi', 'virtio'" + +#~ msgid "Device Bus" +#~ msgstr "Barramento do dispositivo" + +#~ msgid "Failed." +#~ msgstr "Falhou." diff --git a/po/zh_CN.po b/po/zh_CN.po index aa3032a..83c7018 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -20,7 +20,7 @@ msgid "" msgstr "" "Project-Id-Version: kimchi 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-07-29 15:52-0300\n" +"POT-Creation-Date: 2014-08-08 15:27-0300\n" "PO-Revision-Date: 2013-06-27 10:48+0000\n" "Last-Translator: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" "Language-Team: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com>\n" @@ -149,6 +149,16 @@ msgstr "" "录下；或为'%(user)s'用户设置访问权限；或将'%(user)s'用户增加到ISO路径的属组；" "或者为所有的用户增加访问权限 'chmod -R o+x '（不推荐）。详情：%(err)s" +msgid "Error occurs when probing image os information." +msgstr "" + +msgid "No OS information found in given image." +msgstr "" + +#, python-format +msgid "Unable to find/read image file %(filename)s" +msgstr "" + #, python-format msgid "Virtual machine %(name)s already exists" msgstr "虚拟机%(name)s已经存在" @@ -344,8 +354,8 @@ msgstr "模板的CDROM必须是一个本地或者远程的ISO文件" msgid "Invalid storage pool URI %(value)s specified for template" msgstr "给模板指定了无效的存储池URI %(value)s" -msgid "Specify an ISO image as CDROM to create a template" -msgstr "为新模版的CDROM指定一个ISO的镜像" +msgid "Specify an ISO image as CDROM or a base image to create a template" +msgstr "" msgid "All networks for the template must be specified in a list." msgstr "为模板指定的网络必须在一个列表中" @@ -368,6 +378,13 @@ msgstr "由于错误：%(err)s，未能删除模板" msgid "Disk size must be greater than 1GB." msgstr "磁盘大小必须大于1GB。" +msgid "Template base image must be a valid local image file" +msgstr "" + +#, python-format +msgid "Cannot identify base image %(path)s format" +msgstr "" + #, python-format msgid "Storage pool %(name)s already exists" msgstr "存储池%(name)s已经存在" @@ -764,9 +781,6 @@ msgstr "设备路径'%(value)s'不是一个有效的本地/远程路径" msgid "Device name %(dev_name)s already exists in vm %(vm_name)s" msgstr "设备%(dev_name)s在vm%(vm_name)s上已存在" -msgid "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" -msgstr "无效的目标设备总线类型。支持类型为：'ide'，'scsi'，'virtio'" - msgid "Just support cdrom path update" msgstr "仅支持cdrom路径更新" @@ -1061,9 +1075,6 @@ msgstr "设备类型" msgid "The device type. Currently, \"cdrom\" and \"disk\" are supported." msgstr "设备类型。目前支持设备类型：\"cdrom\"和\"disk\"。 " -msgid "Device Bus" -msgstr "设备总线" - msgid "Storage Pool" msgstr "存储池" @@ -1230,9 +1241,6 @@ msgstr "增加" msgid "Remove" msgstr "删除" -msgid "Failed." -msgstr "失败" - msgid "Enable" msgstr "使能" @@ -1424,6 +1432,9 @@ msgid "" "permanently delete it. Would you like to continue?" msgstr "对于非持久存储池，这个操作将会永久删除存储池而不是停用。是否继续？" +msgid "Unable to retrieve partitions information." +msgstr "" + msgid "CDROM path need to be a valid local path and cannot be blank." msgstr "CDROM的路径必须是有效本地路径且不能为空" @@ -1773,3 +1784,13 @@ msgstr "没有发现模板" msgid "Clone" msgstr "制作副本" + +#~ msgid "" +#~ "Invalid target device bus type, type supported: 'ide', 'scsi', 'virtio'" +#~ msgstr "无效的目标设备总线类型。支持类型为：'ide'，'scsi'，'virtio'" + +#~ msgid "Device Bus" +#~ msgstr "设备总线" + +#~ msgid "Failed." +#~ msgstr "失败" diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 0ebdd59..ae3f963 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -223,6 +223,10 @@ kimchi.initLogicalPoolExtend = function() { $('.host-partition').html(i18n['KCHPOOL6011M']); $('.host-partition').addClass('text-help'); } + }, function(err) { + $('#loading-info', '#logicalPoolExtend').addClass('hidden'); + $('.host-partition').html(i18n['KCHPOOL6013M'] + '<br/>(' + err.responseJSON.reason + ')'); + $('.host-partition').addClass('text-help'); }); }, beforeClose : function() { $('.host-partition', '#logicalPoolExtend').empty(); }, diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index 629a37b..ecbc682 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -50,6 +50,9 @@ kimchi.initStorageAddPage = function() { $('.host-partition').html(i18n['KCHPOOL6011M']); $('.host-partition').addClass('text-help'); } + }, function(err) { + $('.host-partition').html(i18n['KCHPOOL6013M'] + '<br/>(' + err.responseJSON.reason + ')'); + $('.host-partition').addClass('text-help'); }); kimchi.getHostPCIDevices(function(data){ diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index f1478a7..697f946 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -162,6 +162,7 @@ "KCHPOOL6010M": "$_("Looking for available partitions ...")", "KCHPOOL6011M": "$_("No available partitions found.")", "KCHPOOL6012M": "$_("This storage pool is not persistent. Instead of deactivate, this action will permanently delete it. Would you like to continue?")", + "KCHPOOL6013M": "$_("Unable to retrieve partitions information.")", "KCHVMSTOR0001E": "$_("CDROM path need to be a valid local path and cannot be blank.")", "KCHVMSTOR0002E": "$_("Disk pool or volume cannot be blank.")" -- 1.9.3

2 2

[PATCH v3 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 11 Aug '14

11 Aug '14

Changelog from v2: - Rename one last occurrence of "_validate_repo_url" to the correct name. Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 25 ++++++++++++++++--- src/kimchi/repositories.py | 11 +++++++++ src/kimchi/utils.py | 15 ++++++++++++ tests/test_model.py | 42 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 41 +++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 8 files changed, 129 insertions(+), 12 deletions(-) -- 1.9.3

2 5

[PATCH V2] UI enhancement: Request /config/capabilities as soon as possible
by Aline Manera 09 Aug '14

09 Aug '14

V1 - V2: - Make sure kimchi.capabilities is properly set before using its value (Cristian) I prefered to do it this way because making a sync request will prevent the full UI to load even for some seconds. Aline Manera (1): UI enhancement: Request /config/capabilities as soon as possible ui/js/src/kimchi.main.js | 8 ++++++++ ui/js/src/kimchi.template_add_main.js | 37 ++++++++++++++++++++-------------- ui/js/src/kimchi.template_edit_main.js | 20 ++++++++++-------- 3 files changed, 42 insertions(+), 23 deletions(-) -- 1.9.3

1 1

[PATCH v2 0/3] Update remote CD ROM
by Christy Perez 08 Aug '14

08 Aug '14

This patchset adds changes to allow a user to update a CD ROM created with a remote ISO. It fixes a KeyError issue, improves the way a remote ISO file is verified, and adds unit tests. Note: Currently updating a CD ROM created with a local iso using a remote ISO is not supported. This patchset does not address that issue, but does add a test for it. This patchset is primarily to correct the KeyError and prevent a regression when trying to update a remote ISO's file. Christy Perez (3): Fix Key Error when editing CD ROM path Fix verification of remote ISO Add unit tests for remote-backed CD ROM updates. src/kimchi/model/vmstorages.py | 2 +- src/kimchi/utils.py | 21 +++++++++++----- tests/test_model.py | 55 +++++++++++++++++++++++++++++++++++++++++- tests/utils.py | 21 +++++++++++++++- 4 files changed, 90 insertions(+), 9 deletions(-) -- 1.9.3

1 3

[PATCH v2] Increasing nginx + cherrypy connection timeout
by Daniel Henrique Barboza 08 Aug '14

08 Aug '14

v1->v2: - changed the timeout of cherrypy to 10 minutes Daniel Henrique Barboza (1): Increasing nginx proxy timeout src/kimchi/server.py | 5 +++++ src/nginx.conf.in | 7 +++++++ 2 files changed, 12 insertions(+) -- 1.8.3.1

3 3

[PATCH v4 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 07 Aug '14

07 Aug '14

Changelog from v3: - Fix code style errors Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 25 +++++++++++++++++--- src/kimchi/repositories.py | 11 +++++++++ src/kimchi/utils.py | 16 +++++++++++++ tests/test_model.py | 39 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 39 ++++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 8 files changed, 125 insertions(+), 12 deletions(-) -- 1.9.3

2 4

[PATCH] bug fix: Allow kimchi runs in multiple platforms
by Aline Manera 07 Aug '14

07 Aug '14

Do not hard coded x86_64 while running feature tests. It prevents kimchi to run in different platforms. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index e401c23..8964098 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -59,7 +59,7 @@ SIMPLE_VM_XML = """ <name>A_SIMPLE_VM</name> <memory unit='KiB'>10240</memory> <os> - <type arch='x86_64' machine='pc'>hvm</type> + <type>hvm</type> <boot dev='hd'/> </os> </domain>""" -- 1.9.3

2 2

[PATCH] bug fix: Add spice.css to Makefile and spec files
by Aline Manera 07 Aug '14

07 Aug '14

spice.css was added to source code but the build process was not updated accordingly. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + ui/css/Makefile.am | 2 +- ui/css/spice/Makefile.am | 20 ++++++++++++++++++++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 ui/css/spice/Makefile.am diff --git a/configure.ac b/configure.ac index a260f7d..d9b991a 100644 --- a/configure.ac +++ b/configure.ac @@ -98,6 +98,7 @@ AC_CONFIG_FILES([ ui/Makefile ui/css/Makefile ui/css/novnc/Makefile + ui/css/spice/Makefile ui/css/fonts/Makefile ui/css/fonts/novnc/Makefile ui/images/Makefile diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index acc9bc0..0c6f934 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -166,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* %endif %{_datadir}/kimchi/ui/css/novnc/base.css +%{_datadir}/kimchi/ui/css/spice/spice.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png %{_datadir}/kimchi/ui/images/*.ico diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 7e082dc..2d3d271 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -87,6 +87,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* %endif %{_datadir}/kimchi/ui/css/novnc/base.css +%{_datadir}/kimchi/ui/css/spice/spice.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png %{_datadir}/kimchi/ui/images/*.ico diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index 9a2a29f..a4f575d 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -SUBDIRS = novnc +SUBDIRS = novnc spice if FONTS SUBDIRS += fonts diff --git a/ui/css/spice/Makefile.am b/ui/css/spice/Makefile.am new file mode 100644 index 0000000..1271663 --- /dev/null +++ b/ui/css/spice/Makefile.am @@ -0,0 +1,20 @@ +# +# Kimchi +# +# Copyright IBM, Corp. 2014 +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +cssdir = $(datadir)/kimchi/ui/css/spice + +dist_css_DATA = spice.css -- 1.9.3

2 2

[PATCH V4 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com 07 Aug '14

07 Aug '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V3 -> V4: test case not pass. fix it. V2 -> V3: do not make ticket as sub-resource of a VM V1 -> V2: make ticket as sub-resource of a VM A ticket is the credential to access VM. Only who get the ticket can access a VM. test this patch set: set the ticket $ sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \ "Accept: application/json" https://localhost:8001/vms/test-vm-8/ \ -X PUT -d '{"ticket": {"passwd": "abcd"}}' get the ticket $ sudo curl -k -u <user>:<password> -H "Content-Type: application/json" -H \ "Accept: application/json" https://localhost:8001/vms/test-vm-8/ ShaoHe Feng (5): vm ticket in backend: update API.md vm ticket in backend: update controller and API.json vm ticket in backend: update model vm ticket in backend: update mockmodel vm ticket in backend: update test case docs/API.md | 7 +++++ src/kimchi/API.json | 16 +++++++++++ src/kimchi/control/vms.py | 3 +- src/kimchi/i18n.py | 2 ++ src/kimchi/mockmodel.py | 14 +++++++++ src/kimchi/model/vms.py | 73 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_mockmodel.py | 2 +- tests/test_model.py | 17 ++++++++++- tests/test_rest.py | 12 ++++++++ 9 files changed, 143 insertions(+), 3 deletions(-) -- 1.9.3

4 11

[PATCHv6 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v5>v6, Delete wrong volume type parameter in to_volume_list to avoid breaking volume filtering v4>v5, Because '/tmp' used tmpfs, but kimchi used 'cache=none' when create vm, so when create image on '/tmp' result in create vm fails, fix this error. Also clear some files created in test. (Aline) v3>v4, Aggreated image scanning and name generate logic to vmtemplate.py to avoid duplicate code. Updated testcases accordingly. v2>v3, Clear unused iso link, Adding mockmodel and tests How to test: create a image using: POST /templates {'name':'mytemp', 'disks':[{'base':'a_base_img_path'}]} create a vm using: POST /vms {'template': '/templates/mytemp', 'pool'....} Royce Lv (7): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Fix: Prevent iso links filling in osinfo.py Create volume based on backing store image Update mockmodel of base img vm Add tests for image based template Makefile.am | 1 + contrib/DEBIAN/control.in | 4 +- contrib/kimchi.spec.fedora.in | 2 + contrib/kimchi.spec.suse.in | 2 + docs/API.md | 3 +- docs/README.md | 9 ++- src/kimchi/API.json | 8 ++- src/kimchi/control/storagevolumes.py | 2 +- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 ++ src/kimchi/i18n.py | 8 ++- src/kimchi/imageinfo.py | 66 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 23 ++++---- src/kimchi/model/templates.py | 12 +--- src/kimchi/model/vms.py | 1 + src/kimchi/osinfo.py | 24 +------- src/kimchi/vmtemplate.py | 105 +++++++++++++++++++++++++---------- tests/test_mockmodel.py | 12 ++-- tests/test_model.py | 31 +++++++++++ tests/test_osinfo.py | 8 --- tests/test_rest.py | 44 +++++++++++++-- tests/test_vmtemplate.py | 25 ++++++--- 22 files changed, 288 insertions(+), 108 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

2 8

[PATCH v2 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 06 Aug '14

06 Aug '14

Changelog from v1: - Put function "validate_repo_url" in "src/kimchi/utils.py". Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 25 ++++++++++++++++--- src/kimchi/repositories.py | 11 +++++++++ src/kimchi/utils.py | 15 ++++++++++++ tests/test_model.py | 42 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 41 +++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 8 files changed, 129 insertions(+), 12 deletions(-) -- 1.9.3

2 5

[PATCH 0/3] Fix: Do not pass 'bus' param when attaching disk
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> We passed 'IDE' for default value when attaching cdrom, but 'IDE' bus is not supported on some platform(e.g. power), In fact, kimchi has a embeded scheme to decide which bus is proper, so let backend to decide which bus to use when attaching disk. Royce Lv (3): Delete 'bus' param from backend Delete 'bus' selection from UI Update testcases for bus type decision making src/kimchi/API.json | 6 ------ src/kimchi/model/vmstorages.py | 3 +-- tests/test_model.py | 34 ++++++++++++++++++------------ ui/js/src/kimchi.guest_storage_add.main.js | 28 ------------------------ ui/pages/guest-storage-add.html.tmpl | 13 ------------ 5 files changed, 22 insertions(+), 62 deletions(-) -- 1.8.3.2

3 6

Blocking progress of issue #395: VM console does not work on iPads
by Wen Wang 06 Aug '14

06 Aug '14

Hi all, I can take this bug whereas there is another issue that blocking this progress. I cannot connect to vnc server using iPad with neither Safari nor Chrome. The Chrome on PC works just fine. Please take a look at the connection problem before we go through this issue. Wang Wen

2 5

[PATCH] Increasing nginx proxy timeout
by Daniel Henrique Barboza 06 Aug '14

06 Aug '14

The 60 seconds nginx timeout is creating some issues with actions that takes some time to complete, like creating a VM with a NFS template. After 60 seconds without a backend answer, the user is presented with a 504 Gateway Timeout error. This patch increases the timeout to 600 seconds, 10 minutes. This is enough time to process all the backend requests and ensure that a 504 error will only occur in a legitimate error in the backend. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/nginx.conf.in | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index 3a8dfc5..1d1a398 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -38,6 +38,13 @@ http { access_log /var/log/nginx/access.log main; sendfile on; + # Timeout set to 10 minutes to avoid the 504 Gateway Timeout + # when Kimchi is processing a request. + proxy_connect_timeout 600; + proxy_send_timeout 600; + proxy_read_timeout 600; + send_timeout 600; + server { listen $proxy_ssl_port ssl; -- 1.8.3.1

2 1

[PATCH] Passthrough: Add PCI Devices to VM
by huoyuxin＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Signed-off-by: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> --- ui/css/theme-default/guest-edit.css | 86 ++++++++++++++++++++++++++++++++++- ui/js/src/kimchi.api.js | 55 ++++++++++++++++++++++ ui/js/src/kimchi.guest_edit_main.js | 66 +++++++++++++++++++++++++++ ui/pages/guest-edit.html.tmpl | 28 +++++++++++ 4 files changed, 233 insertions(+), 2 deletions(-) diff --git a/ui/css/theme-default/guest-edit.css b/ui/css/theme-default/guest-edit.css index 1092cc9..c9b43bd 100644 --- a/ui/css/theme-default/guest-edit.css +++ b/ui/css/theme-default/guest-edit.css @@ -17,8 +17,8 @@ */ #guest-edit-window { font-size: 13px; - height: 400px; - width: 610px; + height: 420px; + width: 820px; } #guest-edit-tabs { @@ -266,3 +266,85 @@ float: right; margin-right: 10px; } + +.guest-edit-pci { + height: 79%; + overflow: auto; + font-size: 12px; +} + +.guest-edit-pci .filter { + height: 35px; + margin-right: 5px; + overflow: hidden; +} + +.guest-edit-pci .group { + float: right; +} + +.guest-edit-pci .filter .control { + border: 1px solid #AAAAAA; + font-size: 12px; + background-color: white; +} + +.guest-edit-pci .filter select { + border-right: 0px!important; + border-radius: 7px 0px 0px 7px; + padding: 2px 2px 2px 7px; + width: 100px; +} + +.guest-edit-pci .filter select option { + padding-left: 7px; +} + +.guest-edit-pci .filter input { + border-radius: 0px 7px 7px 0px; + padding: 3px 3px 3px 10px; + width: 200px; + font-style: italic; +} + +.guest-edit-pci .header { + margin-bottom: 8px; + padding-bottom: 2px; + font-weight: bold; + border-bottom: 1px solid #999999; +} + +.guest-edit-pci .item { + margin-bottom: 4px; + overflow: hidden; +} + +.guest-edit-pci .cell { + display: inline-block; + vertical-align: middle; + margin-right: 10px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.guest-edit-pci .item button { + width: 20px; + height: 20px; + float: right; +} + +.guest-edit-pci .name { + width: 18%; + max-width: 18%; +} + +.guest-edit-pci .product { + width: 45%; + max-width: 45%; +} + +.guest-edit-pci .vendor { + width: 25%; + max-width: 25%; +} diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 4562992..ad91ad3 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -1098,5 +1098,60 @@ var kimchi = { kimchi.message.error(data.responseJSON.reason); } }); + }, + + getHostPCIDevices : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/devices?_passthrough=true&_cap=pci', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + getVMPCIDevices : function(id, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+encodeURIComponent(id)+'/hostdevs', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend : true, + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + addVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs', + type : 'POST', + contentType : 'application/json', + dataType : 'json', + data : JSON.stringify(device), + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); + }, + + removeVMPCIDevice : function(vm, device, suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'vms/'+ encodeURIComponent(vm) +'/hostdevs/' + encodeURIComponent(device), + type : 'DELETE', + contentType : 'application/json', + dataType : 'json', + success : suc, + error : err ? err : function(data) { + kimchi.message.error(data.responseJSON.reason); + } + }); } }; diff --git a/ui/js/src/kimchi.guest_edit_main.js b/ui/js/src/kimchi.guest_edit_main.js index 38a2bc0..d002add 100644 --- a/ui/js/src/kimchi.guest_edit_main.js +++ b/ui/js/src/kimchi.guest_edit_main.js @@ -349,6 +349,71 @@ kimchi.guest_edit_main = function() { }); }; + var setupPCIDevice = function(){ + kimchi.getHostPCIDevices(function(hostPCIs){ + kimchi.getVMPCIDevices(kimchi.selectedGuest, function(vmPCIs){ + for(var i=0; i<hostPCIs.length; i++){ + var itemNode = $.parseHTML(kimchi.substitute($('#pci-tmpl').html(),{ + name: hostPCIs[i].name, + product: hostPCIs[i].product.description, + vendor: hostPCIs[i].vendor.description + })); + $(".body", "#form-guest-edit-pci").append(itemNode); + var iconClass = "ui-icon-plus"; + for(var j=0; j<vmPCIs.length; j++){ + if(hostPCIs[i].name==vmPCIs[j].name){ + iconClass = "ui-icon-minus"; + break; + } + } + $("button", itemNode).button({ + icons: { primary: iconClass }, + text: false + }).click(function(){ + var obj = $(this); + if(obj.button("option", "icons").primary == "ui-icon-minus"){ + kimchi.removeVMPCIDevice(kimchi.selectedGuest, obj.parent().prop("id"), function(){ + obj.button("option", "icons", { primary: "ui-icon-plus" }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + }else{ + kimchi.addVMPCIDevice(kimchi.selectedGuest, { name: obj.parent().prop("id") }, function(){ + obj.button("option", "icons", { primary: "ui-icon-minus" }); + filterNodes($("select", "#form-guest-edit-pci").val(), $("input", "#form-guest-edit-pci").val()); + }); + } + }); + } + }); + }); + var filterNodes = function(group, text){ + text = text.toLowerCase(); + $(".body", "#form-guest-edit-pci").children().each(function(){ + var textFilter = $(".name", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".product", this).text().toLowerCase().indexOf(text)!=-1; + textFilter = textFilter || $(".vendor", this).text().toLowerCase().indexOf(text)!=-1; + var display = "none"; + var itemGroup = $("button", this).button("option", "icons").primary; + if(textFilter){ + if(group == "all"){ + display = ""; + }else if(group=="toAdd" && itemGroup=="ui-icon-plus"){ + display = "" + }else if(group == "added" && itemGroup=="ui-icon-minus"){ + display = "" + } + } + $(this).css("display", display); + }); + }; + $("select", "#form-guest-edit-pci").change(function(){ + filterNodes($(this).val(), $("input", "#form-guest-edit-pci").val()); + }); + $("input", "#form-guest-edit-pci").on("keyup", function() { + filterNodes($("select", "#form-guest-edit-pci").val(), $(this).val()); + }); + }; + var initContent = function(guest) { guest['icon'] = guest['icon'] || 'images/icon-vm.png'; $('#form-guest-edit-general').fillWithObject(guest); @@ -379,6 +444,7 @@ kimchi.guest_edit_main = function() { setupInterface(); setupPermission(); + setupPCIDevice(); kimchi.topic('kimchi/vmCDROMAttached').subscribe(onAttached); kimchi.topic('kimchi/vmCDROMReplaced').subscribe(onReplaced); diff --git a/ui/pages/guest-edit.html.tmpl b/ui/pages/guest-edit.html.tmpl index 1c1d7d4..7ae3bfd 100644 --- a/ui/pages/guest-edit.html.tmpl +++ b/ui/pages/guest-edit.html.tmpl @@ -41,6 +41,9 @@ <li> <a href="#form-guest-edit-permission">$_("Permission")</a> </li> + <li> + <a href="#form-guest-edit-pci">$_("PCI Device")</a> + </li> </ul> <form id="form-guest-edit-general"> <fieldset class="guest-edit-fieldset"> @@ -142,6 +145,23 @@ </div> </div> </form> + <form id="form-guest-edit-pci" class="guest-edit-pci"> + <div class="filter"> + <span class="group"> + <select class="control"> + <option value="all">$_("All")</option> + <option value="toAdd">$_("To Add")</option> + <option value="added">$_("Added")</option> + </select><input type="text" class="control" placeholder="$_("filter")"> + </span> + </div> + <div class="header"> + <span class="cell name">$_("Name")</span> + <span class="cell product">$_("Product")</span> + <span class="cell vendor">$_("Vendor")</span> + </div> + <div class="body"></div> + </form> </div> </div> <footer> @@ -228,6 +248,14 @@ <label>{val}</label> </div> </script> +<script id="pci-tmpl" type="text/html"> +<div class="item" id="{name}"> + <span class="cell name" title="{name}">{name}</span> + <span class="cell product" title="{product}">{product}</span> + <span class="cell vendor" title="{vendor}">{vendor}</span> + <button></button> +</div> +</script> <script type="text/javascript"> kimchi.guest_edit_main(); </script> -- 1.7.1

1 0

[PATCHv5 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com 06 Aug '14

06 Aug '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v4>v5, Because '/tmp' used tmpfs, but kimchi used 'cache=none' when create vm, so when create image on '/tmp' result in create vm fails, fix this error. Also clear some files created in test. (Aline) v3>v4, Aggreated image scanning and name generate logic to vmtemplate.py to avoid duplicate code. Updated testcases accordingly. v2>v3, Clear unused iso link, Adding mockmodel and tests How to test: create a image using: POST /templates {'name':'mytemp', 'disks':[{'base':'a_base_img_path'}]} create a vm using: POST /vms {'template': '/templates/mytemp', 'pool'....} Royce Lv (7): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Fix: Prevent iso links filling in osinfo.py Create volume based on backing store image Update mockmodel of base img vm Add tests for image based template Makefile.am | 1 + contrib/DEBIAN/control.in | 4 +- contrib/kimchi.spec.fedora.in | 2 + contrib/kimchi.spec.suse.in | 2 + docs/API.md | 3 +- docs/README.md | 9 ++- src/kimchi/API.json | 8 ++- src/kimchi/control/storagevolumes.py | 2 +- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 ++ src/kimchi/i18n.py | 8 ++- src/kimchi/imageinfo.py | 66 ++++++++++++++++++++++ src/kimchi/mockmodel.py | 21 +++---- src/kimchi/model/templates.py | 12 +--- src/kimchi/model/vms.py | 1 + src/kimchi/osinfo.py | 24 +------- src/kimchi/vmtemplate.py | 104 +++++++++++++++++++++++++---------- tests/test_mockmodel.py | 12 ++-- tests/test_model.py | 31 +++++++++++ tests/test_osinfo.py | 8 --- tests/test_rest.py | 44 +++++++++++++-- tests/test_vmtemplate.py | 25 ++++++--- 22 files changed, 287 insertions(+), 106 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 9

[PATCH 0/3] Fix issue #377 (and other repository patches)
by Crístian Viana 04 Aug '14

04 Aug '14

Crístian Viana (3): Issue #377: Validate repository URLs typo: Fix "repositorie" repository: Remove error message prefix src/kimchi/mockmodel.py | 41 ++++++++++++++++++++++++++++--- src/kimchi/repositories.py | 29 +++++++++++++++++++++- tests/test_model.py | 42 ++++++++++++++++++++++++++++++-- tests/test_rest.py | 41 +++++++++++++++++++++++++++++-- ui/js/src/kimchi.repository_add_main.js | 3 +-- ui/js/src/kimchi.repository_edit_main.js | 3 +-- ui/pages/i18n.json.tmpl | 1 - 7 files changed, 147 insertions(+), 13 deletions(-) -- 1.9.3

2 7

[PATCH] set the password for spice and VNC page.
by shaohef＠linux.vnet.ibm.com 04 Aug '14

04 Aug '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> set a cookie to store the ticket before connect a VM. get the password from cookie and pass it to spice and VNC server. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/novnc/main.js | 10 +++++++++- ui/js/src/kimchi.guest_main.js | 22 ++++++++++++++++------ ui/pages/spice.html.tmpl | 10 +++++++++- 3 files changed, 34 insertions(+), 8 deletions(-) diff --git a/ui/js/novnc/main.js b/ui/js/novnc/main.js index 22037ec..84a813b 100644 --- a/ui/js/novnc/main.js +++ b/ui/js/novnc/main.js @@ -79,7 +79,15 @@ if (token) { WebUtil.createCookie('token', token, 1) } -password = WebUtil.getQueryVar('password', ''); +// password = WebUtil.getQueryVar('password', ''); +var cookieRe = new RegExp(';?\\\s*(ticketVM)=(\s*[^;]*);?', 'g'); +var match = cookieRe.exec(document.cookie); +var password = match ? decodeURIComponent(match[2]) : ''; +if (match) { + var utcString = new Date().toUTCString(); + document.cookie = 'ticketVM' + '=; expires=' + utcString; +} + path = WebUtil.getQueryVar('path', 'websockify'); if ((!host) || (!port)) { diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index ff6f2e1..1c1428f 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -150,12 +150,22 @@ kimchi.vmedit = function(event) { kimchi.openVmConsole = function(event) { var vm=$(this).closest('li[name=guest]'); var vmObject=vm.data(); - if (vmObject.graphics['type'] == 'vnc') { - kimchi.vncToVM(vm.attr('id')); - } - else if (vmObject.graphics['type'] == 'spice') { - kimchi.spiceToVM(vm.attr('id')); - } + kimchi.retrieveVM(vm.attr('id'), function(result) { + if (result.ticket.expire && result.ticket.expire < 0) { + kimchi.message.error('please reset your password!'); + return; + } + result.ticket.passwd != null && kimchi.cookie.set("ticketVM", result.ticket.passwd, 100); + if (vmObject.graphics['type'] == 'vnc') { + kimchi.vncToVM(vm.attr('id')); + } + else if (vmObject.graphics['type'] == 'spice') { + kimchi.spiceToVM(vm.attr('id')); + } + }, function(err) { + kimchi.message.error(err.responseJSON.reason); + } + ); }; diff --git a/ui/pages/spice.html.tmpl b/ui/pages/spice.html.tmpl index 213d216..cb7c331 100644 --- a/ui/pages/spice.html.tmpl +++ b/ui/pages/spice.html.tmpl @@ -64,6 +64,14 @@ host = getParameter("listen"); port = getParameter("port"); token = getParameter("token"); + var cookieRe = new RegExp(';?\\\s*(ticketVM)=(\s*[^;]*);?', 'g'); + var match = cookieRe.exec(document.cookie); + password = match ? decodeURIComponent(match[2]) : ''; + if (match) { + var utcString = new Date().toUTCString(); + document.cookie = 'ticketVM' + '=; expires=' + utcString; + } + document.getElementById("host").value = host; document.getElementById("port").value = port; if ((!host) || (!port)) { @@ -82,7 +90,7 @@ screen_id : "spice-screen", dump_id : "debug-div", message_id : "message-div", - password : "", + password : password, onerror : spice_error }); } catch (e) { -- 1.9.3

4 4

[PATCH] Update license to LGPLv3
by Aline Manera 04 Aug '14

04 Aug '14

As Kimchi depends on some imported code (src/kimchi/websocket.py and src/kimchi/websockify.py) under LGPLv3, its license also needs to be upgraded to LGPLv3. COPYING.LGPL was updated according to http://www.gnu.org/licenses/lgpl-3.0.txt As all Kimchi files have license header indicating LGPL 2.1 or later, they don't need to be updated. For reference: http://gplv3.fsf.org/dd3-faq Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- COPYING | 2 +- COPYING.LGPL | 657 +++++++++++++++-------------------------------------------- 2 files changed, 161 insertions(+), 498 deletions(-) diff --git a/COPYING b/COPYING index 6129b48..1701a50 100644 --- a/COPYING +++ b/COPYING @@ -1,7 +1,7 @@ Kimchi is distributed pursuant to the terms of two different licenses. The user interface (located in ui/ in this distribution) is governed by the Apache License version 2.0. The rest of this distribution is -governed by the GNU Lesser General Public License version 2.1. +governed by the GNU Lesser General Public License version 3. See COPYING.LGPL and COPYING.ASL2. diff --git a/COPYING.LGPL b/COPYING.LGPL index 4362b49..65c5ca8 100644 --- a/COPYING.LGPL +++ b/COPYING.LGPL @@ -1,502 +1,165 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 + GNU LESSER GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - 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 - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! + This version of the GNU Lesser General Public License incorporates +the terms and conditions of version 3 of the GNU General Public +License, supplemented by the additional permissions listed below. + + 0. Additional Definitions. + + As used herein, "this License" refers to version 3 of the GNU Lesser +General Public License, and the "GNU GPL" refers to version 3 of the GNU +General Public License. + + "The Library" refers to a covered work governed by this License, +other than an Application or a Combined Work as defined below. + + An "Application" is any work that makes use of an interface provided +by the Library, but which is not otherwise based on the Library. +Defining a subclass of a class defined by the Library is deemed a mode +of using an interface provided by the Library. + + A "Combined Work" is a work produced by combining or linking an +Application with the Library. The particular version of the Library +with which the Combined Work was made is also called the "Linked +Version". + + The "Minimal Corresponding Source" for a Combined Work means the +Corresponding Source for the Combined Work, excluding any source code +for portions of the Combined Work that, considered in isolation, are +based on the Application, and not on the Linked Version. + + The "Corresponding Application Code" for a Combined Work means the +object code and/or source code for the Application, including any data +and utility programs needed for reproducing the Combined Work from the +Application, but excluding the System Libraries of the Combined Work. + + 1. Exception to Section 3 of the GNU GPL. + + You may convey a covered work under sections 3 and 4 of this License +without being bound by section 3 of the GNU GPL. + + 2. Conveying Modified Versions. + + If you modify a copy of the Library, and, in your modifications, a +facility refers to a function or data to be supplied by an Application +that uses the facility (other than as an argument passed when the +facility is invoked), then you may convey a copy of the modified +version: + + a) under this License, provided that you make a good faith effort to + ensure that, in the event an Application does not supply the + function or data, the facility still operates, and performs + whatever part of its purpose remains meaningful, or + + b) under the GNU GPL, with none of the additional permissions of + this License applicable to that copy. + + 3. Object Code Incorporating Material from Library Header Files. + + The object code form of an Application may incorporate material from +a header file that is part of the Library. You may convey such object +code under terms of your choice, provided that, if the incorporated +material is not limited to numerical parameters, data structure +layouts and accessors, or small macros, inline functions and templates +(ten or fewer lines in length), you do both of the following: + + a) Give prominent notice with each copy of the object code that the + Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the object code with a copy of the GNU GPL and this license + document. + + 4. Combined Works. + + You may convey a Combined Work under terms of your choice that, +taken together, effectively do not restrict modification of the +portions of the Library contained in the Combined Work and reverse +engineering for debugging such modifications, if you also do each of +the following: + + a) Give prominent notice with each copy of the Combined Work that + the Library is used in it and that the Library and its use are + covered by this License. + + b) Accompany the Combined Work with a copy of the GNU GPL and this license + document. + + c) For a Combined Work that displays copyright notices during + execution, include the copyright notice for the Library among + these notices, as well as a reference directing the user to the + copies of the GNU GPL and this license document. + + d) Do one of the following: + + 0) Convey the Minimal Corresponding Source under the terms of this + License, and the Corresponding Application Code in a form + suitable for, and under terms that permit, the user to + recombine or relink the Application with a modified version of + the Linked Version to produce a modified Combined Work, in the + manner specified by section 6 of the GNU GPL for conveying + Corresponding Source. + + 1) Use a suitable shared library mechanism for linking with the + Library. A suitable mechanism is one that (a) uses at run time + a copy of the Library already present on the user's computer + system, and (b) will operate properly with a modified version + of the Library that is interface-compatible with the Linked + Version. + + e) Provide Installation Information, but only if you would otherwise + be required to provide such information under section 6 of the + GNU GPL, and only to the extent that such information is + necessary to install and execute a modified version of the + Combined Work produced by recombining or relinking the + Application with a modified version of the Linked Version. (If + you use option 4d0, the Installation Information must accompany + the Minimal Corresponding Source and Corresponding Application + Code. If you use option 4d1, you must provide the Installation + Information in the manner specified by section 6 of the GNU GPL + for conveying Corresponding Source.) + + 5. Combined Libraries. + + You may place library facilities that are a work based on the +Library side by side in a single library together with other library +facilities that are not Applications and are not covered by this +License, and convey such a combined library under terms of your +choice, if you do both of the following: + + a) Accompany the combined library with a copy of the same work based + on the Library, uncombined with any other library facilities, + conveyed under the terms of this License. + + b) Give prominent notice with the combined library that part of it + is a work based on the Library, and explaining where to find the + accompanying uncombined form of the same work. + + 6. Revised Versions of the GNU Lesser General Public License. + + The Free Software Foundation may publish revised and/or new versions +of the GNU Lesser General Public License from time to time. Such new +versions will be similar in spirit to the present version, but may +differ in detail to address new problems or concerns. + + Each version is given a distinguishing version number. If the +Library as you received it specifies that a certain numbered version +of the GNU Lesser General Public License "or any later version" +applies to it, you have the option of following the terms and +conditions either of that published version or of any later version +published by the Free Software Foundation. If the Library as you +received it does not specify a version number of the GNU Lesser +General Public License, you may choose any version of the GNU Lesser +General Public License ever published by the Free Software Foundation. + + If the Library as you received it specifies that a proxy can decide +whether future versions of the GNU Lesser General Public License shall +apply, that proxy's public statement of acceptance of any version is +permanent authorization for you to choose that version for the +Library. -- 1.9.3

2 2

[PATCH 0/2] Remove useless files
by Aline Manera 04 Aug '14

04 Aug '14

Aline Manera (2): Remove useless image files Remove useless jquery files contrib/kimchi.spec.fedora.in | 2 - contrib/kimchi.spec.suse.in | 2 - ui/images/progressing.gif | Bin 1152 -> 0 bytes ui/images/theme-default/bg-black-linen.png | Bin 84780 -> 0 bytes ui/images/theme-default/bg-navbar.png | Bin 3043 -> 0 bytes ui/js/jquery-ui.js | 14936 --------------------------- ui/js/jquery.min.js | 5 - 7 files changed, 14945 deletions(-) delete mode 100644 ui/images/progressing.gif delete mode 100644 ui/images/theme-default/bg-black-linen.png delete mode 100644 ui/images/theme-default/bg-navbar.png delete mode 100644 ui/js/jquery-ui.js delete mode 100644 ui/js/jquery.min.js -- 1.9.3

2 6