- Kimchi-devel - oVirt List Archives

[PATCH V2][Wok] Added extended locale list.
by archus＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Archana Singh <archus(a)linux.vnet.ibm.com> Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/pages/login.html.tmpl | 194 +++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 172 insertions(+), 22 deletions(-) diff --git a/ui/pages/login.html.tmpl b/ui/pages/login.html.tmpl index 52b81fd..0357d64 100644 --- a/ui/pages/login.html.tmpl +++ b/ui/pages/login.html.tmpl @@ -138,28 +138,178 @@ <div class="form-group"> <label for="userLocale">$_("Locale")</label> <select id="userLocale" class="selectpicker col-md-12 col-lg-12"> - <option value="af-NA">Afrikaans (Namibia)</option> - <option value="ar-DZ">Arabic (Algeria)</option> - <option value="az-AZ">Azerbaijani (Azerbaijan)</option> - <option value="en-US">English (US)</option> - <option value="hy-AM">Armenian (Armenia)</option> - <option value="hi-IN">Hindi (India)</option> - <option value="nl-BE">Dutch (Belgium)</option> - <option value="ms-MY">Malay (Malaysia)</option> - <option value="no-NO">Norwegian (Norway)</option> - <option value="sq-AL">Albanian (Albania)</option> - <option value="sv-SE">Swedish (Sweden)</option> - <option value="uz-UZ">Uzbek (Uzbekistan)</option> - <option value="zh-CN">中文（简体）</option> - <option value="pt-BR">Português (Brasil)</option> - <option value="de-DE">Deutsch (Deutschland)</option> - <option value="es-ES">Español (España)</option> - <option value="fr-FR">Français (France)</option> - <option value="it-IT">Italiano (Italia)</option> - <option value="ja-JP">日本語 (日本)</option> - <option value="ko-KR">한국어 (대한민국)</option> - <option value="ru-RU">Русский (Россия)</option> - <option value="zh-TW">中文（繁體）</option> + <option value="af-ZA">Afrikaans (South Africa)</option> + <option value="sq-AL">Albanian (Albania)</option> + <option value="am-ET">Amharic (Ethiopia)</option> + <option value="ar-DZ">Arabic (Algeria)</option> + <option value="ar-BH">Arabic (Bahrain)</option> + <option value="ar-EG">Arabic (Egypt)</option> + <option value="ar-IQ">Arabic (Iraq)</option> + <option value="ar-JO">Arabic (Jordan)</option> + <option value="ar-KW">Arabic (Kuwait)</option> + <option value="ar-LB">Arabic (Lebanon)</option> + <option value="ar-LY">Arabic (Libya)</option> + <option value="ar-MR">Arabic (Mauritania)</option> + <option value="ar-MA">Arabic (Morocco)</option> + <option value="ar-OM">Arabic (Oman)</option> + <option value="ar-QA">Arabic (Qatar)</option> + <option value="ar-SA">Arabic (Saudi Arabia)</option> + <option value="ar-SY">Arabic (Syria)</option> + <option value="ar-TN">Arabic (Tunisia)</option> + <option value="ar-AE">Arabic (United Arab Emirates)</option> + <option value="ar-YE">Arabic (Yemen)</option> + <option value="hy-AM">Armenian (Armenia)</option> + <option value="as-IN">Assamese (India)</option> + <option value="az-AZ">Azerbaijani (Azerbaijan)</option> + <option value="eu-ES">Basque (Spain)</option> + <option value="be-BY">Belarusian (Belarus)</option> + <option value="bn-BD">Bengali (Bangladesh)</option> + <option value="bn-IN">Bengali (India)</option> + <option value="bs-BA">Bosnian (Bosnia)</option> + <option value="bg-BG">Bulgarian (Bulgaria)</option> + <option value="my-MM">Burmese (Myanmar)</option> + <option value="ca-ES">Catalan (Spain)</option> + <option value="zh-CN">Chinese-simplified (China)</option> + <option value="zh-SG">Chinese-simplified (Singapore)</option> + <option value="zh-HK">Chinese-traditional (Hong Kong S.A.R. of China)</option> + <option value="zh-MO">Chinese-traditional (Macao)</option> + <option value="zh-TW">Chinese-traditional (Taiwan)</option> + <option value="hr-HR">Croatian (Croatia)</option> + <option value="cs-CZ">Czech (Czech Republic)</option> + <option value="da-DK">Danish (Denmark)</option> + <option value="nl-BE">Dutch (Belgium)</option> + <option value="nl-NL">Dutch (The Netherlands)</option> + <option value="en-AU">English (Australia)</option> + <option value="en-BE">English (Belgium)</option> + <option value="en-CM">English (Cameroon)</option> + <option value="en-CA">English (Canada)</option> + <option value="en-GH">English (Ghana)</option> + <option value="en-HK">English (Hong Kong S.A.R. of China)</option> + <option value="en-IN">English (India)</option> + <option value="en-IE">English (Ireland)</option> + <option value="en-KE">English (Kenya)</option> + <option value="en-MU">English (Mauritius)</option> + <option value="en-NZ">English (New Zealand)</option> + <option value="en-NG">English (Nigeria)</option> + <option value="en-PH">English (Philippines)</option> + <option value="en-SG">English (Singapore)</option> + <option value="en-ZA">English (South Africa)</option> + <option value="en-TZ">English (Tanzania)</option> + <option value="en-GB">English (United Kingdom)</option> + <option value="en-US">English (United States)</option> + <option value="en-ZM">English (Zambia)</option> + <option value="et-EE">Estonian (Estonia)</option> + <option value="tl-PH">Filipino (Philippines)</option> + <option value="fi-FI">Finnish (Finland)</option> + <option value="fr-DZ">French (Algeria)</option> + <option value="fr-CM">French (Cameroon)</option> + <option value="fr-CD">French (Democratic Republic of the Congo)</option> + <option value="fr-BE">French (Belgium)</option> + <option value="fr-CA">French (Canada)</option> + <option value="fr-FR">French (France)</option> + <option value="fr-CI">French (Ivory Coast [Côte d’Ivoire])</option> + <option value="fr-LU">French (Luxembourg)</option> + <option value="fr-MR">French (Mauritania)</option> + <option value="fr-MU">French (Mauritius)</option> + <option value="fr-MA">French (Morocco)</option> + <option value="fr-SN">French (Senegal)</option> + <option value="fr-CH">French (Switzerland)</option> + <option value="fr-TN">French (Tunisia)</option> + <option value="gl-ES">Galician (Spain)</option> + <option value="lg-UG">Ganda (Uganda)</option> + <option value="ka-GE">Georgian (Georgia)</option> + <option value="de-AT">German (Austria)</option> + <option value="de-DE">German (Germany)</option> + <option value="de-LU">German (Luxembourg)</option> + <option value="de-CH">German (Switzerland)</option> + <option value="el-GR">Greek (Greece)</option> + <option value="gu-IN">Gujarati (India)</option> + <option value="ha-NG">Hausa (Nigeria)</option> + <option value="he-IL">Hebrew (Israel)</option> + <option value="hi-IN">Hindi (India)</option> + <option value="hu-HU">Hungarian (Hungary)</option> + <option value="is-IS">Icelandic (Iceland)</option> + <option value="ig-NG">Igbo (Nigeria)</option> + <option value="id-ID">Indonesian (Indonesia)</option> + <option value="it-IT">Italian (Italy)</option> + <option value="it-CH">Italian (Switzerland)</option> + <option value="ja-JP">Japanese (Japan)</option> + <option value="kn-IN">Kannada (India)</option> + <option value="kk-KZ">Kazakh (Kazakhstan)</option> + <option value="km-KH">Khmer (Cambodia)</option> + <option value="rw-RW">Kinyarwanda (Rwanda)</option> + <option value="kok-IN">Konkani (India)</option> + <option value="ko-KR">Korean (Korea, South)</option> + <option value="lo-LA">Lao (Laos)</option> + <option value="lv-LV">Latvian (Latvia)</option> + <option value="lt-LT">Lithuanian (Lithuania)</option> + <option value="mk-MK">Macedonian (Macedonia)</option> + <option value="ms-MY">Malay-Latin (Malaysia)</option> + <option value="ml-IN">Malayalam (India)</option> + <option value="mt-MT">Maltese (Malta)</option> + <option value="mr-IN">Marathi (India)</option> + <option value="mn-Cyrl-MN">Mongolian-Cyrillic (Mongolia)</option> + <option value="ne-IN">Nepali (India)</option> + <option value="ne-NP">Nepali (Nepal)</option> + <option value="nb-NO">Norwegian Bokmål (Norway)</option> + <option value="nn-NO">Norwegian Nynorsk (Norway)</option> + <option value="or-IN">Oriya [aka, Odia] (India)</option> + <option value="om-ET">Oromo (Ethiopia)</option> + <option value="pl-PL">Polish (Poland)</option> + <option value="pt-AO">Portuguese (Angola)</option> + <option value="pt-BR">Portuguese (Brazil)</option> + <option value="pt-MO">Portuguese (Macao)</option> + <option value="pt-MZ">Portuguese (Mozambique)</option> + <option value="pt-PT">Portuguese (Portugal)</option> + <option value="pa-IN">Punjabi (India)</option> + <option value="ro-RO">Romanian (Romania)</option> + <option value="ru-RU">Russian (Russia)</option> + <option value="sr-RS">Serbian-Cyrillic (Serbia)</option> + <option value="sr-ME">Serbian-Latin (Montenegro)</option> + <option value="sr-Latn-RS">Serbian-Latin (Serbia)</option> + <option value="si-LK">Sinhala (Sri Lanka)</option> + <option value="sk-SK">Slovak (Slovakia)</option> + <option value="sl-SI">Slovenian (Slovenia)</option> + <option value="es-AR">Spanish (Argentina)</option> + <option value="es-BO">Spanish (Bolivia)</option> + <option value="es-CL">Spanish (Chile)</option> + <option value="es-CO">Spanish (Colombia)</option> + <option value="es-CR">Spanish (Costa Rica)</option> + <option value="es-DO">Spanish (Dominican Republic)</option> + <option value="es-EC">Spanish (Ecuador)</option> + <option value="es-SV">Spanish (El Salvador)</option> + <option value="es-GT">Spanish (Guatemala)</option> + <option value="es-HN">Spanish (Honduras)</option> + <option value="es-MX">Spanish (Mexico)</option> + <option value="es-NI">Spanish (Nicaragua)</option> + <option value="es-PA">Spanish (Panama)</option> + <option value="es-PY">Spanish (Paraguay)</option> + <option value="es-PE">Spanish (Peru)</option> + <option value="es-PR">Spanish (Puerto Rico)</option> + <option value="es-ES">Spanish (Spain)</option> + <option value="es-US">Spanish (United States)</option> + <option value="es-UY">Spanish (Uruguay)</option> + <option value="es-VE">Spanish (Venezuela)</option> + <option value="sw-KE">Swahili (Kenya)</option> + <option value="sw-TZ">Swahili (Tanzania)</option> + <option value="sv-SE">Swedish (Sweden)</option> + <option value="ta-IN">Tamil (India)</option> + <option value="te-IN">Telugu (India)</option> + <option value="th-TH">Thai (Thailand)</option> + <option value="tr-TR">Turkish (Turkey)</option> + <option value="uk-UA">Ukrainian (Ukraine)</option> + <option value="ur-IN">Urdu (India)</option> + <option value="ur-PK">Urdu (Pakistan)</option> + <option value="uz-Cyrl-UZ">Uzbek-Cyrillic (Uzbekistan)</option> + <option value="uz-Latn-UZ">Uzbek-Latin (Uzbekistan)</option> + <option value="vi-VN">Vietnamese (Vietnam)</option> + <option value="cy-GB">Welsh (United Kingdom)</option> + <option value="yo-NG">Yoruba (Nigeria)</option> + <option value="zu-ZA">Zulu (South Africa)</option> + <option value="az-AZ">Azerbaijani-Latin (Azerbaijan)</option> + <option value="sr-CS">Serbian-Cyrillic ()</option> + <option value="sr-Cyrl-CS">Serbian-Cyrillic (Serbia and Montenegro)</option> + <option value="sr-Latn-CS">Serbian-Latin (Serbia and Montenegro)</option> </select> </div> </form> -- 2.5.0

