[Kimchi-devel] [PATCH 0/2] Live Migration UI v2

[Daniel Henrique Barboza]

Patch set does not apply in current Kimchi master:


$ git am ~/\[Kimchi-devel\]\ \[PATCH\ *
Applying: Initial checkin for live migration UI support
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch:61: 
trailing whitespace.
             result = getMigratingGuests().concat(result);
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch:77: 
trailing whitespace.
             //TODO:  Need to get guest to be passed in here
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch:82: 
trailing whitespace.
wok.message.error(err.responseJSON.reason);
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch:83: 
trailing whitespace.
             });
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch:86: 
trailing whitespace.

error: src/wok/plugins/ginger: does not exist in index
error: src/wok/plugins/kimchi/ui/js/src/kimchi.api.js: does not exist in 
index
error: src/wok/plugins/kimchi/ui/js/src/kimchi.guest_main.js: does not 
exist in index
error: src/wok/plugins/kimchi/ui/pages/guest.html.tmpl: does not exist 
in index
Patch failed at 0001 Initial checkin for live migration UI support
The copy of the patch that failed is found in:
/home/danielhb/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch
When you have resolved this problem, run "git am --resolved".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".



On 12/01/2015 07:21 PM, sguimaraes943 at gmail.com wrote:
> From: samhenri <samuel.guimaraes at eldorado.org.br>
>
> This patch addes Live Migration functionality to the new-ui.
>
> I'm attaching Socorro initial commit because I had to merge and resolve conflicts with the current new-ui version of Guests tab.
>
> Socorro Stoppler (1):
>    Initial checkin for live migration UI support
>
> samhenri (1):
>    Fixing Live Migration for the new-ui Guests tab
>
>   src/wok/plugins/ginger                             |   2 +-
>   src/wok/plugins/kimchi/ui/js/src/kimchi.api.js     |   3 +-
>   .../kimchi/ui/js/src/kimchi.guest_livemigration.js | 115 +++++++++++++++++++++
>   .../plugins/kimchi/ui/js/src/kimchi.guest_main.js  |  82 ++++++++++++++-
>   .../kimchi/ui/pages/guest-migration.html.tmpl      |  67 ++++++++++++
>   src/wok/plugins/kimchi/ui/pages/guest.html.tmpl    |   3 +-
>   src/wok/plugins/kimchi/ui/pages/i18n.json.tmpl     |   2 +
>   src/wok/plugins/kimchi/ui/pages/network.html.tmpl  |   1 -
>   ui/css/src/modules/_validation.scss                |  11 ++
>   ui/css/src/wok.scss                                |   2 +
>   10 files changed, 279 insertions(+), 9 deletions(-)
>   create mode 100644 src/wok/plugins/kimchi/ui/js/src/kimchi.guest_livemigration.js
>   create mode 100644 src/wok/plugins/kimchi/ui/pages/guest-migration.html.tmpl
>   create mode 100644 ui/css/src/modules/_validation.scss
>