From 85e892bded934b73cab8f238738d4613e15b2a8a Mon Sep 17 00:00:00 2001 From: will Date: Fri, 11 Mar 2011 16:32:56 -0800 Subject: [PATCH] bug 3316: Added initial UI support to live migrate VMs. --- .../classes/resources/messages.properties | 5 ++ ui/jsp/instance.jsp | 24 +++++++ ui/scripts/cloud.core.instance.js | 65 ++++++++++++++++++- 3 files changed, 91 insertions(+), 3 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index b10ebb0fa39..9dc54caf783 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -1,5 +1,10 @@ #New - Add all new parameters here. +label.action.migrate.instance=Migrate Instance +label.migrate.instance.to=Migrate instance to +label.full=Full +label.available=Available +message.migrate.instance.confirm=Please confirm the host you wish to migrate the virtual instance to. message.download.volume=Please click 00000 to download volume message.download.ISO=Please click 00000 to download ISO diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp index 6f7c2e1b72d..1cc8ebe7bae 100644 --- a/ui/jsp/instance.jsp +++ b/ui/jsp/instance.jsp @@ -31,6 +31,7 @@ dictionary = { 'label.action.reset.password.processing': '', 'label.action.change.service': '', 'label.action.change.service.processing': '', + 'label.action.migrate.instance': '', 'label.action.detach.disk': '', 'label.action.detach.disk.processing': '', 'label.action.create.template': '', @@ -42,6 +43,8 @@ dictionary = { 'message.action.take.snapshot': '', 'label.data.disk.offering': '', 'label.root.disk.offering': '', + 'label.full': '', + 'label.available': '', 'message.launch.vm.on.private.network': '' }; @@ -1223,6 +1226,27 @@ dictionary = { + + +