etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

new UI - implement remove host action.

This commit is contained in:
Jessica Wang 2010-10-18 17:15:48 -07:00
parent 82132b8a54
commit 95360a51ed
3 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/resource.properties
View File

@ -124,3 +124,4 @@ please.restart.your.management.server.for.your.new.settings.to.take.effect = Ple
enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.on.this.host.to.any.available.host = Enabling maintenance mode will cause a live migration of all running instances on this host to any available host.
please.confirm.you.want.to.cancel.maintenance.for.the.host = Please confirm you want to cancel maintenance for the host
please.confirm.you.want.to.force.a.reconnection.for.the.host = Please confirm you want to force a reconnection for the host
please.confirm.you.want.to.remove.the.host.from.the.management.server = Please confirm you want to remove the host from the management server

6
ui/new/jsp/resource.jsp
View File

@ -1101,3 +1101,9 @@
<%=t.t("please.confirm.you.want.to.force.a.reconnection.for.the.host")%>
</p>
</div>
<div id="dialog_confirmation_remove_host" title="Confirmation" style="display: none">
<p>
<%=t.t("please.confirm.you.want.to.remove.the.host.from.the.management.server")%>
</p>
</div>

56
ui/new/scripts/cloud.core2.resource.js
View File

@ -404,6 +404,7 @@ function hostJsonToDetailsTab(jsonObj) {
buildActionLinkForDetailsTab("Enable Maintenance Mode", hostActionMap, $actionMenu, midmenuItemId, $detailsTab); //when right panel has more than 1 details tab, we need to specify which one it is building action to.
buildActionLinkForDetailsTab("Cancel Maintenance Mode", hostActionMap, $actionMenu, midmenuItemId, $detailsTab); //when right panel has more than 1 details tab, we need to specify which one it is building action to.
buildActionLinkForDetailsTab("Force Reconnect", hostActionMap, $actionMenu, midmenuItemId, $detailsTab); //when right panel has more than 1 details tab, we need to specify which one it is building action to.
buildActionLinkForDetailsTab("Remove Host", hostActionMap, $actionMenu, midmenuItemId, $detailsTab); //when right panel has more than 1 details tab, we need to specify which one it is building action to.
//temporary for testing (begin) *****
@ -436,6 +437,30 @@ function hostJsonToDetailsTab(jsonObj) {
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
}
function hostClearRightPanel() {
hostClearDetailsTab();
}
function hostClearDetailsTab() {
var $detailsTab = $("#right_panel_content #host_page #tab_content_details");
$detailsTab.find("#id").text("");
$detailsTab.find("#name").text("");
$detailsTab.find("#state").text("");
$detailsTab.find("#zonename").text("");
$detailsTab.find("#podname").text("");
$detailsTab.find("#clustername").text("");
$detailsTab.find("#ipaddress").text("");
$detailsTab.find("#version").text("");
$detailsTab.find("#oscategoryname").text("");
$detailsTab.find("#disconnected").text("");
var $actionMenu = $detailsTab.find("#action_link #action_menu");
$actionMenu.find("#action_list").empty();
$actionMenu.find("#action_list").append($("#no_available_actions").clone().show());
}
//***** host page (end) *******************************************************************************************************
//***** primary storage page (bgein) ******************************************************************************************
@ -714,6 +739,7 @@ function afterLoadResourceJSP() {
initDialog("dialog_confirmation_enable_maintenance");
initDialog("dialog_confirmation_cancel_maintenance");
initDialog("dialog_confirmation_force_reconnect");
initDialog("dialog_confirmation_remove_host");
// if hypervisor is KVM, limit the server option to NFS for now
if (getHypervisorType() == 'kvm')
@ -1263,7 +1289,18 @@ var hostActionMap = {
hostJsonToDetailsTab(json.queryasyncjobresultresponse.host[0], $("#right_panel_content #host_page #tab_content_details"));
$("#right_panel_content #after_action_info").text("We are actively reconnecting your host. Please refresh periodically for an updated status.");
}
}
},
"Remove Host": {
isAsyncJob: false,
dialogBeforeActionFn : doRemoveHost,
inProcessText: "Removing Host....",
afterActionSeccessFn: function(json, id, midmenuItemId) {
var $midmenuItem1 = $("#"+midmenuItemId);
$midmenuItem1.remove();
clearRightPanel();
hostClearRightPanel();
}
},
}
function doEnableMaintenanceMode($actionLink, $detailsTab, midmenuItemId){
@ -1315,4 +1352,21 @@ function doForceReconnect($actionLink, $detailsTab, midmenuItemId){
$(this).dialog("close");
}
}).dialog("open");
}
function doRemoveHost($actionLink, $detailsTab, midmenuItemId){
var jsonObj = $detailsTab.data("jsonObj");
$("#dialog_confirmation_remove_host")
.dialog("option", "buttons", {
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=deleteHost&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
}).dialog("open");
}