July 2014 - Kimchi-devel - oVirt List Archives

[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 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

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

[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

PCI Device Passthrough UI Mockup
by Yu Xin Huo 01 Aug '14

01 Aug '14

3 6

[PATCH v9 0/5] Host device passthrough: Summary
by Zhou Zheng Sheng 01 Aug '14

01 Aug '14

Hi all, v9: Update API.md, API.json, unit tests and MockModel. Investigated distro compatibility problems, adapted to Fedora 20, Fedora 19 and Ubuntu 14.04. v8: Change the URI for listing affected passthrough devices, suggested by Aline. Move hostdev.py to src/kimchi/model.py. Still discussing API with the front-end developer. Once the API accepted, The author should add tests for model and mockmodel, and change API.md and API.json accordingly. v7: Some minor coding style improvements. v6: Do not passthrough PCI device of class code 0x07. It might contains system device not suitable to assign to guest. v5: Filter ealigible pci devices according to pci class. When assigning a device to VM, check if there are other VMs holding it. Use "kimchi.model.utils.get_vm_config_flag()" to correctly set the device attaching API flag. v4: Add new sub-collection to host device to list the VMs holding the device. v3: Fix a small naming error introduced by rebase. v2: Handle the devices in VM's sub-collection "hostdevs". v1: Handle the devices in VM template. This patch series is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. Host devices form a tree. We can assign most of the devices in the tree to VM. By assigning a device, all the devices in its sub-tree are also assigned. It might not make sense to assign a USB controller, because the host may be using one of the devices connected to the controller. Instead, Kimchi just presents the "leaf" devices to assign to guest. In recent Linux kernel and KVM, it is able to recognize the IOMMU group of a PCI device. The "leaf" PCI devices in the same IOMMU group should be assigned and dismissed together. The IOMMU group is the actual smallest isolation granularity of the PCI devices. The first patch is to list all host devices information. It's useful on its own to show host devices information. The second patch is to list all eligible host devices to assign, as well as the "affected" devices in the same IOMMU group. The third patch creates a sub-collection "hostdevs" to the VM resource, and deals with assigning and dismissing devices. The fourth patch adds a sub-collection "vm_holders" to the host device resource. It's to list all VMs that are holding the device. Zhou Zheng Sheng (5): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device Host device passthrough: Add unit tests and documents docs/API.md | 66 ++++++- src/kimchi/API.json | 31 +++ src/kimchi/control/host.py | 7 + src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/i18n.py | 10 + src/kimchi/mockmodel.py | 127 ++++++++++++- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 39 ++-- src/kimchi/model/hostdev.py | 337 +++++++++++++++++++++++++++++++++ src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 324 +++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_model.py | 31 +++ tests/test_rest.py | 12 +- tests/test_storagepool.py | 7 +- 17 files changed, 1042 insertions(+), 52 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/model/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

2 7

Doubts about documentation - sudo
by Ramon Medeiros 01 Aug '14

01 Aug '14

Hi, how kimchi are using total sudo for users? Today i used a custom sudo for a user: # defined libvirt as a category Cmnd_Alias LIBVIRT = /bin/virsh # add category to user %phcoder ALL = NETWORKING, LIBVIRT Can we change the documentation? -- Ramon Nunes Medeiros RHEV-H Blue for Troy & Sparta Focal Point Software Engineer - Linux Technology Center Brazil IBM Systems & Technology Group Phone : +55 19 2132 7878 ramonn(a)br.ibm.com

2 1

[PATCH] UI bug fix: Properly display partitions when extending a logical pool
by Aline Manera 31 Jul '14

31 Jul '14

Commit f7ec8f0e replaced kimchi.template to kimchi.substitute but a occurence was not properly updated. And it was preventing user to extend a logical pool as any partition was displayed. Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storage_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 49fcc4a..849eb5e 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -216,7 +216,7 @@ kimchi.initLogicalPoolExtend = function() { if (data.length > 0) { for(var i=0;i<data.length;i++){ if (data[i].type === 'part' || data[i].type === 'disk') { - $('.host-partition', '#logicalPoolExtend').append(kimchi.template($('#logicalPoolExtendTmpl').html(), data[i])); + $('.host-partition', '#logicalPoolExtend').append(kimchi.substitute($('#logicalPoolExtendTmpl').html(), data[i])); } } } else { -- 1.9.3

3 3

[PATCH] Fix pep8 errors according to pep8 1.5.6
by alinefm＠linux.vnet.ibm.com 31 Jul '14

31 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> After updating pep8 to 1.5.6 multiple errors were identified. Fix them. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 2 +- src/kimchi/control/base.py | 4 ++-- src/kimchi/control/debugreports.py | 2 +- src/kimchi/control/utils.py | 2 +- src/kimchi/mockmodel.py | 20 ++++++++++---------- src/kimchi/model/storagepools.py | 6 +++--- src/kimchi/model/utils.py | 8 +++++--- src/kimchi/model/vmstorages.py | 4 ++-- src/kimchi/swupdate.py | 2 +- src/kimchi/template.py | 2 +- src/kimchi/utils.py | 1 + tests/test_model.py | 4 ++-- tests/test_rest.py | 16 ++++++++-------- tests/utils.py | 4 ++-- 14 files changed, 40 insertions(+), 37 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index e2a0a05..f775205 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -70,7 +70,7 @@ def __init__(self, username): self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') def get_groups(self): - out, err, rc = run_command([ 'id', '-Gn', self.user[USER_NAME] ]) + out, err, rc = run_command(['id', '-Gn', self.user[USER_NAME]]) if rc == 0: self.user[USER_GROUPS] = out.rstrip().split(" ") diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 4d1351f..bfc20bf 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -161,8 +161,8 @@ def is_authorized(self): if (users is not None or groups is not None) and \ user_role and user_role != 'admin' and \ - (user_name not in users or \ - (groups and list(set(user_groups) & set(groups)) == [])): + (user_name not in users or + (groups and list(set(user_groups) & set(groups)) == [])): return False return True diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index debc2eb..ce20987 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -32,7 +32,7 @@ def __init__(self, model): def _get_resources(self, filter_params): res_list = super(DebugReports, self)._get_resources(filter_params) - return sorted(res_list, key=lambda x:x.data['time'], reverse=True) + return sorted(res_list, key=lambda x: x.data['time'], reverse=True) class DebugReport(Resource): diff --git a/src/kimchi/control/utils.py b/src/kimchi/control/utils.py index c39dbd8..485a2a1 100644 --- a/src/kimchi/control/utils.py +++ b/src/kimchi/control/utils.py @@ -55,7 +55,7 @@ def validate_method(allowed, role_key, admin_methods): def mime_in_header(header, mime): - if not header in cherrypy.request.headers: + if header not in cherrypy.request.headers: accepts = 'application/json' else: accepts = cherrypy.request.headers[header] diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index ed275d5..f3fd5da 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -57,7 +57,7 @@ from kimchi.vmtemplate import VMTemplate -fake_user = { 'admin': 'letmein!' } +fake_user = {'admin': 'letmein!'} class MockModel(object): @@ -583,8 +583,8 @@ def storageserver_lookup(self, server): pool_info['source']['addr'] == server: return dict(host=server) except NotFoundError: - # Avoid inconsistent pool result because - # of lease between list and lookup + # Avoid inconsistent pool result because + # of lease between list and lookup pass raise NotFoundError("KCHSR0001E", {'server': server}) @@ -1257,13 +1257,13 @@ def getRepositories(self): return self._repos.keys() def getRepository(self, repo_id): - if not repo_id in self._repos.keys(): + if repo_id not in self._repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) return self._repos[repo_id] def enableRepository(self, repo_id): - if not repo_id in self._repos.keys(): + if repo_id not in self._repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) info = self._repos[repo_id] @@ -1276,7 +1276,7 @@ def enableRepository(self, repo_id): return repo_id def disableRepository(self, repo_id): - if not repo_id in self._repos.keys(): + if repo_id not in self._repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) info = self._repos[repo_id] @@ -1289,7 +1289,7 @@ def disableRepository(self, repo_id): return repo_id def updateRepository(self, repo_id, params): - if not repo_id in self._repos.keys(): + if repo_id not in self._repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) info = self._repos[repo_id] @@ -1299,7 +1299,7 @@ def updateRepository(self, repo_id, params): return info['repo_id'] def removeRepository(self, repo_id): - if not repo_id in self._repos.keys(): + if repo_id not in self._repos.keys(): raise NotFoundError("KCHREPOS0012E", {'repo_id': repo_id}) del self._repos[repo_id] @@ -1322,7 +1322,7 @@ def get_mock_environment(): vm = MockVM(vm_uuid, name, model.template_lookup('test-template-0')) model._mock_vms[name] = vm - #mock storagepool + # mock storagepool for i in xrange(5): name = 'default-pool-%i' % i defaultstoragepool = MockStoragePool(name) @@ -1343,7 +1343,7 @@ def get_mock_environment(): mockpool = model._mock_storagepools[name] mockpool._volumes[vol_name] = defaultstoragevolume - #mock network + # mock network for i in xrange(5): name = 'test-network-%i' % i testnetwork = MockNetwork(name) diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index c699fc6..598fb26 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -248,7 +248,7 @@ def lookup(self, name): path = xmlutils.xpath_get_text(xml, "/pool/target/path")[0] pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] source = self._get_storage_source(pool_type, xml) - #FIXME: nfs workaround - prevent any libvirt operation + # FIXME: nfs workaround - prevent any libvirt operation # for a nfs if the corresponding NFS server is down. if pool_type == 'netfs' and not self._nfs_status_online(pool): kimchi_log.debug("NFS pool %s is offline, reason: NFS " @@ -328,7 +328,7 @@ def update(self, name, params): def activate(self, name): pool = self.get_storagepool(name, self.conn) - #FIXME: nfs workaround - do not activate a NFS pool + # FIXME: nfs workaround - do not activate a NFS pool # if the NFS server is not reachable. xml = pool.XMLDesc(0) pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] @@ -359,7 +359,7 @@ def deactivate(self, name): raise InvalidOperation('KCHPOOL0034E', {'name': name}) pool = self.get_storagepool(name, self.conn) - #FIXME: nfs workaround - do not try to deactivate a NFS pool + # FIXME: nfs workaround - do not try to deactivate a NFS pool # if the NFS server is not reachable. xml = pool.XMLDesc(0) pool_type = xmlutils.xpath_get_text(xml, "/pool/@type")[0] diff --git a/src/kimchi/model/utils.py b/src/kimchi/model/utils.py index c9ab1d4..41c840a 100644 --- a/src/kimchi/model/utils.py +++ b/src/kimchi/model/utils.py @@ -111,7 +111,8 @@ def set_metadata_node(dom, node, mode="all"): KIMCHI_NAMESPACE, KIMCHI_META_URL, flags=get_vm_config_flag(dom, mode)) else: - # FIXME remove this code when all distro libvirt supports metadata element + # FIXME remove this code when all distro libvirt supports metadata + # element _kimchi_set_metadata_node(dom, node) @@ -123,7 +124,7 @@ def _kimchi_get_metadata_node(dom, tag): xml = dom.XMLDesc(libvirt.VIR_DOMAIN_XML_INACTIVE) root = etree.fromstring(xml) kimchi = root.find("metadata/{%s}kimchi" % KIMCHI_META_URL) - #remove the "kimchi" prefix of xml + # remove the "kimchi" prefix of xml # some developers may do not like to remove prefix by children iteration # so here, use re to remove the "kimchi" prefix of xml # and developers please don not define element like this: @@ -142,7 +143,8 @@ def get_metadata_node(dom, tag, mode="current"): if CapabilitiesModel().metadata_support: kimchi = libvirt_get_kimchi_metadata_node(dom, mode) else: - # FIXME remove this code when all distro libvirt supports metadata element + # FIXME remove this code when all distro libvirt supports metadata + # element kimchi = _kimchi_get_metadata_node(dom, tag) if kimchi is not None: diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index cd985fa..a1bd754 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -67,8 +67,8 @@ def _get_storage_xml(params, ignore_source=False): # Working with url paths if src_type == 'network': output = urlparse.urlparse(params.get('path')) - host = E.host(name=output.hostname, port= - output.port or socket.getservbyname(output.scheme)) + port = 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) disk.append(source) diff --git a/src/kimchi/swupdate.py b/src/kimchi/swupdate.py index 23e3ff0..5ea36f1 100644 --- a/src/kimchi/swupdate.py +++ b/src/kimchi/swupdate.py @@ -96,7 +96,7 @@ def getUpdate(self, name): """ Return a dictionary with all info from a given package name. """ - if not name in self._packages.keys(): + if name not in self._packages.keys(): raise NotFoundError('KCHPKGUPD0002E', {'name': name}) return self._packages[name] diff --git a/src/kimchi/template.py b/src/kimchi/template.py index 0bee8c4..97103d3 100644 --- a/src/kimchi/template.py +++ b/src/kimchi/template.py @@ -62,7 +62,7 @@ def validate_language(langs): def can_accept(mime): - if not 'Accept' in cherrypy.request.headers: + if 'Accept' not in cherrypy.request.headers: accepts = 'text/html' else: accepts = cherrypy.request.headers['Accept'] diff --git a/src/kimchi/utils.py b/src/kimchi/utils.py index a992189..e48b377 100644 --- a/src/kimchi/utils.py +++ b/src/kimchi/utils.py @@ -109,6 +109,7 @@ def get_enabled_plugins(): except (TypeError, KeyError): continue + def get_all_tabs(): files = [os.path.join(paths.prefix, 'config/ui/tabs.xml')] diff --git a/tests/test_model.py b/tests/test_model.py index cab8288..b77ba5b 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -337,7 +337,7 @@ def test_vm_cdrom(self): self.assertEquals('', cdrom_info['path']) inst.vm_poweroff(vm_name) - # removing non existent cdrom + # removing non existent cdrom self.assertRaises(NotFoundError, inst.vmstorage_delete, vm_name, "fakedev") @@ -1098,7 +1098,7 @@ def test_debug_reports(self): report_list = inst.debugreports_get_list() self.assertTrue(tmp_name in report_list) except OperationFailed, e: - if not 'debugreport tool not found' in e.message: + if 'debugreport tool not found' not in e.message: raise e def _wait_task(self, model, taskid, timeout=5): diff --git a/tests/test_rest.py b/tests/test_rest.py index 4feb298..9266e01 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -46,7 +46,7 @@ ssl_port = None cherrypy_port = None -#utils.silence_server() +# utils.silence_server() def setUpModule(): @@ -175,8 +175,8 @@ def test_get_vms(self): resp = self.request('/templates', req, 'POST') self.assertEquals(201, resp.status) - test_users = [ 'user1', 'user2', 'root'] - test_groups = [ 'group1', 'group2', 'admin' ] + test_users = ['user1', 'user2', 'root'] + test_groups = ['group1', 'group2', 'admin'] # Now add a couple of VMs to the mock model for i in xrange(10): name = 'vm-%i' % i @@ -696,21 +696,21 @@ def test_scsi_fc_storage(self): self.assertEquals(201, resp.status) # Test create vms using lun of this pool - ### activate the storage pool + # activate the storage pool resp = self.request('/storagepools/scsi_fc_pool/activate', '{}', 'POST') - ### Get scsi pool luns and choose one + # Get scsi pool luns and choose one resp = self.request('/storagepools/scsi_fc_pool/storagevolumes') luns = json.loads(resp.read()) lun_name = random.choice(luns).get('name') - ### Create vm in scsi pool without volumes: Error + # Create vm in scsi pool without volumes: Error req = json.dumps({'template': '/templates/test_fc_pool'}) resp = self.request('/vms', req, 'POST') self.assertEquals(400, resp.status) - ### Create vm in scsi pool + # Create vm in scsi pool req = json.dumps({'name': 'test-vm', 'template': '/templates/test_fc_pool', 'volumes': [lun_name]}) @@ -1651,7 +1651,7 @@ def test_create_debugreport(self): self.assertEquals(200, resp.status) req = json.dumps({'name': 'report2'}) resp = request(host, ssl_port, '/debugreports/report1', - req, 'PUT') + req, 'PUT') self.assertEquals(303, resp.status) def test_debugreport_download(self): diff --git a/tests/utils.py b/tests/utils.py index f452854..0730b12 100644 --- a/tests/utils.py +++ b/tests/utils.py @@ -64,7 +64,7 @@ def assertIsInstance(self, obj, cls, msg=None): self.fail('%s is not an instance of %r' % (repr(obj), cls)) def assertIn(self, a, b, msg=None): - if not a in b: + if a not in b: self.fail("%s is not in %b" % (repr(a), repr(b))) def assertNotIn(self, a, b, msg=None): @@ -154,7 +154,7 @@ def patch_auth(sudo=True): """ def _get_groups(self): - return [ 'groupA', 'groupB', 'wheel' ] + return ['groupA', 'groupB', 'wheel'] def _has_sudo(self, result): result.value = sudo -- 1.9.3

3 2

[PATCH 0/2] VirtIO and vhost support in ppc64
by Rodrigo Trujillo 31 Jul '14

31 Jul '14

This patch set changes the RHEL and SLES versions that support virtio in PPC64. Also, it disable vhost feature for LE (PPC Little Endian) distros: Ubuntu 14.04 and SLES 12 Rodrigo Trujillo (2): Change modern distro versions for PPC Disable vhost feature in Ubuntu and SLES (PPC64 LE) src/kimchi/osinfo.py | 4 ++-- src/kimchi/vmtemplate.py | 19 +++++++++++++++++-- 2 files changed, 19 insertions(+), 4 deletions(-) -- 1.9.3

3 4

[PATCH] PowerPC bootable ISO detection code
by Daniel Barboza 31 Jul '14

31 Jul '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> PowerPC ISO images does not follow the same rules as Intel's. Intel ISOs uses ISO9660 extension called 'El Torito', which describes the format of the Boot Record. PowerPC firmware, on the other hand, looks for a file '/ppc/bootinfo.txt' which describes how to boot the image. This patch creates a function that opens the ISO file without mounting it and, following ISO9660 standards, read the filesystem trying to find the boot file that enables PowerPC booting. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 166 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 165 insertions(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index c394a32..72b956d 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import glob +import platform import os import re import struct @@ -132,6 +133,12 @@ class IsoImage(object): EL_TORITO_BOOT_RECORD = struct.Struct("=B5sB32s32sI") EL_TORITO_VALIDATION_ENTRY = struct.Struct("=BBH24sHBB") EL_TORITO_BOOT_ENTRY = struct.Struct("=BBHBBHL20x") + # Path table info starting in ISO9660 offset 132. We force little + # endian byte order (the '<' sign) because Power systems can run on + # both. + # First int is path table size, next 4 bytes are discarded (it is + # the same info but in big endian) and next int is the location. + PATH_TABLE_SIZE_LOC = struct.Struct("<I 4s I") def __init__(self, path): self.path = path @@ -224,6 +231,160 @@ class IsoImage(object): raise IsoFormatError("KCHISO0005E", {'filename': self.path}) + def _scan_ppc(self): + """ + PowerPC firmware does not use the conventional El Torito boot + specification. Instead, it looks for a file '/ppc/bootinfo.txt' + which contains boot information. A PPC image is bootable if + this file exists in the filesystem [1]. + + To detect if a PPC ISO is bootable, we could simply mount the + ISO and search for the boot file as we would with any other + file in the filesystem. We can also look for the boot file + searching byte by byte the ISO image. This is possible because + the PPC ISO image follows the ISO9660 standard [2]. Mounting + the ISO requires extra resources and it takes longer than + searching the image data, thus we chose the latter approach + in this code. + + To locate a file we must access the Path Table, which contains + the records of all the directories in the ISO. After locating + the directory/subdirectory that contains the file, we access + the Directory Record to find it. + + + .. [1] https://www.ibm.com/developerworks/community/wikis/home?\ +lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ +%20Boot%20howto + .. [2] http://wiki.osdev.org/ISO_9660 + """ + + # To locate any file we must access the Path Table, which + # contains the records of all the directories in the ISO. + # ISO9660 dictates that the Path Table location information + # is at offset 132, inside the Primary Volume Descriptor, + # after the SystemArea (16*SECTOR_SIZE). + # + # In the Path table info we're forcing little endian byte + # order (the '<' sign) because Power systems can run on + # both. + # + # First int is path table size, next 4 bytes are discarded (it is + # the same info but in big endian) and next int is the location. + PATH_TABLE_LOC_OFFSET = 16 * IsoImage.SECTOR_SIZE + 132 + PATH_TABLE_SIZE_LOC = struct.Struct("<I 4s I") + + path_table_loc_data = self._get_iso_data(PATH_TABLE_LOC_OFFSET, + PATH_TABLE_SIZE_LOC.size) + path_size, unused, path_loc = self._unpack(PATH_TABLE_SIZE_LOC, + path_table_loc_data) + # Fetch the Path Table using location and size found above + path_table_offset = path_loc * IsoImage.SECTOR_SIZE + path_table_data = self._get_iso_data(path_table_offset, path_size) + + # Loop inside the path table to find the directory 'ppc'. + # The contents of the registers are: + # - length of the directory identifier (1 byte) + # - extended attribute record length (1 byte) + # - location of directory register (4 bytes) + # - directory number of parent dir (2 bytes) + # - directory name (size varies according to length) + # - padding field - 1 byte if the length is odd, not present if even + DIR_NAMELEN_LOCATION_PARENT = struct.Struct("<B B I H") + dir_struct_size = DIR_NAMELEN_LOCATION_PARENT.size + i = 0 + while i < path_size: + dir_data = path_table_data[i: i+dir_struct_size] + i += dir_struct_size + # We won't use the Extended Attribute Record + dir_namelen, unused, dir_loc, dir_parent = \ + self._unpack(DIR_NAMELEN_LOCATION_PARENT, dir_data) + if dir_parent == 1: + # read the dir name using the namelen + dir_name = path_table_data[i: i+dir_namelen].rstrip() + if dir_name == 'ppc': + # stop searching, dir was found + break + # Need to consider the optional padding field as well + i += dir_namelen + dir_namelen % 2 + + if i > path_size: + # Didn't find the '/ppc' directory. ISO is not bootable. + self.bootable = False + return + + # Get the 'ppc' directory record using 'dir_loc'. + ppc_dir_offset = dir_loc * IsoImage.SECTOR_SIZE + + # We need to find the sector size of this dir entry. The + # size of the File Section is located 10 bytes after + # the dir location. + DIR_SIZE_FMT = struct.Struct("<10sI") + data = self._get_iso_data(ppc_dir_offset, DIR_SIZE_FMT.size) + unused, dir_size = self._unpack(DIR_SIZE_FMT, data) + # If the dir is in the middle of a sector, the sector is + # padded zero and won't be utilized. We need to round up + # the result + dir_sectorsize = dir_size / IsoImage.SECTOR_SIZE + if dir_size % IsoImage.SECTOR_SIZE: + dir_sectorsize += 1 + + # Fixed-size directory record fields: + # - length of directory record (1 byte) + # - extended attr. record length (1 byte) + # - location of extend in both-endian format (8 bytes) + # - data length (size of extend) in both-endian (8 bytes) + # - recording date and time (7 bytes) + # - file flags (1 byte) + # - file unit size interleaved (1 byte) + # - interleave gap size (1 byte) + # - volume sequence number (4 bytes) + # - length of file identifier (1 byte) + # + # Of all these fields, we will use only 3 of them, 'ignoring' + # 30 bytes total. + STATIC_DIR_RECORD_FMT = struct.Struct("<B 24s B 6s B") + static_rec_size = STATIC_DIR_RECORD_FMT.size + + # Maximum offset possible of all the records of this directory + DIR_REC_MAX = ppc_dir_offset + dir_sectorsize*IsoImage.SECTOR_SIZE + # Max size of a given directory record + MAX_DIR_SIZE = 255 + # Name of the boot file + BOOT_FILE_NAME = "bootinfo.txt" + + # Loop until one of the following happens: + # - boot file is found + # - end of directory record listing for the 'ppc' dir + while ppc_dir_offset < DIR_REC_MAX: + record_data = self._get_iso_data(ppc_dir_offset, MAX_DIR_SIZE) + dir_rec_len, unused, file_flags, unused2, file_name_len = \ + self._unpack(STATIC_DIR_RECORD_FMT, record_data) + + # if dir_rec_len = 0, increment offset (skip the + # dir_rec_len byte) and continue the loop + if dir_rec_len == 0: + ppc_dir_offset += 1 + continue + + # Get filename of the file/dir we're at. + filename = record_data[static_rec_size: + static_rec_size + file_name_len].rstrip() + # The second bit of the file_flags indicate if this record + # is a directory. + if filename == BOOT_FILE_NAME and (file_flags & 2) != 1: + self.bootable = True + return + + # Update offset and keep looking. There is a padding here + # if the length of the file identifier is EVEN. + padding = 0 + if not file_name_len % 2: + padding = 1 + ppc_dir_offset += dir_rec_len + padding + # If reached this point the file wasn't found = not bootable + self.bootable = False + def _scan_primary_vol(self, data): """ Scan one sector for a Primary Volume Descriptor and extract the @@ -269,7 +430,10 @@ class IsoImage(object): return self._scan_primary_vol(data) - self._scan_el_torito(data) + if platform.machine().startswith('ppc'): + self._scan_ppc() + else: + self._scan_el_torito(data) class Matcher(object): -- 1.8.3.1

3 2

[PATCH] bug fix: Update genChangelog script
by alinefm＠linux.vnet.ibm.com 31 Jul '14

31 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> As the new Kimchi tags do not contain the "kimchi-" prefix, "git tag -l" does not list the tags in the right order as it uses alphabetic order and in genChangelog script we need creation order. Fix it and also update ChangeLog file accordingly. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- ChangeLog | 1315 +----------------------------------------------- build-aux/genChangelog | 2 +- 2 files changed, 4 insertions(+), 1313 deletions(-) diff --git a/ChangeLog b/ChangeLog index 148988e..aee5eab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,7 +2,8 @@ CHANGELOG ========= #### [1.2.1.1] #### - * [77981db] Update ChangeLog and VERSION files for 1.2.1.1 release (Aline Manera) + * [8a6270a] bug fix: Update genChangelog script (Aline Manera) + * [220d37c] Update ChangeLog and VERSION files for 1.2.1.1 release (Aline Manera) * [2136c20] Update Kimchi tag to remove 'kimchi-' prefix (Aline Manera) * [fc99a95] issue #389: Use 127.0.0.1 as VNC listener IP (Aline Manera) * [7f2963f] authorization: Update test cases based on last changes (Crístian Viana) @@ -1320,1317 +1321,7 @@ CHANGELOG * [5cda59c] Need root privilege to run test_vm_list_sorted test (Shu Ming) * [69669a1] test: change testcase to allow running single test (Royce Lv) -#### [v0.1.0] #### - - -#### [1.2.1.1] #### - * [77981db] Update ChangeLog and VERSION files for 1.2.1.1 release (Aline Manera) - * [2136c20] Update Kimchi tag to remove 'kimchi-' prefix (Aline Manera) - * [fc99a95] issue #389: Use 127.0.0.1 as VNC listener IP (Aline Manera) - * [7f2963f] authorization: Update test cases based on last changes (Crístian Viana) - * [f4b91ac] List "admin" as a valid system user in mockmodel (Crístian Viana) - * [75a9acc] Move "fake_user" credentials to mockmodel (Crístian Viana) - * [5bec021] Return some groups for every user in mockmodel (Crístian Viana) - * [ba442f9] authorization: Remove authorization config from UrlSubNode (Aline Manera) - * [ebb8392] authorization: Update control files to set role_key and admin_methods (Aline Manera) - * [5570723] authorization: Restrict access to Resource instance (Aline Manera) - * [19aa234] authorization: Restrict Collection access based on admin_methods parameter (Aline Manera) - * [40f746f] authorization: Filter resources by users and groups (Aline Manera) - * [e01a336] vm ticket in backend: update test case (ShaoHe Feng) - * [85617c4] vm ticket in backend: update mockmodel (ShaoHe Feng) - * [d6bf0bc] vm ticket in backend: update model (ShaoHe Feng) - * [fabf9d8] vm ticket in backend: update controller and API.json (ShaoHe Feng) - * [aff9cda] vm ticket in backend: update API.md (ShaoHe Feng) - * [e47fc1e] authorization: update po files (Yu Xin Huo) - * [286e8b2] authorization: add users/groups to vm (Yu Xin Huo) - * [9f0933f] issue #374: Use base64 encoding to launch VM console (Aline Manera) - * [0fb08af] Authorization: Remove actions based on roles (Wen Wang) - * [eb5abf8] Authorization: remove [+] icon from non-root users view (Wen Wang) - * [48d64cf] Authorization: remove host/template tabs for non-root users (Wen Wang) - * [22eba43] Add roles into cookie (Wen Wang) - * [c47c62e] add a base64 safe url encode and decode to js utils (ShaoHe Feng) - * [e0a6e80] Let frontend redirect user after logging (Aline Manera) - * [8bf9597] Remove special console rules from nginx configuration (Aline Manera) - * [ea3db7e] Remove former login design files (Aline Manera) - * [1fdda55] Update test case to reflect new login design (Aline Manera) - * [14fbfe3] authorization: Get role according to tab instead of sudo rights (Aline Manera) - * [a99cde0] authorization: Add "access" parameter to VM resource (Aline Manera) - * [48b6a55] authorization: Add "access" elements to tabs.xml to describe user view (Aline Manera) - * [1df92ad] authorization: Update /login to return user roles instead of sudo parameter (Aline Manera) - * [7a62bf1] authorization: Update authorization rules per API (Aline Manera) - * [582928c] Always use unicode in KimchiException message (Aline Manera) - * [7c9b576] Debug Report Rename: Update Test Code (Royce Lv) - * [12aa218] Debug Report: Update MockModel (Hongliang Wang) - * [20aad65] Debug Report Rename UI: Enable Rename in Host Tab (Hongliang Wang) - * [47bddf1] Debug Report Rename UI: Add Rename Page (Hongliang Wang) - * [1aff19f] Debug Report Rename UI: Add API in kimchi.api.js (Hongliang Wang) - * [bfaa81f] Debug Report: Sort Reports by Generated Time Descendingly (Hongliang Wang) - * [b9c54b4] Debug Report: Use Generated Time instead of Most Changed Time (Hongliang Wang) - * [7e6d766] Debug Report Rename: Implement Back-end (Hongliang Wang) - * [d600011] Debug Report Rename: Update API.md (Hongliang Wang) - * [7e7083e] Debug Report Rename: Update API.json (Hongliang Wang) - * [1f2d758] Debug Report UI: Generate Report Doesn't Work with Mock Model (Hongliang Wang) - * [377fd70] MockModel: Can't Generate Report if Name is not Given (Hongliang Wang) - * [aef9d42] Add option to add/remove fonts files in rpm packages (ShaoHe Feng) - * [7231a51] Remove useless fonts (Aline Manera) - * [2f319d3] Change ISO stream feature test and kvm user test for PPC (Rodrigo Trujillo) - * [ad655c4] Update API.md to reflect /host/users and /host/groups API (Aline Manera) - * [07f037f] Translation updates for underscore in debug report (Christy Perez) - * [d206f4c] UI changes to allow underscore in debug report name. (Christy Perez) - * [b482880] Add SUSE's products (Dinar Valeev) - * [31e0c0b] Update Changelog and po files for 1.2.1 release (Aline Manera) - * [fcd407e] bugfix: Add policycoreutils-python as Kimchi dependency (Aline Manera) - * [e475bfa] Add translation for vm disk attach exceptions (Royce Lv) - * [593c420] Add testcase for vmstorages create (Royce Lv) - * [954185e] Make sure path and volume will not be specified at same time (Royce Lv) - * [a93aa45] Add mockmodel for vm disk attach (Royce Lv) - * [fff58c2] issue#382: Validate form for adding guest cdrom (Royce Lv) - * [e5333d7] issue#382 :Change false default value (Royce Lv) - * [0599241] update case for root.get redirection (ShaoHe Feng) - * [eed4f36] remove kimchisession hook and add the same logic to root.get (ShaoHe Feng) - * [c13d53d] bug fix: redirect to the protected page after login (ShaoHe Feng) - * [88affbe] Issue #380: Loading icon message splitted into two lines in Chinese (Wen Wang) - * [5afa07f] bug fix: UI set the network persistent attribute. (ShaoHe Feng) - * [4197f3a] Bugfix: Minor i18n updates(Chinese) (Wen Wang) - * [9136f8d] add firewalld to debian Install Dependencies (ShaoHe Feng) - * [0890b7a] bug fix: Set charset to help pages (Aline Manera) - * [5ce667a] Show remote Ubuntu 14.04 x86_64 in new Template window (ShaoHe Feng) - * [000149e] Update i18n package scripts(Chinese) (Wen Wang) - * [e0a6643] Add missing translation entries in pt_BR (Crístian Viana) - * [93784be] Add empty translation entries in English (Crístian Viana) - * [45703ec] Help translation to zh_CN. (Paulo Vital) - * [c29f1e2] Help translation to pt_BR. (Paulo Vital) - * [b430576] Show remote Ubuntu 14.04 in new Template window (Rodrigo Trujillo) - * [b5425f8] escape special characters for jQuery selector. (ShaoHe Feng) - * [7b65e7b] escape < > and & in in xml for network name. (ShaoHe Feng) - * [df9a017] network name support unicode. (ShaoHe Feng) - * [2fabc33] bug fix: network name can be any characters except " and / (ShaoHe Feng) - * [7167f31] Host info: Add support to Power. (Paulo Vital) - * [4b096f2] Fix Bug: Actions Menu Disappears after Refresh in Guests Tab (Hongliang Wang) - * [234c198] Bug fix: Do not require login for simple resources (Crístian Viana) - * [14bc6fc] Typo: Rename function create_defautl_network (Crístian Viana) - * [ba96997] Bug Fix: Fix network list layout. (Wen Wang) - * [4a91e74] Issue#348: Fix UI for nfs mount (Royce Lv) - * [3c6c5c5] List iSCSI targets available for initiator while creating iSCSI Pool (ShaoHe Feng) - * [35050bf] List iSCSI server for initiator while creating iSCSI Pool (ShaoHe Feng) - * [3f61acb] Issue #361: Bugfix disable the action button content when creating network (Hongliang Wang) - * [7467feb] Fix i18n packaging scripts (Zhou Zheng Sheng) - * [19b3c4a] Keep User from Generating a Report with an Existing Name (Hongliang Wang) - * [a1bc654] Add progress Event Handler for Asynchronized Tasks (Hongliang Wang) - * [5ea8e8f] Add License Statement in kimchi.report_add_main.js (Hongliang Wang) - * [464d3d0] Add Name Existence Check for Debug Report when Create (Hongliang Wang) - * [c89c2e0] Bug fix: Display the username on the header bar (Crístian Viana) - * [8ce46e6] Add doc and test case for dedicate iso pool (Royce Lv) - * [e3ab2ce] Store qemu user name in class attribute (Royce Lv) - * [5dc4dd2] Dedicated ISO pool: create an out of box ISO pool (Royce Lv) - * [ff92786] Reword 'isolated' network description (Christy Perez) - * [9aeac73] Disable cache for help page (Royce Lv) - * [27bd99f] Create pool UI: making 'Create' button disable when forms not filled. (Daniel Henrique Barboza) - * [b7c518c] bug fix: Make rpm failed (ssdxiao) - * [bd98489] update ui/pages/Makefile.am to let i18n.json.tmpl be added to the package. (ShaoHe Feng) - * [578ab29] add some sample plugin generated files to .gitignore (ShaoHe Feng) - * [26582d8] skip plugins test, when sample plugin is not enabled (ShaoHe Feng) - * [de177c8] generate the translation files for plugins/sample (ShaoHe Feng) - * [3ce13b5] add an option to toggle the sample plugin (ShaoHe Feng) - * [38bee60] Issue #342: load i18n.html of the plugin (ShaoHe Feng) - * [45b16d0] Add JS API for fetching i18n JSON (ShaoHe Feng) - * [947bce5] Update the i18n tmpl to produce JSON (ShaoHe Feng) - * [3205117] Update root.py to make Cheetah render the JSON template. (ShaoHe Feng) - * [3d52774] Add Minimal UI Page for the Sample Plugin (Zhou Zheng Sheng) - * [d8c2ea1] Bugfix: List inactive network interface while editing template (Wen Wang) - * [cf015d4] login: update test config case (ShaoHe Feng) - * [df4749b] login page prompts error when session timeout (ShaoHe Feng) - * [ba0cf6e] login page prompts error when username or password is wrong (ShaoHe Feng) - * [d7e828e] when login successfully, redirect to the last page. (ShaoHe Feng) - * [85e3837] redirect the URL to login page when session timeout or first login (ShaoHe Feng) - * [8f86568] create a new login page (ShaoHe Feng) - * [a556578] Bugfix: Multiple progress indicator during debug report generating (Wen Wang) - * [54e6bfa] Issue#305: Redesign bridged network UI section tempstorage (Wen Wang) - * [fe23558] Add Ubuntu as modern distro to Power guests. (Paulo Vital) - * [8c50cc8] Added the generating progress indicator (Wang Wen) - * [250cc3d] Remove the first column of debug report grid (Wang Wen) - * [c81314f] Add testcase for cdrom eject (Royce Lv) - * [2768515] Update model to support cdrom eject (Royce Lv) - * [3282020] Change doc and controllor to support cdrom eject (Royce Lv) - * [cd67617] Adding test case for updating flags (Royce Lv) - * [a48518b] Fix wrong create/update/delete flags for vmstorages (Royce Lv) - * [5fee8c2] Fix Bug: Template Tab Broken in Chrome due to Code Error (Hongliang Wang) - * [08a9c00] Bug Fix - Save Button Behaves Incorrectly in Guest Edit Window (Hongliang Wang) - * [f2f137e] Remove Unused Files (Hongliang Wang) - * [c4117ab] Adjust Guest Edit Storage Tab Styles (Hongliang Wang) - * [339c1aa] show template is local or remote (ShaoHe Feng) - * [7835e16] Update API.md (Hongliang Wang) - * [6741700] Add Unit (MB) to Memory in Template Edit Window (Hongliang Wang) - * [b558fd9] bug fix: decode volume name in IsoVolumesModel. (ShaoHe Feng) - * [ef7e8e3] novnc does not work in IE (Adam King) - * [8b6405f] Code Refector: Extract Variables in kimchi.login_window.js (Hongliang Wang) - * [892238e] Disable metadata log output in every guest refresh (Crístian Viana) - * [785920b] Repository Grid Column Resizing Issue (Hongliang Wang) - * [76629f6] StoragePool Edit: Add Disk to Logical Pool (Royce Lv) - * [5ee2b93] Exception: fix exception details when not specified (Royce Lv) - * [7ca9ade] Remove cdrom '.iso' suffix checking from add template js (Rodrigo Trujillo) - * [7e5f8b2] Remove '.iso' extension checking from json schema (Rodrigo Trujillo) - * [a1e7364] model.host: avoid redundant libvirt lookupByName API invocation (Zhou Zheng Sheng) - * [f7ec8f0] Rename kimchi.template to kimchi.substitute (Hongliang Wang) - * [bd866e1] Remove unused listDeepScanIsos function (Rodrigo Trujillo) - * [4448948] Update README with the correct FF ESR version. (Adam King) - * [68d4d6c] VM template: add disk size error message (Zhou Zheng Sheng) - * [0e165c4] adjust the width of host info-container (ShaoHe Feng) - * [d65b8e5] UI: Fix VM Delete Confirmation Dialog Box Title (Zhou Zheng Sheng) - * [96c19c6] Fix text alignment on storage pool type combo boxes (Crístian Viana) - * [c5329c2] Remove button "Cancel" from modal dialog (Crístian Viana) - * [0666eee] Fix Text Truncated Problem of Login Button (Hongliang Wang) - * [ff7f991] bug fix: Allow changing default ports (Aline Manera) - * [96f3248] bug fix: Update test cases to use HTTPS (Aline Manera) - * [1d8476b] host/partitions: avoid calling disks.get_partitions_names() for each partition (Zhou Zheng Sheng) - * [1d56572] Correct the ID String of Disk Size in Template Edit Window (Hongliang Wang) - * [5c2a584] Issue #369: Fix config_dir assignment (Aline Manera) - * [cc3b5b5] Revert "Host Tab: Add Widths for Repository Grid Columns" (Aline Manera) - * [5dc3195] Fix Text Wrapping Problem in Template Edit (Hongliang Wang) - * [9ececcf] Fix Text Wrapping in Tab Bar (Hongliang Wang) - * [4128392] Github #368: Removing 'resend' tag from getHostStats JSON (Daniel Henrique Barboza) - * [44ec020] Set IE edge mode for VNC/Spice web pages (Adam King) - * [73e524c] bug fix: Properly set the listen IP to SPICE console (Aline Manera) - * [58017f4] websockets: Disallow non-encrypted client connections (Aline Manera) - * [381864f] UI: Redirect user to console page after logging (Aline Manera) - * [be9b967] backend: Redirect 401 error to default page (Aline Manera) - * [e1760d8] Enable Kimchi authentication in console pages (Aline Manera) - * [74ad9b4] Make use of the mini Web server in the websockify (Aline Manera) - * [9116d53] Enable encryption in vm console connection (Mark Wu) - * [6ddf6a9] Revert "Enable encryption in vm VNC console connection" (Aline Manera) - * [dc6c28e] vmiface update support: update test case (ShaoHe Feng) - * [b813d6c] vmiface update support: update mockmodel (ShaoHe Feng) - * [309aa71] vmiface update support: update model. (ShaoHe Feng) - * [51820c4] vmiface update support: update API.md (ShaoHe Feng) - * [c356a75] Display all disk types in storage edit view (Royce Lv) - * [010aaac] UI: Support add guest disk (Royce Lv) - * [b2d1217] Fix select menu data append (Royce Lv) - * [3c294a5] Guest disks: Update testcase (Royce Lv) - * [5df01ab] Multiple pep8 fixes (Royce Lv) - * [2360f7c] Guest disk: deals with disk attachment (Royce Lv) - * [1bc8aa6] Guest disks: Abstract vm disk functions (Royce Lv) - * [7770a11] Guest disks: Choose proper bus for device (Royce Lv) - * [4e7a17c] Guest disks: Update api definition and error reporting (Royce Lv) - * [9c0e2a1] Guest disks: Update doc to support manage guest disks (Royce Lv) - * [9328079] Return info from run_command on exception. (Christy Perez) - * [781b331] write the template OS info to vm metadata (ShaoHe Feng) - * [8566599] update test case to set/get user and group when VM is running (ShaoHe Feng) - * [2617373] bug fix: get user and group when vm is living. (ShaoHe Feng) - * [d7e7017] manually manage the metadata element (ShaoHe Feng) - * [2c176c0] Add two function to set and get domain xml metadata (ShaoHe Feng) - * [1f1dcc3] add method to test libvirt metadata api are available (ShaoHe Feng) - * [d777a02] bug fix: call a method should be followed by "()" (ShaoHe Feng) - * [06238f2] Enable encryption in vm VNC console connection (Mark Wu) - * [6bf630c] Change the default tab to "Guests" (Crístian Viana) - * [9e85e59] Define the default tab more clearly (Crístian Viana) - * [976db87] Refactor code to trim file extension (Crístian Viana) - * [37a1e1b] bug fix: Redirect 3xx responses through proxy (Aline Manera) - * [a7f083c] Set default storage pool to autostart and make persistent (Christy Perez) - * [6f5d0d9] Fix PEP8 in scan.py (Rodrigo Trujillo) - * [5de2ca8] security: Prevent XSS attacks (Aline Manera) - * [9d3bb9c] bug fix: Use secure cookies (Aline Manera) - * [def7c67] security: Redirect all HTTP requests to HTTPS (Aline Manera) - * [819cc2a] Fix Bug: Invalid URL at 404 Not Found Page (Hongliang Wang) - * [7132f75] Changes to use 2048 bit public key for self-signed certificate (Mark Wu) - * [6bac3ec] Display historical host statistical info on the host tab (Adam King) - * [217858c] Host stats history: Update test cases (Aline Manera) - * [9d2bf5c] Add API to return host stats history (Aline Manera) - * [9b2eafb] repository: Remove full stop symbol from checkbox's label (Crístian Viana) - * [087e739] repository: Make checkbox clickable (Crístian Viana) - * [f2d6ff4] repository: Place checkbox to the left of its label (Crístian Viana) - * [b4f84dd] Modify edit guest help info (Rodrigo Trujillo) - * [4a8d603] User action menu overflows when actions with names longer than a few chars a.. (Adam King) - * [1ef1561] Regenerate PO files (Adam King) - * [82c1181] Update po/POTFILES.in (Adam King) - * [3acf6c3] UI: Edit Guest Network Interface (Yu Xin Huo) - * [19011c7] Github #329: .gitignore, spec, control.in and readme (Daniel Henrique Barboza) - * [117cd5a] Github #329: changes in mockmodel, model/config and tests (Daniel Henrique Barboza) - * [152d820] Github #329: Kimchid, config.py.in and server.py changes (Daniel Henrique Barboza) - * [6883533] Github #329: Proxy module and template file (Daniel Henrique Barboza) - * [775e630] New domain state pmsuspended (ShaoHe Feng) - * [177a147] VM shutdown support in UI (ShaoHe Feng) - * [d242e30] VM shutdown support in backend (ShaoHe Feng) - * [44e545e] Fix error storage pool lookup usage in deep scan (Royce Lv) - * [2271eeb] Clarify the meaning of an empty vm user or group list (Christy Perez) - * [c01d983] VM Edit: CPU and memory (Adam King) - * [b31a134] VM Edit CPU/Memory: (Backend) Changes mockmodel and tests (Rodrigo Trujillo) - * [ac2c7de] VM Edit CPU/Memory: (Backend) Changes VM control and model (Rodrigo Trujillo) - * [5ea7626] VM Edit CPU/Memory: (Backend) Changes API.md, API.json and i18n.py (Rodrigo Trujillo) - * [ecaf9a8] Update test cases (Aline Manera) - * [f04f67f] Remove unused code (Aline Manera) - * [17fd157] Update users/groups verification based on new API (Aline Manera) - * [fe2fd1d] Add API to list system users and groups (Aline Manera) - * [5641e5e] Create a new common collection named SimpleCollection (Aline Manera) - * [ce2bbbd] Bug fix: add PYTHONPATH for contrib/check_i18n.py (ShaoHe Feng) - * [5c2013d] packaging: ship kimchi with plugins/__init__.py (Zhou Zheng Sheng) - * [361cae4] Display version/build number in UI (Adam King) - * [a67fe54] Host Tab: Add Widths for Repository Grid Columns (Hongliang Wang) - * [88c190a] Issue#364: UI - Column Resizing Function Broken in Host Tab (Hongliang Wang) - * [257d0ff] config version API support in backend. (ShaoHe Feng) - * [698b101] config version API support: add a method to get kimchi version (ShaoHe Feng) - * [4c7c402] Add/remove users and groups to VMs (Aline Manera) - * [ca0bfd9] Return users and groups when fetching VM info (Aline Manera) - * [0a38dc9] Add functions to check if a user/group exists (Aline Manera) - * [021d4d1] Use proper term "user name" instead of "user id" (Aline Manera) - * [0348f4a] Override only the updated "User" methods in "patch_auth" (Crístian Viana) - * [548f894] Set virt_use_nfs when NFS pool is added. (Christy Perez) - * [767a34e] Issue #363: Fix data/information consistence in edit template window (Rodrigo Trujillo) - * [16659a5] Issue #363: Add new rest api function - getStoragePoolVolume (Rodrigo Trujillo) - * [4266218] add a method to check the i18n strings are obsolete (ShaoHe Feng) - * [89411f9] remove obsolete i18n strings which are no longer in use (ShaoHe Feng) - * [3b11219] add a make check-local command to verify the i18n string formatting (ShaoHe Feng) - * [04d2d73] Choose available address for ide disk (Royce Lv) - * [5c487da] add confirmation for reset a VM (ShaoHe Feng) - * [074f7c5] reset vm in UI (ShaoHe Feng) - * [86f1afa] reset VM in backend. (ShaoHe Feng) - * [6fe5997] reset VM: update API.md (ShaoHe Feng) - * [9f626cb] Bug fix #357 - Error when creating template from ISO (Ramon Medeiros) - * [d8617eb] Fix backend error when creating multiple templates (Rodrigo Trujillo) - * [767e486] Fix typo while processing request data (Aline Manera) - * [7c3bb7b] Fix kimchi vlan tagged bridge name (Mark Wu) - * [3bf0173] error when editing repository entry with no mirrorlist. (Paulo Vital) - * [de1d0f6] kimchi.disks: Ignore unsupported partition table (Zhou Zheng Sheng) - * [68d86c5] Fix get_storageservers API and UI retrieval of storage servers. (Christy Perez) - * [e19383c] help pages: Set default index file to /help URI (Aline Manera) - * [23042dd] help pages: Update .gitignore file (Aline Manera) - * [65051df] help pages: Adjust css url (Aline Manera) - * [61d619e] help pages: Remove former .dita files (Aline Manera) - * [a8f8abd] Update build process to generate html pages for each help subdir (Aline Manera) - * [4e548cb] Replicate help pages for pt_BR and zh_CN (Aline Manera) - * [aab8764] Bug fix #360: Support i686 architecture (Ramon Medeiros) - * [42f7771] Fix volume not found error message (Rodrigo Trujillo) - * [4a34cbf] Fix debugreports download issue (Mark Wu) - * [c7e4707] objectstore: support sorting by a key in get_list() (Zhou Zheng Sheng) - * [58efd8f] add confirmation for power off a VM (ShaoHe Feng) - * [250565d] change the stop to power off for VM in UI (ShaoHe Feng) - * [82fa8d1] change the stop to power off for VM in backend (ShaoHe Feng) - * [70dc729] Try to activate physical interface when create a network on it (Mark Wu) - * [6e19ac4] Software Update: Make Update Progress Area Collapsible (Hongliang Wang) - * [c012f81] Issue #365: Preventing duplicate Bridged VLAN tagged network. (Paulo Vital) - * [11b2c7f] improve Chinese translation (ShaoHe Feng) - * [3a2ed85] Make use of the new forms handling capabilities (Adam King) - * [eadacde] Extend jQuery form (Adam King) - * [229710a] Extend base classes to support form processing (Adam King) - * [0e555f5] Fix hardcoded storage bus assignment in vmstorage (Rodrigo Trujillo) - * [58c9025] kimchi.exception: Properly Decode All Kinds of Exception Arguments (Zhou Zheng Sheng) - * [25bd8e0] Sort device paths shown when creating a logical storage pool (Rodrigo Trujillo) - * [02807f8] Add template clone support (Adam King) - * [15b0e43] Fix pep8: add files to whitelist of Makefile.am (Rodrigo Trujillo) - * [5252d7a] Fix pep8 issues in src/kimchi/objectstore.py (Rodrigo Trujillo) - * [75542bd] Fix pep8 in src/kimchi/template.py (Rodrigo Trujillo) - * [b81f7bc] Fix pep8 in src/kimchi/vmtemplate.py (Rodrigo Trujillo) - * [f2c436b] Plugins UI: Correctly Load Plugin Tabs (Zhou Zheng Sheng) - * [e057827] Fix 'disk full' issue: Fix vms/screenshot db store/delete error handling (Rodrigo Trujillo) - * [42a9072] Fix 'disk full' issue: Fix storagepool and asynctasks error handling (Rodrigo Trujillo) - * [fa0b991] Fix 'disk full' issue: Fix storage volume error handling (Rodrigo Trujillo) - * [b787cba] Fix 'disk full' issue: Fix Templates db store/delete error handling (Rodrigo Trujillo) - * [dc2174e] Fix 'disk full' issue: Change objectstore exception handling (Rodrigo Trujillo) - * [e851d99] Add the command to run_command error and debug logging (Christy Perez) - * [833125c] bug fix: we should pass str to cherrpy HTTPError (ShaoHe Feng) - * [f5c517a] Issue #343 & #353: Improve & Correct UI Init Logic Flow (Hongliang Wang) - * [bd80b70] AsyncTask: Propagate cherrypy request information to worker threads (Zhou Zheng Sheng) - * [0ea1f4b] UI: change some code of storage add page (ShaoHe Feng) - * [d5fd304] Fix non persistent network handling (mockmodel/tests) (Rodrigo Trujillo) - * [f3f55a8] Fix non persistent network handling (frontend) (Rodrigo Trujillo) - * [cc87c6a] Fix non persistent network handling (backend) (Rodrigo Trujillo) - * [335ee71] Update Changelog for 1.2 release (Aline Manera) - * [015ebb3] Remove LUN assignment in VM (Aline Manera) - * [103e87b] Update po and pot files for 1.2 release (Aline Manera) - * [002ec76] Translate pt_BR.po file (Ramon Medeiros) - * [35c3000] Chinese translation for release 1.2 (ShaoHe Feng) - * [1add01e] bug fix: fix the string format %(pool). (ShaoHe Feng) - * [58da428] Add error handling for repo management (Adam King) - * [2e4a46a] Logical Storage Pool: Detect and Enumerate Multipath Block Devices (Zhou Zheng Sheng) - * [179bf14] validate the volume parameter when the pool of template is iscsi or scsi (ShaoHe Feng) - * [31fa6b8] Fix swupdate listing (Royce Lv) - * [9259c90] error message fix. (ShaoHe Feng) - * [b056903] Fix a typo. (Leonardo Garcia) - * [b31e125] bug fix: fix the string format. (ShaoHe Feng) - * [429d370] Add lock in swupdate (Royce Lv) - * [a144b90] fix lock for apt package manager (Royce Lv) - * [1e3e121] Properly display YUM exception (Aline Manera) - * [074e265] UI: template edit page support scsi lun (ShaoHe Feng) - * [1060f98] create a VM from an scsi pool template (ShaoHe Feng) - * [81bc75e] create a VM from an iscsi pool template. (ShaoHe Feng) - * [0671de3] generate a iscsi volume disk for a guest (ShaoHe Feng) - * [6ac343a] add a method to get iscsi storage pool auth information. (ShaoHe Feng) - * [f4db0d6] Help for scsi fibre channel (Kersten Richter) - * [e1e7baa] Fibre Channel SCSI Storage Pool UI (Yu Xin Huo) - * [5f43812] Added help for repositories (Kersten Richter) - * [5b14926] Repository Management - Integrate into Host Tab (Hongliang Wang) - * [7999102] Repository Management - Edit Repository Support (Hongliang Wang) - * [55c426b] Repository Management - Add Repository Support (Hongliang Wang) - * [057f2d4] Repository Management - Add API Support (Hongliang Wang) - * [66b1573] Repository Management - Add i18n Strings (Hongliang Wang) - * [f18b0bc] Update grid widget to populate fields from deeply nested objects (Adam King) - * [afea547] Update form.serializeObject method to handle deep object serialization (Adam King) - * [0d51a2f] Adds 'in_use' info to API.md (Rodrigo Trujillo) - * [622781d] Template: Check if the host supports Spice (Zhou Zheng Sheng) - * [a8f9f16] but fix: show the content of combobox and filterselect in storage add page (ShaoHe Feng) - * [24cfe69] Bug fix: specify the class attribute when change pool state dot. (ShaoHe Feng) - * [281d35c] Optimize return code check. (Leonardo Garcia) - * [ddd588d] Show error message from debug report generation async task (Rodrigo Trujillo) - * [3d47c5c] bug fix: Lock YUM operations (Aline Manera) - * [ace80fe] bug fix: Display update progress on real time (Aline Manera) - * [413e36b] bug fix: Allow user specifies the repository name when adding a new YUM repo (Aline Manera) - * [ad283ee] bug fix: Instantiate the apt-get manager when update the apt-get packages list (Aline Manera) - * [e94903a] Issue#349: Software Update Grid Keeps Loading when Error Returns (Hongliang Wang) - * [81c16b4] run pyflakes when make check (ShaoHe Feng) - * [f4cbe91] add template_delete to rollback after create a template (ShaoHe Feng) - * [2fa81bf] make pyflakes happly, remove unused availables (ShaoHe Feng) - * [8b64eb1] make pyflakes happly, remove the unused import module (ShaoHe Feng) - * [be5c57d] Remove debug report's file path from UI (Mark Wu) - * [4fa40e1] partitions: Fix when disk does not have extended partition (Royce Lv) - * [c177cae] bug fix: instantiate the Yum manager when update the yum packages list (ShaoHe Feng) - * [4a43a7c] Issue#352: Debug Report Section NOT Hidden for Non-root User (Hongliang Wang) - * [50a373a] bug fix: Lock yum/apt operations (Aline Manera) - * [bc72f1c] Update test cases to reflect the repositories changes (Aline Manera) - * [d369c91] bug fix: Do not store internal repository information (Aline Manera) - * [8536141] bug fix: Let package manager tool create the repository ID (Aline Manera) - * [ca77c50] bug fix: Sort repositories (Aline Manera) - * [5e6300e] bug fix: Raise exception comming from backend (Aline Manera) - * [384dbec] Update messages used in the repositories management feature (Aline Manera) - * [340e4f5] mockmodel: Move specific repository data under 'config' (Aline Manera) - * [7d5fad5] bug fix: Reorganize repository information (Aline Manera) - * [81e5440] bug fix: Expose repository management tool name (Aline Manera) - * [9b40f58] VLAN: Do not allow bridge to be the trunk device (Zhou Zheng Sheng) - * [24c4319] Fix iso streaming functions and feature tests (Rodrigo Trujillo) - * [c44b238] sudo: run sudo with a pseudo controlling terminal (Zhou Zheng Sheng) - * [e609efa] Display the error code when displaying error msgs (Crístian Viana) - * [f39dfe4] Apply Kimchi standard error message (Crístian Viana) - * [cb1ece8] Do not show success messages (Crístian Viana) - * [6a45ad0] Doc: add work around to handle NFS root squash problem (Royce Lv) - * [13819ab] Fix issue 348: NFS pool creation times out (Christy Perez) - * [6d6c816] Software Update: Enable "Update All" Button when Task Fails (Hongliang Wang) - * [6888a72] Changes to help (Kersten Richter) - * [38d8f1a] Remove bridge and vlan interface unconditionally on removing vlan network (Mark Wu) - * [01c4035] Fix Bug - Text Overlapped in Template Add Window (Hongliang Wang) - * [9c2b766] Fix multiple pep8 (Royce Lv) - * [a37e0bd] Grid Loading Mask - Some Elements are Missing (Hongliang Wang) - * [58ab016] Skip 'screendump' for vms no video device configured (Mark Wu) - * [cfd29f8] Controller: Improve Kimchi Specific Exception Reporting (Zhou Zheng Sheng) - * [4523b3e] Grid widget presently interprets displays null values as null strings (Adam King) - * [22dc2af] mockmodel: Reset packages after updating system (Aline Manera) - * [e6806e4] UI: Disable stop/undefine buttons when network is in use (Aline Manera) - * [b590cd5] Do not allow user disable/delete a network used by VM or template (Aline Manera) - * [31f7bbf] Software Update Support in Host Tab (Hongliang Wang) - * [95bd616] Software Update - APIs in kimchi.api.js (Hongliang Wang) - * [3182653] Software Update - i18n Translation Strings (Hongliang Wang) - * [4f2b234] Supplement to [PATCH v6 0/3] UI: Software Update Support (Adam King) - * [e9ab744] bug fix: encode the args in KimchiException when is is unicode. (ShaoHe Feng) - * [8a6db10] Grid Enhancement - Show Message when Loading Data (Hongliang Wang) - * [c700997] Correct the Repositories parameter name of is_mirror (Adam King) - * [9a54667] Start up Kimchi even if no repo management tool was identified (Aline Manera) - * [aee1318] Expose repo_mngt_tool to /config/capabilities (Aline Manera) - * [0b811f6] bug fix: Identify repository management tool based on available system tools (Aline Manera) - * [e3338e2] bug fix: Identify update tool based on available system tools (Aline Manera) - * [96a0235] Changed xsl file to include stylesheet (Kersten Richter) - * [acde6c7] Added a style sheet to make the html look pretty (Kersten Richter) - * [35033c6] Commit changes to templates and storage.dita files (Kersten Richter) - * [34cd66f] Added help for host and network tab. (Kersten Richter) - * [681ac87] Grid Enhancement - "title" Attribute for Long Values (Hongliang Wang) - * [5b921e0] ISO Scan: Use volume set id instead of volume id for some wrong images. (Mark Wu) - * [e7c6426] Issue #302: let 'create' attr of networks model to create default network (ShaoHe Feng) - * [42008ee] add a new function to get an available network address (ShaoHe Feng) - * [39a2ba8] move _default_network_check from top model to networks model (ShaoHe Feng) - * [3df47fe] Update guest action menu (Adam King) - * [626081f] Pass ajaxError information on to original requester on ajaxError event (Adam King) - * [b113780] Issue 292 Logical Storage Pool Returning "extended" Partitions as Possible P.. (Zhou Zheng Sheng) - * [5ed36d6] bug fix: remove the hard code of disk_path (ShaoHe Feng) - * [378eb45] probe iso permission: update test case (ShaoHe Feng) - * [84a28fb] Don't allow templates to be created with ISOs that won't be usable. (ShaoHe Feng) - * [af51f27] qemu user tests: probe the username of qemu process started by libvirt (ShaoHe Feng) - * [baed491] add a method to probe the permission as qemu user (ShaoHe Feng) - * [de0400b] Attach/Replace/Detach a CDROM to/in/from a VM (Hongliang Wang) - * [474e774] Add/Edit CDROM Support (Hongliang Wang) - * [505409f] Add i18n Variables for CDROM-related Function (Hongliang Wang) - * [f392c6d] Add CDROM-related APIs (Hongliang Wang) - * [9cfb638] kimchi.message - Enhancement (Hongliang Wang) - * [23b5850] Adjust CSS for Window (Hongliang Wang) - * [87a6eec] Issue 294 The auto logout leaves action menu on page - update JS (Adam King) - * [28419d8] Issue 294 The auto logout leaves action menu on page - add classes (Adam King) - * [f8ac146] Fix formatting of the requestJSON function (Adam King) - * [9f91334] pep8 clean for osinfo.py (ShaoHe Feng) - * [82a743b] bug fix: add an icon distros list. (ShaoHe Feng) - * [8c3ce5f] Build help index page only once (Crístian Viana) - * [2c7dbf8] fix: Build new DITA pages when running "make" (Crístian Viana) - * [11e871c] Multiple pep8 fixes (Royce Lv) - * [2ab54c1] Add volume ref_cnt: Update test (Royce Lv) - * [3f0e775] Add volume ref_cnt: Add model and mockmodel implementation (Royce Lv) - * [757a254] Add volume ref_cnt: Update controller and json schema (Royce Lv) - * [d55e72a] Add volume ref_cnt: update api.md (Royce Lv) - * [bb89241] Fix vm disk path when it does not have source element (Royce Lv) - * [86a9b4d] Export list vms functionality (Royce Lv) - * [dfccd65] Allocate enough space for logical volume (Royce Lv) - * [a815850] Window Widget Enhancement - Allow onClose Listener (Hongliang Wang) - * [834e48b] Bug fix: Kimchi could not start guest with iscsi lun assigned as disk (Rodrigo Trujillo) - * [c092436] issue #200: Rebuild .mo files when running "make" (Crístian Viana) - * [57f9f9f] Do not show a success msg when creating a template (Crístian Viana) - * [7dc503d] Window - Correct Footer Height (Hongliang Wang) - * [0c840f0] logical pool: Fix logical pool target path (Royce Lv) - * [75f31dc] Fix storage volume format on logical pool for vm (Royce Lv) - * [3fdbb1c] Use a pool of threads to valid all remote ISOs in parallel (Aline Manera) - * [456018a] bug fix: "sudo: sorry, you must have a tty to run sudo". (Paulo Vital) - * [389b13c] Update distros JSON files to always point to a valid URL (Aline Manera) - * [7b69dfa] issue #301: Add a loading message while listing default remote ISOs (Aline Manera) - * [db72242] issue #301: Only list remote ISOs with valid URL (Aline Manera) - * [33a9257] Increase memory size for vm template on ppc platform (Mark Wu) - * [5747b58] Fix issue #339: Change mock and add test to check persistent variable (Rodrigo Trujillo) - * [88bb4a7] Fix issue #339: Changes UI to handle deactivation of non-persistent pools (Rodrigo Trujillo) - * [596ddb1] Fix issue #339: Enable backend to handle not persistent pools (Rodrigo Trujillo) - * [f11beaa] Fix rollback order (Rodrigo Trujillo) - * [6d234f1] bug fix: Set default flags for virDomain.state() function (Aline Manera) - * [00a60b3] Issue #222: add python-xml to suse require list (ShaoHe Feng) - * [34a6073] storage volume: fix xml parsing of logical volume format type (Zhou Zheng Sheng) - * [4be19f9] Support ppc64 isos in Templates: Fix test cases (Rodrigo Trujillo) - * [6a81c0e] Support ppc64 isos in Templates: Filter remote isos and change UI (Rodrigo Trujillo) - * [01d338b] Support ppc64 isos in Templates: Add arch and urls to distro jsons (Rodrigo Trujillo) - * [0ef900c] issue #330: Make sure exception argument is a string to convert it to unicode (Aline Manera) - * [e9a5071] issue #312: Check volume group exists while creating a logical pool (Aline Manera) - * [186a2ad] Refreshing an inactive pool causes exception (Shu Ming) - * [853908a] session expire: update test case (ShaoHe Feng) - * [2907055] UI: set kimchi robot header for some request. (ShaoHe Feng) - * [ad459df] auth enhancement: expire the session when the request access periodically (ShaoHe Feng) - * [fa350f6] add timeout for sessions (ShaoHe Feng) - * [eb37a50] Issue #333: do not encode error.html when the cherrpy version less than '3.2.. (ShaoHe Feng) - * [707aee0] bug fix: setup disks to use cache=none to support live migration. (Paulo Vital) - * [6779b95] While trying to extend a logical pool I got the following error message: (Aline Manera) - * [008e76f] template integrity verification: update test case to verify storagepool (ShaoHe Feng) - * [2ec01d5] template integrity verification: verify storagepool in backend (ShaoHe Feng) - * [ae3b81b] template integrity verification: verify storagepool, update API.md (ShaoHe Feng) - * [5f28f72] Github bug #307: storage pool type list - html and string changes (Daniel Henrique Barboza) - * [a7ea3d2] Github bug #307: add storage pool type list - JS changes (Daniel Henrique Barboza) - * [d977d18] remove unused InvalidOperation instance (ShaoHe Feng) - * [7869c19] Add test case for kimchi server configuration. (Mark Wu) - * [e65d00a] Add static directory configurations for plugin's ui (Mark Wu) - * [668f522] UI: Grid Widget - Enable/Disable Row Selection (Hongliang Wang) - * [e9f67dc] Bug Fix #282: Handle toggleNetwork error returns (Rodrigo Trujillo) - * [41ac09c] Bug Fix #282: Disable Start/Stop network buttons while wait backend lag (Rodrigo Trujillo) - * [ee36b1f] Clear pep8 failure in make check (Royce Lv) - * [4175f76] Prevent volume create and delete for certain pool types (Royce Lv) - * [20568e2] Fix vm creation storage rollback clean (Royce Lv) - * [729d15b] UI: template support spice, update po (ShaoHe Feng) - * [6a17215] UI: template support spice (ShaoHe Feng) - * [a9d94a7] Fix debug report UI: Error handling and line selection (Rodrigo Trujillo) - * [e1ed6cd] issue #66: Auto generate template name in backend when none is provided (Aline Manera) - * [bd47f5a] bug fix: Only check for ISO images in active pools (Aline Manera) - * [74614bd] bug fix: Do not probe ISO file while checking template integrity (Aline Manera) - * [be2122d] vmtemplate: Remove useless imports (Aline Manera) - * [276c13a] Fix typo on KCHAPI6005E message (Aline Manera) - * [c835175] bug fix: Enable NFS path field when a NFS server is provided (Aline Manera) - * [31c4398] Fix software update action into Host resource (Paulo Vital) - * [793e2c6] Fix test_osinfo.py to use new modern distro version dict. (Paulo Vital) - * [1a05317] Fix VM's network model template for Power systems. (Paulo Vital) - * [9abfad4] kimchi.control.utils: fix request parsing in generate_action_handler() (Zhou Zheng Sheng) - * [5d82241] Issue 299 Inactive storage pools are listed while editing template (Adam King) - * [279a710] Can not create a VM from a template with disks['volume'] parameters. #181 (Shu Ming) - * [3100c0c] Fix Kimchi vm tests according to new messages sent from backend (Rodrigo Trujillo) - * [5e902bf] Delete unsed _vm_exists funtion (Rodrigo Trujillo) - * [9178089] Fix VM delete error message handling (UI/Backend) (Rodrigo Trujillo) - * [d58edad] Fix VM reset (UI) error messages hnadling (Rodrigo Trujillo) - * [82b80e3] Fix VM stop error messages handling (backend/UI) (Rodrigo Trujillo) - * [96f5457] Fix vm start UI error return message (Rodrigo Trujillo) - * [f8c9c60] Fix Add Network window (Rodrigo Trujillo) - * [eb8347e] Add another way to download the debugreport file in the test (Shu Ming) - * [632c3ca] Have a meaningful description for the exception test #81 (Shu Ming) - * [7ee1b09] bug fix: check all Red Hat distributions for yum package management (ShaoHe Feng) - * [8931da1] Set default combo box style to storage pool type list (Aline Manera) - * [c4c093e] issue #242: Do not allow user deactivate/delete storage pool used by a templ.. (Aline Manera) - * [26631c0] bug fix: Make URI parameter is not None before encoding it (Aline Manera) - * [d58f453] Authors cleanup (Paulo Vital) - * [e3ea028] run_command: log error messages using higher log level when return code is n.. (Zhou Zheng Sheng) - * [c6e8212] Fix screenshots and debug reports paths. (Leonardo Garcia) - * [3514d3b] Fix tests: restore the monkey patch after testing Paths (Mark Wu) - * [ca04f30] Issue # 303 The password of iSCSI Authentication should be masked (Adam King) - * [e5cf383] issue #325: Use RamSession instead of FileSession (Aline Manera) - * [e10177e] Github bug #327: NFS pool workaround: model changes (Daniel Henrique Barboza) - * [5c38855] Github bug #327: NFS pool workaround: timeout adjustments (Daniel Henrique Barboza) - * [5076c7d] Github bug #327: NFS pool workaround: i18n changes (Daniel Henrique Barboza) - * [948445f] Packaging: removed start of kimchid from RPM and DEB files (Paulo Vital) - * [d83510c] bug fix: Properly display missing parameter (Aline Manera) - * [19f6fcf] Clear out the guests list properly using jQuery (Adam King) - * [baff478] issue #316: Only verify if path starts with '/' (Aline Manera) - * [ad1ecbc] Add help to user menu (Adam King) - * [346d50d] Fix debug report naming problem (UI) (Rodrigo Trujillo) - * [f1d433b] Fix debug report naming problem (backend) (Rodrigo Trujillo) - * [cde51be] Github bug #326: run_command: killing all children processes (Daniel Henrique Barboza) - * [0a34570] allow user to create a storagepool with name in his local language (ShaoHe Feng) - * [c580e08] Issue #243: start/stop/display a VM whose name with "?" (ShaoHe Feng) - * [7cb61c0] Clear unused reference in vmstorages of 'kargs' (Royce Lv) - * [667a6b2] Issue #289: catch the libvirtError when failed to start a vm (ShaoHe Feng) - * [c35c318] Fix Kimchi UI issues on IE11 (Adam King) - * [5a044d9] Fix typo on API.json and add missing error messages (Aline Manera) - * [68988c3] cdrom: update model test for media update (Royce Lv) - * [cbab49f] cdrom: fix cdrom change media (Royce Lv) - * [a319343] Undefined lable in template buttons. (adriano) - * [30c383a] Issue #315: edit/delete templates that contains slashes in their names (ShaoHe Feng) - * [243dd85] Remove tabs in ui/pages/storagepool-add.html.tmpl (Aline Manera) - * [0af44e3] Change guests tab to update the VM List by DOM manipulation (Adam King) - * [8e7ef05] Update the guest.html.tmpl to use the new circleGauge widget (Adam King) - * [6db93c8] Create a reusable jQuery circleGauge widget (Adam King) - * [b47595d] Update (mock)model to generate proper JSON (Adam King) - * [3be6341] PEP8 for mockmodel.py (Adam King) - * [977e772] Fix PEP8 in test files (Aline Manera) - * [92d04e3] Fix ui/js/Makefile.am (Aline Manera) - * [09366f0] Implement integrity verification: update test case (ShaoHe Feng) - * [9988128] Implement integrity verification: verify template integrity in backend (ShaoHe Feng) - * [ef8222b] add a new method to get iso info for VMTemplate class (ShaoHe Feng) - * [f8bdc13] Implement integrity verification: verify template integrity, update API.md (ShaoHe Feng) - * [8c0ad96] issue #324 Improve error messages of creating a storage pool named "kimchi_i.. (Mark Wu) - * [2e93bbd] Use $(wildcard) to list files in Makefile (Aline Manera) - * [c0ffb52] Fix duplicate dev names in host with multipath storage (Rodrigo Trujillo) - * [898f3bd] Return 403 Forbidden when user does not have permission to access kimchi (Aline Manera) - * [88b01a0] Removing extra word from kimchi description (Christy Perez) - * [a4a64f9] add libxml2 to BuildRequires list (ShaoHe Feng) - * [af31ad1] Host's repositories management: Update error exception messages. (Paulo Vital) - * [1057a2f] Host's repositories management: Update test-cases. (Paulo Vital) - * [c33ab87] Host's repositories management: Update Makefile (Paulo Vital) - * [f27bcdb] Host's repositories management: Update backend. (Paulo Vital) - * [fcb7c68] Host's repositories management: Update REST API (Paulo Vital) - * [b7b2ab3] Host's repositories management: Update API.md (Paulo Vital) - * [5eb9bd8] Block access for non-root users (Aline Manera) - * [23df447] Add one more case to network tests (Ramon Medeiros) - * [10a2ed4] Bug fix #318 Kimchi fails creating new network (Ramon Medeiros) - * [4091825] bug fix: Properly check if there running vms before rebooting system (Aline Manera) - * [ba7dea2] Bug fix: methods signature in storagetargets.py (Daniel Henrique Barboza) - * [7e4588e] Add software update action to Host resource (Aline Manera) - * [a695185] Remove unused vms reference in VMModel (Royce Lv) - * [c53b3ea] Fix encode and decode in storagevolumes.py (Royce Lv) - * [391befb] ui: Add tooltip when hovering long names (Crístian Viana) - * [91bab78] doc: Generate index.html to join all help pages (Aline Manera) - * [0b7d861] bug fix: Package doc html files into deb package (Aline Manera) - * [400f3d8] Setup VM's input and output template for Power systems. (Paulo Vital) - * [13d610b] Fix exception for model test (Royce Lv) - * [db954e9] Implement integrity verification: don't disable network used by guest (ShaoHe Feng) - * [ff94a34] Fix Software Update rebase issue. (Paulo Vital) - * [f5506b9] clone template: update test case (ShaoHe Feng) - * [31dff43] clone template: update model and mockmodel (ShaoHe Feng) - * [a4be3c0] clone template: update controller (ShaoHe Feng) - * [0f0c991] Enhance generate_action_handler to redirect a new resource (ShaoHe Feng) - * [50f8272] clone template: update API.md (ShaoHe Feng) - * [a823e20] Bug fix #309 - network: Unable to create vlan tagged on Ubuntu (Ramon Medeiros) - * [f5502f7] doc: Ignore the generated files (Crístian Viana) - * [1b3310d] doc: Export the help pages to cherrypy (Crístian Viana) - * [5257e69] doc: Add help files to dist packages (Crístian Viana) - * [31d9ccf] doc: Add DITA help pages (Crístian Viana) - * [5c80111] Enhance UrlSubNode decorator and kimchiauth tool to check for sudo rights. (Leonardo Garcia) - * [1ca8c6f] Find out user groups and sudo status during login. (Leonardo Garcia) - * [cd65d8f] Code cleanup. (Leonardo Garcia) - * [382105c] CDROM Management: changes in tests/test_model.py (Daniel Henrique Barboza) - * [68f8784] CDROM Management: Guest vm storage devices mockmodel and rest api test cases (Rodrigo Trujillo) - * [9ce2615] CDROM Management: Devices management model implementation (Rodrigo Trujillo) - * [68701c2] CDROM Management: Update controller and API.json for guest storages (Rodrigo Trujillo) - * [56a6d9a] CDROM Management: API.md and externalized error messages (Aline Manera) - * [cbf7a89] bug fix: display kimchi icon instead of cherrypy icon (ShaoHe Feng) - * [82f1b82] Setup VM's boot order. (Paulo Vital) - * [c58465d] host update: Expose update tool (Aline Manera) - * [dae3830] host update: Update po files (Aline Manera) - * [d23ed36] Host's software update: Update test cases. (Paulo Vital) - * [002cb04] Host's software update: Update Makefile (Paulo Vital) - * [216db4f] Host's software update: Update backend. (Paulo Vital) - * [c29a36f] Host's software update: Update REST API (Paulo Vital) - * [3714aae] Host's software update: Update API.md (Paulo Vital) - * [8e6fc17] bug fix: fix python syntax error (ShaoHe Feng) - * [a9c80ac] bug fix: make install miss ifaces.py (ShaoHe Feng) - * [bfb5608] Fix host debug report for Fedora 20 (Rodrigo Trujillo) - * [c74e1db] Storagepool SCSI/FC: Modifies mockmodel and implements tests for FC pool (Rodrigo Trujillo) - * [7c0fc12] Storagepool SCSI/FC: Backend implementation (Rodrigo Trujillo) - * [ecb4d6c] Storagepool SCSI/FC: API.md entries related to host pci devices (Rodrigo Trujillo) - * [e4d08f3] Storagepool SCSI/FC: Implement node devices API backend (Rodrigo Trujillo) - * [57ece7a] Add mailing list information. (Leonardo Garcia) - * [3907474] Limit README.md to 80 columns. (Leonardo Garcia) - * [79abe0b] Add hypervisor information on README.md. (Leonardo Garcia) - * [a3f157e] refactor exception: Update all po files (Aline Manera) - * [0ee16b4] refactor exception: Update UI references (Aline Manera) - * [ce3953b] refactor exception: Update gen-pot script to get messages from i18n.py (Aline Manera) - * [f137c23] refactor exception: Update all exceptions (Aline Manera) - * [8d19059] refator exception: Update control to raise the exception message (Aline Manera) - * [715152c] refactor exception: Set error messages for jsonschema validation (Aline Manera) - * [26020a5] refactor exception: Add messages to be translated on backend (Aline Manera) - * [e13997a] refactor exception: Create a common Exception to translate error messages (Aline Manera) - * [b94d36c] Fix path of plugins dir (Mark Wu) - * [41ba026] pass params to create method of all Collections. (ShaoHe Feng) - * [9644c05] Fix wrong "Failed to list guest" message (Rodrigo Trujillo) - * [2f6ac7b] Add disks to LVM pool: API.json changes (Daniel Henrique Barboza) - * [61945fd] Add disks to LVM pool: mockmodel changes (Daniel Henrique Barboza) - * [0a54dab] Add disks to LVM pool: API.md changes (Daniel Henrique Barboza) - * [b500a90] Add disks to LVM pool: control and model changes (Daniel Henrique Barboza) - * [d7458e7] Fix missing report-add html page in rpm (Rodrigo Trujillo) - * [db829ac] Fix controller base code: Update function is not using model_args (Rodrigo Trujillo) - * [2fed3f5] change the vm name in test case (ShaoHe Feng) - * [0adea83] update test case for updating vm with unicode name (ShaoHe Feng) - * [60f3da3] bug fix: failed to update vm with unicode name (ShaoHe Feng) - * [3f5cdd2] update test case for storage pool support unicode (ShaoHe Feng) - * [4f3d489] Firewall: Adding WebSocket port in firewall rules (Paulo Vital) - * [8cac63d] Storage pool support unicode correctly (ShaoHe Feng) - * [cc11627] bug fix: Set full path to guest page file in guest tab (Aline Manera) - * [9f33184] bug fix: Fix shallow scan broken after model refactoring (Aline Manera) - * [b9c0594] Make sure ISO files have read permission while starting VM (Aline Manera) - * [461452a] Remove kvmusertests.py (Aline Manera) - * [0e25ad2] Add a method to fix read permission on ISO files (ShaoHe Feng) - * [0368afa] Avoid useless libvirt error log produced by featuretests (apporc) - * [f84b4d5] Packaging: add the basemodel.py to src/kimchi/Makefile.am (Paulo Vital) - * [02d94f5] Fix get vms list function name (Rodrigo Trujillo) - * [0d7d89c] Add test cases for BaseModel (Mark Wu) - * [4a5ede7] Break the 'sample' plugin's monolithic model into several smaller ones (Zhou Zheng Sheng) - * [78443ae] refactor model: Update makefile and specs files (Aline Manera) - * [a0a4dc0] Delete former model.py and rename model_ to model (Aline Manera) - * [17d1014] Update mockmodel imports (Aline Manera) - * [d0ff3f9] Update tests to use the new model (Aline Manera) - * [dd2b2f4] Update server to use the new model (Aline Manera) - * [a87ab93] refactor model: Create a separated model for host resource (Aline Manera) - * [8a93e68] refactor model: Create a separated model for vm interface resource (Aline Manera) - * [5e34a52] refactor model: Create a separated model for vm resource (Aline Manera) - * [41f0cc7] refactor model: Create a separated model for template resource (Aline Manera) - * [977c267] refactor model: Create a separated model for storage target resource (Aline Manera) - * [e67c3be] refactor model: Create a separated model for storage server resource (Aline Manera) - * [b1d2c63] refactor model: Create a separated model for storage volume resource (Aline Manera) - * [f7001ca] refactor model: Create a separated model for storage pool resource (Aline Manera) - * [8d004e1] refactor model: Create a separated model for interface resource (Aline Manera) - * [3bf22b3] refactor model: Create a separated model for network resource (Aline Manera) - * [39d1b7b] refactor model: Create a separated model for config resource (Aline Manera) - * [9c38e1f] refactor model: Create a separated model for debug report resource (Aline Manera) - * [e79ebaa] refactor model: Create a separated model for plugins resource (Aline Manera) - * [c08c091] refactor model: Create a separated model for task resource (Aline Manera) - * [a22d932] Create a model to join all model resources implementation (Aline Manera) - * [4b00cab] refactor model: Create a common model builder (Aline Manera) - * [f96d5e5] refactor model: Move StoragePooldef from model to libvirtstoragepools.py (Aline Manera) - * [e2008c5] refactor model: Separate libvirtconnection from model.py (Aline Manera) - * [b77935b] Allow plugin use kimchi's ui handler (Mark Wu) - * [44be0d2] Add test cases for paths generation code (Mark Wu) - * [8bc4dde] Reorganize the kimchi's paths gereneration code (Mark Wu) - * [fce2030] Move resource config's info fetching to model level (Mark Wu) - * [2ab9785] CSS: Change all CSS files indentation to 4 spaces (Crístian Viana) - * [ab999de] CSS: Do not allow lines longer than 79 characters (Crístian Viana) - * [84df5f7] HTML: Make the form element's labels clickable (Crístian Viana) - * [29e17e4] Update README to direct users to the oVirt mailing list (Adam King) - * [9057ae1] Use Autoconf macros AC_PROG_MKDIR_P and MKDIR_P (ShaoHe Feng) - * [21f099f] GET /plugins failed, fix it (ShaoHe Feng) - * [b1bf105] get vms list by listAllDomains (ShaoHe Feng) - * [6bcbb3f] Make guests template handling more robust like host template handling (Adam King) - * [fdbd2a8] Remove the unnecessary 'exposed' (Mark Wu) - * [de892cb] bug fix: Expose /storageservers (Aline Manera) - * [a6a4999] bug fix: remove decode for resouce ident when use cherrypy's default dispatc.. (ShaoHe Feng) - * [b67aa7b] fix: Add missing license copyright to css files (Aline Manera) - * [8989283] PEP8 cleanup and bug fix for src/kimchi/utils.py (Mark Wu) - * [7410a58] support create/delete VMIface: update testcase (ShaoHe Feng) - * [9072f67] support create/delete VMIface: update API.json (ShaoHe Feng) - * [4cf2b6e] support create/delete VMIface: update mockmodel (ShaoHe Feng) - * [c66c675] support create/delete VMIface: update model (ShaoHe Feng) - * [f4942a0] bug fix: guest iface does not return model if no model is found (ShaoHe Feng) - * [dd5bf4a] bug fix: Use cherrypy host to run feature tests instead of localhost (Aline Manera) - * [6ded2ab] VM supports interfaces: update testcase (ShaoHe Feng) - * [e2e5aab] VM supports interfaces: update mockmodel (ShaoHe Feng) - * [d90f38e] VM supports interfaces: update controller (ShaoHe Feng) - * [5825943] VM supports interfaces: update model (ShaoHe Feng) - * [398a171] VM supports interfaces: update API (ShaoHe Feng) - * [304217b] Add a control.vm module (ShaoHe Feng) - * [b4fe1dc] bug fix: test case can not find plugin, fix it (ShaoHe Feng) - * [b0aed86] improve controller: set authentication automatically (ShaoHe Feng) - * [18b68ea] improve controller: Root loads collections/resouces automatically (ShaoHe Feng) - * [5b82bdf] improve controller: tag the collections/resouces of root with @UrlSubNode (ShaoHe Feng) - * [c7d2856] improve controller: add a method to load root sub collections/resouces autom.. (ShaoHe Feng) - * [f68a3bc] add gettext to package require list (ShaoHe Feng) - * [7cff21e] Modify bug in spice UI (zhoumeina) - * [2ef94b9] Add nfs server and target UI in create storage pool (zhoumeina) - * [504213f] Fix libvirt nfs target probe problem (Royce Lv) - * [881361f] Add showmount function and feature test for libvirt target probe (Royce Lv) - * [e024dd3] storage target: Add model support (Royce Lv) - * [d60c4b8] storage target: Update controller and json schema (Royce Lv) - * [4be609a] storage target: Update API.md (Royce Lv) - * [2e1657e] storage server: Update model and mockmodel (Royce Lv) - * [e976b78] storage server: update controller.py (Royce Lv) - * [545ec78] Storage server: Update API.md (Royce Lv) - * [1740a25] Add testcase for GET param (Royce Lv) - * [478d01d] Support params for GET method (Royce Lv) - * [4750f33] Remove 'encoding=iso-8859-1' from json.dumps() (Mark Wu) - * [7dfb3e4] Integrate nfs path check before create nfs pool (Royce Lv) - * [f575b52] utils: Add nfs prevalication (Royce Lv) - * [0a02212] storagepool: Use callback functions when deleting a pool (Crístian Viana) - * [41e4c8c] storagepool: Do not assume different 'else' values in pool type (Crístian Viana) - * [7606325] Issue #310: Query correct name to validate logical devices (Crístian Viana) - * [7813c63] storagepool: Add missing msg when no logical device is selected (Crístian Viana) - * [3a49821] Ubuntu: Add the LVM dependency package to README (Crístian Viana) - * [c69fa0f] Use cherrypy's default dispatcher for subcollection (Mark Wu) - * [43618b0] UI bug fix: Set vlan_id value only if 'Enable VLAN' is checked (Aline Manera) - * [5e829c2] Add the iSCSI dependency packages to README (Crístian Viana) - * [6ae06e9] add a synchronous function with timeout to execute command (ShaoHe Feng) - * [f060c18] Add jquery widget dropDown button (zhoumeina) - * [a2e7b35] Modify vnc_proxy_port to display_proxy_port (zhoumeina) - * [19ae1dd] Add the front end support for SPICE (zhoumeina) - * [b605432] RollbackContext: Make it complied with Python Standard (Zhou Zheng Sheng) - * [1a2d326] UI: Remove Unused Label Room for Debug Report (Hongliang Wang) - * [0dbfe20] host.css: Change Indent to 4 Spaces (Hongliang Wang) - * [5289d02] Add a timeout tuning environment variable for debug report test (Shu Ming) - * [f51dbbc] Skip the debug report test if there is no tool avaible (Shu Ming) - * [88553a8] Issue #308: Use correct iSCSI package for openSUSE (Crístian Viana) - * [1567cbb] spec: Open 8000 and 8001 port by default (Eli Qiao) - * [31ef97f] Add support to RHEL 7 (Adriano Botega) - * [342334e] Deep scan: listing 'unknown' bootable isos after deep scan (Daniel Henrique Barboza) - * [c3a548e] UI: template supports networks (Xin Ding) - * [7b608a0] Add graphics parameters description in API.md (apporc) - * [655f03d] Update test case for graphics support (apporc) - * [4951d3c] Update mockmodel for spice support (apporc) - * [6c3bc68] Validate graphics parameters input by users (apporc) - * [88ddc57] Add spice backend support for kimchi (apporc) - * [5ab77d3] Fix break of deep scanning (Royce Lv) - * [f5b4740] network improvement: update test case to support vms field (ShaoHe Feng) - * [866e836] network improvement: update mockmodel to support vms field (ShaoHe Feng) - * [dff73d0] network improvement: add vms field (ShaoHe Feng) - * [2f54aab] UI: All user to specify a vlan ID for a virtual network. (Mark Wu) - * [6b339da] Support creating vlan tagged virtual network (Mark Wu) - * [69edfe9] Generate libvirt's interface XML definition for vlan tagged bridge (Mark Wu) - * [b656d4d] Fix qemu-io option in featuretests (Mark Wu) - * [dff7038] Add Fedora 20 and Ubuntu 13.10 to distros.d (Mark Wu) - * [319a83b] Github issue #300: hardcoded server port fix (Daniel Henrique Barboza) - * [e57b07e] Update the po files (Shu Ming) - * [99808b2] Remove the legacy files (Shu Ming) - * [641ace2] Remove the legacy files from automake and package configurations (Shu Ming) - * [90b61f0] Remove jquery-ui customization in network (Yu Xin Huo) - * [af8cac4] Customize jquery-ui dialog (Yu Xin Huo) - * [762c522] Customize jquery-ui menu (Yu Xin Huo) - * [5ba06d7] Customize jquery-ui button (Yu Xin Huo) - * [9882732] Remove vnc related code in mockmodel (Mark Wu) - * [f1234b1] Use one weksockify instance as all vms' vnc proxy. (Mark Wu) - * [8480365] Add a configuration for vnc websocket proxy (Mark Wu) - * [47e64e7] Move configuration parsing to config.py (Mark Wu) - * [212dc33] Add the ISCSI translation po files (zhoumeina) - * [4997624] Add UI support of iscsi (zhoumeina) - * [618035a] Support VM template for Power machine (Mark Wu) - * [177c2a0] Dynamically generate template parameters for different distros (Mark Wu) - * [b4ca2a8] Fix: Storagepool json schema has not been tested when create new SP (Rodrigo Trujillo) - * [0b507ff] pep8 cleanup for isoinfo.py (Aline Manera) - * [b5d80d8] isoinfo: Move _probe_iso() to IsoImage() (Aline Manera) - * [e885f0b] Move ISO path validation to IsoImage() (Aline Manera) - * [ff79ea8] Move IsoFormatError() from isoinfo.py to exception.py (Aline Manera) - * [1eb47bf] isoinfo: Use absolute path only for local ISO files (Aline Manera) - * [e0b2d83] isoinfo: Add default value for ignore_list paramter (Aline Manera) - * [6722758] template supports networks: update test case (ShaoHe Feng) - * [6f7fda8] template supports networks: update mockmodel (ShaoHe Feng) - * [51c1af4] template supports networks: update model (ShaoHe Feng) - * [e777c77] template supports networks: update controller and json schema (ShaoHe Feng) - * [7d03a1c] template supports networks: update API (ShaoHe Feng) - * [601d140] template supports networks: fix test case (ShaoHe Feng) - * [ee3377f] template supports networks: let template xml support more networks (ShaoHe Feng) - * [1a0fd41] pep8 cleanup for exception.py (Aline Manera) - * [be26ed4] pep8 cleanup for distroloader.py (Aline Manera) - * [170709e] qemu user tests: probe the username of qemu process started by libvirt (ShaoHe Feng) - * [8a7aca2] plugin: fix dynamic import mechanism (Zhou Zheng Sheng) - * [05f999f] test_model: test creating iSCSI storage pool (Zhou Zheng Sheng) - * [f163d22] storagepool: Support Creating iSCSI storagepool in model.py (Zhou Zheng Sheng) - * [53e1d40] storagepool: rename and consolidate arguments of creating (front-end) (Zhou Zheng Sheng) - * [265de8d] storagepool: rename and consolidate arguments of creating (back-end) (Zhou Zheng Sheng) - * [ab63bba] storagepool: refactor _get_pool_xml() (Zhou Zheng Sheng) - * [08ff87d] Issue #293: Resizing Issue When There Are Multiple Grids (Hongliang Wang) - * [5e5a6a6] touch 4 files when move RollbackContext, fix pep8 on them (ShaoHe Feng) - * [7c98d3b] move RollbackContext from tests/utils to src/kimchi/rollbackcontext (ShaoHe Feng) - * [cb7c355] Move all resources related to tasks to control/tasks.py (Aline Manera) - * [423e9bb] Move all resources related to plugins to control/plugins.py (Aline Manera) - * [ae9cc6b] Move all resources related to host to control/host.py (Aline Manera) - * [ceff362] Move all resources related to config to control/config.py (Aline Manera) - * [0d44ed9] Move all resources related to networks to control/networks.py (Aline Manera) - * [cd5d5bc] Move all resources related to interfaces to control/interfaces.py (Aline Manera) - * [8a7a5f6] Move all resources related to storage volume to control/storagevolumes.py (Aline Manera) - * [05ce4dd] Move all resources related to storage pools to control/storagepools.py (Aline Manera) - * [69a241a] Move all resources related to debug reports to control/debugreports.py (Aline Manera) - * [6ea6d32] Move all resources related to templates to control/templates.py (Aline Manera) - * [1a23ce1] Move all resources related to vms to control/vms.py (Aline Manera) - * [f824fa2] Move basic controller resources to control/base.py (Aline Manera) - * [cae61e6] Move login() and logout() functions from controller.py to root.py (Aline Manera) - * [9cf0c0f] Move common functions for Resource and Collection to control/utils.py (Aline Manera) - * [2d6d1f5] Move generate_action_handler() function to Resource() class (Aline Manera) - * [817d3ad] Simplify domain xml in featuretests.py (Aline Manera) - * [b44e658] pep8 cleanup for featuretests.py (Aline Manera) - * [07c25db] fix whitespace in test_mockmodel (ShaoHe Feng) - * [c56582e] logical pool: list unused physical volume (Zhou Zheng Sheng) - * [2553e21] logical pool fixes: only list leaf devices, and read file instead of run "cat" (Zhou Zheng Sheng) - * [e467b32] Organize python imports (Rodrigo Trujillo) - * [1410acd] Add support for Gentoo Linux (Crístian Viana) - * [320fd13] PEP 8: Fix an alignment issue in src/kimchi/auth.py (Zhou Zheng Sheng) - * [7cead00] pep8 cleanup for root.py (Aline Manera) - * [de1867a] pep8 cleanup for cachebust.py (Aline Manera) - * [508ada2] pep8 cleanup for auth.py (Aline Manera) - * [c0b9d57] Bug fix: Kimchi will try to create directory for 'DIR' storagepool (Rodrigo Trujillo) - * [f70d34f] Replace tab to 4 spaces (Aline Manera) - * [8698173] Issue #290: correct the log usage (ShaoHe Feng) - * [5831b4d] screenshot: fix problem on Power of truncated picture (Royce Lv) - * [acbcf04] Return source information for storage pool (Royce Lv) - * [88e5ec6] Update changelog and version files for 1.1 release (Aline Manera) - * [bf6d929] Issue #276, logical pool: a quick fix for the device listing rules, front-end (Zhou Zheng Sheng) - * [902d295] Issue #276: logical pool: a quick fix for the device listing rules, back-end (Zhou Zheng Sheng) - * [b555f83] PEP 8: cleanup src/kimchi/disks.py (Zhou Zheng Sheng) - * [85d16e1] Add some brazilian portuguese lang translations (Alexandre Tanaka Hirata) - * [f2de42c] do Chinese translation for release 1.1 (ShaoHe Feng) - * [3c7f2d7] issue #287: Confirm box will be hidden by the window dialog (Xin Ding) - * [bf1d443] Use spacewalk repo to get python-ethtool on suse. (ShaoHe Feng) - * [1773214] Add confirm box to create logical pool,and modify device path number (zhoumeina) - * [0faa902] bug fix: Make sure to use string with os.walk (Aline Manera) - * [b12167b] bug fix: Add authentication to host tab (Aline Manera) - * [0e274b8] bug fix: Update openSUSE instructions in README file (Aline Manera) - * [d5fe662] bug fix: Don't display vlan interfaces while creating network bridge (Aline Manera) - * [a6ddab1] Issue #283: Fix memory leak caused by libvirt connection wrapper (Mark Wu) - * [7c62e72] Templates: Remote ISO Image page aligning mess (Xin Ding) - * [07111ae] Meaningless text "Default Settings" in the templates tab page (Xin Ding) - * [8b41a3f] create template in batch don't show success detail message (Xin Ding) - * [d2f4951] Bug fix:251 template edit page disk unit with no unit and make cdrom disable (zhoumeina) - * [a4b412c] Incosistent pages when no guests or templates available (Xin Ding) - * [3a44881] Update test_model to compare distro name using unicode (Ramon Medeiros) - * [af05155] Set autostart value for logical storagepool (Shu Ming) - * [3cf5330] Issue #259: vm create: fail msg need to be more specific (Hongliang Wang) - * [1a97be6] Fix emulator path in feature tests (Mark Wu) - * [428fce5] Issue #279: some plugins/sample files are missing in dist. (ShaoHe Feng) - * [be5969d] Tests: Generate UUID and use as temp report file name (Zhou Zheng Sheng) - * [1d15833] sosreport: fix name matching of the generated report file (Zhou Zheng Sheng) - * [c8a760a] Support unicode on Host Basic Information page (Ramon Medeiros) - * [d57226d] Issue #278: add iso_gen.py to Makefile EXTRA_DIST list (ShaoHe Feng) - * [0d63a80] Issue 277, Disable 'bridged' option when no interface available (Yu Xin Huo) - * [97139d8] Issue #271, add address space for bridged nework (Yu Xin Huo) - * [842f72b] Issue #241: require python-psutil version (ShaoHe Feng) - * [ed971d1] Issue #262: Switch tab lose default network type selection (Yu Xin Huo) - * [9a22f75] bug fix: set the network ip as bridge ip instead of subnet IP (ShaoHe Feng) - * [d43e538] Bug #260 fix: Makes UI show missing storage volume information (Rodrigo Trujillo) - * [c8a25fd] Bug Fix: Wrong host available memory value (Rodrigo Trujillo) - * [37f4d8c] Issue #273: unittest.TestCase has no attribute 'assertLessEqual' (ShaoHe Feng) - * [e12b93e] bug fix #254: Reset guest statistics when vm is powered off (Aline Manera) - * [1dd695d] bug fix #257: Specify the mime type for debugreports static dir (Aline Manera) - * [01d72ca] bug fix: Don't use shell=True in subprocess.Popen while running qemu-io test (Aline Manera) - * [175869d] Issue #263: network: bridge network shows network/prefix (ShaoHe Feng) - * [89d4766] Packaging: add host.html.tmpl to ui/pages/tabs/Makefile.am (Paulo Vital) - * [ce43d08] Add build in localdisk back-end (zhoumeina) - * [92d81c6] Add logical pool UI support (zhoumeina) - * [97a5e81] Packaging: add the disks.py to src/kimchi/Makefile.am (Zhou Zheng Sheng) - * [55f5fa0] Nit fix of scan_dir_prepare (Royce Lv) - * [2f4de5f] Deduplication: deduplication in shallow scan (Royce Lv) - * [b44c66a] Deep scan: Adding scan ignore path (Royce Lv) - * [8d55a0d] Deep scan result deduplication (Royce Lv) - * [e3cf2c2] interface bug fix: only expose the unused interfaces to the front end (ShaoHe Feng) - * [e9b8deb] Tests: fix test_model.ModelTests.test_debug_reports (Zhou Zheng Sheng) - * [612b8e3] UI: Enhancement & Fixes for Host Monitoring (Hongliang Wang) - * [1bf51f9] Issue #240: The bridge address of nat and isolated network is invalid, fix it (ShaoHe Feng) - * [b1dd7b4] Interface: Fix status return (Rodrigo Trujillo) - * [132bfc5] Logical StoragePool: changes in API.md (Daniel Henrique Barboza) - * [59a0976] Logical StoragePool: changes in controller.py (Daniel Henrique Barboza) - * [343f3d1] Logical StoragePool: changes in model and mockmodel (Daniel Henrique Barboza) - * [d9a2013] Logical StoragePool: adding disks.py module (Daniel Henrique Barboza) - * [2686b5f] PEP8 cleanup for server.py (Mark Wu) - * [8e488ff] Add deep scan test (Royce Lv) - * [6b2f43a] ISSUE #236: Fix break of deep scanning (Royce Lv) - * [02192e5] Add pseudo iso_gen for deep scan test (Royce Lv) - * [64c541a] Template: Enable update Disk size and CDROM path (UI) (Rodrigo Trujillo) - * [d7b1be8] Add dependency of nfs client (Royce Lv) - * [a7223e0] Concatenate ISO URL correctly with port number (Crístian Viana) - * [ebac998] UI: Host Monitoring (Hongliang Wang) - * [f684b36] Issue #235: changetoProperUnit Returns Wrong Result (Hongliang Wang) - * [0164098] change the unit of host disk and net IO rate from kb/s to B/s (ShaoHe Feng) - * [006f773] Fix test cases according to new Templates Schema validation (Rodrigo Trujillo) - * [46e9b94] Enable template data verification against json schema (Rodrigo Trujillo) - * [c57da0d] Json schema for templates (Rodrigo Trujillo) - * [b9b4359] Host reboot and shutdown backend implementation (Rodrigo Trujillo) - * [76f8d5d] ui: Adjust storage pool window layout (Aline Manera) - * [2ad5768] po files: NFS pool (Pradeep K Surisetty) - * [e62ff62] Add/delete NFS pool (Pradeep K Surisetty) - * [76653ec] bug fix: remove wlans from nics. (ShaoHe Feng) - * [33f487e] bug fix: assert list append successfully when get all network interfaces (ShaoHe Feng) - * [f793d3a] Fix minor issue in import order (Rodrigo Trujillo) - * [3ddb97d] Add Network UI Files to Makefile (Yu Xin Huo) - * [f7a0fa8] network UI: update po files (Yu Xin Huo) - * [dc0fc09] create/delete network (Yu Xin Huo) - * [f2cf0b6] List/Start/Stop Network (Yu Xin Huo) - * [e6b0afc] Center the storage pool "Actions" button (Crístian Viana) - * [842e55b] Use consistent padding in storage pool details (Crístian Viana) - * [4e2748a] Use jQuery to load xml to make code consistent (zhoumeina) - * [8e23fef] host net-io: update test case (ShaoHe Feng) - * [c4721df] host net-io: update model and mockmodel (ShaoHe Feng) - * [80bcbcb] host net-io: update API.md (ShaoHe Feng) - * [b0bc8ba] Authentication is required to access networks (ShaoHe Feng) - * [853cdf1] network: update test case (ShaoHe Feng) - * [df2b66e] network: update mockmodel (ShaoHe Feng) - * [3e0d05b] network: update makefile, spec file and README (ShaoHe Feng) - * [9070d60] network: update model (ShaoHe Feng) - * [d30ca35] network: generate network xml and testcast for it (ShaoHe Feng) - * [26ee208] network: update controller (ShaoHe Feng) - * [dbe31d3] network: update API.md (ShaoHe Feng) - * [e7c9ce7] Add license to scan.py file (Aline Manera) - * [65f6ad3] Organize imports in all .py files (Aline Manera) - * [0048f33] fix disk unit: 1K bytes is 1024 bytes instead of 1000 bytes (ShaoHe Feng) - * [ad75a6f] Add test cases for plugin support (Mark Wu) - * [2abc251] Add a sample kimchi plugin (Mark Wu) - * [9fb6a09] Move API schema loading to the initialization of application (Mark Wu) - * [f879390] Add a plugin mechanism for Kimchi server (Mark Wu) - * [ce3e182] Add the missing Makefiles for plugins support (Mark Wu) - * [f22dd25] Add a helper function to get kimchi python package directory (Mark Wu) - * [302f186] host disk-io: update test case (ShaoHe Feng) - * [f987fb5] host disk-io: update model and mockmodel (ShaoHe Feng) - * [76f3f5b] host disk-io: update API.md (ShaoHe Feng) - * [940742a] Fix kimchi make rpm fail error (zhoumeina) - * [e293010] Authentication is required to access debugreports (Shu Ming) - * [f2fce9d] Add the front-end support of tabs (zhoumeina) - * [ebf366f] Add the back-end support of tabs (zhoumeina) - * [b45e709] Template update UI return 'cpus' and 'memory' as numbers (Rodrigo Trujillo) - * [277bd3b] UI: deep scan (Xin Ding) - * [a83f2ee] Use "dropdown" CSS class on the Edit Template page (Crístian Viana) - * [11f78db] Format template and storage pool details (Crístian Viana) - * [7cb6c2a] deep scan: Probe iso information (Aline Manera) - * [00d01a7] Add sos/sosreport package as Kimchi dependency (Aline Manera) - * [af1de8e] Expose if the host has at least one system report tool (Aline Manera) - * [c75d773] Fix low version libvirt bug when get cpuinfo (malcolm yu) - * [df327bb] VM Edit UI (Hongliang Wang) - * [81a7b87] vm-rename fix: return domain after static config change (Royce Lv) - * [89b7631] Sort the storage pool list (Crístian Viana) - * [09f9ee0] Update storage pool list after activate/deactivate (Crístian Viana) - * [722c5a8] vm-rename: Update testcases for vm-rename (Royce Lv) - * [bb895c6] vm-rename: Update mockmodel for vm edit (Royce Lv) - * [b2953fc] vm-rename: Update model for vm edit (Royce Lv) - * [edaa063] vm-rename: Update controller (Royce Lv) - * [a0223e2] vm-rename: Update API.md for vm rename (Royce Lv) - * [ceb4ca3] host memory stats: update test case (ShaoHe Feng) - * [e225c83] host memory stats: update model and mockmodel (ShaoHe Feng) - * [95dda58] host memory stats: update API.md (ShaoHe Feng) - * [63f6f77] support recrusive probe in iso scanning (Royce Lv) - * [ab7518f] Fix session locking issue (Mark Wu) - * [59a8a08] amend API.md (ShaoHe Feng) - * [cdb9023] host info: update test case (ShaoHe Feng) - * [f0f069c] host info: update mockmodel (ShaoHe Feng) - * [371dcdc] host info: update model (ShaoHe Feng) - * [4843de7] host info: update controller (ShaoHe Feng) - * [cd1d545] host info: update API.md (ShaoHe Feng) - * [45df370] interface: update makefile, spec file and README (ShaoHe Feng) - * [2036b2c] interface: update test case (ShaoHe Feng) - * [6f22e4e] interface: update mockmodel (ShaoHe Feng) - * [9054bf9] interface: update model (ShaoHe Feng) - * [c47ba91] interface: update controller (ShaoHe Feng) - * [5ced3ef] interface: update API (ShaoHe Feng) - * [1bd987c] interface: some new utils to get the interface info (ShaoHe Feng) - * [76515ed] Add json schema for API's request parameters (Mark Wu) - * [8ceadbe] Extend the action decorator into an action handler generator (Mark Wu) - * [da4f395] host cpu usage: update test case (ShaoHe Feng) - * [f84e32d] host cpu usage: update mockmodel (ShaoHe Feng) - * [ca7648b] host cpu usage: update model (ShaoHe Feng) - * [1f558d7] host cpu usage: update controller (ShaoHe Feng) - * [18b24b3] host cpu usage: update API.md (ShaoHe Feng) - * [8ef7b15] Use socket.getservbyname() to get the default port of a protocol (Aline Manera) - * [4c05423] Expose the number of CPUs assigned to a VM (Aline Manera) - * [e40d237] Make the report tool silent in the background (Shu Ming) - * [1c807b6] DebugReports: Downloading the archives (Shu Ming) - * [cd74bb8] DebugReports: Implement the real backend (Shu Ming) - * [b01b9f4] DebugReports: Implement the mock model (Shu Ming) - * [bb59b46] DebugReports: Add collection and Resource (Shu Ming) - * [b81fce3] DebugReports: Define the APIs (Shu Ming) - * [31f60d7] Add testcase of template storagepool customise (Royce Lv) - * [aa77a7a] pre-create validate: validate for mockmodel vm create (Royce Lv) - * [94b3b65] pre-create validate: Add iso/storage/network availabilty check (Royce Lv) - * [623135f] test storage pool not changed after vm customization (Royce Lv) - * [24b4c23] model: aggregate vm config customization when creating (Royce Lv) - * [02aa5eb] mockmodel: generate customised temporary template when create vm (Royce Lv) - * [549da65] Customise template storage: Report 'storagepool' info in controller (Royce Lv) - * [1a090d6] Customise template storage: Update API.md (Royce Lv) - * [e2e5892] Set a custom pool for a template (Xin Ding) - * [226f6f7] deep scan: add model support (Royce Lv) - * [0469f1e] Deep scan: Add functions for deep scan preparation (Royce Lv) - * [c359641] Deep scan: update controller (Royce Lv) - * [c71a5a6] Deep scan: Update API.md (Royce Lv) - * [b5e5bc2] Deep scan: Fix isoinfo.py for iso can't be reported (Royce Lv) - * [0c603c5] Adding "python-psutil" package to Kimchi (Daniel Henrique Barboza) - * [fe82184] Issue #227: Misunderstood labels and error messages in templates tab. (Paulo Vital) - * [39dae67] Fix text wrap in template and guest (zhoumeina) - * [1d30644] issue #228: Use SIGKILL to kill proc in featuretests (ShaoHe Feng) - * [0e50096] close libvirt connection in featuretests (ShaoHe Feng) - * [e74728c] Add gen-pot to .gitignore list (Aline Manera) - * [7d86a64] Add missing ui files to spec file (Mark Wu) - * [c339575] Distribute po/get-pot.in instead of po/get-pot (Mark Wu) - * [0bd8245] bug fix: put distroloader.py in Makefile dist list (ShaoHe Feng) - * [50a37a4] Remove 'config.py' from the distribution (Mark Wu) - * [07d9a85] Bug fix:153 Drop kimchi-iso from storagepool list (zhoumeina) - * [2ee72ce] bug fix: Use vm uuid to properly get vm statistics (Aline Manera) - * [a276aff] bug fix: correct to use float when calculate guest net and disk IO (ShaoHe Feng) - * [38bb3bd] iso streaming: Add default port for all protocols (Aline Manera) - * [b4e0122] ISO streaming: Enable UI (Aline Manera) - * [620618b] iso streaming: QEMU workaround (Aline Manera) - * [29c7338] iso streaming: Libvirt workaround (Aline Manera) - * [93d3ccc] Expose QEMU ISO streaming functionality to host capabilities (Aline Manera) - * [03aa2e9] feature tests: Verify QEMU can properly work with hostname while streaming I.. (Aline Manera) - * [9e1eae2] feature tests: Verify QEMU supports ISO streaming (Aline Manera) - * [e14dec1] feature tests: Rename libvirt test to express what it does (Aline Manera) - * [99331be] distros: update testcase in test_rest and rest_model (ShaoHe Feng) - * [8a2980a] distros: add mockmodel and model implementation (ShaoHe Feng) - * [d8b067a] distros: update Controller to add Distros collection and Distro resource (ShaoHe Feng) - * [7e2a5ac] distros: update API document (ShaoHe Feng) - * [7add3d9] distros: add a DistroLoader to load distros (ShaoHe Feng) - * [185cad1] distros: add new distros files (ShaoHe Feng) - * [0e3cb34] Drop IE8 support in README (zhoumeina) - * [cbcbd5d] pep8 cleanup for asynctask.py (Mark Wu) - * [cafab09] Enable pep8 code style checking (Mark Wu) - * [ad793e0] Display error message on template delete failure (Crístian Viana) - * [a138304] Choose right icon for centos iso (Royce Lv) - * [949fc69] Add jquery-ui files to dist data list. (Yu Xin Huo) - * [b1d5002] isoinfo: Allow the main program probe a single ISO file (remote or local) (Aline Manera) - * [193ab1a] templates: Try to identify distro and version from remote ISO file (Aline Manera) - * [e7f3337] isoinfo: Add support to identify distro and version from remote ISO file (Aline Manera) - * [26f1688] StoragePool: Pool name error message (Pradeep K Surisetty) - * [e9599d5] Add jquery-ui (Yu Xin Huo) - * [00536ab] Remove redundant interface in api.js (zhoumeina) - * [8f3e38c] Issue #199: Update templates list only after success of deleteTemplate (Aline Manera) - * [cbafe92] vm-uuid: Update testcases (Royce Lv) - * [053fa95] vm-uuid: Report uuid in controller (Royce Lv) - * [d44883e] vm-uuid: make vm stats indexed in uuid (Royce Lv) - * [b0bbc20] vm-uuid: store vm extra information indexed in uuid (Royce Lv) - * [d022fff] vm-uuid: Use uuid in screenshot generation (Royce Lv) - * [8d70b27] vm-uuid: Using uuid in vmtemplate (Royce Lv) - * [51e9766] Use "font-weight: bold" in header texts (Crístian Viana) - * [ec381bb] No HttpOnly is set to the cookie for session id (Xin Ding) - * [18567d7] Use libvirt api to implement find_qemu_binary (apporc) - * [ce12235] eliminate messages keys from all po files (ShaoHe Feng) - * [1e164ca] bug fix: make gen-pot scan multi lines (ShaoHe Feng) - * [765887d] Add the three translation for Chinese (zhoumeina) - * [1726c5b] Update ChangeLog for the 1.0.1 release (Adam Litke) - * [9d0c89c] Do not generate ChangeLog when outside a Git repo (Crístian Viana) - * [c44d03b] Add VERSION file with Kimchi version (Aline Manera) - * [51d365f] Get the appropriate Kimchi version from Git tag (Crístian Viana) - * [d9d4cdd] Fix variable name "iptype" (Crístian Viana) - * [564babe] Issue #97: "Make distclean" does not remove all the intermediate files (Paulo Vital) - * [4a6edb2] Issue #180: Singular/plural noun agreement on "Templates" (Crístian Viana) - * [d665854] Update ChangeLog for the 1.0.0 release (Adam Litke) - * [0448a5a] opensuse: Start kimchid automatically (Adam Litke) - * [5db3d20] Issue #173: set the correct mime type of Content-Type in HTTP respose header (ShaoHe Feng) - * [665406d] Bugfix: Issue #182 int object has no attribute isdigit (apporc) - * [0654104] Encode parameters in URL generated by the server (Xin Ding) - * [f7fa1d8] Encode parameters in URL When calling REST APIs (Xin Ding) - * [4fdc708] Make header text sizes equal (Crístian Viana) - * [3c88c7f] build: Generate ChangeLog (Adam Litke) - * [51f15c6] issue #183: Display all template information in pt_BR on Firefox (Aline Manera) - * [adb065f] i18n: Update translation catalogue (Adam Litke) - * [f4d7f5b] Fix typo in English translation (Aline Manera) - * [65bdf9e] Issue #183: Adjust Template Tile Layout (Hongliang Wang) - * [916344a] Fug fix:Chinese tooltip will wrap in storage (zhoumeina) - * [045c506] change the storage arrow style, and make arrow disable when inactive (zhoumeina) - * [b45b62c] i18n: Update pt_BR translations (Aline Manera) - * [27cebf6] Issue #154: Prompt User When Creating VM and There is NO Template (Hongliang Wang) - * [85195d6] Issue #191: Log-in Name Disappears after Restarting Browser (Hongliang Wang) - * [4cf0113] Issue #190: Language Selector Value NOT Match Page Content (Hongliang Wang) - * [6c85531] Bug fix: login window will have scroll bar when putted wrong password (zhoumeina) - * [111494a] Drop the handle in storage,fix the position error of the navbar arrow (zhoumeina) - * [917d120] The icon image for unknown os is not suitable (Xin Ding) - * [aea983c] issue #166: Destroy storage when vm define fails (Royce Lv) - * [3269670] The size unit of scanned ISOs is wrong (Xin Ding) - * [66be273] kimchid: Fix default for 'host' parameter (Adam Litke) - * [1fd2284] Add the translation of English and Chinese (zhoumeina) - * [832a270] bug fix: 404 error in debugger network tab when creating new VM (Aline Manera) - * [457afa8] Apply Kimchi style to login screen (Aline Manera) - * [26f8b50] model: Handle libvirt connection failures (Adam Litke) - * [b97428f] MockModel: fix mock_environment (Adam Litke) - * [e7c976e] Issue#93 UI Not updated after deleting the last guest (fix) (Adam King) - * [e515426] issue #171: Adjust template box style to avoid text overlapping (Aline Manera) - * [3d4d209] Fix bug:145 Make a util to change the storage unit (zhoumeina) - * [318a183] update test case after a series unit bug fixed (ShaoHe Feng) - * [385a1b0] bug fix: keep the default value of storage info from libvirt (ShaoHe Feng) - * [8171fcc] bug fix: set the capacity unit to MB when pass it the storagevolumes_create. (ShaoHe Feng) - * [508cbdb] bug fix: mockmodel set the storage volume size to MB according to the API.md (ShaoHe Feng) - * [aee9ebe] bug fix: Update API for storage volume resize (ShaoHe Feng) - * [5eb9b8b] Issue: #177: iso storage volume get wrong allocation value (ShaoHe Feng) - * [8976efd] Add spaces around words on "Templates" (Crístian Viana) - * [4ed3db9] tests: Add tests to verify data validation when editing a template (Aline Manera) - * [cf817b9] issue #75: Validate parameters when updating a Template (Aline Manera) - * [71a3a88] Create default network if it does not exist (Aline Manera) - * [59efe0c] bug fix: Fix log error message when kimchi can not create default pool (Aline Manera) - * [c20106f] bug fix: Fix typo while logging information to cherrypy handlers (Aline Manera) - * [e97498a] bug fix: Import missing modules (Aline Manera) - * [6d8d739] doc: Restart libvirt after installing packages (Adam Litke) - * [5387198] tests: Add assertIn and assertNotIn for python2.6 (Adam Litke) - * [7498532] Update README and packaging files for release (Adam Litke) - * [f8ef624] Fix typo on Storage Tab (Aline Manera) - * [f6a60ff] change the login window css to make language selector in the head (zhoumeina) - * [0509118] Issue #174: error page can not be translated, fix it. (ShaoHe Feng) - * [de3cc14] UI Template Edit: Hide Unsupported Items (Hongliang Wang) - * [87b2930] Fix bug Regex in checking url (zhoumeina) - * [149f12d] Align storage header in Storage tab (Aline Manera) - * [e7e8c61] Autostart storagepools created from kimchi (apporc) - * [d41f4f5] UI: Enable Language Selection (Hongliang Wang) - * [87049d1] Enable the template_create test with non-root account (Shu Ming) - * [ba5fbc3] Streamline template creation flows - update (Xin Ding) - * [0abccf7] bug fix: Recognize openSUSE 12.3 ISO file (Aline Manera) - * [a8c5430] Fixed the regx pattern (Shu Ming) - * [d244cb6] bug fix: Recognize Fedora 19 ISO file (Aline Manera) - * [488784e] Issue #133: mv make_dirs from kimchid.in to server.py (ShaoHe Feng) - * [ac1d7c2] Streamline template creation flows (Xin Ding) - * [436ce3e] doc: Update images in README (Adam Litke) - * [4ea86e3] Issue #167: Duplicate Requests for HTML Fragment when Switching Pages (Hongliang Wang) - * [657bb3b] Issue #161: Firefox Doesn't Take Correct Favicon for Kimchi (Hongliang Wang) - * [0ba88f8] bug fix: remove ordereddict from suse spec require list (ShaoHe Feng) - * [768441a] Style of uneditable fileds in template edit (Xin Ding) - * [26a9427] Change the ico of iso (zhoumeina) - * [6f74c37] Bug fix:137 UI: When expanding an empty pool, show a message in the drawer (zhoumeina) - * [827f3b2] Issue #151: No Message when User Opens http://kimchi:port/#i18n (Hongliang Wang) - * [316565c] issue#149: fix relative symlink path error in iso scan (Royce Lv) - * [cb7b5e5] Issue #131: Wrong Arrow Position after Error Page (Hongliang Wang) - * [87fdfb8] Add test for refresh and vol number display (Royce Lv) - * [0c7900a] Update model to support refresh and 'nr_volumes' info (Royce Lv) - * [fa3ffc2] Change mockmodel to refresh pool volumes (Royce Lv) - * [2391429] Update Controller to add 'nr_volumes' into its info (Royce Lv) - * [8c4fedc] Update the description StoragePool and StorageVolume in API.md (Royce Lv) - * [868db8e] Add testcase for create volume for active pool (Royce Lv) - * [7657947] Prevent mockmodel from creating volumes for deactive pool (Royce Lv) - * [45c6769] Activate default pool for mockmodel (Royce Lv) - * [78f18e7] Create default pool and activate in model (Royce Lv) - * [3a33f1c] Issue #112: Guest reboot and power buttons do not have hover text (Hongliang Wang) - * [b8ad3fd] Issue #147: Storage UI NOT List Storage Automatically After Logging in (Hongliang Wang) - * [d514ac6] KPI: Updates model and mockmodel tests (Aline Manera) - * [c2dcfa9] KPI: Update API documentation (Aline Manera) - * [8e6448e] Display disk I/O rate instead of storage usage (Aline Manera) - * [f6c1daf] Display network I/O rate instead of memory usage (Aline Manera) - * [dd1b604] Create new thread to collect Kimchi statistics (Aline Manera) - * [9e20380] Fix Log-in Window Redrawn after 401 Returned (Hongliang Wang) - * [5539156] tests: Fix auth tests (Adam Litke) - * [87dc322] tests: Add authentication tests (Adam Litke) - * [3d993d3] Issue #125: Switching Page Tabs Breaks Pop-up Menu Disappearing (Hongliang Wang) - * [f00ee09] i18n: Correct storage pool create error message (Adam Litke) - * [adf3ac3] issue #143: Add missing parameter while calling the request error handler (Aline Manera) - * [a915292] Add the globalization translation in English/Chinese (zhoumeina) - * [8ccaf94] Fix bug: Storage pool name will wrap when it contains - and white-space (zhoumeina) - * [b27d1f4] issue #141: Fix regex responsible to check if an URL is valid or not (Aline Manera) - * [e9a8723] fix issue #136 about mockmodel iso pool type (Royce Lv) - * [d412d20] There will be two goto homepage button at the #tag nonexistent page (zhoumeina) - * [d894fc1] Aggregate read for iso to improve scan efficiency (Royce Lv) - * [6ffb568] Add a go to homepage button at the error page (zhoumeina) - * [cd1b23d] capabilities: Update REST API tests (Aline Manera) - * [f5089e8] capabilities: Update API.md (Aline Manera) - * [8f54df9] Capabilities detection (Aline Manera) - * [b0a0c73] screenshot: Expose stream test result (Aline Manera) - * [99f9d9e] Update Test Code (Hongliang Wang) - * [d00782c] Edit Template API: Change HTTP Code to 303 (Hongliang Wang) - * [cfc30c8] UI: Update Template (Hongliang Wang) - * [f12ebc0] UI:[Storage support]Add the html of Storage support (zhoumeina) - * [53cad8d] UI:[Storage support]Add the js files of storage (zhoumeina) - * [59f07ab] UI:[Storage support]Add the css style of the storage page (zhoumeina) - * [3d9a7ff] UI:[Storage support]Add the po files of storage ui design (zhoumeina) - * [e806e87] UI:[Storage support]Add the png files for storage ui design (zhoumeina) - * [6d72c82] tests: Disable auth debug (Adam Litke) - * [740ae82] tests: Fix unit tests after auth was merged (Adam Litke) - * [c8876e3] auth: Prevent HTTBA in browser with FF Poster (Adam Litke) - * [114d52e] Enable UI (Hongliang Wang) - * [e13434a] Enable Cookie Manipulating in Client Side (Hongliang Wang) - * [bd1367b] Enable REST API (Hongliang Wang) - * [d69d14c] authentication (ShaoHe Feng) - * [f2949fa] Raise exception when cdrom URl does not match any criteria (Aline Manera) - * [ec0dd6a] Create sanity test to verify libvirt supports iso streaming (Aline Manera) - * [2a0504d] Adjust VM xml to support iso streaming (Aline Manera) - * [2d9ee88] bug fix: Use unitdir macro when creating directory for systemd units (ShaoHe Feng) - * [706a277] Create templates by shallow scan, deep scan and distros (Xin Ding) - * [50a5f26] shallow scan: Update testcases (Royce Lv) - * [0ef2130] Shallow scan: Add mockmodel implementation (Royce Lv) - * [e652eaf] shallow scan: Add model support (Royce Lv) - * [451c006] shallow scan: Change controller to be compatible with virtual pool (Royce Lv) - * [e2dd533] shallow scan: return unknown distro and version rather than none (Royce Lv) - * [3bceeaf] shallow scan: Report path info to storage volume (Royce Lv) - * [fac0794] shallow scan: extend API.md to make volume report iso information (Royce Lv) - * [0453992] Create template iso path needs to check (zhoumeina) - * [f1594e4] Fix bug:119 Action will be closed after refresh each 5 s (zhoumeina) - * [9e7ccba] No html escape in the kimchi.template function (Xin Ding) - * [a3b4891] Add browser support in README (zhoumeina) - * [78ba75c] Remove the msg check in test_exception.py (Bing Bu Cao) - * [d64c1fb] Catch the libvirt exceptions when accessing storage objects (Bing Bu Cao) - * [0ca05c1] Return abspath for iso scanning (Royce Lv) - * [7a01840] Add parentheses around dependency version in deb control file (Aline Manera) - * [781ba1d] issue#110: Fix list storage volume for inactive pool (Royce Lv) - * [b53bb35] Add testcase for InvalidOperation (Royce Lv) - * [a21aaeb] Catch InvalidOperation in collection (Royce Lv) - * [99638de] tests: Test the REST API using an SSL connection (Adam Litke) - * [2f26f37] server: Support SSL connections (Adam Litke) - * [a92de0d] api: Add an API to retrieve application configuration (Adam Litke) - * [8aac0d1] bug fix: add two dependencies in README. (apporc) - * [7dd1243] bug fix: two python souce missing in distribution (apporc) - * [1e46730] build: Include extra top-level files in dist (Adam Litke) - * [e8f27d8] Issue #76 - ImportError: No module named discover (Bing Bu Cao) - * [270a971] adopt a single log convention (ShaoHe Feng) - * [fff1bdf] IE8: The arrow indicator of dropdown menus can't be displayed (Xin Ding) - * [c73d9e6] A module to check the pam authenticate (ShaoHe Feng) - * [a724d98] set expires for static content caching (ShaoHe Feng) - * [c89a1ed] cacheBust parameter for static content caching (ShaoHe Feng) - * [ce1ad9c] add a cachebust module to generate href with cacheBust (ShaoHe Feng) - * [253a894] IE8: No background style for items in the template list page (Xin Ding) - * [0ea6333] IE8: No selected style for items in the main (Xin Ding) - * [44202b0] Fix indent of the js files (zhoumeina) - * [4d78ca5] template-update: real model support implement update method (ShaoHe Feng) - * [d3f864b] template-update: add the test case for update (ShaoHe Feng) - * [d3c4cb2] template-update: mock model support implement update method (ShaoHe Feng) - * [7d924e6] template-update: resouce support update method (ShaoHe Feng) - * [f67cf47] template-update: define an update method in API.md document (ShaoHe Feng) - * [dab2688] codingstyle: Fix indent for templates.html.tmpl (Adam Litke) - * [d12b474] IE8: The template list page can't be displayed (Xin Ding) - * [d24d1d5] Add delete confirm message box (zhoumeina) - * [40f0d9d] issues #95: Added files generated by build to .gitignore (ShaoHe Feng) - * [6528b11] IE8: Very long guest names cause column misalignment (Xin Ding) - * [8b6f92f] issue #82: convert from svg image to png image (ShaoHe Feng) - * [41206f4] Add Portuguese (Brazil) translation (Aline Manera) - * [e1eb228] Remove magic directories from config.py.in (Adam Litke) - * [9bc6ba2] i18n: Stop adding location comments to po files (Adam Litke) - * [c873867] Issue #39: Animate Button Clicks to Provide User Feedback (Hongliang Wang) - * [692cdd6] ui: Rename tab pages (Adam Litke) - * [eb1c6a3] python2.6 do not support dict key iteration (ShaoHe Feng) - * [c59b7d6] Using absolute path in error page (Royce Lv) - * [5f04ac0] test case for creating a vm with unicode name (ShaoHe Feng) - * [1797fe8] mockmodel support a VM with ww language name (ShaoHe Feng) - * [af8014d] support create a vm with unicode name (ShaoHe Feng) - * [a4c99eb] sqlite3 support unicode (ShaoHe Feng) - * [ae358e4] Passing the options from autogen.sh to configure (Shu Ming) - * [ff869d5] remove the translation keys in i18n.thml and update the po files (ShaoHe Feng) - * [afb3a77] UI: update some labels of template edit page (ShaoHe Feng) - * [04395d5] All templates translate all languages no exceptions for English (ShaoHe Feng) - * [49a02da] Issue #72: Make Pages Be Bookmark-able (Hongliang Wang) - * [a5fceb2] fix bug:35 GUEST 'VNC' do not work which graphic type is 'spice' (zhoumeina) - * [bfd91d8] ui: Keep image ratio while displaying VM icon and screenshot image (Aline Manera) - * [1846daa] Exception: Add UI support (Royce Lv) - * [431d554] Exception: Add testcase to test error reporting (Royce Lv) - * [55d84e1] Exception: Distinguish development mode and production mode in kimchi server (Royce Lv) - * [1463303] Exception: reporting error in controller.py in details (Royce Lv) - * [dc8881f] Exception: Customise error page handler (Royce Lv) - * [b8c6eee] Exception: move exceptions from model (Royce Lv) - * [3e86f3f] ui: Disable 'Create' button on create guest without required input (Aline Manera) - * [c5e3951] Update Banner image for Kimchi rename (Adam King) - * [551a564] Issue #43: UI Reports Error When Pressing Enter Key in Creating VM Form (Hongliang Wang) - * [75ce907] fix bug:#51 guest tab contains 404 file not find error (zhoumeina) - * [2086de3] Bug fix:#67 add M for template memory (zhoumeina) - * [831160b] update UI to get connect graphics (ShaoHe Feng) - * [a196235] add graphics in mockmodel (ShaoHe Feng) - * [091af9b] add an attribute to get graphics of vm in model and update test case (ShaoHe Feng) - * [9d17820] bug fix: Add graphics of vm in API.md document (ShaoHe Feng) - * [4c227f5] Add ignore_missing parameter to ObjectStoreSession.delete() method (Aline Manera) - * [7c5b4d3] add automake and autoconf to dependencies (zhoumeina) - * [895f18c] add i18n.html.tmpl in dist_html_DATA list (ShaoHe Feng) - * [e67e479] doc: Update README.md with new build steps (Adam Litke) - * [91746b7] Rename burnet to kimchi (Adam Litke) - * [da6bc2c] build: Set install prefix using autoconf (Adam Litke) - * [0eba7d3] build: remove old distutils build files (Adam Litke) - * [818f184] build: Add support for building distro packages (Adam Litke) - * [544d8bd] build: Add gettext i18n support (Adam Litke) - * [b868785] build: Compile, distribute and install files (Adam Litke) - * [3529c60] build: Add basic autotools infrastructure (Adam Litke) - * [fff5167] screenshot: Add timeout to screenshot creation (Aline Manera) - * [5bebdc2] bug fix:#49 404 in debugger network tab when opening kimchi templates tab (zhoumeina) - * [30bc539] tests: Fix test_server_start (Adam Litke) - * [6228dee] ui: Ensure i18n.html loads (Adam Litke) - * [7e963fe] Remove obsolete data used in rendering page (Royce Lv) - * [cc89b1e] add js globalization method (ShaoHe Feng) - * [0c1cdcb] Asynctask: add logging to async task (Royce Lv) - * [37b87ab] Remove 'path' which should not be specified when creating volume (Bing Bu Cao) - * [95b7446] Use #unicode instead of #encoding in Cheetah templates (Aline Manera) - * [cbd5afa] fix bug: xmlutils get node context by context attribute (ShaoHe Feng) - * [80df676] issue34: add handling invalid iso file (Royce Lv) - * [5380105] issue60: Avoid using default database file in test (Royce Lv) - * [56b6e67] Issue #59: Make the popup menu entirely visible in browser (Hongliang Wang) - * [8796558] template: add rhel to osinfo (Royce Lv) - * [e05096c] bug: fix list vm name in unicode for mockmodel (Royce Lv) - * [de4d8b4] bug fix: kimchi supports to show VM with Chinese name (ShaoHe Feng) - * [b5fa8c2] Fix the exception caused by IE8 (Shu Ming) - * [4a8fcfd] fix-bug: remove the useless mini-line (ShaoHe Feng) - * [130d98b] UI:Add Template button should be disable but not hide before input the iSO (Xin Ding) - * [7c4c1b5] fix-bug: issues30 UI:Add Template contains js errors (Xin Ding) - * [a747f74] Hidden the VNC button when VM is stopped (Bing Bu Cao) - * [f17e101] #32 template name too long make page abnarmally (zhoumeina) - * [2477c0c] Fix Issue #10: Very long guest names cause column misalignment (Hongliang Wang) - * [1b33ded] Remove useless text in template-add.html.tmpl (Xin Ding) - * [868abd7] doc: Update README.md with more package dependencies (ShaoHe Feng) - * [5cda59c] Need root privilege to run test_vm_list_sorted test (Shu Ming) - * [69669a1] test: change testcase to allow running single test (Royce Lv) +#### [kimchi-0.1.0] #### * [3efcaa2] Enable the usage of test:///default (Eduardo Elias Ferreira) * [96f604f] Ordered guest list (Eduardo Elias Ferreira) * [7c06d1d] Convert VM list to unicode (Eduardo Elias Ferreira) diff --git a/build-aux/genChangelog b/build-aux/genChangelog index 4a92430..803f24e 100755 --- a/build-aux/genChangelog +++ b/build-aux/genChangelog @@ -19,7 +19,7 @@ git for-each-ref --sort='*authordate' --format='%(tag)' refs/tags | tac |grep -v NEXT=$TAG echo; echo done -FIRST=$(git tag -l | head -1) +FIRST=$(git for-each-ref --sort='*authordate' --format='%(tag)' refs/tags | head -1) echo "#### [$FIRST] ####" GIT_PAGER=cat git log --pretty=format:" * [%h] %<(78,trunc)%s (%an)" $FIRST -- 1.9.3

4 4

[PATCH 0/2] Filter directory from storage volume list
by lvroyce0210＠gmail.com 30 Jul '14

30 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Royce Lv (2): Filter directory in storage volume listing fix test case for volume filtering src/kimchi/control/base.py | 2 +- src/kimchi/control/storagevolumes.py | 5 +++++ tests/test_rest.py | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) -- 1.8.3.2

3 4

[PATCH] Bugfix Issue#398 UI: Add information when no cdrom exists
by wenwang＠linux.vnet.ibm.com 30 Jul '14

30 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Add one line "No CDROM found" under "Manage Media" diaguage when there is no CDROM found for an VM. Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_media_main.js | 15 ++++++++++----- ui/pages/guest-media.html.tmpl | 5 +++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ui/js/src/kimchi.guest_media_main.js b/ui/js/src/kimchi.guest_media_main.js index d6dee2e..60d12ba 100644 --- a/ui/js/src/kimchi.guest_media_main.js +++ b/ui/js/src/kimchi.guest_media_main.js @@ -23,14 +23,19 @@ kimchi.guest_media_main = function() { storageType: 'cdrom' }, function(storages) { var rowHTML = $('#cdrom-row-tmpl').html(); + var noCDROMHTML = $('#empty-cdrom-tmpl').html(); var container = $('#guest-edit-cdrom-row-container'); $(container).empty(); - $.each(storages, function(index, storage) { - storage['vm'] = kimchi.selectedGuest; - var templated = kimchi.substitute(rowHTML, storage); - container.append(templated); - }); + if(storages.length > 0) { + $.each(storages, function(index, storage) { + storage['vm'] = kimchi.selectedGuest; + var templated = kimchi.substitute(rowHTML, storage); + container.append(templated); + }); + } else { + container.append(noCDROMHTML); + } var replaceCDROM = function(event) { event.preventDefault(); diff --git a/ui/pages/guest-media.html.tmpl b/ui/pages/guest-media.html.tmpl index 83ad6ab..fe2e8ef 100644 --- a/ui/pages/guest-media.html.tmpl +++ b/ui/pages/guest-media.html.tmpl @@ -51,6 +51,11 @@ </div> </div> </script> +<script id="empty-cdrom-tmpl" type="text/html"> + <div> + $_("No CDROM found.") + </div> +</script> <script type="text/javascript"> kimchi.guest_media_main(); -- 1.7.1

3 2

[PATCH] Bugfix Issue#397 UI Broken when cookie is clear
by wenwang＠linux.vnet.ibm.com 30 Jul '14

30 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> 1)Fixed the bug that login page cannot find cookies when "roles" in the cookie is deleted in browser 2)Have the "eval()" function changed to JSON.parse() which is safer 3)Have the var "_tabMode" changed to "kimchi.tabMode" that better fit kimchi namespace 4)Changed lifetime of cookie "roles" to session Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 3 +-- ui/js/src/kimchi.login.js | 2 +- ui/js/src/kimchi.main.js | 23 +++++++++++++---------- ui/js/src/kimchi.network.js | 5 ++--- ui/js/src/kimchi.storage_main.js | 7 +++---- ui/js/src/kimchi.template_main.js | 3 +-- 6 files changed, 21 insertions(+), 22 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index d81c6b7..394ec9d 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -323,8 +323,7 @@ kimchi.guestSetRequestHeader = function(xhr) { }; kimchi.guest_main = function() { - var guestsMode = _tabMode['guests']; - if(guestsMode === 'admin') { + if(kimchi.tabMode['guests'] === 'admin') { $('.tools').attr('style','display'); $("#vm-add").on("click", function(event) { kimchi.window.open('guest-add.html'); diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/kimchi.login.js index b20f0b0..f9c9af0 100644 --- a/ui/js/src/kimchi.login.js +++ b/ui/js/src/kimchi.login.js @@ -57,7 +57,7 @@ kimchi.login_main = function() { var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; } var next_url = lastPage ? lastPage.replace(/\"/g,'') : "/"; - kimchi.cookie.set('roles',JSON.stringify(data.roles), 365); + kimchi.cookie.set('roles',JSON.stringify(data.roles)); window.location.replace(next_url) }, function() { $("#messUserPass").show(); diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 01ebded..b79c7f8 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -var _tabMode = {}; +kimchi.tabMode = {}; kimchi.main = function() { kimchi.popable(); @@ -46,15 +46,18 @@ kimchi.main = function() { var title = i18n[titleKey] ? i18n[titleKey] : titleKey; var path = $tab.find('path').text(); var roles = kimchi.cookie.get('roles'); - var roleString = 'JSON.parse(roles).' + titleKey.toLowerCase(); - var role = eval(roleString); - var mode = $tab.find('[role="' + role + '"]').attr('mode'); - _tabMode[titleKey.toLowerCase()] = mode; - tabs.push({ - title: title, - path: path, - mode: mode - }); + if (roles) { + var role = JSON.parse(roles)[titleKey.toLowerCase()]; + var mode = $tab.find('[role="' + role + '"]').attr('mode'); + kimchi.tabMode[titleKey.toLowerCase()] = mode; + tabs.push({ + title: title, + path: path, + mode: mode + }); + } else { + document.location.href = 'login.html'; + } }); return tabs; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index 5b811ca..1530dd9 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -19,8 +19,7 @@ kimchi.NETWORK_TYPE_BRIDGE = "bridged"; kimchi.initNetwork = function() { - var networkMode = _tabMode['network']; - if(networkMode === 'admin') { + if(kimchi.tabMode['network'] === 'admin') { $('.tools').attr('style','display'); $('#network-content .header span:last-child').attr('style','display'); kimchi.initNetworkCreation(); @@ -53,7 +52,7 @@ kimchi.initNetworkListView = function() { kimchi.addNetworkItem = function(network) { $("#networkBody").append(kimchi.getNetworkItemHtml(network)); - if(_tabMode["network"] === "admin") { + if(kimchi.tabMode["network"] === "admin") { $(".column-action").attr("style","display"); } else { $(".column-space").addClass('column-space-no-border-right'); diff --git a/ui/js/src/kimchi.storage_main.js b/ui/js/src/kimchi.storage_main.js index 4b6fd13..49fcc4a 100644 --- a/ui/js/src/kimchi.storage_main.js +++ b/ui/js/src/kimchi.storage_main.js @@ -30,7 +30,7 @@ kimchi.doListStoragePools = function() { } }); $('#storagepoolsList').html(listHtml); - if(_tabMode['storage'] === 'admin') { + if(kimchi.tabMode['storage'] === 'admin') { $('.storage-button').attr('style','display'); } else { $('.storage-allocate').addClass('storage-allocate-padding-user'); @@ -79,7 +79,7 @@ kimchi.storageBindClick = function() { } }); - if(_tabMode['storage'] === 'admin') { + if(kimchi.tabMode['storage'] === 'admin') { $('.pool-delete').on('click', function(event) { var $pool = $(this); var settings = { @@ -242,8 +242,7 @@ kimchi.initLogicalPoolExtend = function() { } kimchi.storage_main = function() { - var storageMode = _tabMode['storage']; - if(storageMode === 'admin') { + if(kimchi.tabMode['storage'] === 'admin') { $('.tools').attr('style','display'); $('#storage-pool-add').on('click', function() { kimchi.window.open('storagepool-add.html'); diff --git a/ui/js/src/kimchi.template_main.js b/ui/js/src/kimchi.template_main.js index 7ce408f..4fa4dd8 100644 --- a/ui/js/src/kimchi.template_main.js +++ b/ui/js/src/kimchi.template_main.js @@ -83,8 +83,7 @@ kimchi.hideTitle = function() { }; kimchi.template_main = function() { - var templatesMode = _tabMode['templates']; - if(templatesMode === 'admin') { + if(kimchi.tabMode['templates'] === 'admin') { $('.tools').attr('style','display'); $("#template-add").on("click", function(event) { kimchi.window.open({ -- 1.7.1

3 2

[PATCH] Fix pep8 errors in make check
by lvroyce＠linux.vnet.ibm.com 30 Jul '14

30 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Fix 2 pep8 errors in make check Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 4 +--- src/kimchi/root.py | 1 - 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index ac24b3f..4d1351f 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -65,9 +65,7 @@ class Resource(object): def generate_action_handler(self, action_name, action_args=None): def wrapper(*args, **kwargs): - method = validate_method(('POST'), - self.role_key, self.admin_methods) - + validate_method(('POST'), self.role_key, self.admin_methods) try: self.lookup() if not self.is_authorized(): diff --git a/src/kimchi/root.py b/src/kimchi/root.py index dec5862..1bae7be 100644 --- a/src/kimchi/root.py +++ b/src/kimchi/root.py @@ -17,7 +17,6 @@ # License along with this library; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -import base64 import cherrypy import json import os -- 1.8.3.2

3 3

[PATCH V2] bug fix: Avoid equals sign in VM console URL
by alinefm＠linux.vnet.ibm.com 30 Jul '14

30 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 -> V2: - Remove equals sign instead of replacing it for any other character as base64 can work well without it (Sheldon) Aline Manera (1): bug fix: Avoid equals sign in VM console URL src/kimchi/vnc.py | 9 ++++++++- ui/js/src/kimchi.api.js | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) -- 1.9.3

3 3

[PATCH] Get user groups correctly
by Crístian Viana 30 Jul '14

30 Jul '14

Kimchi uses the Python API (module "grp") to get the groups which a user belongs to. But that implementation is not correct, in some cases some groups are left out. For example, take a look at the following commands. Here's the Python method of getting the user groups (user=vianac): $ python -c "import grp; u = 'vianac'; print [ g.gr_name for g in grp.getgrall() if u in g.gr_mem ]" ['wheel', 'vianac', 'desktop_admin_r', 'aline'] And here's another method of getting the same groups, using a GNU/Linux command: $ id -Gn vianac vianac wheel desktop_admin_r aline Now, let's try the same thing with a different user (user=root): $ python -c "import grp; u = 'root'; print [ g.gr_name for g in grp.getgrall() if u in g.gr_mem ]" [] $ id -Gn root root As shown above, the Python method doesn't always display the correct results. As the command "id" is bundled in the GNU/Linux package "coreutils", I'd say its output is the correct one. Use the external command "id" to get the user groups instead of the Python API. Signed-off-by: Crístian Viana <vianac(a)linux.vnet.ibm.com> --- src/kimchi/auth.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/kimchi/auth.py b/src/kimchi/auth.py index aabcb6c..41538f1 100644 --- a/src/kimchi/auth.py +++ b/src/kimchi/auth.py @@ -20,7 +20,6 @@ import base64 import cherrypy import fcntl -import grp import multiprocessing import os import PAM @@ -71,8 +70,10 @@ class User(object): self.user[USER_ROLES] = dict.fromkeys(tabs, 'user') def get_groups(self): - self.user[USER_GROUPS] = [g.gr_name for g in grp.getgrall() - if self.user[USER_NAME] in g.gr_mem] + out, err, rc = run_command([ 'id', '-Gn', self.user[USER_NAME] ]) + if rc == 0: + self.user[USER_GROUPS] = out.rstrip().split(" ") + return self.user[USER_GROUPS] def get_roles(self): -- 1.9.3

2 2

[PATCH 1/2] Update Kimchi tag to remove 'kimchi-' prefix
by alinefm＠linux.vnet.ibm.com 30 Jul '14

30 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> As the tags on Kimchi repository is only related to it, we don't need to prefix it witk 'kimchi-' Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- build-aux/pkg-version | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/build-aux/pkg-version b/build-aux/pkg-version index 5e3e333..749cf6c 100755 --- a/build-aux/pkg-version +++ b/build-aux/pkg-version @@ -17,25 +17,24 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA # tags and output versions: -# - kimchi-4.9.0 => 4.9.0 (upstream clean) -# - kimchi-4.9.0-1 => 4.9.0 (downstream clean) -# - kimchi-4.9.0-2-g34e62f => 4.9.0 (upstream dirty) -# - kimchi-4.9.0-1-2-g34e62f => 4.9.0 (downstream dirty) +# - 4.9.0 => 4.9.0 (upstream clean) +# - 4.9.0-1 => 4.9.0 (downstream clean) +# - 4.9.0-2-g34e62f => 4.9.0 (upstream dirty) +# - 4.9.0-1-2-g34e62f => 4.9.0 (downstream dirty) AWK_VERSION=' BEGIN { FS="-" } - /^kimchi-[0-9]/ { - sub(/^kimchi-/,"") ; print $1 + /^[0-9]/ { + print $1 }' # tags and output releases: -# - kimchi-4.9.0 => 0 (upstream clean) -# - kimchi-4.9.0-1 => 1 (downstream clean) -# - kimchi-4.9.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty) -# - kimchi-4.9.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty) +# - 4.9.0 => 0 (upstream clean) +# - 4.9.0-1 => 1 (downstream clean) +# - 4.9.0-2-g34e62f1 => 2.git34e62f1 (upstream dirty) +# - 4.9.0-1-2-g34e62f1 => 1.2.git34e62f1 (downstream dirty) AWK_RELEASE=' BEGIN { FS="-"; OFS="." } - /^kimchi-[0-9]/ { - sub(/^kimchi-/,"") + /^[0-9]/ { if (NF == 1) print 0 else if (NF == 2) print $2 else if (NF == 3) print $2, "git" substr($3, 2) @@ -45,7 +44,7 @@ AWK_RELEASE=' if [ ! -d .git ]; then PKG_VERSION=`cat VERSION` else - PKG_VERSION=`git describe --tags --match "kimchi-[0-9]*" || cat VERSION` + PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION` fi if test "x$1" = "x--full"; then -- 1.9.3

3 2

[RFC] Directories in storage pools and Filesystem Passthrough
by Christy Perez 30 Jul '14

30 Jul '14

Hi team, A colleague has noticed that directories (even the 'lost+found') directory are showing up as images in storage pools. Here's an old mail thread discussing the addition of directories to storage pools: http://www.redhat.com/archives/libvir-list/2011-May/msg01901.html, but it was because they can be used for 'filesystem passthrough.' See http://libvirt.org/formatdomain.html#elementsFilesystems So my question is: How should kimchi treat directories? My thoughts are, we can filter them out of storage pools, and then in the future, add a feature for filesystem passthrough. FYI: virt-manager has this capability for reference. Regards, - Christy

2 1

[PATCH v8 0/4] Host device passthrough: Summary
by Zhou Zheng Sheng 29 Jul '14

29 Jul '14

Hi, This patch series is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. Host devices form a tree. We can assign most of the devices in the tree to VM. By assigning a device, all the devices in its sub-tree are also assigned. It might not make sense to assign a USB controller, because the host may be using one of the devices connected to the controller. Instead, Kimchi just presents the "leaf" devices to assign to guest. In recent Linux kernel and KVM, it is able to recognize the IOMMU group of a PCI device. The "leaf" PCI devices in the same IOMMU group should be assigned and dismissed together. The IOMMU group is the actual smallest isolation granularity of the PCI devices. The first patch is to list all host devices information. It's useful on its own to show host devices information. The second patch is to list all eligible host devices to assign, as well as the "affected" devices in the same IOMMU group. The third patch creates a sub-collection "hostdevs" to the VM resource, and deals with assigning and dismissing devices. The fourth patch adds a sub-collection "vm_holders" to the host device resource. It's to list all VMs that are holding the device. I'll update API and unit test once everyone is happy with the interface and logic. v8: Change the URI for listing affected passthrough devices, suggested by Aline. Move hostdev.py to src/kimchi/model.py. Still discussing API with the front-end developer. Once the API accepted, The author should add tests for model and mockmodel, and change API.md and API.json accordingly. v7: Some minor coding style improvements. v6: Do not passthrough PCI device of class code 0x07. It might contains system device not suitable to assign to guest. v5: Filter ealigible pci devices according to pci class. When assigning a device to VM, check if there are other VMs holding it. Use "kimchi.model.utils.get_vm_config_flag()" to correctly set the device attaching API flag. v4: Add new sub-collection to host device to list the VMs holding the device. v3: Fix a small naming error introduced by rebase. v2: Handle the devices in VM's sub-collection "hostdevs". v1: Handle the devices in VM template. Zhou Zheng Sheng (4): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device docs/API.md | 11 +- src/kimchi/control/host.py | 7 + src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/i18n.py | 10 + src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 38 ++-- src/kimchi/model/hostdev.py | 311 +++++++++++++++++++++++++++++++ src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 324 +++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 784 insertions(+), 40 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/model/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

3 19

Re: [Kimchi-devel] [PATCH] bug fix: Avoid equals sign in VM console URL
by Sheldon 29 Jul '14

29 Jul '14

On 07/29/2014 10:22 AM, Zheng Sheng ZS Zhou wrote: > > Sheldon <shaohef(a)linux.vnet.ibm.com> wrote 2014-07-28 17:23:21: > > > From: Sheldon <shaohef(a)linux.vnet.ibm.com> > > To: alinefm(a)linux.vnet.ibm.com, Kimchi Devel <kimchi- > > devel(a)ovirt.org>, Zheng Sheng ZS Zhou/China/IBM@IBMCN > > Date: 2014-07-28 17:22 > > Subject: Re: [Kimchi-devel] [PATCH] bug fix: Avoid equals sign in VM > > console URL > > > > On 07/26/2014 05:01 AM, alinefm(a)linux.vnet.ibm.com wrote: > > > From: Aline Manera <alinefm(a)linux.vnet.ibm.com> > > > > > > >From python documentation, base64.urlsafe_b64encode(s) > > substitutes - instead > > > of + and _ instead of / in the standard Base64 alphabet, BUT the > result can > > > still contain = which is not safe in a URL query component. > > > As token value is not decoded nowhere, replace = by A > > also in our kimchi I have try: > > In [45]: base64.urlsafe_b64encode("abcd") > > Out[45]: 'YWJjZA==' > > In [41]: base64.urlsafe_b64encode("abcde") > > Out[41]: 'YWJjZGU=' > > > > > > JS is very cool, it can decode base64 without "=" padding well > > kimchi.urlSafeB64Decode("YWJjZA") > > "abcd" > > kimchi.urlSafeB64Decode("YWJjZGU") > > "abcde" > > > > we just need in python: > > In [48]: base64.urlsafe_b64encode("abcd").rstrip("=") > > Out[48]: 'YWJjZA' > > > > > > A friendly remind: We have to make sure this trick also works in IE > and Chome. > Try chrom can work. But No IE environment. > > > > > The problem with equals sign was only identified on Spice connections. > > > noVNC can deal well with that. > > > > > > For reference: https://docs.python.org/2/library/base64.html > > > > > > Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> > > > --- > > > src/kimchi/vnc.py | 9 ++++++++- > > > ui/js/src/kimchi.api.js | 18 ++++++++++++++++-- > > > 2 files changed, 24 insertions(+), 3 deletions(-) > > > > > > diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py > > > index 9380e21..4159049 100644 > > > --- a/src/kimchi/vnc.py > > > +++ b/src/kimchi/vnc.py > > > @@ -54,7 +54,14 @@ def new_ws_proxy(): > > > > > > def add_proxy_token(name, port): > > > with open(os.path.join(WS_TOKENS_DIR, name), 'w') as f: > > > - name = base64.urlsafe_b64encode(name) > > > + """ > > > + From python documentation base64.urlsafe_b64encode(s) > > > + substitutes - instead of + and _ instead of / in the > > > + standard Base64 alphabet, BUT the result can still > > > + contain = which is not safe in a URL query component. > > > + As token value is not decoded nowhere, replace = by A > > > + """ > > > + name = base64.urlsafe_b64encode(name).replace('=', 'A') > > > f.write('%s: localhost:%s' % (name.encode('utf-8'), port)) > > > > > > > > > diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js > > > index 8f5b68f..30360c5 100644 > > > --- a/ui/js/src/kimchi.api.js > > > +++ b/ui/js/src/kimchi.api.js > > > @@ -352,7 +352,14 @@ var kimchi = { > > > }).done(function() { > > > url = 'https://' + location.hostname + ':' + proxy_port; > > > url += "/console.html?url=vnc_auto.html&port=" + > > proxy_port; > > > - url += "&path=?token=" + kimchi.urlSafeB64Encode(vm); > > > + /* > > > + * From python documentation base64.urlsafe_b64encode(s) > > > + * substitutes - instead of + and _ instead of / in the > > > + * standard Base64 alphabet, BUT the result can still > > > + * contain = which is not safe in a URL query component. > > > + * As token value is not decoded nowhere, replace = by A > > > + * */ > > > + url += "&path=?token=" + kimchi.urlSafeB64Encode > > (vm).replace(/=/g, 'A'); > > > url += "&kimchi=" + location.port; > > > url += '&encrypt=1'; > > > window.open(url); > > > @@ -377,7 +384,14 @@ var kimchi = { > > > url = 'https://' + location.hostname + ':' + proxy_port; > > > url += "/console.html?url=spice.html&port=" + proxy_port; > > > url += "&listen=" + location.hostname; > > > - url += "&token=" + kimchi.urlSafeB64Encode(vm); > > > + /* > > > + * From python documentation base64.urlsafe_b64encode(s) > > > + * substitutes - instead of + and _ instead of / in the > > > + * standard Base64 alphabet, BUT the result can still > > > + * contain = which is not safe in a URL query component. > > > + * As token value is not decoded nowhere, replace = by A > > > + * */ > > > + url += "&token=" + kimchi.urlSafeB64Encode > > (vm).replace(/=/g, 'A'); > > > url += "&kimchi=" + location.port; > > > url += '&encrypt=1'; > > > window.open(url); > > > > > > -- > > Thanks and best regards! > > > > Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> > > IBM Linux Technology Center > > > -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

1 0

[PATCH] issue #389: Use 127.0.0.1 as VNC listener IP
by alinefm＠linux.vnet.ibm.com 28 Jul '14

28 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> When setting the listener IP to 0.0.0.0 anyone can connect to the freshly configured kimchi virtual machine manager box on port 5900, 5901, etc. and take over any virtual machine, since VNC is per default configured by kimchi to listen on all IPs. As websockets proxy connects to QEMU-VNC from 127.0.0.1 also set VNC listener IP to 127.0.0.1 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 2 +- src/kimchi/osinfo.py | 2 +- tests/test_mockmodel.py | 2 +- tests/test_model.py | 2 +- tests/test_rest.py | 6 +++--- tests/test_vmtemplate.py | 8 ++++---- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 1584471..ed275d5 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -1064,7 +1064,7 @@ def __init__(self, uuid, name, template_info): 'memory': self.memory, 'cpus': self.cpus, 'icon': None, - 'graphics': {'type': 'vnc', 'listen': '0.0.0.0', + 'graphics': {'type': 'vnc', 'listen': '127.0.0.1', 'port': None}, 'users': ['user1', 'user2', 'root'], 'groups': ['group1', 'group2', 'admin'], diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 39c9163..d2a1c1d 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -94,7 +94,7 @@ defaults = {'networks': ['default'], 'storagepool': '/storagepools/default', 'domain': 'kvm', 'arch': os.uname()[4], - 'graphics': {'type': 'vnc', 'listen': '0.0.0.0'}} + 'graphics': {'type': 'vnc', 'listen': '127.0.0.1'}} def _get_arch(): diff --git a/tests/test_mockmodel.py b/tests/test_mockmodel.py index 223879c..97b5fdb 100644 --- a/tests/test_mockmodel.py +++ b/tests/test_mockmodel.py @@ -154,7 +154,7 @@ def test_vm_info(self): self.assertEquals('images/icon-vm.png', info['icon']) self.assertEquals(stats_keys, set(info['stats'].keys())) self.assertEquals('vnc', info['graphics']['type']) - self.assertEquals('0.0.0.0', info['graphics']['listen']) + self.assertEquals('127.0.0.1', info['graphics']['listen']) def test_packages_update(self): pkgs = model.packagesupdate_get_list() diff --git a/tests/test_model.py b/tests/test_model.py index da9dae5..cab8288 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -118,7 +118,7 @@ def test_vm_graphics(self): info = inst.vm_lookup('kimchi-vnc') self.assertEquals('vnc', info['graphics']['type']) - self.assertEquals('0.0.0.0', info['graphics']['listen']) + self.assertEquals('127.0.0.1', info['graphics']['listen']) graphics = {'type': 'spice', 'listen': '127.0.0.1'} params = {'name': 'kimchi-spice', 'template': '/templates/test', diff --git a/tests/test_rest.py b/tests/test_rest.py index 3ea1927..4feb298 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -370,7 +370,7 @@ def test_vm_graphics(self): self.assertEquals(201, resp.status) # Verify the VM vm = json.loads(self.request('/vms/test-vm').read()) - self.assertEquals('0.0.0.0', vm['graphics']['listen']) + self.assertEquals('127.0.0.1', vm['graphics']['listen']) self.assertEquals('vnc', vm['graphics']['type']) # Delete the VM resp = self.request('/vms/test-vm', '{}', 'DELETE') @@ -412,7 +412,7 @@ def test_vm_graphics(self): self.assertEquals(201, resp.status) # Verify the VM vm = json.loads(self.request('/vms/test-vm').read()) - self.assertEquals('0.0.0.0', vm['graphics']['listen']) + self.assertEquals('127.0.0.1', vm['graphics']['listen']) self.assertEquals('spice', vm['graphics']['type']) # Delete the VM resp = self.request('/vms/test-vm', '{}', 'DELETE') @@ -1132,7 +1132,7 @@ def verify_template(t, res): # Update the template t['os_distro'] = 'Linux.ISO' t['os_version'] = '1.1' - t['graphics'] = {'type': 'vnc', 'listen': '0.0.0.0'} + t['graphics'] = {'type': 'vnc', 'listen': '127.0.0.1'} req = json.dumps(t) resp = self.request('/templates/%s' % t['name'], req, 'PUT') self.assertEquals(200, resp.status) diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 821ca24..acf0150 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -31,7 +31,7 @@ def test_minimal_construct(self): ('os_version', 'unknown'), ('cpus', 1), ('memory', 1024), ('cdrom', ''), ('networks', ['default']), ('disk_bus', 'ide'), ('nic_model', 'e1000'), - ('graphics', {'type': 'vnc', 'listen': '0.0.0.0'})) + ('graphics', {'type': 'vnc', 'listen': '127.0.0.1'})) args = {'name': 'test'} t = VMTemplate(args) @@ -55,7 +55,7 @@ def test_specified_graphics(self): self.assertEquals(graphics, t.info['graphics']) # Test specified type - graphics = {'type': 'spice', 'listen': '0.0.0.0'} + graphics = {'type': 'spice', 'listen': '127.0.0.1'} args['graphics'] = graphics t = VMTemplate(args) self.assertEquals(graphics, t.info['graphics']) @@ -65,10 +65,10 @@ def test_specified_graphics(self): args['graphics'] = graphics t = VMTemplate(args) self.assertEquals(graphics['type'], t.info['graphics']['type']) - self.assertEquals('0.0.0.0', t.info['graphics']['listen']) + self.assertEquals('127.0.0.1', t.info['graphics']['listen']) def test_to_xml(self): - graphics = {'type': 'spice', 'listen': '0.0.0.0'} + graphics = {'type': 'spice', 'listen': '127.0.0.1'} vm_uuid = str(uuid.uuid4()).replace('-', '') t = VMTemplate({'name': 'test-template'}) xml = t.to_vm_xml('test-vm', vm_uuid, graphics=graphics) -- 1.9.3

4 3

[PATCH] bug fix: Avoid equals sign in VM console URL
by alinefm＠linux.vnet.ibm.com 28 Jul '14

28 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> >From python documentation, base64.urlsafe_b64encode(s) substitutes - instead of + and _ instead of / in the standard Base64 alphabet, BUT the result can still contain = which is not safe in a URL query component. As token value is not decoded nowhere, replace = by A The problem with equals sign was only identified on Spice connections. noVNC can deal well with that. For reference: https://docs.python.org/2/library/base64.html Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vnc.py | 9 ++++++++- ui/js/src/kimchi.api.js | 18 ++++++++++++++++-- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index 9380e21..4159049 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -54,7 +54,14 @@ def new_ws_proxy(): def add_proxy_token(name, port): with open(os.path.join(WS_TOKENS_DIR, name), 'w') as f: - name = base64.urlsafe_b64encode(name) + """ + From python documentation base64.urlsafe_b64encode(s) + substitutes - instead of + and _ instead of / in the + standard Base64 alphabet, BUT the result can still + contain = which is not safe in a URL query component. + As token value is not decoded nowhere, replace = by A + """ + name = base64.urlsafe_b64encode(name).replace('=', 'A') f.write('%s: localhost:%s' % (name.encode('utf-8'), port)) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 8f5b68f..30360c5 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -352,7 +352,14 @@ var kimchi = { }).done(function() { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=vnc_auto.html&port=" + proxy_port; - url += "&path=?token=" + kimchi.urlSafeB64Encode(vm); + /* + * From python documentation base64.urlsafe_b64encode(s) + * substitutes - instead of + and _ instead of / in the + * standard Base64 alphabet, BUT the result can still + * contain = which is not safe in a URL query component. + * As token value is not decoded nowhere, replace = by A + * */ + url += "&path=?token=" + kimchi.urlSafeB64Encode(vm).replace(/=/g, 'A'); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); @@ -377,7 +384,14 @@ var kimchi = { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=spice.html&port=" + proxy_port; url += "&listen=" + location.hostname; - url += "&token=" + kimchi.urlSafeB64Encode(vm); + /* + * From python documentation base64.urlsafe_b64encode(s) + * substitutes - instead of + and _ instead of / in the + * standard Base64 alphabet, BUT the result can still + * contain = which is not safe in a URL query component. + * As token value is not decoded nowhere, replace = by A + * */ + url += "&token=" + kimchi.urlSafeB64Encode(vm).replace(/=/g, 'A'); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); -- 1.9.3

4 6

[PATCHv4 0/7] Support image based template
by lvroyce＠linux.vnet.ibm.com 28 Jul '14

28 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> 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'....} Passed test: 1. regression: (1) create vm from local iso based template (2) create vm from remote iso based template 2. name generating test: (1) iso/image with valid distro can produce right name (2) iso/image with unknown distro can produce right name 3. functional test: (1) create template from img (2) create vm from img based template 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 | 25 +++++++++ tests/test_osinfo.py | 8 --- tests/test_rest.py | 35 +++++++++++- tests/test_vmtemplate.py | 25 ++++++--- 22 files changed, 276 insertions(+), 102 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 10

[PATCH] Do not auto create default network
by alinefm＠linux.vnet.ibm.com 28 Jul '14

28 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Kimchi does not depends on default network as a template and a guest can be created without any network interface. So do not auto create the default network when starting up Kimchi and let users create and configure their networks and templates as they want. It is part of issue #392 Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/mockmodel.py | 8 +------- src/kimchi/model/networks.py | 44 -------------------------------------------- src/kimchi/osinfo.py | 2 +- tests/test_model.py | 19 +++++++------------ tests/test_osinfo.py | 2 +- tests/test_rest.py | 19 +++++-------------- tests/test_vmtemplate.py | 2 +- 7 files changed, 16 insertions(+), 80 deletions(-) diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py index 1584471..2a74044 100644 --- a/src/kimchi/mockmodel.py +++ b/src/kimchi/mockmodel.py @@ -81,7 +81,7 @@ def reset(self): self._mock_screenshots = {} self._mock_templates = {} self._mock_storagepools = {'default': MockStoragePool('default')} - self._mock_networks = {'default': MockNetwork('default')} + self._mock_networks = {} self._mock_interfaces = self.dummy_interfaces() self._mock_swupdate = MockSoftwareUpdate() self.next_taskid = 1 @@ -659,12 +659,6 @@ def _is_network_used_by_template(self, network): return False def _is_network_in_use(self, name): - # The network "default" is used for Kimchi proposal and should not be - # deactivate or deleted. Otherwise, we will allow user create - # inconsistent templates from scratch - if name == 'default': - return True - vms = self._get_vms_attach_to_a_network(name) return bool(vms) or self._is_network_used_by_template(name) diff --git a/src/kimchi/model/networks.py b/src/kimchi/model/networks.py index bc93da5..45659ea 100644 --- a/src/kimchi/model/networks.py +++ b/src/kimchi/model/networks.py @@ -41,44 +41,6 @@ class NetworksModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - if 'qemu:///' in self.conn.get().getURI(): - self._default_network_check() - - def _default_network_check(self): - def create_default_network(): - try: - subnet = self._get_available_address(knetwork.DefaultNetsPool) - params = {"name": "default", "connection": "nat", - "subnet": subnet} - self.create(params) - return conn.networkLookupByName("default") - except Exception as e: - kimchi_log.error("Fatal: Cannot create default network " - "because of %s, exit kimchid", e.message) - sys.exit(1) - - conn = self.conn.get() - try: - net = conn.networkLookupByName("default") - except libvirt.libvirtError: - net = create_default_network() - - if net.isActive() == 0: - try: - net.create() - except libvirt.libvirtError as e: - # FIXME we can not distinguish this error from other internal - # error by error code. - if ("network is already in use by interface" - in e.message.lower()): - # libvirt do not support update IP element, so delete the - # the network and create new one. - net.undefine() - create_default_network() - else: - kimchi_log.error("Fatal: Cannot activate default network " - "because of %s, exit kimchid", e.message) - sys.exit(1) def create(self, params): conn = self.conn.get() @@ -267,12 +229,6 @@ def lookup(self, name): 'persistent': True if network.isPersistent() else False} def _is_network_in_use(self, name): - # The network "default" is used for Kimchi proposal and should not be - # deactivate or deleted. Otherwise, we will allow user create - # inconsistent templates from scratch - if name == 'default': - return True - vms = self._get_vms_attach_to_a_network(name) return bool(vms) or self._is_network_used_by_template(name) diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 39c9163..cec2c50 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -91,7 +91,7 @@ }, } -defaults = {'networks': ['default'], +defaults = {'networks': [], 'storagepool': '/storagepools/default', 'domain': 'kvm', 'arch': os.uname()[4], 'graphics': {'type': 'vnc', 'listen': '0.0.0.0'}} diff --git a/tests/test_model.py b/tests/test_model.py index da9dae5..e717872 100644 --- a/tests/test_model.py +++ b/tests/test_model.py @@ -154,12 +154,7 @@ def test_vm_ifaces(self): rollback.prependDefer(inst.network_deactivate, net_name) ifaces = inst.vmifaces_get_list('kimchi-ifaces') - self.assertEquals(1, len(ifaces)) - - iface = inst.vmiface_lookup('kimchi-ifaces', ifaces[0]) - self.assertEquals(17, len(iface['mac'])) - self.assertEquals("default", iface['network']) - self.assertIn("model", iface) + self.assertEquals(0, len(ifaces)) # attach network interface to vm iface_args = {"type": "network", @@ -176,11 +171,11 @@ def test_vm_ifaces(self): self.assertEquals("virtio", iface["model"]) # update vm interface - iface_args = {"network": "default", + iface_args = {"network": "test-network", "model": "e1000"} inst.vmiface_update('kimchi-ifaces', mac, iface_args) iface = inst.vmiface_lookup('kimchi-ifaces', mac) - self.assertEquals("default", iface['network']) + self.assertEquals("test-network", iface['network']) self.assertEquals("e1000", iface["model"]) @unittest.skipUnless(utils.running_as_root(), 'Must be run as root') @@ -565,14 +560,14 @@ def test_template_create(self): info = inst.template_lookup('test') for key in params.keys(): self.assertEquals(params[key], info[key]) - self.assertEquals("default", info["networks"][0]) + self.assertEquals(0, len(info["networks"])) # create template with non-existent network params['name'] = 'new-test' params['networks'] = ["no-exist"] self.assertRaises(InvalidParameter, inst.templates_create, params) - params['networks'] = ['default', 'test-network'] + params['networks'] = ['test-network'] inst.templates_create(params) rollback.prependDefer(inst.template_delete, params['name']) info = inst.template_lookup(params['name']) @@ -667,10 +662,10 @@ def test_template_update(self): info = inst.template_lookup('new-test') for key in params.keys(): self.assertEquals(params[key], info[key]) - self.assertEquals("default", info["networks"][0]) + self.assertEquals(0, len(info["networks"])) params = {'name': 'new-test', 'memory': 1024, 'cpus': 1, - 'networks': ['default', 'test-network']} + 'networks': ['test-network']} inst.template_update('new-test', params) info = inst.template_lookup('new-test') for key in params.keys(): diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py index 104e7b8..7524f84 100644 --- a/tests/test_osinfo.py +++ b/tests/test_osinfo.py @@ -28,7 +28,7 @@ def test_default_lookup(self): entry = lookup(None, None) self.assertEquals('unknown', entry['os_distro']) self.assertEquals('unknown', entry['os_version']) - self.assertEquals(['default'], entry['networks']) + self.assertEquals([], entry['networks']) def test_fedora_lookup(self): cd = ('http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/' diff --git a/tests/test_rest.py b/tests/test_rest.py index 3ea1927..306064c 100644 --- a/tests/test_rest.py +++ b/tests/test_rest.py @@ -603,14 +603,7 @@ def test_vm_iface(self): '/networks/test-network', '{}', 'DELETE') ifaces = json.loads(self.request('/vms/test-vm/ifaces').read()) - self.assertEquals(1, len(ifaces)) - - for iface in ifaces: - res = json.loads(self.request('/vms/test-vm/ifaces/%s' % - iface['mac']).read()) - self.assertEquals('default', res['network']) - self.assertEquals(17, len(res['mac'])) - self.assertEquals('virtio', res['model']) + self.assertEquals(0, len(ifaces)) # attach network interface to vm req = json.dumps({"type": "network", @@ -794,7 +787,7 @@ def test_template_customise_network(self): '/templates/test', '{}', 'DELETE') tmpl_res = json.loads(resp.read()) self.assertTrue(type(tmpl_res['networks']) is list) - self.assertEquals("default", tmpl_res['networks'][0]) + self.assertEquals(0, len(tmpl_res['networks'])) tmpl['name'] = "failed_tmpl" # Create a Template with non-array network fails with 400 @@ -832,7 +825,7 @@ def test_template_customise_network(self): self.assertEquals(400, resp.status) # Update a Template with existent network, successful - tmpl['networks'] = ["default", "test-network"] + tmpl['networks'] = ["test-network"] req = json.dumps(tmpl) resp = self.request('/templates/test', req, 'PUT') self.assertEquals(200, resp.status) @@ -1407,9 +1400,7 @@ def test_interfaces(self): def test_get_networks(self): networks = json.loads(request(host, ssl_port, '/networks').read()) - self.assertEquals(1, len(networks)) - self.assertEquals('default', networks[0]['name']) - self.assertEquals([], networks[0]['vms']) + self.assertEquals(0, len(networks)) # Now add a couple of Networks to the mock model for i in xrange(5): @@ -1424,7 +1415,7 @@ def test_get_networks(self): self.assertEquals([], network["vms"]) networks = json.loads(request(host, ssl_port, '/networks').read()) - self.assertEquals(6, len(networks)) + self.assertEquals(5, len(networks)) network = json.loads(request(host, ssl_port, '/networks/network-1').read()) diff --git a/tests/test_vmtemplate.py b/tests/test_vmtemplate.py index 821ca24..8dceced 100644 --- a/tests/test_vmtemplate.py +++ b/tests/test_vmtemplate.py @@ -29,7 +29,7 @@ class VMTemplateTests(unittest.TestCase): def test_minimal_construct(self): fields = (('name', 'test'), ('os_distro', 'unknown'), ('os_version', 'unknown'), ('cpus', 1), - ('memory', 1024), ('cdrom', ''), ('networks', ['default']), + ('memory', 1024), ('cdrom', ''), ('networks', []), ('disk_bus', 'ide'), ('nic_model', 'e1000'), ('graphics', {'type': 'vnc', 'listen': '0.0.0.0'})) -- 1.9.3

4 3

[PATCH] PowerPC bootable ISO detection code
by Daniel Barboza 27 Jul '14

27 Jul '14

From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> PowerPC ISO images does not follow the same rules as Intel's. Intel ISOs uses ISO9660 extension called 'El Torito', which describes the format of the Boot Record. PowerPC firmware, on the other hand, looks for a file '/ppc/bootinfo.txt' which describes how to boot the image. This patch creates a function that opens the ISO file without mounting it and, following ISO9660 standards, read the filesystem trying to find the boot file that enables PowerPC booting. Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com> --- src/kimchi/isoinfo.py | 166 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 165 insertions(+), 1 deletion(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index c394a32..72b956d 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import glob +import platform import os import re import struct @@ -132,6 +133,12 @@ class IsoImage(object): EL_TORITO_BOOT_RECORD = struct.Struct("=B5sB32s32sI") EL_TORITO_VALIDATION_ENTRY = struct.Struct("=BBH24sHBB") EL_TORITO_BOOT_ENTRY = struct.Struct("=BBHBBHL20x") + # Path table info starting in ISO9660 offset 132. We force little + # endian byte order (the '<' sign) because Power systems can run on + # both. + # First int is path table size, next 4 bytes are discarded (it is + # the same info but in big endian) and next int is the location. + PATH_TABLE_SIZE_LOC = struct.Struct("<I 4s I") def __init__(self, path): self.path = path @@ -224,6 +231,160 @@ class IsoImage(object): raise IsoFormatError("KCHISO0005E", {'filename': self.path}) + def _scan_ppc(self): + """ + PowerPC firmware does not use the conventional El Torito boot + specification. Instead, it looks for a file '/ppc/bootinfo.txt' + which contains boot information. A PPC image is bootable if + this file exists in the filesystem [1]. + + To detect if a PPC ISO is bootable, we could simply mount the + ISO and search for the boot file as we would with any other + file in the filesystem. We can also look for the boot file + searching byte by byte the ISO image. This is possible because + the PPC ISO image follows the ISO9660 standard [2]. Mounting + the ISO requires extra resources and it takes longer than + searching the image data, thus we chose the latter approach + in this code. + + To locate a file we must access the Path Table, which contains + the records of all the directories in the ISO. After locating + the directory/subdirectory that contains the file, we access + the Directory Record to find it. + + + .. [1] https://www.ibm.com/developerworks/community/wikis/home?\ +lang=en#!/wiki/W51a7ffcf4dfd_4b40_9d82_446ebc23c550/page/PowerLinux\ +%20Boot%20howto + .. [2] http://wiki.osdev.org/ISO_9660 + """ + + # To locate any file we must access the Path Table, which + # contains the records of all the directories in the ISO. + # ISO9660 dictates that the Path Table location information + # is at offset 132, inside the Primary Volume Descriptor, + # after the SystemArea (16*SECTOR_SIZE). + # + # In the Path table info we're forcing little endian byte + # order (the '<' sign) because Power systems can run on + # both. + # + # First int is path table size, next 4 bytes are discarded (it is + # the same info but in big endian) and next int is the location. + PATH_TABLE_LOC_OFFSET = 16 * IsoImage.SECTOR_SIZE + 132 + PATH_TABLE_SIZE_LOC = struct.Struct("<I 4s I") + + path_table_loc_data = self._get_iso_data(PATH_TABLE_LOC_OFFSET, + PATH_TABLE_SIZE_LOC.size) + path_size, unused, path_loc = self._unpack(PATH_TABLE_SIZE_LOC, + path_table_loc_data) + # Fetch the Path Table using location and size found above + path_table_offset = path_loc * IsoImage.SECTOR_SIZE + path_table_data = self._get_iso_data(path_table_offset, path_size) + + # Loop inside the path table to find the directory 'ppc'. + # The contents of the registers are: + # - length of the directory identifier (1 byte) + # - extended attribute record length (1 byte) + # - location of directory register (4 bytes) + # - directory number of parent dir (2 bytes) + # - directory name (size varies according to length) + # - padding field - 1 byte if the length is odd, not present if even + DIR_NAMELEN_LOCATION_PARENT = struct.Struct("<B B I H") + dir_struct_size = DIR_NAMELEN_LOCATION_PARENT.size + i = 0 + while i < path_size: + dir_data = path_table_data[i: i+dir_struct_size] + i += dir_struct_size + # We won't use the Extended Attribute Record + dir_namelen, unused, dir_loc, dir_parent = \ + self._unpack(DIR_NAMELEN_LOCATION_PARENT, dir_data) + if dir_parent == 1: + # read the dir name using the namelen + dir_name = path_table_data[i: i+dir_namelen].rstrip() + if dir_name == 'ppc': + # stop searching, dir was found + break + # Need to consider the optional padding field as well + i += dir_namelen + dir_namelen % 2 + + if i > path_size: + # Didn't find the '/ppc' directory. ISO is not bootable. + self.bootable = False + return + + # Get the 'ppc' directory record using 'dir_loc'. + ppc_dir_offset = dir_loc * IsoImage.SECTOR_SIZE + + # We need to find the sector size of this dir entry. The + # size of the File Section is located 10 bytes after + # the dir location. + DIR_SIZE_FMT = struct.Struct("<10sI") + data = self._get_iso_data(ppc_dir_offset, DIR_SIZE_FMT.size) + unused, dir_size = self._unpack(DIR_SIZE_FMT, data) + # If the dir is in the middle of a sector, the sector is + # padded zero and won't be utilized. We need to round up + # the result + dir_sectorsize = dir_size / IsoImage.SECTOR_SIZE + if dir_size % IsoImage.SECTOR_SIZE: + dir_sectorsize += 1 + + # Fixed-size directory record fields: + # - length of directory record (1 byte) + # - extended attr. record length (1 byte) + # - location of extend in both-endian format (8 bytes) + # - data length (size of extend) in both-endian (8 bytes) + # - recording date and time (7 bytes) + # - file flags (1 byte) + # - file unit size interleaved (1 byte) + # - interleave gap size (1 byte) + # - volume sequence number (4 bytes) + # - length of file identifier (1 byte) + # + # Of all these fields, we will use only 3 of them, 'ignoring' + # 30 bytes total. + STATIC_DIR_RECORD_FMT = struct.Struct("<B 24s B 6s B") + static_rec_size = STATIC_DIR_RECORD_FMT.size + + # Maximum offset possible of all the records of this directory + DIR_REC_MAX = ppc_dir_offset + dir_sectorsize*IsoImage.SECTOR_SIZE + # Max size of a given directory record + MAX_DIR_SIZE = 255 + # Name of the boot file + BOOT_FILE_NAME = "bootinfo.txt" + + # Loop until one of the following happens: + # - boot file is found + # - end of directory record listing for the 'ppc' dir + while ppc_dir_offset < DIR_REC_MAX: + record_data = self._get_iso_data(ppc_dir_offset, MAX_DIR_SIZE) + dir_rec_len, unused, file_flags, unused2, file_name_len = \ + self._unpack(STATIC_DIR_RECORD_FMT, record_data) + + # if dir_rec_len = 0, increment offset (skip the + # dir_rec_len byte) and continue the loop + if dir_rec_len == 0: + ppc_dir_offset += 1 + continue + + # Get filename of the file/dir we're at. + filename = record_data[static_rec_size: + static_rec_size + file_name_len].rstrip() + # The second bit of the file_flags indicate if this record + # is a directory. + if filename == BOOT_FILE_NAME and (file_flags & 2) != 1: + self.bootable = True + return + + # Update offset and keep looking. There is a padding here + # if the length of the file identifier is EVEN. + padding = 0 + if not file_name_len % 2: + padding = 1 + ppc_dir_offset += dir_rec_len + padding + # If reached this point the file wasn't found = not bootable + self.bootable = False + def _scan_primary_vol(self, data): """ Scan one sector for a Primary Volume Descriptor and extract the @@ -269,7 +430,10 @@ class IsoImage(object): return self._scan_primary_vol(data) - self._scan_el_torito(data) + if platform.machine().startswith('ppc'): + self._scan_ppc() + else: + self._scan_el_torito(data) class Matcher(object): -- 1.8.3.1

1 0

[V2 0/2] Authorization: Add users/groups to VM
by huoyuxin＠linux.vnet.ibm.com 25 Jul '14

25 Jul '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): Add users/groups to VM po files update for permission po/en_US.po | 9 +++ po/kimchi.pot | 9 +++ po/pt_BR.po | 9 +++ po/zh_CN.po | 9 +++ ui/css/theme-default/guest-edit.css | 116 +++++++++++++++++++++++++++++++++++ ui/images/theme-default/group.png | Bin 0 -> 1703 bytes ui/images/theme-default/user.png | Bin 0 -> 1322 bytes ui/js/src/kimchi.api.js | 28 ++++++++ ui/js/src/kimchi.guest_edit_main.js | 112 ++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 37 +++++++++++ 10 files changed, 326 insertions(+), 3 deletions(-) create mode 100644 ui/images/theme-default/group.png create mode 100644 ui/images/theme-default/user.png

3 7

[PATCH 0/9] authorization: Filter resources by users and groups
by alinefm＠linux.vnet.ibm.com 24 Jul '14

24 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Also move autorization mechanism to controller to be able to distinguish resource and collection configuration If we use UrlSubNode to also handle the authorization configuration, we won't be able to specify different configuration to collection and its resource as Kimchi uses the same base URL to both. Example: @UrlSubNode("vms", True, ["POST", "PUT", "DELETE"], 'guests') It meant that all the methods listed were exclusive for admin users. Which it is not correct, as a user assigned to a VM can also perform POST, PUT and DELETE actions. So fix it by moving the authorization mechanism to controller Aline Manera (5): authorization: Filter resources by users and groups authorization: Restrict Collection access based on admin_methods parameter authorization: Restrict access to Resource instance authorization: Update control files to set role_key and admin_methods authorization: Remove authorization config from UrlSubNode Crístian Viana (4): Return some groups for every user in mockmodel Move "fake_user" credentials to mockmodel List "admin" as a valid system user in mockmodel authorization: Update test cases based on last changes src/kimchi/auth.py | 16 +---------- src/kimchi/control/base.py | 56 +++++++++++++++++++++++++++++++----- src/kimchi/control/debugreports.py | 8 +++++- src/kimchi/control/host.py | 26 +++++++++++++++-- src/kimchi/control/interfaces.py | 6 +++- src/kimchi/control/networks.py | 6 +++- src/kimchi/control/storagepools.py | 6 +++- src/kimchi/control/storageservers.py | 8 +++++- src/kimchi/control/templates.py | 6 +++- src/kimchi/control/utils.py | 14 +++++---- src/kimchi/control/vms.py | 6 +++- src/kimchi/exception.py | 4 +++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 5 +++- src/kimchi/server.py | 4 --- tests/test_authorization.py | 30 +++++++++++++++++-- tests/test_rest.py | 19 ++++++------ tests/utils.py | 9 +++--- 18 files changed, 172 insertions(+), 58 deletions(-) -- 1.9.3

3 11

[V3 0/2] Authorization: Add Users/Groups to VM
by huoyuxin＠linux.vnet.ibm.com 24 Jul '14

24 Jul '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): authorization: add users/groups to vm authorization: update po files po/en_US.po | 9 +++ po/kimchi.pot | 9 +++ po/pt_BR.po | 9 +++ po/zh_CN.po | 9 +++ ui/css/theme-default/guest-edit.css | 104 ++++++++++++++++++++++++++++++ ui/images/theme-default/group.png | Bin 0 -> 1703 bytes ui/images/theme-default/user.png | Bin 0 -> 1322 bytes ui/js/src/kimchi.api.js | 28 ++++++++ ui/js/src/kimchi.guest_edit_main.js | 120 ++++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 42 ++++++++++++ 10 files changed, 327 insertions(+), 3 deletions(-) create mode 100644 ui/images/theme-default/group.png create mode 100644 ui/images/theme-default/user.png

2 5

[PATCH] issue #374: Use base64 encoding to launch VM console
by alinefm＠linux.vnet.ibm.com 24 Jul '14

24 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> websockify.py uses urlparse.parse_qs() to parse token parameter in the console URL /vnc_auto.html?port=64667&path=?token=issue%2B374&encrypt=1 And even encoding the VM name using encodeURIComponent() it replaces the plus sign for a white space, {'token': ['issue 374']} That way the console (noVNC/Spice) will never be able to find the console port based on VM name, as it was wrongly recorded. To fix it, uses base64 for encoding the VM name while setting up the console configuration and accessing it using noVNC or Spice. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vnc.py | 2 ++ ui/js/src/kimchi.api.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index 002b950..660b9c6 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -18,6 +18,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 base64 import errno import os import subprocess @@ -53,6 +54,7 @@ def new_ws_proxy(): def add_proxy_token(name, port): with open(os.path.join(WS_TOKENS_DIR, name), 'w') as f: + name = base64.b64encode(name) f.write('%s: localhost:%s' % (name.encode('utf-8'), port)) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 021be63..97d5800 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -352,7 +352,7 @@ var kimchi = { }).done(function() { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=vnc_auto.html&port=" + proxy_port; - url += "&path=?token=" + encodeURIComponent(vm); + url += "&path=?token=" + btoa(vm); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); @@ -377,7 +377,7 @@ var kimchi = { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=spice.html&port=" + proxy_port; url += "&listen=" + location.hostname; - url += "&token=" + encodeURIComponent(vm); + url += "&token=" + btoa(vm); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); -- 1.9.3

3 2

[PATCH] issue #374: Use base64 encoding to launch VM console
by alinefm＠linux.vnet.ibm.com 24 Jul '14

24 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> websockify.py uses urlparse.parse_qs() to parse token parameter in the console URL /vnc_auto.html?port=64667&path=?token=issue%2B374&encrypt=1 And even encoding the VM name using encodeURIComponent() it replaces the plus sign for a white space, {'token': ['issue 374']} That way websockify will never be able to find the console port based on VM name. To fix it, use base64 for encoding the VM name while setting up the console configuration and accessing it using noVNC or Spice. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/vnc.py | 2 ++ ui/js/src/kimchi.api.js | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/kimchi/vnc.py b/src/kimchi/vnc.py index 002b950..9380e21 100644 --- a/src/kimchi/vnc.py +++ b/src/kimchi/vnc.py @@ -18,6 +18,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 base64 import errno import os import subprocess @@ -53,6 +54,7 @@ def new_ws_proxy(): def add_proxy_token(name, port): with open(os.path.join(WS_TOKENS_DIR, name), 'w') as f: + name = base64.urlsafe_b64encode(name) f.write('%s: localhost:%s' % (name.encode('utf-8'), port)) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 021be63..99ac730 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -352,7 +352,7 @@ var kimchi = { }).done(function() { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=vnc_auto.html&port=" + proxy_port; - url += "&path=?token=" + encodeURIComponent(vm); + url += "&path=?token=" + kimchi.urlSafeB64Encode(vm); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); @@ -377,7 +377,7 @@ var kimchi = { url = 'https://' + location.hostname + ':' + proxy_port; url += "/console.html?url=spice.html&port=" + proxy_port; url += "&listen=" + location.hostname; - url += "&token=" + encodeURIComponent(vm); + url += "&token=" + kimchi.urlSafeB64Encode(vm); url += "&kimchi=" + location.port; url += '&encrypt=1'; window.open(url); -- 1.9.3

4 3

[PATCH V4 0/4] Authorization: disable non-root user functions in UI
by wenwang＠linux.vnet.ibm.com 24 Jul '14

24 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V3 -> V4: Removed the additional white border line in user mode(Aline) Minor change to the layout of the storage tab of user mode that makes the arrow-down/arrow-up more consistent(Aline) V2 -> V3: stored the mode into global _tabMode that can be used for each tab.(Aline) Making the buttons that is not avaiable for non-root users invisible by default and enable when user is admin.(Yu Xin) Fixed css inconsistent under "Storage" tab. Removed the onClick function if the buttons are not avaiable. V1 -> V2: Store "roles" parameter in cookie instead of each tab's mode.(Aline) read only "roles" from cookie instead of roles of each tab(Aline) Minor changes in method of removing "Action" title under network tab (Hongliang Wang) This patch defines user privilege according to different user roles In this release, only two roles are supported: "admin" and "user", conbined with four modes: "admin", "byInstance", "read-only" and "none", each of which has own privileges to different tabs as well as instances. modes are stored in cookie and functions of different roles are protected in the back-end. Wen Wang (4): Add roles into cookie Authorization: remove host/template tabs for non-root users Authorization: remove [+] icon from non-root users view Authorization: Remove actions based on roles ui/css/theme-default/network.css | 4 + ui/css/theme-default/storage.css | 22 ++++--- ui/js/src/kimchi.guest_main.js | 10 ++- ui/js/src/kimchi.login.js | 16 +++-- ui/js/src/kimchi.main.js | 26 +++++-- ui/js/src/kimchi.network.js | 12 +++- ui/js/src/kimchi.storage_main.js | 137 ++++++++++++++++++++----------------- ui/js/src/kimchi.template_main.js | 21 ++++-- ui/pages/tabs/guests.html.tmpl | 4 +- ui/pages/tabs/network.html.tmpl | 6 +- ui/pages/tabs/storage.html.tmpl | 6 +- ui/pages/tabs/templates.html.tmpl | 2 +- 12 files changed, 159 insertions(+), 107 deletions(-)

2 6

[V1 0/2] Add Users/Groups to VM
by huoyuxin＠linux.vnet.ibm.com 23 Jul '14

23 Jul '14

From: Yu Xin Huo <huoyuxin(a)linux.vnet.ibm.com> Yu Xin Huo (2): Add users/groups to VM update po po/en_US.po | 9 +++ po/kimchi.pot | 9 +++ po/pt_BR.po | 39 ++++++++----- po/zh_CN.po | 9 +++ ui/css/theme-default/guest-edit.css | 106 +++++++++++++++++++++++++++++++++ ui/images/theme-default/group.png | Bin 0 -> 1703 bytes ui/images/theme-default/user.png | Bin 0 -> 1322 bytes ui/js/src/kimchi.api.js | 28 +++++++++ ui/js/src/kimchi.guest_edit_main.js | 112 ++++++++++++++++++++++++++++++++++- ui/pages/guest-edit.html.tmpl | 33 ++++++++++ 10 files changed, 327 insertions(+), 18 deletions(-) create mode 100644 ui/images/theme-default/group.png create mode 100644 ui/images/theme-default/user.png

4 8

[PATCH 0/2 V2] [Fix BZ#111243 - pkvm 2.1-SP2]
by Rodrigo Trujillo 23 Jul '14

23 Jul '14

V2: - Patch disables vhost feature only in ubuntu 14.04 or lower V1: Patch 1 - Disables vhost feature Patch 2 - Uses/modify SUSE patch from kimchi upstream. Adds SLES and change RHEL version (6.5) in modern distros dict. Modern distros are going to use virtio. Rodrigo Trujillo (2): Disable vhost feature in Ubuntu LE Change modern distro versions src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 9 ++++++--- src/kimchi/vmtemplate.py | 10 +++++++++- 3 files changed, 16 insertions(+), 4 deletions(-) -- 1.9.3

1 3

[PATCHv3 0/8] Support img based template
by lvroyce0210＠gmail.com 23 Jul '14

23 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> 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'....} Known issues: 1.This is only available for NFS and dir pool, logical pool in kimchi now adopted raw format which does not suitable for qcow2 img(will fix later). iscsi, scsi pool volume size need to be checked and handled later. So in this version just support dir based pool. 2.Due to template integrity check need be refactored, this check will be added later. Royce Lv (8): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Fix: Prevent iso links filling in osinfo.py Integrate image os probe in vm template create 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 | 31 ++++++++++++--- src/kimchi/model/templates.py | 13 +++--- src/kimchi/model/vms.py | 1 + src/kimchi/osinfo.py | 24 +----------- src/kimchi/vmtemplate.py | 76 ++++++++++++++++++++++++------------ tests/test_model.py | 25 ++++++++++++ tests/test_osinfo.py | 8 ---- tests/test_rest.py | 32 ++++++++++++++- tests/test_vmtemplate.py | 2 +- 21 files changed, 244 insertions(+), 79 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 18

[PATCH V3 0/4] Authorization: disable non-root user functions in UI
by wenwang＠linux.vnet.ibm.com 23 Jul '14

23 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V2 -> V3: stored the mode into global _tabMode that can be used for each tab.(Aline) Making the buttons that is not avaiable for non-root users invisible by default and enable when user is admin.(Yu Xin) Fixed css inconsistent under "Storage" tab. Removed the onClick function if the buttons are not avaiable. V1 -> V2: Store "roles" parameter in cookie instead of each tab's mode.(Aline) read only "roles" from cookie instead of roles of each tab(Aline) Minor changes in method of removing "Action" title under network tab (Hongliang Wang) This patch defines user privilege according to different user roles In this release, only two roles are supported: "admin" and "user", conbined with four modes: "admin", "byInstance", "read-only" and "none", each of which has own privileges to different tabs as well as instances. modes are stored in cookie and functions of different roles are protected in the back-end. Wen Wang (4): Add roles into cookie Authorization: remove host/template tabs for non-root users Authorization: remove [+] icon from non-root users view Authorization: Remove actions based on roles ui/css/theme-default/storage.css | 22 ++++--- ui/js/src/kimchi.guest_main.js | 10 ++- ui/js/src/kimchi.login.js | 16 +++-- ui/js/src/kimchi.main.js | 26 +++++-- ui/js/src/kimchi.network.js | 10 +++- ui/js/src/kimchi.storage_main.js | 137 ++++++++++++++++++++----------------- ui/js/src/kimchi.template_main.js | 21 ++++-- ui/pages/tabs/guests.html.tmpl | 4 +- ui/pages/tabs/network.html.tmpl | 6 +- ui/pages/tabs/storage.html.tmpl | 6 +- ui/pages/tabs/templates.html.tmpl | 2 +- 11 files changed, 153 insertions(+), 107 deletions(-)

3 6

[PATCH V3 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com 22 Jul '14

22 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> 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 | 68 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 15 +++++++++++ tests/test_rest.py | 12 +++++++++ 8 files changed, 136 insertions(+), 1 deletion(-) -- 1.9.3

2 7

[PATCH V2] add a base64 safe url encode and decode to js utils
by shaohef＠linux.vnet.ibm.com 22 Jul '14

22 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2: address zhengsheng's comment. add the base64 wiki to commit message. ShaoHe Feng (1): add a base64 safe url encode and decode to js utils ui/js/src/kimchi.utils.js | 8 ++++++++ 1 file changed, 8 insertions(+) -- 1.9.3

3 4

[RFC]Redirect to login page if user close the browser
by Wen Wang 22 Jul '14

22 Jul '14

Hi all, Now after closing the browser, paste the url you copied from either kimchi or vnc, you can access kimchi or vnc without asking for authentication with login page. I think it's better to redirect user to login page after closing the browser even if they pasted their url used before to enhance the security. Thanks Wang Wen

2 1

[PATCH V2 0/4] Authorization: disable non-root user functions in UI
by wenwang＠linux.vnet.ibm.com 22 Jul '14

22 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> V1 -> V2: Store "roles" parameter in cookie instead of each tab's mode.(Aline) read only "roles" from cookie instead of roles of each tab(Aline) Minor changes in method of removing "Action" title under network tab (Hongliang Wang) This patch defines user privilege according to different user roles In this release, only two roles are supported: "admin" and "user", conbined with four modes: "admin", "byInstance", "read-only" and "none", each of which has own privileges to different tabs as well as instances. modes are stored in cookie and functions of different roles are protected in the back-end. Wen Wang (4): Add roles into cookie Authorization: remove host/template tabs for non-root users Authorization: remove [+] icon from non-root users view Authorization: Remove actions based on roles ui/css/theme-default/storage.css | 18 +++++++++--------- ui/js/src/kimchi.guest_main.js | 4 ++++ ui/js/src/kimchi.login.js | 16 +++++++++------- ui/js/src/kimchi.main.js | 24 ++++++++++++++++-------- ui/js/src/kimchi.network.js | 9 +++++++++ ui/js/src/kimchi.storage_main.js | 11 +++++++++++ 6 files changed, 58 insertions(+), 24 deletions(-)

3 7

[PATCH 0/4] Authorization: disable non-root user functions in UI
by wenwang＠linux.vnet.ibm.com 22 Jul '14

22 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch defines user privilege according to different user roles In this release, only two roles are supported: "admin" and "user", conbined with four modes: "admin", "byInstance", "read-only" and "none", each of which has own privileges to different tabs as well as instances. modes are stored in cookie and functions of different roles are protected in the back-end. Please apply Aline's patches first before this one. Below are the references: (1)[Kimchi-devel] [PATCH 0/4 V2] Let frontend redirect user after logging (2)[Kimchi-devel] [PATCH 0/5 V3] authorization: Backend changes Apply these two patches in order then this UI changes can work Wen Wang (4): Add modes into cookie Authorization: remove host/template tabs for non-root users Authorization: remove [+] icon from non-root users view Authorization: Remove actions based on roles ui/css/theme-default/storage.css | 18 +++++++++--------- ui/js/src/kimchi.guest_main.js | 4 ++++ ui/js/src/kimchi.login.js | 20 +++++++++++++------- ui/js/src/kimchi.main.js | 21 +++++++++++++-------- ui/js/src/kimchi.network.js | 9 +++++++++ ui/js/src/kimchi.storage_main.js | 11 +++++++++++ 6 files changed, 59 insertions(+), 24 deletions(-)

3 14

[PATCH 0/3 WIP] Let frontend redirect user after logging
by alinefm＠linux.vnet.ibm.com 21 Jul '14

21 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> This patch set removes useless files related to former login design and redirect user in frontend after logging - that way frontend can store user information for authorization matters. The patch 2 has 2 problems: 1) the next URL is encoded using base64 So in UI I need to decode it. How do I do that? 2) while using kimchi.cookie.get() to get the lastPage it returns the URL with "" So the redirection fails as it tries to redirect the user to "/#tabs/guests" How do I remove those "" around the cookie value? Any help is welcome! Aline Manera (3): Remove former login design files Remove special console rules from nginx configuration Let frontend redirect user after logging src/kimchi/auth.py | 6 -- src/kimchi/root.py | 19 +----- src/nginx.conf.in | 11 ---- ui/js/src/kimchi.login.js | 73 ++++++++++++++++++++++ ui/js/src/kimchi.login_window.js | 128 --------------------------------------- ui/pages/login-window.html.tmpl | 53 ---------------- ui/pages/login.html.tmpl | 36 ++--------- 7 files changed, 78 insertions(+), 248 deletions(-) create mode 100644 ui/js/src/kimchi.login.js delete mode 100644 ui/js/src/kimchi.login_window.js delete mode 100644 ui/pages/login-window.html.tmpl -- 1.9.3

4 9

[PATCH] Always use unicode in KimchiException message
by alinefm＠linux.vnet.ibm.com 21 Jul '14

21 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> When KimchiException was raised inside a cherrypy application it returned a unicode message. But if the exception was raised independently the cherrypy server (ie, using model instance directly) it returned a string message. To keep the same behavior in all those situations, let KimchiException always returns a unicode message Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- src/kimchi/exception.py | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..d84ddb9 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -29,18 +29,29 @@ class KimchiException(Exception): def __init__(self, code='', args={}): self.code = code + for key, value in args.iteritems(): + if isinstance(value, unicode): + continue + + # value is not unicode: convert it + try: + # In case the value formats itself to an ascii string. + args[key] = unicode(str(value), 'utf-8') + except UnicodeEncodeError: + # In case the value is a KimchiException or it formats + # itself to a unicode string. + args[key] = unicode(value) + if cherrypy.request.app: - msg = self._get_translation(args) + msg = self._get_translation() else: - for key, value in args.iteritems(): - if isinstance(value, unicode): - args[key] = value.encode('utf-8') - msg = _messages.get(code, code) % args + msg = _messages.get(code, code) + msg = unicode(msg, 'utf-8') % args pattern = "%s: %s" % (code, msg) Exception.__init__(self, pattern) - def _get_translation(self, args): + def _get_translation(self): lang = validate_language(get_lang()) paths = cherrypy.request.app.root.paths domain = cherrypy.request.app.root.domain @@ -52,17 +63,7 @@ def _get_translation(self, args): except: translation = gettext - for key, value in args.iteritems(): - if not isinstance(value, unicode): - try: - # In case the value formats itself to an ascii string. - args[key] = unicode(str(value), 'utf-8') - except UnicodeEncodeError: - # In case the value is a KimchiException or it formats - # itself to a unicode string. - args[key] = unicode(value) - - return unicode(translation.gettext(text), 'utf-8') % args + return translation.gettext(text) class NotFoundError(KimchiException): -- 1.9.3

3 3

[PATCH 0/4 V2] Let frontend redirect user after logging
by alinefm＠linux.vnet.ibm.com 21 Jul '14

21 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 -> V2: - Turn back next_url parameter to fix problems mentioned by Wen Wang - Use urllib2.quote() to encode next_url in backend - Use decodeURIcomponent() to decode next_url in JS Aline Manera (4): Update test case to reflect new login design Remove former login design files Remove special console rules from nginx configuration Let frontend redirect user after logging src/kimchi/auth.py | 9 +-- src/kimchi/root.py | 19 +---- src/nginx.conf.in | 11 --- tests/test_rest.py | 2 +- ui/css/theme-default/login-window.css | 90 ------------------------ ui/js/src/kimchi.login.js | 71 +++++++++++++++++++ ui/js/src/kimchi.login_window.js | 128 ---------------------------------- ui/pages/login-window.html.tmpl | 53 -------------- ui/pages/login.html.tmpl | 36 ++-------- 9 files changed, 79 insertions(+), 340 deletions(-) delete mode 100644 ui/css/theme-default/login-window.css create mode 100644 ui/js/src/kimchi.login.js delete mode 100644 ui/js/src/kimchi.login_window.js delete mode 100644 ui/pages/login-window.html.tmpl -- 1.9.3

4 16

[PATCH 0/5 V3] authorization: Backend changes
by alinefm＠linux.vnet.ibm.com 21 Jul '14

21 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V2 -> V3: - Update backend authorization rules to reflect our last discussions - Use .getiterator() instead of .iter() while reading xml files - Get role according tab instead of sudo rights To do that I needed to add a new parameter to UrlSubNode() as Kimchi protects its API URIs and the user role is per tab, I need to know which URIs is used in each tab V1 -> V2: - Add "access" elements to describe role/view for each tab - Return a role map in /login For each tab, a role will be returned. That way we have more flexibility to change user role per tab - Add "access" parameter to VM.lookup() As the user will have full access to the VM assigned to it, return "access=full" for all them Aline Manera (5): authorization: Update authorization rules per API authorization: Update /login to return user roles instead of sudo parameter authorization: Add "access" elements to tabs.xml to describe user view authorization: Add "access" parameter to VM resource authorization: Get role according to tab instead of sudo rights config/ui/tabs.xml | 15 +++++++++++++ plugins/sample/ui/config/tab-ext.xml | 3 +++ src/kimchi/auth.py | 42 +++++++++++++++++++++++++----------- src/kimchi/control/debugreports.py | 2 +- src/kimchi/control/host.py | 2 +- src/kimchi/control/interfaces.py | 2 +- src/kimchi/control/networks.py | 2 +- src/kimchi/control/storagepools.py | 2 +- src/kimchi/control/storageservers.py | 2 +- src/kimchi/control/templates.py | 2 +- src/kimchi/control/utils.py | 4 +++- src/kimchi/control/vms.py | 2 +- src/kimchi/mockmodel.py | 3 ++- src/kimchi/model/vms.py | 3 ++- src/kimchi/server.py | 1 + src/kimchi/utils.py | 15 +++++++++++++ tests/test_authorization.py | 8 +++---- tests/test_mockmodel.py | 3 ++- tests/test_model.py | 3 ++- tests/test_rest.py | 8 +++++++ tests/utils.py | 6 +++--- 21 files changed, 97 insertions(+), 33 deletions(-) -- 1.9.3

3 12

[RFC] ticket of VM
by Sheldon 21 Jul '14

21 Jul '14

Now I have send a patch V1, no more comments. These days, I talk with ZhengSheng about the ticket of VM. Now we are change our design as follow for we should care the VMs created by other tools. 1. make the ticket as the sub-resource of a VM. support GET(lookup) and PUT(update) method. 2. we will not set expire for ticket. 3. kimchi will set a initial random password for VM when create it. 4. PUT(update) method can set a password for a VM created by other tool. but if expire is set for this VM, kimchi will not change the password. or kimchi can change the password but not change the expire. 5. when GET method to retrieve the password, if the VM is create by other-tools. And expire is set, kimchi raise http 400 error when timeout. 6. pass the ticket to vnc/spice websocket in cookie, not in URL. vnc/spice login page get the ticket from cookie. -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 5

Host Device Passthrough UI Task Discussion
by Zhou Zheng Sheng 21 Jul '14

21 Jul '14

Hi, As in Kimchi 1.3 TODO list (https://github.com/kimchi-project/kimchi/wiki/Todo-1.3) there is a task of passthrough support. It is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. The back-end patch also handles PCI device grouping (attach and detach all devices in the same iommu group together) and provides some other useful features. Since the due day is near, I think we can come up with an easy and simple UI for 1.3, and mark this feature as experimental. Then we improve it in future releases. So in this release we may only expose PCI devices to user and don't mention the iommu grouping logic. For this version I think we may provide the following operations to the user. In the VM edit window, initially, the user sees a list of PCI devices already assigned to the VM. This maps to GET vms/VM_NAME/hostdevs. In edit mode, the user can detach device. This maps to DELETE vms/VM_NAME/hostdevs/DEVICE_NAME. The user can also select device to attach to VM from a list. The listing of eligible devices is mapped to GET host/devices?_passthrough=true&_cap=pci. To attach a device, just POST a dict containing only the device name to vms/VM_NAME/hostdevs. I think these operations forms a basic interaction to enable user to consume this feature. It may be feasible to finish them before the due day. -- Zhou Zheng Sheng / 周征晟 E-mail: zhshzhou(a)linux.vnet.ibm.com Telephone: 86-10-82454397

5 6

[PATCH] add a base64 safe url encode and decode to js utils
by shaohef＠linux.vnet.ibm.com 21 Jul '14

21 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Most webs encode/decode url by base64 to escape the special characters. base64 encode/decode is similar to base64 safe url encode/decode. The difference is the alphabet. The base64 safe url alphabet uses '-' instead of '+' and '_' instead of '/'. after this patch: In backend, we can encode an url: >>> base64.urlsafe_b64encode("/vnc_auto.html?port=64667&path=?token=opensuse12&encrypt=1") 'L3ZuY19hdXRvLmh0bWw_cG9ydD02NDY2NyZwYXRoPT90b2tlbj1vcGVuc3VzZTEyJmVuY3J5cHQ9MQ==' and in UI, we can decode it: kimchi.urlSafeB64Decode("L3ZuY19hdXRvLmh0bWw_cG9ydD02NDY2NyZwYXRoPT90b2tlbj1vcGVuc3VzZTEyJmVuY3J5cHQ9MQ==") "/vnc_auto.html?port=64667&path=?token=opensuse12&encrypt=1" or In UI, we can encode an url: kimchi.urlSafeB64Encode("/vnc_auto.html?port=64667&path=?token=opensuse12&encrypt=1") "L3ZuY19hdXRvLmh0bWw_cG9ydD02NDY2NyZwYXRoPT90b2tlbj1vcGVuc3VzZTEyJmVuY3J5cHQ9MQ==" and in backend, we can decode it: >>> base64.urlsafe_b64decode("L3ZuY19hdXRvLmh0bWw_cG9ydD02NDY2NyZwYXRoPT90b2tlbj1vcGVuc3VzZTEyJmVuY3J5cHQ9MQ==") '/vnc_auto.html?port=64667&path=?token=opensuse12&encrypt=1' Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.utils.js | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/js/src/kimchi.utils.js b/ui/js/src/kimchi.utils.js index c7103f8..480b9b5 100644 --- a/ui/js/src/kimchi.utils.js +++ b/ui/js/src/kimchi.utils.js @@ -183,3 +183,11 @@ kimchi.escapeStr = function(str) { return str; }; + +kimchi.urlSafeB64Decode = function(str) { + return atob(str.replace(/-/g, '+').replace(/_/g, '/')); +} + +kimchi.urlSafeB64Encode = function(str) { + return btoa(str).replace(/\+/g, '-').replace(/\//g, '_'); +} -- 1.9.3

2 1

[PATCH 0/4] Authorization: disable non-root user functions in UI
by wenwang＠linux.vnet.ibm.com 18 Jul '14

18 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> This patch defines user privilege according to different user roles In this release, only two roles are supported: "admin" and "user", conbined with four modes: "admin", "byInstance", "read-only" and "none", each of which has own privileges to different tabs as well as instances. modes are stored in cookie and functions of different roles are protected in the back-end. Please apply Aline's patches first before this one. Below are the references: (1)[Kimchi-devel] [PATCH 0/4 V2] Let frontend redirect user after logging (2)[Kimchi-devel] [PATCH 0/5 V3] authorization: Backend changes Apply these two patches in order then this UI changes can work Wen Wang (4): Add modes into cookie Authorization: remove host/template tabs for non-root users Authorization: remove [+] icon from non-root users view Authorization: Remove actions based on roles ui/css/theme-default/storage.css | 18 +++++++++--------- ui/js/src/kimchi.guest_main.js | 4 ++++ ui/js/src/kimchi.login.js | 20 +++++++++++++------- ui/js/src/kimchi.main.js | 21 +++++++++++++-------- ui/js/src/kimchi.network.js | 9 +++++++++ ui/js/src/kimchi.storage_main.js | 11 +++++++++++ 6 files changed, 59 insertions(+), 24 deletions(-)

1 4

[PATCH V2 0/5] vm ticket in backend
by shaohef＠linux.vnet.ibm.com 18 Jul '14

18 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> 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/ticket/ \ -X PUT -d '{"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/ticket/ 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 | 20 +++++++++++++++ src/kimchi/API.json | 14 ++++++++++ src/kimchi/control/vms.py | 13 ++++++++++ src/kimchi/i18n.py | 1 + src/kimchi/mockmodel.py | 18 +++++++++++++ src/kimchi/model/vms.py | 65 +++++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 31 ++++++++++++++++++++++ tests/test_rest.py | 36 ++++++++++++++++++++++++++ 8 files changed, 198 insertions(+) -- 1.9.3

4 24

[PATCHv2 0/5] Create vm from image based template
by lvroyce＠linux.vnet.ibm.com 18 Jul '14

18 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> 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'....} Known issues: 1.This is only available for NFS and dir pool 2.template integrity is not checked, and base img is not protected. 3.Welcome ideas on how to test this feature. Royce Lv (5): Add image probe function Change doc and api specification Change 'cdrom' to a optional param Integrate image os probe in vm template create Create volume based on backing store image docs/API.md | 3 ++- docs/README.md | 9 ++++--- src/kimchi/API.json | 8 +++++- src/kimchi/control/templates.py | 2 +- src/kimchi/exception.py | 4 +++ src/kimchi/i18n.py | 8 +++++- src/kimchi/imageinfo.py | 48 +++++++++++++++++++++++++++++++++ src/kimchi/mockmodel.py | 27 ++++++++++++++----- src/kimchi/model/templates.py | 13 +++++---- src/kimchi/model/vms.py | 1 + src/kimchi/utils.py | 16 +++++++++++ src/kimchi/vmtemplate.py | 60 +++++++++++++++++++++++++++-------------- tests/test_rest.py | 2 +- 13 files changed, 162 insertions(+), 39 deletions(-) create mode 100644 src/kimchi/imageinfo.py -- 1.8.3.2

3 14

[WIP] Filter VMs by users and groups
by Crístian Viana 17 Jul '14

17 Jul '14

This is a working version of the patchset. It will use the users and groups metadata on each VM to decide if the current user is able to perform an operation on the VM. If the user (1) has sudo access or (2) is listed in the VM 'users' metadata or (3) is part of at least one of the groups listed in the VM 'groups' metadata, they will be able to see and perform any operation on that VM. The VMs listed by /vms are also filtered by the current user's permissions. This patch contains the actual feature implementation. The tests and appropriate updates to the mockmodel are not ready yet, as they happen to require more changes in the current code than expected. Crístian Viana (1): Filter VMs by users and groups src/kimchi/control/base.py | 4 +++ src/kimchi/model/vms.py | 63 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 65 insertions(+), 2 deletions(-) -- 1.9.3

3 6

[PATCH] add a Base64 saftURL encode and decode function
by shaohef＠linux.vnet.ibm.com 17 Jul '14

17 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> These two functions are similar to the functions in ui/js/novnc/base64.js usage: --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -36,6 +36,7 @@ <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> <script src="$href('js/kimchi.min.js')"></script> +<script src="$href('js/Base64saftURL.js')"></script> <style type="text/css"> .topbar select { float: right; then in UI: Base64.encode("f4>&^bc") "ZjQ-Jl5iYw==" Base64.decode("ZjQ-Jl5iYw==") "f4>&^bc" this is just a sample. we can add it to ui/js/src/kimchi.utils.js Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/Base64saftURL.js | 110 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 110 insertions(+) create mode 100644 ui/js/Base64saftURL.js diff --git a/ui/js/Base64saftURL.js b/ui/js/Base64saftURL.js new file mode 100644 index 0000000..8880a7e --- /dev/null +++ b/ui/js/Base64saftURL.js @@ -0,0 +1,110 @@ +/* This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + +// From: http://hg.mozilla.org/mozilla-central/raw-file/ec10630b1a54/js/src/devtools… + +/*jslint white: false, bitwise: false, plusplus: false */ +/*global console */ + +var Base64 = { + +/* Convert data (an array of integers) to a Base64 string. */ +toBase64Table : 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_='.split(''), +base64Pad : '=', + +encode: function (data) { + "use strict"; + var result = ''; + var toBase64Table = Base64.toBase64Table; + var length = data.length + var lengthpad = (length%3); + var i = 0, j = 0; + // Convert every three bytes to 4 ascii characters. + /* BEGIN LOOP */ + for (i = 0; i < (length - 2); i += 3) { + result += toBase64Table[data.charCodeAt(i) >> 2]; + result += toBase64Table[((data.charCodeAt(i) & 0x03) << 4) + (data.charCodeAt(i+1) >> 4)]; + result += toBase64Table[((data.charCodeAt(i+1) & 0x0f) << 2) + (data.charCodeAt(i+2) >> 6)]; + result += toBase64Table[data.charCodeAt(i+2) & 0x3f]; + } + /* END LOOP */ + + // Convert the remaining 1 or 2 bytes, pad out to 4 characters. + if (lengthpad === 2) { + j = length - lengthpad; + result += toBase64Table[data.charCodeAt(j) >> 2]; + result += toBase64Table[((data.charCodeAt(j) & 0x03) << 4) + (data.charCodeAt(j+1) >> 4)]; + result += toBase64Table[(data.charCodeAt(j+1) & 0x0f) << 2]; + result += toBase64Table[64]; + } else if (lengthpad === 1) { + j = length - lengthpad; + result += toBase64Table[data.charCodeAt(j) >> 2]; + result += toBase64Table[(data.charCodeAt(j) & 0x03) << 4]; + result += toBase64Table[64]; + result += toBase64Table[64]; + } + + return result; +}, + +/* Convert Base64 data to a string */ +toBinaryTable : [ + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, + -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,62,-1,-1, + 52,53,54,55, 56,57,58,59, 60,61,-1,-1, -1, 0,-1,-1, + -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10, 11,12,13,14, + 15,16,17,18, 19,20,21,22, 23,24,25,-1, -1,-1,-1,63, + -1,26,27,28, 29,30,31,32, 33,34,35,36, 37,38,39,40, + 41,42,43,44, 45,46,47,48, 49,50,51,-1, -1,-1,-1,-1 +], + +decode: function (data, offset) { + "use strict"; + offset = typeof(offset) !== 'undefined' ? offset : 0; + var toBinaryTable = Base64.toBinaryTable; + var base64Pad = Base64.base64Pad; + var result, result_length, idx, i, c, padding; + var leftbits = 0; // number of bits decoded, but yet to be appended + var leftdata = 0; // bits decoded, but yet to be appended + + // Convert one by one. + /* BEGIN LOOP */ + result = "" + for (idx = 0, i = offset; i < data.length; i++) { + c = toBinaryTable[data.charCodeAt(i) & 0x7f]; + padding = (data.charAt(i) === base64Pad); + // Skip illegal characters and whitespace + if (c === -1) { + console.error("Illegal character code " + data.charCodeAt(i) + " at position " + i); + continue; + } + + // Collect data into leftdata, update bitcount + leftdata = (leftdata << 6) | c; + leftbits += 6; + + // If we have 8 or more bits, append 8 bits to the result + if (leftbits >= 8) { + leftbits -= 8; + // Append if not padding. + if (!padding) { + idx++; + result += String.fromCharCode((leftdata >> leftbits) & 0xff); + } + leftdata &= (1 << leftbits) - 1; + } + } + /* END LOOP */ + + // If there are any bits left, the base64 string was corrupted + if (leftbits) { + throw {name: 'Base64-Error', + message: 'Corrupted base64 string'}; + } + + return result; +} + +}; /* End of Base64 namespace */ -- 1.9.3

4 3

[PATCH 0/4] Let frontend redirect user after logging
by alinefm＠linux.vnet.ibm.com 16 Jul '14

16 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Aline Manera (4): Update test case to reflect new login design Remove former login design files Remove special console rules from nginx configuration Let frontend redirect user after logging src/kimchi/auth.py | 10 +-- src/kimchi/root.py | 19 +---- src/nginx.conf.in | 11 --- tests/test_rest.py | 2 +- ui/css/theme-default/login-window.css | 90 ------------------------ ui/js/src/kimchi.login.js | 64 +++++++++++++++++ ui/js/src/kimchi.login_window.js | 128 ---------------------------------- ui/pages/login-window.html.tmpl | 53 -------------- ui/pages/login.html.tmpl | 36 ++-------- 9 files changed, 72 insertions(+), 341 deletions(-) delete mode 100644 ui/css/theme-default/login-window.css create mode 100644 ui/js/src/kimchi.login.js delete mode 100644 ui/js/src/kimchi.login_window.js delete mode 100644 ui/pages/login-window.html.tmpl -- 1.9.3

3 7

[PATCH 0/3 V2] authorization: Backend changes
by alinefm＠linux.vnet.ibm.com 16 Jul '14

16 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 -> V2: - Add "access" elements to describe role/view for each tab - Return a role map in /login For each tab, a role will be returned. That way we have more flexibility to change user role per tab - Add "access" parameter to VM.lookup() As the user will have full access to the VM assigned to it, return "access=full" for all them Aline Manera (3): authorization: Update /login to return user roles instead of sudo parameter authorization: Add "access" elements to tabs.xml to describe user view authorization: Add "access" parameter to VM resource config/ui/tabs.xml | 15 +++++++++++++++ plugins/sample/ui/config/tab-ext.xml | 3 +++ src/kimchi/auth.py | 19 ++++++++++++++----- src/kimchi/mockmodel.py | 3 ++- src/kimchi/model/vms.py | 3 ++- src/kimchi/utils.py | 15 +++++++++++++++ tests/test_rest.py | 6 ++++++ tests/utils.py | 6 +++--- 8 files changed, 60 insertions(+), 10 deletions(-) -- 1.9.3

4 11

[RFC] filter the users of host system
by Sheldon 16 Jul '14

16 Jul '14

Now kimchi uses host system users to login. In fedora most of system users are not allowed to login. so we should filter them. but in ubuntu, it seems most system user still can login. but their pw_shell are /bin/sh it is softlink to */bin/bash * Now I'd like to just list the users who's pw_shell are /bin/bash Not sure all distribution can works well by this way. I have just checked fedora and ubuntu, seems it can works. so any one can help check if any exception on your distribution? *root:x:0:0:root:/root:/bin/bash* bin:x:1:1:bin:/bin:/sbin/nologin daemon:x:2:2:daemon:/sbin:/sbin/nologin adm:x:3:4:adm:/var/adm:/sbin/nologin lp:x:4:7:lp:/var/spool/lpd:/sbin/nologin sync:x:5:0:sync:/sbin:/bin/sync shutdown:x:6:0:shutdown:/sbin:/sbin/shutdown halt:x:7:0:halt:/sbin:/sbin/halt mail:x:8:12:mail:/var/spool/mail:/sbin/nologin operator:x:11:0:operator:/root:/sbin/nologin games:x:12:100:games:/usr/games:/sbin/nologin ftp:x:14:50:FTP User:/var/ftp:/sbin/nologin nobody:x:99:99:Nobody:/:/sbin/nologin avahi-autoipd:x:170:170:Avahi IPv4LL Stack:/var/lib/avahi-autoipd:/sbin/nologin dbus:x:81:81:System message bus:/:/sbin/nologin polkitd:x:999:999:User for polkitd:/:/sbin/nologin abrt:x:173:173::/etc/abrt:/sbin/nologin usbmuxd:x:113:113:usbmuxd user:/:/sbin/nologin colord:x:998:998:User for colord:/var/lib/colord:/sbin/nologin rtkit:x:172:172:RealtimeKit:/proc:/sbin/nologin geoclue:x:997:996:User for geoclue:/var/lib/geoclue:/sbin/nologin chrony:x:996:995::/var/lib/chrony:/sbin/nologin tss:x:59:59:Account used by the trousers package to sandbox the tcsd daemon:/dev/null:/sbin/nologin unbound:x:995:994:Unbound DNS resolver:/etc/unbound:/sbin/nologin openvpn:x:994:993:OpenVPN:/etc/openvpn:/sbin/nologin avahi:x:70:70:Avahi mDNS/DNS-SD Stack:/var/run/avahi-daemon:/sbin/nologin pulse:x:993:991:PulseAudio System Daemon:/var/run/pulse:/sbin/nologin gdm:x:42:42::/var/lib/gdm:/sbin/nologin gnome-initial-setup:x:992:989::/run/gnome-initial-setup/:/sbin/nologin nm-openconnect:x:991:988:NetworkManager user for OpenConnect:/:/sbin/nologin sshd:x:74:74:Privilege-separated SSH:/var/empty/sshd:/sbin/nologin *shhfeng:x:1000:1000:shhfeng:/home/shhfeng:/bin/bash* qemu:x:107:107:qemu user:/:/sbin/nologin rpc:x:32:32:Rpcbind Daemon:/var/lib/rpcbind:/sbin/nologin radvd:x:75:75:radvd user:/:/sbin/nologin rpcuser:x:29:29:RPC Service User:/var/lib/nfs:/sbin/nologin nfsnobody:x:65534:65534:Anonymous NFS User:/var/lib/nfs:/sbin/nologin saslauth:x:990:76:"Saslauthd user":/run/saslauthd:/sbin/nologin *guest:x:1001:1001::/home/guest:/bin/bash* nginx:x:989:984:Nginx web server:/var/lib/nginx:/sbin/nologin but in ubuntu, it seems most system user still can login. but their pw_shell are /bin/sh it is softlink to */bin/bash* *root:x:0:0:root:/root:/bin/bash* daemon:x:1:1:daemon:/usr/sbin:/bin/sh bin:x:2:2:bin:/bin:/bin/sh sys:x:3:3:sys:/dev:/bin/sh sync:x:4:65534:sync:/bin:/bin/sync games:x:5:60:games:/usr/games:/bin/sh man:x:6:12:man:/var/cache/man:/bin/sh lp:x:7:7:lp:/var/spool/lpd:/bin/sh mail:x:8:8:mail:/var/mail:/bin/sh news:x:9:9:news:/var/spool/news:/bin/sh uucp:x:10:10:uucp:/var/spool/uucp:/bin/sh proxy:x:13:13:proxy:/bin:/bin/sh www-data:x:33:33:www-data:/var/www:/bin/sh backup:x:34:34:backup:/var/backups:/bin/sh list:x:38:38:Mailing List Manager:/var/list:/bin/sh irc:x:39:39:ircd:/var/run/ircd:/bin/sh gnats:x:41:41:Gnats Bug-Reporting System (admin):/var/lib/gnats:/bin/sh nobody:x:65534:65534:nobody:/nonexistent:/bin/sh libuuid:x:100:101::/var/lib/libuuid:/bin/sh syslog:x:101:103::/home/syslog:/bin/false messagebus:x:102:105::/var/run/dbus:/bin/false usbmux:x:103:46:usbmux daemon,,,:/home/usbmux:/bin/false dnsmasq:x:104:65534:dnsmasq,,,:/var/lib/misc:/bin/false avahi-autoipd:x:105:111:Avahi autoip daemon,,,:/var/lib/avahi-autoipd:/bin/false kernoops:x:106:65534:Kernel Oops Tracking Daemon,,,:/:/bin/false rtkit:x:107:113:RealtimeKit,,,:/proc:/bin/false whoopsie:x:108:114::/nonexistent:/bin/false speech-dispatcher:x:109:29:Speech Dispatcher,,,:/var/run/speech-dispatcher:/bin/sh avahi:x:110:116:Avahi mDNS daemon,,,:/var/run/avahi-daemon:/bin/false lightdm:x:111:117:Light Display Manager:/var/lib/lightdm:/bin/false pulse:x:112:119:PulseAudio daemon,,,:/var/run/pulse:/bin/false hplip:x:113:7:HPLIP system user,,,:/var/run/hplip:/bin/false colord:x:114:122:colord colour management daemon,,,:/var/lib/colord:/bin/false saned:x:115:123::/home/saned:/bin/false *royce:x:1000:1000:royce,,,:/home/royce:/bin/bash* libvirt-qemu:x:116:126:Libvirt Qemu,,,:/var/lib/libvirt:/bin/false libvirt-dnsmasq:x:117:125:Libvirt Dnsmasq,,,:/var/lib/libvirt/dnsmasq:/bin/false statd:x:118:65534::/var/lib/nfs:/bin/false sshd:x:119:65534::/var/run/sshd:/usr/sbin/nologi -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

4 6

[PATCH v5 00/10] Debug Report Rename Feature
by Hongliang Wang 15 Jul '14

15 Jul '14

Enable debug report rename feature in this patch set. Please apply the following patch set first: * [PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate v4 -> v5: 5a) Implemented mock model (Aline's comment) 5b) Implemented test code (Aline's comment) v3 -> v4: 4a) Updated according to dependency changes v2 -> v3: 3a) Added check for name existence when renaming a report (Yu Xin's comment) v1 -> v2: 2a) Retrieved the Right Generated Time for Debug Report (Wen Wang's comment) 2b) Sorted debug reports by Generated Time Descendingly (Wen Wang's comment) 2c) Enabled Form Fields after Request Processed (Yuxin's comment) Hongliang Wang (9): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report: Use Generated Time instead of Most Changed Time Debug Report: Sort Reports by Generated Time Descendingly Debug Report Rename UI: Add API in kimchi.api.js Debug Report Rename UI: Add Rename Page Debug Report Rename UI: Enable Rename in Host Tab Debug Report: Update MockModel Royce Lv (1): Debug Report Rename: Update Test Code docs/API.md | 3 ++ src/kimchi/API.json | 11 +++++++ src/kimchi/control/debugreports.py | 8 ++++- src/kimchi/mockmodel.py | 18 +++++++++++- src/kimchi/model/debugreports.py | 18 +++++++++++- tests/test_model.py | 7 ++++- tests/test_rest.py | 6 +++- ui/css/theme-default/report-rename.css | 22 ++++++++++++++ ui/js/src/kimchi.api.js | 12 ++++++++ ui/js/src/kimchi.host.js | 35 +++++++++++++++------- ui/js/src/kimchi.report_rename_main.js | 41 ++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 ++++++++++++++++++++++++++++++++++ 12 files changed, 218 insertions(+), 16 deletions(-) create mode 100644 ui/css/theme-default/report-rename.css create mode 100644 ui/js/src/kimchi.report_rename_main.js create mode 100644 ui/pages/report-rename.html.tmpl -- 1.8.1.4

2 24

[PATCH v6 00/10] Debug Report Rename Feature
by Hongliang Wang 15 Jul '14

15 Jul '14

Enable debug report rename feature in this patch set. Please apply the following patch set first: * [PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate v5 -> v6: 6a) Updated regexp of report name in API.json (Aline's comment) 6b) Updated license statement (Aline's comment) v4 -> v5: 5a) Implemented mock model (Aline's comment) 5b) Implemented test code (Aline's comment) v3 -> v4: 4a) Updated according to dependency changes v2 -> v3: 3a) Added check for name existence when renaming a report (Yu Xin's comment) v1 -> v2: 2a) Retrieved the Right Generated Time for Debug Report (Wen Wang's comment) 2b) Sorted debug reports by Generated Time Descendingly (Wen Wang's comment) 2c) Enabled Form Fields after Request Processed (Yuxin's comment) Hongliang Wang (9): Debug Report Rename: Update API.json Debug Report Rename: Update API.md Debug Report Rename: Implement Back-end Debug Report: Use Generated Time instead of Most Changed Time Debug Report: Sort Reports by Generated Time Descendingly Debug Report Rename UI: Add API in kimchi.api.js Debug Report Rename UI: Add Rename Page Debug Report Rename UI: Enable Rename in Host Tab Debug Report: Update MockModel Royce Lv (1): Debug Report Rename: Update Test Code docs/API.md | 3 ++ src/kimchi/API.json | 11 +++++++ src/kimchi/control/debugreports.py | 8 ++++- src/kimchi/mockmodel.py | 18 ++++++++++- src/kimchi/model/debugreports.py | 18 ++++++++++- tests/test_model.py | 7 +++- tests/test_rest.py | 6 +++- ui/css/theme-default/report-rename.css | 39 +++++++++++++++++++++++ ui/js/src/kimchi.api.js | 12 +++++++ ui/js/src/kimchi.host.js | 35 +++++++++++++------- ui/js/src/kimchi.report_rename_main.js | 58 ++++++++++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 +++++++++++++++++++++++++++++++ 12 files changed, 252 insertions(+), 16 deletions(-) create mode 100644 ui/css/theme-default/report-rename.css create mode 100644 ui/js/src/kimchi.report_rename_main.js create mode 100644 ui/pages/report-rename.html.tmpl -- 1.8.1.4

2 12

[PATCH 0/2] Bug Fixes: Mock Model with Debug Report Generate
by Hongliang Wang 14 Jul '14

14 Jul '14

Fixed 2 bugs: 1). When in mock model, generate report doesn't work if report name is left as blank. 2). When in mock model, generate report window will never disappear even after the report is generated. Hongliang Wang (2): MockModel: Can't Generate Report if Name is not Given Debug Report UI: Generate Report Doesn't Work with Mock Model src/kimchi/mockmodel.py | 8 +++++++- ui/js/src/kimchi.report_add_main.js | 39 ++++++++++++++++++++----------------- 2 files changed, 28 insertions(+), 19 deletions(-) -- 1.8.1.4

2 5

[PATCH 0/2 V2] Add option to add/remove fonts files in rpm packages
by alinefm＠linux.vnet.ibm.com 14 Jul '14

14 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> V1 - V2: - Remove useless fonts - Set SUBDIRS according to FONTS (Zheng Sheng) - Set --enable-fonts as default behavior - Explict verify with_fonts value to enable its use outside make process - Add the same behavior to suse spec file Aline Manera (1): Remove useless fonts ShaoHe Feng (1): Add option to add/remove fonts files in rpm packages Makefile.am | 8 +++++++- configure.ac | 12 ++++++++++++ contrib/kimchi.spec.fedora.in | 19 ++++++++++++++----- contrib/kimchi.spec.suse.in | 11 ++++++++++- ui/css/Makefile.am | 6 +++++- ui/css/fonts/Makefile.am | 4 ---- ui/css/fonts/fontawesome-webfont.eot | Bin 25395 -> 0 bytes ui/css/fonts/fontawesome-webfont.ttf | Bin 55096 -> 0 bytes ui/css/fonts/fontawesome-webfont.woff | Bin 29380 -> 0 bytes 9 files changed, 48 insertions(+), 12 deletions(-) delete mode 100644 ui/css/fonts/fontawesome-webfont.eot delete mode 100644 ui/css/fonts/fontawesome-webfont.ttf delete mode 100644 ui/css/fonts/fontawesome-webfont.woff -- 1.9.3

3 5

[PATCH v7 0/4] Host device passthrough: Summary
by Zhou Zheng Sheng 14 Jul '14

14 Jul '14

Hi, This patch series is to enable Kimchi to assign hos devices directly to a VM, thus greately improve VM performance. Currently we support assigning PCI device, USB device and SCSI LUN. For example, we can assign an NIC to VM to improve guest network throughput, or passthrough a USB camera to enable the guest OS to record video. Host devices form a tree. We can assign most of the devices in the tree to VM. By assigning a device, all the devices in its sub-tree are also assigned. It might not make sense to assign a USB controller, because the host may be using one of the devices connected to the controller. Instead, Kimchi just presents the "leaf" devices to assign to guest. In recent Linux kernel and KVM, it is able to recognize the IOMMU group of a PCI device. The "leaf" PCI devices in the same IOMMU group should be assigned and dismissed together. The IOMMU group is the actual smallest isolation granularity of the PCI devices. The first patch is to list all host devices information. It's useful on its own to show host devices information. The second patch is to list all eligible host devices to assign, as well as the "affected" devices in the same IOMMU group. The third patch creates a sub-collection "hostdevs" to the VM resource, and deals with assigning and dismissing devices. The fourth patch adds a sub-collection "vm_holders" to the host device resource. It's to list all VMs that are holding the device. I'll update API and unit test once everyone is happy with the interface and logic. v7: Some minor coding style improvements. v6: Do not passthrough PCI device of class code 0x07. It might contains system device not suitable to assign to guest. v5: Filter ealigible pci devices according to pci class. When assigning a device to VM, check if there are other VMs holding it. Use "kimchi.model.utils.get_vm_config_flag()" to correctly set the device attaching API flag. v4: Add new sub-collection to host device to list the VMs holding the device. v3: Fix a small naming error introduced by rebase. v2: Handle the devices in VM's sub-collection "hostdevs". v1: Handle the devices in VM template. Zhou Zheng Sheng (4): Host device passthrough: List all types of host devices Host device passthrough: List eligible device to passthrough Host device passthrough: Directly assign and dissmis host device from VM Host device passthrough: List VMs that are holding a host device docs/API.md | 11 +- src/kimchi/control/host.py | 16 ++ src/kimchi/control/vm/hostdevs.py | 44 +++++ src/kimchi/featuretests.py | 10 +- src/kimchi/hostdev.py | 311 +++++++++++++++++++++++++++++++ src/kimchi/i18n.py | 9 + src/kimchi/mockmodel.py | 7 +- src/kimchi/model/config.py | 2 + src/kimchi/model/host.py | 32 ++-- src/kimchi/model/libvirtstoragepool.py | 18 +- src/kimchi/model/vmhostdevs.py | 323 +++++++++++++++++++++++++++++++++ src/kimchi/rollbackcontext.py | 3 + src/kimchi/xmlutils.py | 26 ++- tests/test_rest.py | 6 +- tests/test_storagepool.py | 7 +- 15 files changed, 786 insertions(+), 39 deletions(-) create mode 100644 src/kimchi/control/vm/hostdevs.py create mode 100644 src/kimchi/hostdev.py create mode 100644 src/kimchi/model/vmhostdevs.py -- 1.9.3

2 15

[PATCH] Have the quote deleted from the url located in "lastPage"
by wenwang＠linux.vnet.ibm.com 14 Jul '14

14 Jul '14

From: Wen Wang <wenwang(a)linux.vnet.ibm.com> Enabled Redirection for reload by having the quote deleted from the url located in "lastPage" Signed-off-by: Wen Wang <wenwang(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.login.js | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/ui/js/src/kimchi.login.js b/ui/js/src/kimchi.login.js index a547999..0c11e45 100644 --- a/ui/js/src/kimchi.login.js +++ b/ui/js/src/kimchi.login.js @@ -55,7 +55,7 @@ kimchi.login_main = function() { } else { // lastPage is displayed with " ". How to exclude " " from string? - var lastPage = kimchi.cookie.get('lastPage'); + var lastPage = kimchi.cookie.get('lastPage').replace(/\"/g,''); var next_url = lastPage ? lastPage : "/" } window.location.replace(next_url) -- 1.7.1

1 0

[PATCH 0/2] Doc and testcases: Create template from image
by lvroyce＠linux.vnet.ibm.com 13 Jul '14

13 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> This patch is to present the api definition and clean original cdrom based template creation implementation. Royce Lv (2): Change doc and api specification Change 'cdrom' to a optional param docs/API.md | 3 ++- src/kimchi/API.json | 8 +++++++- src/kimchi/control/templates.py | 2 +- src/kimchi/i18n.py | 3 ++- src/kimchi/mockmodel.py | 26 ++++++++++++++++++++------ src/kimchi/model/templates.py | 13 ++++++++----- src/kimchi/vmtemplate.py | 12 ++++++++++-- tests/test_rest.py | 2 +- 8 files changed, 51 insertions(+), 18 deletions(-) -- 1.8.3.2

3 6

[PATCHv2] Add image probe function
by lvroyce＠linux.vnet.ibm.com 13 Jul '14

13 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> v1>v2, Add handling exception. Image file probe will be used in identify image file os info and generate reasonable configuration for it. This will be useful when import image and create a vm from it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++--- src/kimchi/exception.py | 4 ++++ src/kimchi/i18n.py | 4 ++++ src/kimchi/imageinfo.py | 48 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+), 3 deletions(-) create mode 100644 src/kimchi/imageinfo.py diff --git a/docs/README.md b/docs/README.md index ab03918..24537e1 100644 --- a/docs/README.md +++ b/docs/README.md @@ -54,7 +54,8 @@ Install Dependencies qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ iscsi-initiator-utils libxslt pyparted nginx \ - policycoreutils-python + policycoreutils-python python-libguestfs \ + libguestfs-tools # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -76,7 +77,8 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted nginx firewalld + open-iscsi lvm2 xsltproc python-parted nginx \ + firewalld python-guestfs libguestfs-tools Packages version requirement: python-jsonschema >= 1.3.0 @@ -90,7 +92,8 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted \ + python-libguestfs guestfs-tools Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..6b4c913 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -89,5 +89,9 @@ class IsoFormatError(KimchiException): pass +class ImageFormatError(KimchiException): + pass + + class TimeoutExpired(KimchiException): pass diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..daeeed8 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -61,6 +61,10 @@ messages = { "'%(user)s' to the ISO path group, or (not recommended) 'chmod -R o+x 'path_to_iso'." "Details: %(err)s" ), + "KCHIMG0001E": _("Error occurs when probing image os information."), + "KCHIMG0002E": _("No os information found in given image."), + "KCHIMG0003E": _("Unable to find/read image file %(filename)s"), + "KCHVM0001E": _("Virtual machine %(name)s already exists"), "KCHVM0002E": _("Virtual machine %(name)s does not exist"), "KCHVM0003E": _("Unable to rename virtual machine %(name)s. The name %(new_name)s already exists or it is not powered off."), diff --git a/src/kimchi/imageinfo.py b/src/kimchi/imageinfo.py new file mode 100644 index 0000000..26a9480 --- /dev/null +++ b/src/kimchi/imageinfo.py @@ -0,0 +1,48 @@ +# +# Kimchi +# +# Copyright IBM Corp, 2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import os +import sys +import guestfs + +from kimchi.exception import ImageFormatError + +def probe_image(image_path): + g = guestfs.GuestFS(python_return_dict=True) + g.add_drive_opts(image_path, readonly=1) + g.launch() + if not os.access(image_path, os.R_OK): + raise ImageFormatError("KCHIMG0003E", {'filename': image_path}) + try: + roots = g.inspect_os() + except: + raise ImageFormatError("KCHIMG0001E") + if len(roots) == 0: + raise ImageFormatError("KCHIMG0002E") + + for root in roots: + version = "%d.%d" % (g.inspect_get_major_version(root), + g.inspect_get_minor_version(root)) + distro = "%s" % (g.inspect_get_distro(root)) + + return (distro, version) + + +if __name__ == '__main__': + print probe_image(sys.argv[1]) -- 1.8.3.2

3 2

[PATCH 0/2] authorization: Backend changes
by alinefm＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> This patchset provides the backend changes discussed in "[Kimchi-devel] RFC: Design of Authorization in Kimchi" Aline Manera (2): authorization: Update /login to return user roles instead of sudo parameter authorization: Add "mode" attribute to describe user view config/ui/tabs.xml | 10 +++++----- src/kimchi/auth.py | 12 ++++++++---- tests/test_rest.py | 6 ++++++ tests/utils.py | 6 +++--- 4 files changed, 22 insertions(+), 12 deletions(-) -- 1.9.3

3 7

[PATCH V2] add an option do not build fonts files in rpm packages
by shaohef＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> ui/css/fonts/novnc/Makefile and ui/css/fonts/Makefile will not install fonts when build fonts are disabled. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 6 +++++- configure.ac | 12 ++++++++++++ contrib/kimchi.spec.fedora.in | 4 +++- ui/css/fonts/Makefile.am | 4 ++++ ui/css/fonts/novnc/Makefile.am | 4 ++++ 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9785de9..e6ff673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,10 @@ SUBDIRS = src ui docs contrib tests po config plugins +if FONTS +WITH_FONTS = --define="with_fonts 1" +endif + ACLOCAL_AMFLAGS = --install -I m4 EXTRA_DIST = \ @@ -134,7 +138,7 @@ rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES - rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + rpmbuild -ba $(WITH_FONTS) --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec fedora-rpm: contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec diff --git a/configure.ac b/configure.ac index e5e6441..43cf35f 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,18 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +AC_ARG_ENABLE( + [fonts], + [AS_HELP_STRING( + [--enable-fonts], + [Build fonts files in package @<:@default=no@:>@] + )], + , + [enable_fonts="no"] +) + +AM_CONDITIONAL([FONTS], [test "${enable_fonts}" = "yes"]) + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 993fd6f..4e863f5 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -61,7 +61,7 @@ Web server application to manage KVM/Qemu virtual machines %build -%configure +%configure %{?with_fonts:--enable-fonts} make @@ -154,8 +154,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/doc/kimchi-templates.png %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml +%if 0%{?with_fonts} %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.* %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* +%endif %{_datadir}/kimchi/ui/css/novnc/base.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png diff --git a/ui/css/fonts/Makefile.am b/ui/css/fonts/Makefile.am index 63df038..1de082f 100644 --- a/ui/css/fonts/Makefile.am +++ b/ui/css/fonts/Makefile.am @@ -19,4 +19,8 @@ SUBDIRS = novnc fontdir = $(datadir)/kimchi/ui/css/fonts +if FONTS dist_font_DATA = fontawesome-webfont.* +else +dist_noinst_DATA = fontawesome-webfont.* +endif diff --git a/ui/css/fonts/novnc/Makefile.am b/ui/css/fonts/novnc/Makefile.am index 50f6050..31c428e 100644 --- a/ui/css/fonts/novnc/Makefile.am +++ b/ui/css/fonts/novnc/Makefile.am @@ -17,4 +17,8 @@ fontdir = $(datadir)/kimchi/ui/css/fonts/novnc +if FONTS dist_font_DATA = Orbitron700.* +else +dist_noinst_DATA = Orbitron700.* +endif -- 1.9.3

3 2

[PATCH] add an option do not build fonts files in rpm packages
by shaohef＠linux.vnet.ibm.com 11 Jul '14

11 Jul '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> configure will do not generate ui/css/fonts/novnc/Makefile and ui/css/fonts/Makefile when build fonts are disabled. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Zhou Zheng Sheng <zhshzhou(a)linux.vnet.ibm.com> --- Makefile.am | 6 +++++- configure.ac | 24 ++++++++++++++++++++++-- contrib/kimchi.spec.fedora.in | 4 +++- ui/css/Makefile.am | 4 ++++ 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 9785de9..e6ff673 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,10 @@ SUBDIRS = src ui docs contrib tests po config plugins +if FONTS +WITH_FONTS = --define="with_fonts 1" +endif + ACLOCAL_AMFLAGS = --install -I m4 EXTRA_DIST = \ @@ -134,7 +138,7 @@ rpm: dist kimchi.spec $(MKDIR_P) rpm/BUILD rpm/RPMS rpm/SOURCES rpm/SPECS rpm/SRPMS cp $(top_srcdir)/kimchi.spec rpm/SPECS/kimchi.spec cp $(DIST_ARCHIVES) rpm/SOURCES - rpmbuild -ba --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec + rpmbuild -ba $(WITH_FONTS) --define "_topdir `pwd`/rpm" rpm/SPECS/kimchi.spec fedora-rpm: contrib/kimchi.spec.fedora ln -sf contrib/kimchi.spec.fedora kimchi.spec diff --git a/configure.ac b/configure.ac index e5e6441..2b71cf7 100644 --- a/configure.ac +++ b/configure.ac @@ -64,6 +64,26 @@ else AC_SUBST([ENABLE_SAMPLE], [False]) fi +AC_ARG_ENABLE( + [fonts], + [AS_HELP_STRING( + [--enable-fonts], + [Build fonts files in package @<:@default=no@:>@] + )], + , + [enable_fonts="no"] +) + +AM_CONDITIONAL([FONTS], [test "${enable_fonts}" = "yes"]) + +if test "${enable_fonts}" = "yes"; then +AC_SUBST([ONVNCFONTS], [ui/css/fonts/novnc/Makefile]) +AC_SUBST([UIFONTS], [ui/css/fonts/Makefile]) +else +AC_SUBST([ONVNCFONTS], ['']) +AC_SUBST([UIFONTS], []) +fi + AC_CONFIG_FILES([ po/Makefile.in po/gen-pot @@ -86,8 +106,6 @@ AC_CONFIG_FILES([ ui/Makefile ui/css/Makefile ui/css/novnc/Makefile - ui/css/fonts/Makefile - ui/css/fonts/novnc/Makefile ui/images/Makefile ui/images/theme-default/Makefile ui/js/Makefile @@ -113,6 +131,8 @@ AC_CONFIG_FILES([ tests/Makefile config/Makefile config/ui/Makefile + $UIFONTS + $ONVNCFONTS ],[ chmod +x po/gen-pot ]) diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 993fd6f..4e863f5 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -61,7 +61,7 @@ Web server application to manage KVM/Qemu virtual machines %build -%configure +%configure %{?with_fonts:--enable-fonts} make @@ -154,8 +154,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/doc/kimchi-templates.png %{_datadir}/kimchi/mo/*/LC_MESSAGES/kimchi.mo %{_datadir}/kimchi/config/ui/*.xml +%if 0%{?with_fonts} %{_datadir}/kimchi/ui/css/fonts/fontawesome-webfont.* %{_datadir}/kimchi/ui/css/fonts/novnc/Orbitron700.* +%endif %{_datadir}/kimchi/ui/css/novnc/base.css %{_datadir}/kimchi/ui/css/theme-default.min.css %{_datadir}/kimchi/ui/images/*.png diff --git a/ui/css/Makefile.am b/ui/css/Makefile.am index db65799..020f859 100644 --- a/ui/css/Makefile.am +++ b/ui/css/Makefile.am @@ -15,7 +15,11 @@ # See the License for the specific language governing permissions and # limitations under the License. +if FONTS SUBDIRS = novnc fonts +else +SUBDIRS = novnc +endif EXTRA_DIST = theme-default -- 1.9.3

1 0

[PATCH] Change ISO stream feature test and kvm user test for PPC
by Rodrigo Trujillo 10 Jul '14

10 Jul '14

This patch removes X86 hardcoded tags from test XMLs in order to allow run the tests in PPC machines. It also increases the amount of memory used in User test xml, because PPC only creates VMs with more then 128M. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 2 +- src/kimchi/kvmusertests.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..fd9b7d8 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -37,7 +37,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> + <type>hvm</type> <boot dev='cdrom'/> </os> <devices> diff --git a/src/kimchi/kvmusertests.py b/src/kimchi/kvmusertests.py index 1757725..3a44ae3 100644 --- a/src/kimchi/kvmusertests.py +++ b/src/kimchi/kvmusertests.py @@ -31,9 +31,9 @@ class UserTests(object): <domain type='kvm'> <name>%s</name> <uuid>%s</uuid> - <memory unit='KiB'>10240</memory> + <memory unit='KiB'>262144</memory> <os> - <type arch='x86_64' machine='pc'>hvm</type> + <type>hvm</type> <boot dev='hd'/> </os> </domain>""" -- 1.9.3

3 2

[PATCH 1/2] Add PPC support to ISO Stream feature test
by Rodrigo Trujillo 10 Jul '14

10 Jul '14

This patch removes hardcoded tags from iso stream xml. Tags are related to machine type and architecture and are set in running type. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/featuretests.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py index 5192361..277dd56 100644 --- a/src/kimchi/featuretests.py +++ b/src/kimchi/featuretests.py @@ -20,6 +20,7 @@ import cherrypy import libvirt import lxml.etree as ET +import platform import socket import subprocess import threading @@ -37,7 +38,7 @@ ISO_STREAM_XML = """ <name>ISO_STREAMING</name> <memory unit='KiB'>1048576</memory> <os> - <type arch='x86_64' machine='pc-1.2'>hvm</type> + <type arch='%(arch)s' machine='%(machine)s'>hvm</type> <boot dev='cdrom'/> </os> <devices> @@ -100,7 +101,14 @@ class FeatureTests(object): @staticmethod def libvirt_supports_iso_stream(protocol): - xml = ISO_STREAM_XML % {'protocol': protocol} + if platform.machine().startswith('ppc'): + arch = "ppc64" + machine = "pseries" + else: + arch = "x86_64" + machine = "pc-1.2" + xml = ISO_STREAM_XML % {'protocol': protocol, 'arch': arch, + 'machine': machine} conn = None try: FeatureTests.disable_screen_error_logging() -- 1.9.3

3 7

[PATCH] Update API.md to reflect /host/users and /host/groups API
by alinefm＠linux.vnet.ibm.com 10 Jul '14

10 Jul '14

From: Aline Manera <alinefm(a)linux.vnet.ibm.com> Commit fe2fd1db added the functionalities to list system users and groups but forgot to update the API.md Fix it. Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com> --- docs/API.md | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/docs/API.md b/docs/API.md index 4f51dd0..75b933c 100644 --- a/docs/API.md +++ b/docs/API.md @@ -763,6 +763,24 @@ Contains information of host. * swupdate: Start the update of packages in background and return a Task resource * task resource. * See Resource: Task * +### Resource: Host users + +**URI:** /host/users +List of system users in the host. + +**Methods:** + +* **GET**: Retrieve list of system users in the host. + +### Resource: Host groups + +**URI:** /host/groups +List of system groups in the host. + +**Methods:** + +* **GET**: Retrieve list of system groups in the host. + ### Resource: HostStats **URI:** /host/stats -- 1.9.3

3 2

RFC: Design of Authorization in Kimchi
by Wen Wang 09 Jul '14

09 Jul '14

Hi all, Due to the fact that Kimchi needs authorization feature to be designed. I an posting my point of view below of how I thought about doing it, including how I plan doing it in the front-end and request for help for the back end support. Kimchi changed to a traditional login patten in last release that makes Kimchi more secure to use. It Before login, the front-end can hardly get any html information before user actually login. As we discussed, root user will have full access to Kimchi whereas the non-root user will have restricted privileges. It will be easier and more decent to show the proper tabs to certain users that distinguished by the back-end. Now the tabs are generated by an xml file generated from the back-end that show all 5 tabs. We probably need to have the '*Host*' and '*template*' tab_removed_ for non-root users, which is recommended to be done in the back-end. Also there need to be information provided to the front-end like the user-name, user-role as well as user-group, etc. that indicate user identity after login. The browser need the information to give certain privileges to certain users and disable the unnecessary functions. My suggestion is to have these 3 parameters passed: ***user-name, user-role* as well as *user-group*. There is a better extendibility to user the user-role other than isRoot so that we can define more roles in the future. As fact that we have only defined two roles now, the user-role parameter can be divided into root and guest based on user is root or non-root. These message can get from *sessiondada*, *cookie *or passed according to a query. the way passing the info of the user is still under discussion. Request for your advises. Best Regards Wang Wen

3 7

Authorization: allow root user specify users/groups to a VM
by Yu Xin Huo 08 Jul '14

08 Jul '14

I tried below: On my linux workstation, I only created 2 users: 'root' and 'tify'. Most of users and groups below look like system users and groups target for quite specific purpose. Can we do some filtering to only get users and groups that truly related to VM assignment? curl -k -u root:pass -H "Content-Type: applicaion/json" -H "Accept: application/json" https://localhost:8001/host/users [ "root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt", "mail", "uucp", "operator", "games", "gopher", "ftp", "nobody", "dbus", "usbmuxd", "rpc", "vcsa", "rtkit", "avahi-autoipd", "saslauth", "postfix", "rpcuser", "nfsnobody", "ntp", "apache", "radvd", "haldaemon", "qemu", "pulse", "gsanslcd", "nm-openconnect", "gdm", "sshd", "tcpdump", "tify", "nginx" ] curl -k -u root:pass -H "Content-Type: applicaion/json" -H "Accept: application/json" https://localhost:8001/host/groups [ "root", "bin", "daemon", "sys", "adm", "tty", "disk", "lp", "mem", "kmem", "wheel", "mail", "uucp", "man", "games", "gopher", "video", "dip", "ftp", "lock", "audio", "nobody", "users", "dbus", "utmp", "utempter", "usbmuxd", "rpc", "avdefs", "floppy", "vcsa", "desktop_admin_r", "desktop_user_r", "rtkit", "avahi-autoipd", "cdrom", "tape", "dialout", "wbpriv", "cgred", "saslauth", "postdrop", "postfix", "rpcuser", "nfsnobody", "ntp", "apache", "radvd", "haldaemon", "kvm", "qemu", "pulse", "pulse-access", "fuse", "ldap", "nm-openconnect", "gdm", "stapusr", "stapsys", "stapdev", "sshd", "tcpdump", "slocate", "tify", "screen", "nginx" ]

2 2

[RFC] discover Kimchi peers
by Sheldon 08 Jul '14

08 Jul '14

I'd like to talk about how to discover Kimchi peers. Now I just talk about discover a peer in a same network here. I will use a local multicast subnetwork address <http://en.wikipedia.org/wiki/Multicast_address#Local_subnetwork> to find peers in one network. Choose 224.0.0.132 as the kimchi multicast address, and 8000 as the port. For cross network that need the router support multicast, so I give up discover a peer cross network. I will let user add the remote peers manully. In the whole system all peers are equal. There will not be a center discover service. We will define two kinds of multicast message Notify and Search. the format as follow. # ____________________________________________ # | head | message body | tail | # |___________________|_________________|______| # |sizeof(messageBody)| json message | EOL | # |___________________|_________________|______| the flow of discover Kimchi peers: 1. one host multicast a "search" message. in this message it tell himself information, and ask others tell their information. Like this: {"search": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this means "hello, I'm a kimchi host, this is my information, can you tell me who you are?" 2. others received a search will response an "notify" message. Like this: {"notify": {"domain": "kimchi-host1", "IP": "192.168.0.3", "httpport": "8000", "httpsport": "8001"}} this tells others that "hi, I'm a kimchi host, I'm alive and this is my information" o (user) 1 is "search" /\ --------> 2 is "notify" | 1 _____ ________________ kimchi-host1 ------2-<---| DB |<----2-----|multicast listen |<--2-- | |____| |_______________| | ----------------------1-------------------------------> | | _____ |_____ | | | switch | | | |___________| o (user) | /\ --------- -----------------------------2----------------------- --->| | | _____ ________________ | kimchi-host3 ------1<---| DB |<---1------|multicast listen |<---1--| |____| |_______________| we need to discuss: 1. should we support beat heart? every kimchi host will send periodic notify to tell others himself information? 2. should we support a "quit" message? "quit" message tell other peers, that this kimchi quit normally. others can remove this from peers list. But the kimchi can not send "quit" when aborting abnormally. 3. Do we store the local peers information in DB? we can collection the local peers and send them immediately when user need to discover the peers. We will extend to support remote peers, these information need to be stored in DB. -- Thanks and best regards! Sheldon Feng(???)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 8

[RFC] create an image from VM for OOTB storage pool
by Sheldon 08 Jul '14

08 Jul '14

Now OOTB ISO pool is available. we can copy an base image to OOTB ISO pool from VM. There will useful for when user want to create a image from an existing VM. User create a VM and configure this VM. He want to create several VMs with this VM. There are two ways for him. 1. use backing store (http://libvirt.org/formatstorage.html#StorageVolBacking) for the existing img 2. create an base image to OOTB ISO pool from the existing VM. When are are snapshots on the VM base image. we should merge the all snapshots and the base image. Then he can create a template from this image. And create a VM from this template. -- Thanks and best regards! Sheldon Feng(冯少合)<shaohef(a)linux.vnet.ibm.com> IBM Linux Technology Center

3 4

[PATCH] Update README.md to introduce startup script
by Ding xiao 08 Jul '14

08 Jul '14

We use different startup script in different system, so it's nessesary introduce them. Signed-off-by: Ding xiao <ssdxiao(a)163.com> --- docs/README.md | 15 +++++++++++++++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/docs/README.md b/docs/README.md index ab03918..dbefae3 100644 --- a/docs/README.md +++ b/docs/README.md @@ -114,6 +114,21 @@ Run $ sudo kimchid --host=0.0.0.0 +Use startup script in different system +---------------------------------------- + +Fedora: + $ systemctl start kimchid.service + $ systemctl stop kimchid.service + +Suse or Centos5: + $ service start kimchid + $ service stop kimchid + +Centos6 or Debian: + $ start kimchid + $ stop kimchid + Usage ----- -- 1.7.1

3 2

[PATCH v3 1/2] UI changes to allow underscore in debug report name.
by Christy Perez 07 Jul '14

07 Jul '14

New message on the debug report creation screen now says that underscore ('_') characters are allowed, as well as hyphens ('-'). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/en_US.po | 12 ++++++------ po/pt_BR.po | 13 ++++++------- po/zh_CN.po | 12 ++++++------ src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 2 +- ui/js/src/kimchi.report_add_main.js | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 7b66eb2..933d4eb 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -703,9 +703,9 @@ msgid "You should give a name for the debug file report." msgstr "You should give a name for the debug file report." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." #, python-format msgid "" @@ -1317,8 +1317,8 @@ msgstr "Rename" msgid "Download" msgstr "Download" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Report name should contain only letters, digits and/or hyphen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." msgid "Pending..." msgstr "Pending..." @@ -1503,10 +1503,10 @@ msgstr "Report Name" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgid "Add a Repository" msgstr "Add a Repository" diff --git a/po/pt_BR.po b/po/pt_BR.po index b0884b4..f43a1c4 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -748,10 +748,9 @@ msgid "You should give a name for the debug file report." msgstr "Você deve dar um nome para o arquivo do relatório de debug." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Nome deve ser uma string. Somente letras, digitos e hífem ('-') são " -"permitidos." +"Nome deve ser uma string. Somente letras, digitos, underscore ('_') e hífem ('-') são permitidos." #, python-format msgid "" @@ -1382,8 +1381,8 @@ msgstr "Renomear" msgid "Download" msgstr "Baixar" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Nome do relatório deve apenas conter letras, números e/ou hífen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Nome do relatório deve apenas conter letras, números, underscore ('_') e/ou hífen ('-')." msgid "Pending..." msgstr "Pendente..." @@ -1568,10 +1567,10 @@ msgstr "Nome do Relatório" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "Se o nome do relatório for omitido, será escolhido um nome baseado no " -"horário atual. O nome pode conter: letras, números e hífen ('-')." +"horário atual. O nome pode conter: letras, números, underscore ('_') e hífen ('-')." msgid "Add a Repository" msgstr "Adicionar um Repositório" diff --git a/po/zh_CN.po b/po/zh_CN.po index 272dd51..9e623c5 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -680,8 +680,8 @@ msgid "You should give a name for the debug file report." msgstr "应该为诊断文件报告指定一个名字。" msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." -msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." +msgstr "名字必须是一个字符串。只允许字母、数字、下划线 ('_') 和连字符 ('-')。" #, python-format msgid "" @@ -1270,8 +1270,8 @@ msgstr "重命名" msgid "Download" msgstr "下载" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "报告名字中只能包含字母、数字或连字符（-）。" +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "报告名字中只能包含字母、数字、下划线('_')和连字符('-')" msgid "Pending..." msgstr "正在加载..." @@ -1441,10 +1441,10 @@ msgstr "诊断报告名" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包" -"含字母、数字和连字符（-）" +"含字母、数字、下划线 ('_') 和连字符（-）" msgid "Add a Repository" msgstr "增加一个软件仓库" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..d635d2c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -36,7 +36,7 @@ "name": { "description": "The name for the debug report file.", "type": "string", - "pattern": "^[A-Za-z0-9-]*$", + "pattern": "^[_A-Za-z0-9-]*$", "error": "KCHDR0007E" } } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..0c76145 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -206,7 +206,7 @@ "KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"), "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"), "KCHDR0006E": _("You should give a name for the debug file report."), - "KCHDR0007E": _("Name should be a string. Only letters, digits and hyphen ('-') are allowed."), + "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 43484f5..f64b879 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -41,7 +41,7 @@ kimchi.report_add_main = function() { return false; } var reportName = nameTextbox.val(); - var validator = RegExp("^[A-Za-z0-9-]*$"); + var validator = RegExp("^[_A-Za-z0-9-]*$"); if (!validator.test(reportName)) { kimchi.message.error.code('KCHDR6011M'); return false; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d765cf2..c6f4e8c 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -113,7 +113,7 @@ "KCHDR6008M": "$_("Rename")", "KCHDR6009M": "$_("Remove")", "KCHDR6010M": "$_("Download")", - "KCHDR6011M": "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")", "KCHDR6012M": "$_("Pending...")", "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index b7209fe..74ef313 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -35,7 +35,7 @@ </h2> <div class="field"> <span> - $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits and hyphen (\"-\").") + $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, underscore (\"_\") and hyphen (\"-\").") </span> <input type="text" class="text" id="report-name-textbox" name="name" /> </div> -- 1.9.3

2 4

The Independence Day - Ginger is now public!
by Paulo Ricardo Paz Vital 07 Jul '14

07 Jul '14

Hello. It's a pleasure to announce that today, July 4th - the Independence Day, Ginger project, a Kimchi plugin for host management, becomes a public open source project! The project will use the following public infrastructure: Code: GitHub https://github.com/kimchi-project/ginger Mailing List: ginger-dev(a)yahoogroups.com Send an email to ginger-dev-subscribe(a)yahoogroups.com to join the mailing list. Thanks to everyone who has contributed to this exciting milestone for this project! -- Paulo Ricardo Paz Vital <pvital(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 1

[PATCH v3] Add SUSE's products
by Dinar valeev 07 Jul '14

07 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..39c9163 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '11'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

3 2

[PATCH v2 0/2] Keep UI Consistent in Guest Edit Window
by Hongliang Wang 07 Jul '14

07 Jul '14

Make guest cdrom edit UI consistent with guest interface edit UI. The key point is to edit cdrom properties in place. Because there is only one property can be updated for a cdrom, it works fine this way. Though another inconsistence comes up that in the same storage tab, there is also lines for disks, which have more editable properties and it's not that easy to make all of these properties stay in one line. So for disks, possibly we still need provide another window to let users update properties. So here are 2 choices: C1) Apply this PATCH v2 to keep cdrom consistent with interface C2) Apply PATCH v1 to keep cdrom consistent with disk Both are OK for me. v1 -> v2: 2a) Made updating cdrom properties in place (Aline's comment) Hongliang Wang (2): Adjust Guest Edit Storage Tab Styles Remove Unused Files ui/css/theme-default/guest-cdrom-edit.css | 57 ------------ ui/css/theme-default/guest-edit.css | 99 +++++++------------- ui/images/theme-default/guest-icon-sprite.png | Bin 6748 -> 0 bytes ui/js/src/kimchi.guest_cdrom_edit_main.js | 85 ------------------ ui/js/src/kimchi.guest_edit_main.js | 125 +++++++++++++++++++++----- ui/pages/guest-cdrom-edit.html.tmpl | 70 --------------- ui/pages/guest-edit.html.tmpl | 57 +++++++----- 7 files changed, 166 insertions(+), 327 deletions(-) delete mode 100644 ui/css/theme-default/guest-cdrom-edit.css delete mode 100644 ui/images/theme-default/guest-icon-sprite.png delete mode 100644 ui/js/src/kimchi.guest_cdrom_edit_main.js delete mode 100644 ui/pages/guest-cdrom-edit.html.tmpl -- 1.8.1.4

2 10

RFC: Design of the authentication in Kimchi
by Wen Wang 07 Jul '14

07 Jul '14

Hi all, Due to the fact that Kimchi needs authentication feature to be designed. I an posting my point of view below of how I thought about doing it, including how I plan doing it in the front-end and request for help for the back end support. Kimchi changed to a traditional login patten in last release that makes Kimchi more secure to use. It Before login, the front-end can hardly get any html information before user actually login. As we discussed, root user will have full access to Kimchi whereas the non-root user will have restricted privileges. It will be easier and more decent to show the proper tabs to certain users that distinguished by the back-end. Now the tabs are generated by an xml file generated from the back-end that show all 5 tabs. We probably need to have the '*Host*' and '*template*' tab_removed_ for non-root users, which is recommended to be done in the back-end. Also there need to be information provided to the front-end like the user-name, user-role as well as user-group, etc. that indicate user identity after login. The browser need the information to give certain privileges to certain users and disable the unnecessary functions. My suggestion is to have these 3 parameters passed: ***user-name, user-role* as well as *user-group*. There is a better extendibility to user the user-role other than isRoot so that we can define more roles in the future. As fact that we have only defined two roles now, the user-role parameter can be divided into root and guest based on user is root or non-root. These message can get from *sessiondada*, *cookie *or passed according to a query. the way passing the info of the user is still under discussion. Request for your advises. Best Regards Wang Wen

1 1

[RFC] Improve task management for kimchi
by Wen Wang 07 Jul '14

07 Jul '14

Dear all, * **Problems:* Now our strategy for long time operation is using task which the browser needs to check up-to-date task status time by time until the task ends. It's time consuming and less efficient. Also there exists several problems when locating each task when doing debug generating and storage pool as well as some new features that might use task strategy in the future. *Solution*: As talked with Sheldon and Zhengsheng, we came up with a solution that avoid browser checking status every 200ms. Also, we might need some more labels in each task to provide more information when getting the task like we might need to indicate which operation triggered certain task. What's in our mind is to use the strategy that allow the server inform browser about the task information. Our proposal is designed as follows. 1) Browser needs to register to the back end to indicate which part the result needs to reply to when the task finished. 2) The back end use broker to manage message distribution: when a task is finished or experiencing an error, back end inform the browser certain part of work is finished or error. 3) Using websocket of cherrypy to accomplish the message transfer. Best Regards Wang Wen

5 17

RFC: smt support
by Christy Perez 04 Jul '14

04 Jul '14

Quick poll for adding support for <cpu> <topology sockets='1' cores='2' threads='1'/> </cpu> I know it would be nice to let users add it on a per-vm basis, but maybe it might be something that we'd rather just leave in the template only. Having it in the template only seems simpler when thinking about UI design, imo, but I'd love to hear what everyone else thinks. Thanks, - Christy

4 11

[PATCH v2] Add SUSE's products
by Dinar valeev 04 Jul '14

04 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..0cf005e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -58,9 +58,12 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '11', 'sles': '12'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

4 4

[PATCH] Fix create vm disk params
by lvroyce＠linux.vnet.ibm.com 04 Jul '14

04 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> When creating vm on SCSI/iSCSI pools, volume needs to be specified. API.md and doc need to be updated. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/API.md | 1 + src/kimchi/API.json | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/docs/API.md b/docs/API.md index 4f51dd0..7a3076b 100644 --- a/docs/API.md +++ b/docs/API.md @@ -183,6 +183,7 @@ Represents a snapshot of the Virtual Machine's primary monitor. (either *size* or *volume* must be specified): * index: The device index * size: The device size in GB + * volume: LUN of SCSI or iSCSI storage. * graphics *(optional)*: The graphics paramenters of this template * type: The type of graphics. It can be VNC or spice or None. diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..ea1eb61 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -381,7 +381,13 @@ "type": "number", "minimum": 1, "error": "KCHTMPL0022E" + }, + "volume": { + "description": "LUN of SCSI or iSCSI storage", + "type": "string", + "minLength": 1 } + } }, "minItems": 1, -- 1.8.3.2

4 4

[PATCH 1/2] add SysV init scripts in centos6
by ssdxiao 03 Jul '14

03 Jul '14

now in centos6 has'nt the SysV init scripts, so add it to kimchi Signed-off-by: Ding Xiao <ssdxiao(a)163.com> --- contrib/kimchid.sysvinit.centos6 | 112 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 112 insertions(+), 0 deletions(-) create mode 100644 contrib/kimchid.sysvinit.centos6 diff --git a/contrib/kimchid.sysvinit.centos6 b/contrib/kimchid.sysvinit.centos6 new file mode 100644 index 0000000..ba4adff --- /dev/null +++ b/contrib/kimchid.sysvinit.centos6 @@ -0,0 +1,112 @@ +#! /bin/sh +# +#kimchid Kimchi Web Server +# +# +# Author: Ding Xiao <ssdxiao(a)163.com> +# +# 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 +# +### BEGIN INIT INFO +# Provides: kimchid +# Required-Start: libvirtd +# Required-Stop: +# Default-Start: 3 5 +# Default-Stop: 0 1 2 6 +# Description: Start the kimchid daemon +### END INIT INFO + +. /etc/rc.d/init.d/functions + +prog="kimchid" +exec="/usr/bin/kimchid" +pidfile="/var/run/kimchi.pid" + + +lockfile=/var/lock/subsys/$prog + +start() { + [ -x $exec ] || exit 5 + echo -n $"Starting $prog: " + daemon --user root --pidfile $pidfile "$exec &>/dev/null & echo \$! > $pidfile" + retval=$? + echo + [ $retval -eq 0 ] && touch $lockfile + return $retval +} + +stop() { + echo -n $"Stopping $prog: " + killproc -p $pidfile $prog + retval=$? + echo + [ $retval -eq 0 ] && rm -f $lockfile + return $retval +} + +restart() { + stop + start +} + +reload() { + restart +} + +force_reload() { + restart +} + +rh_status() { + status -p $pidfile $prog +} + +rh_status_q() { + rh_status >/dev/null 2>&1 +} + + +case "$1" in + start) + rh_status_q && exit 0 + $1 + ;; + stop) + rh_status_q || exit 0 + $1 + ;; + restart) + $1 + ;; + reload) + rh_status_q || exit 7 + $1 + ;; + force-reload) + force_reload + ;; + status) + rh_status + ;; + condrestart|try-restart) + rh_status_q || exit 0 + restart + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}" + exit 2 +esac +exit $? + -- 1.7.1

2 7

[PATCH v2 1/2] UI changes to allow underscore in debug report name.
by Christy Perez 03 Jul '14

03 Jul '14

New message on the debug report creation screen now says that underscore ('_') characters are allowed, as well as hyphens ('-'). Signed-off-by: Christy Perez <christy(a)linux.vnet.ibm.com> --- po/en_US.po | 12 ++++++------ po/pt_BR.po | 13 ++++++------- po/zh_CN.po | 12 ++++++------ src/kimchi/API.json | 2 +- src/kimchi/i18n.py | 2 +- ui/js/src/kimchi.report_add_main.js | 2 +- ui/pages/i18n.json.tmpl | 2 +- ui/pages/report-add.html.tmpl | 2 +- 8 files changed, 23 insertions(+), 24 deletions(-) diff --git a/po/en_US.po b/po/en_US.po index 7b66eb2..933d4eb 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -703,9 +703,9 @@ msgid "You should give a name for the debug file report." msgstr "You should give a name for the debug file report." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." #, python-format msgid "" @@ -1317,8 +1317,8 @@ msgstr "Rename" msgid "Download" msgstr "Download" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Report name should contain only letters, digits and/or hyphen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." msgid "Pending..." msgstr "Pending..." @@ -1503,10 +1503,10 @@ msgstr "Report Name" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgid "Add a Repository" msgstr "Add a Repository" diff --git a/po/pt_BR.po b/po/pt_BR.po index b0884b4..adcfd11 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -748,10 +748,9 @@ msgid "You should give a name for the debug file report." msgstr "Você deve dar um nome para o arquivo do relatório de debug." msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." msgstr "" -"Nome deve ser uma string. Somente letras, digitos e hífem ('-') são " -"permitidos." +"Nome deve ser uma string. Somente letras, digitos, sublinhar ('_') e hífem ('-') são permitidos." #, python-format msgid "" @@ -1382,8 +1381,8 @@ msgstr "Renomear" msgid "Download" msgstr "Baixar" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "Nome do relatório deve apenas conter letras, números e/ou hífen ('-')." +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "Nome do relatório deve apenas conter letras, números, sublinhar ('_') e/ou hífen ('-')." msgid "Pending..." msgstr "Pendente..." @@ -1568,10 +1567,10 @@ msgstr "Nome do Relatório" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "Se o nome do relatório for omitido, será escolhido um nome baseado no " -"horário atual. O nome pode conter: letras, números e hífen ('-')." +"horário atual. O nome pode conter: letras, números, sublinhar ('_') e hífen ('-')." msgid "Add a Repository" msgstr "Adicionar um Repositório" diff --git a/po/zh_CN.po b/po/zh_CN.po index 272dd51..a3b5dcb 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -680,8 +680,8 @@ msgid "You should give a name for the debug file report." msgstr "应该为诊断文件报告指定一个名字。" msgid "" -"Name should be a string. Only letters, digits and hyphen ('-') are allowed." -msgstr "名字必须是一个字符串。只允许字母、数字和连字符 ('-')。" +"Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed." +msgstr "名字必须是一个字符串。只允许字母、下划线 ('_') 数字和连字符 ('-')。" #, python-format msgid "" @@ -1270,8 +1270,8 @@ msgstr "重命名" msgid "Download" msgstr "下载" -msgid "Report name should contain only letters, digits and/or hyphen ('-')." -msgstr "报告名字中只能包含字母、数字或连字符（-）。" +msgid "Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-')." +msgstr "报告名字中只能包含字母、下划线 ('_') 数字或连字符（-）。" msgid "Pending..." msgstr "正在加载..." @@ -1441,10 +1441,10 @@ msgstr "诊断报告名" msgid "" "The name used to identify the report. If omitted, a name will be chosen " -"based on current time. Name can contain: letters, digits and hyphen (\"-\")." +"based on current time. Name can contain: letters, digits, underscore ('_') and hyphen (\"-\")." msgstr "" "名字用来标识诊断报告。如果省略，将会基于当前时间生成一个新名字。名字中可以包" -"含字母、数字和连字符（-）" +"含字母、下划线 ('_') 数字和连字符（-）" msgid "Add a Repository" msgstr "增加一个软件仓库" diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 6d1324c..d635d2c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -36,7 +36,7 @@ "name": { "description": "The name for the debug report file.", "type": "string", - "pattern": "^[A-Za-z0-9-]*$", + "pattern": "^[_A-Za-z0-9-]*$", "error": "KCHDR0007E" } } diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 91684b6..0c76145 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -206,7 +206,7 @@ "KCHDR0004E": _("Can not find any generated debug report matching name %(name)s"), "KCHDR0005E": _("Unable to generate debug report %(name)s. Details: %(err)s"), "KCHDR0006E": _("You should give a name for the debug file report."), - "KCHDR0007E": _("Name should be a string. Only letters, digits and hyphen ('-') are allowed."), + "KCHDR0007E": _("Name should be a string. Only letters, digits, underscore ('_') and hyphen ('-') are allowed."), "KCHDR0008E": _("The debug report with specified name \"%(name)s\" already exists. Please use another one."), "KCHSR0001E": _("Storage server %(server)s was not used by Kimchi"), diff --git a/ui/js/src/kimchi.report_add_main.js b/ui/js/src/kimchi.report_add_main.js index 43484f5..f64b879 100644 --- a/ui/js/src/kimchi.report_add_main.js +++ b/ui/js/src/kimchi.report_add_main.js @@ -41,7 +41,7 @@ kimchi.report_add_main = function() { return false; } var reportName = nameTextbox.val(); - var validator = RegExp("^[A-Za-z0-9-]*$"); + var validator = RegExp("^[_A-Za-z0-9-]*$"); if (!validator.test(reportName)) { kimchi.message.error.code('KCHDR6011M'); return false; diff --git a/ui/pages/i18n.json.tmpl b/ui/pages/i18n.json.tmpl index d765cf2..c6f4e8c 100644 --- a/ui/pages/i18n.json.tmpl +++ b/ui/pages/i18n.json.tmpl @@ -113,7 +113,7 @@ "KCHDR6008M": "$_("Rename")", "KCHDR6009M": "$_("Remove")", "KCHDR6010M": "$_("Download")", - "KCHDR6011M": "$_("Report name should contain only letters, digits and/or hyphen ('-').")", + "KCHDR6011M": "$_("Report name should contain only letters, digits, underscore ('_') and/or hyphen ('-').")", "KCHDR6012M": "$_("Pending...")", "KCHVM6001M": "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", diff --git a/ui/pages/report-add.html.tmpl b/ui/pages/report-add.html.tmpl index b7209fe..74ef313 100644 --- a/ui/pages/report-add.html.tmpl +++ b/ui/pages/report-add.html.tmpl @@ -35,7 +35,7 @@ </h2> <div class="field"> <span> - $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits and hyphen (\"-\").") + $_("The name used to identify the report. If omitted, a name will be chosen based on current time. Name can contain: letters, digits, underscore (\"_\") and hyphen (\"-\").") </span> <input type="text" class="text" id="report-name-textbox" name="name" /> </div> -- 1.9.3

4 6

[RFC]Create VM from image
by Royce Lv 02 Jul '14

02 Jul '14

Currently kimchi just support create a vm from an ISO defined template. This requires duplicate installation. This release we want to support create a vm from an installed image. This involves the following change: 1. Create a template from an image: POST /templates/template-1 {'base': 'abs_base_img_path'} Implementation: (1)probe image os distro and version to get suggested config. (2)Avoid image to be deleted. (3)Avoid using ISO and base image at the same time. 2. Create a vm from image based template: This part has already been covered by Aline's prototype patch. POST /vms/vm-1 {'storagepool': 'default', 'network': 'default', 'disks':[{'index':0, 'base': 'abs_path'}]} or {'storagepool': 'default', 'network': 'default', 'disks':[{'index':0, 'base': 'abs_path', 'volume': 'scsi_volume'}]} The create vm implementation need to be re-considered for the following points: (1) when creating vm on scsi/iscsi pool, if volume size smaller than original image, need to be rejected. (2) when creating vm on directory based pool, volume generating logic is different with allocation new volume. (2) xml generating need to be refactored. Anything else need to be considered, welcome your comments.

4 6

[PATCH] Add SUSE's products
by Dinar valeev 02 Jul '14

02 Jul '14

From: Dinar Valeev <dvaleev(a)suse.com> Add SLES 12 information and set openSUSE's version to 13.1 Signed-off-by: Dinar Valeev <dvaleev(a)suse.com> --- src/kimchi/isoinfo.py | 1 + src/kimchi/osinfo.py | 9 ++++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/kimchi/isoinfo.py b/src/kimchi/isoinfo.py index b7315e0..c394a32 100644 --- a/src/kimchi/isoinfo.py +++ b/src/kimchi/isoinfo.py @@ -95,6 +95,7 @@ iso_dir = [ '|HRM_CENA_X64CHKV|HRM_CPRA_X64FREV|HRM_CPRNA_X64FREV')), ('sles', '10', 'SLES10|SUSE-Linux-Enterprise-Server.001'), ('sles', '11', 'SUSE_SLES-11-0-0'), + ('sles', '12', 'SLE-12'), ('sles', lambda m: "11sp%s" % m.group(1), 'SLES-11-SP(\d+)'), ('opensuse', lambda m: m.group(1), 'openSUSE[ -](\d+\.\d+)'), ('opensuse', '11.1', 'SU1110.001'), diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py index 093feca..9e8b62e 100644 --- a/src/kimchi/osinfo.py +++ b/src/kimchi/osinfo.py @@ -57,10 +57,13 @@ template_specs = {'x86': {'old': dict(common_spec, disk_bus='ide', modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10', - 'opensuse': '10.3', 'centos': '5.3', - 'rhel': '6.0', 'fedora': '16', 'gentoo': '0'}, + 'opensuse': '13.1', 'centos': '5.3', + 'rhel': '6.0', 'fedora': '16', 'gentoo': '0', + 'sles': '12'}, 'power': {'rhel': '7.0', 'fedora': '19', - 'ubuntu': '14.04'}} + 'ubuntu': '14.04', + 'opensuse': '13.1', + 'sles': '12'}} icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/' % paths.ui_dir, 'icon-*.png')] -- 1.8.4.5

3 5

RFC: Security Model & UI Design
by Yu Xin Huo 02 Jul '14

02 Jul '14

*Security Strategy:* 1. Only handle existing linux users and groups, kimchi is positioned to be a virtualization console, will not handle user management which is host level admin. 2. Two levels of privileges root users: console settings and virtualization resources management full access to 'Host', 'Guests', 'Templates', 'Storage', 'Network' all root users can see all the guests, templates, storage pools and volumes, networks no matter who created it for created VMs, assign to non-root users with either an admin or user role non-root users: manage or use VMs assigned to them admin role: edit & delete their VMs user role: start, stop, vnc their VMs they only have access to 'Guests' tab In 'Guests' tab, only list VMs that they have an admin or user role *UI Design:* root users: all current UI will be available. for create a VM, add a section to add users with admin or user role for edit a VM, also has a section for add/remove/change users' access non-root users: As only one 'Guest' tab, remove tabs bar and the '+' bar Only list VMs that they have a role on If the user have 'admin' role, then all current actions available if the user have 'user' role, then only actions 'start', 'stop', 'vnc' available

2 2

[RFC] Upload and download image for OOTB storage pool
by Royce Lv 02 Jul '14

02 Jul '14

Now OOTB ISO pool is available, but user has to copy ISO manually to the ISO pool, which is not convenient. So here we propose two ways to transfer ISOs. 1. User ---upload --> Kimchi Server REST API will be: POST /storagepools/isos/upload {'file': file_local_abs_path} Ding Xiao had already posted a piece of code in his patch: using cherrypy file upload interface. His code can support following requirements: (1) upload task can be cancelled. (2) non-blocking, other request can be handled. (3) progress can be monitored with a progress bar. (4) multi-file selected support. Only nits are UI part needs to be refactored a little. Also for multiple file upload, number of upload session needs to be controlled through config file. 2. Http server -- download -->Kimchi server REST API will be: POST /storagepools/isos/download {'file': file_remote_path} RETURN: {'task_id': id_of_download_task} This will start a backend task for download. The UI will query the task for progress. For implementation, we will use python libcurl to download image/ISO. REF: http://curl.haxx.se/libcurl/python/

2 2

[PATCH] Add image probe function
by lvroyce＠linux.vnet.ibm.com 02 Jul '14

02 Jul '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Image file probe will be used in identify image file os info and generate reasonable configuration for it. This will be useful when import image and create a vm from it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- docs/README.md | 9 ++++++--- src/kimchi/exception.py | 2 ++ src/kimchi/imageinfo.py | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 src/kimchi/imageinfo.py diff --git a/docs/README.md b/docs/README.md index c658637..c341a5d 100644 --- a/docs/README.md +++ b/docs/README.md @@ -53,7 +53,8 @@ Install Dependencies PyPAM m2crypto python-jsonschema rpm-build \ qemu-kvm python-psutil python-ethtool sos \ python-ipaddr python-lxml nfs-utils \ - iscsi-initiator-utils libxslt pyparted nginx + iscsi-initiator-utils libxslt pyparted nginx \ + python-libguestfs libguestfs-tools # If using RHEL6, install the following additional packages: $ sudo yum install python-unittest2 python-ordereddict # Restart libvirt to allow configuration changes to take effect @@ -75,7 +76,8 @@ for more information on how to configure your system to access this repository. python-pam python-m2crypto python-jsonschema \ qemu-kvm libtool python-psutil python-ethtool \ sosreport python-ipaddr python-lxml nfs-common \ - open-iscsi lvm2 xsltproc python-parted nginx + open-iscsi lvm2 xsltproc python-parted nginx \ + python-guestfs libguestfs-tools Packages version requirement: python-jsonschema >= 1.3.0 @@ -89,7 +91,8 @@ for more information on how to configure your system to access this repository. python-pam python-M2Crypto python-jsonschema \ rpm-build kvm python-psutil python-ethtool \ python-ipaddr python-lxml nfs-client open-iscsi \ - libxslt-tools python-xml python-parted + libxslt-tools python-xml python-parted \ + python-libguestfs guestfs-tools Packages version requirement: python-psutil >= 0.6.0 diff --git a/src/kimchi/exception.py b/src/kimchi/exception.py index fcf60cc..a983d46 100644 --- a/src/kimchi/exception.py +++ b/src/kimchi/exception.py @@ -88,6 +88,8 @@ class InvalidOperation(KimchiException): class IsoFormatError(KimchiException): pass +class ImageFormatError(KimchiException): + pass class TimeoutExpired(KimchiException): pass diff --git a/src/kimchi/imageinfo.py b/src/kimchi/imageinfo.py new file mode 100644 index 0000000..d57ecac --- /dev/null +++ b/src/kimchi/imageinfo.py @@ -0,0 +1,42 @@ +# +# Kimchi +# +# Copyright IBM Corp, 2013 +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License, or (at your option) any later version. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + +import sys +import guestfs + + +def probe_image(image_path): + g = guestfs.GuestFS(python_return_dict=True) + g.add_drive_opts(image_path, readonly=1) + g.launch() + + roots = g.inspect_os() + if len(roots) == 0: + raise ImageFormatError("No os found in given image.") + + for root in roots: + version = "%d.%d" % (g.inspect_get_major_version(root), + g.inspect_get_minor_version(root)) + distro = "%s" % (g.inspect_get_distro(root)) + + return (distro, version) + + +if __name__ == '__main__': + print probe_image(sys.argv[1]) -- 1.8.3.2

4 5

RFC: Suggestion of changing the button "Clone" to "Replicate"
by Wen Wang 02 Jul '14

02 Jul '14

Dear all, I did some translation in last release and found out it is a little bit odd to see the word "clone" under "Action" in Templates tab: In my point of view, "clone" is used in medical area in most cases and I recommend to have it changed to "Replicate" which have the same meaning that indicates to copy and paste the same template configuration. Best Regards Wang Wen

3 4

[PATCH] Support to upload ISO
by ssdxiao 01 Jul '14

01 Jul '14

Upload ISO to the path /var/lib/kimchi/iso of the local disk Signed-off-by: ssdxiao <ssdxiao(a)163.com> --- contrib/kimchi.spec.fedora.in | 1 + contrib/kimchi.spec.suse.in | 1 + po/en_US.po | 3 + po/pt_BR.po | 3 + po/zh_CN.po | 3 + src/kimchi/control/storagepools.py | 28 +- 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 + 12 files changed, 938 insertions(+), 2 deletions(-) create mode 100644 ui/css/theme-default/upload.css create mode 100644 ui/js/resumable.js diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in index 2d4699b..771fccc 100644 --- a/contrib/kimchi.spec.fedora.in +++ b/contrib/kimchi.spec.fedora.in @@ -164,6 +164,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/js/kimchi.min.js %{_datadir}/kimchi/ui/js/jquery-ui.js %{_datadir}/kimchi/ui/js/jquery.min.js +%{_datadir}/kimchi/ui/js/resumable.js %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js %{_datadir}/kimchi/ui/js/novnc/*.js %{_datadir}/kimchi/ui/js/spice/*.js diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in index 165f566..ad6aed4 100644 --- a/contrib/kimchi.spec.suse.in +++ b/contrib/kimchi.spec.suse.in @@ -86,6 +86,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/kimchi/ui/js/kimchi.min.js %{_datadir}/kimchi/ui/js/jquery-ui.js %{_datadir}/kimchi/ui/js/jquery.min.js +%{_datadir}/kimchi/ui/js/resumable.js %{_datadir}/kimchi/ui/js/modernizr.custom.2.6.2.min.js %{_datadir}/kimchi/ui/js/novnc/*.js %{_datadir}/kimchi/ui/js/spice/*.js diff --git a/po/en_US.po b/po/en_US.po index 1ede7dc..6f5b100 100644 --- a/po/en_US.po +++ b/po/en_US.po @@ -1670,3 +1670,6 @@ msgstr "No templates found." msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "Upload ISO Image" diff --git a/po/pt_BR.po b/po/pt_BR.po index 5ff54e0..d4d26ee 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -1777,3 +1777,6 @@ msgstr "Nenhum modelo encontrado." msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "Carregar Imagem ISO" diff --git a/po/zh_CN.po b/po/zh_CN.po index caef515..da62131 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -1679,3 +1679,6 @@ msgstr "没有发现模板" msgid "Clone" msgstr "" + +msgid "Upload ISO Image" +msgstr "上传ISO镜像" \ No newline at end of file diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index b75bca0..72b9f78 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -18,8 +18,8 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA import cherrypy - - +import os +import errno from kimchi.control.base import Collection, Resource from kimchi.control.storagevolumes import IsoVolumes, StorageVolumes from kimchi.control.utils import get_class_name, model_fn @@ -28,6 +28,9 @@ from kimchi.model.storagepools import ISO_POOL_NAME from kimchi.control.utils import UrlSubNode +ISO_UPLOAD_DIR = "/var/lib/kimchi/iso/" + + @UrlSubNode("storagepools", True, ['POST', 'DELETE']) class StoragePools(Collection): def __init__(self, model): @@ -35,6 +38,11 @@ class StoragePools(Collection): self.resource = StoragePool isos = IsoPool(model) setattr(self, ISO_POOL_NAME, isos) + try: + os.makedirs(ISO_UPLOAD_DIR, mode=0755) + except OSError as e: + if e.errno == errno.EEXIST: + pass def create(self, params, *args): try: @@ -57,6 +65,22 @@ class StoragePools(Collection): return resp + @cherrypy.expose + def upload(self, *args, **kwargs): + method = cherrypy.request.method.upper() + if method != "POST": + raise cherrypy.HTTPError(405) + fileName = kwargs["resumableFilename"] + chunkSize = kwargs["resumableChunkSize"] + chunkNumber = kwargs["resumableChunkNumber"] + position = int(chunkSize) * (int(chunkNumber)-1) + + filePath = ISO_UPLOAD_DIR+fileName + fp = open(filePath, "a+") + fp.seek(position) + fp.write(kwargs["file"].fullvalue()) + fp.close() + def _get_resources(self, filter_params): try: res_list = super(StoragePools, self)._get_resources(filter_params) diff --git a/src/nginx.conf.in b/src/nginx.conf.in index 38e643d..9568476 100644 --- a/src/nginx.conf.in +++ b/src/nginx.conf.in @@ -37,6 +37,7 @@ http { access_log /var/log/nginx/access.log main; sendfile on; + client_max_body_size 2m; server { listen $proxy_ssl_port ssl; diff --git a/ui/css/theme-default/upload.css b/ui/css/theme-default/upload.css new file mode 100644 index 0000000..9cdfe4f --- /dev/null +++ b/ui/css/theme-default/upload.css @@ -0,0 +1,43 @@ +/* +Uploadify +Copyright (c) 2012 Reactive Apps, Ronnie Garcia +Released under the MIT License <http://www.opensource.org/licenses/mit-license.php> +*/ + +.uploadify-button { + background-color: #505050; + background-image: linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -o-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -moz-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -webkit-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -ms-linear-gradient(bottom, #505050 0%, #707070 100%); + background-image: -webkit-gradient( + linear, + left bottom, + left top, + color-stop(0, #505050), + color-stop(1, #707070) + ); + background-position: center top; + background-repeat: no-repeat; + -webkit-border-radius: 30px; + -moz-border-radius: 30px; + border-radius: 30px; + border: 2px solid #808080; + color: #FFF; + height: 30px; + width: 120px; + font: bold 12px Arial, Helvetica, sans-serif; + text-align: center; + text-shadow: 0 -1px 0 rgba(0,0,0,0.25); +} +.uploadify-progress { + background-color: #E5E5E5; + margin-top: 10px; + width: 100%; +} +.uploadify-progress-bar { + background-color: #0099FF; + height: 3px; + width: 1px; +} diff --git a/ui/js/resumable.js b/ui/js/resumable.js new file mode 100644 index 0000000..add21ec --- /dev/null +++ b/ui/js/resumable.js @@ -0,0 +1,816 @@ +/* +* MIT Licensed +* http://www.23developer.com/opensource +* http://github.com/23/resumable.js +* Steffen Tiedemann Christensen, steffen(a)23company.com +*/ + +(function(){ +"use strict"; + + var Resumable = function(opts){ + if ( !(this instanceof Resumable) ) { + return new Resumable(opts); + } + this.version = 1.0; + // SUPPORTED BY BROWSER? + // Check if these features are support by the browser: + // - File object type + // - Blob object type + // - FileList object type + // - slicing files + this.support = ( + (typeof(File)!=='undefined') + && + (typeof(Blob)!=='undefined') + && + (typeof(FileList)!=='undefined') + && + (!!Blob.prototype.webkitSlice||!!Blob.prototype.mozSlice||!!Blob.prototype.slice||false) + ); + if(!this.support) return(false); + + + // PROPERTIES + var $ = this; + $.files = []; + $.defaults = { + chunkSize:1*1024*1024, + forceChunkSize:false, + simultaneousUploads:3, + fileParameterName:'file', + throttleProgressCallbacks:0.5, + query:{}, + headers:{}, + preprocess:null, + method:'multipart', + prioritizeFirstAndLastChunk:false, + target:'/', + testChunks:true, + generateUniqueIdentifier:null, + maxChunkRetries:undefined, + chunkRetryInterval:undefined, + permanentErrors:[404, 415, 500, 501], + maxFiles:undefined, + withCredentials:false, + xhrTimeout:0, + maxFilesErrorCallback:function (files, errorCount) { + var maxFiles = $.getOpt('maxFiles'); + alert('Please upload ' + maxFiles + ' file' + (maxFiles === 1 ? '' : 's') + ' at a time.'); + }, + minFileSize:1, + minFileSizeErrorCallback:function(file, errorCount) { + alert(file.fileName||file.name +' is too small, please upload files larger than ' + $h.formatSize($.getOpt('minFileSize')) + '.'); + }, + maxFileSize:undefined, + maxFileSizeErrorCallback:function(file, errorCount) { + alert(file.fileName||file.name +' is too large, please upload files less than ' + $h.formatSize($.getOpt('maxFileSize')) + '.'); + }, + fileType: [], + fileTypeErrorCallback: function(file, errorCount) { + alert(file.fileName||file.name +' has type not allowed, please upload files of type ' + $.getOpt('fileType') + '.'); + } + }; + $.opts = opts||{}; + $.getOpt = function(o) { + var $opt = this; + // Get multiple option if passed an array + if(o instanceof Array) { + var options = {}; + $h.each(o, function(option){ + options[option] = $opt.getOpt(option); + }); + return options; + } + // Otherwise, just return a simple option + if ($opt instanceof ResumableChunk) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { $opt = $opt.fileObj; } + } + if ($opt instanceof ResumableFile) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { $opt = $opt.resumableObj; } + } + if ($opt instanceof Resumable) { + if (typeof $opt.opts[o] !== 'undefined') { return $opt.opts[o]; } + else { return $opt.defaults[o]; } + } + }; + + // EVENTS + // catchAll(event, ...) + // fileSuccess(file), fileProgress(file), fileAdded(file, event), fileRetry(file), fileError(file, message), + // complete(), progress(), error(message, file), pause() + $.events = []; + $.on = function(event,callback){ + $.events.push(event.toLowerCase(), callback); + }; + $.fire = function(){ + // `arguments` is an object, not array, in FF, so: + var args = []; + for (var i=0; i<arguments.length; i++) args.push(arguments[i]); + // Find event listeners, and support pseudo-event `catchAll` + var event = args[0].toLowerCase(); + for (var i=0; i<=$.events.length; i+=2) { + if($.events[i]==event) $.events[i+1].apply($,args.slice(1)); + if($.events[i]=='catchall') $.events[i+1].apply(null,args); + } + if(event=='fileerror') $.fire('error', args[2], args[1]); + if(event=='fileprogress') $.fire('progress'); + }; + + + // INTERNAL HELPER METHODS (handy, but ultimately not part of uploading) + var $h = { + stopEvent: function(e){ + e.stopPropagation(); + e.preventDefault(); + }, + each: function(o,callback){ + if(typeof(o.length)!=='undefined') { + for (var i=0; i<o.length; i++) { + // Array or FileList + if(callback(o[i])===false) return; + } + } else { + for (i in o) { + // Object + if(callback(i,o[i])===false) return; + } + } + }, + generateUniqueIdentifier:function(file){ + var custom = $.getOpt('generateUniqueIdentifier'); + if(typeof custom === 'function') { + return custom(file); + } + var relativePath = file.webkitRelativePath||file.fileName||file.name; // Some confusion in different versions of Firefox + var size = file.size; + return(size + '-' + relativePath.replace(/[^0-9a-zA-Z_-]/img, '')); + }, + contains:function(array,test) { + var result = false; + + $h.each(array, function(value) { + if (value == test) { + result = true; + return false; + } + return true; + }); + + return result; + }, + formatSize:function(size){ + if(size<1024) { + return size + ' bytes'; + } else if(size<1024*1024) { + return (size/1024.0).toFixed(0) + ' KB'; + } else if(size<1024*1024*1024) { + return (size/1024.0/1024.0).toFixed(1) + ' MB'; + } else { + return (size/1024.0/1024.0/1024.0).toFixed(1) + ' GB'; + } + }, + getTarget:function(params){ + var target = $.getOpt('target'); + if(target.indexOf('?') < 0) { + target += '?'; + } else { + target += '&'; + } + return target + params.join('&'); + } + }; + + var onDrop = function(event){ + $h.stopEvent(event); + appendFilesFromFileList(event.dataTransfer.files, event); + }; + var onDragOver = function(e) { + e.preventDefault(); + }; + + // INTERNAL METHODS (both handy and responsible for the heavy load) + var appendFilesFromFileList = function(fileList, event){ + // check for uploading too many files + var errorCount = 0; + var o = $.getOpt(['maxFiles', 'minFileSize', 'maxFileSize', 'maxFilesErrorCallback', 'minFileSizeErrorCallback', 'maxFileSizeErrorCallback', 'fileType', 'fileTypeErrorCallback']); + if (typeof(o.maxFiles)!=='undefined' && o.maxFiles<(fileList.length+$.files.length)) { + // if single-file upload, file is already added, and trying to add 1 new file, simply replace the already-added file + if (o.maxFiles===1 && $.files.length===1 && fileList.length===1) { + $.removeFile($.files[0]); + } else { + o.maxFilesErrorCallback(fileList, errorCount++); + return false; + } + } + var files = []; + $h.each(fileList, function(file){ + var fileName = file.name.split('.'); + var fileType = fileName[fileName.length-1].toLowerCase(); + + if (o.fileType.length > 0 && !$h.contains(o.fileType, fileType)) { + o.fileTypeErrorCallback(file, errorCount++); + return false; + } + + if (typeof(o.minFileSize)!=='undefined' && file.size<o.minFileSize) { + o.minFileSizeErrorCallback(file, errorCount++); + return false; + } + if (typeof(o.maxFileSize)!=='undefined' && file.size>o.maxFileSize) { + o.maxFileSizeErrorCallback(file, errorCount++); + return false; + } + + // directories have size == 0 + if (!$.getFromUniqueIdentifier($h.generateUniqueIdentifier(file))) {(function(){ + var f = new ResumableFile($, file); + window.setTimeout(function(){ + $.files.push(f); + files.push(f); + f.container = (typeof event != 'undefined' ? event.srcElement : null); + $.fire('fileAdded', f, event) + },0); + })()}; + }); + window.setTimeout(function(){ + $.fire('filesAdded', files) + },0); + }; + + // INTERNAL OBJECT TYPES + function ResumableFile(resumableObj, file){ + var $ = this; + $.opts = {}; + $.getOpt = resumableObj.getOpt; + $._prevProgress = 0; + $.resumableObj = resumableObj; + $.file = file; + $.fileName = file.fileName||file.name; // Some confusion in different versions of Firefox + $.size = file.size; + $.relativePath = file.webkitRelativePath || $.fileName; + $.uniqueIdentifier = $h.generateUniqueIdentifier(file); + $._pause = false; + $.container = ''; + var _error = false; + + // Callback when something happens within the chunk + var chunkEvent = function(event, message){ + // event can be 'progress', 'success', 'error' or 'retry' + switch(event){ + case 'progress': + $.resumableObj.fire('fileProgress', $); + break; + case 'error': + $.abort(); + _error = true; + $.chunks = []; + $.resumableObj.fire('fileError', $, message); + break; + case 'success': + if(_error) return; + $.resumableObj.fire('fileProgress', $); // it's at least progress + if($.isComplete()) { + $.resumableObj.fire('fileSuccess', $, message); + } + break; + case 'retry': + $.resumableObj.fire('fileRetry', $); + break; + } + }; + + // Main code to set up a file object with chunks, + // packaged to be able to handle retries if needed. + $.chunks = []; + $.abort = function(){ + // Stop current uploads + var abortCount = 0; + $h.each($.chunks, function(c){ + if(c.status()=='uploading') { + c.abort(); + abortCount++; + } + }); + if(abortCount>0) $.resumableObj.fire('fileProgress', $); + }; + $.cancel = function(){ + // Reset this file to be void + var _chunks = $.chunks; + $.chunks = []; + // Stop current uploads + $h.each(_chunks, function(c){ + if(c.status()=='uploading') { + c.abort(); + $.resumableObj.uploadNextChunk(); + } + }); + $.resumableObj.removeFile($); + $.resumableObj.fire('fileProgress', $); + }; + $.retry = function(){ + $.bootstrap(); + var firedRetry = false; + $.resumableObj.on('chunkingComplete', function(){ + if(!firedRetry) $.resumableObj.upload(); + firedRetry = true; + }); + }; + $.bootstrap = function(){ + $.abort(); + _error = false; + // Rebuild stack of chunks from file + $.chunks = []; + $._prevProgress = 0; + var round = $.getOpt('forceChunkSize') ? Math.ceil : Math.floor; + var maxOffset = Math.max(round($.file.size/$.getOpt('chunkSize')),1); + for (var offset=0; offset<maxOffset; offset++) {(function(offset){ + window.setTimeout(function(){ + $.chunks.push(new ResumableChunk($.resumableObj, $, offset, chunkEvent)); + $.resumableObj.fire('chunkingProgress',$,offset/maxOffset); + },0); + })(offset)} + window.setTimeout(function(){ + $.resumableObj.fire('chunkingComplete',$); + },0); + }; + $.progress = function(){ + if(_error) return(1); + // Sum up progress across everything + var ret = 0; + var error = false; + $h.each($.chunks, function(c){ + if(c.status()=='error') error = true; + ret += c.progress(true); // get chunk progress relative to entire file + }); + ret = (error ? 1 : (ret>0.999 ? 1 : ret)); + ret = Math.max($._prevProgress, ret); // We don't want to lose percentages when an upload is paused + $._prevProgress = ret; + return(ret); + }; + $.isUploading = function(){ + var uploading = false; + $h.each($.chunks, function(chunk){ + if(chunk.status()=='uploading') { + uploading = true; + return(false); + } + }); + return(uploading); + }; + $.isComplete = function(){ + var outstanding = false; + $h.each($.chunks, function(chunk){ + var status = chunk.status(); + if(status=='pending' || status=='uploading' || chunk.preprocessState === 1) { + outstanding = true; + return(false); + } + }); + return(!outstanding); + }; + $.pause = function(pause){ + if(typeof(pause)==='undefined'){ + $._pause = ($._pause ? false : true); + }else{ + $._pause = pause; + } + }; + $.isPaused = function() { + return $._pause; + }; + + + // Bootstrap and return + $.resumableObj.fire('chunkingStart', $); + $.bootstrap(); + return(this); + } + + function ResumableChunk(resumableObj, fileObj, offset, callback){ + var $ = this; + $.opts = {}; + $.getOpt = resumableObj.getOpt; + $.resumableObj = resumableObj; + $.fileObj = fileObj; + $.fileObjSize = fileObj.size; + $.fileObjType = fileObj.file.type; + $.offset = offset; + $.callback = callback; + $.lastProgressCallback = (new Date); + $.tested = false; + $.retries = 0; + $.pendingRetry = false; + $.preprocessState = 0; // 0 = unprocessed, 1 = processing, 2 = finished + + // Computed properties + var chunkSize = $.getOpt('chunkSize'); + $.loaded = 0; + $.startByte = $.offset*chunkSize; + $.endByte = Math.min($.fileObjSize, ($.offset+1)*chunkSize); + if ($.fileObjSize-$.endByte < chunkSize && !$.getOpt('forceChunkSize')) { + // The last chunk will be bigger than the chunk size, but less than 2*chunkSize + $.endByte = $.fileObjSize; + } + $.xhr = null; + + // test() makes a GET request without any data to see if the chunk has already been uploaded in a previous session + $.test = function(){ + // Set up request and listen for event + $.xhr = new XMLHttpRequest(); + + var testHandler = function(e){ + $.tested = true; + var status = $.status(); + if(status=='success') { + $.callback(status, $.message()); + $.resumableObj.uploadNextChunk(); + } else { + $.send(); + } + }; + $.xhr.addEventListener('load', testHandler, false); + $.xhr.addEventListener('error', testHandler, false); + + // Add data from the query options + var params = []; + var customQuery = $.getOpt('query'); + if(typeof customQuery == 'function') customQuery = customQuery($.fileObj, $); + $h.each(customQuery, function(k,v){ + params.push([encodeURIComponent(k), encodeURIComponent(v)].join('=')); + }); + // Add extra data to identify chunk + params.push(['resumableChunkNumber', encodeURIComponent($.offset+1)].join('=')); + params.push(['resumableChunkSize', encodeURIComponent($.getOpt('chunkSize'))].join('=')); + params.push(['resumableCurrentChunkSize', encodeURIComponent($.endByte - $.startByte)].join('=')); + params.push(['resumableTotalSize', encodeURIComponent($.fileObjSize)].join('=')); + params.push(['resumableType', encodeURIComponent($.fileObjType)].join('=')); + params.push(['resumableIdentifier', encodeURIComponent($.fileObj.uniqueIdentifier)].join('=')); + params.push(['resumableFilename', encodeURIComponent($.fileObj.fileName)].join('=')); + params.push(['resumableRelativePath', encodeURIComponent($.fileObj.relativePath)].join('=')); + // Append the relevant chunk and send it + $.xhr.open('GET', $h.getTarget(params)); + $.xhr.timeout = $.getOpt('xhrTimeout'); + $.xhr.withCredentials = $.getOpt('withCredentials'); + // Add data from header options + $h.each($.getOpt('headers'), function(k,v) { + $.xhr.setRequestHeader(k, v); + }); + $.xhr.send(null); + }; + + $.preprocessFinished = function(){ + $.preprocessState = 2; + $.send(); + }; + + // send() uploads the actual data in a POST call + $.send = function(){ + var preprocess = $.getOpt('preprocess'); + if(typeof preprocess === 'function') { + switch($.preprocessState) { + case 0: preprocess($); $.preprocessState = 1; return; + case 1: return; + case 2: break; + } + } + if($.getOpt('testChunks') && !$.tested) { + $.test(); + return; + } + + // Set up request and listen for event + $.xhr = new XMLHttpRequest(); + + // Progress + $.xhr.upload.addEventListener('progress', function(e){ + if( (new Date) - $.lastProgressCallback > $.getOpt('throttleProgressCallbacks') * 1000 ) { + $.callback('progress'); + $.lastProgressCallback = (new Date); + } + $.loaded=e.loaded||0; + }, false); + $.loaded = 0; + $.pendingRetry = false; + $.callback('progress'); + + // Done (either done, failed or retry) + var doneHandler = function(e){ + var status = $.status(); + if(status=='success'||status=='error') { + $.callback(status, $.message()); + $.resumableObj.uploadNextChunk(); + } else { + $.callback('retry', $.message()); + $.abort(); + $.retries++; + var retryInterval = $.getOpt('chunkRetryInterval'); + if(retryInterval !== undefined) { + $.pendingRetry = true; + setTimeout($.send, retryInterval); + } else { + $.send(); + } + } + }; + $.xhr.addEventListener('load', doneHandler, false); + $.xhr.addEventListener('error', doneHandler, false); + + // Set up the basic query data from Resumable + var query = { + resumableChunkNumber: $.offset+1, + resumableChunkSize: $.getOpt('chunkSize'), + resumableCurrentChunkSize: $.endByte - $.startByte, + resumableTotalSize: $.fileObjSize, + resumableType: $.fileObjType, + resumableIdentifier: $.fileObj.uniqueIdentifier, + resumableFilename: $.fileObj.fileName, + resumableRelativePath: $.fileObj.relativePath, + resumableTotalChunks: $.fileObj.chunks.length + }; + // Mix in custom data + var customQuery = $.getOpt('query'); + if(typeof customQuery == 'function') customQuery = customQuery($.fileObj, $); + $h.each(customQuery, function(k,v){ + query[k] = v; + }); + + var func = ($.fileObj.file.slice ? 'slice' : ($.fileObj.file.mozSlice ? 'mozSlice' : ($.fileObj.file.webkitSlice ? 'webkitSlice' : 'slice'))), + bytes = $.fileObj.file[func]($.startByte,$.endByte), + data = null, + target = $.getOpt('target'); + + if ($.getOpt('method') === 'octet') { + // Add data from the query options + data = bytes; + var params = []; + $h.each(query, function(k,v){ + params.push([encodeURIComponent(k), encodeURIComponent(v)].join('=')); + }); + target = $h.getTarget(params); + } else { + // Add data from the query options + data = new FormData(); + $h.each(query, function(k,v){ + data.append(k,v); + }); + data.append($.getOpt('fileParameterName'), bytes); + } + + $.xhr.open('POST', target); + $.xhr.timeout = $.getOpt('xhrTimeout'); + $.xhr.withCredentials = $.getOpt('withCredentials'); + // Add data from header options + $h.each($.getOpt('headers'), function(k,v) { + $.xhr.setRequestHeader(k, v); + }); + $.xhr.send(data); + }; + $.abort = function(){ + // Abort and reset + if($.xhr) $.xhr.abort(); + $.xhr = null; + }; + $.status = function(){ + // Returns: 'pending', 'uploading', 'success', 'error' + if($.pendingRetry) { + // if pending retry then that's effectively the same as actively uploading, + // there might just be a slight delay before the retry starts + return('uploading'); + } else if(!$.xhr) { + return('pending'); + } else if($.xhr.readyState<4) { + // Status is really 'OPENED', 'HEADERS_RECEIVED' or 'LOADING' - meaning that stuff is happening + return('uploading'); + } else { + if($.xhr.status==200) { + // HTTP 200, perfect + return('success'); + } else if($h.contains($.getOpt('permanentErrors'), $.xhr.status) || $.retries >= $.getOpt('maxChunkRetries')) { + // HTTP 415/500/501, permanent error + return('error'); + } else { + // this should never happen, but we'll reset and queue a retry + // a likely case for this would be 503 service unavailable + $.abort(); + return('pending'); + } + } + }; + $.message = function(){ + return($.xhr ? $.xhr.responseText : ''); + }; + $.progress = function(relative){ + if(typeof(relative)==='undefined') relative = false; + var factor = (relative ? ($.endByte-$.startByte)/$.fileObjSize : 1); + if($.pendingRetry) return(0); + var s = $.status(); + switch(s){ + case 'success': + case 'error': + return(1*factor); + case 'pending': + return(0*factor); + default: + return($.loaded/($.endByte-$.startByte)*factor); + } + }; + return(this); + } + + // QUEUE + $.uploadNextChunk = function(){ + var found = false; + + // In some cases (such as videos) it's really handy to upload the first + // and last chunk of a file quickly; this let's the server check the file's + // metadata and determine if there's even a point in continuing. + if ($.getOpt('prioritizeFirstAndLastChunk')) { + $h.each($.files, function(file){ + if(file.chunks.length && file.chunks[0].status()=='pending' && file.chunks[0].preprocessState === 0) { + file.chunks[0].send(); + found = true; + return(false); + } + if(file.chunks.length>1 && file.chunks[file.chunks.length-1].status()=='pending' && file.chunks[file.chunks.length-1].preprocessState === 0) { + file.chunks[file.chunks.length-1].send(); + found = true; + return(false); + } + }); + if(found) return(true); + } + + // Now, simply look for the next, best thing to upload + $h.each($.files, function(file){ + if(file.isPaused()===false){ + $h.each(file.chunks, function(chunk){ + if(chunk.status()=='pending' && chunk.preprocessState === 0) { + chunk.send(); + found = true; + return(false); + } + }); + } + if(found) return(false); + }); + if(found) return(true); + + // The are no more outstanding chunks to upload, check is everything is done + var outstanding = false; + $h.each($.files, function(file){ + if(!file.isComplete()) { + outstanding = true; + return(false); + } + }); + if(!outstanding) { + // All chunks have been uploaded, complete + $.fire('complete'); + } + return(false); + }; + + + // PUBLIC METHODS FOR RESUMABLE.JS + $.assignBrowse = function(domNodes, isDirectory){ + if(typeof(domNodes.length)=='undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + var input; + if(domNode.tagName==='INPUT' && domNode.type==='file'){ + input = domNode; + } else { + input = document.createElement('input'); + input.setAttribute('type', 'file'); + input.style.display = 'none'; + domNode.addEventListener('click', function(){ + input.style.opacity = 0; + input.style.display='block'; + input.focus(); + input.click(); + input.style.display='none'; + }, false); + domNode.appendChild(input); + } + var maxFiles = $.getOpt('maxFiles'); + if (typeof(maxFiles)==='undefined'||maxFiles!=1){ + input.setAttribute('multiple', 'multiple'); + } else { + input.removeAttribute('multiple'); + } + if(isDirectory){ + input.setAttribute('webkitdirectory', 'webkitdirectory'); + } else { + input.removeAttribute('webkitdirectory'); + } + // When new files are added, simply append them to the overall list + input.addEventListener('change', function(e){ + appendFilesFromFileList(e.target.files,e); + e.target.value = ''; + }, false); + }); + }; + $.assignDrop = function(domNodes){ + if(typeof(domNodes.length)=='undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + domNode.addEventListener('dragover', onDragOver, false); + domNode.addEventListener('drop', onDrop, false); + }); + }; + $.unAssignDrop = function(domNodes) { + if (typeof(domNodes.length) == 'undefined') domNodes = [domNodes]; + + $h.each(domNodes, function(domNode) { + domNode.removeEventListener('dragover', onDragOver); + domNode.removeEventListener('drop', onDrop); + }); + }; + $.isUploading = function(){ + var uploading = false; + $h.each($.files, function(file){ + if (file.isUploading()) { + uploading = true; + return(false); + } + }); + return(uploading); + }; + $.upload = function(){ + // Make sure we don't start too many uploads at once + if($.isUploading()) return; + // Kick off the queue + $.fire('uploadStart'); + for (var num=1; num<=$.getOpt('simultaneousUploads'); num++) { + $.uploadNextChunk(); + } + }; + $.pause = function(){ + // Resume all chunks currently being uploaded + $h.each($.files, function(file){ + file.abort(); + }); + $.fire('pause'); + }; + $.cancel = function(){ + for(var i = $.files.length - 1; i >= 0; i--) { + $.files[i].cancel(); + } + $.fire('cancel'); + }; + $.progress = function(){ + var totalDone = 0; + var totalSize = 0; + // Resume all chunks currently being uploaded + $h.each($.files, function(file){ + totalDone += file.progress()*file.size; + totalSize += file.size; + }); + return(totalSize>0 ? totalDone/totalSize : 0); + }; + $.addFile = function(file, event){ + appendFilesFromFileList([file], event); + }; + $.removeFile = function(file){ + for(var i = $.files.length - 1; i >= 0; i--) { + if($.files[i] === file) { + $.files.splice(i, 1); + } + } + }; + $.getFromUniqueIdentifier = function(uniqueIdentifier){ + var ret = false; + $h.each($.files, function(f){ + if(f.uniqueIdentifier==uniqueIdentifier) ret = f; + }); + return(ret); + }; + $.getSize = function(){ + var totalSize = 0; + $h.each($.files, function(file){ + totalSize += file.size; + }); + return(totalSize); + }; + + return(this); + }; + + + // Node.js-style export for Node and Component + if (typeof module != 'undefined') { + module.exports = Resumable; + } else if (typeof define === "function" && define.amd) { + // AMD/requirejs: Define the module + define(function(){ + return Resumable; + }); + } else { + // Browser: Expose to window + window.Resumable = Resumable; + } + +})(); diff --git a/ui/js/src/kimchi.template_add_main.js b/ui/js/src/kimchi.template_add_main.js index dbb3952..5651424 100644 --- a/ui/js/src/kimchi.template_add_main.js +++ b/ui/js/src/kimchi.template_add_main.js @@ -387,6 +387,33 @@ kimchi.template_add_main = function() { } } }; + //1-3 upload iso + $('#iso-upload').click(function() { + kimchi.switchPage('iso-type-box', 'iso-upload-box'); + }); + + $('#iso-upload-box-back').click(function() { + kimchi.switchPage('iso-upload-box', 'iso-type-box', 'right'); + }); + + var r = new Resumable({ + target:'storagepools/upload' + }); + + r.on('fileProgress', function(file){ + console.debug(file); + var element=document.getElementById("upload"); + var progress = Math.round(file.progress()*100)+"%" + element.innerHTML=file.fileName+ "-" + progress; + var tmp=document.getElementById("movie"); + tmp.innerHTML=['<div class="uploadify-progress"><div class="uploadify-progress-bar" style="width:', progress,'"></div></div>'].join("") + }); + + r.on('fileAdded', function(file, event){ + r.upload(); + }); + + r.assignBrowse(document.getElementById('browseButton')); }; kimchi.template_check_url = function(url) { diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index 08b27a8..542cd43 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -38,6 +38,7 @@ <script src="$href('libs/jquery-ui.min.js')"></script> <script src="$href('libs/jquery-ui-i18n.min.js')"></script> <script src="$href('js/kimchi.min.js')"></script> +<script src="$href('js/resumable.js')"></script>  <style type="text/css"> diff --git a/ui/pages/template-add.html.tmpl b/ui/pages/template-add.html.tmpl index afe22dd..ecda083 100644 --- a/ui/pages/template-add.html.tmpl +++ b/ui/pages/template-add.html.tmpl @@ -41,6 +41,9 @@ <li> <a id="iso-remote" class="remote">$_("Remote ISO Image")</a> </li> + <li> + <a id="iso-upload" class="local">$_("Upload ISO Image")</a> + </li> </ul> </div> @@ -204,6 +207,16 @@ </div> </div> +  + <div class="page" id="iso-upload-box"> + <header> + <a class="back" id="iso-upload-box-back"></a> + <h2 class="step-title">$_("Upload ISO Image")</h2> + </header> + <a href="#" id="browseButton" class="uploadify-button">Select files</a> + <div id="upload"></div> + <div id="movie"></div> + </div> </div> </div> </div> -- 1.7.9.5

3 9

UI developmet help to fix bug
by Paulo Ricardo Paz Vital 01 Jul '14

01 Jul '14

Hello UI developers. I'd like to ask for one volunteer to help me on coding the UI part for the solution of bugzilla 110428 [1]. This solution will be submitted to Kimchi project. I already have the backend done and tried to do something nice and beautiful, but I'm taking too much time in this part and want some help from you guys. [1] https://bugzilla.linux.ibm.com/show_bug.cgi?id=110428 Thanks and best regards, -- Paulo Ricardo Paz Vital <pvital(a)linux.vnet.ibm.com> IBM Linux Technology Center

2 3