- Kimchi-devel - oVirt List Archives

[PATCHv2 0/2] Make vms model singleton
by lvroyce＠linux.vnet.ibm.com 10 Mar '14

10 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Everytime when when VMsModel.get_list() need to be called one more background task to collect vm status is started. Fix this by making vms model singleton. Royce Lv (2): Make vms model to be a singleton Hack test_model to support vm model singleton src/kimchi/model/vms.py | 3 +++ tests/test_model.py | 2 ++ 2 files changed, 5 insertions(+) -- 1.8.1.2

5 10

[PATCH] [UI] Window - Correct Footer Height
by Hongliang Wang 07 Mar '14

07 Mar '14

The footer height is 56 pixel, though window content only leaves 48 pixel for it by: margin: 48px 0; Fix it in this patch. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/window.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/theme-default/window.css b/ui/css/theme-default/window.css index 09a9840..7e057fd 100644 --- a/ui/css/theme-default/window.css +++ b/ui/css/theme-default/window.css @@ -77,7 +77,7 @@ top: 0; bottom: 0; overflow: auto; - margin: 48px 0; + margin: 48px 0 56px; } .window .close { -- 1.8.1.4

4 3

[PATCHv1 0/2] fix create vm on logical pool
by lvroyce＠linux.vnet.ibm.com 07 Mar '14

07 Mar '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> VG path is create under 'dev' and logical volume's format should be raw, to avoid qcow2 write exceed problem. Royce Lv (2): Fix storage volume format on logical pool for vm logical pool: Fix logical pool target path src/kimchi/model/libvirtstoragepool.py | 2 +- src/kimchi/vmtemplate.py | 8 +++++--- tests/test_storagepool.py | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) -- 1.8.1.2

2 4

[PATCH] Use a pool of threads to valid all remote ISOs in parallel
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> That way we can reduce processing time in 8s. Without threads the requests takes 15s to complete: GET http://localhost:8000/config/distros 200 OK 10.64s And with the pool of threads it takes 2s: GET http://localhost:8000/config/distros 200 OK 2.01s Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/config.py | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/kimchi/model/config.py b/src/kimchi/model/config.py index d44ef90..3580ad3 100644 --- a/src/kimchi/model/config.py +++ b/src/kimchi/model/config.py @@ -17,6 +17,8 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +from multiprocessing.pool import ThreadPool + import cherrypy from kimchi.basemodel import Singleton @@ -91,12 +93,16 @@ class DistrosModel(object): self.distros = distroloader.get() def get_list(self): - res = [] - # only return distro with valid URL - for distro, data in self.distros.iteritems(): - url = data['path'] - if check_url_path(url): - res.append(distro) + def validate_distro(distro): + if check_url_path(distro['path']): + return distro['name'] + + n_processes = len(self.distros.keys()) + pool = ThreadPool(processes=n_processes) + map_res = pool.map_async(validate_distro, self.distros.values()) + pool.close() + pool.join() + res = list(set(map_res.get()) - set([None])) return sorted(res) -- 1.7.10.4

2 3

[PATCH] bug fix: "sudo: sorry, you must have a tty to run sudo".
by Paulo Vital 07 Mar '14

07 Mar '14

The authorization code executes some sudo commands in backend to check if the user used to login in Kimchi has permission to execute privileged commands. By default, sudo needs a TTY to be executed and when Kimchi is executed as a service by systemd (systemctl start kimchid.service), it runs disconnected from any TTY, and sudo returns an error and the message: "sudo: sorry, you must have a tty to run sudo". This patch sets in Kimchi service file for systemd the /dev/tty11 as default TTY to execute the service. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- contrib/kimchid.service.fedora | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/kimchid.service.fedora b/contrib/kimchid.service.fedora index 7abe49b..5f274fb 100644 --- a/contrib/kimchid.service.fedora +++ b/contrib/kimchid.service.fedora @@ -8,6 +8,9 @@ Type=simple ExecStart=/usr/bin/kimchid ExecStop=/bin/kill -TERM $MAINPID EnvironmentFile=/etc/kimchi/kimchi.conf +StandardInput=tty +StandardOutput=tty +TTYPath=/dev/tty11 [Install] WantedBy=multi-user.target -- 1.8.3.1

2 2

[PATCH 0/3] Fix issue #301
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Aline Manera (3): issue #301: Only list remote ISOs with valid URL issue #301: Add a loading message while listing default remote ISOs Update distros JSON files to always point to a valid URL po/en_US.po | 8 +++++++- po/kimchi.pot | 8 +++++++- po/pt_BR.po | 8 +++++++- po/zh_CN.po | 8 +++++++- src/distros.d/debian.json | 4 ++-- src/distros.d/gentoo.json | 6 +++--- src/kimchi/model/config.py | 10 ++++++++-- ui/js/src/kimchi.template_add_main.js | 4 ++++ ui/pages/template-add.html.tmpl | 12 +++++++++++- 9 files changed, 56 insertions(+), 12 deletions(-) -- 1.7.10.4

3 8

[PATCH] Increase memory size for vm template on ppc platform
by Mark Wu 07 Mar '14

07 Mar '14

The minimum memory size required by graphics installer is 1280. So to allow user install vm in graphics, this patch increases it to 1280. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- src/kimchi/osinfo.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index a50daae..106cc0e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -42,11 +42,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', sound_model= 'ich6')}, 'power': {'old': dict(common_spec, disk_bus='scsi', nic_model='spapr-vlan', cdrom_bus='scsi', - kbd_bus='usb', mouse_bus='usb'), + kbd_bus='usb', mouse_bus='usb', + memory=1280), 'modern': dict(common_spec, disk_bus='virtio', nic_model='virtio', cdrom_bus='scsi', kbd_bus='usb', - mouse_bus='usb')}} + mouse_bus='usb', memory=1280)}} modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', -- 1.8.4.2

