- Kimchi-devel - oVirt List Archives

[PATCH V3 0/4] support create/delete VMIface
by shaohef＠linux.vnet.ibm.com 25 Jan '14

25 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 rebase V1 -> V2 do not support hot plugging attach/detach interface we will support this feature after we implement events. 1. get all vms: $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms 2. get all networks: $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/networks 3. get all ifaces of a vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-0/ifaces/ [ { "mac":"52:54:00:00:00:01", "model":"virtio", "type":"network", "network":"default" } ] 4. attach a new iface to vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-8/ifaces -X POST -d ' { "type":"network", "network":"test-network-0" } ' { "mac":"52:54:00:00:00:0d", "model":"virtio", "type":"network", "network":"test-network-0" } 5. detach a iface from vm $ curl -u <user> -H 'Accept: application/json' -H 'Content-type: application/json' http://localhost:8000/vms/test-vm-8/ifaces/52:54:00:00:00:0d -X DELETE ShaoHe Feng (4): support create/delete VMIface: update model support create/delete VMIface: update mockmodel support create/delete VMIface: update API.json support create/delete VMIface: update testcase src/kimchi/API.json | 21 +++++++++++++++++++ src/kimchi/mockmodel.py | 21 +++++++++++++++++++ src/kimchi/model.py | 56 ++++++++++++++++++++++++++++++++++++++++++++++++- tests/test_model.py | 22 +++++++++++++++++++ tests/test_rest.py | 27 ++++++++++++++++++++++++ 5 files changed, 146 insertions(+), 1 deletion(-) -- 1.8.4.2

3 12

[PATCH V2] bug fix: guest iface does not return model if no model is found
by shaohef＠linux.vnet.ibm.com 25 Jan '14

25 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> On some distros, libvirt will not set model automatically. if no model is found, guest iface will not return this field. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: SAline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 2 +- src/kimchi/model.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index f6f89f9..580728c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -180,7 +180,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. - * model: model of emulated network interface card. It will be one of these models: + * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the interface type is network. diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 63e748e..544fa80 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1001,7 +1001,8 @@ class Model(object): info['type'] = iface.attrib['type'] info['mac'] = iface.mac.get('address') - info['model'] = iface.model.get('type') + if iface.find("model") is not None: + info['model'] = iface.model.get('type') if info['type'] == 'network': info['network'] = iface.source.get('network') if info['type'] == 'bridge': -- 1.8.4.2

3 3

Help from UI experts to my latest patch
by Rodrigo Trujillo 25 Jan '14

25 Jan '14

Hi guys, I wonder if someone expert in UI can help me with my latest patch. Actually, the patch: [PATCH V2 7/7] (WIP) Storagepool SCSI/FC: Draft UI to allow user to select a LUN to new VM You guys will find the code some TODO's and FIXME I need to popup a window with LUN's names and allow user to select one of them. Then retrieve this selection. I think this is not that complicated, but I could not research deeper how to do it. See an example below: ********************************* (X) Close Select Host () Lun 1 () Lun 2 () Lun xxx ---------------------------------------- ________ | Select | ********************************* Appreciate any help Regards, Rodrigo

3 3

[PATCH] bug fix: guest iface does not return model if no model is found
by shaohef＠linux.vnet.ibm.com 24 Jan '14

24 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> On some distros, libvirt will not set model automatically. if no model is found, guest iface will not return this field. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- docs/API.md | 2 +- src/kimchi/model.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/API.md b/docs/API.md index f6f89f9..580728c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -180,7 +180,7 @@ A interface represents available network interface on VM. * bridge *(optional)*: the name of resource bridge, only be available when the interface type is bridge. * mac: Media Access Control Address of the VM interface. - * model: model of emulated network interface card. It will be one of these models: + * model *(optional)*: model of emulated network interface card. It will be one of these models: ne2k_pci, i82551, i82557b, i82559er, rtl8139, e1000, pcnet and virtio. * network *(optional)*: the name of resource network, only be available when the interface type is network. diff --git a/src/kimchi/model.py b/src/kimchi/model.py index 63e748e..a3a2576 100644 --- a/src/kimchi/model.py +++ b/src/kimchi/model.py @@ -1001,7 +1001,8 @@ class Model(object): info['type'] = iface.attrib['type'] info['mac'] = iface.mac.get('address') - info['model'] = iface.model.get('type') + if iface.find("model"): + info['model'] = iface.model.get('type') if info['type'] == 'network': info['network'] = iface.source.get('network') if info['type'] == 'bridge': -- 1.8.4.2

1 0

