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

new UI - host page - implement update OS action.

This commit is contained in:
Jessica Wang 2010-10-18 19:09:38 -07:00
parent 3c27d0506b
commit bae8998d2d
3 changed files with 126 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,6 +91,8 @@ type = Type
disk.total = Disk Total
disk.allocated = Disk Allocated
ip.address.range = IP Range
OS.preference = OS Preference
none = None
disk.offering = Disk Offering
copy.ISO.to = Copy ISO to
@ -125,3 +127,4 @@ enabling.maintenance.mode.will.cause.a.live.migration.of.all.running.instances.o
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
Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts. = Please choose a OS preference for this host. Virtual machines will always be allocated to hosts with an OS preference that matches with the OS type of the template chosen for the virtual machine before choosing other hosts.

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

@ -1107,3 +1107,22 @@
<%=t.t("please.confirm.you.want.to.remove.the.host.from.the.management.server")%>
</p>
</div>
<!-- Update OS Pref Dialog -->
<div id="dialog_update_os" title="Update OS Preference" style="display:none">
<p>
<%=t.t("Please.choose.a.OS.preference.for.this.host..Virtual.machines.will.always.be.allocated.to.hosts.with.an.OS.preference.that.matches.with.the.OS.type.of.the.template.chosen.for.the.virtual.machine.before.choosing.other.hosts.")%>
</p>
<div class="dialog_formcontent">
<form action="#" method="post" id="form_acquire">
<ol>
<li>
<label><%=t.t("OS.preference")%>:</label>
<select class="select" name="host_os" id="host_os">
<option value=""><%=t.t("none")%></option>
</select>
</li>
</ol>
</form>
</div>
</div>

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

@ -373,6 +373,8 @@ function hostJsonToDetailsTab(jsonObj) {
$detailsTab.find("#oscategoryname").text(fromdb(jsonObj.oscategoryname));
$detailsTab.find("#disconnected").text(fromdb(jsonObj.disconnected));
populateForUpdateOSDialog(jsonObj.oscategoryid);
//actions ***
var $actionLink = $detailsTab.find("#action_link");
$actionLink.bind("mouseover", function(event) {
@ -405,6 +407,7 @@ function hostJsonToDetailsTab(jsonObj) {
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.
buildActionLinkForDetailsTab("Update OS Preference", 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) *****
@ -740,6 +743,7 @@ function afterLoadResourceJSP() {
initDialog("dialog_confirmation_cancel_maintenance");
initDialog("dialog_confirmation_force_reconnect");
initDialog("dialog_confirmation_remove_host");
initDialog("dialog_update_os");
// if hypervisor is KVM, limit the server option to NFS for now
if (getHypervisorType() == 'kvm')
@ -750,11 +754,32 @@ function afterLoadResourceJSP() {
if (getNetworkType() == "vnet")
$("#dialog_add_vlan_for_zone").attr("title", "Add Public IP Range");
bindEventHandlerToDialogAddVlanForZone();
//initialize Add Zone button
initAddZoneButton($("#midmenu_add_link"));
}
function populateForUpdateOSDialog(oscategoryid) {
$.ajax({
data: createURL("command=listOsCategories"+maxPageSize),
dataType: "json",
success: function(json) {
var categories = json.listoscategoriesresponse.oscategory;
var select = $("#dialog_update_os #host_os");
if (categories != null && categories.length > 0) {
for (var i = 0; i < categories.length; i++) {
if(categories[i].id == oscategoryid) {
select.append("<option value='" + categories[i].id + "' selected >" + categories[i].name + "</option>");
}
else {
select.append("<option value='" + categories[i].id + "'>" + categories[i].name + "</option>");
}
}
}
}
});
}
function nfsURL(server, path) {
var url;
if(server.indexOf("://")==-1)
@ -1300,7 +1325,24 @@ var hostActionMap = {
clearRightPanel();
hostClearRightPanel();
}
},
},
"Update OS Preference": {
isAsyncJob: false,
dialogBeforeActionFn : doUpdateOSPreference,
inProcessText: "Updating OS Preference....",
afterActionSeccessFn: function(json, id, midmenuItemId) {
//call listHosts API before bug 6650 ("updateHost API should return an embedded object like what listHosts API does") is fixed.
$.ajax({
data: createURL("command=listHosts&id="+id),
dataType: "json",
success: function(json) {
$midmenuItem1 = $("#"+midmenuItemId);
hostToMidmenu(json.listhostsresponse.host[0], $midmenuItem1);
hostToRigntPanel($midmenuItem1)
}
});
}
},
}
function doEnableMaintenanceMode($actionLink, $detailsTab, midmenuItemId){
@ -1308,15 +1350,15 @@ function doEnableMaintenanceMode($actionLink, $detailsTab, midmenuItemId){
$("#dialog_confirmation_enable_maintenance")
.dialog("option", "buttons", {
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=prepareHostForMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=prepareHostForMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
}).dialog("open");
}
@ -1325,15 +1367,15 @@ function doCancelMaintenanceMode($actionLink, $detailsTab, midmenuItemId){
$("#dialog_confirmation_cancel_maintenance")
.dialog("option", "buttons", {
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=cancelHostMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=cancelHostMaintenance&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
}).dialog("open");
}
@ -1342,15 +1384,15 @@ function doForceReconnect($actionLink, $detailsTab, midmenuItemId){
$("#dialog_confirmation_force_reconnect")
.dialog("option", "buttons", {
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=reconnectHost&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
"OK": function() {
$(this).dialog("close");
var id = jsonObj.id;
var apiCommand = "command=reconnectHost&id="+id;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
}).dialog("open");
}
@ -1359,14 +1401,38 @@ function doRemoveHost($actionLink, $detailsTab, midmenuItemId){
$("#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");
}
"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");
}
function doUpdateOSPreference($actionLink, $detailsTab, midmenuItemId){
var jsonObj = $detailsTab.data("jsonObj");
$("#dialog_update_os")
.dialog("option", "buttons", {
"Update": function() {
$(this).dialog("close");
var osId = $("#dialog_update_os #host_os").val();
var osName = $("#dialog_update_os #host_os option:selected").text();
var category = "";
if (osId.length > 0) {
category = "&osCategoryId="+osId;
}
var id = jsonObj.id;
var apiCommand = "command=updateHost&id="+id+category;
doActionToDetailsTab(id, $actionLink, apiCommand, midmenuItemId);
},
"Cancel": function() {
$(this).dialog("close");
}
}).dialog("open");
}