1 0

Re: [Kimchi-devel] [PATCH] [Wok] Log error when using tee arg on run_command.
by Aline Manera 31 May '16

31 May '16

Applied. Thanks. Regards, Aline Manera

1 0

[PATCH v5] [Kimchi] Storage Volume management
by sguimaraes943＠gmail.com 31 May '16

31 May '16

From: Samuel Guimarães <sguimaraes943(a)gmail.com> This patch adds Storage Volume management functions Wipe, Clone, Resize and Delete with multiple selection. It also includes a filter input for each Storage Pool and Gallery View for Storage Volumes. v1: - HTML and CSS v2: - Delete and Wipe with multi-selection - Confirm messages with list of selected volumes when wiping or deleting volumes (requires SCSS/CSS patch sent to Wok) - Filter working - Removed "Add Volume" link from Storage Pool action button - Added "Add Volume" to Volume box action button v3: - Clone function working with multiple selection - Progress bar working for clone and create volume - Temporary volume added to the volumes when cloning - Seamless refresh on the volumes once each task is finished - Fixed issue when list wouldn't refresh when all volumes are removed from the storage pool. v4: - Prevent scroll when Drop-down in volumes list is clicked - Dropdown is not clipped from volumes list when there's only one or two items on the list - Added Media Queries for small screen resolutions v5: - Fixed black border in Firefox and IE when switching from List View to Gallery View - Allocation and % Used in the parent table are now updated when wiping/resizing/deleting/cloning volumes - Removed success messages / duplicated messages - Changed scrollbar position in Volumes area - When applying multiple actions, the checkbox is hidden/disabled and a spinner is shown while the the queue of selected items is being processed Samuel Guimarães (1): Storage Volume management model/storagevolumes.py | 2 +- ui/css/kimchi.css | 396 +++++++++++++++-- ui/css/src/modules/_storage.scss | 375 ++++++++++++++-- ui/js/src/kimchi.api.js | 50 +++ ui/js/src/kimchi.storage_main.js | 488 +++++++++++++++++---- ui/js/src/kimchi.storagepool_add_volume_main.js | 2 +- ui/js/src/kimchi.storagepool_resize_volume_main.js | 59 +++ ui/pages/i18n.json.tmpl | 4 + ui/pages/storagepool-resize-volume.html.tmpl | 51 +++ ui/pages/tabs/storage.html.tmpl | 155 ++++--- 10 files changed, 1323 insertions(+), 259 deletions(-) create mode 100644 ui/js/src/kimchi.storagepool_resize_volume_main.js create mode 100644 ui/pages/storagepool-resize-volume.html.tmpl -- 1.9.3