[PATCH 0/7] VM supports interfaces
by shaohef＠linux.vnet.ibm.com 24 Jan '14

24 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> $ curl -u user -H 'Accept: application/json' -H 'Content-type: application/json' \ http://localhost:800/vms/test-vm-8/ifaces/ [ { "mac":"52:54:00:00:00:08", "model":"virtio", "type":"network", "network":"default", "name":"52:54:00:00:00:08" } ] $ curl -u user -H 'Accept: application/json' -H 'Content-type: application/json' \ http://localhost:800/vms/test-vm-8/ifaces/52:54:00:00:00:08 { "mac":"52:54:00:00:00:08", "model":"virtio", "type":"network", "network":"default", "name":"52:54:00:00:00:08" } ShaoHe Feng (7): Add a control.vm module add a method to load vms sub collection automatically VM supports interfaces: update API VM supports interfaces: update model VM supports interfaces: update controller VM supports interfaces: update mockmodel VM supports interfaces: update testcase Makefile.am | 1 + configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 47 ++++++++++++++++++++++++++++ src/kimchi/control/Makefile.am | 2 ++ src/kimchi/control/vm/Makefile.am | 32 +++++++++++++++++++ src/kimchi/control/vm/__init__.py | 66 +++++++++++++++++++++++++++++++++++++++ src/kimchi/control/vm/ifaces.py | 48 ++++++++++++++++++++++++++++ src/kimchi/control/vms.py | 9 ++++++ src/kimchi/mockmodel.py | 31 ++++++++++++++++++ src/kimchi/model.py | 31 ++++++++++++++++++ tests/test_model.py | 19 +++++++++++ tests/test_rest.py | 31 ++++++++++++++++++ 14 files changed, 320 insertions(+) create mode 100644 src/kimchi/control/vm/Makefile.am create mode 100644 src/kimchi/control/vm/__init__.py create mode 100644 src/kimchi/control/vm/ifaces.py -- 1.8.4.2

4 21

[PATCH] bug fix: Use cherrypy host to run feature tests instead of localhost
by Aline Manera 24 Jan '14

24 Jan '14

From: Aline Manera <alinefm(a)br.ibm.com> When user specifies a different IP/hostname to run kimchi, the feature tests related to ISO streaming will fail as it points to localhost and kimchi is running in other address. Fix it by using cherrypy host to run the feature tests. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/featuretests.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 32ad2ec..1557dd9 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -93,8 +93,10 @@ class FeatureTests(object): @staticmethod def qemu_supports_iso_stream(): - cmd = "qemu-io -r http://127.0.0.1:%d/images/icon-fedora.png \ - -c 'read -v 0 512'" % cherrypy.server.socket_port + host = cherrypy.server.socket_host + port = cherrypy.server.socket_port + cmd = "qemu-io -r http://%s:%d/images/icon-fedora.png \ + -c 'read -v 0 512'" % (host, port) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True) stdout, stderr = proc.communicate() @@ -102,8 +104,10 @@ class FeatureTests(object): @staticmethod def qemu_iso_stream_dns(): - cmd = ["qemu-io", "-r", "http://localhost:%d/images/icon-fedora.png" % - cherrypy.server.socket_port, "-c", "'read -v 0 512'"] + host = cherrypy.server.socket_host + port = cherrypy.server.socket_port + cmd = ["qemu-io", "-r", "http://%s:%d/images/icon-fedora.png" % + (host, port), "-c", "'read -v 0 512'"] proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) thread = threading.Thread(target=proc.communicate) -- 1.7.10.4

2 2

[PATCH v2 0/3]
by Mark Wu 24 Jan '14

24 Jan '14

This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler. Changes: v2: Rebase Remove the optimization for plugin paths since it just have a few instantiations. Mark Wu (3): Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Allow plugin use kimchi's ui handler src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 155 +++++++++++++++++++----------------------------- src/kimchi/root.py | 23 ++++--- src/kimchi/server.py | 14 +++-- src/kimchi/template.py | 17 ++++-- src/kimchi/utils.py | 6 +- src/kimchid.in | 7 ++- tests/test_config.py | 73 +++++++++++++++++++++++ tests/test_plugin.py | 4 +- 9 files changed, 178 insertions(+), 125 deletions(-) create mode 100644 tests/test_config.py -- 1.8.4.2

2 4

[PATCH] bug fix: test case can not find plugin, fix it
by shaohef＠linux.vnet.ibm.com 24 Jan '14