2 1

[PATCH 1/3] Fix issue #339: Enable backend to handle not persistent pools
by Rodrigo Trujillo 07 Mar '14

07 Mar '14

This patch changes the error message when storage pool is not found and adds the isPersistent checkings, in order to return correctly from deactivate function. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/control/storagepools.py | 3 ++- src/kimchi/model/storagepools.py | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index 62f9525..b75bca0 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -90,7 +90,8 @@ class StoragePool(Resource): 'source': self.info['source'], 'type': self.info['type'], 'nr_volumes': self.info['nr_volumes'], - 'autostart': self.info['autostart']} + 'autostart': self.info['autostart'], + 'persistent': self.info['persistent']} val = self.info.get('task_id') if val: diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index fe70fa1..fea19f6 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -175,7 +175,7 @@ class StoragePoolModel(object): return conn.storagePoolLookupByName(name.encode("utf-8")) except libvirt.libvirtError as e: if e.get_error_code() == libvirt.VIR_ERR_NO_STORAGE_POOL: - raise NotFoundError("KCHTMPL0002E", {'name': name}) + raise NotFoundError("KCHPOOL0002E", {'name': name}) else: raise @@ -229,6 +229,7 @@ class StoragePoolModel(object): pool = self.get_storagepool(name, self.conn) info = pool.info() autostart = True if pool.autostart() else False + persistent = True if pool.isPersistent() else False xml = pool.XMLDesc(0) path = xmlutils.xpath_get_text(xml, "/pool/target/path")[0] pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] @@ -254,7 +255,8 @@ class StoragePoolModel(object): 'capacity': info[1], 'allocated': info[2], 'available': info[3], - 'nr_volumes': nr_volumes} + 'nr_volumes': nr_volumes, + 'persistent': persistent} if not pool.isPersistent(): # Deal with deep scan generated pool @@ -354,10 +356,15 @@ class StoragePoolModel(object): {'name': name, 'server': source['addr']}) return try: + persistent = pool.isPersistent() pool.destroy() except libvirt.libvirtError as e: raise OperationFailed("KCHPOOL0010E", {'name': name, 'err': e.get_error_message()}) + # If pool was not persistent, then it was erased by destroy() and + # must return nothing here, to trigger _redirect() and avoid errors + if not persistent: + return "" def delete(self, name): if self._pool_used_by_template(name): -- 1.8.5.3

3 6

[PATCH] Fix rollback order
by Rodrigo Trujillo 07 Mar '14

07 Mar '14

This patch changes the order of two rollback calls, avoiding the chance of tests left a test file or a test vm in the system. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- tests/test_model.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test_model.py b/tests/test_model.py index f849039..1fa40fa 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -179,10 +179,10 @@ class ModelTests(unittest.TestCase): iso_path = '/tmp/existent.iso' iso_path2 = '/tmp/existent2.iso' open(iso_path, 'w').close() - open(iso_path2, 'w').close() - wrong_iso_path = '/nonexistent.iso' rollback.prependDefer(os.remove, iso_path) + open(iso_path2, 'w').close() rollback.prependDefer(os.remove, iso_path2) + wrong_iso_path = '/nonexistent.iso' # Create a cdrom cdrom_args = {"type": "cdrom", @@ -546,9 +546,9 @@ class ModelTests(unittest.TestCase): params_1 = {'name': 'kimchi-vm1', 'template': '/templates/test'} params_2 = {'name': 'kimchi-vm2', 'template': '/templates/test'} inst.vms_create(params_1) - inst.vms_create(params_2) rollback.prependDefer(self._rollback_wrapper, inst.vm_delete, 'kimchi-vm1') + inst.vms_create(params_2) rollback.prependDefer(self._rollback_wrapper, inst.vm_delete, 'kimchi-vm2') -- 1.8.5.3

3 2

[PATCH] bug fix: Set default flags for virDomain.state() function
by Aline Manera 07 Mar '14

07 Mar '14

From: Aline Manera <alinefm(a)br.ibm.com> Some libvirt versions do not set the default value for flags, so we need to explicity set it. libvirt.virDomain.state = state(self, flags) unbound libvirt.virDomain method Otherwise, the following error will be raised [06/Mar/2014:23:40:05] HTTP Traceback (most recent call last): File "/usr/lib/python2.7/dist-packages/cherrypy/_cprequest.py", line 656, in respond response.body = self.handler() File "/usr/lib/python2.7/dist-packages/cherrypy/lib/encoding.py", line 188, in __call__ self.body = self.oldhandler(*args, **kwargs) File "/usr/lib/python2.7/dist-packages/cherrypy/_cpdispatch.py", line 34, in __call__ return self.callable(*self.args, **self.kwargs) File "/home/alinefm/kimchi/src/kimchi/control/base.py", line 71, in wrapper ident = fn(*model_args) File "/home/alinefm/kimchi/src/kimchi/model/networks.py", line 214, in deactivate if self._get_vms_attach_to_a_network(name, "running"): File "/home/alinefm/kimchi/src/kimchi/model/networks.py", line 199, in _get_vms_attach_to_a_network state == dom.state()[0]): File "/home/alinefm/kimchi/src/kimchi/model/libvirtconnection.py", line 62, in wrapper ret = f(*args, **kwargs) TypeError: state() takes exactly 2 arguments (1 given) Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/model/networks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index f032875..0d6ccec 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -196,7 +196,7 @@ class NetworkModel(object): for dom in conn.listAllDomains(0): networks = self._vm_get_networks(dom) if network in networks and (state is None or - state == dom.state()[0]): + state == dom.state(0)[0]): vms.append(dom.name()) return vms -- 1.7.10.4

4 4