2 2

Re: [Kimchi-devel] [PATCH] [Kimchi] Properly display network interfaces when more than one exists
by Socorro Stoppler 31 May '16

31 May '16

Hi Aline, I tried this w/a test env (i.e. --test) so I could have an interface and when I created a VEPA network, it showed the interface. What showed up as unavailable was the Address Space column. Would you mind sending me a picture? Thanks -Socorro On 05/27/2016 12:36 PM, Aline Manera wrote: > > Hi Socorro, > > 1. Once I create a VEPA or Passthrough Bridged network, the interface > column displays "unavailable". If I switch tabs and go back to Network > tab, the interface column displays the interface values as proposed by > this patch. > > 2. I'd suggest to rename the variable name to 'interfaces' just to > reflect that this field can list multiple values. > > Regards, > Aline Manera > > On 05/25/2016 03:03 PM, Socorro Stoppler wrote: >> This patch fixes a bug in the listing of networks in that only one >> network >> interface is being shown regardless of the number of interfaces that >> exist for >> that network. >> >> In addition to now displaying all of the interfaces, in the case >> that there's too many to fit in the column, an ellipsis has been >> added to indicate >> that there's more interfaces than what it being shown. A tooltip >> will be seen when >> the user hovers over the interface(s) to show all of the interfaces. >> >> >> Signed-off-by: Socorro Stoppler <socorro(a)linux.vnet.ibm.com> >> --- >> ui/css/kimchi.css | 8 ++++++-- >> ui/css/src/modules/_network.scss | 9 ++++++--- >> ui/js/src/kimchi.network.js | 4 +++- >> ui/pages/tabs/network.html.tmpl | 4 ++-- >> 4 files changed, 17 insertions(+), 8 deletions(-) >> >> diff --git a/ui/css/kimchi.css b/ui/css/kimchi.css >> index 49ea39a..72f340c 100644 >> --- a/ui/css/kimchi.css >> +++ b/ui/css/kimchi.css >> @@ -2156,12 +2156,16 @@ body.wok-gallery { >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-interface, >> #network-root-container .wok-datagrid > .wok-datagrid-body > >> .wok-datagrid-row > span.column-interface { >> - width: 10.3896%; >> + width: 15.3896%; >> + padding-right: 40px; >> + white-space: nowrap; >> + overflow: hidden; >> + text-overflow: ellipsis; >> } >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-space, >> #network-root-container .wok-datagrid > .wok-datagrid-body > >> .wok-datagrid-row > span.column-space { >> - width: 30%; >> + width: 25%; >> } >> >> #network-root-container .wok-datagrid > .wok-datagrid-header > >> span.column-action, >> diff --git a/ui/css/src/modules/_network.scss >> b/ui/css/src/modules/_network.scss >> index 4627ab5..ab47c89 100644 >> --- a/ui/css/src/modules/_network.scss >> +++ b/ui/css/src/modules/_network.scss >> @@ -93,18 +93,21 @@ >> } >> >> > span.column-interface { >> - width: 10.3896%; >> + width: 15.3896%; >> + padding-right: 40px; >> + white-space: nowrap; >> + overflow: hidden; >> + text-overflow: ellipsis; >> } >> >> > span.column-space { >> - width: 30%; >> + width: 25%; >> } >> >> > span.column-action { >> width: 25.909%; >> text-align: right; >> } >> - >> } >> >> .wok-datagrid > .wok-datagrid-body > .wok-datagrid-row > span { >> diff --git a/ui/js/src/kimchi.network.js b/ui/js/src/kimchi.network.js >> index 381449d..ac6bf74 100644 >> --- a/ui/js/src/kimchi.network.js >> +++ b/ui/js/src/kimchi.network.js >> @@ -35,6 +35,7 @@ kimchi.initNetwork = function() { >> kimchi.initNetworkListView = function() { >> $('.wok-mask').removeClass('hidden'); >> kimchi.listNetworks(function(data) { >> + $('[data-toggle="tooltip"]').tooltip(); >> for (var i = 0; i < data.length; i++) { >> var network = { >> name : data[i].name, >> @@ -46,7 +47,8 @@ kimchi.initNetworkListView = function() { >> } else { >> network.type = data[i].connection; >> } >> - network.interface = data[i].interfaces ? >> data[i].interfaces[0] : null; >> + network.interface = data[i].interfaces ? >> data[i].interfaces : null; >> + network.interface.join(); >> network.addrSpace = data[i].subnet ? data[i].subnet : >> null; >> network.persistent = data[i].persistent; >> kimchi.addNetworkItem(network); >> diff --git a/ui/pages/tabs/network.html.tmpl >> b/ui/pages/tabs/network.html.tmpl >> index 6ddabaa..7e2825d 100644 >> --- a/ui/pages/tabs/network.html.tmpl >> +++ b/ui/pages/tabs/network.html.tmpl >> @@ -85,11 +85,11 @@ >> </div> >> <div id="modalWindow" class="modal fade network-modal" >> tabindex="-1" role="dialog" aria-labelledby="networkModalLabel" >> aria-hidden="true"> </div> >> <script id="networkItem" type="text/html"> >> - <div id='{name}' class='wok-nw-grid-body remove-when-logged-off '> >> + <div id='{name}' class='wok-nw-grid-body remove-when-logged-off'> >> <span class='column-state' val="{state}"><span >> class='network-state {state}'><i class="fa fa-power-off"></i><span >> class="wok-nw-loading-icon"></span></span></span><span class='column-name' title="{name}" >> val="{name}">{name}</span><span class='column-type' >> val="{type}">{type}</span><span class='column-interface' >> val="{interface}">{interface}</span><span class='column-interface' >> data-placement="top" data-toggle="tooltip" title="{interface}" >> val="{interface}">{interface}</span><span class='column-space' >> val="{addrSpace}">{addrSpace}</span><span class='column-action' >> style="display:none"> >> <span class="pull-right"> >

