Update API.json for validation. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- src/kimchi/API.json | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/kimchi/API.json b/src/kimchi/API.json index 76c94ab..39bfc8c 100644 --- a/src/kimchi/API.json +++ b/src/kimchi/API.json @@ -41,6 +41,17 @@ } } }, + "debugreport_update": { + "type": "object", + "properties": { + "name": { + "description": "New name of debug report", + "type": "string", + "pattern": "^[A-Za-z0-9-]*$", + "error": "KCHDR0007E" + } + } + }, "storagepools_create": { "type": "object", "error": "KCHPOOL0026E", -- 1.8.1.4

Update API.md accordingly. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- docs/API.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/API.md b/docs/API.md index 9217a37..6a8c02e 100644 --- a/docs/API.md +++ b/docs/API.md @@ -707,6 +707,9 @@ specific to the low level collection tool being used. * uri: The URI path to download a debug report * time: The time when the debug report is created +* **PUT**: rename an existed debug report + * name: The new name for this debug report + * **DELETE**: Remove the Debug Report * name: The debug report name used to identify the report -- 1.8.1.4

Added processing in model and controller. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- src/kimchi/control/debugreports.py | 4 +++- src/kimchi/model/debugreports.py | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 3c12230..65b53a3 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -22,7 +22,7 @@ from kimchi.control.utils import internal_redirect from kimchi.control.utils import UrlSubNode -@UrlSubNode("debugreports", True, ['GET', 'POST']) +@UrlSubNode("debugreports", True, ['GET', 'PUT', 'POST']) class DebugReports(AsyncCollection): def __init__(self, model): super(DebugReports, self).__init__(model) @@ -32,6 +32,8 @@ class DebugReports(AsyncCollection): class DebugReport(Resource): def __init__(self, model, ident): super(DebugReport, self).__init__(model, ident) + self.update_params = ["name"] + self.uri_fmt = '/debugreports/%s' self.content = DebugReportContent(model, ident) @property diff --git a/src/kimchi/model/debugreports.py b/src/kimchi/model/debugreports.py index cd31b31..43c4fb6 100644 --- a/src/kimchi/model/debugreports.py +++ b/src/kimchi/model/debugreports.py @@ -170,6 +170,19 @@ class DebugReportModel(object): return {'uri': file_target, 'ctime': ctime} + def update(self, name, params): + path = config.get_debugreports_path() + file_pattern = os.path.join(path, name + '.*') + try: + file_source = glob.glob(file_pattern)[0] + except IndexError: + raise NotFoundError("KCHDR0001E", {'name': name}) + + file_target = file_source.replace(name, params['name']) + shutil.move(file_source, file_target) + kimchi_log.info('%s renamed to %s' % (file_source, file_target)) + return params['name'] + def delete(self, name): path = config.get_debugreports_path() file_pattern = os.path.join(path, name + '.*') -- 1.8.1.4

On 05/22/2014 03:55 PM, Hongliang Wang wrote: -- Thanks and best regards! Sheldon Feng(冯少合)&lt;shaohef(a)linux.vnet.ibm.com&gt; IBM Linux Technology Center

Sorted reports by generated time descendingly. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- src/kimchi/control/debugreports.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/kimchi/control/debugreports.py b/src/kimchi/control/debugreports.py index 65b53a3..444cb07 100644 --- a/src/kimchi/control/debugreports.py +++ b/src/kimchi/control/debugreports.py @@ -28,6 +28,10 @@ class DebugReports(AsyncCollection): super(DebugReports, self).__init__(model) self.resource = DebugReport + 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) + class DebugReport(Resource): def __init__(self, model, ident): -- 1.8.1.4

