February 2014 - Kimchi-devel - oVirt List Archives

[PATCH v2] UI: Host Software Update Support
by Hongliang Wang 24 Feb '14

24 Feb '14

Added UI support for software updating. The Host Tab will initially list available updates to user if there are any; or we will disable "Update All" Button if no updates available. V1 -> V2: 2a) Fixed "Update All" Button always being disabled issue (Thanks to Paulo Ricardo Paz Vital's comment) Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- ui/css/theme-default/host.css | 22 +++++++++++++++ ui/js/src/kimchi.api.js | 52 ++++++++++++++++++++++++++++++++++ ui/js/src/kimchi.host.js | 65 +++++++++++++++++++++++++++++++++++++++++++ ui/pages/i18n.html.tmpl | 9 ++++++ ui/pages/tabs/host.html.tmpl | 13 +++++++++ 5 files changed, 161 insertions(+) diff --git a/ui/css/theme-default/host.css b/ui/css/theme-default/host.css index 67daeaf..1342ade 100644 --- a/ui/css/theme-default/host.css +++ b/ui/css/theme-default/host.css @@ -227,3 +227,25 @@ width: 300px; } /* End of Debug Report */ + +/* Software Updates */ +.host-panel #software-updates-grid { + border-color: #ddd; + height: 300px; + width: 850px; +} + +.software-update-id { + width: 30px; +} + +.software-update-name, +.software-update-repos { + width: 220px; +} + +.software-update-version, +.software-update-arch { + width: 190px; +} +/* End of Software Updates */ diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 6433fe0..c3a9516 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -731,5 +731,57 @@ var kimchi = { success : suc, error : err }); + }, + + listSoftwareUpdates : function(suc, err) { + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate', + type : 'GET', + contentType : 'application/json', + dataType : 'json', + resend: true, + success : suc, + error : err + }); + }, + + updateSoftwares : function(suc, err) { + var taskID = -1; + var onResponse = function(data) { + taskID = data['id']; + trackTask(); + }; + + var trackTask = function() { + kimchi.getTask(taskID, onTaskResponse, err); + }; + + var onTaskResponse = function(result) { + var taskStatus = result['status']; + switch(taskStatus) { + case 'running': + setTimeout(function() { + trackTask(); + }, 200); + break; + case 'finished': + suc(result); + break; + case 'failed': + err(result); + break; + default: + break; + } + }; + + kimchi.requestJSON({ + url : kimchi.url + 'host/packagesupdate/update', + type : "POST", + contentType : "application/json", + dataType : "json", + success : onResponse, + error : err + }); } }; diff --git a/ui/js/src/kimchi.host.js b/ui/js/src/kimchi.host.js index a5c341b..b6a5878 100644 --- a/ui/js/src/kimchi.host.js +++ b/ui/js/src/kimchi.host.js @@ -131,6 +131,69 @@ kimchi.host_main = function() { }); }; + var softwareUpdatesGridID = 'software-updates-grid'; + var softwareUpdatesGrid = null; + var initSoftwareUpdatesGrid = function(softwareUpdates) { + softwareUpdatesGrid = new kimchi.widget.Grid({ + container: 'software-updates-grid-container', + id: softwareUpdatesGridID, + title: i18n['KCHUPD6001M'], + toolbarButtons: [{ + id: softwareUpdatesGridID + '-update-button', + label: i18n['KCHUPD6006M'], + disabled: true, + onClick: function(event) { + var updateButton = $(this); + $(updateButton).text(i18n['KCHUPD6007M']).prop('disabled', true); + kimchi.updateSoftwares(function(result) { + $(updateButton).text(i18n['KCHUPD6006M']).prop('disabled', false); + }); + } + }], + frozenFields: [{ + name: 'id', + label: ' ', + 'class': 'software-update-id' + }], + fields: [{ + name: 'package_name', + label: i18n['KCHUPD6002M'], + 'class': 'software-update-name' + }, { + name: 'version', + label: i18n['KCHUPD6003M'], + 'class': 'software-update-version' + }, { + name: 'arch', + label: i18n['KCHUPD6004M'], + 'class': 'software-update-arch' + }, { + name: 'repository', + label: i18n['KCHUPD6005M'], + 'class': 'software-update-repos' + }], + data: softwareUpdates + }); + }; + + var listSoftwareUpdates = function() { + kimchi.listSoftwareUpdates(function(softwareUpdates) { + $.each(softwareUpdates, function(i, item) { + softwareUpdates[i]['id'] = i + 1; + }); + + if(softwareUpdatesGrid) { + softwareUpdatesGrid.setData(softwareUpdates); + } + else { + initSoftwareUpdatesGrid(softwareUpdates); + } + + $(softwareUpdatesGridID + '-update-button') + .prop('disabled', softwareUpdates.length === 0); + }); + }; + var shutdownButtonID = '#host-button-shutdown'; var restartButtonID = '#host-button-restart'; var shutdownHost = function(params) { @@ -189,6 +252,8 @@ kimchi.host_main = function() { kimchi.keepMonitoringHost = this['checked']; }); + listSoftwareUpdates(); + kimchi.getCapabilities(function(capabilities) { if(!capabilities['system_report_tool']) { return; diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 098a0a9..a9d86b3 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -94,6 +94,15 @@ var i18n = { 'KCHDR6010M': "$_("Download")", + 'KCHUPD6001M': "$_("Software Updates")", + 'KCHUPD6002M': "$_("Package Name")", + 'KCHUPD6003M': "$_("Version")", + 'KCHUPD6004M': "$_("Architecture")", + 'KCHUPD6005M': "$_("Repository")", + 'KCHUPD6006M': "$_("Update All")", + 'KCHUPD6007M': "$_("Updating...")", + + 'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", 'KCHNET6001E': "$_("The VLAN id must be between 1 and 4094.")", diff --git a/ui/pages/tabs/host.html.tmpl b/ui/pages/tabs/host.html.tmpl index d32773a..1de4fcd 100644 --- a/ui/pages/tabs/host.html.tmpl +++ b/ui/pages/tabs/host.html.tmpl @@ -123,6 +123,19 @@ </div> </div> </div> + <div id="software-update-section" class="host-section"> + <h3 class="section-header" + aria-controls="content-software-update"> + $_("Software Updates") + </h3> + <div id="content-software-update" class="section-content"> + <div class="section-row"> + <div class="section-value"> + <div id="software-updates-grid-container"></div> + </div> + </div> + </div> + </div> <div id="debug-report-section" class="host-section hidden"> <h3 class="section-header" aria-controls="content-sys-reports"> -- 1.8.1.4

3 3

[PATCH 1/2] Issue #243: start/stop/display a VM whose name with "?"
by shaohef＠linux.vnet.ibm.com 24 Feb '14

24 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> create a VM with name ubuntu?guest4 start/stop/display this VM Kimchi will throw a exception: "Unexpected query string parameters: guest4" That's because the URL is not quoted when internal_redirect. Also unquote the ident before dispatch the resource. issue: https://github.com/kimchi-project/kimchi/issues/243 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index 048dd34..50f8c43 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -54,7 +54,6 @@ class Resource(object): """ def __init__(self, model, ident=None): self.model = model - ident = ident if ident is None else urllib2.unquote(ident) self.ident = ident self.model_args = (ident,) self.update_params = [] @@ -76,7 +75,8 @@ class Resource(object): fn = getattr(self.model, model_fn(self, action_name)) ident = fn(*model_args) self._redirect(ident) - uri_params = tuple(self.model_args) + uri_params = tuple([urllib2.quote(arg.encode('utf-8'), safe="") + for arg in self.model_args]) raise internal_redirect(self.uri_fmt % uri_params) except MissingParameter, e: raise cherrypy.HTTPError(400, e.message) @@ -238,6 +238,7 @@ class Collection(object): def _cp_dispatch(self, vpath): if vpath: ident = vpath.pop(0) + ident = urllib2.unquote(ident) # incoming text, from URL, is not unicode, need decode args = self.resource_args + [ident.decode("utf-8")] return self.resource(self.model, *args) -- 1.8.4.2

3 5

[PATCH] Clear unused reference in vmstorages of 'kargs'
by lvroyce＠linux.vnet.ibm.com 24 Feb '14

24 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Unused attribute in VMStorageModel 'kargs', delete it. Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com> --- src/kimchi/model/vmstorages.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/kimchi/model/vmstorages.py b/src/kimchi/model/vmstorages.py index c715b43..7796f30 100644 --- a/src/kimchi/model/vmstorages.py +++ b/src/kimchi/model/vmstorages.py @@ -150,7 +150,6 @@ class VMStoragesModel(object): class VMStorageModel(object): def __init__(self, **kargs): self.conn = kargs['conn'] - self.kargs = kargs def _get_device_xml(self, vm_name, dev_name): # Get VM xml and then devices xml -- 1.8.1.2

2 2

[PATCH] bug fix: add rhel workstation to YUM_DISTROS
by shaohef＠linux.vnet.ibm.com 24 Feb '14

24 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> red hat enterprise linux workstation also use yum to manage package. Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/repositories.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/kimchi/repositories.py b/src/kimchi/repositories.py index 0ab0b1a..40ce266 100644 --- a/src/kimchi/repositories.py +++ b/src/kimchi/repositories.py @@ -28,6 +28,7 @@ from kimchi.exception import InvalidOperation, InvalidParameter from kimchi.exception import OperationFailed, NotFoundError, MissingParameter YUM_DISTROS = ['fedora', 'red hat enterprise linux', + 'red hat enterprise linux workstation', 'red hat enterprise linux server', 'opensuse ', 'suse linux enterprise server '] APT_DISTROS = ['debian', 'ubuntu'] -- 1.8.4.2

2 1

[PATCH] Issue #320: give friendly prompt when kimchid fails to run with non-root user
by shaohef＠linux.vnet.ibm.com 22 Feb '14

22 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> If a non-root/non-sudo user tries to run kimchid, it fails with the verbose stacktrace. This is not friendly to user. There should be a check for these cases, allowing kimchid to fail gracefully. Issue: https://github.com/kimchi-project/kimchi/issues/320 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 6dd0404..f93b6ee 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -158,8 +158,13 @@ class Server(object): pass cherrypy.log.screen = True - cherrypy.log.access_file = options.access_log - cherrypy.log.error_file = options.error_log + try: + cherrypy.log.access_file = options.access_log + cherrypy.log.error_file = options.error_log + except IOError as e: + print e + print "Please run kimchi with root user" + exit() logLevel = LOGGING_LEVEL.get(options.log_level, logging.DEBUG) dev_env = options.environment != 'production' -- 1.8.4.2

3 2

[PATCH] Fix Kimchi UI issues on IE11
by Adam King 21 Feb '14

21 Feb '14

I discovered that the Kimchi UI would not render in IE11 due to some Javascript syntax sensitivity. This patch corrects those issues. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 4 ++-- ui/js/src/kimchi.network.js | 18 +++++++++--------- ui/pages/kimchi-ui.html.tmpl | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 5387495..f652b46 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -197,7 +197,7 @@ kimchi.getDefaultPage = function(url) { if (path) { defautLocation = path.substring(0, path.length - 5); } - }, + } }); return defautLocation; }; @@ -215,7 +215,7 @@ kimchi.getTabHtml = function(url) { var path = $tab.find('path').text(); tabsHtml += "<li><a class='item' href=" + path + ">" + title + "</a></li>"; }); - }, + } }); return tabsHtml; }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c1f87ce..faf1285 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -135,7 +135,7 @@ kimchi.initNetworkCreation = function() { var network = kimchi.getNetworkDialogValues(); var data = { name : network.name, - connection: network.type, + connection: network.type }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; @@ -160,6 +160,13 @@ kimchi.initNetworkCreation = function() { }; kimchi.initNetworkDialog = function() { + + buttonsObj= {}; + buttonsObj['id'] = "networkFormOk"; + buttonsObj['text'] = i18n.KCHAPI6005M; + buttonsObj['class'] = "ui-button-primary"; + buttonsObj['disabled'] = true; + buttonsObj['click'] = function() { }; $("#networkConfig").dialog({ autoOpen : false, modal : true, @@ -174,14 +181,7 @@ kimchi.initNetworkDialog = function() { beforeClose : function() { kimchi.cleanNetworkDialog(); }, - buttons : [ { - id : "networkFormOk", - text : i18n.KCHAPI6005M, - class: "ui-button-primary", - disabled: true, - click : function() { - } - } ] + buttons : [buttonsObj] }); kimchi.setupNetworkFormEvent(); }; diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index eebe886..31b46eb 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -30,6 +30,7 @@ <head> <meta charset="UTF-8"> <title>Kimchi</title> +<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <link rel="shortcut icon" href="images/logo.ico"> <link rel="stylesheet" href="$href('libs/themes/base/jquery-ui.min.css')"> -- 1.8.1.4

2 1

Fwd: [PATCH] Fix Kimchi UI issues on IE11
by Adam King 21 Feb '14

21 Feb '14

I discovered that the Kimchi UI would not render in IE11 due to some Javascript syntax sensitivity. This patch corrects those issues. Signed-off-by: Adam King <rak(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.main.js | 4 ++-- ui/js/src/kimchi.network.js | 18 +++++++++--------- ui/pages/kimchi-ui.html.tmpl | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/ui/js/src/kimchi.main.js b/ui/js/src/kimchi.main.js index 5387495..f652b46 100644 --- a/ui/js/src/kimchi.main.js +++ b/ui/js/src/kimchi.main.js @@ -197,7 +197,7 @@ kimchi.getDefaultPage = function(url) { if (path) { defautLocation = path.substring(0, path.length - 5); } - }, + } }); return defautLocation; }; @@ -215,7 +215,7 @@ kimchi.getTabHtml = function(url) { var path = $tab.find('path').text(); tabsHtml += "<li><a class='item' href=" + path + ">" + title + "</a></li>"; }); - }, + } }); return tabsHtml; }; diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js index c1f87ce..faf1285 100644 --- a/ui/js/src/kimchi.network.js +++ b/ui/js/src/kimchi.network.js @@ -135,7 +135,7 @@ kimchi.initNetworkCreation = function() { var network = kimchi.getNetworkDialogValues(); var data = { name : network.name, - connection: network.type, + connection: network.type }; if (network.type === kimchi.NETWORK_TYPE_BRIDGE) { data.connection = "bridge"; @@ -160,6 +160,13 @@ kimchi.initNetworkCreation = function() { }; kimchi.initNetworkDialog = function() { + + buttonsObj= {}; + buttonsObj['id'] = "networkFormOk"; + buttonsObj['text'] = i18n.KCHAPI6005M; + buttonsObj['class'] = "ui-button-primary"; + buttonsObj['disabled'] = true; + buttonsObj['click'] = function() { }; $("#networkConfig").dialog({ autoOpen : false, modal : true, @@ -174,14 +181,7 @@ kimchi.initNetworkDialog = function() { beforeClose : function() { kimchi.cleanNetworkDialog(); }, - buttons : [ { - id : "networkFormOk", - text : i18n.KCHAPI6005M, - class: "ui-button-primary", - disabled: true, - click : function() { - } - } ] + buttons : [buttonsObj] }); kimchi.setupNetworkFormEvent(); }; diff --git a/ui/pages/kimchi-ui.html.tmpl b/ui/pages/kimchi-ui.html.tmpl index eebe886..31b46eb 100644 --- a/ui/pages/kimchi-ui.html.tmpl +++ b/ui/pages/kimchi-ui.html.tmpl @@ -30,6 +30,7 @@ <head> <meta charset="UTF-8"> <title>Kimchi</title> +<meta http-equiv="X-UA-Compatible" content="IE=edge"/> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" /> <link rel="shortcut icon" href="images/logo.ico"> <link rel="stylesheet" href="$href('libs/themes/base/jquery-ui.min.css')"> -- 1.8.1.4

1 0

[PATCH] Fix messages in guest UI
by Rodrigo Trujillo 21 Feb '14

21 Feb '14

In the guest UI, some messages were missed to add to i18n file. This patch fixes this. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.guest_main.js | 16 ++++++++-------- ui/pages/i18n.html.tmpl | 8 ++++++++ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/ui/js/src/kimchi.guest_main.js b/ui/js/src/kimchi.guest_main.js index b5e7af3..d43b62f 100644 --- a/ui/js/src/kimchi.guest_main.js +++ b/ui/js/src/kimchi.guest_main.js @@ -31,7 +31,7 @@ kimchi.vmstart = function(event) { kimchi.listVmsAuto(); }, function() { startButton.removeClass('loading'); - kimchi.message.error(i18n['msg.fail.start']); + kimchi.message.error(i18n['KCHVM6002M']); } ); } else { @@ -51,7 +51,7 @@ kimchi.vmstop = function(event) { button.removeClass('loading'); kimchi.listVmsAuto(); }, function() { - kimchi.message.error(i18n['msg.fail.stop']); + kimchi.message.error(i18n['KCHVM6003M']); }); } else { event.preventDefault(); @@ -65,7 +65,7 @@ kimchi.vmreset = function(event){ kimchi.resetVM(vm_id, function(result) { kimchi.listVmsAuto(); }, function() { - kimchi.message.error(i18n['msg.fail.reset']); + kimchi.message.error(i18n['KCHVM6004M']); } ); }; @@ -74,16 +74,16 @@ kimchi.vmdelete = function(event) { var vm = $(this).closest('li[name=guest]'); var vm_id=vm.attr("id"); var settings = { - title : i18n['msg.confirm.delete.title'], - content : i18n['msg.vm.confirm.delete'], - confirm : i18n['msg.confirm.delete.confirm'], - cancel : i18n['msg.confirm.delete.cancel'] + title : i18n['KCHVM6005M'], + content : i18n['KCHVM6006M'], + confirm : i18n['KCHAPI6002M'], + cancel : i18n['KCHAPI6003M'] }; kimchi.confirm(settings, function() { kimchi.deleteVM(vm_id, function(result) { kimchi.listVmsAuto(); }, function() { - kimchi.message.error(i18n['msg.fail.delete']); + kimchi.message.error(i18n['KCHVM6007M']); }); }, function() { }); diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl index 613b707..cd48029 100644 --- a/ui/pages/i18n.html.tmpl +++ b/ui/pages/i18n.html.tmpl @@ -95,6 +95,14 @@ var i18n = { 'KCHVM6001M': "$_("This will delete the virtual machine and its virtual disks. This operation cannot be undone. Would you like to continue?")", + 'KCHVM6002M': "$_("Failed to start")", + 'KCHVM6003M': "$_("Failed to stop")", + 'KCHVM6004M': "$_("Failed to reset")", + 'KCHVM6005M': "$_("Delete Confirmation")", + 'KCHVM6006M': "$_("This will delete the VM and its virtual disks. " + "This operation cannot be undone. " + "Would you like to continue?")", + 'KCHVM6007M': "$_("Failed to delete")", 'KCHNET6001E': "$_("The VLAN id must be between 1 and 4094.")", -- 1.8.5.3

2 1

[PATCH 0/2] cdrom: Fix cdrom update
by lvroyce＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: Royce Lv <lvroyce(a)linux.vnet.ibm.com> Cdrom update should be able to operated when vm is running, and do no change to the device target. Fix formal implementation. Royce Lv (2): cdrom: fix cdrom change media cdrom: update model test for media update src/kimchi/model/vmstorages.py | 116 ++++++++++++++++++++--------------------- tests/test_model.py | 14 +++-- 2 files changed, 68 insertions(+), 62 deletions(-) -- 1.8.1.2

2 3

[PATCH] Fix typo on API.json and add missing error messages
by Aline Manera 21 Feb '14

21 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Instead of storages_create and storages_update they should be vmstorages_create and vmstorages_update. Fix it in order to use jsonschema to validate data while adding/updating vm cdrom. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- src/kimchi/API.json | 6 ++++-- src/kimchi/i18n.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index d3a8e64..1189c01 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -352,8 +352,9 @@ "additionalProperties": false, "error": "KCHAPI0001E" }, - "storages_create": { + "vmstorages_create": { "type": "object", + "error": "KCHCDROM0012E", "properties": { "dev": { "description": "The storage (cd-rom) device name", @@ -377,8 +378,9 @@ } } }, - "storage_update": { + "vmstorage_update": { "type": "object", + "error": "KCHCDROM0013E", "properties": { "path": { "description": "Path of iso image file or disk mount point", diff --git a/src/kimchi/i18n.py b/src/kimchi/i18n.py index 43acd71..dfc1b2b 100644 --- a/src/kimchi/i18n.py +++ b/src/kimchi/i18n.py @@ -197,15 +197,16 @@ messages = { "KCHCDROM0001E": _("Invalid CDROM device name"), "KCHCDROM0002E": _("Invalid storage type. Types supported: 'cdrom'"), - "KCHCDROM0003E": _("The path %(value)s is not valid local/remote path for the device"), + "KCHCDROM0003E": _("The path '%(value)s' is not valid local/remote path for the device"), "KCHCDROM0004E": _("Device name %(dev_name)s already exists in vm %(vm_name)s"), - "KCHCDROM0005E": _("Must specify a device name"), "KCHCDROM0006E": _("Can't specify a directory for a CDROM device path"), "KCHCDROM0007E": _("The storage device %(dev_name)s does not exist in the guest %(vm_name)s"), "KCHCDROM0008E": _("Error while creating new storage device: %(error)s"), "KCHCDROM0009E": _("Error while updating storage device: %(error)s"), "KCHCDROM0010E": _("Error while removing storage device: %(error)s"), "KCHCDROM0011E": _("Do not support guest CDROM hot plug attachment"), + "KCHCDROM0012E": _("Specify type and path to add a new virtual machine disk"), + "KCHCDROM0013E": _("Specify path to update virtual machine disk"), "KCHREPOS0001E": _("Repository ID must be one word only string."), "KCHREPOS0002E": _("Repository URL must be an http://, ftp:// or file:// URL."), -- 1.7.10.4

2 2

Re: [Kimchi-devel] Undefined lable in template buttons.
by Aline Manera 21 Feb '14

21 Feb '14

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH] Issue #315: edit/delete templates that contains slashes in their names
by shaohef＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> we should unquote the resource name when it contains special characters. issue: https://github.com/kimchi-project/kimchi/issues/315 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/control/base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/kimchi/control/base.py b/src/kimchi/control/base.py index e8f03ae..048dd34 100644 --- a/src/kimchi/control/base.py +++ b/src/kimchi/control/base.py @@ -54,6 +54,7 @@ class Resource(object): """ def __init__(self, model, ident=None): self.model = model + ident = ident if ident is None else urllib2.unquote(ident) self.ident = ident self.model_args = (ident,) self.update_params = [] @@ -61,7 +62,7 @@ class Resource(object): def _redirect(self, ident, code=303): if ident is not None and ident != self.ident: uri_params = list(self.model_args[:-1]) - uri_params += [urllib2.quote(ident.encode('utf-8'))] + uri_params += [urllib2.quote(ident.encode('utf-8'), safe="")] raise cherrypy.HTTPRedirect(self.uri_fmt % tuple(uri_params), code) def generate_action_handler(self, action_name, action_args=None): -- 1.8.4.2

2 1

[PATCH] Issue 316: allow dir storage directory path ending with '/'
by shaohef＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> Allow dir storage directory path ending with '/' issue: https://github.com/kimchi-project/kimchi/issues/316 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ac97e1a..b634ca6 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -167,7 +167,7 @@ kimchi.validateDirForm = function () { kimchi.message.error.code('KCHPOOL6002E'); return false; } - if (!/((\/([0-9a-zA-Z-_\.]+)))$/.test(path)) { + if (!/((\/([0-9a-zA-Z-_\.]+)\/*?))$/.test(path)) { kimchi.message.error.code('KCHAPI6003E'); return false; } -- 1.8.4.2

3 2

[PATCH V2 0/4] Implement integrity verification: verify template integrity
by shaohef＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V1 -> V2 rename invalid_integrity to validate_integrity change list to array in API.md list is the python semantic, array is json semantic. Implement integrity verification: verify template integrity, update API.md Sometimes, user create a template, but networks, cdrom, disks or storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check some paramenters of template. ShaoHe Feng (4): Implement integrity verification: verify template integrity, update API.md add a new method to get iso info for VMTemplate class Implement integrity verification: verify template integrity in backend Implement integrity verification: update test case docs/API.md | 4 +++ src/kimchi/control/templates.py | 1 + src/kimchi/mockmodel.py | 5 +++- src/kimchi/model/templates.py | 7 +++++- src/kimchi/vmtemplate.py | 54 ++++++++++++++++++++++++++++++++--------- tests/test_model.py | 33 +++++++++++++++++++++++++ tests/test_rest.py | 40 ++++++++++++++++++++++++++++++ 7 files changed, 131 insertions(+), 13 deletions(-) -- 1.8.4.2

3 7

[PATCH] Fix ui/js/Makefile.am
by Aline Manera 21 Feb '14

21 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> kimchi-min.js is generated during build process so we need to explicit list it on Makefile. Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- ui/js/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index ed75ea2..aae9b9c 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -24,7 +24,7 @@ EXTRA_DIST = src widgets jsdir = $(datadir)/kimchi/ui/js -dist_js_DATA = $(wildcard *.js) $(NULL) +dist_js_DATA = kimchi.min.js $(wildcard *.js) $(NULL) kimchi.min.js: widgets/*.js src/*.js cat $(sort $^) > $@ -- 1.7.10.4

2 2

[PATCH V3 0/4] Implement integrity verification: verify template integrity
by shaohef＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> V2 -> V3 use listNetworks() + listDefinedNetworks() instead of listAllNetworks() V1 -> V2 rename invalid_integrity to validate_integrity change list to array in API.md list is the python semantic, array is json semantic. Implement integrity verification: verify template integrity, update API.md Sometimes, user create a template, but networks, cdrom, disks or storagepool will change later. So users can not create a vm from this template successfully. It is necessary to check some paramenters of template. ShaoHe Feng (4): Implement integrity verification: verify template integrity, update API.md add a new method to get iso info for VMTemplate class Implement integrity verification: verify template integrity in backend Implement integrity verification: update test case docs/API.md | 4 +++ src/kimchi/control/templates.py | 1 + src/kimchi/mockmodel.py | 5 +++- src/kimchi/model/templates.py | 7 +++++- src/kimchi/vmtemplate.py | 54 ++++++++++++++++++++++++++++++++--------- tests/test_model.py | 33 +++++++++++++++++++++++++ tests/test_rest.py | 40 ++++++++++++++++++++++++++++++ 7 files changed, 131 insertions(+), 13 deletions(-) -- 1.8.4.2

4 10

[PATCH] Fix directory path validation for 'DIR' type storage pool
by Mark Wu 21 Feb '14

21 Feb '14

The current regex will refuse the strings which end with '/'. Obviously, even if the dir path ends with '/', it's still valid. So this patch changes the regex to accept this case. Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com> --- ui/js/src/kimchi.storagepool_add_main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js index ac97e1a..8c0025f 100644 --- a/ui/js/src/kimchi.storagepool_add_main.js +++ b/ui/js/src/kimchi.storagepool_add_main.js @@ -167,7 +167,7 @@ kimchi.validateDirForm = function () { kimchi.message.error.code('KCHPOOL6002E'); return false; } - if (!/((\/([0-9a-zA-Z-_\.]+)))$/.test(path)) { + if (!/(\/([0-9a-zA-Z-_\.]+))+\/?$/.test(path)) { kimchi.message.error.code('KCHAPI6003E'); return false; } -- 1.8.4.2

5 4

[PATCH] Use $(wildcard) to list files in Makefile
by Aline Manera 21 Feb '14

21 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> Instead of listing file by file in Makefile it is better to use a pattern for it. That way when adding a new file we don't need to change the Makefile anymore, unless the pattern changes for some reason (new file extension or so). Signed-off-by: Aline Manera <alinefm(a)br.ibm.com> --- config/Makefile.am | 1 - plugins/sample/Makefile.am | 7 +------ src/kimchi/Makefile.am | 35 +---------------------------------- tests/Makefile.am | 15 +-------------- ui/js/Makefile.am | 7 +------ ui/js/novnc/Makefile.am | 13 +------------ ui/libs/Makefile.am | 7 +------ ui/libs/themes/base/Makefile.am | 4 +--- ui/pages/Makefile.am | 15 +-------------- ui/pages/help/Makefile.am | 2 ++ ui/pages/tabs/Makefile.am | 8 +------- 11 files changed, 11 insertions(+), 103 deletions(-) diff --git a/config/Makefile.am b/config/Makefile.am index 8c5d364..514ae25 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -19,4 +19,3 @@ # limitations under the License. SUBDIRS = ui -#configdir = $(datadir)/kimchi/config diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am index afab703..bb2d926 100644 --- a/plugins/sample/Makefile.am +++ b/plugins/sample/Makefile.am @@ -22,9 +22,4 @@ SUBDIRS = ui -EXTRA_DIST = \ - __init__.py \ - API.json \ - model.py \ - i18n.py \ - sample.conf +EXTRA_DIST = API.json sample.conf $(wildcard *.py) diff --git a/src/kimchi/Makefile.am b/src/kimchi/Makefile.am index 6adef3c..6a0e100 100644 --- a/src/kimchi/Makefile.am +++ b/src/kimchi/Makefile.am @@ -22,40 +22,7 @@ SUBDIRS = control model -kimchi_PYTHON = \ - __init__.py \ - asynctask.py \ - auth.py \ - basemodel.py \ - cachebust.py \ - disks.py \ - distroloader.py \ - exception.py \ - featuretests.py \ - i18n.py \ - iscsi.py \ - isoinfo.py \ - mockmodel.py \ - netinfo.py \ - network.py \ - networkxml.py \ - objectstore.py \ - osinfo.py \ - repositories.py \ - rollbackcontext.py \ - root.py \ - scan.py \ - screenshot.py \ - server.py \ - sslcert.py \ - swupdate.py \ - template.py \ - utils.py \ - vmtemplate.py \ - vnc.py \ - websocket.py \ - websockify.py \ - xmlutils.py +kimchi_PYTHON = $(filter-out config.py, $(wildcard *.py)) nodist_kimchi_PYTHON = config.py diff --git a/tests/Makefile.am b/tests/Makefile.am index e8db05c..1c40f5b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -23,21 +23,8 @@ EXTRA_DIST = \ Makefile.am \ run_tests.sh.in \ - iso_gen.py \ - test_authorization.py \ test_config.py.in \ - test_exception.py \ - test_mockmodel.py \ - test_model.py \ - test_networkxml.py \ - test_osinfo.py \ - test_plugin.py \ - test_rest.py \ - test_rollbackcontext.py \ - test_server.py \ - test_storagepool.py \ - test_vmtemplate.py \ - utils.py \ + $(filter-out test_config.py, $(wildcard *.py)) \ $(NULL) noinst_SCRIPTS = run_tests.sh diff --git a/ui/js/Makefile.am b/ui/js/Makefile.am index 1468569..ed75ea2 100644 --- a/ui/js/Makefile.am +++ b/ui/js/Makefile.am @@ -24,12 +24,7 @@ EXTRA_DIST = src widgets jsdir = $(datadir)/kimchi/ui/js -dist_js_DATA = \ - kimchi.min.js \ - jquery.min.js \ - jquery-ui.js \ - modernizr.custom.2.6.2.min.js \ - $(NULL) +dist_js_DATA = $(wildcard *.js) $(NULL) kimchi.min.js: widgets/*.js src/*.js cat $(sort $^) > $@ diff --git a/ui/js/novnc/Makefile.am b/ui/js/novnc/Makefile.am index 61383f8..b9038d7 100644 --- a/ui/js/novnc/Makefile.am +++ b/ui/js/novnc/Makefile.am @@ -22,15 +22,4 @@ SUBDIRS = web-socket-js jsdir = $(datadir)/kimchi/ui/js/novnc -dist_js_DATA = \ - base64.js \ - des.js \ - display.js \ - input.js \ - jsunzip.js \ - main.js \ - rfb.js \ - util.js \ - websock.js \ - webutil.js \ - $(NULL) +dist_js_DATA = $(wildcard *.js) $(NULL) diff --git a/ui/libs/Makefile.am b/ui/libs/Makefile.am index d9bc761..0e99517 100644 --- a/ui/libs/Makefile.am +++ b/ui/libs/Makefile.am @@ -22,9 +22,4 @@ SUBDIRS = themes jsdir = $(datadir)/kimchi/ui/libs -dist_js_DATA = \ - jquery-1.10.0.min.js \ - jquery-ui.min.js \ - jquery-ui-i18n.min.js \ - modernizr.custom.76777.js \ - $(NULL) +dist_js_DATA = $(wildcard *.js) $(NULL) diff --git a/ui/libs/themes/base/Makefile.am b/ui/libs/themes/base/Makefile.am index 811b2e6..ccf12e8 100644 --- a/ui/libs/themes/base/Makefile.am +++ b/ui/libs/themes/base/Makefile.am @@ -23,6 +23,4 @@ SUBDIRS = images basedir = $(datadir)/kimchi/ui/libs/themes/base -dist_base_DATA = \ - jquery-ui.min.css \ - $(NULL) +dist_base_DATA = $(wildcard *.css) $(NULL) diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 8d72398..42bbfa0 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -22,17 +22,4 @@ SUBDIRS = help tabs htmldir = $(datadir)/kimchi/ui/pages -dist_html_DATA = \ - error.html.tmpl \ - kimchi-ui.html.tmpl \ - guest-add.html.tmpl \ - guest-edit.html.tmpl \ - guest.html.tmpl \ - template-add.html.tmpl \ - template-edit.html.tmpl \ - vnc_auto.html.tmpl \ - i18n.html.tmpl \ - login-window.html.tmpl \ - storagepool-add.html.tmpl \ - report-add.html.tmpl \ - $(NULL) +dist_html_DATA = $(wildcard *.html.tmpl) $(NULL) diff --git a/ui/pages/help/Makefile.am b/ui/pages/help/Makefile.am index 5146692..cd09995 100644 --- a/ui/pages/help/Makefile.am +++ b/ui/pages/help/Makefile.am @@ -25,6 +25,8 @@ helpdir = $(datadir)/kimchi/ui/pages/help dist_help_DATA = $(HTML_FILES) $(NULL) +EXTRA_DIST = $(wildcard *.dita) + %.html: %.dita $(DITA_XSL_FILE) xsltproc -o $@ $(DITA_XSL_FILE) $< $(shell pwd)/gen-index.py diff --git a/ui/pages/tabs/Makefile.am b/ui/pages/tabs/Makefile.am index 163401b..fee2a5e 100644 --- a/ui/pages/tabs/Makefile.am +++ b/ui/pages/tabs/Makefile.am @@ -20,10 +20,4 @@ tabshtmldir = $(datadir)/kimchi/ui/pages/tabs -dist_tabshtml_DATA = \ - guests.html.tmpl \ - host.html.tmpl \ - network.html.tmpl \ - storage.html.tmpl \ - templates.html.tmpl \ - $(NULL) +dist_tabshtml_DATA = $(wildcard *.html.tmpl) $(NULL) -- 1.7.10.4

2 2

[PATCH] Issue #320: give friendly prompt when kimchid fails to run with non-root user
by shaohef＠linux.vnet.ibm.com 21 Feb '14

21 Feb '14

From: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> If a non-root/non-sudo user tries to run kimchid, it fails with the verbose stacktrace. This is not friendly to user. There should be a check for these cases, allowing kimchid to fail gracefully. Issue: https://github.com/kimchi-project/kimchi/issues/320 Signed-off-by: ShaoHe Feng <shaohef(a)linux.vnet.ibm.com> --- src/kimchi/server.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/kimchi/server.py b/src/kimchi/server.py index 6dd0404..f93b6ee 100644 --- a/src/kimchi/server.py +++ b/src/kimchi/server.py @@ -158,8 +158,13 @@ class Server(object): pass cherrypy.log.screen = True - cherrypy.log.access_file = options.access_log - cherrypy.log.error_file = options.error_log + try: + cherrypy.log.access_file = options.access_log + cherrypy.log.error_file = options.error_log + except IOError as e: + print e + print "Please run kimchi with root user" + exit() logLevel = LOGGING_LEVEL.get(options.log_level, logging.DEBUG) dev_env = options.environment != 'production' -- 1.8.4.2

1 0

[PATCH 0/6 V4] Host's repositories management support
by Paulo Vital 21 Feb '14

21 Feb '14

V3 -> V4: * PEP8 compatibility * Fixed bugs regarding exception error system code in mockmodel.py, model/host.py and repository.py * Removed the "enabled" parameter from update_params' list. V2 -> V3: * PEP8 compatibility * Improved mockmodel.py and model/host.py * Updated API.json and backend files to use new exception error system code V1 -> V2: * Removed the enable/disable from docs/API.md and src/kimchi/API.json * fixed wrong URI on test_rest.py * PEP8 compatibility * Updated repositories.py to make consistent with docs/API.md * Raised correct exceptions * Changed model/host.py and mockmodel.py to generate repo_id if not provided * Changed mockmodel.py to declare MockRepositories class V1: This patch set provides support to host's repositories management operations. At this point, an agnostic class is providing support to backend and REST API operations. In addition, YUM (for RHEL, Fedora, SLES and OpenSuse) and APT (for Debian and Ubuntu) specific classes are provided to support the operation os each software update system. To test the backend execute the following commands: $ cd tests $ sudo ./run_tests.sh test_model.ModelTests.test_repository_create $ sudo ./run_tests.sh test_model.ModelTests.test_repository_update $ sudo ./run_tests.sh test_model.ModelTests.test_repository_disable_enable To test the REST API, execute the following commands (all them are agnostic of the host's distro): 1) Get list of all repositories enabled in the host: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X GET 2) Create a new repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X POST -d' { "repo_id": "fedora-fake", "baseurl": "http://www.fedora.org", "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-fake-19" } ' 3) Get information from a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake 4) Update a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X PUT -d' { "repo_id":"fedora-fake", "repo_name":"Fedora 19 FAKEs", "baseurl": "http://www.fedora.org/downloads" } ' 5) Disable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/disable -X POST -d '' 6) Enable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/enable -X POST -d '' 7) Delete a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X DELETE Paulo Vital (6): Host's repositories management: Update API.md Host's repositories management: Update REST API Host's repositories management: Update backend. Host's repositories management: Update Makefile Host's repositories management: Update test-cases. Host's repositories management: Update error exception messages. Makefile.am | 1 + docs/API.md | 77 ++++++ src/kimchi/API.json | 76 ++++++ src/kimchi/Makefile.am | 1 + src/kimchi/control/host.py | 21 ++ src/kimchi/i18n.py | 19 ++ src/kimchi/mockmodel.py | 133 ++++++++++ src/kimchi/model/host.py | 54 ++++- src/kimchi/repositories.py | 586 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 100 ++++++++ tests/test_rest.py | 33 +++ 11 files changed, 1100 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/repositories.py -- 1.8.3.1

2 9

[PATCH] Return 403 Forbidden when user does not have permission to access kimchi
by Aline Manera 21 Feb '14

21 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> This patch **partial** fix bug #323. We still need to update UI to properly avoid user to perform some operations when he/she does not have enough permission to do it. Aline Manera (1): Return 403 Forbidden when user does not have permission to access kimchi po/en_US.po | 83 +++++++++++++++++++++++++++++++++++++++++-- po/kimchi.pot | 83 +++++++++++++++++++++++++++++++++++++++++-- po/pt_BR.po | 83 +++++++++++++++++++++++++++++++++++++++++-- po/zh_CN.po | 83 +++++++++++++++++++++++++++++++++++++++++-- src/kimchi/auth.py | 10 ++++-- src/kimchi/i18n.py | 1 + tests/test_authorization.py | 30 ++++++++-------- 7 files changed, 348 insertions(+), 25 deletions(-) -- 1.7.10.4

3 6

[PATCH] Fix duplicate dev names in host with multipath storage
by Rodrigo Trujillo 21 Feb '14

21 Feb '14

If the host has a storage connection with multipath, lsblk is going to return the block devices twice, then when creating LOGICAL storage pool the user sees devices paths replicated in the UI. This patch fixes this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- src/kimchi/disks.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/kimchi/disks.py b/src/kimchi/disks.py index 83d5cc6..ef065e2 100644 --- a/src/kimchi/disks.py +++ b/src/kimchi/disks.py @@ -113,7 +113,7 @@ def _get_vgname(devNodePath): def get_partitions_names(): - names = [] + names = set() keys = ["NAME", "TYPE", "FSTYPE", "MOUNTPOINT", "MAJ:MIN"] # output is on format key="value", # where key can be NAME, TYPE, FSTYPE, MOUNTPOINT @@ -133,9 +133,9 @@ def get_partitions_names(): _is_dev_leaf(devNodePath)): continue - names.append(name) + names.add(name) - return names + return list(names) def get_partition_details(name): -- 1.8.5.3

3 2

[PATCH] Adds spice.html.tmpl to makefile.am
by Rodrigo Trujillo 20 Feb '14

20 Feb '14

The file spice.html.tmpl is not being added to rpm packages because it was not added to Makefile.am. This patch fixed this problem. Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com> --- ui/pages/Makefile.am | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/pages/Makefile.am b/ui/pages/Makefile.am index 8d72398..9908376 100644 --- a/ui/pages/Makefile.am +++ b/ui/pages/Makefile.am @@ -35,4 +35,5 @@ dist_html_DATA = \ login-window.html.tmpl \ storagepool-add.html.tmpl \ report-add.html.tmpl \ + spice.html.tmpl \ $(NULL) -- 1.8.5.3

3 3

[PATCH 0/6 V5] Host's repositories management support
by Paulo Vital 20 Feb '14

20 Feb '14

V4 -> V5: * Updated test_rest.py * Fixed wrong dict declaration on mockmodel.py V3 -> V4: * PEP8 compatibility * Fixed bugs regarding exception error system code in mockmodel.py, model/host.py and repository.py * Removed the "enabled" parameter from update_params' list. V2 -> V3: * PEP8 compatibility * Improved mockmodel.py and model/host.py * Updated API.json and backend files to use new exception error system code V1 -> V2: * Removed the enable/disable from docs/API.md and src/kimchi/API.json * fixed wrong URI on test_rest.py * PEP8 compatibility * Updated repositories.py to make consistent with docs/API.md * Raised correct exceptions * Changed model/host.py and mockmodel.py to generate repo_id if not provided * Changed mockmodel.py to declare MockRepositories class V1: This patch set provides support to host's repositories management operations. At this point, an agnostic class is providing support to backend and REST API operations. In addition, YUM (for RHEL, Fedora, SLES and OpenSuse) and APT (for Debian and Ubuntu) specific classes are provided to support the operation os each software update system. To test the backend execute the following commands: $ cd tests $ sudo ./run_tests.sh test_model.ModelTests.test_repository_create $ sudo ./run_tests.sh test_model.ModelTests.test_repository_update $ sudo ./run_tests.sh test_model.ModelTests.test_repository_disable_enable To test the REST API, execute the following commands (all them are agnostic of the host's distro): 1) Get list of all repositories enabled in the host: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X GET 2) Create a new repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/ -X POST -d' { "repo_id": "fedora-fake", "baseurl": "http://www.fedora.org", "gpgkey": "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-fake-19" } ' 3) Get information from a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake 4) Update a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X PUT -d' { "repo_id":"fedora-fake", "repo_name":"Fedora 19 FAKEs", "baseurl": "http://www.fedora.org/downloads" } ' 5) Disable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/disable -X POST -d '' 6) Enable a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake/enable -X POST -d '' 7) Delete a specific repository: $ curl -u <USER> -H 'Content-type: application/json' -H 'Accept: application/json' http://localhost:8000/host/repositories/fedora-fake -X DELETE Paulo Vital (6): Host's repositories management: Update API.md Host's repositories management: Update REST API Host's repositories management: Update backend. Host's repositories management: Update Makefile Host's repositories management: Update test-cases. Host's repositories management: Update error exception messages. Makefile.am | 1 + docs/API.md | 77 ++++++ src/kimchi/API.json | 72 ++++++ src/kimchi/Makefile.am | 1 + src/kimchi/control/host.py | 21 ++ src/kimchi/i18n.py | 19 ++ src/kimchi/mockmodel.py | 135 +++++++++++ src/kimchi/model/host.py | 54 ++++- src/kimchi/repositories.py | 586 +++++++++++++++++++++++++++++++++++++++++++++ tests/test_model.py | 100 ++++++++ tests/test_rest.py | 38 +++ 11 files changed, 1103 insertions(+), 1 deletion(-) create mode 100644 src/kimchi/repositories.py -- 1.8.3.1

2 8

[PATCH 0/2] doc: Create index.html to join all help pages
by Aline Manera 20 Feb '14

20 Feb '14

From: Aline Manera <alinefm(a)br.ibm.com> It also fixes a bug found while building deb package. Aline Manera (2): bug fix: Package doc html files into deb package doc: Generate index.html to join all help pages ui/pages/help/Makefile.am | 8 +++--- ui/pages/help/gen-index.py | 64 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 3 deletions(-) create mode 100755 ui/pages/help/gen-index.py -- 1.7.10.4

4 17