2 1

[PATCH] [Wok] Log error when using tee arg on run_command.
by pvital＠linux.vnet.ibm.com 31 May '16

31 May '16

From: Paulo Vital <pvital(a)linux.vnet.ibm.com> Make the error, not only the output, of run_command execution be logged when using the tee argument. Signed-off-by: Paulo Vital <pvital(a)linux.vnet.ibm.com> --- src/wok/utils.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/wok/utils.py b/src/wok/utils.py index b37518f..0ee4964 100644 --- a/src/wok/utils.py +++ b/src/wok/utils.py @@ -280,6 +280,8 @@ def run_command(cmd, timeout=None, silent=False, tee=None, else: wok_log.error(msg) + if tee is not None: + tee_log(msg, tee) elif error: wok_log.debug("error: %s returned from cmd: %s", error, ' '.join(cmd)) -- 2.5.5

1 0

Re: [Kimchi-devel] [PATCH v2] [Kimchi 0/2] Implement multi-function pci hotplug
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH] [Kimchi] Always update snapshot XML with new name and UUID
by Aline Manera 30 May '16

30 May '16

Hi Lucio, I am getting the following errors while running the tests. Could you fix it and resend? I tested on Fedora 23. ***** Running unit test: test_model... FAILED ====================================================================== ERROR: test_vm_edit (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 1080, in test_vm_edit inst.vm_update('kimchi-vm1', params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 290, in update vm_name, dom = self._static_vm_update(name, dom, params) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 816, in _static_vm_update self._redefine_snapshots(dom, snapshots_info) File "/home/alinefm/wok/src/wok/plugins/kimchi/model/vms.py", line 737, in _redefine_snapshots xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) File "/home/alinefm/wok/src/wok/xmlutils/utils.py", line 52, in xml_item_update item.text = value File "lxml.etree.pyx", line 951, in lxml.etree._Element.text.__set__ (src/lxml/lxml.etree.c:46377) File "apihelpers.pxi", line 695, in lxml.etree._setNodeText (src/lxml/lxml.etree.c:20989) File "apihelpers.pxi", line 683, in lxml.etree._createTextNode (src/lxml/lxml.etree.c:20865) File "apihelpers.pxi", line 1393, in lxml.etree._utf8 (src/lxml/lxml.etree.c:27155) ValueError: All strings must be XML compatible: Unicode or ASCII, no NULL bytes or control characters ====================================================================== FAIL: test_vm_lifecycle (test_model.ModelTests) ---------------------------------------------------------------------- Traceback (most recent call last): File "test_model.py", line 230, in test_vm_lifecycle self.assertEquals(result, [u'kimchi-vm', snap['name']]) AssertionError: Lists differ: ['kimchi-vm-new', u'mysnap'] != [u'kimchi-vm', u'mysnap'] First differing element 0: kimchi-vm-new kimchi-vm - ['kimchi-vm-new', u'mysnap'] ? ---- + [u'kimchi-vm', u'mysnap'] ? + ---------------------------------------------------------------------- Ran 25 tests in 96.215s FAILED (failures=1, errors=1, skipped=1) On 05/30/2016 05:32 PM, Lucio Correia wrote: > When a guest with snapshots is renamed, and afterwards > guest is reverted to a snapshot created before the name > change, the guest is also renamed back. This patch fixes > this issue by updating snapshot XML when guest is renamed. > > Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> > --- > model/vms.py | 12 +++++++++++- > 1 file changed, 11 insertions(+), 1 deletion(-) > > diff --git a/model/vms.py b/model/vms.py > index 5c1b4e6..f5fbd16 100644 > --- a/model/vms.py > +++ b/model/vms.py > @@ -97,6 +97,8 @@ XPATH_DOMAIN_DEV_CPU_ID = '/domain/devices/spapr-cpu-socket/@id' > XPATH_CPU = './cpu' > XPATH_NAME = './name' > XPATH_NUMA_CELL = './cpu/numa/cell' > +XPATH_SNAP_VM_NAME = './domain/name' > +XPATH_SNAP_VM_UUID = './domain/uuid' > XPATH_TOPOLOGY = './cpu/topology' > XPATH_VCPU = './vcpu' > XPATH_MAX_MEMORY = './maxMemory' > @@ -728,7 +730,15 @@ class VMModel(object): > if info['current']: > flags |= libvirt.VIR_DOMAIN_SNAPSHOT_CREATE_CURRENT > > - dom.snapshotCreateXML(info['xml'], flags) > + # Snapshot XML contains the VM xml from the time it was created. > + # Thus VM name and uuid must be updated to current ones. Otherwise, > + # when reverted, the vm name will be inconsistent. > + xml = info['xml'] > + xml = xml_item_update(xml, XPATH_SNAP_VM_NAME, dom.name(), None) > + xml = xml_item_update(xml, XPATH_SNAP_VM_UUID, dom.UUIDString(), > + None) > + > + dom.snapshotCreateXML(xml, flags) > > def _update_metadata_name(self, dom, nonascii_name): > if nonascii_name is not None:

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Remove notification message if Libvirt is back
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Load Kimchi when started by command line and libvirt is not running
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0

Re: [Kimchi-devel] [PATCH][Kimchi] Remove notification message if Libvirt is back
by Aline Manera 30 May '16

30 May '16

Applied. Thanks. Regards, Aline Manera

1 0