Added API. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- ui/js/src/kimchi.api.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ui/js/src/kimchi.api.js b/ui/js/src/kimchi.api.js index 7d85fdf..584eabe 100644 --- a/ui/js/src/kimchi.api.js +++ b/ui/js/src/kimchi.api.js @@ -695,6 +695,18 @@ var kimchi = { }); }, + renameReport : function(name, settings, suc, err) { + $.ajax({ + url : kimchi.url + "debugreports/" + encodeURIComponent(name), + type : 'PUT', + contentType : 'application/json', + data : JSON.stringify(settings), + dataType : 'json', + success: suc, + error: err + }); + }, + deleteReport: function(settings, suc, err) { var reportName = encodeURIComponent(settings['name']); kimchi.requestJSON({ -- 1.8.1.4

Added rename page including HTML, CSS, and JS. Signed-off-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com&gt; --- ui/css/theme-default/report-rename.css | 22 ++++++++++++++ ui/js/src/kimchi.report_rename_main.js | 41 ++++++++++++++++++++++++++ ui/pages/report-rename.html.tmpl | 53 ++++++++++++++++++++++++++++++++++ 3 files changed, 116 insertions(+) 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 diff --git a/ui/css/theme-default/report-rename.css b/ui/css/theme-default/report-rename.css new file mode 100644 index 0000000..959d577 --- /dev/null +++ b/ui/css/theme-default/report-rename.css @@ -0,0 +1,22 @@ +#report-rename-window { + height: 300px; + width: 400px; +} + +#report-rename-window .field { + font-size: 12px; +} + +#report-name-textbox { + -moz-box-sizing: border-box; + box-sizing: border-box; + margin: .5em 0; + width: 100%; +} + +#button-report-rename[disabled] { + background: #c0c0c0 url(../../images/theme-default/loading.gif) 7px + center no-repeat; + color: #DDD; + prenameing-left: 26px; +} diff --git a/ui/js/src/kimchi.report_rename_main.js b/ui/js/src/kimchi.report_rename_main.js new file mode 100644 index 0000000..09d03bd --- /dev/null +++ b/ui/js/src/kimchi.report_rename_main.js @@ -0,0 +1,41 @@ +kimchi.report_rename_main = function() { + var renameReportForm = $('#form-report-rename'); + var submitButton = $('#button-report-rename'); + var nameTextbox = $('input[name="name"]', renameReportForm); + var submitForm = function(event) { + if(submitButton.prop('disabled')) { + return false; + } + var reportName = nameTextbox.val(); + var validator = RegExp("^[A-Za-z0-9-]*$"); + if (!validator.test(reportName)) { + kimchi.message.error.code('KCHDR6011M'); + return false; + } + var formData = renameReportForm.serializeObject(); + submitButton.prop('disabled', true); + nameTextbox.prop('disabled', true); + kimchi.renameReport(kimchi.selectedReport, formData, function(result) { + submitButton.prop('disabled', false); + nameTextbox.prop('disabled', false); + kimchi.window.close(); + kimchi.topic('kimchi/debugReportRenamed').publish({ + result: result + }); + }, function(result) { + var errText = result && + result['responseJSON'] && + result['responseJSON']['reason']; + kimchi.message.error(errText); + submitButton.prop('disabled', false); + nameTextbox.prop('disabled', false).focus(); + }); + + event.preventDefault(); + }; + + renameReportForm.on('submit', submitForm); + submitButton.on('click', submitForm); + + nameTextbox.val(kimchi.selectedReport).select(); +}; diff --git a/ui/pages/report-rename.html.tmpl b/ui/pages/report-rename.html.tmpl new file mode 100644 index 0000000..7fab0b6 --- /dev/null +++ b/ui/pages/report-rename.html.tmpl @@ -0,0 +1,53 @@ +#* + * Project Kimchi + * + * Copyright IBM, Corp. 2013 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + *# +#unicode UTF-8 +#import gettext +#from kimchi.cachebust import href +#silent t = gettext.translation($lang.domain, $lang.localedir, languages=$lang.lang) +#silent _ = t.gettext +#silent _t = t.gettext +<!DOCTYPE html> +<div id="report-rename-window" class="window"> + <header> + <h1 class="title">$_("Rename a Debug Report")</h1> + <div class="close">X</div> + </header> + <div class="content"> + <form id="form-report-rename"> + <section class="form-section"> + <h2> + <label for="report-name-textbox">$_("Report Name")</label> + </h2> + <div class="field"> + <span> + $_("The name used to identify the report. Name can contain: letters, digits and hyphen (\"-\").") + </span> + <input type="text" class="text" id="report-name-textbox" name="name" /> + </div> + </section> + </form> + </div> + <footer> + <div class="btn-group"> + <button id="button-report-rename" class="btn-normal"><span class="text">$_("Submit")</span></button> + </div> + </footer> +</div> +<script> + kimchi.report_rename_main(); +</script> -- 1.8.1.4