24 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> $ sudo ./run_tests.sh test_rest Failed to import plugin plugins.sample.Drawings That's because plugin is not in src/ Add the plugin path in run_tests.sh Remove the plugin path from test_plugin.py Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- tests/run_tests.sh.in | 4 ++-- tests/test_plugin.py | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/run_tests.sh.in b/tests/run_tests.sh.in index 2baf66d..038e8fa 100644 --- a/tests/run_tests.sh.in +++ b/tests/run_tests.sh.in @@ -31,7 +31,7 @@ else fi if [ "$HAVE_UNITTEST" != "yes" -o "$PYTHON_VER" == "2.6" ]; then - PYTHONPATH=../src:./ unit2 $ARGS + PYTHONPATH=../src:./:../ unit2 $ARGS else - PYTHONPATH=../src python -m unittest $ARGS + PYTHONPATH=../src:../ python -m unittest $ARGS fi diff --git a/tests/test_plugin.py b/tests/test_plugin.py index 42c87a9..607dd55 100644 --- a/tests/test_plugin.py +++ b/tests/test_plugin.py @@ -22,7 +22,6 @@ import json import os -import sys import unittest @@ -32,7 +31,6 @@ from functools import partial import kimchi.mockmodel import kimchi.server import utils -from kimchi import config test_server = None @@ -48,7 +46,6 @@ def setUpModule(): host = '127.0.0.1' port = utils.get_free_port('http') ssl_port = None - sys.path.append(config.get_prefix()) test_server = utils.run_server(host, port, ssl_port, test_mode=True, model=model) -- 1.8.4.2

2 2

[PATCH V3 0/6] VM supports interfaces
by shaohef＠linux.vnet.ibm.com 24 Jan '14

24 Jan '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 rebase V1 -> V2 use the "mac" to identify the iface and remove "name" parameter $ curl -u user -H 'Accept: application/json' -H 'Content-type: application/json' \ http://localhost:800/vms/test-vm-8/ifaces/ [ { "mac":"52:54:00:00:00:08", "model":"virtio", "type":"network", "network":"default", "name":"52:54:00:00:00:08" } ] $ curl -u user -H 'Accept: application/json' -H 'Content-type: application/json' \ http://localhost:800/vms/test-vm-8/ifaces/52:54:00:00:00:08 { "mac":"52:54:00:00:00:08", "model":"virtio", "type":"network", "network":"default", "name":"52:54:00:00:00:08" } ShaoHe Feng (6): Add a control.vm module VM supports interfaces: update API VM supports interfaces: update model VM supports interfaces: update controller VM supports interfaces: update mockmodel VM supports interfaces: update testcase Makefile.am | 1 + configure.ac | 1 + contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + docs/API.md | 46 +++++++++++++++++++++++++++++++++++++ src/kimchi/control/Makefile.am | 2 ++ src/kimchi/control/vm/Makefile.am | 32 ++++++++++++++++++++++++++ src/kimchi/control/vm/__init__.py | 30 ++++++++++++++++++++++++ src/kimchi/control/vm/ifaces.py | 48 +++++++++++++++++++++++++++++++++++++++ src/kimchi/control/vms.py | 3 +++ src/kimchi/mockmodel.py | 33 +++++++++++++++++++++++++++ src/kimchi/model.py | 35 ++++++++++++++++++++++++++++ tests/test_model.py | 19 ++++++++++++++++ tests/test_rest.py | 31 +++++++++++++++++++++++++ 14 files changed, 283 insertions(+) create mode 100644 src/kimchi/control/vm/Makefile.am create mode 100644 src/kimchi/control/vm/__init__.py create mode 100644 src/kimchi/control/vm/ifaces.py -- 1.8.4.2

3 14

[PATCH 0/3] Allow plugin use kimchi s ui handler
by Mark Wu 24 Jan '14

24 Jan '14

This series of patches reorganize kimchi's path vars generation code to allow plugin use kimchi s ui handler. Mark Wu (3): Reorganize the kimchi's paths gereneration code Add test cases for paths generation code Allow plugin use kimchi's ui handler src/kimchi/cachebust.py | 4 +- src/kimchi/config.py.in | 164 ++++++++++++++++++++---------------------------- src/kimchi/root.py | 39 +++++++----- src/kimchi/server.py | 14 +++-- src/kimchi/template.py | 17 +++-- src/kimchi/utils.py | 6 +- src/kimchid.in | 7 ++- tests/test_config.py | 73 +++++++++++++++++++++ tests/test_plugin.py | 4 +- 9 files changed, 196 insertions(+), 132 deletions(-) create mode 100644 tests/test_config.py -- 1.8.4.2

3 9