From 7dc62cc293215ecbc73d59c931d37adcb4e7c451 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 24 Sep 2010 14:27:58 -0700 Subject: [PATCH 001/244] bug 6247: incremental checkin --- .../com/cloud/hypervisor/xen/resource/CitrixResourceBase.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index b30a0996e92..4e9c7e7ca59 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -1624,9 +1624,9 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR vmStatsAnswer.setNumCPUs(vmStatsAnswer.getNumCPUs() + 1); vmStatsAnswer.setCPUUtilization((vmStatsAnswer.getCPUUtilization() + getDataAverage(dataNode, col, numRows))*100); } else if (param.equals("vif_0_rx")) { - vmStatsAnswer.setNetworkReadKBs(getDataAverage(dataNode, col, numRows)); + vmStatsAnswer.setNetworkReadKBs(getDataAverage(dataNode, col, numRows)/(8*2)); } else if (param.equals("vif_0_tx")) { - vmStatsAnswer.setNetworkWriteKBs(getDataAverage(dataNode, col, numRows)); + vmStatsAnswer.setNetworkWriteKBs(getDataAverage(dataNode, col, numRows)/(8*2)); } } From 7abda2ee2dd86954d3f1e7b04cf64331426d1f92 Mon Sep 17 00:00:00 2001 From: abhishek Date: Fri, 24 Sep 2010 15:50:33 -0700 Subject: [PATCH 002/244] bug 6291: generating some events whilst starting vms, wrt volume creation status 6291: resolved fixed --- .../com/cloud/storage/StorageManagerImpl.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 04c7f9bed39..0539b3a470b 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -939,6 +939,9 @@ public class StorageManagerImpl implements StorageManager { txn.start(); if (Storage.ImageFormat.ISO == template.getFormat()) { rootVol = new VolumeVO(VolumeType.ROOT, vm.getId(), vm.getInstanceName() + "-ROOT", dc.getId(), pod.getId(), account.getId(), account.getDomainId(),(size>0)? size : diskOffering.getDiskSizeInBytes()); + + createStartedEvent(account, rootVol); + rootVol.setDiskOfferingId(diskOffering.getId()); rootVol.setSourceType(SourceType.Template); rootVol.setSourceId(template.getId()); @@ -946,6 +949,9 @@ public class StorageManagerImpl implements StorageManager { rootVol = _volsDao.persist(rootVol); } else { rootVol = new VolumeVO(VolumeType.ROOT, vm.getId(), template.getId(), vm.getInstanceName() + "-ROOT", dc.getId(), pod.getId(), account.getId(), account.getDomainId(), offering.isRecreatable()); + + createStartedEvent(account, rootVol); + rootVol.setDiskOfferingId(offering.getId()); rootVol.setTemplateId(template.getId()); rootVol.setSourceId(template.getId()); @@ -955,6 +961,9 @@ public class StorageManagerImpl implements StorageManager { if (diskOffering != null && diskOffering.getDiskSizeInBytes() > 0) { dataVol = new VolumeVO(VolumeType.DATADISK, vm.getId(), vm.getInstanceName() + "-DATA", dc.getId(), pod.getId(), account.getId(), account.getDomainId(), (size>0)? size : diskOffering.getDiskSizeInBytes()); + + createStartedEvent(account, dataVol); + dataVol.setDiskOfferingId(diskOffering.getId()); dataVol.setSourceType(SourceType.DiskOffering); dataVol.setSourceId(diskOffering.getId()); @@ -994,6 +1003,16 @@ public class StorageManagerImpl implements StorageManager { throw new CloudRuntimeException("Unable to create volumes for " + vm, e); } } + + private void createStartedEvent(Account account, VolumeVO rootVol) { + EventVO event1 = new EventVO(); + event1.setAccountId(account.getId()); + event1.setUserId(1L); + event1.setType(EventTypes.EVENT_VOLUME_CREATE); + event1.setState(EventState.Started); + event1.setDescription("Create volume: " + rootVol.getName()+ "started"); + _eventDao.persist(event1); + } @Override From 461149a3904d3fd079ecdc947bfe46e6566ba198 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 24 Sep 2010 23:43:38 -0700 Subject: [PATCH 003/244] new UI - accounts page - implement Resource limits action. --- ui/new/jsp/account.jsp | 57 ++++++++++ ui/new/scripts/cloud.core2.account.js | 157 ++++++++++++++++++++++++-- 2 files changed, 202 insertions(+), 12 deletions(-) diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index e82770f784c..d4f0e263269 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -139,3 +139,60 @@ + + + + + + + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 7bf04e1b8a1..28a3ff10457 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -1,5 +1,18 @@ -function afterLoadAccountJSP() { +var systemAccountId = 1; +var adminAccountId = 2; +function afterLoadAccountJSP() { + activateDialog($("#dialog_resource_limits").dialog({ + autoOpen: false, + modal: true, + zIndex: 2000 + })); + + activateDialog($("#dialog_disable_account").dialog({ + autoOpen: false, + modal: true, + zIndex: 2000 + })); } function accountToMidmenu(jsonObj, $midmenuItem1) { @@ -20,15 +33,135 @@ function accountToMidmenu(jsonObj, $midmenuItem1) { function accountToRigntPanel($midmenuItem) { var jsonObj = $midmenuItem.data("jsonObj"); + accountJsonToDetailsTab(jsonObj); +} + +function accountJsonToDetailsTab(jsonObj) { + var $detailsTab = $("#right_panel_content #tab_content_details"); + $detailsTab.data("jsonObj", jsonObj); + $detailsTab.find("#id").text(jsonObj.id); + $detailsTab.find("#role").text(toRole(jsonObj.accounttype)); + $detailsTab.find("#account").text(fromdb(jsonObj.name)); + $detailsTab.find("#domain").text(fromdb(jsonObj.domain)); + $detailsTab.find("#vm_total").text(jsonObj.vmtotal); + $detailsTab.find("#ip_total").text(jsonObj.iptotal); + $detailsTab.find("#bytes_received").text(jsonObj.receivedbytes); + $detailsTab.find("#bytes_sent").text(jsonObj.sentbytes); + $detailsTab.find("#state").text(jsonObj.state); - var $rightPanelContent = $("#right_panel_content"); - $rightPanelContent.find("#id").text(jsonObj.id); - $rightPanelContent.find("#role").text(toRole(jsonObj.accounttype)); - $rightPanelContent.find("#account").text(fromdb(jsonObj.name)); - $rightPanelContent.find("#domain").text(fromdb(jsonObj.domain)); - $rightPanelContent.find("#vm_total").text(jsonObj.vmtotal); - $rightPanelContent.find("#ip_total").text(jsonObj.iptotal); - $rightPanelContent.find("#bytes_received").text(jsonObj.receivedbytes); - $rightPanelContent.find("#bytes_sent").text(jsonObj.sentbytes); - $rightPanelContent.find("#state").text(jsonObj.state); -} \ No newline at end of file + //actions *** + var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); + $actionMenu.find("#action_list").empty(); + if(jsonObj.id != systemAccountId && jsonObj.id != adminAccountId) { + if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) + buildActionLinkForDetailsTab("Resource limits", accountActionMap, $actionMenu, accountListAPIMap); + +// if(jsonObj.state == "enabled") +// buildActionLinkForDetailsTab("Disable", accountActionMap, $actionMenu, accountListAPIMap); +// else if(jsonObj.state == "disabled") +// buildActionLinkForDetailsTab("Enable", accountActionMap, $actionMenu, accountListAPIMap); + } +} + +var accountActionMap = { + "Resource limits": { + customActionFn : doResourceLimits + } +}; + +var accountListAPIMap = { + listAPI: "listAccounts", + listAPIResponse: "listaccountsresponse", + listAPIResponseObj: "account" +}; + +function updateResourceLimit(domainId, account, type, max) { + $.ajax({ + data: createURL("command=updateResourceLimit&domainid="+domainId+"&account="+account+"&resourceType="+type+"&max="+max), + dataType: "json", + success: function(json) { + } + }); +} + +function doResourceLimits () { + var $detailsTab = $("#right_panel_content #tab_content_details"); + var jsonObj = $detailsTab.data("jsonObj"); + var domainId = jsonObj.domainid; + var account = jsonObj.name; + $.ajax({ + cache: false, + data: createURL("command=listResourceLimits&domainid="+domainId+"&account="+account), + dataType: "json", + success: function(json) { + var limits = json.listresourcelimitsresponse.resourcelimit; + var preInstanceLimit, preIpLimit, preDiskLimit, preSnapshotLimit, preTemplateLimit = -1; + if (limits != null) { + for (var i = 0; i < limits.length; i++) { + var limit = limits[i]; + switch (limit.resourcetype) { + case "0": + preInstanceLimit = limit.max; + $("#dialog_resource_limits #limits_vm").val(limit.max); + break; + case "1": + preIpLimit = limit.max; + $("#dialog_resource_limits #limits_ip").val(limit.max); + break; + case "2": + preDiskLimit = limit.max; + $("#dialog_resource_limits #limits_volume").val(limit.max); + break; + case "3": + preSnapshotLimit = limit.max; + $("#dialog_resource_limits #limits_snapshot").val(limit.max); + break; + case "4": + preTemplateLimit = limit.max; + $("#dialog_resource_limits #limits_template").val(limit.max); + break; + } + } + } + $("#dialog_resource_limits") + .dialog('option', 'buttons', { + "Save": function() { + // validate values + var isValid = true; + isValid &= validateNumber("Instance Limit", $("#dialog_resource_limits #limits_vm"), $("#dialog_resource_limits #limits_vm_errormsg"), -1, 32000, false); + isValid &= validateNumber("Public IP Limit", $("#dialog_resource_limits #limits_ip"), $("#dialog_resource_limits #limits_ip_errormsg"), -1, 32000, false); + isValid &= validateNumber("Disk Volume Limit", $("#dialog_resource_limits #limits_volume"), $("#dialog_resource_limits #limits_volume_errormsg"), -1, 32000, false); + isValid &= validateNumber("Snapshot Limit", $("#dialog_resource_limits #limits_snapshot"), $("#dialog_resource_limits #limits_snapshot_errormsg"), -1, 32000, false); + isValid &= validateNumber("Template Limit", $("#dialog_resource_limits #limits_template"), $("#dialog_resource_limits #limits_template_errormsg"), -1, 32000, false); + if (!isValid) return; + + var instanceLimit = trim($("#dialog_resource_limits #limits_vm").val()); + var ipLimit = trim($("#dialog_resource_limits #limits_ip").val()); + var diskLimit = trim($("#dialog_resource_limits #limits_volume").val()); + var snapshotLimit = trim($("#dialog_resource_limits #limits_snapshot").val()); + var templateLimit = trim($("#dialog_resource_limits #limits_template").val()); + + $(this).dialog("close"); + if (instanceLimit != preInstanceLimit) { + updateResourceLimit(domainId, account, 0, instanceLimit); + } + if (ipLimit != preIpLimit) { + updateResourceLimit(domainId, account, 1, ipLimit); + } + if (diskLimit != preDiskLimit) { + updateResourceLimit(domainId, account, 2, diskLimit); + } + if (snapshotLimit != preSnapshotLimit) { + updateResourceLimit(domainId, account, 3, snapshotLimit); + } + if (templateLimit != preTemplateLimit) { + updateResourceLimit(domainId, account, 4, templateLimit); + } + }, + "Cancel": function() { + $(this).dialog("close"); + } + }).dialog("open"); + } + }); +} From ae453b296179197af8423fed8640b5783b9ba97b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 09:57:48 -0700 Subject: [PATCH 004/244] new UI - accounts page - implement Disable account action. --- ui/new/jsp/account.jsp | 23 +++------------- ui/new/scripts/cloud.core2.account.js | 39 +++++++++++++++++++++++---- 2 files changed, 37 insertions(+), 25 deletions(-) diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index d4f0e263269..205ef23c8d9 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -176,23 +176,6 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 28a3ff10457..a0a811a4d3d 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -56,17 +56,30 @@ function accountJsonToDetailsTab(jsonObj) { if (jsonObj.accounttype == roleTypeUser || jsonObj.accounttype == roleTypeDomainAdmin) buildActionLinkForDetailsTab("Resource limits", accountActionMap, $actionMenu, accountListAPIMap); -// if(jsonObj.state == "enabled") -// buildActionLinkForDetailsTab("Disable", accountActionMap, $actionMenu, accountListAPIMap); -// else if(jsonObj.state == "disabled") -// buildActionLinkForDetailsTab("Enable", accountActionMap, $actionMenu, accountListAPIMap); + if(jsonObj.state == "enabled") { + buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, accountListAPIMap); + //buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, accountListAPIMap); + } +// else if(jsonObj.state == "disabled") { +// buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, accountListAPIMap); +// } } } var accountActionMap = { "Resource limits": { customActionFn : doResourceLimits - } + } + , + "Disable account": { + isAsyncJob: true, + asyncJobResponse: "disableaccountresponse", + dialogBeforeActionFn : doDisableAccount, + inProcessText: "Disabling account....", + afterActionSeccessFn: function(jsonObj) { + accountJsonToDetailsTab(jsonObj); + } + } }; var accountListAPIMap = { @@ -165,3 +178,19 @@ function doResourceLimits () { } }); } + +function doDisableAccount($actionLink, listAPIMap, $detailsTab) { + var jsonObj = $detailsTab.data("jsonObj"); + + $("#dialog_disable_account") + .dialog('option', 'buttons', { + "Yes": function() { + $(this).dialog("close"); + var apiCommand = "command=disableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; + doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, listAPIMap); + }, + "Cancel": function() { + $(this).dialog("close"); + } + }).dialog("open"); +} From 13181b79f814ed530cd1560b94a996b543298a38 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 10:15:53 -0700 Subject: [PATCH 005/244] new UI - accounts page - implement Enable Account action. --- ui/new/jsp/account.jsp | 4 +++ ui/new/scripts/cloud.core2.account.js | 41 +++++++++++++++++++++++---- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index 205ef23c8d9..9e243e2a4bc 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -178,4 +178,8 @@ + + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index a0a811a4d3d..4facf3c11d9 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -6,13 +6,17 @@ function afterLoadAccountJSP() { autoOpen: false, modal: true, zIndex: 2000 - })); - + })); activateDialog($("#dialog_disable_account").dialog({ autoOpen: false, modal: true, zIndex: 2000 })); + activateDialog($("#dialog_enable_account").dialog({ + autoOpen: false, + modal: true, + zIndex: 2000 + })); } function accountToMidmenu(jsonObj, $midmenuItem1) { @@ -60,9 +64,9 @@ function accountJsonToDetailsTab(jsonObj) { buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, accountListAPIMap); //buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, accountListAPIMap); } -// else if(jsonObj.state == "disabled") { -// buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, accountListAPIMap); -// } + else if(jsonObj.state == "disabled" || jsonObj.state == "locked") { + buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, accountListAPIMap); + } } } @@ -76,7 +80,18 @@ var accountActionMap = { asyncJobResponse: "disableaccountresponse", dialogBeforeActionFn : doDisableAccount, inProcessText: "Disabling account....", + afterActionSeccessFn: function(jsonObj) { + $("#midmenuItem_"+jsonObj.id).data("jsonObj", jsonObj); + accountJsonToDetailsTab(jsonObj); + } + } + , + "Enable account": { + isAsyncJob: false, + dialogBeforeActionFn : doEnableAccount, + inProcessText: "Enabling account....", afterActionSeccessFn: function(jsonObj) { + $("#midmenuItem_"+jsonObj.id).data("jsonObj", jsonObj); accountJsonToDetailsTab(jsonObj); } } @@ -194,3 +209,19 @@ function doDisableAccount($actionLink, listAPIMap, $detailsTab) { } }).dialog("open"); } + +function doEnableAccount($actionLink, listAPIMap, $detailsTab) { + var jsonObj = $detailsTab.data("jsonObj"); + + $("#dialog_enable_account") + .dialog('option', 'buttons', { + "Yes": function() { + $(this).dialog("close"); + var apiCommand = "command=enableAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; + doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, listAPIMap); + }, + "Cancel": function() { + $(this).dialog("close"); + } + }).dialog("open"); +} \ No newline at end of file From e2114b195038131cd8983602790441861033a1cb Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 10:28:46 -0700 Subject: [PATCH 006/244] new UI - accounts page - implement Lock Account action. --- ui/new/jsp/account.jsp | 6 ++++- ui/new/scripts/cloud.core2.account.js | 33 ++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index 9e243e2a4bc..f6ad235af2f 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -45,7 +45,7 @@
-
+
<%=t.t("id")%>:
@@ -180,6 +180,10 @@

Please confirm you want to disable account that will prevent account access to the cloud and shut down all existing virtual instances.

+ + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index 4facf3c11d9..bdc6d726366 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -12,6 +12,11 @@ function afterLoadAccountJSP() { modal: true, zIndex: 2000 })); + activateDialog($("#dialog_lock_account").dialog({ + autoOpen: false, + modal: true, + zIndex: 2000 + })); activateDialog($("#dialog_enable_account").dialog({ autoOpen: false, modal: true, @@ -62,7 +67,7 @@ function accountJsonToDetailsTab(jsonObj) { if(jsonObj.state == "enabled") { buildActionLinkForDetailsTab("Disable account", accountActionMap, $actionMenu, accountListAPIMap); - //buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, accountListAPIMap); + buildActionLinkForDetailsTab("Lock account", accountActionMap, $actionMenu, accountListAPIMap); } else if(jsonObj.state == "disabled" || jsonObj.state == "locked") { buildActionLinkForDetailsTab("Enable account", accountActionMap, $actionMenu, accountListAPIMap); @@ -86,6 +91,16 @@ var accountActionMap = { } } , + "Lock account": { + isAsyncJob: false, + dialogBeforeActionFn : doLockAccount, + inProcessText: "Locking account....", + afterActionSeccessFn: function(jsonObj) { + $("#midmenuItem_"+jsonObj.id).data("jsonObj", jsonObj); + accountJsonToDetailsTab(jsonObj); + } + } + , "Enable account": { isAsyncJob: false, dialogBeforeActionFn : doEnableAccount, @@ -210,6 +225,22 @@ function doDisableAccount($actionLink, listAPIMap, $detailsTab) { }).dialog("open"); } +function doLockAccount($actionLink, listAPIMap, $detailsTab) { + var jsonObj = $detailsTab.data("jsonObj"); + + $("#dialog_lock_account") + .dialog('option', 'buttons', { + "Yes": function() { + $(this).dialog("close"); + var apiCommand = "command=lockAccount&account="+jsonObj.name+"&domainId="+jsonObj.domainid; + doActionToDetailsTab(jsonObj.id, $actionLink, apiCommand, listAPIMap); + }, + "Cancel": function() { + $(this).dialog("close"); + } + }).dialog("open"); +} + function doEnableAccount($actionLink, listAPIMap, $detailsTab) { var jsonObj = $detailsTab.data("jsonObj"); From fc6a551ac7eb3ce0ee50ab89976c73e231798ebf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 15:41:56 -0700 Subject: [PATCH 007/244] new UI - slowly slide up snapshot after deleting it. --- ui/new/scripts/cloud.core2.volume.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/new/scripts/cloud.core2.volume.js b/ui/new/scripts/cloud.core2.volume.js index ad6b218b802..86203144d97 100644 --- a/ui/new/scripts/cloud.core2.volume.js +++ b/ui/new/scripts/cloud.core2.volume.js @@ -861,8 +861,10 @@ var volumeSnapshotActionMap = { isAsyncJob: true, asyncJobResponse: "deletesnapshotresponse", inProcessText: "Deleting snapshot....", - afterActionSeccessFn: function(id) { - $("#volume_snapshot_"+id).remove(); + afterActionSeccessFn: function(id) { + $("#volume_snapshot_"+id).slideUp("slow", function() { + $(this).remove(); + }); } } , From 9163ffea6764dbb2d0adc9fc18f46e7164f7ec52 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 17:52:02 -0700 Subject: [PATCH 008/244] new UI - dashboard page - populate zone field and pod field. --- ui/new/index.jsp | 2 + ui/new/jsp/dashboard.jsp | 713 +++++++++++++----------- ui/new/scripts/cloud.core2.dashboard.js | 72 +++ ui/new/scripts/cloud.core2.init.js | 4 +- 4 files changed, 453 insertions(+), 338 deletions(-) create mode 100644 ui/new/scripts/cloud.core2.dashboard.js diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 99d3c2a695f..4e38f48bb02 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -55,6 +55,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 3f5be1504cf..7574ac5c5de 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -1,337 +1,376 @@ -<%@ page import="java.util.*" %> -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - - -
- -
- Event
- -

Dashboard -

-
- - -
- - -
-
-
-
System Wide Capacity
-
-
-
- - -
-
-
-
-
-
-

Public IP Addresses

-
-

Used: 2 / 11

-
-
-
-
-
-
-
-
18.2 %
-
-
- -
-
-
-

Private IP Addresses

-
-

Used: 2 / 10

-
-
-
-
-
-
-
-
20 %
-
-
- -
-
-
-

Memory Allocated

-
-

Used: 2.12 GB / 3.22 GB

-
-
-
-
-
-
-
-
65.8 %
-
-
- -
-
-
-

CPU

-
-

Used: 8 MHZ / 9.60 MHZ

-
-
-
-
-
-
-
-
83.3 %
-
-
- -
-
-
-

Primary Storage Allocated

-
-

Used: Used: 4.00 GB / 3.50 TB

-
-
-
-
-
-
-
-
15.2 %
-
-
- -
-
-
-

Primary Storage Used

-
-

Used: 999.17 GB / 1.75 TB

-
-
-
-
-
-
-
-
40.12 %
-
-
- -
-
-
-

Secondary Storage Used

-
-

Used: 599.17 GB / 1.75 TB

-
-
-
-
-
-
-
-
20.12 %
-
-
- -
- - -
-
-
-
General Alerts
-
-
-
-
-
-
-
-
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
-
- - - -
-
-
-
General Alerts
-
-
-
-
-
-
-
-
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
- -
-
-
-
- -
-
Alerts name
-
Details about the alert will appear here
-
- -
-
09/17/2010 14:33:49
-
-
-
- -
- - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
+
+ Event
+

+ Dashboard +

+
+ +
+ +
+
+
+
+ System Wide Capacity
+
+
+
+ + +
+
+
+
+
+
+

+ Public IP Addresses

+
+

+ Used: 2 / 11 +

+
+
+
+
+
+
+
+
+
+ 18.2 %
+
+
+
+
+
+

+ Private IP Addresses

+
+

+ Used: 2 / 10 +

+
+
+
+
+
+
+
+
+
+ 20 %
+
+
+
+
+
+

+ Memory Allocated

+
+

+ Used: 2.12 GB / 3.22 GB +

+
+
+
+
+
+
+
+
+
+ 65.8 %
+
+
+
+
+
+

+ CPU

+
+

+ Used: 8 MHZ / 9.60 MHZ +

+
+
+
+
+
+
+
+
+
+ 83.3 %
+
+
+
+
+
+

+ Primary Storage Allocated

+
+

+ Used: Used: 4.00 GB / 3.50 TB +

+
+
+
+
+
+
+
+
+
+ 15.2 %
+
+
+
+
+
+

+ Primary Storage Used

+
+

+ Used: 999.17 GB / 1.75 TB +

+
+
+
+
+
+
+
+
+
+ 40.12 %
+
+
+
+
+
+

+ Secondary Storage Used

+
+

+ Used: 599.17 GB / 1.75 TB +

+
+
+
+
+
+
+
+
+
+ 20.12 %
+
+
+
+ +
+
+
+
+ General Alerts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+ +
+
+
+
+ General Alerts
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
+
+
+
+
+
+ Alerts name
+
+ Details about the alert will appear here
+
+
+
+ 09/17/2010 14:33:49
+
+
+
+
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js new file mode 100644 index 00000000000..a3e07b91e55 --- /dev/null +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -0,0 +1,72 @@ +function afterLoadDashboardJSP() { + if (isAdmin()) { + var sessionExpired = false; + var zones = null; + var noZones = false; + var noPods = true; + //$("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").hide(); + + $.ajax({ + data: createURL("command=listZones&available=true"+maxPageSize), + dataType: "json", + async: false, + success: function(json) { + zones = json.listzonesresponse.zone; + var zoneSelect = $("#capacity_zone_select").empty(); + if (zones != null && zones.length > 0) { + for (var i = 0; i < zones.length; i++) { + zoneSelect.append(""); + if(noPods == true) { + $.ajax({ + data: createURL("command=listPods&zoneId="+zones[i].id), + dataType: "json", + async: false, + success: function(json) { + var pods = json.listpodsresponse.pod; + if (pods != null && pods.length > 0) { + noPods = false; + //$("#menutab_dashboard_root, #menutab_vm, #menutab_networking_old, #menutab_networking, #menutab_templates, #menutab_events, #menutab_hosts, #menutab_storage, #menutab_accounts, #menutab_domain").show(); + } + } + }); + } + } + } else { + noZones = true; + } + } + }); + + + $("#capacity_zone_select").bind("change", function(event) { + var zoneId = $(this).val(); + $.ajax({ + data: createURL("command=listPods&zoneId="+zoneId+maxPageSize), + dataType: "json", + async: false, + success: function(json) { + var pods = json.listpodsresponse.pod; + var podSelect = $("#capacity_pod_select").empty(); + if (pods != null && pods.length > 0) { + podSelect.append(""); + for (var i = 0; i < pods.length; i++) { + podSelect.append(""); + } + } + $("#capacity_pod_select").change(); + } + }); + }); + $("#capacity_zone_select").change(); + } + else if (isDomainAdmin()) { + + } + else if(isUser()) { + + } + else { //no role + logout(false); + return; + } +} \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 1ae6b076e3d..4f06e793ef1 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -96,7 +96,9 @@ $(document).ready(function() { $("#leftmenu_dashboard").bind("click", function(event) { hideMiddleMenu(); - $("#right_panel").load("jsp/dashboard.jsp", function(){}); + $("#right_panel").load("jsp/dashboard.jsp", function(){ + afterLoadDashboardJSP(); + }); return false; }); From 84a2cea56dd013dca3a91d067ae2389dc6fcf6c5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 23:20:21 -0700 Subject: [PATCH 009/244] new UI - dashboard page - implement system wide capacity area. --- ui/new/jsp/dashboard.jsp | 51 +++--- ui/new/scripts/cloud.core2.dashboard.js | 220 +++++++++++++++++++++++- 2 files changed, 241 insertions(+), 30 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 7574ac5c5de..13f8831fe16 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -20,7 +20,7 @@

-
+
@@ -35,14 +35,14 @@
-
+

Public IP Addresses

- Used: 2 / 11 + Used: N/A

@@ -52,18 +52,17 @@
-
- 18.2 %
+
-
+

Private IP Addresses

- Used: 2 / 10 + Used: N/A

@@ -73,18 +72,17 @@
-
- 20 %
+
-
+

Memory Allocated

- Used: 2.12 GB / 3.22 GB + Used: N/A

@@ -94,18 +92,17 @@
-
- 65.8 %
+
-
+

CPU

- Used: 8 MHZ / 9.60 MHZ + Used: N/A

@@ -115,18 +112,17 @@
-
- 83.3 %
+
-
+

Primary Storage Allocated

- Used: Used: 4.00 GB / 3.50 TB + Used: N/A

@@ -136,18 +132,17 @@
-
- 15.2 %
+
-
+

Primary Storage Used

- Used: 999.17 GB / 1.75 TB + Used: N/A

@@ -157,18 +152,17 @@
-
- 40.12 %
+
-
+

Secondary Storage Used

- Used: 599.17 GB / 1.75 TB + Used: N/A

@@ -178,8 +172,7 @@
-
- 20.12 %
+
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index a3e07b91e55..308351d40b1 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -1,5 +1,5 @@ function afterLoadDashboardJSP() { - if (isAdmin()) { + if (isAdmin()) { var sessionExpired = false; var zones = null; var noZones = false; @@ -37,6 +37,224 @@ function afterLoadDashboardJSP() { } }); + //??? + if (sessionExpired) + return false; + + if (noZones || noPods) { +// $("#tab_dashboard_user").hide(); +// $("#menutab_role_user").hide(); +// $("#menutab_role_root").show(); +// $("#menutab_configuration").click(); + return false; + } + + var capacities = null; + $.ajax({ + cache: false, + async: false, + data: createURL("command=listCapacity"), + dataType: "json", + success: function(json) { + capacities = json.listcapacityresponse.capacity; + } + }); + + $("#capacity_pod_select").bind("change", function(event) { + // Reset to Defaults + /* + $("#public_ip_total, #storage_total, #storage_alloc_total, #sec_storage_total, #memory_total, #cpu_total, #private_ip_total").text("N/A"); + $("#public_ip_used, #storage_used, #storage_alloc, #sec_storage_used, #memory_used, #cpu_used, #private_ip_used,").attr("style", "width:50%").text("N/A"); + $(".db_bargraph_barbox_safezone").attr("style", "width:0%"); + $(".db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + */ + + var selectedZone = $("#capacity_zone_select option:selected").text(); + var selectedPod = $("#capacity_pod_select").val(); + + var $capacityContainer = $("#system_wide_capacity_container"); + + if (capacities != null && capacities.length > 0) { + for (var i = 0; i < capacities.length; i++) { + var capacity = capacities[i]; + if (capacity.zonename == selectedZone) { + + // Public IPs Addresses + if (capacity.type == "4") { + var $c = $capacityContainer.find("#public_ip_address"); + $c.find("#capacityused").text(capacity.capacityused); + $c.find("#capacitytotal").text(capacity.capacitytotal); + $c.find("#percentused").text(capacity.percentused + "%"); + /* + $("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); + $("#public_ip_total").text("Total: " + capacity.capacitytotal); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + // Secondary Storage Used + else if (capacity.type == "6") { + var $c = $capacityContainer.find("#secondary_storage_used"); + $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + $c.find("#percentused").text(capacity.percentused + "%"); + /* + $("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); + $("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + else { + if (capacity.podname == selectedPod) { + // Memory Allocated + if (capacity.type == "0") { + var $c = $capacityContainer.find("#memory_allocated"); + $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + $c.find("#percentused").text(capacity.percentused + "%"); + + /* + $("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); + $("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + // CPU + else if (capacity.type == "1") { + var $c = $capacityContainer.find("#cpu"); + $c.find("#capacityused").text(convertHz(parseInt(capacity.capacityused))); + $c.find("#capacitytotal").text(convertHz(parseInt(capacity.capacitytotal))); + $c.find("#percentused").text(capacity.percentused + "%"); + + /* + $("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); + $("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal))); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + // Primary Storage Used + else if (capacity.type == "2") { + var $c = $capacityContainer.find("#primary_storage_used"); + $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + $c.find("#percentused").text(capacity.percentused + "%"); + + /* + $("#storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); + $("#storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + // Primary Storage Allocated + else if (capacity.type == "3") { + var $c = $capacityContainer.find("#primary_storage_allocated"); + $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + $c.find("#percentused").text(capacity.percentused + "%"); + + /* + $("#storage_alloc").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); + $("#storage_alloc_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + // Private IP Addresses + else if (capacity.type == "5") { + var $c = $capacityContainer.find("#private_ip_address"); + $c.find("#capacityused").text(capacity.capacityused); + $c.find("#capacitytotal").text(capacity.capacitytotal); + $c.find("#percentused").text(capacity.percentused + "%"); + + /* + $("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); + $("#private_ip_total").text("Total: " + capacity.capacitytotal); + var usedPercentage = parseInt(capacity.percentused); + if (usedPercentage > 70) { + $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:70%"); + if(usedPercentage <= 100) + $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); + else + $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); + } else { + $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); + $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); + } + */ + } + + + } + } + } + } + } + }); + //??? $("#capacity_zone_select").bind("change", function(event) { var zoneId = $(this).val(); From 75499ab39303efb68f395be710ca52cafb49bda7 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 25 Sep 2010 23:40:50 -0700 Subject: [PATCH 010/244] new UI - dashboard page - system wide capacity - reset to default everytime pod field or zone field is changed. --- ui/new/scripts/cloud.core2.dashboard.js | 39 +++++++++++++------------ 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index 308351d40b1..071673d1145 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -60,26 +60,28 @@ function afterLoadDashboardJSP() { } }); - $("#capacity_pod_select").bind("change", function(event) { - // Reset to Defaults + $("#capacity_pod_select").bind("change", function(event) { + event.stopPropagation(); + var selectedZone = $("#capacity_zone_select option:selected").text(); + var selectedPod = $("#capacity_pod_select").val(); + + // Reset to Defaults + var $capacityContainer = $("#system_wide_capacity_container"); + var $allSections = $capacityContainer.find("#public_ip_address, #secondary_storage_used, #memory_allocated, #cpu, #primary_storage_used, #primary_storage_allocated, #private_ip_address"); + $allSections.find("#capacityused").text("N"); + $allSections.find("#capacitytotal").text("A"); + $allSections.find("#percentused").text(""); /* - $("#public_ip_total, #storage_total, #storage_alloc_total, #sec_storage_total, #memory_total, #cpu_total, #private_ip_total").text("N/A"); - $("#public_ip_used, #storage_used, #storage_alloc, #sec_storage_used, #memory_used, #cpu_used, #private_ip_used,").attr("style", "width:50%").text("N/A"); $(".db_bargraph_barbox_safezone").attr("style", "width:0%"); $(".db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - */ - - var selectedZone = $("#capacity_zone_select option:selected").text(); - var selectedPod = $("#capacity_pod_select").val(); - - var $capacityContainer = $("#system_wide_capacity_container"); + */ if (capacities != null && capacities.length > 0) { for (var i = 0; i < capacities.length; i++) { var capacity = capacities[i]; if (capacity.zonename == selectedZone) { - // Public IPs Addresses + // ***** Public IPs Addresses ***** if (capacity.type == "4") { var $c = $capacityContainer.find("#public_ip_address"); $c.find("#capacityused").text(capacity.capacityused); @@ -102,7 +104,7 @@ function afterLoadDashboardJSP() { */ } - // Secondary Storage Used + // ***** Secondary Storage Used ***** else if (capacity.type == "6") { var $c = $capacityContainer.find("#secondary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); @@ -127,7 +129,7 @@ function afterLoadDashboardJSP() { else { if (capacity.podname == selectedPod) { - // Memory Allocated + // ***** Memory Allocated ***** if (capacity.type == "0") { var $c = $capacityContainer.find("#memory_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); @@ -151,7 +153,7 @@ function afterLoadDashboardJSP() { */ } - // CPU + // ***** CPU ***** else if (capacity.type == "1") { var $c = $capacityContainer.find("#cpu"); $c.find("#capacityused").text(convertHz(parseInt(capacity.capacityused))); @@ -175,7 +177,7 @@ function afterLoadDashboardJSP() { */ } - // Primary Storage Used + // ***** Primary Storage Used ***** else if (capacity.type == "2") { var $c = $capacityContainer.find("#primary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); @@ -199,7 +201,7 @@ function afterLoadDashboardJSP() { */ } - // Primary Storage Allocated + // ***** Primary Storage Allocated ***** else if (capacity.type == "3") { var $c = $capacityContainer.find("#primary_storage_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); @@ -223,7 +225,7 @@ function afterLoadDashboardJSP() { */ } - // Private IP Addresses + // ***** Private IP Addresses ***** else if (capacity.type == "5") { var $c = $capacityContainer.find("#private_ip_address"); $c.find("#capacityused").text(capacity.capacityused); @@ -245,8 +247,7 @@ function afterLoadDashboardJSP() { $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); } */ - } - + } } } From 23641a4398a2dc90f4012e6f358ce0c0d2596baa Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 26 Sep 2010 11:57:32 -0700 Subject: [PATCH 011/244] new UI - dashboard - implement bar chart. --- ui/new/jsp/dashboard.jsp | 14 +++---- ui/new/scripts/cloud.core2.dashboard.js | 54 ++++++++++++++----------- 2 files changed, 38 insertions(+), 30 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 13f8831fe16..11518f83af4 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -48,7 +48,7 @@
-
+
@@ -68,7 +68,7 @@
-
+
@@ -88,7 +88,7 @@
-
+
@@ -108,7 +108,7 @@
-
+
@@ -128,7 +128,7 @@
-
+
@@ -148,7 +148,7 @@
-
+
@@ -168,7 +168,7 @@
-
+
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index 071673d1145..a5a59909826 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -67,10 +67,11 @@ function afterLoadDashboardJSP() { // Reset to Defaults var $capacityContainer = $("#system_wide_capacity_container"); - var $allSections = $capacityContainer.find("#public_ip_address, #secondary_storage_used, #memory_allocated, #cpu, #primary_storage_used, #primary_storage_allocated, #private_ip_address"); - $allSections.find("#capacityused").text("N"); - $allSections.find("#capacitytotal").text("A"); - $allSections.find("#percentused").text(""); + //var $allSections = $capacityContainer.find("#public_ip_address, #secondary_storage_used, #memory_allocated, #cpu, #primary_storage_used, #primary_storage_allocated, #private_ip_address"); + $capacityContainer.find("#capacityused").text("N"); + $capacityContainer.find("#capacitytotal").text("A"); + $capacityContainer.find("#percentused").text(""); + $capacityContainer.find("#bar_chart").removeClass().addClass("db_barbox").css("width", "0%"); /* $(".db_bargraph_barbox_safezone").attr("style", "width:0%"); $(".db_bargraph_barbox_unsafezone").attr("style", "width:0%"); @@ -85,8 +86,8 @@ function afterLoadDashboardJSP() { if (capacity.type == "4") { var $c = $capacityContainer.find("#public_ip_address"); $c.find("#capacityused").text(capacity.capacityused); - $c.find("#capacitytotal").text(capacity.capacitytotal); - $c.find("#percentused").text(capacity.percentused + "%"); + $c.find("#capacitytotal").text(capacity.capacitytotal); + capacityBarChart($c, capacity.percentused); /* $("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); $("#public_ip_total").text("Total: " + capacity.capacitytotal); @@ -108,8 +109,8 @@ function afterLoadDashboardJSP() { else if (capacity.type == "6") { var $c = $capacityContainer.find("#secondary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); - $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - $c.find("#percentused").text(capacity.percentused + "%"); + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + capacityBarChart($c, capacity.percentused); /* $("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); $("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); @@ -133,9 +134,8 @@ function afterLoadDashboardJSP() { if (capacity.type == "0") { var $c = $capacityContainer.find("#memory_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); - $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - $c.find("#percentused").text(capacity.percentused + "%"); - + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + capacityBarChart($c, capacity.percentused); /* $("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); $("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); @@ -157,9 +157,8 @@ function afterLoadDashboardJSP() { else if (capacity.type == "1") { var $c = $capacityContainer.find("#cpu"); $c.find("#capacityused").text(convertHz(parseInt(capacity.capacityused))); - $c.find("#capacitytotal").text(convertHz(parseInt(capacity.capacitytotal))); - $c.find("#percentused").text(capacity.percentused + "%"); - + $c.find("#capacitytotal").text(convertHz(parseInt(capacity.capacitytotal))); + capacityBarChart($c, capacity.percentused); /* $("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); $("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal))); @@ -181,9 +180,8 @@ function afterLoadDashboardJSP() { else if (capacity.type == "2") { var $c = $capacityContainer.find("#primary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); - $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - $c.find("#percentused").text(capacity.percentused + "%"); - + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + capacityBarChart($c, capacity.percentused); /* $("#storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); $("#storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); @@ -205,9 +203,8 @@ function afterLoadDashboardJSP() { else if (capacity.type == "3") { var $c = $capacityContainer.find("#primary_storage_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); - $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - $c.find("#percentused").text(capacity.percentused + "%"); - + $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); + capacityBarChart($c, capacity.percentused); /* $("#storage_alloc").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); $("#storage_alloc_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); @@ -229,9 +226,8 @@ function afterLoadDashboardJSP() { else if (capacity.type == "5") { var $c = $capacityContainer.find("#private_ip_address"); $c.find("#capacityused").text(capacity.capacityused); - $c.find("#capacitytotal").text(capacity.capacitytotal); - $c.find("#percentused").text(capacity.percentused + "%"); - + $c.find("#capacitytotal").text(capacity.capacitytotal); + capacityBarChart($c, capacity.percentused); /* $("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); $("#private_ip_total").text("Total: " + capacity.capacitytotal); @@ -288,4 +284,16 @@ function afterLoadDashboardJSP() { logout(false); return; } +} + +function capacityBarChart($capacity, percentused) { + var percentused2 = (percentused + "%"); + $capacity.find("#percentused").text(percentused2); + + if (percentused <= 60) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox low").css("width", percentused2); + else if (percentused > 60 && percentused <= 80 ) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox mid").css("width", percentused2); + else if (percentused > 80 ) + $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused2); } \ No newline at end of file From bea86479d8ac3cf27a44b6d88c882a4a1da2b585 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 26 Sep 2010 14:37:32 -0700 Subject: [PATCH 012/244] new UI - dashboard - implement General Alert section. --- ui/new/jsp/dashboard.jsp | 99 +++----------- ui/new/scripts/cloud.core2.dashboard.js | 163 ++++++------------------ 2 files changed, 55 insertions(+), 207 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 11518f83af4..9f0efcac724 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -189,87 +189,12 @@
- -
-
-
-
+
+
+
+ No Recent Alerts
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
+
@@ -367,3 +292,17 @@
+ + diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index a5a59909826..07226ffaf34 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -36,8 +36,7 @@ function afterLoadDashboardJSP() { } } }); - - //??? + if (sessionExpired) return false; @@ -67,42 +66,21 @@ function afterLoadDashboardJSP() { // Reset to Defaults var $capacityContainer = $("#system_wide_capacity_container"); - //var $allSections = $capacityContainer.find("#public_ip_address, #secondary_storage_used, #memory_allocated, #cpu, #primary_storage_used, #primary_storage_allocated, #private_ip_address"); - $capacityContainer.find("#capacityused").text("N"); + $capacityContainer.find("#capacityused").text("N"); $capacityContainer.find("#capacitytotal").text("A"); $capacityContainer.find("#percentused").text(""); $capacityContainer.find("#bar_chart").removeClass().addClass("db_barbox").css("width", "0%"); - /* - $(".db_bargraph_barbox_safezone").attr("style", "width:0%"); - $(".db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - */ - + if (capacities != null && capacities.length > 0) { for (var i = 0; i < capacities.length; i++) { var capacity = capacities[i]; - if (capacity.zonename == selectedZone) { - + if (capacity.zonename == selectedZone) { // ***** Public IPs Addresses ***** if (capacity.type == "4") { var $c = $capacityContainer.find("#public_ip_address"); $c.find("#capacityused").text(capacity.capacityused); $c.find("#capacitytotal").text(capacity.capacitytotal); - capacityBarChart($c, capacity.percentused); - /* - $("#public_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); - $("#public_ip_total").text("Total: " + capacity.capacitytotal); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_public_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_public_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } // ***** Secondary Storage Used ***** @@ -110,22 +88,7 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#secondary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - capacityBarChart($c, capacity.percentused); - /* - $("#sec_storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); - $("#sec_storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_sec_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_sec_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } else { @@ -135,22 +98,7 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#memory_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - capacityBarChart($c, capacity.percentused); - /* - $("#memory_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); - $("#memory_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_memory .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_memory .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } // ***** CPU ***** @@ -158,22 +106,7 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#cpu"); $c.find("#capacityused").text(convertHz(parseInt(capacity.capacityused))); $c.find("#capacitytotal").text(convertHz(parseInt(capacity.capacitytotal))); - capacityBarChart($c, capacity.percentused); - /* - $("#cpu_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertHz(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); - $("#cpu_total").text("Total: " + convertHz(parseInt(capacity.capacitytotal))); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_cpu .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_cpu .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } // ***** Primary Storage Used ***** @@ -181,22 +114,7 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#primary_storage_used"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - capacityBarChart($c, capacity.percentused); - /* - $("#storage_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); - $("#storage_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_storage .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_storage .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } // ***** Primary Storage Allocated ***** @@ -204,22 +122,7 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#primary_storage_allocated"); $c.find("#capacityused").text(convertBytes(parseInt(capacity.capacityused))); $c.find("#capacitytotal").text(convertBytes(parseInt(capacity.capacitytotal))); - capacityBarChart($c, capacity.percentused); - /* - $("#storage_alloc").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + convertBytes(parseInt(capacity.capacityused)) + " / " + capacity.percentused + "%"); - $("#storage_alloc_total").text("Total: " + convertBytes(parseInt(capacity.capacitytotal))); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_storage_alloc .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_storage_alloc .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ + capacityBarChart($c, capacity.percentused); } // ***** Private IP Addresses ***** @@ -227,32 +130,15 @@ function afterLoadDashboardJSP() { var $c = $capacityContainer.find("#private_ip_address"); $c.find("#capacityused").text(capacity.capacityused); $c.find("#capacitytotal").text(capacity.capacitytotal); - capacityBarChart($c, capacity.percentused); - /* - $("#private_ip_used").attr("style", "width: " + ((parseFloat(capacity.percentused) < 50) ? "50%" : capacity.percentused + "%")).text("Used: " + capacity.capacityused + " / " + capacity.percentused + "%"); - $("#private_ip_total").text("Total: " + capacity.capacitytotal); - var usedPercentage = parseInt(capacity.percentused); - if (usedPercentage > 70) { - $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:70%"); - if(usedPercentage <= 100) - $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:"+(usedPercentage - 70)+"%"); - else - $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:30%"); - } else { - $("#capacity_private_ip .db_bargraph_barbox_safezone").attr("style", "width:"+usedPercentage+"%"); - $("#capacity_private_ip .db_bargraph_barbox_unsafezone").attr("style", "width:0%"); - } - */ - } - + capacityBarChart($c, capacity.percentused); + } } } } } } }); - //??? - + $("#capacity_zone_select").bind("change", function(event) { var zoneId = $(this).val(); $.ajax({ @@ -273,6 +159,29 @@ function afterLoadDashboardJSP() { }); }); $("#capacity_zone_select").change(); + + //??? + // Show Recent Alerts + $.ajax({ + data: createURL("command=listAlerts"), + dataType: "json", + success: function(json) { + var alerts = json.listalertsresponse.alert; + if (alerts != null && alerts.length > 0) { + var alertGrid = $("#alert_grid_content").empty(); + var length = (alerts.length>=5) ? 5 : alerts.length; + var $alertTemplate = $("#alert_template"); + for (var i = 0; i < length; i++) { + var template = $alertTemplate.clone(true); + template.find("#type").text(toAlertType(alerts[i].type)); + template.find("#descripton").append(sanitizeXSS(alerts[i].description)); + setDateField(alerts[i].sent, template.find("#sent")); + alertGrid.append(template.show()); + } + } + } + }); + //??? } else if (isDomainAdmin()) { From 0a03ca672124bb34d67c4bb537d2fad65f66e6c7 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 26 Sep 2010 14:48:46 -0700 Subject: [PATCH 013/244] new UI - dashboard - implement Hosts Alerts section. --- ui/new/jsp/dashboard.jsp | 91 +++---------------------- ui/new/scripts/cloud.core2.dashboard.js | 34 +++++++-- 2 files changed, 35 insertions(+), 90 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 9f0efcac724..ff01f151cb7 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -196,12 +196,12 @@ - +
- General Alerts
+ Hosts Alerts
@@ -209,87 +209,12 @@
- -
-
-
-
+
+
+
+ No Recent Alerts
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
-
-
-
-
-
-
-
- Alerts name
-
- Details about the alert will appear here
-
-
-
- 09/17/2010 14:33:49
-
-
+
@@ -303,6 +228,6 @@
-
+
diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index 07226ffaf34..78d00e576d4 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -159,9 +159,10 @@ function afterLoadDashboardJSP() { }); }); $("#capacity_zone_select").change(); + + // General Alerts + var $alertTemplate = $("#alert_template"); - //??? - // Show Recent Alerts $.ajax({ data: createURL("command=listAlerts"), dataType: "json", @@ -169,19 +170,38 @@ function afterLoadDashboardJSP() { var alerts = json.listalertsresponse.alert; if (alerts != null && alerts.length > 0) { var alertGrid = $("#alert_grid_content").empty(); - var length = (alerts.length>=5) ? 5 : alerts.length; - var $alertTemplate = $("#alert_template"); + var length = (alerts.length>=5) ? 5 : alerts.length; for (var i = 0; i < length; i++) { var template = $alertTemplate.clone(true); template.find("#type").text(toAlertType(alerts[i].type)); - template.find("#descripton").append(sanitizeXSS(alerts[i].description)); - setDateField(alerts[i].sent, template.find("#sent")); + template.find("#description").append(fromdb(alerts[i].description)); + setDateField(alerts[i].sent, template.find("#date")); alertGrid.append(template.show()); } } } }); - //??? + + // Hosts Alerts + $.ajax({ + data: createURL("command=listHosts&state=Alert"), + dataType: "json", + success: function(json) { + var alerts = json.listhostsresponse.host; + if (alerts != null && alerts.length > 0) { + var alertGrid = $("#host_alert_grid_content").empty(); + var length = (alerts.length>=4) ? 4 : alerts.length; + for (var i = 0; i < length; i++) { + var template = $alertTemplate.clone(true); + template.find("#type").text("Host - Alert State"); + template.find("#description").append("Host - " + fromdb(alerts[i].name) + " has been detected in Alert state."); + setDateField(alerts[i].disconnected, template.find("#date")); + alertGrid.append(template.show()); + } + } + } + }); + } else if (isDomainAdmin()) { From 26fc22160c4fb54ff5c6fb486f5df526ef8583f9 Mon Sep 17 00:00:00 2001 From: nit Date: Mon, 27 Sep 2010 12:10:49 +0530 Subject: [PATCH 014/244] bug 5871: Correcting the ostypeid and ostypename returned by the listIsos --- server/src/com/cloud/api/commands/ListIsosCmd.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/com/cloud/api/commands/ListIsosCmd.java b/server/src/com/cloud/api/commands/ListIsosCmd.java index 26c3fdbd1ec..7f1c97fde25 100644 --- a/server/src/com/cloud/api/commands/ListIsosCmd.java +++ b/server/src/com/cloud/api/commands/ListIsosCmd.java @@ -192,7 +192,7 @@ public class ListIsosCmd extends BaseCmd { isoData.add(new Pair(BaseCmd.Properties.CROSS_ZONES.getName(), Boolean.valueOf(iso.isCrossZones()).toString())); GuestOS os = getManagementServer().findGuestOSById(iso.getGuestOSId()); - if(os != null) { + if(os != null && !iso.getName().startsWith("xs-tools")) { isoData.add(new Pair(BaseCmd.Properties.OS_TYPE_ID.getName(), os.getId())); isoData.add(new Pair(BaseCmd.Properties.OS_TYPE_NAME.getName(), os.getDisplayName())); } else { From 6e4fa7fcd1ba1c3217bf18ce66a9c47fd17088e2 Mon Sep 17 00:00:00 2001 From: kishan Date: Mon, 27 Sep 2010 16:26:56 +0530 Subject: [PATCH 015/244] bug 6176: Included domR name in networkUsage command status 6176: resolved fixed --- core/src/com/cloud/agent/api/NetworkUsageCommand.java | 8 +++++++- server/src/com/cloud/network/NetworkManagerImpl.java | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/agent/api/NetworkUsageCommand.java b/core/src/com/cloud/agent/api/NetworkUsageCommand.java index c9c88279f6d..5ecf9741959 100644 --- a/core/src/com/cloud/agent/api/NetworkUsageCommand.java +++ b/core/src/com/cloud/agent/api/NetworkUsageCommand.java @@ -20,20 +20,26 @@ package com.cloud.agent.api; public class NetworkUsageCommand extends Command { private String privateIP; + private String domRName; protected NetworkUsageCommand() { } - public NetworkUsageCommand(String privateIP) + public NetworkUsageCommand(String privateIP, String domRName) { this.privateIP = privateIP; + this.domRName = domRName; } public String getPrivateIP() { return privateIP; } + public String getDomRName() { + return domRName; + } + /** * {@inheritDoc} */ diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a86194ab76d..5dd5ec4ec74 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2559,7 +2559,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager for (DomainRouterVO router : routers) { String privateIP = router.getPrivateIpAddress(); if(privateIP != null){ - final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP); + final NetworkUsageCommand usageCmd = new NetworkUsageCommand(privateIP, router.getName()); final NetworkUsageAnswer answer = (NetworkUsageAnswer)_agentMgr.easySend(router.getHostId(), usageCmd); if(answer != null){ Transaction txn = Transaction.open(Transaction.CLOUD_DB); From ec4755a60e5d70fb18d39cf2b1938a9ad96e6648 Mon Sep 17 00:00:00 2001 From: kishan Date: Mon, 27 Sep 2010 16:57:31 +0530 Subject: [PATCH 016/244] bug 6123: Include last id in the vlan range status 6123: resolved fixed --- core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java | 2 +- .../src/com/cloud/configuration/ConfigurationManagerImpl.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java index 43ba290d2ea..bedc5d30941 100755 --- a/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java +++ b/core/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java @@ -60,7 +60,7 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase Date: Mon, 27 Sep 2010 17:22:12 +0530 Subject: [PATCH 017/244] bug 4177: registerTemplate/registerIso commands would start accepting account/domainId params. status 4177: resolved fixed --- .../com/cloud/server/ManagementServer.java | 5 ++- .../cloud/api/commands/RegisterIsoCmd.java | 44 ++++++++++++------ .../api/commands/RegisterTemplateCmd.java | 45 ++++++++++++------- .../cloud/server/ManagementServerImpl.java | 16 +++---- .../com/cloud/template/TemplateManager.java | 3 +- .../cloud/template/TemplateManagerImpl.java | 11 ++--- 6 files changed, 76 insertions(+), 48 deletions(-) mode change 100644 => 100755 server/src/com/cloud/api/commands/RegisterIsoCmd.java mode change 100644 => 100755 server/src/com/cloud/api/commands/RegisterTemplateCmd.java diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index f3973baa180..6ec6cc889be 100755 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -1174,7 +1174,8 @@ public interface ManagementServer { /** * Creates a template by downloading to all zones - * @param createdBy userId of the template creater + * @param createdBy userId of the template creator + * @param accountId accountId under which the template will get created. * @param zoneId optional zoneId. if null, assumed to be all zones * @param name - user specified name for the template * @param displayText user readable name. @@ -1194,7 +1195,7 @@ public interface ManagementServer { * @throws ResourceAllocationException * @throws InvalidParameterValueException */ - Long createTemplate(long createdBy, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, String format, String diskType, String url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) throws IllegalArgumentException, ResourceAllocationException, InvalidParameterValueException; + Long createTemplate(long createdBy, long accountId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, String format, String diskType, String url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) throws IllegalArgumentException, ResourceAllocationException, InvalidParameterValueException; /** * Deletes a template from all secondary storage servers diff --git a/server/src/com/cloud/api/commands/RegisterIsoCmd.java b/server/src/com/cloud/api/commands/RegisterIsoCmd.java old mode 100644 new mode 100755 index f6de4345ccd..29917fe3ed1 --- a/server/src/com/cloud/api/commands/RegisterIsoCmd.java +++ b/server/src/com/cloud/api/commands/RegisterIsoCmd.java @@ -45,8 +45,10 @@ public class RegisterIsoCmd extends BaseCmd { s_properties.add(new Pair(BaseCmd.Properties.NAME, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.DISPLAY_TEXT, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.URL, Boolean.TRUE)); - s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); - s_properties.add(new Pair(BaseCmd.Properties.USER_ID, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.USER_ID, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.IS_PUBLIC, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.IS_FEATURED, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.OS_TYPE_ID, Boolean.TRUE)); @@ -65,7 +67,9 @@ public class RegisterIsoCmd extends BaseCmd { @Override public List> execute(Map params) { - Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName()); + Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName()); + String accountName = (String)params.get(BaseCmd.Properties.ACCOUNT.getName()); + Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName()); Long userId = (Long)params.get(BaseCmd.Properties.USER_ID.getName()); String name = (String)params.get(BaseCmd.Properties.NAME.getName()); String displayText = (String)params.get(BaseCmd.Properties.DISPLAY_TEXT.getName()); @@ -84,19 +88,31 @@ public class RegisterIsoCmd extends BaseCmd { zoneId = null; } - long accountId = 1L; // default to system account - if (account != null) { - accountId = account.getId(); - } - - Account accountObj; - if (account == null) { - accountObj = getManagementServer().findAccountById(accountId); + Long accountId = null; + if ((account == null) || isAdmin(account.getType())) { + if (domainId != null) { + if ((account != null) && !getManagementServer().isChildDomain(account.getDomainId(), domainId)) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, "Invalid domain id (" + domainId + ") "); + } + if (accountName != null) { + Account userAccount = getManagementServer().findActiveAccount(accountName, domainId); + if (userAccount == null) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, "Unable to find account " + accountName + " in domain " + domainId); + } + accountId = userAccount.getId(); + } + } else { + accountId = ((account != null) ? account.getId() : null); + } } else { - accountObj = account; + accountId = account.getId(); + } + + if (accountId == null) { + throw new ServerApiException(BaseCmd.ACCOUNT_ERROR, "No valid account specified for registering ISO."); } - boolean isAdmin = (accountObj.getType() == Account.ACCOUNT_TYPE_ADMIN); + boolean isAdmin = getManagementServer().findAccountById(accountId).getType() == Account.ACCOUNT_TYPE_ADMIN; if (!isAdmin && zoneId == null) { throw new ServerApiException(BaseCmd.PARAM_ERROR, "Please specify a valid zone Id."); @@ -132,7 +148,7 @@ public class RegisterIsoCmd extends BaseCmd { Long templateId; try { - templateId = getManagementServer().createTemplate(userId, zoneId, name, displayText, isPublic.booleanValue(), featured.booleanValue(), ImageFormat.ISO.toString(), FileSystem.cdfs.toString(), url, null, true, 64 /*bits*/, false, guestOSId, bootable); + templateId = getManagementServer().createTemplate(userId, accountId, zoneId, name, displayText, isPublic.booleanValue(), featured.booleanValue(), ImageFormat.ISO.toString(), FileSystem.cdfs.toString(), url, null, true, 64 /*bits*/, false, guestOSId, bootable); } catch (Exception ex) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, ex.getMessage()); } diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java old mode 100644 new mode 100755 index c3a8439ec13..01a9150e1a0 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -51,8 +51,10 @@ public class RegisterTemplateCmd extends BaseCmd { s_properties.add(new Pair(BaseCmd.Properties.REQUIRES_HVM, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.IS_PUBLIC, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.IS_FEATURED, Boolean.FALSE)); - s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); - s_properties.add(new Pair(BaseCmd.Properties.USER_ID, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT_OBJ, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.ACCOUNT, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.USER_ID, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.DOMAIN_ID, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.FORMAT, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.OS_TYPE_ID, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.ZONE_ID, Boolean.TRUE)); @@ -71,7 +73,9 @@ public class RegisterTemplateCmd extends BaseCmd { @Override public List> execute(Map params) { - Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName()); + Account account = (Account)params.get(BaseCmd.Properties.ACCOUNT_OBJ.getName()); + String accountName = (String)params.get(BaseCmd.Properties.ACCOUNT.getName()); + Long domainId = (Long)params.get(BaseCmd.Properties.DOMAIN_ID.getName()); Long userId = (Long)params.get(BaseCmd.Properties.USER_ID.getName()); String name = (String)params.get(BaseCmd.Properties.NAME.getName()); String displayText = (String)params.get(BaseCmd.Properties.DISPLAY_TEXT.getName()); @@ -103,20 +107,31 @@ public class RegisterTemplateCmd extends BaseCmd { zoneId = null; } - long accountId = 1L; // default to system account - if (account != null) { + Long accountId = null; + if ((account == null) || isAdmin(account.getType())) { + if (domainId != null) { + if ((account != null) && !getManagementServer().isChildDomain(account.getDomainId(), domainId)) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, "Invalid domain id (" + domainId + ") "); + } + if (accountName != null) { + Account userAccount = getManagementServer().findActiveAccount(accountName, domainId); + if (userAccount == null) { + throw new ServerApiException(BaseCmd.PARAM_ERROR, "Unable to find account " + accountName + " in domain " + domainId); + } + accountId = userAccount.getId(); + } + } else { + accountId = ((account != null) ? account.getId() : null); + } + } else { accountId = account.getId(); } - - Account accountObj; - if (account == null) { - accountObj = getManagementServer().findAccountById(accountId); - } else { - accountObj = account; + + if (accountId == null) { + throw new ServerApiException(BaseCmd.ACCOUNT_ERROR, "No valid account specified for registering template."); } - boolean isAdmin = (accountObj.getType() == Account.ACCOUNT_TYPE_ADMIN); - + boolean isAdmin = getManagementServer().findAccountById(accountId).getType() == Account.ACCOUNT_TYPE_ADMIN; if (!isAdmin && zoneId == null) { throw new ServerApiException(BaseCmd.PARAM_ERROR, "Please specify a valid zone Id."); } @@ -131,7 +146,7 @@ public class RegisterTemplateCmd extends BaseCmd { &&(!url.toLowerCase().endsWith("qcow2.bz2"))&&(!url.toLowerCase().endsWith("qcow2.gz")))){ throw new ServerApiException(BaseCmd.PARAM_ERROR, "Please specify a valid "+format.toLowerCase()); } - + boolean allowPublicUserTemplates = Boolean.parseBoolean(getManagementServer().getConfigurationValue("allow.public.user.templates")); if (!isAdmin && !allowPublicUserTemplates && isPublic) { throw new ServerApiException(BaseCmd.PARAM_ERROR, "Only private templates can be created."); @@ -148,7 +163,7 @@ public class RegisterTemplateCmd extends BaseCmd { Long templateId; try { - templateId = getManagementServer().createTemplate(userId, zoneId, name, displayText, isPublic, featured, format, "ext3", url, null, requiresHVM, bits, passwordEnabled, guestOSId, true); + templateId = getManagementServer().createTemplate(userId, accountId, zoneId, name, displayText, isPublic, featured, format, "ext3", url, null, requiresHVM, bits, passwordEnabled, guestOSId, true); } catch (InvalidParameterValueException ipve) { throw new ServerApiException(BaseCmd.PARAM_ERROR, "Internal error registering template " + name + "; " + ipve.getMessage()); } catch (IllegalArgumentException iae) { diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 3bf8a1c0f2b..39bc8aec0bd 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -4911,11 +4911,12 @@ public class ManagementServerImpl implements ManagementServer { throw new InternalErrorException(errorString); } - + String volumeLocalPath = "volumes/"+volume.getId()+"/"+cvAnswer.getVolumePath()+".vhd"; uploadJob.setUploadState(UploadVO.Status.COPY_COMPLETE); uploadJob.setLastUpdated(new Date()); _uploadDao.update(uploadJob.getId(), uploadJob); - _uploadMonitor.extractVolume(uploadJob, sserver, volume, url, zoneId, "volumes/"+volume.getId()+"/"+cvAnswer.getVolumePath()+".vhd", eventId, asyncJobId, _asyncMgr); + + _uploadMonitor.extractVolume(uploadJob, sserver, volume, url, zoneId, volumeLocalPath, eventId, asyncJobId, _asyncMgr); } @@ -4986,7 +4987,7 @@ public class ManagementServerImpl implements ManagementServer { } @Override - public Long createTemplate(long userId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, String format, String diskType, String url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) throws InvalidParameterValueException,IllegalArgumentException, ResourceAllocationException { + public Long createTemplate(long userId, long accountId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, String format, String diskType, String url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) throws InvalidParameterValueException,IllegalArgumentException, ResourceAllocationException { try { if (name.length() > 32) @@ -5030,11 +5031,10 @@ public class ManagementServerImpl implements ManagementServer { } // Check that the resource limit for templates/ISOs won't be exceeded - UserVO user = _userDao.findById(userId); - if (user == null) { - throw new IllegalArgumentException("Unable to find user with id " + userId); + AccountVO account = _accountDao.findById(accountId); + if (account == null) { + throw new InvalidParameterValueException("Unable to find account: " + accountId); } - AccountVO account = _accountDao.findById(user.getAccountId()); if (_accountMgr.resourceLimitExceeded(account, ResourceType.template)) { ResourceAllocationException rae = new ResourceAllocationException("Maximum number of templates and ISOs for account: " + account.getAccountName() + " has been exceeded."); rae.setResourceType("template"); @@ -5052,7 +5052,7 @@ public class ManagementServerImpl implements ManagementServer { throw new IllegalArgumentException("Cannot use reserved names for templates"); } - return _tmpltMgr.create(userId, zoneId, name, displayText, isPublic, featured, imgfmt, fileSystem, uri, chksum, requiresHvm, bits, enablePassword, guestOSId, bootable); + return _tmpltMgr.create(userId, accountId, zoneId, name, displayText, isPublic, featured, imgfmt, fileSystem, uri, chksum, requiresHvm, bits, enablePassword, guestOSId, bootable); } catch (URISyntaxException e) { throw new IllegalArgumentException("Invalid URL " + url); } diff --git a/server/src/com/cloud/template/TemplateManager.java b/server/src/com/cloud/template/TemplateManager.java index 7644e5bb22e..b0ed035edb4 100755 --- a/server/src/com/cloud/template/TemplateManager.java +++ b/server/src/com/cloud/template/TemplateManager.java @@ -46,6 +46,7 @@ public interface TemplateManager extends Manager { * Creates a Template * * @param userId the Id of the user + * @param accountId of the template to be created. * @param zoneId (optional) the zone to download the template to * @param name - user specified name for the template * @param displayText user readable name. @@ -62,7 +63,7 @@ public interface TemplateManager extends Manager { * @param bootable true if this template will represent a bootable ISO * @return id of the template created. */ - Long create(long userId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable); + Long create(long userId, long accountId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable); /** * Creates a Template diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index a1aea47fe1b..698d30ca11a 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -117,11 +117,9 @@ public class TemplateManagerImpl implements TemplateManager { @Override - public Long create(long userId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) { + public Long create(long userId, long accountId, Long zoneId, String name, String displayText, boolean isPublic, boolean featured, ImageFormat format, FileSystem fs, URI url, String chksum, boolean requiresHvm, int bits, boolean enablePassword, long guestOSId, boolean bootable) { Long id = _tmpltDao.getNextInSequence(Long.class, "id"); - - UserVO user = _userDao.findById(userId); - long accountId = user.getAccountId(); + AccountVO account = _accountDao.findById(accountId); if (account.getType() != Account.ACCOUNT_TYPE_ADMIN && zoneId == null) { throw new IllegalArgumentException("Only admins can create templates in all zones"); @@ -139,12 +137,9 @@ public class TemplateManagerImpl implements TemplateManager { _tmpltDao.addTemplateToZone(template, zoneId); } - - UserAccount userAccount = _userAccountDao.findById(userId); - _downloadMonitor.downloadTemplateToStorage(id, zoneId); - _accountMgr.incrementResourceCount(userAccount.getAccountId(), ResourceType.template); + _accountMgr.incrementResourceCount(accountId, ResourceType.template); return id; } From 6c683e733a4f2afbe76f8b37e71620f64634c2d7 Mon Sep 17 00:00:00 2001 From: kishan Date: Mon, 27 Sep 2010 18:29:02 +0530 Subject: [PATCH 018/244] bug 5851,6312: fixed start event ids for router start/stop events status 5851,6312: resolved fixed --- server/src/com/cloud/network/NetworkManagerImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 5dd5ec4ec74..ec603e50dc9 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2018,7 +2018,10 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager event.setState(EventState.Started); event.setDescription("Stopping Router with Id: "+routerId); event.setStartId(eventId); - _eventDao.persist(event); + event = _eventDao.persist(event); + if(eventId == 0){ + eventId = event.getId(); + } try { @@ -2230,7 +2233,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Override public DomainRouterVO addVirtualMachineToGuestNetwork(UserVmVO vm, String password, long startEventId) throws ConcurrentOperationException { try { - DomainRouterVO router = start(vm.getDomainRouterId(), startEventId); + DomainRouterVO router = start(vm.getDomainRouterId(), 0); if (router == null) { s_logger.error("Can't find a domain router to start VM: " + vm.getName()); return null; From 27a32380f2bb656c442d03059eaefffa26198ba6 Mon Sep 17 00:00:00 2001 From: nit Date: Mon, 27 Sep 2010 20:39:05 +0530 Subject: [PATCH 019/244] bug 5360: Adding scheduled and started events for USER.DELETE. status 5360: resolved fixed --- .../async/executor/DeleteUserExecutor.java | 15 ++++++++--- .../cloud/async/executor/DeleteUserParam.java | 25 +++++++++++++++++++ .../cloud/server/ManagementServerImpl.java | 7 +++++- 3 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 server/src/com/cloud/async/executor/DeleteUserParam.java diff --git a/server/src/com/cloud/async/executor/DeleteUserExecutor.java b/server/src/com/cloud/async/executor/DeleteUserExecutor.java index 40b8dd0730f..c1214b1e180 100644 --- a/server/src/com/cloud/async/executor/DeleteUserExecutor.java +++ b/server/src/com/cloud/async/executor/DeleteUserExecutor.java @@ -25,8 +25,10 @@ import com.cloud.async.AsyncJobManager; import com.cloud.async.AsyncJobResult; import com.cloud.async.AsyncJobVO; import com.cloud.async.BaseAsyncJobExecutor; +import com.cloud.event.EventTypes; import com.cloud.serializer.GsonHelper; import com.cloud.server.ManagementServer; +import com.cloud.user.User; import com.google.gson.Gson; public class DeleteUserExecutor extends BaseAsyncJobExecutor { @@ -37,10 +39,15 @@ public class DeleteUserExecutor extends BaseAsyncJobExecutor { AsyncJobManager asyncMgr = getAsyncJobMgr(); AsyncJobVO job = getJob(); ManagementServer managementServer = asyncMgr.getExecutorContext().getManagementServer(); - Long param = gson.fromJson(job.getCmdInfo(), Long.class); + DeleteUserParam param = gson.fromJson(job.getCmdInfo(), DeleteUserParam.class); - try { - if(managementServer.deleteUser(param.longValue())) { + try { + User user = managementServer.getUser(param.getUserId(), true); + String description = "Starting deleting User " + user.getUsername() + " (id: " + param.getUserId() + + ") for accountId = " + user.getAccountId(); + managementServer.saveStartedEvent(1L, 1L, EventTypes.EVENT_USER_DELETE, description, param.getEventId()); + + if(managementServer.deleteUser(param.getUserId())) { asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_SUCCEEDED, 0, "success"); } else { @@ -48,7 +55,7 @@ public class DeleteUserExecutor extends BaseAsyncJobExecutor { "operation failed"); } } catch(Exception e) { - s_logger.warn("Unable to delete User " + param.longValue() + ": " + e.getMessage(), e); + s_logger.warn("Unable to delete User " + param.getUserId() + ": " + e.getMessage(), e); asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, e.getMessage()); } diff --git a/server/src/com/cloud/async/executor/DeleteUserParam.java b/server/src/com/cloud/async/executor/DeleteUserParam.java new file mode 100644 index 00000000000..97974992c1f --- /dev/null +++ b/server/src/com/cloud/async/executor/DeleteUserParam.java @@ -0,0 +1,25 @@ +package com.cloud.async.executor; + +public class DeleteUserParam { + + private Long userId; + private Long eventId; + + public DeleteUserParam() {} + + public DeleteUserParam(Long userId, Long eventId) { + this.userId = userId; + this.eventId = eventId; + + } + + public Long getUserId() { + return userId; + } + + public Long getEventId() { + return eventId; + } + + +} diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 39bc8aec0bd..d94d221c5c9 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -97,6 +97,7 @@ import com.cloud.async.executor.CreatePrivateTemplateParam; import com.cloud.async.executor.DeleteDomainParam; import com.cloud.async.executor.DeleteRuleParam; import com.cloud.async.executor.DeleteTemplateParam; +import com.cloud.async.executor.DeleteUserParam; import com.cloud.async.executor.DeployVMParam; import com.cloud.async.executor.DisassociateIpAddressParam; import com.cloud.async.executor.ExtractJobResultObject; @@ -903,7 +904,11 @@ public class ManagementServerImpl implements ManagementServer { @Override public long deleteUserAsync(long userId) { - Long param = new Long(userId); + User user = getUser(userId, true); + String description = "User " + user.getUsername() + " (id: " + userId + + ") and accountId = " + user.getAccountId(); + long eventId = saveScheduledEvent(1L, 1L, EventTypes.EVENT_USER_DELETE, description); + DeleteUserParam param = new DeleteUserParam(userId, eventId); Gson gson = GsonHelper.getBuilder().create(); AsyncJobVO job = new AsyncJobVO(); From 4a305631f9d693aef931fb97618c38f410c51cff Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Mon, 27 Sep 2010 10:49:52 -0700 Subject: [PATCH 020/244] fix a bug - showXXXXXXXTab() is not defined. --- ui/jsp/tab_accounts.jsp | 1 + ui/jsp/tab_configuration.jsp | 1 + ui/jsp/tab_domains.jsp | 1 + ui/jsp/tab_events.jsp | 1 + ui/jsp/tab_hosts.jsp | 1 + ui/jsp/tab_instances.jsp | 1 + ui/jsp/tab_networking.jsp | 1 + ui/jsp/tab_storage.jsp | 1 + ui/jsp/tab_templates.jsp | 1 + 9 files changed, 9 insertions(+) diff --git a/ui/jsp/tab_accounts.jsp b/ui/jsp/tab_accounts.jsp index 8bd1bb882b8..df4da1544c5 100755 --- a/ui/jsp/tab_accounts.jsp +++ b/ui/jsp/tab_accounts.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> +
diff --git a/ui/jsp/tab_configuration.jsp b/ui/jsp/tab_configuration.jsp index c9f574702fc..1d1df5ca070 100755 --- a/ui/jsp/tab_configuration.jsp +++ b/ui/jsp/tab_configuration.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> + diff --git a/ui/jsp/tab_domains.jsp b/ui/jsp/tab_domains.jsp index 5a9ceb6bfa3..dbe56fb321d 100755 --- a/ui/jsp/tab_domains.jsp +++ b/ui/jsp/tab_domains.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> +
diff --git a/ui/jsp/tab_events.jsp b/ui/jsp/tab_events.jsp index e83a0bed7ac..f5c4ac48e88 100755 --- a/ui/jsp/tab_events.jsp +++ b/ui/jsp/tab_events.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> + diff --git a/ui/jsp/tab_hosts.jsp b/ui/jsp/tab_hosts.jsp index 3e0eb71ae30..438efabae1e 100755 --- a/ui/jsp/tab_hosts.jsp +++ b/ui/jsp/tab_hosts.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> +
diff --git a/ui/jsp/tab_instances.jsp b/ui/jsp/tab_instances.jsp index 6676b55432e..856ca9189c8 100755 --- a/ui/jsp/tab_instances.jsp +++ b/ui/jsp/tab_instances.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> + diff --git a/ui/jsp/tab_networking.jsp b/ui/jsp/tab_networking.jsp index ae81f2d107e..ea0b1f27a9a 100755 --- a/ui/jsp/tab_networking.jsp +++ b/ui/jsp/tab_networking.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> + diff --git a/ui/jsp/tab_storage.jsp b/ui/jsp/tab_storage.jsp index f84a9405cde..aaab49adb19 100755 --- a/ui/jsp/tab_storage.jsp +++ b/ui/jsp/tab_storage.jsp @@ -2,6 +2,7 @@ <% long milliseconds = new Date().getTime(); %> +
- - + + + + + diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 5af09b65573..ddfde4ca684 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -201,7 +201,7 @@ var selectedItemsInMidMenu = {}; function buildActionLinkForMidMenu(label, actionMap, $actionMenu, listAPIMap) { var apiInfo = actionMap[label]; - var $listItem = $("#action_list_item").clone(); + var $listItem = $("#action_list_item_middle_menu").clone(); $actionMenu.find("#action_list").append($listItem.show()); var $link = $listItem.find("#link").text(label); $link.data("label", label); From 49143dbe4a3ee8cb9bd9302bec357950a47ba80a Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 27 Sep 2010 14:20:05 -0700 Subject: [PATCH 024/244] Remove user vm from instance_group when empty string is passed as value for "group" parameter in updateVirtualMachine API. --- server/src/com/cloud/api/commands/UpdateVMCmd.java | 6 +----- server/src/com/cloud/server/ManagementServerImpl.java | 11 ++++++++--- server/src/com/cloud/vm/UserVmManager.java | 2 ++ server/src/com/cloud/vm/UserVmManagerImpl.java | 1 + 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/server/src/com/cloud/api/commands/UpdateVMCmd.java b/server/src/com/cloud/api/commands/UpdateVMCmd.java index ff788e42e51..a6903097c1c 100644 --- a/server/src/com/cloud/api/commands/UpdateVMCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMCmd.java @@ -66,11 +66,7 @@ public class UpdateVMCmd extends BaseCmd{ // default userId to SYSTEM user if (userId == null) { userId = Long.valueOf(1); - } - - //don't accept empty parameter for the group - if (group != null && group.isEmpty()) - group = null; + } // Verify input parameters try { diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index d94d221c5c9..33410c61a32 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2804,9 +2804,14 @@ public class ManagementServerImpl implements ManagementServer { } if (group != null) { - boolean addToGroup = _vmMgr.addInstanceToGroup(Long.valueOf(vmId), group); - if (!addToGroup) { - throw new CloudRuntimeException("Unable to update Vm with the the group " + group); + if (group.isEmpty()) { + _vmMgr.removeInstanceFromGroup(vmId); + } + else { + boolean addToGroup = _vmMgr.addInstanceToGroup(Long.valueOf(vmId), group); + if (!addToGroup) { + throw new CloudRuntimeException("Unable to update Vm with the the group " + group); + } } } diff --git a/server/src/com/cloud/vm/UserVmManager.java b/server/src/com/cloud/vm/UserVmManager.java index 6c70f3c3f42..7e8a3919d22 100644 --- a/server/src/com/cloud/vm/UserVmManager.java +++ b/server/src/com/cloud/vm/UserVmManager.java @@ -232,5 +232,7 @@ public interface UserVmManager extends Manager, VirtualMachineManager boolean addInstanceToGroup(long userVmId, String group); InstanceGroupVO getGroupForVm(long vmId); + + void removeInstanceFromGroup(long vmId); } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 01c1181e2f8..44b834374c2 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -3154,6 +3154,7 @@ public class UserVmManagerImpl implements UserVmManager { } } + @Override public void removeInstanceFromGroup(long vmId) { try { List groupVmMaps = _groupVMMapDao.listByInstanceId(vmId); From c443867f281e9aa7d8b467e32c2936993dea6790 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Mon, 27 Sep 2010 12:17:18 -0700 Subject: [PATCH 025/244] more changes --- .../computing/LibvirtComputingResource.java | 4 +- .../src/com/cloud/agent/api/Answer.java | 0 .../src/com/cloud/agent/api/Command.java | 0 .../cloud/agent/api/UnsupportedAnswer.java | 0 .../agent/api/storage/CreateCommand.java | 33 ++- .../cloud/agent/api/to/StorageFilerTO.java | 9 +- .../StorageUnavailableException.java | 37 ++- .../cloud/network/NetworkConfiguration.java | 24 +- api/src/com/cloud/resource/Resource.java | 24 +- api/src/com/cloud/storage/StorageGuru.java | 30 +++ api/src/com/cloud/storage/StoragePool.java | 4 + api/src/com/cloud/storage/Volume.java | 76 +++++- api/src/com/cloud/vm/State.java | 30 ++- .../xen/resource/CitrixResourceBase.java | 16 +- .../src/com/cloud/storage/StorageManager.java | 10 +- core/src/com/cloud/storage/StoragePoolVO.java | 35 ++- core/src/com/cloud/storage/VolumeVO.java | 7 +- core/src/com/cloud/storage/dao/VolumeDao.java | 10 + .../com/cloud/storage/dao/VolumeDaoImpl.java | 51 ++++ .../consoleproxy/ConsoleProxyManagerImpl.java | 10 +- .../com/cloud/network/NetworkManagerImpl.java | 2 +- .../com/cloud/storage/StorageManagerImpl.java | 239 ++++++++++++------ .../AbstractStoragePoolAllocator.java | 9 +- .../allocator/StoragePoolAllocator.java | 2 +- .../SecondaryStorageManagerImpl.java | 2 +- server/src/com/cloud/vm/MauriceMoss.java | 15 +- .../src/com/cloud/vm/UserVmManagerImpl.java | 9 +- .../src/com/cloud/utils/fsm/FiniteState.java | 2 + 28 files changed, 512 insertions(+), 178 deletions(-) rename {core => api}/src/com/cloud/agent/api/Answer.java (100%) rename {core => api}/src/com/cloud/agent/api/Command.java (100%) rename {core => api}/src/com/cloud/agent/api/UnsupportedAnswer.java (100%) rename {core => api}/src/com/cloud/agent/api/storage/CreateCommand.java (70%) rename core/src/com/cloud/agent/api/to/StoragePoolTO.java => api/src/com/cloud/agent/api/to/StorageFilerTO.java (92%) create mode 100644 api/src/com/cloud/storage/StorageGuru.java diff --git a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java index 7f9d79c65bc..8e7a15e7757 100644 --- a/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java +++ b/agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java @@ -137,7 +137,7 @@ import com.cloud.agent.api.storage.CreatePrivateTemplateCommand; import com.cloud.agent.api.storage.DestroyCommand; import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; -import com.cloud.agent.api.to.StoragePoolTO; +import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.resource.computing.LibvirtStoragePoolDef.poolType; import com.cloud.agent.resource.computing.LibvirtStorageVolumeDef.volFormat; @@ -1173,7 +1173,7 @@ public class LibvirtComputingResource extends ServerResourceBase implements Serv } protected Answer execute(CreateCommand cmd) { - StoragePoolTO pool = cmd.getPool(); + StorageFilerTO pool = cmd.getPool(); DiskProfile dskch = cmd.getDiskCharacteristics(); StorageVol tmplVol = null; StoragePool primaryPool = null; diff --git a/core/src/com/cloud/agent/api/Answer.java b/api/src/com/cloud/agent/api/Answer.java similarity index 100% rename from core/src/com/cloud/agent/api/Answer.java rename to api/src/com/cloud/agent/api/Answer.java diff --git a/core/src/com/cloud/agent/api/Command.java b/api/src/com/cloud/agent/api/Command.java similarity index 100% rename from core/src/com/cloud/agent/api/Command.java rename to api/src/com/cloud/agent/api/Command.java diff --git a/core/src/com/cloud/agent/api/UnsupportedAnswer.java b/api/src/com/cloud/agent/api/UnsupportedAnswer.java similarity index 100% rename from core/src/com/cloud/agent/api/UnsupportedAnswer.java rename to api/src/com/cloud/agent/api/UnsupportedAnswer.java diff --git a/core/src/com/cloud/agent/api/storage/CreateCommand.java b/api/src/com/cloud/agent/api/storage/CreateCommand.java similarity index 70% rename from core/src/com/cloud/agent/api/storage/CreateCommand.java rename to api/src/com/cloud/agent/api/storage/CreateCommand.java index d53e378aec7..46eae20a601 100644 --- a/core/src/com/cloud/agent/api/storage/CreateCommand.java +++ b/api/src/com/cloud/agent/api/storage/CreateCommand.java @@ -18,19 +18,16 @@ package com.cloud.agent.api.storage; import com.cloud.agent.api.Command; -import com.cloud.agent.api.to.StoragePoolTO; -import com.cloud.storage.StoragePoolVO; -import com.cloud.storage.VolumeVO; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.storage.StoragePool; import com.cloud.vm.DiskProfile; -import com.cloud.vm.VMInstanceVO; public class CreateCommand extends Command { private long volId; - private StoragePoolTO pool; + private StorageFilerTO pool; private DiskProfile diskCharacteristics; private String templateUrl; private long size; - private String instanceName; protected CreateCommand() { super(); @@ -45,8 +42,8 @@ public class CreateCommand extends Command { * @param templateUrl * @param pool */ - public CreateCommand(VolumeVO vol, VMInstanceVO vm, DiskProfile diskCharacteristics, String templateUrl, StoragePoolVO pool) { - this(vol, vm, diskCharacteristics, pool, 0); + public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StorageFilerTO pool) { + this(diskCharacteristics, pool, 0); this.templateUrl = templateUrl; } @@ -58,13 +55,20 @@ public class CreateCommand extends Command { * @param diskCharacteristics * @param pool */ - public CreateCommand(VolumeVO vol, VMInstanceVO vm, DiskProfile diskCharacteristics, StoragePoolVO pool, long size) { - this.volId = vol.getId(); + public CreateCommand(DiskProfile diskCharacteristics, StorageFilerTO pool, long size) { + this.volId = diskCharacteristics.getVolumeId(); this.diskCharacteristics = diskCharacteristics; - this.pool = new StoragePoolTO(pool); + this.pool = pool; this.templateUrl = null; this.size = size; - //this.instanceName = vm.getInstanceName(); + } + + public CreateCommand(DiskProfile diskCharacteristics, String templateUrl, StoragePool pool) { + this(diskCharacteristics, templateUrl, new StorageFilerTO(pool)); + } + + public CreateCommand(DiskProfile diskCharacteristics, StoragePool pool, long size) { + this(diskCharacteristics, new StorageFilerTO(pool), size); } @Override @@ -76,7 +80,7 @@ public class CreateCommand extends Command { return templateUrl; } - public StoragePoolTO getPool() { + public StorageFilerTO getPool() { return pool; } @@ -92,7 +96,8 @@ public class CreateCommand extends Command { return this.size; } + @Deprecated public String getInstanceName() { - return instanceName; + return null; } } diff --git a/core/src/com/cloud/agent/api/to/StoragePoolTO.java b/api/src/com/cloud/agent/api/to/StorageFilerTO.java similarity index 92% rename from core/src/com/cloud/agent/api/to/StoragePoolTO.java rename to api/src/com/cloud/agent/api/to/StorageFilerTO.java index 188dc1c8094..f59ca841aa4 100644 --- a/core/src/com/cloud/agent/api/to/StoragePoolTO.java +++ b/api/src/com/cloud/agent/api/to/StorageFilerTO.java @@ -17,11 +17,10 @@ */ package com.cloud.agent.api.to; -import com.cloud.storage.StoragePoolVO; import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.storage.StoragePool; - -public class StoragePoolTO { +public class StorageFilerTO { long id; String uuid; String host; @@ -29,7 +28,7 @@ public class StoragePoolTO { int port; StoragePoolType type; - public StoragePoolTO(StoragePoolVO pool) { + public StorageFilerTO(StoragePool pool) { this.id = pool.getId(); this.host = pool.getHostAddress(); this.port = pool.getPort(); @@ -62,7 +61,7 @@ public class StoragePoolTO { return type; } - protected StoragePoolTO() { + protected StorageFilerTO() { } @Override diff --git a/api/src/com/cloud/exception/StorageUnavailableException.java b/api/src/com/cloud/exception/StorageUnavailableException.java index d6ed0265d88..1015e65835e 100644 --- a/api/src/com/cloud/exception/StorageUnavailableException.java +++ b/api/src/com/cloud/exception/StorageUnavailableException.java @@ -20,18 +20,39 @@ package com.cloud.exception; import com.cloud.utils.SerialVersionUID; /** - * This exception is thrown when the storage device can not be reached. - * + * This exception is thrown when storage for a VM is unavailable. + * If the cause is due to storage pool unavailable, calling + * getOffendingObject() will return the object that we have + * problem with. + * */ -public class StorageUnavailableException extends AgentUnavailableException { +public class StorageUnavailableException extends Exception { + Object _obj; private static final long serialVersionUID = SerialVersionUID.StorageUnavailableException; - public StorageUnavailableException(long hostId) { - super(hostId); - } - public StorageUnavailableException(String msg) { - super(msg, -1); + super(msg); + } + + public StorageUnavailableException(String msg, Throwable cause) { + super(msg, cause); + } + + public StorageUnavailableException(String msg, Object cause) { + super(msg); + _obj = cause; + } + + public StorageUnavailableException(String msg, Object obj, Throwable cause) { + super(msg, cause); + _obj = obj; + } + + /** + * @return object that caused this problem. It can either be a StoragePool or volume. + */ + public Object getOffendingObject() { + return _obj; } } diff --git a/api/src/com/cloud/network/NetworkConfiguration.java b/api/src/com/cloud/network/NetworkConfiguration.java index 9ccf426a389..760e7ce2e13 100644 --- a/api/src/com/cloud/network/NetworkConfiguration.java +++ b/api/src/com/cloud/network/NetworkConfiguration.java @@ -23,10 +23,10 @@ public interface NetworkConfiguration { } enum State implements FiniteState { - Allocated, // Indicates the network configuration is in allocated but not setup. - Setup, // Indicates the network configuration is setup. - Implemented, // Indicates the network configuration is in use. - Destroying; + Allocated("Indicates the network configuration is in allocated but not setup"), + Setup("Indicates the network configuration is setup"), + Implemented("Indicates the network configuration is in use"), + Destroying("Indicates the network configuration is being destroyed"); @Override public StateMachine getStateMachine() { @@ -48,7 +48,23 @@ public interface NetworkConfiguration { return s_fsm.getPossibleEvents(this); } + String _description; + + @Override + public String getDescription() { + return _description; + } + + private State(String description) { + _description = description; + } + private static StateMachine s_fsm = new StateMachine(); + static { + s_fsm.addTransition(State.Allocated, Event.ImplementNetwork, State.Implemented); + s_fsm.addTransition(State.Implemented, Event.DestroyNetwork, State.Destroying); + } + } diff --git a/api/src/com/cloud/resource/Resource.java b/api/src/com/cloud/resource/Resource.java index 310507061ae..3cc5135c648 100644 --- a/api/src/com/cloud/resource/Resource.java +++ b/api/src/com/cloud/resource/Resource.java @@ -26,12 +26,14 @@ public interface Resource { } enum State implements FiniteState { - Allocated, // Resource is allocated - Reserving, // Resource is being reserved right now. - Reserved, // Resource is reserved - Releasing, // Resource is being released. - Ready; // Resource is ready which means it does not need to go through reservation. + Allocated("Resource is allocated but not reserved"), + Reserving("Resource is being reserved right now"), + Reserved("Resource has been reserved."), + Releasing("Resource is being released"), + Ready("Resource is ready which means it doesn't need to go through resservation"); + String _description; + @Override public StateMachine getStateMachine() { @@ -54,12 +56,24 @@ public interface Resource { return s_fsm.getPossibleEvents(this); } + private State(String description) { + _description = description; + } + + @Override + public String getDescription() { + return _description; + } + final static private StateMachine s_fsm = new StateMachine(); static { s_fsm.addTransition(State.Allocated, Event.ReservationRequested, State.Reserving); s_fsm.addTransition(State.Reserving, Event.CancelRequested, State.Allocated); s_fsm.addTransition(State.Reserving, Event.OperationCompleted, State.Reserved); s_fsm.addTransition(State.Reserving, Event.OperationFailed, State.Allocated); + s_fsm.addTransition(State.Reserved, Event.ReleaseRequested, State.Releasing); + s_fsm.addTransition(State.Releasing, Event.OperationCompleted, State.Allocated); + s_fsm.addTransition(State.Releasing, Event.OperationFailed, State.Reserved); } } diff --git a/api/src/com/cloud/storage/StorageGuru.java b/api/src/com/cloud/storage/StorageGuru.java new file mode 100644 index 00000000000..396013debf5 --- /dev/null +++ b/api/src/com/cloud/storage/StorageGuru.java @@ -0,0 +1,30 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +package com.cloud.storage; + +import com.cloud.utils.component.Adapter; + +/** + * StorageGuru understands about how to implement different + * types of storage pools. + */ +public interface StorageGuru extends Adapter { + void createVolume(); + void prepareVolume(); + void destroyVolume(); +} diff --git a/api/src/com/cloud/storage/StoragePool.java b/api/src/com/cloud/storage/StoragePool.java index 2c06aba7628..dbbb8c61492 100644 --- a/api/src/com/cloud/storage/StoragePool.java +++ b/api/src/com/cloud/storage/StoragePool.java @@ -101,4 +101,8 @@ public interface StoragePool { * @return the storage pool status */ Status getStatus(); + + int getPort(); + + Long getPodId(); } diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java index 75421e1880b..15333865c20 100755 --- a/api/src/com/cloud/storage/Volume.java +++ b/api/src/com/cloud/storage/Volume.java @@ -18,10 +18,14 @@ package com.cloud.storage; import java.util.Date; +import java.util.List; +import java.util.Set; import com.cloud.domain.PartOf; import com.cloud.template.BasedOn; import com.cloud.user.OwnedBy; +import com.cloud.utils.fsm.FiniteState; +import com.cloud.utils.fsm.StateMachine; public interface Volume extends PartOf, OwnedBy, BasedOn { @@ -29,14 +33,70 @@ public interface Volume extends PartOf, OwnedBy, BasedOn { enum MirrorState {NOT_MIRRORED, ACTIVE, DEFUNCT}; - enum State { - Allocated, - Creating, - Created, - Corrupted, - ToBeDestroyed, - Expunging, - Destroyed + enum State implements FiniteState { + Allocated("The volume is allocated but has not been created yet."), + Creating("The volume is being created. getPoolId() should reflect the pool where it is being created."), + Ready("The volume is ready to be used."), + Destroy("The volume is set to be desctroyed but can be recovered."), + Expunging("The volume is being destroyed. There's no way to recover."), + Destroyed("The volume is destroyed. Should be removed."); + + String _description; + + private State(String description) { + _description = description; + } + + @Override + public StateMachine getStateMachine() { + return s_fsm; + } + + @Override + public State getNextState(Event event) { + return s_fsm.getNextState(this, event); + } + + @Override + public List getFromStates(Event event) { + return s_fsm.getFromStates(this, event); + } + + @Override + public Set getPossibleEvents() { + return s_fsm.getPossibleEvents(this); + } + + @Override + public String getDescription() { + return _description; + } + + private final static StateMachine s_fsm = new StateMachine(); + static { + s_fsm.addTransition(Allocated, Event.Create, Creating); + s_fsm.addTransition(Allocated, Event.Destroy, Destroyed); + s_fsm.addTransition(Creating, Event.OperationRetry, Creating); + s_fsm.addTransition(Creating, Event.OperationFailed, Allocated); + s_fsm.addTransition(Creating, Event.OperationSucceeded, Ready); + s_fsm.addTransition(Creating, Event.Destroy, Expunging); + s_fsm.addTransition(Ready, Event.Destroy, Destroy); + s_fsm.addTransition(Destroy, Event.Expunge, Expunging); + s_fsm.addTransition(Destroy, Event.Recover, Ready); + s_fsm.addTransition(Expunging, Event.OperationSucceeded, Destroyed); + s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy); + s_fsm.addTransition(Allocated, Event.Destroy, Destroyed); + } + } + + enum Event { + Create, + OperationFailed, + OperationSucceeded, + OperationRetry, + Destroy, + Recover, + Expunge; } enum SourceType { diff --git a/api/src/com/cloud/vm/State.java b/api/src/com/cloud/vm/State.java index 53bd798818f..c024ff270b9 100644 --- a/api/src/com/cloud/vm/State.java +++ b/api/src/com/cloud/vm/State.java @@ -26,21 +26,28 @@ import com.cloud.utils.fsm.StateMachine; import com.cloud.vm.VirtualMachine.Event; public enum State implements FiniteState { - Creating(true), - Starting(true), - Running(false), - Stopping(true), - Stopped(false), - Destroyed(false), - Expunging(true), - Migrating(true), - Error(false), - Unknown(false); + Creating(true, "VM is being created"), + Starting(true, "VM is being started. At this state, you should find host id filled which means it's being started on that host."), + Running(false, "VM is running. host id has the host that it is running on."), + Stopping(true, "VM is being stopped. host id has the host that it is being stopped on."), + Stopped(false, "VM is stopped. host id should be null."), + Destroyed(false, "VM is marked for destroy."), + Expunging(true, "VM is being expunged."), + Migrating(true, "VM is being migrated. host id holds to from host"), + Error(false, "VM is in error"), + Unknown(false, "VM state is unknown."); private final boolean _transitional; + String _description; - private State(boolean transitional) { + private State(boolean transitional, String description) { _transitional = transitional; + _description = description; + } + + @Override + public String getDescription() { + return _description; } public boolean isTransitional() { @@ -67,6 +74,7 @@ public enum State implements FiniteState { return s_fsm; } + protected static final StateMachine s_fsm = new StateMachine(); static { s_fsm.addTransition(null, VirtualMachine.Event.CreateRequested, State.Creating); diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 4e9c7e7ca59..0bef5d1f407 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -145,7 +145,7 @@ import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.agent.api.storage.ShareAnswer; import com.cloud.agent.api.storage.ShareCommand; import com.cloud.agent.api.to.NicTO; -import com.cloud.agent.api.to.StoragePoolTO; +import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.exception.InternalErrorException; @@ -4449,7 +4449,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR protected Answer execute(ModifyStoragePoolCommand cmd) { StoragePoolVO pool = cmd.getPool(); - StoragePoolTO poolTO = new StoragePoolTO(pool); + StorageFilerTO poolTO = new StorageFilerTO(pool); try { Connection conn = getConnection(); @@ -4478,7 +4478,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR protected Answer execute(DeleteStoragePoolCommand cmd) { StoragePoolVO pool = cmd.getPool(); - StoragePoolTO poolTO = new StoragePoolTO(pool); + StorageFilerTO poolTO = new StorageFilerTO(pool); try { Connection conn = getConnection(); SR sr = getStorageRepository(conn, poolTO); @@ -4719,7 +4719,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR @Override public CreateAnswer execute(CreateCommand cmd) { - StoragePoolTO pool = cmd.getPool(); + StorageFilerTO pool = cmd.getPool(); DiskProfile dskch = cmd.getDiskCharacteristics(); VDI vdi = null; @@ -4893,7 +4893,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } } - protected SR getIscsiSR(StoragePoolTO pool) { + protected SR getIscsiSR(StorageFilerTO pool) { Connection conn = getConnection(); synchronized (pool.getUuid().intern()) { Map deviceConfig = new HashMap(); @@ -5003,7 +5003,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } } - protected SR getNfsSR(StoragePoolTO pool) { + protected SR getNfsSR(StorageFilerTO pool) { Connection conn = getConnection(); Map deviceConfig = new HashMap(); @@ -5124,7 +5124,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR public CopyVolumeAnswer execute(final CopyVolumeCommand cmd) { String volumeUUID = cmd.getVolumePath(); StoragePoolVO pool = cmd.getPool(); - StoragePoolTO poolTO = new StoragePoolTO(pool); + StorageFilerTO poolTO = new StorageFilerTO(pool); String secondaryStorageURL = cmd.getSecondaryStorageURL(); URI uri = null; @@ -6041,7 +6041,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } } - protected SR getStorageRepository(Connection conn, StoragePoolTO pool) { + protected SR getStorageRepository(Connection conn, StorageFilerTO pool) { Set srs; try { srs = SR.getByNameLabel(conn, pool.getUuid()); diff --git a/core/src/com/cloud/storage/StorageManager.java b/core/src/com/cloud/storage/StorageManager.java index d7bda8cb9ed..e75267963a7 100755 --- a/core/src/com/cloud/storage/StorageManager.java +++ b/core/src/com/cloud/storage/StorageManager.java @@ -28,6 +28,8 @@ import com.cloud.agent.api.to.VolumeTO; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.deploy.DeployDestination; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientStorageCapacityException; import com.cloud.exception.InternalErrorException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceInUseException; @@ -229,9 +231,9 @@ public interface StorageManager extends Manager { */ boolean volumeOnSharedStoragePool(VolumeVO volume); - Answer[] sendToPool(StoragePoolVO pool, Command[] cmds, boolean stopOnError); + Answer[] sendToPool(StoragePool pool, Command[] cmds, boolean stopOnError); - Answer sendToPool(StoragePoolVO pool, Command cmd); + Answer sendToPool(StoragePool pool, Command cmd); /** * Checks that one of the following is true: @@ -314,9 +316,9 @@ public interface StorageManager extends Manager { DiskProfile allocateTemplatedVolume(VolumeType type, String name, DiskOfferingVO offering, VMTemplateVO template, T vm, AccountVO owner); void create(T vm); - Long findHostIdForStoragePool(StoragePoolVO pool); + Long findHostIdForStoragePool(StoragePool pool); void createCapacityEntry(StoragePoolVO storagePool, long allocated); - VolumeTO[] prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException; + VolumeTO[] prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException, ConcurrentOperationException; } diff --git a/core/src/com/cloud/storage/StoragePoolVO.java b/core/src/com/cloud/storage/StoragePoolVO.java index f3a3460157c..7d3a8b90724 100644 --- a/core/src/com/cloud/storage/StoragePoolVO.java +++ b/core/src/com/cloud/storage/StoragePoolVO.java @@ -82,7 +82,8 @@ public class StoragePoolVO implements StoragePool { @Enumerated(value=EnumType.STRING) private Status status; - public long getId() { + @Override + public long getId() { return id; } @@ -95,19 +96,23 @@ public class StoragePoolVO implements StoragePool { // TODO Auto-generated constructor stub } - public String getName() { + @Override + public String getName() { return name; } - public String getUuid() { + @Override + public String getUuid() { return uuid; } - public StoragePoolType getPoolType() { + @Override + public StoragePoolType getPoolType() { return poolType; } - public Date getCreated() { + @Override + public Date getCreated() { return created; } @@ -115,19 +120,23 @@ public class StoragePoolVO implements StoragePool { return removed; } - public Date getUpdateTime() { + @Override + public Date getUpdateTime() { return updateTime; } - public long getDataCenterId() { + @Override + public long getDataCenterId() { return dataCenterId; } - public long getAvailableBytes() { + @Override + public long getAvailableBytes() { return availableBytes; } - public long getCapacityBytes() { + @Override + public long getCapacityBytes() { return capacityBytes; } @@ -160,10 +169,12 @@ public class StoragePoolVO implements StoragePool { this.clusterId = clusterId; } + @Override public String getHostAddress() { return hostAddress; } + @Override public String getPath() { return path; } @@ -217,10 +228,12 @@ public class StoragePoolVO implements StoragePool { return port; } + @Override public boolean isShared() { return poolType.isShared(); } + @Override public boolean isLocal() { return !poolType.isShared(); } @@ -252,6 +265,10 @@ public class StoragePoolVO implements StoragePool { this.name = name; } + public boolean isInMaintenance() { + return status == Status.PrepareForMaintenance || status == Status.Maintenance || status == Status.ErrorInMaintenance || removed != null; + } + @Override public boolean equals(Object obj) { if (!(obj instanceof StoragePoolVO) || obj == null) { diff --git a/core/src/com/cloud/storage/VolumeVO.java b/core/src/com/cloud/storage/VolumeVO.java index d5d23dea53d..72b4f237635 100755 --- a/core/src/com/cloud/storage/VolumeVO.java +++ b/core/src/com/cloud/storage/VolumeVO.java @@ -236,6 +236,10 @@ public class VolumeVO implements Volume { this.status = AsyncInstanceCreateStatus.Created; this.recreatable = false; } + + public void setState(State state) { + this.state = state; + } public boolean isRecreatable() { return recreatable; @@ -245,7 +249,8 @@ public class VolumeVO implements Volume { return iscsiName; } - public long getId() { + @Override + public long getId() { return id; } diff --git a/core/src/com/cloud/storage/dao/VolumeDao.java b/core/src/com/cloud/storage/dao/VolumeDao.java index 3bd43faf9bc..22a84e0a85a 100755 --- a/core/src/com/cloud/storage/dao/VolumeDao.java +++ b/core/src/com/cloud/storage/dao/VolumeDao.java @@ -19,6 +19,7 @@ package com.cloud.storage.dao; import java.util.List; +import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; import com.cloud.storage.VolumeVO; import com.cloud.utils.Pair; @@ -47,4 +48,13 @@ public interface VolumeDao extends GenericDao { List findCreatedByInstance(long id); List findByPoolId(long poolId); List findByInstanceAndDeviceId(long instanceId, long deviceId); + List findUsableVolumesForInstance(long instanceId); + + /** + * Updates the volume only if the state in memory matches the state in the database. + * @param vol Volume to be updated. + * @param event event that causes the database change. + * @return true if update happened, false if not. + */ + boolean update(VolumeVO vol, Volume.Event event) throws ConcurrentOperationException; } diff --git a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java index dc82102a1a5..d58444a9245 100755 --- a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -29,11 +29,13 @@ import javax.ejb.Local; import org.apache.log4j.Logger; import com.cloud.async.AsyncInstanceCreateStatus; +import com.cloud.exception.ConcurrentOperationException; import com.cloud.storage.Volume; import com.cloud.storage.Volume.MirrorState; import com.cloud.storage.Volume.VolumeType; import com.cloud.storage.VolumeVO; import com.cloud.utils.Pair; +import com.cloud.utils.db.Attribute; import com.cloud.utils.db.DB; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; @@ -42,6 +44,7 @@ import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; +import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.exception.CloudRuntimeException; @Local(value=VolumeDao.class) @DB(txn=false) @@ -62,6 +65,10 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol protected final SearchBuilder RemovedButNotDestroyedSearch; protected final SearchBuilder PoolIdSearch; protected final SearchBuilder InstanceAndDeviceIdSearch; + protected final SearchBuilder InstanceStatesSearch; + protected final SearchBuilder IdStateSearch; + + protected final Attribute _stateAttr; protected static final String SELECT_VM_SQL = "SELECT DISTINCT instance_id from volumes v where v.host_id = ? and v.mirror_state = ?"; protected static final String SELECT_VM_ID_SQL = "SELECT DISTINCT instance_id from volumes v where v.host_id = ?"; @@ -143,6 +150,15 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol return listBy(sc); } + @Override + public List findUsableVolumesForInstance(long instanceId) { + SearchCriteria sc = InstanceStatesSearch.create(); + sc.setParameters("instance", instanceId); + sc.setParameters("states", Volume.State.Creating, Volume.State.Ready, Volume.State.Allocated); + + return listBy(sc); + } + @Override public List findByInstanceAndType(long id, VolumeType vType) { SearchCriteria sc = InstanceAndTypeSearch.create(); @@ -271,6 +287,28 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol update(volumeId, volume); } + @Override + public boolean update(VolumeVO vol, Volume.Event event) throws ConcurrentOperationException { + Volume.State oldState = vol.getState(); + Volume.State newState = oldState.getNextState(event); + + assert newState != null : "Event "+ event + " cannot happen from " + oldState; + + UpdateBuilder builder = getUpdateBuilder(vol); + builder.set(vol, _stateAttr, newState); + + SearchCriteria sc = IdStateSearch.create(); + sc.setParameters("id", vol.getId()); + sc.setParameters("state", vol.getState()); + + int rows = update(builder, sc, null); + if (rows != 1) { + VolumeVO dbVol = findById(vol.getId()); + throw new ConcurrentOperationException("Unable to update " + vol + ": Old State=" + oldState + "; New State = " + newState + "; DB State=" + dbVol.getState()); + } + return rows == 1; + } + protected VolumeDaoImpl() { AccountIdSearch = createSearchBuilder(); AccountIdSearch.and("accountId", AccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); @@ -353,6 +391,19 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol RemovedButNotDestroyedSearch.and("destroyed", RemovedButNotDestroyedSearch.entity().getDestroyed(), SearchCriteria.Op.EQ); RemovedButNotDestroyedSearch.and("removed", RemovedButNotDestroyedSearch.entity().getRemoved(), SearchCriteria.Op.NNULL); RemovedButNotDestroyedSearch.done(); + + InstanceStatesSearch = createSearchBuilder(); + InstanceStatesSearch.and("instance", InstanceStatesSearch.entity().getInstanceId(), SearchCriteria.Op.EQ); + InstanceStatesSearch.and("states", InstanceStatesSearch.entity().getState(), SearchCriteria.Op.IN); + InstanceStatesSearch.done(); + + IdStateSearch = createSearchBuilder(); + IdStateSearch.and("id", IdStateSearch.entity().getId(), SearchCriteria.Op.EQ); + IdStateSearch.and("state", IdStateSearch.entity().getState(), SearchCriteria.Op.EQ); + IdStateSearch.done(); + + _stateAttr = _allAttributes.get("state"); + assert _stateAttr != null : "Couldn't get the state attribute"; } @Override @DB(txn=false) diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 399c7795de3..9e41e39652d 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -516,7 +516,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach @Override public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) { try { - return start(proxyVmId, startEventId); + return start2(proxyVmId, startEventId); } catch (StorageUnavailableException e) { s_logger.warn("Exception while trying to start console proxy", e); return null; @@ -852,7 +852,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach if (s_logger.isDebugEnabled()) s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); - Map context = createProxyInstance(dataCenterId); + Map context = createProxyInstance2(dataCenterId); long proxyVmId = (Long) context.get("proxyVmId"); if (proxyVmId == 0) { @@ -892,7 +892,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach if (s_logger.isDebugEnabled()) s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); - Map context = createProxyInstance(dataCenterId); + Map context = createProxyInstance2(dataCenterId); long proxyVmId = (Long) context.get("proxyVmId"); if (proxyVmId == 0) { @@ -1417,7 +1417,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach try { if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) { try { - readyProxy = start(readyProxy.getId(), 0); + readyProxy = start2(readyProxy.getId(), 0); } finally { proxyLock.unlock(); } @@ -2150,7 +2150,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach if (!_storageMgr.share(proxy, vols, routingHost, false)) { s_logger.warn("Can not share " + proxy.getName()); - throw new StorageUnavailableException(vol.getPoolId()); + throw new StorageUnavailableException("Can not share " + proxy.getName(), vol); } Answer answer = _agentMgr.easySend(routingHost.getId(), cmd); diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index ec603e50dc9..bd79579bdf1 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -2139,7 +2139,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager if( ! _storageMgr.share(router, vols, routingHost, false) ) { s_logger.warn("Can not share " + vol.getPath() + " to " + router.getName() ); - throw new StorageUnavailableException(vol.getPoolId()); + throw new StorageUnavailableException("Can not share " + vol.getPath() + " to " + router.getName(), vol); } final Answer answer = _agentMgr.easySend(routingHost.getId(), cmd); diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 0539b3a470b..1d344ac666e 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -26,7 +26,6 @@ import java.util.Enumeration; import java.util.Formatter; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -56,6 +55,7 @@ import com.cloud.agent.api.storage.CreateAnswer; import com.cloud.agent.api.storage.CreateCommand; import com.cloud.agent.api.storage.DeleteTemplateCommand; import com.cloud.agent.api.storage.DestroyCommand; +import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.alert.AlertManager; import com.cloud.api.BaseCmd; @@ -84,6 +84,7 @@ import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.DiscoveryException; import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InsufficientStorageCapacityException; import com.cloud.exception.InternalErrorException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.OperationTimedoutException; @@ -103,6 +104,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Storage.StoragePoolType; +import com.cloud.storage.Volume.Event; import com.cloud.storage.Volume.MirrorState; import com.cloud.storage.Volume.SourceType; import com.cloud.storage.Volume.VolumeType; @@ -173,10 +175,6 @@ public class StorageManagerImpl implements StorageManager { @Inject protected ConsoleProxyDao _consoleProxyDao; @Inject protected DetailsDao _detailsDao; @Inject protected SnapshotDao _snapshotDao; - @Inject(adapter=StoragePoolAllocator.class) - protected Adapters _storagePoolAllocators; - @Inject(adapter=StoragePoolDiscoverer.class) - protected Adapters _discoverers; @Inject protected StoragePoolHostDao _storagePoolHostDao; @Inject protected AlertManager _alertMgr; @Inject protected VMTemplateHostDao _vmTemplateHostDao = null; @@ -197,6 +195,11 @@ public class StorageManagerImpl implements StorageManager { @Inject protected ServiceOfferingDao _offeringDao; @Inject protected UserDao _userDao; + @Inject(adapter=StoragePoolAllocator.class) + protected Adapters _storagePoolAllocators; + @Inject(adapter=StoragePoolDiscoverer.class) + protected Adapters _discoverers; + protected SearchBuilder HostTemplateStatesSearch; protected SearchBuilder PoolsUsedByVmSearch; @@ -272,79 +275,6 @@ public class StorageManagerImpl implements StorageManager { return vols.get(0); } - @Override - public VolumeTO[] prepare(VirtualMachineProfile vm, DeployDestination dest) { - List vols = _volsDao.findCreatedByInstance(vm.getId()); - List recreateVols = new ArrayList(vols.size()); - Host host = dest.getHost(); - - VolumeTO[] disks = new VolumeTO[vols.size()]; - int i = 0; - Iterator it = vols.iterator(); - while (it.hasNext()) { - VolumeVO vol = it.next(); - if (vol.isRecreatable()) { - it.remove(); - //if we have a system vm - //get the storage pool - //if pool is in maintenance - //add to recreate vols, and continue - if(vm.getType().equals(VirtualMachine.Type.ConsoleProxy) || vm.getType().equals(VirtualMachine.Type.DomainRouter) || vm.getType().equals(VirtualMachine.Type.SecondaryStorageVm)) - { - StoragePoolVO sp = _storagePoolDao.findById(vol.getPoolId()); - - if(sp!=null && sp.getStatus().equals(Status.PrepareForMaintenance)) - { - recreateVols.add(vol); - continue; - } - } - - StoragePoolHostVO ph = _storagePoolHostDao.findByPoolHost(vol.getPoolId(), host.getId()); - if (ph == null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Must recreate " + vol + " since " + vol.getPoolId() + " has is not hooked up with host " + host.getId()); - } - recreateVols.add(vol); - } - } - } - - for (VolumeVO vol : recreateVols) { - VolumeVO create = allocateDuplicateVolume(vol); - vols.add(vol); - } - - /* - create.setDiskOfferingId(vol.getDiskOfferingId()); - create.setDeviceId(vol.getDeviceId()); - create = _volsDao.persist(create); - VMTemplateVO template = _templateDao.findById(create.getTemplateId()); - DataCenterVO dc = _dcDao.findById(create.getDataCenterId()); - HostPodVO pod = _podDao.findById(host.getPodId()); - DiskOfferingVO diskOffering = null; - diskOffering = _diskOfferingDao.findById(vol.getDiskOfferingId()); - ServiceOfferingVO offering; - if (vm instanceof UserVmVO) { - offering = _offeringDao.findById(((UserVmVO)vm).getServiceOfferingId()); - } else { - offering = _offeringDao.findById(vol.getDiskOfferingId()); - } - VolumeVO created = createVolume(create, vm, template, dc, pod, host.getClusterId(), offering, diskOffering, new ArrayList(),0); - if (created == null) { - break; - } - createds.add(created); - - for (VolumeVO vol : recreateVols) { - _volsDao.remove(vol.getId()); - } - disks[i++] = null; - } - */ - return disks; - } - VolumeVO allocateDuplicateVolume(VolumeVO oldVol) { VolumeVO newVol = new VolumeVO(oldVol.getVolumeType(), oldVol.getName(), oldVol.getDataCenterId(), oldVol.getDomainId(), oldVol.getAccountId(), oldVol.getDiskOfferingId(), oldVol.getSize()); newVol.setTemplateId(oldVol.getTemplateId()); @@ -487,7 +417,7 @@ public class StorageManagerImpl implements StorageManager { } @Override - public Long findHostIdForStoragePool(StoragePoolVO pool) { + public Long findHostIdForStoragePool(StoragePool pool) { List poolHosts = _poolHostDao.listByHostStatus(pool.getId(), Status.Up); if (poolHosts.size() == 0) { @@ -498,7 +428,7 @@ public class StorageManagerImpl implements StorageManager { } @Override - public Answer[] sendToPool(StoragePoolVO pool, Command[] cmds, boolean stopOnError) { + public Answer[] sendToPool(StoragePool pool, Command[] cmds, boolean stopOnError) { List poolHosts = _poolHostDao.listByHostStatus(pool.getId(), Status.Up); Collections.shuffle(poolHosts); @@ -520,7 +450,7 @@ public class StorageManagerImpl implements StorageManager { } @Override - public Answer sendToPool(StoragePoolVO pool, Command cmd) { + public Answer sendToPool(StoragePool pool, Command cmd) { Command[] cmds = new Command[]{cmd}; Answer[] answers = sendToPool(pool, cmds, true); if (answers == null) { @@ -885,9 +815,9 @@ public class StorageManagerImpl implements StorageManager { if (tmpltStoredOn == null) { continue; } - cmd = new CreateCommand(volume, vm, dskCh, tmpltStoredOn.getLocalDownloadPath(), pool); + cmd = new CreateCommand(dskCh, tmpltStoredOn.getLocalDownloadPath(), new StorageFilerTO(pool)); } else { - cmd = new CreateCommand(volume, vm, dskCh, pool, size); + cmd = new CreateCommand(dskCh, new StorageFilerTO(pool), size); } Answer answer = sendToPool(pool, cmd); @@ -2441,6 +2371,149 @@ public class StorageManagerImpl implements StorageManager { return createDiskCharacteristics(volume, offering); } + protected StoragePool findStorage(DiskProfile dskCh, DeployDestination dest, VirtualMachineProfile vm, List alreadyAllocated, Set avoid) { + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + StoragePool pool = allocator.allocateTo(dskCh, vm, dest, alreadyAllocated, avoid); + if (pool != null) { + return pool; + } + } + return null; + } + + @Override + public VolumeTO[] prepare(VirtualMachineProfile vm, DeployDestination dest) throws StorageUnavailableException, InsufficientStorageCapacityException { + List vols = _volsDao.findUsableVolumesForInstance(vm.getId()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Preparing " + vols.size() + " volumes for " + vm); + } + + List recreateVols = new ArrayList(vols.size()); + VolumeTO[] disks = new VolumeTO[vols.size()]; + + int i = 0; + for (VolumeVO vol : vols) { + Volume.State state = vol.getState(); + if (state == Volume.State.Ready) { + StoragePoolVO pool = _storagePoolDao.findById(vol.getPoolId()); + if (pool.getRemoved() != null || pool.isInMaintenance()) { + if (vol.isRecreatable()) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Volume " + vol + " has to be recreated due to storage pool " + pool + " is unavailable"); + } + recreateVols.add(vol); + } else { + throw new StorageUnavailableException("Volume " + vol + " is not available on the storage pool.", pool); + } + } else { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Volume " + vol + " is ready."); + } + disks[i++] = new VolumeTO(vol, pool); + } + } else if (state == Volume.State.Allocated) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Creating volume " + vol + " for the first time."); + } + recreateVols.add(vol); + } else { + throw new StorageUnavailableException("Volume " + vol + " can not be used", vol); + } + } + + for (VolumeVO vol : recreateVols) { + VolumeVO newVol; + if (vol.getState() == Volume.State.Allocated) { + newVol = vol; + } else { + newVol = switchVolume(vol); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Created new volume " + newVol + " for old volume " + vol); + } + } + + try { + _volsDao.update(newVol, Volume.Event.Create); + } catch(ConcurrentOperationException e) { + throw new StorageUnavailableException("Unable to create " + newVol, newVol); + } + Pair created = createVolume(newVol, _diskOfferingDao.findById(newVol.getDiskOfferingId()), vm, vols, dest); + if (created == null) { + newVol.setPoolId(null); + try { + _volsDao.update(newVol, Event.OperationFailed); + } catch (ConcurrentOperationException e) { + throw new CloudRuntimeException("Unable to update the failure on a volume: " + newVol, e); + } + throw new StorageUnavailableException("Unable to create " + newVol, newVol); + } + newVol.setStatus(AsyncInstanceCreateStatus.Created); + newVol.setFolder(created.second().getPath()); + newVol.setPath(created.first().getPath()); + newVol.setSize(created.first().getSize()); + newVol.setPoolType(created.second().getPoolType()); + newVol.setPodId(created.second().getPodId()); + try { + _volsDao.update(newVol, Event.OperationSucceeded); + } catch (ConcurrentOperationException e) { + throw new CloudRuntimeException("Unable to update an CREATE operation succeeded on volume " + newVol, e); + } + if (s_logger.isDebugEnabled()) { + s_logger.debug("Volume " + newVol + " is created on " + created.second()); + } + disks[i++] = created.first(); + } + + return disks; + } + + @DB + protected VolumeVO switchVolume(VolumeVO existingVolume) throws StorageUnavailableException { + Transaction txn = Transaction.currentTxn(); + try { + txn.start(); + _volsDao.update(existingVolume, Event.Destroy); + VolumeVO newVolume = allocateDuplicateVolume(existingVolume); + txn.commit(); + return newVolume; + } catch (ConcurrentOperationException e) { + throw new StorageUnavailableException("Unable to duplicate the volume " + existingVolume, existingVolume, e); + } + } + + public Pair createVolume(VolumeVO toBeCreated, DiskOfferingVO offering, VirtualMachineProfile vm, List alreadyCreated, DeployDestination dest) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Creating volume: " + toBeCreated); + } + DiskProfile diskProfile = new DiskProfile(toBeCreated, offering); + + Set avoids = new HashSet(); + StoragePool pool = null; + while ((pool = findStorage(diskProfile, dest, vm, alreadyCreated, avoids)) != null) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Trying to create in " + pool); + } + avoids.add(pool); + toBeCreated.setPoolId(pool.getId()); + try { + _volsDao.update(toBeCreated, Volume.Event.OperationRetry); + } catch (ConcurrentOperationException e) { + throw new CloudRuntimeException("Unable to retry a create operation on volume " + toBeCreated); + } + CreateCommand cmd = new CreateCommand(diskProfile, new StorageFilerTO(pool), diskProfile.getSize()); + Answer answer = sendToPool(pool, cmd); + if (answer.getResult()) { + CreateAnswer createAnswer = (CreateAnswer)answer; + return new Pair(createAnswer.getVolume(), pool); + } + } + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Unable to create volume " + toBeCreated); + } + return null; + } + @Override public void create(T vm) { List vols = _volsDao.findByInstance(vm.getId()); diff --git a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java index c0d950907b9..bd67360e645 100644 --- a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java @@ -28,6 +28,8 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.HostPodVO; import com.cloud.deploy.DeployDestination; import com.cloud.host.Host; import com.cloud.host.HostVO; @@ -229,8 +231,11 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement } @Override - public StoragePool allocateTo(DiskProfile dskCh, VirtualMachineProfile vm, DeployDestination dest, List disks, Set avoids) { + public StoragePool allocateTo(DiskProfile dskCh, VirtualMachineProfile vm, DeployDestination dest, List disks, Set avoids) { - return null; + VMInstanceVO instance = (VMInstanceVO)(vm.getVm()); + + VMTemplateVO template = vm.getTemplateId() != null ? _templateDao.findById(vm.getTemplateId()) : null; + return allocateToPool(dskCh, (DataCenterVO)dest.getDataCenter(), (HostPodVO)dest.getPod(), dest.getCluster().getId(), instance, template, avoids); } } diff --git a/server/src/com/cloud/storage/allocator/StoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/StoragePoolAllocator.java index deec2ac7049..58bd80d9a07 100644 --- a/server/src/com/cloud/storage/allocator/StoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/StoragePoolAllocator.java @@ -43,5 +43,5 @@ public interface StoragePoolAllocator extends Adapter { String chooseStorageIp(VirtualMachine vm, Host host, Host storage); - StoragePool allocateTo(DiskProfile dskCh, VirtualMachineProfile vm, DeployDestination dest, List disks, Set avoids); + StoragePool allocateTo(DiskProfile dskCh, VirtualMachineProfile vm, DeployDestination dest, List disks, Set avoids); } diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 9073529922c..11fa385eb02 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1822,7 +1822,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V if( !_storageMgr.share(secStorageVm, vols, routingHost, false) ) { s_logger.warn("Can not share " + vol.getPath() + " to " + secStorageVm.getName()); - throw new StorageUnavailableException(vol.getPoolId()); + throw new StorageUnavailableException("Can not share " + vol.getPath() + " to " + secStorageVm.getName(), vol); } Answer answer = _agentMgr.easySend(routingHost.getId(), cmd); diff --git a/server/src/com/cloud/vm/MauriceMoss.java b/server/src/com/cloud/vm/MauriceMoss.java index a9764a48403..5163afed108 100644 --- a/server/src/com/cloud/vm/MauriceMoss.java +++ b/server/src/com/cloud/vm/MauriceMoss.java @@ -36,7 +36,9 @@ import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner; import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.StorageUnavailableException; import com.cloud.network.NetworkConfigurationVO; import com.cloud.network.NetworkManager; import com.cloud.offering.ServiceOffering; @@ -233,7 +235,7 @@ public class MauriceMoss implements VmManager { } @Override - public T start(T vm, DeploymentPlan plan) throws InsufficientCapacityException { + public T start(T vm, DeploymentPlan plan) throws InsufficientCapacityException, ConcurrentOperationException { if (s_logger.isDebugEnabled()) { s_logger.debug("Creating actual resources for VM " + vm); } @@ -246,7 +248,7 @@ public class MauriceMoss implements VmManager { Set avoids = new HashSet(); int retry = _retry; - while (retry-- > 0) { + while (retry-- != 0) { // It's != so that it can match -1. DeployDestination dest = null; for (DeploymentPlanner dispatcher : _planners) { dest = dispatcher.plan(vmProfile, plan, avoids); @@ -266,8 +268,15 @@ public class MauriceMoss implements VmManager { _vmDao.updateIf(vm, Event.StartRequested, dest.getHost().getId()); VirtualMachineTO vmTO = new VirtualMachineTO(); + try { + _storageMgr.prepare(vmProfile, dest); + } catch (ConcurrentOperationException e) { + throw e; + } catch (StorageUnavailableException e) { + s_logger.warn("Unable to contact storage.", e); + continue; + } _networkMgr.prepare(vmProfile, dest); -// _storageMgr.prepare(vm, dest); } if (s_logger.isDebugEnabled()) { diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 44b834374c2..18312123738 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -179,9 +179,9 @@ import com.cloud.vm.DomainRouter.Role; import com.cloud.vm.VirtualMachine.Event; import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.dao.DomainRouterDao; +import com.cloud.vm.dao.InstanceGroupDao; import com.cloud.vm.dao.InstanceGroupVMMapDao; import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.InstanceGroupDao; @Local(value={UserVmManager.class}) public class UserVmManagerImpl implements UserVmManager { @@ -1207,6 +1207,7 @@ public class UserVmManagerImpl implements UserVmManager { } + @Override public void releaseGuestIpAddress(UserVmVO userVm) { ServiceOffering offering = _offeringDao.findById(userVm.getServiceOfferingId()); @@ -2117,7 +2118,7 @@ public class UserVmManagerImpl implements UserVmManager { if( !_storageMgr.share(vm, vols, vmHost, false) ) { s_logger.warn("Can not share " + vm.toString() + " on host " + vmHost.getId()); - throw new StorageUnavailableException(vmHost.getId()); + throw new StorageUnavailableException("Can not share " + vm.toString() + " on host " + vmHost.getId()); } Answer answer = _agentMgr.easySend(vmHost.getId(), cmd); @@ -2400,6 +2401,7 @@ public class UserVmManagerImpl implements UserVmManager { } } + @Override public VMTemplateVO createPrivateTemplateRecord(Long userId, long volumeId, String name, String description, long guestOSId, Boolean requiresHvm, Integer bits, Boolean passwordEnabled, boolean isPublic, boolean featured) throws InvalidParameterValueException { @@ -3014,7 +3016,8 @@ public class UserVmManagerImpl implements UserVmManager { _vmMgr = vmMgr; } - public void run() { + @Override + public void run() { GlobalLock scanLock = GlobalLock.getInternLock("UserVMExpunge"); try { if(scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) { diff --git a/utils/src/com/cloud/utils/fsm/FiniteState.java b/utils/src/com/cloud/utils/fsm/FiniteState.java index 7ce9b2a6ed9..ca0d1f668ca 100644 --- a/utils/src/com/cloud/utils/fsm/FiniteState.java +++ b/utils/src/com/cloud/utils/fsm/FiniteState.java @@ -52,4 +52,6 @@ public interface FiniteState { * @return array of events. */ Set getPossibleEvents(); + + String getDescription(); } From dcea43ba0fd3f0642389a0503b8bba66d130eaa7 Mon Sep 17 00:00:00 2001 From: Alex Huang Date: Mon, 27 Sep 2010 15:14:13 -0700 Subject: [PATCH 026/244] create is now complete --- api/src/com/cloud/storage/Volume.java | 1 - core/src/com/cloud/storage/dao/VolumeDaoImpl.java | 2 +- .../com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 8 ++++---- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/api/src/com/cloud/storage/Volume.java b/api/src/com/cloud/storage/Volume.java index 15333865c20..bd663f142f6 100755 --- a/api/src/com/cloud/storage/Volume.java +++ b/api/src/com/cloud/storage/Volume.java @@ -85,7 +85,6 @@ public interface Volume extends PartOf, OwnedBy, BasedOn { s_fsm.addTransition(Destroy, Event.Recover, Ready); s_fsm.addTransition(Expunging, Event.OperationSucceeded, Destroyed); s_fsm.addTransition(Expunging, Event.OperationFailed, Destroy); - s_fsm.addTransition(Allocated, Event.Destroy, Destroyed); } } diff --git a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java index d58444a9245..e454506d09c 100755 --- a/core/src/com/cloud/storage/dao/VolumeDaoImpl.java +++ b/core/src/com/cloud/storage/dao/VolumeDaoImpl.java @@ -299,7 +299,7 @@ public class VolumeDaoImpl extends GenericDaoBase implements Vol SearchCriteria sc = IdStateSearch.create(); sc.setParameters("id", vol.getId()); - sc.setParameters("state", vol.getState()); + sc.setParameters("state", oldState); int rows = update(builder, sc, null); if (rows != 1) { diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 9e41e39652d..02f927bc0ca 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -516,7 +516,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach @Override public ConsoleProxyVO startProxy(long proxyVmId, long startEventId) { try { - return start2(proxyVmId, startEventId); + return start(proxyVmId, startEventId); } catch (StorageUnavailableException e) { s_logger.warn("Exception while trying to start console proxy", e); return null; @@ -852,7 +852,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach if (s_logger.isDebugEnabled()) s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); - Map context = createProxyInstance2(dataCenterId); + Map context = createProxyInstance(dataCenterId); long proxyVmId = (Long) context.get("proxyVmId"); if (proxyVmId == 0) { @@ -892,7 +892,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach if (s_logger.isDebugEnabled()) s_logger.debug("Assign console proxy from a newly started instance for request from data center : " + dataCenterId); - Map context = createProxyInstance2(dataCenterId); + Map context = createProxyInstance(dataCenterId); long proxyVmId = (Long) context.get("proxyVmId"); if (proxyVmId == 0) { @@ -1417,7 +1417,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach try { if (proxyLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_SYNC)) { try { - readyProxy = start2(readyProxy.getId(), 0); + readyProxy = start(readyProxy.getId(), 0); } finally { proxyLock.unlock(); } From 060dfc2cf9906901145de3f85e2fab0b047ee9f4 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 27 Sep 2010 16:39:13 -0700 Subject: [PATCH 027/244] bug 5190: incremental checkin --- .../api/commands/UpdateCertificateCmd.java | 78 +++++++++++++++++++ 1 file changed, 78 insertions(+) create mode 100644 server/src/com/cloud/api/commands/UpdateCertificateCmd.java diff --git a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java new file mode 100644 index 00000000000..6f46a5616f9 --- /dev/null +++ b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java @@ -0,0 +1,78 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.api.commands; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.log4j.Logger; + +import com.cloud.api.BaseCmd; +import com.cloud.api.ServerApiException; +import com.cloud.user.Account; +import com.cloud.utils.Pair; + +public class UpdateCertificateCmd extends BaseCmd { + public static final Logger s_logger = Logger.getLogger(AddConfigCmd.class.getName()); + + private static final String s_name = "updatecertificateresponse"; + private static final List> s_properties = new ArrayList>(); + + static { + s_properties.add(new Pair(BaseCmd.Properties.PATH, Boolean.FALSE)); + } + @Override + public String getName() { + return s_name; + } + + @Override + public List> getProperties() { + return s_properties; + } + + @Override + public List> execute(Map params) { + String instance = (String) params.get(BaseCmd.Properties.INSTANCE.getName()); + String component = (String) params.get(BaseCmd.Properties.COMPONENT.getName()); + String category = (String) params.get(BaseCmd.Properties.CATEGORY.getName()); + String name = (String) params.get(BaseCmd.Properties.NAME.getName()); + String value = (String) params.get(BaseCmd.Properties.VALUE.getName()); + String description = (String) params.get(BaseCmd.Properties.DESCRIPTION.getName()); + + try + { + boolean status = getManagementServer().addConfig(instance, component, category, name, value, description); + List> returnValues = new ArrayList>(); + + if(status) + { + returnValues.add(new Pair(BaseCmd.Properties.NAME.getName(), name)); + returnValues.add(new Pair(BaseCmd.Properties.VALUE.getName(), value)); + } + + return returnValues; + } + catch (Exception ex) { + s_logger.error("Exception adding config value: ", ex); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); + } + + } +} From 1356f5f33ac65aebf6ae90a714b2c49cb33078f0 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 27 Sep 2010 16:46:14 -0700 Subject: [PATCH 028/244] bug 5190: incremental checkin, code cleanup --- server/src/com/cloud/api/commands/UpdateCertificateCmd.java | 1 - 1 file changed, 1 deletion(-) diff --git a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java index 6f46a5616f9..eca054685ac 100644 --- a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java @@ -25,7 +25,6 @@ import org.apache.log4j.Logger; import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; -import com.cloud.user.Account; import com.cloud.utils.Pair; public class UpdateCertificateCmd extends BaseCmd { From 677d8894eafec217e8daea17c83a8404888eed67 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 27 Sep 2010 16:49:34 -0700 Subject: [PATCH 029/244] bug 5190: modifying the api calls --- .../cloud/api/commands/UpdateCertificateCmd.java | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java index eca054685ac..e65e3d26a29 100644 --- a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java @@ -48,23 +48,14 @@ public class UpdateCertificateCmd extends BaseCmd { @Override public List> execute(Map params) { - String instance = (String) params.get(BaseCmd.Properties.INSTANCE.getName()); - String component = (String) params.get(BaseCmd.Properties.COMPONENT.getName()); - String category = (String) params.get(BaseCmd.Properties.CATEGORY.getName()); - String name = (String) params.get(BaseCmd.Properties.NAME.getName()); - String value = (String) params.get(BaseCmd.Properties.VALUE.getName()); - String description = (String) params.get(BaseCmd.Properties.DESCRIPTION.getName()); + String certificatePath = (String) params.get(BaseCmd.Properties.PATH.getName()); try { - boolean status = getManagementServer().addConfig(instance, component, category, name, value, description); + boolean status = getManagementServer().updateCertificate(certificatePath); List> returnValues = new ArrayList>(); - if(status) - { - returnValues.add(new Pair(BaseCmd.Properties.NAME.getName(), name)); - returnValues.add(new Pair(BaseCmd.Properties.VALUE.getName(), value)); - } + returnValues.add(new Pair(BaseCmd.Properties.STATUS.getName(), status)); return returnValues; } From 89cce1a023b99605271cacc264efe8d1ddf2b581 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 27 Sep 2010 16:54:28 -0700 Subject: [PATCH 030/244] bug 5190: adding some more methods for the functionality --- core/src/com/cloud/server/ManagementServer.java | 1 + server/src/com/cloud/server/ManagementServerImpl.java | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index 6ec6cc889be..eb4938a1db3 100755 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -2260,5 +2260,6 @@ public interface ManagementServer { * Fetches the version of cloud stack */ String getVersion(); + boolean updateCertificate(String certificatePath); } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 33410c61a32..17d31bd0454 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -9110,6 +9110,12 @@ public class ManagementServerImpl implements ManagementServer { } return version; } + + @Override + public boolean updateCertificate(String certificatePath) + { + return false; + } } From ad4ea9020751e9040aaae54acc8c546521999c62 Mon Sep 17 00:00:00 2001 From: abhishek Date: Mon, 27 Sep 2010 17:01:01 -0700 Subject: [PATCH 031/244] bug 5190: enhancing some of the error messages returned to be more intuitive --- server/src/com/cloud/api/commands/UpdateCertificateCmd.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java index e65e3d26a29..16b9c6f400e 100644 --- a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UpdateCertificateCmd.java @@ -60,8 +60,8 @@ public class UpdateCertificateCmd extends BaseCmd { return returnValues; } catch (Exception ex) { - s_logger.error("Exception adding config value: ", ex); - throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Failed to add config value : " + ex.getMessage()); + s_logger.error("Exception updating the ssl certificate in db: ", ex); + throw new ServerApiException(BaseCmd.INTERNAL_ERROR, "Exception updating the ssl certificate in db: " + ex.getMessage()); } } From 2d728d4044600fc50c205852f2a19a680c9e31ac Mon Sep 17 00:00:00 2001 From: edison Date: Mon, 27 Sep 2010 17:08:31 -0700 Subject: [PATCH 032/244] set default gateway always on eth2, to fix the bug that system vm is not pingable, if public network and private network both are in the same subnet. --- tools/systemvm/debian/config/etc/init.d/cloud-early-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/systemvm/debian/config/etc/init.d/cloud-early-config b/tools/systemvm/debian/config/etc/init.d/cloud-early-config index 11efc5c1afc..6d3ea7723cf 100755 --- a/tools/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/tools/systemvm/debian/config/etc/init.d/cloud-early-config @@ -141,7 +141,7 @@ setup_common() { fi ip route delete default - ip route add default via $GW + ip route add default via $GW eth2 } setup_dnsmasq() { From 0e5469340c82acb7d9c41c2c3a7eaf99c329c22e Mon Sep 17 00:00:00 2001 From: edison Date: Mon, 27 Sep 2010 17:24:03 -0700 Subject: [PATCH 033/244] fix typo, should be "dev eth2" --- tools/systemvm/debian/config/etc/init.d/cloud-early-config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/systemvm/debian/config/etc/init.d/cloud-early-config b/tools/systemvm/debian/config/etc/init.d/cloud-early-config index 6d3ea7723cf..4b3e59b50f0 100755 --- a/tools/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/tools/systemvm/debian/config/etc/init.d/cloud-early-config @@ -141,7 +141,7 @@ setup_common() { fi ip route delete default - ip route add default via $GW eth2 + ip route add default via $GW dev eth2 } setup_dnsmasq() { From f1b0e4b8113225face1edd359c79a0753f4b0064 Mon Sep 17 00:00:00 2001 From: Chiradeep Vittal Date: Mon, 27 Sep 2010 18:04:42 -0700 Subject: [PATCH 034/244] tweaks for debian system vm --- .../cloud/storage/resource/NfsSecondaryStorageResource.java | 2 +- core/src/com/cloud/storage/template/DownloadManagerImpl.java | 4 ++-- .../src/com/cloud/storage/download/DownloadMonitorImpl.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java index b99d867978f..2051cd07323 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java @@ -431,7 +431,7 @@ public class NfsSecondaryStorageResource extends ServerResourceBase implements S private void startAdditionalServices() { Script command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service sshd restart "); + command.add("if [ -f /etc/init.d/ssh ]; then service ssh restart; else service sshd restart; fi "); String result = command.execute(); if (result != null) { s_logger.warn("Error in starting sshd service err=" + result ); diff --git a/core/src/com/cloud/storage/template/DownloadManagerImpl.java b/core/src/com/cloud/storage/template/DownloadManagerImpl.java index 2d37f630fe3..4ca24d102cb 100644 --- a/core/src/com/cloud/storage/template/DownloadManagerImpl.java +++ b/core/src/com/cloud/storage/template/DownloadManagerImpl.java @@ -853,7 +853,7 @@ public class DownloadManagerImpl implements DownloadManager { Script command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service httpd stop "); + command.add("if [ -d /etc/apache2 ] ; then service apache2 stop; else service httpd stop; fi "); String result = command.execute(); if (result != null) { s_logger.warn("Error in stopping httpd service err=" + result ); @@ -883,7 +883,7 @@ public class DownloadManagerImpl implements DownloadManager { command = new Script("/bin/bash", s_logger); command.add("-c"); - command.add("service httpd start "); + command.add("if [ -d /etc/apache2 ] ; then service apache2 start; else service httpd start; fi "); result = command.execute(); if (result != null) { s_logger.warn("Error in starting httpd service err=" + result ); diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index be30a0b0cca..17e97562a78 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -140,7 +140,7 @@ public class DownloadMonitorImpl implements DownloadMonitor { _sslCopy = Boolean.parseBoolean(configs.get("secstorage.encrypt.copy")); String cert = configs.get("secstorage.secure.copy.cert"); - if ("realhostip.com".equalsIgnoreCase(cert)) { + if (!"realhostip.com".equalsIgnoreCase(cert)) { s_logger.warn("Only realhostip.com ssl cert is supported, ignoring self-signed and other certs"); } From 9b10074c2a94fa8fd37ba102b4c908b1be7d3e08 Mon Sep 17 00:00:00 2001 From: alena Date: Mon, 27 Sep 2010 18:58:30 -0700 Subject: [PATCH 035/244] Added missing license info to the bunch of files --- .../src/com/cloud/vm/InstanceGroupVMMapVO.java | 18 ++++++++++++++++++ core/src/com/cloud/vm/InstanceGroupVO.java | 18 ++++++++++++++++++ .../src/com/cloud/vm/dao/InstanceGroupDao.java | 18 ++++++++++++++++++ .../com/cloud/vm/dao/InstanceGroupDaoImpl.java | 18 ++++++++++++++++++ .../cloud/vm/dao/InstanceGroupVMMapDao.java | 18 ++++++++++++++++++ .../vm/dao/InstanceGroupVMMapDaoImpl.java | 18 ++++++++++++++++++ .../cloud/api/commands/CreateVMGroupCmd.java | 18 ++++++++++++++++++ .../cloud/api/commands/DeleteVMGroupCmd.java | 18 ++++++++++++++++++ .../cloud/api/commands/ListVMGroupsCmd.java | 18 ++++++++++++++++++ .../cloud/api/commands/UpdateVMGroupCmd.java | 18 ++++++++++++++++++ utils/src/com/cloud/utils/db/JoinBuilder.java | 18 ++++++++++++++++++ 11 files changed, 198 insertions(+) diff --git a/core/src/com/cloud/vm/InstanceGroupVMMapVO.java b/core/src/com/cloud/vm/InstanceGroupVMMapVO.java index f51092c5dc7..96d389ff3fd 100644 --- a/core/src/com/cloud/vm/InstanceGroupVMMapVO.java +++ b/core/src/com/cloud/vm/InstanceGroupVMMapVO.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm; import javax.persistence.Column; diff --git a/core/src/com/cloud/vm/InstanceGroupVO.java b/core/src/com/cloud/vm/InstanceGroupVO.java index a16d784c3fb..1f7dde80430 100644 --- a/core/src/com/cloud/vm/InstanceGroupVO.java +++ b/core/src/com/cloud/vm/InstanceGroupVO.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm; import java.util.Date; diff --git a/core/src/com/cloud/vm/dao/InstanceGroupDao.java b/core/src/com/cloud/vm/dao/InstanceGroupDao.java index 6cfadce311b..b4d61b6ec21 100644 --- a/core/src/com/cloud/vm/dao/InstanceGroupDao.java +++ b/core/src/com/cloud/vm/dao/InstanceGroupDao.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm.dao; import java.util.List; diff --git a/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java b/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java index ad38184c6e8..a86d5fcf539 100644 --- a/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java +++ b/core/src/com/cloud/vm/dao/InstanceGroupDaoImpl.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm.dao; import java.util.List; diff --git a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java index 14d05cb4f7a..76cad6af1b7 100644 --- a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java +++ b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDao.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm.dao; import java.util.List; diff --git a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java index 7e61dad390a..e0d8f2f0eea 100644 --- a/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java +++ b/core/src/com/cloud/vm/dao/InstanceGroupVMMapDaoImpl.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.vm.dao; import java.util.List; diff --git a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java index a9fbaf9cd93..622d8476aaa 100644 --- a/server/src/com/cloud/api/commands/CreateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/CreateVMGroupCmd.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.api.commands; import java.util.ArrayList; diff --git a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java index abd3f4b4b72..08be77b1673 100644 --- a/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/DeleteVMGroupCmd.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.api.commands; import java.util.ArrayList; diff --git a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java index faefe34bd5d..83265174b4a 100644 --- a/server/src/com/cloud/api/commands/ListVMGroupsCmd.java +++ b/server/src/com/cloud/api/commands/ListVMGroupsCmd.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.api.commands; import java.util.ArrayList; diff --git a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java index fcc80e9959b..0917e119284 100644 --- a/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java +++ b/server/src/com/cloud/api/commands/UpdateVMGroupCmd.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.api.commands; import java.util.ArrayList; diff --git a/utils/src/com/cloud/utils/db/JoinBuilder.java b/utils/src/com/cloud/utils/db/JoinBuilder.java index 17242b2fa43..e1a0c0ead7f 100644 --- a/utils/src/com/cloud/utils/db/JoinBuilder.java +++ b/utils/src/com/cloud/utils/db/JoinBuilder.java @@ -1,3 +1,21 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + package com.cloud.utils.db; From 122b15071d51fa5553149acc403049e1ab854b7e Mon Sep 17 00:00:00 2001 From: nit Date: Tue, 28 Sep 2010 14:44:38 +0530 Subject: [PATCH 036/244] bug 6334: Correcting the syntax of json data when the response is empty. status 6334: resolved fixed --- server/src/com/cloud/api/BaseCmd.java | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/server/src/com/cloud/api/BaseCmd.java b/server/src/com/cloud/api/BaseCmd.java index cf34dfd65ac..c0c0970bd42 100755 --- a/server/src/com/cloud/api/BaseCmd.java +++ b/server/src/com/cloud/api/BaseCmd.java @@ -637,14 +637,15 @@ public abstract class BaseCmd { } public String buildResponse(List> tagList, String responseType) { - StringBuffer sb = new StringBuffer(); + StringBuffer prefixSb = new StringBuffer(); + StringBuffer suffixSb = new StringBuffer(); // set up the return value with the name of the response if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) { - sb.append("{ \"" + getName() + "\" : { \"@attributes\":{\"cloud-stack-version\":\""+getManagementServer().getVersion()+"\"},"); + prefixSb.append("{ \"" + getName() + "\" : { \"@attributes\":{\"cloud-stack-version\":\""+getManagementServer().getVersion()+"\"}"); } else { - sb.append(""); - sb.append("<" + getName() + " cloud-stack-version=\""+getManagementServer().getVersion()+ "\">"); + prefixSb.append(""); + prefixSb.append("<" + getName() + " cloud-stack-version=\""+getManagementServer().getVersion()+ "\">"); } int i = 0; @@ -654,19 +655,25 @@ public abstract class BaseCmd { if (tagValue instanceof Object[]) { Object[] subObjects = (Object[])tagValue; if (subObjects.length < 1) continue; - writeObjectArray(responseType, sb, i++, tagName, subObjects); + writeObjectArray(responseType, suffixSb, i++, tagName, subObjects); } else { - writeNameValuePair(sb, tagName, tagValue, responseType, i++); + writeNameValuePair(suffixSb, tagName, tagValue, responseType, i++); } } - + + if(suffixSb.length() > 0){ + if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)){ // append comma only if we have some suffix else not as per strict Json syntax. + prefixSb.append(","); + } + prefixSb.append(suffixSb); + } // close the response if (RESPONSE_TYPE_JSON.equalsIgnoreCase(responseType)) { - sb.append("} }"); + prefixSb.append("} }"); } else { - sb.append(""); + prefixSb.append(""); } - return sb.toString(); + return prefixSb.toString(); } private void writeNameValuePair(StringBuffer sb, String tagName, Object tagValue, String responseType, int propertyCount) { From 9a4ceb64c049d45de1b41dc73114a1099e8fab57 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 10:44:09 -0700 Subject: [PATCH 037/244] fix bug 6287 - decode string before displaying on UI. --- ui/scripts/cloud.core.accounts.js | 4 +- ui/scripts/cloud.core.configuration.js | 26 ++++++------- ui/scripts/cloud.core.domains.js | 2 +- ui/scripts/cloud.core.hosts.js | 14 +++---- ui/scripts/cloud.core.init.js | 12 +++--- ui/scripts/cloud.core.instances.js | 52 +++++++++++++------------- ui/scripts/cloud.core.js | 8 ++++ ui/scripts/cloud.core.network.js | 14 +++---- ui/scripts/cloud.core.storage.js | 40 ++++++++++---------- ui/scripts/cloud.core.templates.js | 44 +++++++++++----------- 10 files changed, 112 insertions(+), 104 deletions(-) diff --git a/ui/scripts/cloud.core.accounts.js b/ui/scripts/cloud.core.accounts.js index 085f1e55c4f..b4d1d868b31 100644 --- a/ui/scripts/cloud.core.accounts.js +++ b/ui/scripts/cloud.core.accounts.js @@ -117,7 +117,7 @@ function showAccountsTab(domainId) { loadingImg.hide(); rowContainer.show(); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

" + sanitizeXSS(result.jobresult) + "

").dialog("open"); + $("#dialog_alert").html("

" + fromdb(result.jobresult) + "

").dialog("open"); loadingImg.hide(); rowContainer.show(); } @@ -165,7 +165,7 @@ function showAccountsTab(domainId) { var accountId = json.id; var accountName = json.name; var domainId = json.domainid; - template.attr("id", "account"+accountId).data("accountId", accountId).data("accountName", sanitizeXSS(accountName)).data("domainId", sanitizeXSS(domainId)); + template.attr("id", "account"+accountId).data("accountId", accountId).data("accountName", fromdb(accountName)).data("domainId", fromdb(domainId)); template.find("#account_role").text(toRole(json.accounttype)); template.find("#account_accountid").text(json.id); diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js index 1bfcb7b1199..e431395c0d7 100644 --- a/ui/scripts/cloud.core.configuration.js +++ b/ui/scripts/cloud.core.configuration.js @@ -69,7 +69,7 @@ function showConfigurationTab() { }); function globalJSONToTemplate(json, template) { - template.data("name", sanitizeXSS(noNull(json.name))).attr("id", "global_"+noNull(json.name)); + template.data("name", fromdb(json.name)).attr("id", "global_"+noNull(json.name)); (index++ % 2 == 0)? template.addClass("smallrow_even"): template.addClass("smallrow_odd"); template.find("#global_name").text(noNull(json.name)); template.find("#global_value").text(noNull(json.value)); @@ -160,9 +160,9 @@ function showConfigurationTab() { } function zoneObjectToRightPanel(obj) { - rightPanel.html("Zone: "+sanitizeXSS(obj.name)); + rightPanel.html("Zone: "+fromdb(obj.name)); var rightContentHtml = - "

ZONE: "+sanitizeXSS(obj.name)+"

" + "

ZONE: "+fromdb(obj.name)+"

" + "

DNS 1: "+obj.dns1+"

" + "

DNS 2: "+((obj.dns2 == null) ? "" : obj.dns2) +"

" + "

Internal DNS 1: "+obj.internaldns1+"

" @@ -187,10 +187,10 @@ function showConfigurationTab() { } function podObjectToRightPanel(obj) { - rightPanel.html("Pod: " + sanitizeXSS(obj.name)); + rightPanel.html("Pod: " + fromdb(obj.name)); var rightContentHtml = - "

POD: "+sanitizeXSS(obj.name)+"

" + "

POD: "+fromdb(obj.name)+"

" + "

Private CIDR: "+obj.cidr+"

" + "

Private IP Range: "+obj.ipRange+"

" + "

Gateway: "+obj.gateway+"

"; @@ -361,7 +361,7 @@ function showConfigurationTab() { var obj = {"id": id, "name": name, "dns1": dns1, "dns2": dns2, "internaldns1": internaldns1, "internaldns2": internaldns2, "vlan": vlan, "guestcidraddress": guestcidraddress }; zoneObjectToRightPanel(obj); var zoneName = $("#zone_"+id).find("#zone_name").text(name); - zoneName.data("id", id).data("name", sanitizeXSS(name)).data("dns1", dns1).data("internaldns1", internaldns1).data("guestcidraddress", guestcidraddress); + zoneName.data("id", id).data("name", fromdb(name)).data("dns1", dns1).data("internaldns1", internaldns1).data("guestcidraddress", guestcidraddress); if (dns2 != "") zoneName.data("dns2", dns2); if (internaldns2 != "") @@ -624,7 +624,7 @@ function showConfigurationTab() { var obj = {"id": id, "zoneid": zoneid, "name": newName, "cidr": newCidr, "startip": newStartip, "endip": newEndip, "ipRange": newIpRange, "gateway": newGateway}; podObjectToRightPanel(obj); var podName = $("#pod_"+id).find("#pod_name").text(newName); - podName.data("id", id).data("name", sanitizeXSS(newName)).data("cidr", newCidr).data("startip", newStartip).data("endip", newEndip).data("ipRange", newIpRange).data("gateway", newGateway); + podName.data("id", id).data("name", fromdb(newName)).data("cidr", newCidr).data("startip", newStartip).data("endip", newEndip).data("ipRange", newIpRange).data("gateway", newGateway); loadingImg.hide(); row_container.show(); }, @@ -664,7 +664,7 @@ function showConfigurationTab() { var pods = json.listpodsresponse.pod; if (pods != null && pods.length > 0) { for (var i = 0; i < pods.length; i++) { - podSelect.append(""); + podSelect.append(""); } } else { podSelect.append(""); @@ -681,7 +681,7 @@ function showConfigurationTab() { var domains = json.listdomainsresponse.domain; if (domains != null && domains.length > 0) { for (var i = 0; i < domains.length; i++) { - domainSelect.append(""); + domainSelect.append(""); } } } @@ -933,11 +933,11 @@ function showConfigurationTab() { function zoneJSONToTemplate(json, template) { var zoneid = json.id; - template.data("id", zoneid).data("name", sanitizeXSS(json.name)); + template.data("id", zoneid).data("name", fromdb(json.name)); template.find("#zone_name") .text(json.name) .data("id", zoneid) - .data("name", sanitizeXSS(json.name)) + .data("name", fromdb(json.name)) .data("dns1", json.dns1) .data("internaldns1", json.internaldns1) .data("guestcidraddress", json.guestcidraddress); @@ -1302,7 +1302,7 @@ function showConfigurationTab() { function serviceJSONToTemplate(json, template) { template.attr("id", "service_"+json.id); (index++ % 2 == 0)? template.addClass("smallrow_even"): template.addClass("smallrow_odd"); - template.data("svcId", json.id).data("svcName", sanitizeXSS(unescape(json.name))); + template.data("svcId", json.id).data("svcName", fromdb(json.name)); template.find("#service_id").text(json.id); template.find("#service_name").text(unescape(json.name)); @@ -1685,7 +1685,7 @@ function showConfigurationTab() { } else { template.addClass("smallrow_odd"); } - template.data("diskId", json.id).data("diskName", sanitizeXSS(unescape(json.name))); + template.data("diskId", json.id).data("diskName", fromdb(json.name)); template.find("#disk_id").text(json.id); template.find("#disk_name").text(unescape(json.name)); diff --git a/ui/scripts/cloud.core.domains.js b/ui/scripts/cloud.core.domains.js index 572ebe8dbad..fd0b5a81a44 100644 --- a/ui/scripts/cloud.core.domains.js +++ b/ui/scripts/cloud.core.domains.js @@ -55,7 +55,7 @@ function showDomainsTab() { var template = treenodeTemplate.clone(true); template.attr("id", "domain_"+json.id); - template.data("domainId", json.id).data("domainName", sanitizeXSS(json.name)).data("domainLevel", level); + template.data("domainId", json.id).data("domainName", fromdb(json.name)).data("domainLevel", level); template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id); template.find("#domain_expand_icon").attr("id", "domain_expand_icon_"+json.id); template.find("#domain_name").attr("id", "domain_name_"+json.id).text(json.name); diff --git a/ui/scripts/cloud.core.hosts.js b/ui/scripts/cloud.core.hosts.js index af7aac1e64d..25a9609d99f 100644 --- a/ui/scripts/cloud.core.hosts.js +++ b/ui/scripts/cloud.core.hosts.js @@ -41,7 +41,7 @@ function showHostsTab() { var zoneSelect = dialogAddRouting.find("#host_zone").empty(); if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) - zoneSelect.append(""); + zoneSelect.append(""); } //dialogAddRouting.find("#host_zone").change(); } @@ -58,7 +58,7 @@ function showHostsTab() { var podSelect = dialogAddRouting.find("#host_pod").empty(); if (pods != null && pods.length > 0) { for (var i = 0; i < pods.length; i++) { - podSelect.append(""); + podSelect.append(""); } } dialogAddRouting.find("#host_pod").change(); @@ -228,7 +228,7 @@ function showHostsTab() { break; case "host_action_enable_maint" : $("#dialog_confirmation") - .html("

Please confirm you enable maintenance for host: "+sanitizeXSS(hostName)+". Enabling maintenance mode will cause a live migration of all running instances on this host to any available host. An alert will be sent to the admin when this process has been completed.

") + .html("

Please confirm you enable maintenance for host: "+fromdb(hostName)+". Enabling maintenance mode will cause a live migration of all running instances on this host to any available host. An alert will be sent to the admin when this process has been completed.

") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -302,7 +302,7 @@ function showHostsTab() { break; case "host_action_cancel_maint" : $("#dialog_confirmation") - .html("

Please confirm you want to cancel maintenance for host: "+sanitizeXSS(hostName)+".

") + .html("

Please confirm you want to cancel maintenance for host: "+fromdb(hostName)+".

") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -377,7 +377,7 @@ function showHostsTab() { break; case "host_action_reconnect" : $("#dialog_confirmation") - .html("

Please confirm you want to force a reconnection for host: "+sanitizeXSS(hostName)+".

") + .html("

Please confirm you want to force a reconnection for host: "+fromdb(hostName)+".

") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -452,7 +452,7 @@ function showHostsTab() { break; case "host_action_remove" : $("#dialog_confirmation") - .html("

Please confirm you want to remove this host: "+sanitizeXSS(hostName)+" from the management server.

") + .html("

Please confirm you want to remove this host: "+fromdb(hostName)+" from the management server.

") .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); @@ -513,7 +513,7 @@ function showHostsTab() { } else { template.find("#row_container").addClass("row_odd"); } - template.data("hostId", json.id).data("hostName", sanitizeXSS(json.name)); + template.data("hostId", json.id).data("hostName", fromdb(json.name)); template.find("#routing_zone").text(json.zonename); template.find("#routing_pod").text(json.podname); diff --git a/ui/scripts/cloud.core.init.js b/ui/scripts/cloud.core.init.js index ffc2e3bfa3c..b7713efef2a 100644 --- a/ui/scripts/cloud.core.init.js +++ b/ui/scripts/cloud.core.init.js @@ -360,7 +360,7 @@ $(document).ready(function() { var zoneSelect = $("#capacity_zone_select").empty(); if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { - zoneSelect.append(""); + zoneSelect.append(""); if(noPods) { $.ajax({ data: createURL("command=listPods&zoneId="+zones[i].id+"&response=json"), @@ -545,7 +545,7 @@ $(document).ready(function() { if (pods != null && pods.length > 0) { podSelect.append(""); for (var i = 0; i < pods.length; i++) { - podSelect.append(""); + podSelect.append(""); } } $("#capacity_pod_select").change(); @@ -566,7 +566,7 @@ $(document).ready(function() { for (var i = 0; i < length; i++) { var errorTemplate = $("#recent_error_template").clone(true); errorTemplate.find("#db_error_type").text(toAlertType(alerts[i].type)); - errorTemplate.find("#db_error_msg").append(sanitizeXSS(alerts[i].description)); + errorTemplate.find("#db_error_msg").append(fromdb(alerts[i].description)); setDateField(alerts[i].sent, errorTemplate.find("#db_error_date")); alertGrid.append(errorTemplate.show()); } @@ -586,7 +586,7 @@ $(document).ready(function() { for (var i = 0; i < length; i++) { var errorTemplate = $("#recent_error_template").clone(true); errorTemplate.find("#db_error_type").text("Host - Alert State"); - errorTemplate.find("#db_error_msg").append("Host - " + sanitizeXSS(alerts[i].name) + " has been detected in Alert state."); + errorTemplate.find("#db_error_msg").append("Host - " + fromdb(alerts[i].name) + " has been detected in Alert state."); setDateField(alerts[i].disconnected, errorTemplate.find("#db_error_date")); alertGrid.append(errorTemplate.show()); } @@ -664,7 +664,7 @@ $(document).ready(function() { for (var i = 0; i < length; i++) { var errorTemplate = $("#recent_error_template").clone(true); errorTemplate.find("#db_error_type").text(events[i].type); - errorTemplate.find("#db_error_msg").text(sanitizeXSS(events[i].description)); + errorTemplate.find("#db_error_msg").text(fromdb(events[i].description)); setDateField(events[i].created, errorTemplate.find("#db_error_date")); errorGrid.append(errorTemplate.show()); } @@ -724,7 +724,7 @@ $(document).ready(function() { for (var i = 0; i < length; i++) { var errorTemplate = $("#recent_error_template").clone(true); errorTemplate.find("#db_error_type").text(events[i].type); - errorTemplate.find("#db_error_msg").text(sanitizeXSS(events[i].description)); + errorTemplate.find("#db_error_msg").text(fromdb(events[i].description)); setDateField(events[i].created, errorTemplate.find("#db_error_date")); errorGrid.append(errorTemplate.show()); } diff --git a/ui/scripts/cloud.core.instances.js b/ui/scripts/cloud.core.instances.js index bb7062dec70..914722c9b13 100644 --- a/ui/scripts/cloud.core.instances.js +++ b/ui/scripts/cloud.core.instances.js @@ -205,7 +205,7 @@ function showInstancesTab(p_domainId, p_account) { vmInstance.data("state", result.virtualmachine[0].state); if (result.virtualmachine[0].hostname != undefined) { - vmInstance.find("#vm_host").html("Host: " + sanitizeXSS(result.virtualmachine[0].hostname)); + vmInstance.find("#vm_host").html("Host: " + fromdb(result.virtualmachine[0].hostname)); } else { vmInstance.find("#vm_host").html("Host: "); } @@ -295,7 +295,7 @@ function showInstancesTab(p_domainId, p_account) { vmInstance.data("state", result.virtualmachine[0].state); if (result.virtualmachine[0].hostname != undefined) { - vmInstance.find("#vm_host").html("Host: " + sanitizeXSS(result.virtualmachine[0].hostname)); + vmInstance.find("#vm_host").html("Host: " + fromdb(result.virtualmachine[0].hostname)); } else { vmInstance.find("#vm_host").html("Host: "); } @@ -576,7 +576,7 @@ function showInstancesTab(p_domainId, p_account) { if (offerings != null && offerings.length > 0) { for (var i = 0; i < offerings.length; i++) { - var option = $("").data("name", sanitizeXSS(unescape(offerings[i].name))); + var option = $("").data("name", fromdb(offerings[i].name)); offeringSelect.append(option); } } @@ -611,7 +611,7 @@ function showInstancesTab(p_domainId, p_account) { vmInstance.find(".row_loading").show(); vmInstance.find(".loadingmessage_container .loadingmessage_top p").html("Your virtual instance has been upgraded. Please restart your virtual instance for the new service offering to take effect."); vmInstance.find(".loadingmessage_container").fadeIn("slow"); - vmInstance.find("#vm_service").html("Service: " + sanitizeXSS(unescape(result.virtualmachine[0].serviceofferingname))); + vmInstance.find("#vm_service").html("Service: " + fromdb(result.virtualmachine[0].serviceofferingname)); if (result.virtualmachine[0].haenable =='true') { vmInstance.find("#vm_ha").html("HA: Enabled"); vmInstance.find("#vm_action_ha").text("Disable HA"); @@ -620,7 +620,7 @@ function showInstancesTab(p_domainId, p_account) { vmInstance.find("#vm_action_ha").text("Enable HA"); } } else if (result.jobstatus == 2) { // Failed - $("#dialog_alert").html("

" + sanitizeXSS(result.jobresult) + "

").dialog("open"); + $("#dialog_alert").html("

" + fromdb(result.jobresult) + "

").dialog("open"); } } }, @@ -840,7 +840,7 @@ function showInstancesTab(p_domainId, p_account) { if (isos != null && isos.length > 0) { isoSelect.empty(); for (var i = 0; i < isos.length; i++) { - isoSelect.append("");; + isoSelect.append("");; } } } @@ -1090,15 +1090,15 @@ function showInstancesTab(p_domainId, p_account) { var vmName = getVmName(instanceJSON.name, instanceJSON.displayname); instanceTemplate.data("id", instanceJSON.id) - .data("systemName", sanitizeXSS(instanceJSON.name)) - .data("name", sanitizeXSS(vmName)) + .data("systemName", fromdb(instanceJSON.name)) + .data("name", fromdb(vmName)) .data("passwordEnabled", instanceJSON.passwordenabled) .data("domainId", instanceJSON.domainid) - .data("account", sanitizeXSS(instanceJSON.account)) - .data("zoneId", sanitizeXSS(instanceJSON.zoneid)) + .data("account", fromdb(instanceJSON.account)) + .data("zoneId", fromdb(instanceJSON.zoneid)) .data("state", instanceJSON.state) .data("ha", instanceJSON.haenable); - instanceTemplate.data("group", sanitizeXSS(instanceJSON.group)); + instanceTemplate.data("group", fromdb(instanceJSON.group)); if (instanceJSON.isoId != undefined && instanceJSON.isoid.length > 0) { instanceTemplate.data("isoId", instanceJSON.isoid); @@ -1106,11 +1106,11 @@ function showInstancesTab(p_domainId, p_account) { instanceTemplate.find("#vm_actions").data("id", instanceJSON.id); // Populate the template - instanceTemplate.find("#vm_name").html("Name: " + sanitizeXSS(vmName)); + instanceTemplate.find("#vm_name").html("Name: " + fromdb(vmName)); instanceTemplate.find("#vm_ip_address").html("IP Address: " + instanceJSON.ipaddress); - instanceTemplate.find("#vm_zone").html("Zone: " + sanitizeXSS(instanceJSON.zonename)); - instanceTemplate.find("#vm_template").html("Template: " + sanitizeXSS(instanceJSON.templatename)); - instanceTemplate.find("#vm_service").html("Service: " + sanitizeXSS(unescape(instanceJSON.serviceofferingname))); + instanceTemplate.find("#vm_zone").html("Zone: " + fromdb(instanceJSON.zonename)); + instanceTemplate.find("#vm_template").html("Template: " + fromdb(instanceJSON.templatename)); + instanceTemplate.find("#vm_service").html("Service: " + fromdb(instanceJSON.serviceofferingname)); if (instanceJSON.haenable =='true') { instanceTemplate.find("#vm_ha").html("HA: Enabled"); instanceTemplate.find("#vm_action_ha").text("Disable HA"); @@ -1121,11 +1121,11 @@ function showInstancesTab(p_domainId, p_account) { setDateField(instanceJSON.created, instanceTemplate.find("#vm_created"), "Created: "); - instanceTemplate.find("#vm_account").html("Account: " + sanitizeXSS(instanceJSON.account)); - instanceTemplate.find("#vm_domain").html("Domain: " + sanitizeXSS(instanceJSON.domain)); + instanceTemplate.find("#vm_account").html("Account: " + fromdb(instanceJSON.account)); + instanceTemplate.find("#vm_domain").html("Domain: " + fromdb(instanceJSON.domain)); if (isAdmin()) { if (instanceJSON.hostname != undefined) { - instanceTemplate.find("#vm_host").html("Host: " + sanitizeXSS(instanceJSON.hostname)); + instanceTemplate.find("#vm_host").html("Host: " + fromdb(instanceJSON.hostname)); } else { instanceTemplate.find("#vm_host").html("Host: "); } @@ -1241,7 +1241,7 @@ function showInstancesTab(p_domainId, p_account) { var zoneSelect = vmPopup.find("#wizard_zone").empty(); if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { - zoneSelect.append(""); + zoneSelect.append(""); } } listTemplatesInVmPopup(); @@ -1257,7 +1257,7 @@ function showInstancesTab(p_domainId, p_account) { if (items != null && items.length > 0) { for (var i = 0; i < items.length; i++) { if(items[i].name != "default") - networkGroupSelect.append(""); + networkGroupSelect.append(""); } } } @@ -1278,7 +1278,7 @@ function showInstancesTab(p_domainId, p_account) { continue; var checked = "checked"; if (first == false) checked = ""; - var listItem = $("
    • "); + var listItem = $("
    • "); $("#wizard_service_offering").append(listItem); first = false; } @@ -1307,14 +1307,14 @@ function showInstancesTab(p_domainId, p_account) { var html = "
  • " +"" - +"" + +"" +"
    • "; $("#wizard_root_disk_offering").append(html); var html2 = "
  • " +"" - +"" + +"" +"
    • "; $("#wizard_data_disk_offering").append(html2); } @@ -1457,8 +1457,8 @@ function showInstancesTab(p_domainId, p_account) { var html = '
    ' +'
    ' - +'
    '+sanitizeXSS(items[i].displaytext)+'
    ' - +'
    '+sanitizeXSS(items[i].account)+'
    ' + +'
    '+fromdb(items[i].displaytext)+'
    ' + +'
    '+fromdb(items[i].account)+'
    ' +'
    '; container.append(html); } @@ -2530,7 +2530,7 @@ function showInstancesTab(p_domainId, p_account) { // Failed template.find(".adding_loading").hide(); template.find("#volume_body").show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, diff --git a/ui/scripts/cloud.core.js b/ui/scripts/cloud.core.js index fca118859e2..5abdda6ec30 100644 --- a/ui/scripts/cloud.core.js +++ b/ui/scripts/cloud.core.js @@ -89,6 +89,14 @@ function createURL(url) { return url + "&sessionkey=" + g_sessionKey; } +function fromdb(val) { + return sanitizeXSS(unescape(noNull(val))); +} + +function todb(val) { + return encodeURIComponent(escape(val)); +} + function setDateField(dateValue, dateField, htmlMarkup) { if (dateValue != null && dateValue.length > 0) { var disconnected = new Date(); diff --git a/ui/scripts/cloud.core.network.js b/ui/scripts/cloud.core.network.js index 782ce057b04..1a831acbfba 100644 --- a/ui/scripts/cloud.core.network.js +++ b/ui/scripts/cloud.core.network.js @@ -36,7 +36,7 @@ function showNetworkingTab(p_domainId, p_account) { var zoneSelect = $("#dialog_acquire_public_ip #acquire_zone").empty(); if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { - zoneSelect.append(""); + zoneSelect.append(""); } } } @@ -221,7 +221,7 @@ function showNetworkingTab(p_domainId, p_account) { var domains = json.listdomainsresponse.domain; if (domains != null && domains.length > 0) { for (var i = 0; i < domains.length; i++) { - domainSelect.append(""); + domainSelect.append(""); } } } @@ -517,7 +517,7 @@ function showNetworkingTab(p_domainId, p_account) { } else if (result.jobstatus == 2) { //Fail loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -784,7 +784,7 @@ function showNetworkingTab(p_domainId, p_account) { } else if (result.jobstatus == 2) { //Fail loadingContainer.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -845,7 +845,7 @@ function showNetworkingTab(p_domainId, p_account) { loading.hide(); rowContainer.show(); } else if (result.jobstatus == 2) { // Failed - $("#dialog_error").html("

    Operation error:


    "+ sanitizeXSS(result.jobresult)+"

    ").dialog("open"); + $("#dialog_error").html("

    Operation error:


    "+ fromdb(result.jobresult)+"

    ").dialog("open"); loading.hide(); rowContainer.show(); } @@ -1148,7 +1148,7 @@ function showNetworkingTab(p_domainId, p_account) { //*** Network Group (begin) ********************************************************************** function networkGroupJSONToTemplate(json, template) { (index++ % 2 == 0)? template.addClass("smallrow_even"): template.addClass("smallrow_odd"); - template.attr("id", "networkGroup_"+json.id).data("networkGroupId", json.id).data("domainId", json.domainid).data("account",json.account).data("networkGroupName", sanitizeXSS(json.name)); + template.attr("id", "networkGroup_"+json.id).data("networkGroupId", json.id).data("domainId", json.domainid).data("account",json.account).data("networkGroupName", fromdb(json.name)); template.find("#delete_link, #ingress_rule_link").data("parent_template_id", "networkGroup_"+json.id); template.find("#id").text(json.id); @@ -1609,7 +1609,7 @@ function showNetworkingTab(p_domainId, p_account) { }); }); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); } diff --git a/ui/scripts/cloud.core.storage.js b/ui/scripts/cloud.core.storage.js index 2f8bcf6557f..3a2fcce6016 100644 --- a/ui/scripts/cloud.core.storage.js +++ b/ui/scripts/cloud.core.storage.js @@ -35,10 +35,10 @@ function showStorageTab(domainId, targetTab) { if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { if(isAdmin) { - poolZoneSelect.append(""); - hostZoneSelect.append(""); + poolZoneSelect.append(""); + hostZoneSelect.append(""); } - volumeZoneSelect.append(""); + volumeZoneSelect.append(""); } } if (isAdmin) { @@ -58,7 +58,7 @@ function showStorageTab(domainId, targetTab) { if (offerings != null && offerings.length > 0) { if (offerings != null && offerings.length > 0) { for (var i = 0; i < offerings.length; i++) - volumeDiskOfferingSelect.append(""); + volumeDiskOfferingSelect.append(""); } } } @@ -177,7 +177,7 @@ function showStorageTab(domainId, targetTab) { }); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); template.slideUp("slow", function() { $(this).remove(); }); @@ -249,8 +249,8 @@ function showStorageTab(domainId, targetTab) { template.data("vmname", getVmName(json.vmname, json.vmdisplayname)); template.data("vmstate", json.vmstate); template.data("domainId", json.domainid); - template.data("account", sanitizeXSS(json.account)); - template.data("volumeName", sanitizeXSS(json.name)); + template.data("account", fromdb(json.account)); + template.data("volumeName", fromdb(json.name)); template.data("vmid", json.virtualmachineid); template.data("zoneId", json.zoneid); @@ -440,7 +440,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -500,7 +500,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -567,7 +567,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1042,7 +1042,7 @@ function showStorageTab(domainId, targetTab) { // Failed loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1122,7 +1122,7 @@ function showStorageTab(domainId, targetTab) { // Failed loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1199,7 +1199,7 @@ function showStorageTab(domainId, targetTab) { if (result.jobstatus == 1) { $("#dialog_info").html("

    " + ((isPublic=="true")? "Public":"Private") + " template: " + name + " has been successfully created

    ").dialog("open"); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1265,7 +1265,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1498,7 +1498,7 @@ function showStorageTab(domainId, targetTab) { rowContainer.show(); }); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); template.slideUp("slow", function() { $(this).remove(); }); @@ -1567,7 +1567,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1634,7 +1634,7 @@ function showStorageTab(domainId, targetTab) { } else if (result.jobstatus == 2) { loadingImg.hide(); rowContainer.show(); - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); } } }, @@ -1708,7 +1708,7 @@ function showStorageTab(domainId, targetTab) { template.find("#row_container").addClass("smallrow_odd"); } - template.data("id", json.id).data("name", sanitizeXSS(json.name)); + template.data("id", json.id).data("name", fromdb(json.name)); template.find("#pool_id").text(json.id); template.find("#pool_name").text(json.name); template.find("#pool_zone").text(json.zonename); @@ -1781,7 +1781,7 @@ function showStorageTab(domainId, targetTab) { var podSelect = $("#dialog_add_pool").find("#pool_pod").empty(); if (pods != null && pods.length > 0) { for (var i = 0; i < pods.length; i++) { - podSelect.append(""); + podSelect.append(""); } } $("#dialog_add_pool").find("#pool_pod").change(); @@ -2088,7 +2088,7 @@ function showStorageTab(domainId, targetTab) { } else { template.find("#row_container").addClass("smallrow_odd"); } - template.data("hostName", sanitizeXSS(json.name)); + template.data("hostName", fromdb(json.name)); template.find("#storage_status").text(json.state); template.find("#storage_type").text(json.type); diff --git a/ui/scripts/cloud.core.templates.js b/ui/scripts/cloud.core.templates.js index 12d1d91ccfa..cab389fcb0c 100644 --- a/ui/scripts/cloud.core.templates.js +++ b/ui/scripts/cloud.core.templates.js @@ -73,8 +73,8 @@ function showTemplatesTab() { var zones = json.listzonesresponse.zone; if (zones != null && zones.length > 0) { for (var i = 0; i < zones.length; i++) { - addTemplateZoneField.append(""); - addIsoZoneField.append(""); + addTemplateZoneField.append(""); + addIsoZoneField.append(""); g_zoneIds.push(zones[i].id); g_zoneNames.push(zones[i].name); } @@ -87,7 +87,7 @@ function showTemplatesTab() { if (g_zoneIds != null && g_zoneIds.length > 0) { for (var i = 0; i < g_zoneIds.length; i++) { if(g_zoneIds[i] != excludeZoneId) - zoneField.append(""); + zoneField.append(""); } } } @@ -118,8 +118,8 @@ function showTemplatesTab() { var templateServiceOfferingField = $("#dialog_create_vm_from_template #service_offering").empty(); var isoServiceOfferingField = $("#dialog_create_vm_from_iso #service_offering").empty(); for(var i = 0; i < items.length; i++) { - templateServiceOfferingField.append(""); - isoServiceOfferingField.append(""); + templateServiceOfferingField.append(""); + isoServiceOfferingField.append(""); } } } @@ -137,8 +137,8 @@ function showTemplatesTab() { var isoDiskOfferingField = $("#dialog_create_vm_from_iso #disk_offering").empty(); for(var i = 0; i < items.length; i++) { - templateDiskOfferingField.append(""); - isoDiskOfferingField.append(""); + templateDiskOfferingField.append(""); + isoDiskOfferingField.append(""); } } @@ -234,9 +234,9 @@ function showTemplatesTab() { (index++ % 2 == 0)? template.addClass("dbsmallrow_odd"):template.addClass("dbsmallrow_even"); template.attr("id", "template"+json.id+"_zone"+json.zoneid); template.data("templateId", json.id); - template.data("zoneId",sanitizeXSS(json.zoneid)); - template.data("zoneName",sanitizeXSS(json.zonename)); - template.data("name", sanitizeXSS(json.name)); + template.data("zoneId",fromdb(json.zoneid)); + template.data("zoneName",fromdb(json.zonename)); + template.data("name", fromdb(json.name)); template.find("#template_id").text(json.id); template.find("#template_zone").text(json.zonename); @@ -420,7 +420,7 @@ function showTemplatesTab() { that.slideUp("slow", function() { $(this).remove() }); changeGridRowsTotal($("#submenu_content_template").find("#grid_rows_total"), -1); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); } @@ -497,13 +497,13 @@ function showTemplatesTab() { } else { $("body").stopTime(timerKey); if (result.jobstatus == 1) { - $("#dialog_info").html("

    Template download started (ID: "+result.copytemplateresponse[0].id+", Zone: "+sanitizeXSS(result.copytemplateresponse[0].zonename)+", Name: "+sanitizeXSS(result.copytemplateresponse[0].name)+") . Check the progress...

    ").dialog("open"); + $("#dialog_info").html("

    Template download started (ID: "+result.copytemplateresponse[0].id+", Zone: "+fromdb(result.copytemplateresponse[0].zonename)+", Name: "+fromdb(result.copytemplateresponse[0].name)+") . Check the progress...

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); $("#template_type").val("self"); $("#template_type").change(); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); } @@ -610,15 +610,15 @@ function showTemplatesTab() { // Succeeded var htmlMsg; if (result.virtualmachine[0].passwordenabled == 'true') - htmlMsg = "Your instance from " + sanitizeXSS(name) + " has been successfully created. Your new password is : " + result.virtualmachine[0].password + " . Please change it as soon as you log into your new instance"; + htmlMsg = "Your instance from " + fromdb(name) + " has been successfully created. Your new password is : " + result.virtualmachine[0].password + " . Please change it as soon as you log into your new instance"; else - htmlMsg = "Your instance from " + sanitizeXSS(name) + " has been successfully created."; + htmlMsg = "Your instance from " + fromdb(name) + " has been successfully created."; $("#dialog_info").html(htmlMsg).dialog("open"); loadingImg.hide(); rowContainer.show(); } else if (result.jobstatus == 2) { // Failed - $("#dialog_info").html("Unable to create your new instance from " + sanitizeXSS(name) + " due to the error: " + sanitizeXSS(result.jobresult)).dialog("open"); + $("#dialog_info").html("Unable to create your new instance from " + fromdb(name) + " due to the error: " + fromdb(result.jobresult)).dialog("open"); loadingImg.hide(); rowContainer.show(); } @@ -804,9 +804,9 @@ function showTemplatesTab() { } template.data("isoId", json.id); - template.data("zoneId",sanitizeXSS(json.zoneid)); - template.data("zoneName",sanitizeXSS(json.zonename)); - template.data("name", sanitizeXSS(json.name)); + template.data("zoneId",fromdb(json.zoneid)); + template.data("zoneName",fromdb(json.zonename)); + template.data("name", fromdb(json.name)); template.data("isPublic", json.ispublic); template.find("#iso_id").text(json.id); @@ -935,7 +935,7 @@ function showTemplatesTab() { that.slideUp("slow", function() { $(this).remove() }); changeGridRowsTotal($("#submenu_content_iso").find("#grid_rows_total"), -1); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); } @@ -1016,13 +1016,13 @@ function showTemplatesTab() { } else { $("body").stopTime(timerKey); if (result.jobstatus == 1) { - $("#dialog_info").html("

    ISO download started (ID: "+result.copytemplateresponse[0].id+", Zone: "+sanitizeXSS(result.copytemplateresponse[0].zonename)+", Name: "+sanitizeXSS(result.copytemplateresponse[0].name)+") . Check the progress...

    ").dialog("open"); + $("#dialog_info").html("

    ISO download started (ID: "+result.copytemplateresponse[0].id+", Zone: "+fromdb(result.copytemplateresponse[0].zonename)+", Name: "+fromdb(result.copytemplateresponse[0].name)+") . Check the progress...

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); currentPage=1; //refresh the whole ISO grid until Keshav changes copyIso to return the newly created ISO. listIsos(); } else if (result.jobstatus == 2) { - $("#dialog_alert").html("

    " + sanitizeXSS(result.jobresult) + "

    ").dialog("open"); + $("#dialog_alert").html("

    " + fromdb(result.jobresult) + "

    ").dialog("open"); loadingImg.hide(); rowContainer.show(); } From 91340ca8de218839b5e9dc10c137abab149395a3 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 28 Sep 2010 10:29:25 -0700 Subject: [PATCH 038/244] bug 5190: incremental checkin with a bunch of vo,dao,schema and upgrade changes --- server/src/com/cloud/server/ManagementServerImpl.java | 1 + setup/db/create-schema.sql | 7 +++++++ setup/db/schema-21to22.sql | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 17d31bd0454..b039a13166e 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -9114,6 +9114,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public boolean updateCertificate(String certificatePath) { + return false; } diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index e98fd6768f8..7e3587ed740 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -82,6 +82,7 @@ DROP TABLE IF EXISTS `cloud`.`hypervisor_properties`; DROP TABLE IF EXISTS `cloud`.`account_network_ref`; DROP TABLE IF EXISTS `cloud`.`instance_group`; DROP TABLE IF EXISTS `cloud`.`instance_group_vm_map`; +DROP TABLE IF EXISTS `cloud`.`certificate`; CREATE TABLE `cloud`.`hypervsior_properties` ( `hypervisor` varchar(32) NOT NULL UNIQUE COMMENT 'hypervisor type', @@ -113,6 +114,12 @@ CREATE TABLE `cloud`.`account_network_ref` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `cloud`.`certificate` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `certificate` text COMMENT 'the actual custom certificate being stored in the db', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE `cloud`.`nics` ( `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id', `instance_id` bigint unsigned NOT NULL COMMENT 'vm instance id', diff --git a/setup/db/schema-21to22.sql b/setup/db/schema-21to22.sql index 9fbd99612fa..90ebe3ec441 100644 --- a/setup/db/schema-21to22.sql +++ b/setup/db/schema-21to22.sql @@ -19,6 +19,11 @@ CREATE TABLE `cloud`.`instance_group_vm_map` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; +CREATE TABLE `cloud`.`certificate` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `certificate` text COMMENT 'the actual custom certificate being stored in the db', + PRIMARY KEY (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; ALTER TABLE `cloud`.`data_center` MODIFY COLUMN `guest_network_cidr` varchar(18); -- modify column width to 18 from 15 From 918ddff25ea0bd194debb1290b6a215bfb5dcb58 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 28 Sep 2010 11:02:48 -0700 Subject: [PATCH 039/244] some code cleanup, and adding some more meat to the enh --- core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java index 23531318350..79a583dceda 100644 --- a/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java +++ b/core/src/com/cloud/storage/dao/StoragePoolDaoImpl.java @@ -31,7 +31,6 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.storage.StoragePoolDetailVO; import com.cloud.storage.StoragePoolVO; From 300905df840325be918dea3331e67af3186ba4ce Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 28 Sep 2010 11:07:04 -0700 Subject: [PATCH 040/244] adding some more files --- .../com/cloud/certificate/CertificateVO.java | 56 +++++++++++++++++++ .../cloud/certificate/dao/CertificateDao.java | 26 +++++++++ .../certificate/dao/CertificateDaoImpl.java | 51 +++++++++++++++++ 3 files changed, 133 insertions(+) create mode 100644 core/src/com/cloud/certificate/CertificateVO.java create mode 100644 core/src/com/cloud/certificate/dao/CertificateDao.java create mode 100644 core/src/com/cloud/certificate/dao/CertificateDaoImpl.java diff --git a/core/src/com/cloud/certificate/CertificateVO.java b/core/src/com/cloud/certificate/CertificateVO.java new file mode 100644 index 00000000000..fa63d030b4d --- /dev/null +++ b/core/src/com/cloud/certificate/CertificateVO.java @@ -0,0 +1,56 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ +package com.cloud.certificate; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name="certificate") +public class CertificateVO { + + public CertificateVO(String cert) + { + this.certificate = cert; + } + + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + @Column(name="id") + private Long id = null; + + @Column(name="certificate") + private String certificate; + + public CertificateVO() {} + + public Long getId() { + return id; + } + + public String getCertificate() { + return certificate; + } + public void setCertificate(String certificate) { + this.certificate = certificate; + } +} diff --git a/core/src/com/cloud/certificate/dao/CertificateDao.java b/core/src/com/cloud/certificate/dao/CertificateDao.java new file mode 100644 index 00000000000..9da10b49fef --- /dev/null +++ b/core/src/com/cloud/certificate/dao/CertificateDao.java @@ -0,0 +1,26 @@ +/** + * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. + * + * This software is licensed under the GNU General Public License v3 or later. + * + * It is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + */ + +package com.cloud.certificate.dao; + +import com.cloud.certificate.CertificateVO; +import com.cloud.utils.db.GenericDao; + +public interface CertificateDao extends GenericDao { + public boolean persistCustomCertToDb(String certPath); +} diff --git a/core/src/com/cloud/certificate/dao/CertificateDaoImpl.java b/core/src/com/cloud/certificate/dao/CertificateDaoImpl.java new file mode 100644 index 00000000000..209c30591a6 --- /dev/null +++ b/core/src/com/cloud/certificate/dao/CertificateDaoImpl.java @@ -0,0 +1,51 @@ +package com.cloud.certificate.dao; + +import java.io.BufferedInputStream; +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; + +import javax.ejb.Local; + +import org.apache.log4j.Logger; + +import com.cloud.certificate.CertificateVO; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; + +@Local(value={CertificateDao.class}) @DB(txn=false) +public class CertificateDaoImpl extends GenericDaoBase implements CertificateDao { + + private static final Logger s_logger = Logger.getLogger(CertificateDaoImpl.class); + + @Override + public boolean persistCustomCertToDb(String certPath){ + + String certStr = null; + byte[] buffer = new byte[(int) new File(certPath).length()]; + BufferedInputStream f = null; + try + { + f = new BufferedInputStream(new FileInputStream(certPath)); + f.read(buffer); + } catch (FileNotFoundException e) { + s_logger.warn("Unable to read the certificate: "+e); + return false; + } catch (IOException e) { + s_logger.warn("Unable to read the certificate: "+e); + return false; + } + finally + { + if (f != null) + try { f.close(); } catch (IOException ignored) { } + } + certStr = new String(buffer); + + CertificateVO certRec = new CertificateVO(certStr); + this.persist(certRec); + + return true; + } +} From bbdc135c12c28f0e771715d292ff9f1b87791102 Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 28 Sep 2010 11:19:08 -0700 Subject: [PATCH 041/244] bug 5190: more changes --- server/src/com/cloud/server/ManagementServerImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index b039a13166e..1da497b7414 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -50,7 +50,6 @@ import javax.crypto.spec.SecretKeySpec; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; - import com.cloud.agent.AgentManager; import com.cloud.agent.api.GetVncPortAnswer; import com.cloud.agent.api.GetVncPortCommand; @@ -114,6 +113,7 @@ import com.cloud.async.executor.VolumeOperationParam; import com.cloud.async.executor.VolumeOperationParam.VolumeOp; import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; +import com.cloud.certificate.dao.CertificateDao; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.ConfigurationVO; import com.cloud.configuration.ResourceCount.ResourceType; @@ -364,6 +364,7 @@ public class ManagementServerImpl implements ManagementServer { private final InstanceGroupVMMapDao _groupVMMapDao; private final UploadMonitor _uploadMonitor; private final UploadDao _uploadDao; + private final CertificateDao _certDao; private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AccountChecker")); private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker")); @@ -443,7 +444,7 @@ public class ManagementServerImpl implements ManagementServer { _vmGroupDao = locator.getDao(InstanceGroupDao.class); _groupVMMapDao = locator.getDao(InstanceGroupVMMapDao.class); _uploadDao = locator.getDao(UploadDao.class); - + _certDao = locator.getDao(CertificateDao.class); _configs = _configDao.getConfiguration(); _userStatsDao = locator.getDao(UserStatisticsDao.class); _vmInstanceDao = locator.getDao(VMInstanceDao.class); @@ -9114,8 +9115,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public boolean updateCertificate(String certificatePath) { - - return false; + return _certDao.persistCustomCertToDb(certificatePath); } } From 0af7ad934b06d5ca7ded4c69b2d7cadf3e3db9bc Mon Sep 17 00:00:00 2001 From: abhishek Date: Tue, 28 Sep 2010 11:28:40 -0700 Subject: [PATCH 042/244] bug 5190: updating the command list --- client/tomcatconf/commands.properties.in | 4 +++- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index c8ae73f15d1..255cfa307c1 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -213,9 +213,11 @@ registerPreallocatedLun=com.cloud.server.api.commands.RegisterPreallocatedLunCmd deletePreallocatedLun=com.cloud.server.api.commands.DeletePreallocatedLunCmd;1 listPreallocatedLuns=com.cloud.api.commands.ListPreallocatedLunsCmd;1 - #### vm group commands createInstanceGroup=com.cloud.api.commands.CreateVMGroupCmd;15 deleteInstanceGroup=com.cloud.api.commands.DeleteVMGroupCmd;15 updateInstanceGroup=com.cloud.api.commands.UpdateVMGroupCmd;15 listInstanceGroups=com.cloud.api.commands.ListVMGroupsCmd;15 + +### Certificate commands +updateCustomCertificate=com.cloud.api.commands.UpdateCertificateCmd;15 \ No newline at end of file diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 1da497b7414..097ca672ba5 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -9115,7 +9115,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public boolean updateCertificate(String certificatePath) { - return _certDao.persistCustomCertToDb(certificatePath); + return _certDao.persistCustomCertToDb(certificatePath ); } } From 1bb4eeafd9d95048fc69d7e618a6f747ecdd79f5 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 12:06:29 -0700 Subject: [PATCH 043/244] new UI - implement new API listInstanceGroups to list instance groups on left menu. --- ui/new/scripts/cloud.core2.instance.js | 113 +++++++++++-------------- 1 file changed, 50 insertions(+), 63 deletions(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 8d78520b59e..b614223d549 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -522,72 +522,22 @@ function clickInstanceGroupHeader($arrowIcon) { $("#midmenu_add_link").show(); if($arrowIcon.hasClass("close") == true) { $arrowIcon.removeClass("close").addClass("open"); + + appendInstanceGroup(-1, noGroupName); + $.ajax({ cache: false, - data: createURL("command=listVirtualMachines"), + data: createURL("command=listInstanceGroups"), dataType: "json", - success: function(json) { - var instanceGroupMap = {}; - var instanceGroupArray = []; - var instances = json.listvirtualmachinesresponse.virtualmachine; - if (instances != null && instances.length > 0) { - for (var i = 0; i < instances.length; i++) { - var group1 = instances[i].group; - if(group1 == null || group1.length == 0) - group1 = noGroupName; - if(group1 in instanceGroupMap) { - instanceGroupMap[group1].push(instances[i]); - } - else { - instanceGroupMap[group1] = [instances[i]]; - instanceGroupArray.push(group1); - } - } - } - for(var i=0; i < instanceGroupArray.length; i++) { - if(instanceGroupArray[i]!=null && instanceGroupArray[i].length>0) { - var $leftmenuSubmenuTemplate = $("#leftmenu_submenu_template").clone().show(); - $leftmenuSubmenuTemplate.attr("id", ("leftmenu_instance_group_"+i)); - $leftmenuSubmenuTemplate.find("#submenu_name").text(instanceGroupArray[i]); - $leftmenuSubmenuTemplate.find("#icon").attr("src", "images/instance_leftmenuicon.png").show(); - - $leftmenuSubmenuTemplate.bind("click", function(event) { - if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0) - $("#"+selected_leftmenu_id).removeClass("selected"); - selected_leftmenu_id = $(this).attr("id"); - $(this).addClass("selected"); - - $("#midmenu_container").empty(); - selectedItemsInMidMenu = {}; - - var groupName = $(this).find("#submenu_name").text(); - var group1 = groupName; - if(groupName == noGroupName) - group1 = ""; - - $.ajax({ - cache: false, - data: createURL("command=listVirtualMachines&group="+group1+"&pagesize="+midmenuItemCount), - dataType: "json", - success: function(json) { - var instances = json.listvirtualmachinesresponse.virtualmachine; - if (instances != null && instances.length > 0) { - for(var i=0; i0) { + for(var i=0; i < instancegroups.length; i++) { + appendInstanceGroup(instancegroups[i].id, instancegroups[i].name); } } - //action menu + //action menu ??? $("#midmenu_action_link").show(); $("#action_menu #action_list").empty(); for(var label in vmActionMap) @@ -598,7 +548,46 @@ function clickInstanceGroupHeader($arrowIcon) { else if($arrowIcon.hasClass("open") == true) { $arrowIcon.removeClass("open").addClass("close"); $("#leftmenu_instance_group_container").empty(); - } + } + + function appendInstanceGroup(groupId, groupName) { + var $leftmenuSubmenuTemplate = $("#leftmenu_submenu_template").clone().show(); + $leftmenuSubmenuTemplate.attr("id", ("leftmenu_instance_group_"+groupId)); + $leftmenuSubmenuTemplate.data("groupId", groupId) + $leftmenuSubmenuTemplate.find("#submenu_name").text(groupName); + $leftmenuSubmenuTemplate.find("#icon").attr("src", "images/instance_leftmenuicon.png").show(); + + $leftmenuSubmenuTemplate.bind("click", function(event) { + if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0) + $("#"+selected_leftmenu_id).removeClass("selected"); + selected_leftmenu_id = $(this).attr("id"); + $(this).addClass("selected"); + + $("#midmenu_container").empty(); + selectedItemsInMidMenu = {}; + + var groupId = $(this).data("groupId"); + $.ajax({ + cache: false, + data: createURL("command=listVirtualMachines&groupid="+groupId+"&pagesize="+midmenuItemCount), + dataType: "json", + success: function(json) { + var instances = json.listvirtualmachinesresponse.virtualmachine; + if (instances != null && instances.length > 0) { + for(var i=0; i Date: Tue, 28 Sep 2010 13:51:03 -0700 Subject: [PATCH 044/244] bug 5190: a part of the enhancement is complete; now we can upload a custom cert using a file from our local machine, into the system. It is stored in the certificate table as a "text" column --- client/tomcatconf/components.xml.in | 1 + core/src/com/cloud/certificate/CertificateVO.java | 2 +- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index 83b9938b82b..c455fc4dd15 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -89,6 +89,7 @@ + diff --git a/core/src/com/cloud/certificate/CertificateVO.java b/core/src/com/cloud/certificate/CertificateVO.java index fa63d030b4d..5e989e7ff68 100644 --- a/core/src/com/cloud/certificate/CertificateVO.java +++ b/core/src/com/cloud/certificate/CertificateVO.java @@ -38,7 +38,7 @@ public class CertificateVO { @Column(name="id") private Long id = null; - @Column(name="certificate") + @Column(name="certificate",length=65535) private String certificate; public CertificateVO() {} diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 097ca672ba5..1da497b7414 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -9115,7 +9115,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public boolean updateCertificate(String certificatePath) { - return _certDao.persistCustomCertToDb(certificatePath ); + return _certDao.persistCustomCertToDb(certificatePath); } } From f08ef8c6d4c89ceb8e0fe777f1edce17dc5410c8 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 15:05:13 -0700 Subject: [PATCH 045/244] fix a bug - Zones page - Direct VLAN IP Range - account field appears twice in view mode. --- ui/scripts/cloud.core.configuration.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/ui/scripts/cloud.core.configuration.js b/ui/scripts/cloud.core.configuration.js index e431395c0d7..a7ee7aacee9 100644 --- a/ui/scripts/cloud.core.configuration.js +++ b/ui/scripts/cloud.core.configuration.js @@ -813,26 +813,22 @@ function showConfigurationTab() { var isTagged = target.data("vlan") != "untagged"; if (isDirect) { title = "Direct VLAN IP Range"; - } - var rightPanelHtmlForDirect = ""; - if (isDirect && isTagged) { - rightPanelHtmlForDirect = "

    Domain ID: "+target.data("domainId")+"

    Account: "+target.data("account")+"

    " - } else if (isDirect && !isTagged) { - rightPanelHtmlForDirect = "

    Pod: "+target.data("podname")+"

    "; - } - + } rightPanel.html(title); - + var rightContentHtml = - "

    VLAN ID: "+target.data("vlan")+"

    " - + rightPanelHtmlForDirect + "

    VLAN ID: "+target.data("vlan")+"

    " + "

    Gateway: "+target.data("gateway")+"

    " + "

    Netmask: "+target.data("netmask")+"

    " + "

    IP Range: "+target.data("name")+"

    "; + if(target.data("domainId")!=null) + rightContentHtml += "

    Domain ID: "+target.data("domainId")+"

    "; if(target.data("domain")!=null) rightContentHtml += "

    Domain: "+target.data("domain")+"

    "; if(target.data("account")!=null) rightContentHtml += "

    Account: "+target.data("account")+"

    "; + if(target.data("podname")!=null) + rightContentHtml += "

    Pod: "+target.data("podname")+"

    "; rightContent.data("id", target.data("id")).html(rightContentHtml); $("#submenu_content_zones").find("#action_edit_zone, #action_add_pod, #action_edit_pod, #action_add_publicip_vlan, #action_add_directip_vlan").hide(); From b6806373668e06c4fbcbd767147639905ef87b75 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 16:04:14 -0700 Subject: [PATCH 046/244] new UI - add JSP file, javascript file for Domain page. --- ui/new/index.jsp | 2 + ui/new/jsp/domain.jsp | 109 +++++++++++++++++++++++++++ ui/new/scripts/cloud.core2.domain.js | 3 + ui/new/scripts/cloud.core2.init.js | 19 ++++- ui/new/scripts/cloud.core2.js | 6 +- 5 files changed, 137 insertions(+), 2 deletions(-) create mode 100644 ui/new/jsp/domain.jsp create mode 100644 ui/new/scripts/cloud.core2.domain.js diff --git a/ui/new/index.jsp b/ui/new/index.jsp index c00ca7b6ae6..17185781259 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -58,6 +58,8 @@ long milliseconds = new Date().getTime(); + + Cloud.com CloudStack diff --git a/ui/new/jsp/domain.jsp b/ui/new/jsp/domain.jsp new file mode 100644 index 00000000000..16e11335ffd --- /dev/null +++ b/ui/new/jsp/domain.jsp @@ -0,0 +1,109 @@ +<%@ page import="java.util.*" %> +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + + +
    + +
    + Event
    + +

    Domain +

    +
    +
    + +
    +
    + <%=t.t("Details")%>
    +
    +
    +
    +
    +
    + <%=t.t("id")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Initiated.By")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Owner.Account")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Type")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Level")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Description")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("State")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Date")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js new file mode 100644 index 00000000000..49829f6e2be --- /dev/null +++ b/ui/new/scripts/cloud.core2.domain.js @@ -0,0 +1,3 @@ +function afterLoadDomainJSP() { + +} \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.init.js b/ui/new/scripts/cloud.core2.init.js index 4f06e793ef1..9e75c6d385a 100644 --- a/ui/new/scripts/cloud.core2.init.js +++ b/ui/new/scripts/cloud.core2.init.js @@ -25,7 +25,7 @@ $(document).ready(function() { $(this).addClass("selected"); showMiddleMenu(); - $("#midmenu_container").selectable("destroy" ); //Most pages don't need multiple selection in middle menu. + $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu. clearLeftMenu(); clearMiddleMenu(); @@ -102,6 +102,23 @@ $(document).ready(function() { return false; }); + $("#leftmenu_domain").bind("click", function(event) { + if(selected_leftmenu_id != null && selected_leftmenu_id.length > 0) + $("#"+selected_leftmenu_id).removeClass("selected"); + selected_leftmenu_id = "leftmenu_domain"; + $(this).addClass("selected"); + + showMiddleMenuWithoutSearch(); + $("#midmenu_container").selectable("destroy"); //Most pages don't need multiple selection in middle menu. + + clearLeftMenu(); + clearMiddleMenu(); + + $("#right_panel").load("jsp/domain.jsp", function(){ + afterLoadDomainJSP(); + }); + return false; + }); diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index ddfde4ca684..72f01954eaa 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -591,7 +591,11 @@ function showMiddleMenu() { $("#middle_menu, #search_panel, #middle_menu_pagination").show(); $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea"); } - +function showMiddleMenuWithoutSearch() { + $("#middle_menu").show(); + $("#search_panel, #middle_menu_pagination").hide(); + $("#right_panel").removeClass("main_contentarea_dashboard").addClass("main_contentarea"); +} // adding middle menu item *** function beforeAddingMidMenuItem() { From 88abc071a41f2d153f645687067dc68f1b9f1325 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 16:32:06 -0700 Subject: [PATCH 047/244] new UI - domains page - draw tree in middle menu. --- ui/new/jsp/domain.jsp | 107 +------ ui/new/scripts/cloud.core2.domain.js | 399 ++++++++++++++++++++++++++- 2 files changed, 406 insertions(+), 100 deletions(-) diff --git a/ui/new/jsp/domain.jsp b/ui/new/jsp/domain.jsp index 16e11335ffd..3c02eab7588 100644 --- a/ui/new/jsp/domain.jsp +++ b/ui/new/jsp/domain.jsp @@ -6,104 +6,15 @@ CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> - -
    - -
    - Event
    - -

    Domain -

    -
    -
    - -
    -
    - <%=t.t("Details")%>
    -
    -
    -
    -
    -
    - <%=t.t("id")%>:
    -
    -
    -
    -
    -
    + + - \ No newline at end of file + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js index 49829f6e2be..edc43a0f5a5 100644 --- a/ui/new/scripts/cloud.core2.domain.js +++ b/ui/new/scripts/cloud.core2.domain.js @@ -1,3 +1,398 @@ function afterLoadDomainJSP() { - -} \ No newline at end of file + var defaultRootDomainId = g_domainid; + var defaultRootLevel = 0; + var index = 1; + + //var treeContentBox = $("#tree_contentbox"); //??? + var treeContentBox = $("#midmenu_container"); + + var treenodeTemplate = $("#treenode_template"); + var grid = $("#right_panel_grid"); + var gridRowTemplate = $("#grid_row_template"); + var gridContent = grid.find("#grid_content"); + var gridHeader = grid.find("#grid_header"); + var rightPanelDetailContent = $("#right_panel_detail_content"); + var rightPanelSearchResult = $("#right_panel_search_result"); + var rightPanelGrid = rightPanelDetailContent.find("#right_panel_grid"); + var domainDetail = rightPanelDetailContent.find("#domain_detail"); + var submenuContent = $("#submenu_content_domains"); + var searchButton = submenuContent.find("#search_button"); + var searchInput = submenuContent.find("#search_input"); + var searchResultsContainer = submenuContent.find("#search_results_container"); + var searchResultTemplate = $("#search_result_template"); + //var breadcrumbBox = submenuContent.find("#breadcrumb_box"); + //var breadcrumbPieceTemplate = $("#breadcrumb_piece_template"); + var childParentMap = {}; //map childDomainId to parentDomainId + var domainIdNameMap = {}; //map domainId to domainName + + /* + activateDialog($("#dialog_resource_limits").dialog({ + autoOpen: false, + modal: true, + zIndex: 2000 + })); + */ + + function drawNode(json, level, container) { + if("parentdomainid" in json) + childParentMap[json.id] = json.parentdomainid; //map childDomainId to parentDomainId + domainIdNameMap[json.id] = json.name; //map domainId to domainName + + var template = treenodeTemplate.clone(true); + template.attr("id", "domain_"+json.id); + template.data("domainId", json.id).data("domainName", fromdb(json.name)).data("domainLevel", level); + template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id); + template.find("#domain_expand_icon").attr("id", "domain_expand_icon_"+json.id); + template.find("#domain_name").attr("id", "domain_name_"+json.id).text(json.name); + template.find("#domain_children_container").attr("id", "domain_children_container_"+json.id); + container.append(template.show()); + return template; + } + + function drawTree(id, level, container) { + $.ajax({ + data: createURL("command=listDomainChildren&id="+id+"&response=json&pageSize=-1"), + dataType: "json", + async: false, + success: function(json) { + var domains = json.listdomainchildrenresponse.domain; + if (domains != null && domains.length > 0) { + for (var i = 0; i < domains.length; i++) { + drawNode(domains[i], level, container); + if(domains[i].haschild=="true") + drawTree(domains[i].id, (level+1), $("#domain_children_container_"+domains[i].id)); + } + } + } + }); + } + + function clickExpandIcon(domainId) { + var template = $("#domain_"+domainId); + var expandIcon = template.find("#domain_expand_icon_"+domainId); + if (expandIcon.hasClass("zonetree_closedarrows")) { + template.find("#domain_children_container_"+domainId).show(); + expandIcon.removeClass().addClass("zonetree_openarrows"); + } else { + template.find("#domain_children_container_"+domainId).hide(); + expandIcon.removeClass().addClass("zonetree_closedarrows"); + } + } + + /* + function accountJSONToTemplate(json, template) { + if (index++ % 2 == 0) { + template.addClass("smallrow_odd"); + } else { + template.addClass("smallrow_even"); + } + template.find("#grid_row_cell1").text(json.domain); + template.find("#grid_row_cell2").text(json.name); + } + */ + + function updateResourceLimit(domainId, type, max) { + $.ajax({ + data: createURL("command=updateResourceLimit&domainid="+domainId+"&resourceType="+type+"&max="+max), + dataType: "json", + success: function(json) { + } + }); + } + + function listAdminAccounts(domainId) { + gridContent.empty(); + index = 0; + rightPanelDetailContent.find("#loading_gridtable").show(); + var accountType = (domainId==1)? 1: 2; + $.ajax({ + cache: false, + data: createURL("command=listAccounts&domainid="+domainId+"&accounttype="+accountType+"&response=json"+maxPageSize), + dataType: "json", + success: function(json) { + var accounts = json.listaccountsresponse.account; + if (accounts != null && accounts.length > 0) { + for (var i = 0; i < accounts.length; i++) { + var template = gridRowTemplate.clone(true).attr("id","account"+accounts[i].id); + accountJSONToTemplate(accounts[i], template); + gridContent.append(template.show()); + } + } + rightPanelDetailContent.find("#loading_gridtable").hide(); + }, + error: function(XMLHttpResponse) { + handleError(XMLHttpResponse); + rightPanelDetailContent.find("#loading_gridtable").hide(); + } + }); + } + + treenodeTemplate.bind("click", function(event) { + var template = $(this); + var target = $(event.target); + var action = target.attr("id"); + var id = template.attr("id"); + var domainId = template.data("domainId"); + var domainName = template.data("domainName"); + if (action.indexOf("domain_expand_icon")!=-1) { + clickExpandIcon(domainId); + } + else if(action.indexOf("domain_name")!=-1) { + domainDetail.find("#domain_name").text(domainName); + domainDetail.find("#domain_id").text(domainId); + $.ajax({ + cache: false, + data: createURL("command=listAccounts&domainid="+domainId+maxPageSize), + dataType: "json", + success: function(json) { + var accounts = json.listaccountsresponse.account; + if (accounts != null) { + domainDetail.find("#redirect_to_account_page").text(accounts.length); + domainDetail.find("#redirect_to_account_page").bind("click", function() { + $("#menutab_role_root #menutab_accounts").data("domainId", domainId).click(); + }); + } + else { + domainDetail.find("#redirect_to_account_page").text(""); + domainDetail.find("#redirect_to_account_page").unbind("click"); + } + } + }); + + $.ajax({ + cache: false, + data: createURL("command=listVirtualMachines&domainid="+domainId+"&response=json"), + dataType: "json", + success: function(json) { + var instances = json.listvirtualmachinesresponse.virtualmachine; + if (instances != null) { + domainDetail.find("#redirect_to_instance_page").text(instances.length); + domainDetail.find("#redirect_to_instance_page").bind("click", function() { + $("#menutab_role_root #menutab_vm").data("domainId", domainId).click(); + }); + } + else { + domainDetail.find("#redirect_to_instance_page").text(""); + domainDetail.find("#redirect_to_instance_page").unbind("click"); + } + } + }); + + $.ajax({ + cache: false, + data: createURL("command=listVolumes&domainid="+domainId+"&response=json"), + dataType: "json", + success: function(json) { + var volumes = json.listvolumesresponse.volume; + if (volumes != null) { + domainDetail.find("#redirect_to_volume_page").text(volumes.length); + domainDetail.find("#redirect_to_volume_page").bind("click", function() { + $("#menutab_role_root #menutab_storage").data("domainId", domainId).data("targetTab", "submenu_volume").click(); + }); + } + else { + domainDetail.find("#redirect_to_volume_page").text(""); + domainDetail.find("#redirect_to_volume_page").unbind("click"); + } + } + }); + + if (isAdmin() || (isDomainAdmin() && (g_domainid != domainId))) { + $("#limits_container").show(); + /* + $("#account_resource_limits").data("domainId", domainId).unbind("click").bind("click", function() { + var domainId = $(this).data("domainId"); + $.ajax({ + cache: false, + data: createURL("command=listResourceLimits&domainid="+domainId+"&response=json"), + dataType: "json", + success: function(json) { + var limits = json.listresourcelimitsresponse.resourcelimit; + var preInstanceLimit, preIpLimit, preDiskLimit, preSnapshotLimit, preTemplateLimit = -1; + if (limits != null) { + for (var i = 0; i < limits.length; i++) { + var limit = limits[i]; + switch (limit.resourcetype) { + case "0": + preInstanceLimit = limit.max; + $("#dialog_resource_limits #limits_vm").val(limit.max); + break; + case "1": + preIpLimit = limit.max; + $("#dialog_resource_limits #limits_ip").val(limit.max); + break; + case "2": + preDiskLimit = limit.max; + $("#dialog_resource_limits #limits_volume").val(limit.max); + break; + case "3": + preSnapshotLimit = limit.max; + $("#dialog_resource_limits #limits_snapshot").val(limit.max); + break; + case "4": + preTemplateLimit = limit.max; + $("#dialog_resource_limits #limits_template").val(limit.max); + break; + } + } + } + $("#dialog_resource_limits") + .dialog('option', 'buttons', { + "Save": function() { + // validate values + var isValid = true; + isValid &= validateNumber("Instance Limit", $("#dialog_resource_limits #limits_vm"), $("#dialog_resource_limits #limits_vm_errormsg"), -1, 32000, false); + isValid &= validateNumber("Public IP Limit", $("#dialog_resource_limits #limits_ip"), $("#dialog_resource_limits #limits_ip_errormsg"), -1, 32000, false); + isValid &= validateNumber("Disk Volume Limit", $("#dialog_resource_limits #limits_volume"), $("#dialog_resource_limits #limits_volume_errormsg"), -1, 32000, false); + isValid &= validateNumber("Snapshot Limit", $("#dialog_resource_limits #limits_snapshot"), $("#dialog_resource_limits #limits_snapshot_errormsg"), -1, 32000, false); + isValid &= validateNumber("Template Limit", $("#dialog_resource_limits #limits_template"), $("#dialog_resource_limits #limits_template_errormsg"), -1, 32000, false); + if (!isValid) return; + + var instanceLimit = trim($("#dialog_resource_limits #limits_vm").val()); + var ipLimit = trim($("#dialog_resource_limits #limits_ip").val()); + var diskLimit = trim($("#dialog_resource_limits #limits_volume").val()); + var snapshotLimit = trim($("#dialog_resource_limits #limits_snapshot").val()); + var templateLimit = trim($("#dialog_resource_limits #limits_template").val()); + + $(this).dialog("close"); + if (instanceLimit != preInstanceLimit) { + updateResourceLimit(domainId, 0, instanceLimit); + } + if (ipLimit != preIpLimit) { + updateResourceLimit(domainId, 1, ipLimit); + } + if (diskLimit != preDiskLimit) { + updateResourceLimit(domainId, 2, diskLimit); + } + if (snapshotLimit != preSnapshotLimit) { + updateResourceLimit(domainId, 3, snapshotLimit); + } + if (templateLimit != preTemplateLimit) { + updateResourceLimit(domainId, 4, templateLimit); + } + }, + "Cancel": function() { + $(this).dialog("close"); + } + }).dialog("open"); + } + }); + return false; + }); + */ + } else { + $("#limits_container").hide(); + } + + rightPanelDetailContent.show(); + rightPanelSearchResult.hide(); + + listAdminAccounts(domainId); + rightPanelGrid.show(); + } + + return false; + }); + + /* + searchResultTemplate.bind("click", function(event) { + var template = $(this); + var target = $(event.target); + var action = target.attr("id"); + var id = template.attr("id"); + var domainId = template.data("domainId"); + if(action=="domain_name") + refreshWholeTree(domainId, defaultRootLevel); + }); + */ + + /* + searchButton.bind("click", function(event) { + searchResultsContainer.empty(); + rightPanelDetailContent.hide(); + rightPanelSearchResult.show(); + var keyword = searchInput.val(); + $.ajax({ + data: createURL("command=listDomains&keyword="+keyword+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation) + dataType: "json", + async: false, + success: function(json) { + var domains = json.listdomainsresponse.domain; + if (domains != null && domains.length > 0) { + for(var i=0; i 0) { + var node = drawNode(domains[0], defaultRootLevel, treeContentBox); + + var treeLevelsbox = node.find(".tree_levelsbox"); //root node shouldn't have margin-left:20px + if(treeLevelsbox!=null && treeLevelsbox.length >0) + treeLevelsbox[0].style.marginLeft="0px"; //set root node's margin-left to 0px. + } + } + }); + } + + /* + breadcrumbPieceTemplate.bind("click", function(event) { + var domainId = $(this).data("domainId"); + refreshWholeTree(domainId); + }); + */ + + //draw breadcrumb all the way up + /* + function drawBreadcrumb(domainId) { + var domainName = domainIdNameMap[domainId]; + if(domainName == null) + return; + + var onePiece = breadcrumbPieceTemplate.clone(true).attr("id", "breadcrumb_"+domainId).data("domainId", domainId).text(" > "+domainName); + breadcrumbBox.prepend(onePiece.show()); + + var parentDomainId = childParentMap[domainId]; + if(parentDomainId!=null) + drawBreadcrumb(parentDomainId); + } + */ + + function refreshWholeTree(rootDomainId, rootLevel) { + drawRootNode(rootDomainId); + drawTree(rootDomainId, (rootLevel+1), $("#domain_children_container_"+rootDomainId)); //draw the whole tree (under root node) + $("#domain_"+rootDomainId).show(); //show root node + clickExpandIcon(rootDomainId); //expand root node + + //breadcrumbBox.empty(); + //drawBreadcrumb(rootDomainId); + } + + refreshWholeTree(defaultRootDomainId, defaultRootLevel); +} From 2abfedce476a873ce27058c8999970b0f1e01879 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 16:53:17 -0700 Subject: [PATCH 048/244] new UI - domain page - tree - implement expand tree node, collapse tree node. --- ui/new/css/main.css | 169 +++++++++++++++++++++++++++ ui/new/images/zone_openarrow.png | Bin 0 -> 251 bytes ui/new/images/zone_sidearrow.png | Bin 0 -> 283 bytes ui/new/scripts/cloud.core2.domain.js | 4 +- 4 files changed, 170 insertions(+), 3 deletions(-) create mode 100644 ui/new/images/zone_openarrow.png create mode 100644 ui/new/images/zone_sidearrow.png diff --git a/ui/new/css/main.css b/ui/new/css/main.css index b92c4b6ed89..77b46d49ab2 100644 --- a/ui/new/css/main.css +++ b/ui/new/css/main.css @@ -2736,4 +2736,173 @@ a:hover.search_button { font-weight:bold; margin:14px 15px 0 0; padding:0; +} + +/* tree in middle menu */ + + +.tree_box { + width:400px; + height:618px; + float:left; + margin:0; + padding:0; +} + + +.tree_boxleft { + width: 16px; + height:618px; + float:left; + background:url(../images/zonetree_left.gif) no-repeat top left; + margin:0; + padding:0; + overflow:hidden; +} + +.tree_boxmid { + width: 368px; + height:618px; + float:left; + background:url(../images/zonetree_mid.gif) repeat-x top left; + margin:0; + padding:0; +} + +.tree_boxright { + width: 16px; + height:618px; + float:left; + background:url(../images/tree_boxright.gif) no-repeat top left; + margin:0; + padding:0; +} + + +.tree_contentbox { + width:360px; + height:590px; + float:left; + margin:15px 0 0 0; + overflow-x:scroll; + overflow-x:auto; + overflow-y:scroll; + overflow-y:auto; +} + + +.tree_firstlevel { + width:360px; + height:25px; + float:left; + margin:0 0 0 0; + padding:0; +} + + +.tree_levelspanel { + width:360px; + height:auto; + float:left; + margin:0 0 0 0; + padding:0; +} + +.tree_levelsbox{ + width:auto; + height:auto; + float:left; + margin:0 0 0 0; + padding:0; + display:inline; +} + +.tree_levels{ + width:auto; + height:auto; + float:left; + margin:0 0 0 0; + padding:0; +} + + + +.tree_eventlevels { + width:auto; + height:auto; + float:left; + margin:3px 0 0 39px; + padding:0; +} + + +.tree_eventlinks { + width:250px; + float:left; + padding:0 0 5px 20px; + font-family:Verdana, Geneva, sans-serif; + color:#2c8bbc; + font-size:12px; + font-weight:normal; + background:url(../images/tree_eventicon.gif) no-repeat top left; + margin:3px 0 0 0; + cursor:pointer; + cursor:hand; + text-decoration:none; +} + +.tree_eventlinks:hover { + text-decoration:underline; +} + +.tree_eventicon { + width:12px; + height:16px; + background:url(../images/tree_eventicon.gif) no-repeat top left; + float:left; + margin:0 5px 10px 8px; + padding:0; +} + + +.tree_links { + width:auto; + height:auto; + float:left; + color:#2c8bbc; + text-decoration:none; + font-size:12px; + text-align:left; + margin:5px 0 0 2px; + display:inline; + padding:0; + cursor:pointer; + cursor:hand; +} +.tree_links:hover { + text-decoration:underline; +} + +.zonetree_closedarrows { + width:12px; + height:14px; + background:url(../images/zone_sidearrow.png) no-repeat top left; + float:left; + margin:5px 5px 0 8px; + display:inline; + padding:0; + cursor:pointer; + cursor:hand; +} + +.zonetree_openarrows { + width:12px; + height:14px; + background:url(../images/zone_openarrow.png) no-repeat top left; + float:left; + margin:10px 5px 0 8px; + display:inline; + padding:0; + cursor:pointer; + cursor:hand; } \ No newline at end of file diff --git a/ui/new/images/zone_openarrow.png b/ui/new/images/zone_openarrow.png new file mode 100644 index 0000000000000000000000000000000000000000..90b59cea46b131194229e8275aef1eb044dd186e GIT binary patch literal 251 zcmeAS@N?(olHy`uVBq!ia0vp^JV4CO!N$PA=)HB$CLl+$#5JNMI6tkVJh3R1!7(L2 zDOJHUH!(dmC^a#qvhZZ84N%csPZ!6Kid#uJSy{i%pEz-XLBN4Wfz5%zkcpE`;r+w^ z|NqM}FmW9Dd7gpQ$Keb|sxcFbK!l`#4NH>cgtP@k0`Z-!tDNLq7+6Icuha@iD>MY0 zaboi^xa#ph(1TfciekTt2LGmR)<_1I!!is42@2K@VsZ>SyBO^mGRqR0cKONORMFv@ y+VDtW_4~~WJWnvMWxZJ>xG=8v_HQ&^Z@nAV;#qHKHUqKdq!Zu_%?nF(p4K zRlzeiF+DXXH8G{K@MNkDP|;pb7srr_TS*yNS({Rl5)v%f1RQuA#F#rm*##VW9In+X z9OgQ*n*GsZ21XX4LCjV21(mTXs**~J*NSS3$# z9O-9Z;>goEvw%N9G=a}vpq@>dWfB{c+yn;U8+siK`e$6+X4EFIaWJq*oXD7vInUsF z! Date: Tue, 28 Sep 2010 17:27:15 -0700 Subject: [PATCH 049/244] new UI - domain page - implement details panel. --- ui/new/jsp/domain.jsp | 97 ++++++++++++++++++++++++++++ ui/new/scripts/cloud.core2.domain.js | 56 +++++++++------- 2 files changed, 129 insertions(+), 24 deletions(-) diff --git a/ui/new/jsp/domain.jsp b/ui/new/jsp/domain.jsp index 3c02eab7588..48fb781d705 100644 --- a/ui/new/jsp/domain.jsp +++ b/ui/new/jsp/domain.jsp @@ -6,6 +6,103 @@ CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); %> + +
    + +

    + Domain +

    +
    +
    + +
    +
    + <%=t.t("Details")%>
    +
    +
    +
    + +
    +
    +
    +
    +
    +

    + Detaching Disk …

    +
    +
    +
    +
    +
    +
    + <%=t.t("ID")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Name")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Accounts")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Instances")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + <%=t.t("Volume")%>:
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + + + + +
    diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js index 6a879f605cf..07689c6eb3b 100644 --- a/ui/new/scripts/cloud.core2.domain.js +++ b/ui/new/scripts/cloud.core2.domain.js @@ -21,6 +21,9 @@ function afterLoadDomainJSP() { //var breadcrumbPieceTemplate = $("#breadcrumb_piece_template"); var childParentMap = {}; //map childDomainId to parentDomainId var domainIdNameMap = {}; //map domainId to domainName + + var $detailsTab = $("#right_panel_content #tab_content_details"); + var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits"); /* activateDialog($("#dialog_resource_limits").dialog({ @@ -87,11 +90,12 @@ function afterLoadDomainJSP() { template.find("#grid_row_cell2").text(json.name); } - function updateResourceLimit(domainId, type, max) { + function updateResourceLimit(domainId, type, max, $readonlyField) { $.ajax({ data: createURL("command=updateResourceLimit&domainid="+domainId+"&resourceType="+type+"&max="+max), dataType: "json", - success: function(json) { + success: function(json) { + $readonlyField.text(max); } }); } @@ -135,7 +139,6 @@ function afterLoadDomainJSP() { clickExpandIcon(domainId); } else if(action.indexOf("domain_name")!=-1) { - var $detailsTab = $("#right_panel_content #tab_content_details"); $detailsTab.data("jsonObj", jsonObj); $detailsTab.find("#id").text(domainId); $detailsTab.find("#name").text(domainName); @@ -204,13 +207,14 @@ function afterLoadDomainJSP() { }); if (isAdmin() || (isDomainAdmin() && (g_domainid != domainId))) { - $("#limits_container").show(); - /* - $("#account_resource_limits").data("domainId", domainId).unbind("click").bind("click", function() { - var domainId = $(this).data("domainId"); + $("#tab_resource_limits").show(); + + //??? + //$("#account_resource_limits").data("domainId", domainId).unbind("click").bind("click", function() { + //debugger; $.ajax({ cache: false, - data: createURL("command=listResourceLimits&domainid="+domainId+"&response=json"), + data: createURL("command=listResourceLimits&domainid="+domainId+"&response=json"), dataType: "json", success: function(json) { var limits = json.listresourcelimitsresponse.resourcelimit; @@ -221,27 +225,34 @@ function afterLoadDomainJSP() { switch (limit.resourcetype) { case "0": preInstanceLimit = limit.max; - $("#dialog_resource_limits #limits_vm").val(limit.max); + $resourceLimitsTab.find("#limits_vm").text(preInstanceLimit); + $resourceLimitsTab.find("#limits_vm_edit").val(preInstanceLimit); break; case "1": preIpLimit = limit.max; - $("#dialog_resource_limits #limits_ip").val(limit.max); + $resourceLimitsTab.find("#limits_ip").text(preIpLimit); + $resourceLimitsTab.find("#limits_ip_edit").val(preIpLimit); break; case "2": preDiskLimit = limit.max; - $("#dialog_resource_limits #limits_volume").val(limit.max); + $resourceLimitsTab.find("#limits_volume").text(preDiskLimit); + $resourceLimitsTab.find("#limits_volume_edit").val(preDiskLimit); break; case "3": preSnapshotLimit = limit.max; - $("#dialog_resource_limits #limits_snapshot").val(limit.max); + $resourceLimitsTab.find("#limits_snapshot").text(preSnapshotLimit); + $resourceLimitsTab.find("#limits_snapshot_edit").val(preSnapshotLimit); break; case "4": preTemplateLimit = limit.max; - $("#dialog_resource_limits #limits_template").val(limit.max); + $resourceLimitsTab.find("#limits_template").text(preTemplateLimit); + $resourceLimitsTab.find("#limits_template_edit").val(preTemplateLimit); break; } } } + + /* $("#dialog_resource_limits") .dialog('option', 'buttons', { "Save": function() { @@ -281,13 +292,18 @@ function afterLoadDomainJSP() { $(this).dialog("close"); } }).dialog("open"); + */ + + } }); - return false; - }); - */ + //return false; + //}); + //??? + + } else { - $("#limits_container").hide(); + $("#tab_resource_limits").hide(); } rightPanelDetailContent.show(); @@ -401,4 +417,62 @@ function afterLoadDomainJSP() { } refreshWholeTree(defaultRootDomainId, defaultRootLevel); + + //***** switch to different tab (begin) ******************************************************************** + $("#tab_details").bind("click", function(event){ + $(this).removeClass("off").addClass("on"); + $("#tab_resource_limits").removeClass("on").addClass("off"); + $("#tab_content_details").show(); + $("#tab_content_resource_limits").hide(); + return false; + }); + + $("#tab_resource_limits").bind("click", function(event){ + $(this).removeClass("off").addClass("on"); + $("#tab_details").removeClass("on").addClass("off"); + $("#tab_content_resource_limits").show(); + $("#tab_content_details").hide(); + return false; + }); + //***** switch to different tab (end) ********************************************************************** + + //edit button *** + var $readonlyFields = $resourceLimitsTab.find("#limits_vm, #limits_ip, #limits_volume, #limits_snapshot, #limits_template"); + var $editFields = $resourceLimitsTab.find("#limits_vm_edit, #limits_ip_edit, #limits_volume_edit, #limits_snapshot_edit, #limits_template_edit"); + initializeEditFunction($readonlyFields, $editFields, doUpdateResourceLimits); + + function doUpdateResourceLimits() { + var isValid = true; + isValid &= validateNumber("Instance Limit", $resourceLimitsTab.find("#limits_vm_edit"), $resourceLimitsTab.find("#limits_vm_edit_errormsg"), -1, 32000, false); + isValid &= validateNumber("Public IP Limit", $resourceLimitsTab.find("#limits_ip_edit"), $resourceLimitsTab.find("#limits_ip_edit_errormsg"), -1, 32000, false); + isValid &= validateNumber("Disk Volume Limit", $resourceLimitsTab.find("#limits_volume_edit"), $resourceLimitsTab.find("#limits_volume_edit_errormsg"), -1, 32000, false); + isValid &= validateNumber("Snapshot Limit", $resourceLimitsTab.find("#limits_snapshot_edit"), $resourceLimitsTab.find("#limits_snapshot_edit_errormsg"), -1, 32000, false); + isValid &= validateNumber("Template Limit", $resourceLimitsTab.find("#limits_template_edit"), $resourceLimitsTab.find("#limits_template_edit_errormsg"), -1, 32000, false); + if (!isValid) return; + + var jsonObj = $detailsTab.data("jsonObj"); + var domainId = jsonObj.id; + + var instanceLimit = trim($resourceLimitsTab.find("#limits_vm_edit").val()); + var ipLimit = trim($resourceLimitsTab.find("#limits_ip_edit").val()); + var diskLimit = trim($resourceLimitsTab.find("#limits_volume_edit").val()); + var snapshotLimit = trim($resourceLimitsTab.find("#limits_snapshot_edit").val()); + var templateLimit = trim($resourceLimitsTab.find("#limits_template_edit").val()); + + if (instanceLimit != $resourceLimitsTab.find("#limits_vm").text()) { + updateResourceLimit(domainId, 0, instanceLimit, $resourceLimitsTab.find("#limits_vm")); + } + if (ipLimit != $resourceLimitsTab.find("#limits_ip").text()) { + updateResourceLimit(domainId, 1, ipLimit, $resourceLimitsTab.find("#limits_ip")); + } + if (diskLimit != $resourceLimitsTab.find("#limits_volume").text()) { + updateResourceLimit(domainId, 2, diskLimit, $resourceLimitsTab.find("#limits_volume")); + } + if (snapshotLimit != $resourceLimitsTab.find("#limits_snapshot").text()) { + updateResourceLimit(domainId, 3, snapshotLimit, $resourceLimitsTab.find("#limits_snapshot")); + } + if (templateLimit != $resourceLimitsTab.find("#limits_template").text()) { + updateResourceLimit(domainId, 4, templateLimit, $resourceLimitsTab.find("#limits_template")); + } + } } diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index 72f01954eaa..a85cbe2cbf8 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -642,7 +642,27 @@ function bindClickToMidMenu($midmenuItem1, toRightPanel, getMidmenuId) { }); } - +function initializeEditFunction($readonlyFields, $editFields, doUpdateFn) { + $("#edit_button").bind("click", function(event){ + $readonlyFields.hide(); + $editFields.show(); + $("#cancel_button, #save_button").show() + return false; + }); + $("#cancel_button").bind("click", function(event){ + $editFields.hide(); + $readonlyFields.show(); + $("#save_button, #cancel_button").hide(); + return false; + }); + $("#save_button").bind("click", function(event){ + doUpdateFn(); + $editFields.hide(); + $readonlyFields.show(); + $("#save_button, #cancel_button").hide(); + return false; + }); +} diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index 3e15a82373d..4902db124c4 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -82,27 +82,8 @@ function afterLoadTemplateJSP() { //edit button *** var $readonlyFields = $detailsTab.find("#name, #displaytext, #passwordenabled, #ispublic, #isfeatured, #ostypename"); - var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit"); - $("#edit_button").bind("click", function(event){ - $readonlyFields.hide(); - $editFields.show(); - $("#cancel_button, #save_button").show() - return false; - }); - $("#cancel_button").bind("click", function(event){ - $editFields.hide(); - $readonlyFields.show(); - $("#save_button, #cancel_button").hide(); - return false; - }); - $("#save_button").bind("click", function(event){ - doUpdateTemplate(); - $editFields.hide(); - $readonlyFields.show(); - $("#save_button, #cancel_button").hide(); - return false; - }); - + var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #passwordenabled_edit, #ispublic_edit, #isfeatured_edit, #ostypename_edit"); + initializeEditFunction($readonlyFields, $editFields, doUpdateTemplate); //populate dropdown *** var addTemplateZoneField = $("#dialog_add_template #add_template_zone"); From 273313aa2520cdc88528b727b74672444489343a Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 20:05:08 -0700 Subject: [PATCH 053/244] new UI - domain page - implement admin accounts tab. --- ui/new/jsp/account.jsp | 2 +- ui/new/jsp/domain.jsp | 114 ++++++++++- ui/new/scripts/cloud.core2.account.js | 4 +- ui/new/scripts/cloud.core2.domain.js | 272 ++++++++++---------------- 4 files changed, 215 insertions(+), 177 deletions(-) diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index f6ad235af2f..9b39eddd060 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -48,7 +48,7 @@
    - <%=t.t("id")%>:
    + <%=t.t("ID")%>:
    diff --git a/ui/new/jsp/domain.jsp b/ui/new/jsp/domain.jsp index 48f7d9b2b2f..0a8cd0b38ef 100644 --- a/ui/new/jsp/domain.jsp +++ b/ui/new/jsp/domain.jsp @@ -24,9 +24,12 @@
    <%=t.t("Details")%>
    +
    + <%=t.t("Admin.Accounts")%>
    <%=t.t("Resource.Limits")%>
    +
    @@ -81,7 +84,14 @@
    + + + + + + @@ -176,4 +186,104 @@
    - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/ui/new/scripts/cloud.core2.account.js b/ui/new/scripts/cloud.core2.account.js index bdc6d726366..9802692caaf 100644 --- a/ui/new/scripts/cloud.core2.account.js +++ b/ui/new/scripts/cloud.core2.account.js @@ -54,8 +54,8 @@ function accountJsonToDetailsTab(jsonObj) { $detailsTab.find("#domain").text(fromdb(jsonObj.domain)); $detailsTab.find("#vm_total").text(jsonObj.vmtotal); $detailsTab.find("#ip_total").text(jsonObj.iptotal); - $detailsTab.find("#bytes_received").text(jsonObj.receivedbytes); - $detailsTab.find("#bytes_sent").text(jsonObj.sentbytes); + $detailsTab.find("#bytes_received").text(convertBytes(jsonObj.receivedbytes)); + $detailsTab.find("#bytes_sent").text(convertBytes(jsonObj.sentbytes)); $detailsTab.find("#state").text(jsonObj.state); //actions *** diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js index 07689c6eb3b..c27a8dd3b3e 100644 --- a/ui/new/scripts/cloud.core2.domain.js +++ b/ui/new/scripts/cloud.core2.domain.js @@ -52,7 +52,7 @@ function afterLoadDomainJSP() { function drawTree(id, level, container) { $.ajax({ - data: createURL("command=listDomainChildren&id="+id+"&response=json&pageSize=-1"), + data: createURL("command=listDomainChildren&id="+id+"&pageSize=-1"), dataType: "json", async: false, success: function(json) { @@ -80,14 +80,17 @@ function afterLoadDomainJSP() { } } - function accountJSONToTemplate(json, template) { - if (index++ % 2 == 0) { - template.addClass("smallrow_odd"); - } else { - template.addClass("smallrow_even"); - } - template.find("#grid_row_cell1").text(json.domain); - template.find("#grid_row_cell2").text(json.name); + function accountJSONToTemplate(jsonObj, $template) { + $template.data("jsonObj", jsonObj); + $template.find("#id").text(jsonObj.id); + $template.find("#role").text(toRole(jsonObj.accounttype)); + $template.find("#account").text(fromdb(jsonObj.name)); + $template.find("#domain").text(fromdb(jsonObj.domain)); + $template.find("#vm_total").text(jsonObj.vmtotal); + $template.find("#ip_total").text(jsonObj.iptotal); + $template.find("#bytes_received").text(convertBytes(jsonObj.receivedbytes)); + $template.find("#bytes_sent").text(convertBytes(jsonObj.sentbytes)); + $template.find("#state").text(jsonObj.state); } function updateResourceLimit(domainId, type, max, $readonlyField) { @@ -101,29 +104,27 @@ function afterLoadDomainJSP() { } function listAdminAccounts(domainId) { - gridContent.empty(); - index = 0; - rightPanelDetailContent.find("#loading_gridtable").show(); + //gridContent.empty(); + //index = 0; + //rightPanelDetailContent.find("#loading_gridtable").show(); var accountType = (domainId==1)? 1: 2; $.ajax({ cache: false, - data: createURL("command=listAccounts&domainid="+domainId+"&accounttype="+accountType+"&response=json"+maxPageSize), + data: createURL("command=listAccounts&domainid="+domainId+"&accounttype="+accountType+maxPageSize), dataType: "json", success: function(json) { - var accounts = json.listaccountsresponse.account; - if (accounts != null && accounts.length > 0) { - for (var i = 0; i < accounts.length; i++) { - var template = gridRowTemplate.clone(true).attr("id","account"+accounts[i].id); - accountJSONToTemplate(accounts[i], template); - gridContent.append(template.show()); - } + var items = json.listaccountsresponse.account; + if (items != null && items.length > 0) { + var $container = $("#right_panel_content #tab_content_admin_account").empty(); + var $template = $("#admin_account_tab_template"); + for (var i = 0; i < items.length; i++) { + var $newTemplate = $template.clone(true); + accountJSONToTemplate(items[i], $newTemplate); + $container.append($newTemplate.show()); + } } - rightPanelDetailContent.find("#loading_gridtable").hide(); - }, - error: function(XMLHttpResponse) { - handleError(XMLHttpResponse); - rightPanelDetailContent.find("#loading_gridtable").hide(); - } + //rightPanelDetailContent.find("#loading_gridtable").hide(); + } }); } @@ -149,170 +150,89 @@ function afterLoadDomainJSP() { dataType: "json", success: function(json) { var accounts = json.listaccountsresponse.account; - if (accounts != null) { - $detailsTab.find("#redirect_to_account_page").text(accounts.length); - /* - $detailsTab.find("#redirect_to_account_page").bind("click", function() { - $("#menutab_role_root #menutab_accounts").data("domainId", domainId).click(); - }); - */ - } - else { - $detailsTab.find("#redirect_to_account_page").text(""); - //$detailsTab.find("#redirect_to_account_page").unbind("click"); - } + if (accounts != null) + $detailsTab.find("#redirect_to_account_page").text(accounts.length); + else + $detailsTab.find("#redirect_to_account_page").text(""); } }); $.ajax({ cache: false, - data: createURL("command=listVirtualMachines&domainid="+domainId+"&response=json"), + data: createURL("command=listVirtualMachines&domainid="+domainId), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; - if (instances != null) { + if (instances != null) $detailsTab.find("#redirect_to_instance_page").text(instances.length); - /* - $detailsTab.find("#redirect_to_instance_page").bind("click", function() { - $("#menutab_role_root #menutab_vm").data("domainId", domainId).click(); - }); - */ - } - else { - $detailsTab.find("#redirect_to_instance_page").text(""); - //$detailsTab.find("#redirect_to_instance_page").unbind("click"); - } + else + $detailsTab.find("#redirect_to_instance_page").text(""); } }); $.ajax({ cache: false, - data: createURL("command=listVolumes&domainid="+domainId+"&response=json"), + data: createURL("command=listVolumes&domainid="+domainId), dataType: "json", success: function(json) { var volumes = json.listvolumesresponse.volume; - if (volumes != null) { + if (volumes != null) $detailsTab.find("#redirect_to_volume_page").text(volumes.length); - /* - $detailsTab.find("#redirect_to_volume_page").bind("click", function() { - $("#menutab_role_root #menutab_storage").data("domainId", domainId).data("targetTab", "submenu_volume").click(); - }); - */ - } - else { - $detailsTab.find("#redirect_to_volume_page").text(""); - //$detailsTab.find("#redirect_to_volume_page").unbind("click"); - } + else + $detailsTab.find("#redirect_to_volume_page").text(""); } }); + listAdminAccounts(domainId); + if (isAdmin() || (isDomainAdmin() && (g_domainid != domainId))) { - $("#tab_resource_limits").show(); - - //??? - //$("#account_resource_limits").data("domainId", domainId).unbind("click").bind("click", function() { - //debugger; - $.ajax({ - cache: false, - data: createURL("command=listResourceLimits&domainid="+domainId+"&response=json"), - dataType: "json", - success: function(json) { - var limits = json.listresourcelimitsresponse.resourcelimit; - var preInstanceLimit, preIpLimit, preDiskLimit, preSnapshotLimit, preTemplateLimit = -1; - if (limits != null) { - for (var i = 0; i < limits.length; i++) { - var limit = limits[i]; - switch (limit.resourcetype) { - case "0": - preInstanceLimit = limit.max; - $resourceLimitsTab.find("#limits_vm").text(preInstanceLimit); - $resourceLimitsTab.find("#limits_vm_edit").val(preInstanceLimit); - break; - case "1": - preIpLimit = limit.max; - $resourceLimitsTab.find("#limits_ip").text(preIpLimit); - $resourceLimitsTab.find("#limits_ip_edit").val(preIpLimit); - break; - case "2": - preDiskLimit = limit.max; - $resourceLimitsTab.find("#limits_volume").text(preDiskLimit); - $resourceLimitsTab.find("#limits_volume_edit").val(preDiskLimit); - break; - case "3": - preSnapshotLimit = limit.max; - $resourceLimitsTab.find("#limits_snapshot").text(preSnapshotLimit); - $resourceLimitsTab.find("#limits_snapshot_edit").val(preSnapshotLimit); - break; - case "4": - preTemplateLimit = limit.max; - $resourceLimitsTab.find("#limits_template").text(preTemplateLimit); - $resourceLimitsTab.find("#limits_template_edit").val(preTemplateLimit); - break; - } + $("#tab_resource_limits").show(); + $.ajax({ + cache: false, + data: createURL("command=listResourceLimits&domainid="+domainId), + dataType: "json", + success: function(json) { + var limits = json.listresourcelimitsresponse.resourcelimit; + var preInstanceLimit, preIpLimit, preDiskLimit, preSnapshotLimit, preTemplateLimit = -1; + if (limits != null) { + for (var i = 0; i < limits.length; i++) { + var limit = limits[i]; + switch (limit.resourcetype) { + case "0": + preInstanceLimit = limit.max; + $resourceLimitsTab.find("#limits_vm").text(preInstanceLimit); + $resourceLimitsTab.find("#limits_vm_edit").val(preInstanceLimit); + break; + case "1": + preIpLimit = limit.max; + $resourceLimitsTab.find("#limits_ip").text(preIpLimit); + $resourceLimitsTab.find("#limits_ip_edit").val(preIpLimit); + break; + case "2": + preDiskLimit = limit.max; + $resourceLimitsTab.find("#limits_volume").text(preDiskLimit); + $resourceLimitsTab.find("#limits_volume_edit").val(preDiskLimit); + break; + case "3": + preSnapshotLimit = limit.max; + $resourceLimitsTab.find("#limits_snapshot").text(preSnapshotLimit); + $resourceLimitsTab.find("#limits_snapshot_edit").val(preSnapshotLimit); + break; + case "4": + preTemplateLimit = limit.max; + $resourceLimitsTab.find("#limits_template").text(preTemplateLimit); + $resourceLimitsTab.find("#limits_template_edit").val(preTemplateLimit); + break; } - } - - /* - $("#dialog_resource_limits") - .dialog('option', 'buttons', { - "Save": function() { - // validate values - var isValid = true; - isValid &= validateNumber("Instance Limit", $("#dialog_resource_limits #limits_vm"), $("#dialog_resource_limits #limits_vm_errormsg"), -1, 32000, false); - isValid &= validateNumber("Public IP Limit", $("#dialog_resource_limits #limits_ip"), $("#dialog_resource_limits #limits_ip_errormsg"), -1, 32000, false); - isValid &= validateNumber("Disk Volume Limit", $("#dialog_resource_limits #limits_volume"), $("#dialog_resource_limits #limits_volume_errormsg"), -1, 32000, false); - isValid &= validateNumber("Snapshot Limit", $("#dialog_resource_limits #limits_snapshot"), $("#dialog_resource_limits #limits_snapshot_errormsg"), -1, 32000, false); - isValid &= validateNumber("Template Limit", $("#dialog_resource_limits #limits_template"), $("#dialog_resource_limits #limits_template_errormsg"), -1, 32000, false); - if (!isValid) return; - - var instanceLimit = trim($("#dialog_resource_limits #limits_vm").val()); - var ipLimit = trim($("#dialog_resource_limits #limits_ip").val()); - var diskLimit = trim($("#dialog_resource_limits #limits_volume").val()); - var snapshotLimit = trim($("#dialog_resource_limits #limits_snapshot").val()); - var templateLimit = trim($("#dialog_resource_limits #limits_template").val()); - - $(this).dialog("close"); - if (instanceLimit != preInstanceLimit) { - updateResourceLimit(domainId, 0, instanceLimit); - } - if (ipLimit != preIpLimit) { - updateResourceLimit(domainId, 1, ipLimit); - } - if (diskLimit != preDiskLimit) { - updateResourceLimit(domainId, 2, diskLimit); - } - if (snapshotLimit != preSnapshotLimit) { - updateResourceLimit(domainId, 3, snapshotLimit); - } - if (templateLimit != preTemplateLimit) { - updateResourceLimit(domainId, 4, templateLimit); - } - }, - "Cancel": function() { - $(this).dialog("close"); - } - }).dialog("open"); - */ - - - } - }); - //return false; - //}); - //??? - - - } else { + } + } + } + }); + } + else { $("#tab_resource_limits").hide(); - } - - rightPanelDetailContent.show(); - rightPanelSearchResult.hide(); - - listAdminAccounts(domainId); - rightPanelGrid.show(); - } - + } + } return false; }); @@ -335,7 +255,7 @@ function afterLoadDomainJSP() { rightPanelSearchResult.show(); var keyword = searchInput.val(); $.ajax({ - data: createURL("command=listDomains&keyword="+keyword+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation) + data: createURL("command=listDomains&keyword="+keyword+"&pageSize=-1"), //pageSize=-1 will return all items (no limitation) dataType: "json", async: false, success: function(json) { @@ -367,7 +287,7 @@ function afterLoadDomainJSP() { function drawRootNode(rootDomainId) { treeContentBox.empty(); $.ajax({ - data: createURL("command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation) + data: createURL("command=listDomains&id="+rootDomainId+"&pageSize=-1"), //pageSize=-1 will return all items (no limitation) dataType: "json", async: false, success: function(json) { @@ -421,17 +341,25 @@ function afterLoadDomainJSP() { //***** switch to different tab (begin) ******************************************************************** $("#tab_details").bind("click", function(event){ $(this).removeClass("off").addClass("on"); - $("#tab_resource_limits").removeClass("on").addClass("off"); + $("#tab_resource_limits, #tab_admin_account").removeClass("on").addClass("off"); $("#tab_content_details").show(); - $("#tab_content_resource_limits").hide(); + $("#tab_content_resource_limits, #tab_content_admin_account").hide(); return false; }); $("#tab_resource_limits").bind("click", function(event){ $(this).removeClass("off").addClass("on"); - $("#tab_details").removeClass("on").addClass("off"); + $("#tab_details, #tab_admin_account").removeClass("on").addClass("off"); $("#tab_content_resource_limits").show(); - $("#tab_content_details").hide(); + $("#tab_content_details, #tab_content_admin_account").hide(); + return false; + }); + + $("#tab_admin_account").bind("click", function(event){ + $(this).removeClass("off").addClass("on"); + $("#tab_details, #tab_resource_limits").removeClass("on").addClass("off"); + $("#tab_content_admin_account").show(); + $("#tab_content_details, #tab_content_resource_limits").hide(); return false; }); //***** switch to different tab (end) ********************************************************************** From 9e543b2c12f34d042e10a6a1fde20bd8d23c6e10 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 28 Sep 2010 20:15:28 -0700 Subject: [PATCH 054/244] new UI - domain page - remove obsolete code. --- ui/new/scripts/cloud.core2.domain.js | 134 ++++----------------------- 1 file changed, 16 insertions(+), 118 deletions(-) diff --git a/ui/new/scripts/cloud.core2.domain.js b/ui/new/scripts/cloud.core2.domain.js index c27a8dd3b3e..f6d95afdd7b 100644 --- a/ui/new/scripts/cloud.core2.domain.js +++ b/ui/new/scripts/cloud.core2.domain.js @@ -1,46 +1,21 @@ function afterLoadDomainJSP() { var defaultRootDomainId = g_domainid; - var defaultRootLevel = 0; - var index = 1; - var treeContentBox = $("#midmenu_container"); - var treenodeTemplate = $("#treenode_template"); - var grid = $("#right_panel_grid"); - var gridRowTemplate = $("#grid_row_template"); - var gridContent = grid.find("#grid_content"); - var gridHeader = grid.find("#grid_header"); - var rightPanelDetailContent = $("#right_panel_detail_content"); - var rightPanelSearchResult = $("#right_panel_search_result"); - var rightPanelGrid = rightPanelDetailContent.find("#right_panel_grid"); - var domainDetail = rightPanelDetailContent.find("#domain_detail"); - var submenuContent = $("#submenu_content_domains"); - var searchButton = submenuContent.find("#search_button"); - var searchInput = submenuContent.find("#search_input"); - var searchResultsContainer = submenuContent.find("#search_results_container"); - var searchResultTemplate = $("#search_result_template"); - //var breadcrumbBox = submenuContent.find("#breadcrumb_box"); - //var breadcrumbPieceTemplate = $("#breadcrumb_piece_template"); + var defaultRootLevel = 0; var childParentMap = {}; //map childDomainId to parentDomainId var domainIdNameMap = {}; //map domainId to domainName - + + var $treeContentBox = $("#midmenu_container"); + var $treenodeTemplate = $("#treenode_template"); var $detailsTab = $("#right_panel_content #tab_content_details"); var $resourceLimitsTab = $("#right_panel_content #tab_content_resource_limits"); - - /* - activateDialog($("#dialog_resource_limits").dialog({ - autoOpen: false, - modal: true, - zIndex: 2000 - })); - */ - + function drawNode(json, level, container) { if("parentdomainid" in json) - childParentMap[json.id] = json.parentdomainid; //map childDomainId to parentDomainId - domainIdNameMap[json.id] = json.name; //map domainId to domainName + childParentMap[json.id] = json.parentdomainid; //map childDomainId to parentDomainId + domainIdNameMap[json.id] = json.name; //map domainId to domainName - var template = treenodeTemplate.clone(true); - template.attr("id", "domain_"+json.id); - //template.data("domainId", json.id).data("domainName", fromdb(json.name)).data("domainLevel", level); + var template = $treenodeTemplate.clone(true); + template.attr("id", "domain_"+json.id); template.data("jsonObj", json).data("domainLevel", level); template.find("#domain_title_container").attr("id", "domain_title_container_"+json.id); template.find("#domain_expand_icon").attr("id", "domain_expand_icon_"+json.id); @@ -103,10 +78,7 @@ function afterLoadDomainJSP() { }); } - function listAdminAccounts(domainId) { - //gridContent.empty(); - //index = 0; - //rightPanelDetailContent.find("#loading_gridtable").show(); + function listAdminAccounts(domainId) { var accountType = (domainId==1)? 1: 2; $.ajax({ cache: false, @@ -122,13 +94,12 @@ function afterLoadDomainJSP() { accountJSONToTemplate(items[i], $newTemplate); $container.append($newTemplate.show()); } - } - //rightPanelDetailContent.find("#loading_gridtable").hide(); + } } }); } - treenodeTemplate.bind("click", function(event) { + $treenodeTemplate.bind("click", function(event) { var template = $(this); var target = $(event.target); var action = target.attr("id"); @@ -235,57 +206,10 @@ function afterLoadDomainJSP() { } return false; }); - - /* - searchResultTemplate.bind("click", function(event) { - var template = $(this); - var target = $(event.target); - var action = target.attr("id"); - var id = template.attr("id"); - var domainId = template.data("domainId"); - if(action=="domain_name") - refreshWholeTree(domainId, defaultRootLevel); - }); - */ - - /* - searchButton.bind("click", function(event) { - searchResultsContainer.empty(); - rightPanelDetailContent.hide(); - rightPanelSearchResult.show(); - var keyword = searchInput.val(); - $.ajax({ - data: createURL("command=listDomains&keyword="+keyword+"&pageSize=-1"), //pageSize=-1 will return all items (no limitation) - dataType: "json", - async: false, - success: function(json) { - var domains = json.listdomainsresponse.domain; - if (domains != null && domains.length > 0) { - for(var i=0; i 0) { - var node = drawNode(domains[0], defaultRootLevel, treeContentBox); + var node = drawNode(domains[0], defaultRootLevel, $treeContentBox); var treeLevelsbox = node.find(".tree_levelsbox"); //root node shouldn't have margin-left:20px if(treeLevelsbox!=null && treeLevelsbox.length >0) @@ -303,37 +227,11 @@ function afterLoadDomainJSP() { }); } - /* - breadcrumbPieceTemplate.bind("click", function(event) { - var domainId = $(this).data("domainId"); - refreshWholeTree(domainId); - }); - */ - - //draw breadcrumb all the way up - /* - function drawBreadcrumb(domainId) { - var domainName = domainIdNameMap[domainId]; - if(domainName == null) - return; - - var onePiece = breadcrumbPieceTemplate.clone(true).attr("id", "breadcrumb_"+domainId).data("domainId", domainId).text(" > "+domainName); - breadcrumbBox.prepend(onePiece.show()); - - var parentDomainId = childParentMap[domainId]; - if(parentDomainId!=null) - drawBreadcrumb(parentDomainId); - } - */ - function refreshWholeTree(rootDomainId, rootLevel) { drawRootNode(rootDomainId); drawTree(rootDomainId, (rootLevel+1), $("#domain_children_container_"+rootDomainId)); //draw the whole tree (under root node) $("#domain_"+rootDomainId).show(); //show root node - clickExpandIcon(rootDomainId); //expand root node - - //breadcrumbBox.empty(); - //drawBreadcrumb(rootDomainId); + clickExpandIcon(rootDomainId); //expand root node } refreshWholeTree(defaultRootDomainId, defaultRootLevel); From 9e87534e42b049a67d0f483b3fd617b4a758c958 Mon Sep 17 00:00:00 2001 From: kishan Date: Wed, 29 Sep 2010 15:51:49 +0530 Subject: [PATCH 055/244] bug 6216: Added Id to listAlerts response --- server/src/com/cloud/api/commands/ListAlertsCmd.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/api/commands/ListAlertsCmd.java b/server/src/com/cloud/api/commands/ListAlertsCmd.java index cf95167b0d7..f20ef270cd6 100644 --- a/server/src/com/cloud/api/commands/ListAlertsCmd.java +++ b/server/src/com/cloud/api/commands/ListAlertsCmd.java @@ -88,7 +88,8 @@ public class ListAlertsCmd extends BaseCmd{ int i=0; for (AlertVO alert : alerts) { - List> alertData = new ArrayList>(); + List> alertData = new ArrayList>(); + alertData.add(new Pair(BaseCmd.Properties.ID.getName(), alert.getId())); alertData.add(new Pair(BaseCmd.Properties.TYPE.getName(), alert.getType())); alertData.add(new Pair(BaseCmd.Properties.DESCRIPTION.getName(), alert.getSubject())); alertData.add(new Pair(BaseCmd.Properties.SENT.getName(), getDateString(alert.getLastSent()))); From 153dca3ddf30b5ac18ebabd666b2d43c52101623 Mon Sep 17 00:00:00 2001 From: kishan Date: Wed, 29 Sep 2010 18:29:07 +0530 Subject: [PATCH 056/244] bug 6195: removed service offering Id for ROOT volumes in usage data --- server/src/com/cloud/storage/StorageManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 3b30f4863fd..1d885992095 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -910,14 +910,16 @@ public class StorageManagerImpl implements StorageManager { } long templateId = -1; + long doId = v.getDiskOfferingId(); if(v.getVolumeType() == VolumeType.ROOT && Storage.ImageFormat.ISO != template.getFormat()){ templateId = template.getId(); + doId = -1; } long volumeId = v.getId(); // Create an event long sizeMB = v.getSize() / (1024 * 1024); - String eventParams = "id=" + volumeId + "\ndoId=" + v.getDiskOfferingId() + "\ntId=" + templateId + "\ndcId=" + dc.getId() + "\nsize=" + sizeMB; + String eventParams = "id=" + volumeId + "\ndoId=" + doId + "\ntId=" + templateId + "\ndcId=" + dc.getId() + "\nsize=" + sizeMB; EventVO event = new EventVO(); event.setAccountId(account.getId()); event.setUserId(1L); From 4026eba2e50f83540b222221053ab55b5a2bd990 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 29 Sep 2010 10:22:17 -0700 Subject: [PATCH 057/244] new UI - add login section. --- ui/new/index.jsp | 1568 ++++++++++++++++++++++++---------------------- 1 file changed, 812 insertions(+), 756 deletions(-) diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 17185781259..2d829ba5334 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -1,756 +1,812 @@ -<%@ page import="java.util.Date" %> - -<% -long milliseconds = new Date().getTime(); -%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cloud.com CloudStack - - - - -
    - -
    -
    -
    - -
    -
    -
    -
      -
    1. -
      - -
      -
      -
      2. -
    -
    - Advanced - -
    - - - - - - -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    - - - -
    -
    - -
    -
    - -
    - -
    - -
    - - - - - - - - - - - - - - - - - - - - - - - + + +<%@ page import="java.util.Date" %> + +<% +long milliseconds = new Date().getTime(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cloud.com CloudStack + + + + +
    + +
    +
    +
    + +
    +
    +
    +
      +
    1. +
      + +
      +
      +
      +
      2. +
    +
    + Advanced + +
    + + + +
    + + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + + +
    +
    + +
    +
    + +
    + +
    + +
    + + + + + + + + + + + + + + + + + From cd42fcc1bf11d59ae4c13c404031b894d43330b5 Mon Sep 17 00:00:00 2001 From: abhishek Date: Wed, 29 Sep 2010 11:17:27 -0700 Subject: [PATCH 058/244] some code refactoring --- client/tomcatconf/commands.properties.in | 2 +- core/src/com/cloud/server/ManagementServer.java | 2 +- ...eCertificateCmd.java => UploadCustomCertificateCmd.java} | 6 +++--- server/src/com/cloud/server/ManagementServerImpl.java | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) rename server/src/com/cloud/api/commands/{UpdateCertificateCmd.java => UploadCustomCertificateCmd.java} (91%) diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 255cfa307c1..ca255d96f7a 100755 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -220,4 +220,4 @@ updateInstanceGroup=com.cloud.api.commands.UpdateVMGroupCmd;15 listInstanceGroups=com.cloud.api.commands.ListVMGroupsCmd;15 ### Certificate commands -updateCustomCertificate=com.cloud.api.commands.UpdateCertificateCmd;15 \ No newline at end of file +uploadCustomCertificate=com.cloud.api.commands.UploadCustomCertificateCmd;15 \ No newline at end of file diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index d717ee295b1..6aa4ff76b8a 100755 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -2254,6 +2254,6 @@ public interface ManagementServer { * Fetches the version of cloud stack */ String getVersion(); - boolean updateCertificate(String certificatePath); + boolean uploadCertificate(String certificatePath); } diff --git a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java similarity index 91% rename from server/src/com/cloud/api/commands/UpdateCertificateCmd.java rename to server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java index 16b9c6f400e..cecb5a7d48f 100644 --- a/server/src/com/cloud/api/commands/UpdateCertificateCmd.java +++ b/server/src/com/cloud/api/commands/UploadCustomCertificateCmd.java @@ -27,10 +27,10 @@ import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; import com.cloud.utils.Pair; -public class UpdateCertificateCmd extends BaseCmd { +public class UploadCustomCertificateCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddConfigCmd.class.getName()); - private static final String s_name = "updatecertificateresponse"; + private static final String s_name = "uploadcustomcertificateresponse"; private static final List> s_properties = new ArrayList>(); static { @@ -52,7 +52,7 @@ public class UpdateCertificateCmd extends BaseCmd { try { - boolean status = getManagementServer().updateCertificate(certificatePath); + boolean status = getManagementServer().uploadCertificate(certificatePath); List> returnValues = new ArrayList>(); returnValues.add(new Pair(BaseCmd.Properties.STATUS.getName(), status)); diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 6cd7ae3d180..7fbc447e9a2 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -9102,7 +9102,7 @@ public class ManagementServerImpl implements ManagementServer { } @Override - public boolean updateCertificate(String certificatePath) + public boolean uploadCertificate(String certificatePath) { return _certDao.persistCustomCertToDb(certificatePath); } From b71010cbf65cf40766ee11257ee229b4a443a37b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 29 Sep 2010 14:12:12 -0700 Subject: [PATCH 059/244] new UI - VM creation - fix bug "$t is not defined". --- ui/new/scripts/cloud.core2.instance.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index b614223d549..3e3b0b0471b 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -1202,7 +1202,7 @@ function clickInstanceGroupHeader($arrowIcon) { // Succeeded afterAddingMidMenuItem($midmenuItem1, true); if("virtualmachine" in result) - vmToMidmenu(result.virtualmachine[0], $t); + vmToMidmenu(result.virtualmachine[0], $midmenuItem1); } else if (result.jobstatus == 2) { // Failed From 7374f85a184740b200fccd5fac0f70c1dff80088 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 29 Sep 2010 15:24:55 -0700 Subject: [PATCH 060/244] new UI - VM creation - fix bug "toRightPanel is not a function". --- ui/new/scripts/cloud.core2.instance.js | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 3e3b0b0471b..97f46c1557e 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -369,9 +369,12 @@ function clickInstanceGroupHeader($arrowIcon) { $midmenuItem1.find("#first_row").text(vmName); $midmenuItem1.find("#second_row").text(json.ipaddress); updateVirtualMachineStateInMidMenu(json, $midmenuItem1); + + $midmenuItem1.data("toRightPanelFn", vmToRightPanel); $midmenuItem1.bind("click", function(event) { var $t = $(this); - vmToRightPanel($t); + var toRightPanelFn = $t.data("toRightPanelFn"); + toRightPanelFn($t); return false; }); } @@ -575,8 +578,7 @@ function clickInstanceGroupHeader($arrowIcon) { var instances = json.listvirtualmachinesresponse.virtualmachine; if (instances != null && instances.length > 0) { for(var i=0; i Date: Wed, 29 Sep 2010 15:23:25 -0700 Subject: [PATCH 061/244] bug 6365: find policy from volumeId instead of snapshotID status 6365: resolved fixed --- .../com/cloud/storage/dao/SnapshotDao.java | 2 ++ .../cloud/storage/dao/SnapshotDaoImpl.java | 21 +++++++++++++++++++ .../cloud/server/ManagementServerImpl.java | 2 +- .../storage/snapshot/SnapshotManagerImpl.java | 18 ++++++++++------ 4 files changed, 36 insertions(+), 7 deletions(-) diff --git a/core/src/com/cloud/storage/dao/SnapshotDao.java b/core/src/com/cloud/storage/dao/SnapshotDao.java index b424a754ae8..4391add9a82 100644 --- a/core/src/com/cloud/storage/dao/SnapshotDao.java +++ b/core/src/com/cloud/storage/dao/SnapshotDao.java @@ -20,6 +20,7 @@ package com.cloud.storage.dao; import java.util.List; +import com.cloud.storage.Snapshot; import com.cloud.storage.SnapshotVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDao; @@ -29,5 +30,6 @@ public interface SnapshotDao extends GenericDao { List listByVolumeId(Filter filter, long volumeId); SnapshotVO findNextSnapshot(long parentSnapId); long getLastSnapshot(long volumeId, long snapId); + List listByVolumeIdType(long volumeId, String type); } diff --git a/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java b/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java index 67c59e2ed85..19f5b64fde8 100644 --- a/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java +++ b/core/src/com/cloud/storage/dao/SnapshotDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; +import com.cloud.storage.Snapshot; import com.cloud.storage.SnapshotVO; import com.cloud.utils.db.Filter; import com.cloud.utils.db.GenericDaoBase; @@ -33,6 +34,7 @@ import com.cloud.utils.db.SearchCriteria; public class SnapshotDaoImpl extends GenericDaoBase implements SnapshotDao { private final SearchBuilder VolumeIdSearch; + private final SearchBuilder VolumeIdTypeSearch; private final SearchBuilder ParentIdSearch; private final GenericSearchBuilder lastSnapSearch; @@ -42,6 +44,12 @@ public class SnapshotDaoImpl extends GenericDaoBase implements sc.setParameters("prevSnapshotId", snapshotId); return findOneIncludingRemovedBy(sc); } + + @Override + public List listByVolumeIdType(long volumeId, String type ) { + return listByVolumeIdType(null, volumeId, type); + } + @Override public List listByVolumeId(long volumeId) { @@ -54,12 +62,25 @@ public class SnapshotDaoImpl extends GenericDaoBase implements sc.setParameters("volumeId", volumeId); return listBy(sc, filter); } + + + public List listByVolumeIdType(Filter filter, long volumeId, String type ) { + SearchCriteria sc = VolumeIdTypeSearch.create(); + sc.setParameters("volumeId", volumeId); + sc.setParameters("type", type); + return listBy(sc, filter); + } protected SnapshotDaoImpl() { VolumeIdSearch = createSearchBuilder(); VolumeIdSearch.and("volumeId", VolumeIdSearch.entity().getVolumeId(), SearchCriteria.Op.EQ); VolumeIdSearch.done(); + VolumeIdTypeSearch = createSearchBuilder(); + VolumeIdTypeSearch.and("volumeId", VolumeIdTypeSearch.entity().getVolumeId(), SearchCriteria.Op.EQ); + VolumeIdTypeSearch.and("type", VolumeIdTypeSearch.entity().getTypeDescription(), SearchCriteria.Op.EQ); + VolumeIdTypeSearch.done(); + ParentIdSearch = createSearchBuilder(); ParentIdSearch.and("prevSnapshotId", ParentIdSearch.entity().getPrevSnapshotId(), SearchCriteria.Op.EQ); ParentIdSearch.done(); diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 7fbc447e9a2..bf66acedbcc 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -6875,7 +6875,7 @@ public class ManagementServerImpl implements ManagementServer { public long deleteSnapshotAsync(long userId, long snapshotId) { Snapshot snapshot = findSnapshotById(snapshotId); long volumeId = snapshot.getVolumeId(); - List policies = _snapMgr.listPoliciesforSnapshot(snapshotId); + List policies = _snapMgr.listPoliciesforVolume(volumeId); // Return the job id of the last destroySnapshotAsync job which actually destroys the snapshot. // The rest of the async jobs just update the db and don't really do any meaningful thing. diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index ea0ad93f192..98356d4bc3a 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -606,8 +606,7 @@ public class SnapshotManagerImpl implements SnapshotManager { private void postCreateRecurringSnapshotForPolicy(long userId, long volumeId, long snapshotId, long policyId) { //Use count query - Filter searchFilter = new Filter(SnapshotVO.class, GenericDaoBase.CREATED_COLUMN, true, null, null); - List snaps = listSnapsforPolicy(policyId, searchFilter); + List snaps = listSnapsforVolumeType(volumeId, SnapshotType.RECURRING.name()); SnapshotPolicyVO policy = _snapshotPolicyDao.findById(policyId); while(snaps.size() > policy.getMaxSnaps() && snaps.size() > 1) { @@ -640,9 +639,8 @@ public class SnapshotManagerImpl implements SnapshotManager { while( lastSnapshot.getRemoved() != null ) { String BackupSnapshotId = lastSnapshot.getBackupSnapshotId(); if( BackupSnapshotId != null ) { - if( destroySnapshotBackUp(userId, snapshotId, policyId) ) { - lastSnapshot.setBackupSnapshotId(null); - _snapshotDao.update(lastId, lastSnapshot); + if( destroySnapshotBackUp(userId, lastId, policyId) ) { + } else { s_logger.debug("Destroying snapshot backup failed " + lastSnapshot); break; @@ -650,6 +648,9 @@ public class SnapshotManagerImpl implements SnapshotManager { } postDeleteSnapshot(userId, lastId, policyId); lastId = lastSnapshot.getPrevSnapshotId(); + if( lastId == 0 ) { + break; + } lastSnapshot = _snapshotDao.findById(lastId); } return true; @@ -699,8 +700,9 @@ public class SnapshotManagerImpl implements SnapshotManager { _pauseInterval, _shouldBeSnapshotCapable, volume.getInstanceId()); if ((answer != null) && answer.getResult()) { + snapshot.setBackupSnapshotId(null); + _snapshotDao.update(snapshotId, snapshot); // This is not the last snapshot. - postDeleteSnapshot(userId, snapshotId, policyId); success = true; details = "Successfully deleted snapshot " + snapshotId + " for volumeId: " + volumeId + " and policyId " + policyId; @@ -933,6 +935,10 @@ public class SnapshotManagerImpl implements SnapshotManager { public List listSnapsforVolume(long volumeId) { return _snapshotDao.listByVolumeId(volumeId); } + + public List listSnapsforVolumeType(long volumeId, String type) { + return _snapshotDao.listByVolumeIdType(volumeId, type); + } @Override public void deletePoliciesForVolume(Long volumeId) { From 76fbb6edf70c42461aa1fe3f65a209073cfed186 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 29 Sep 2010 15:56:11 -0700 Subject: [PATCH 062/244] Revert "new UI - add login section." This reverts commit 4026eba2e50f83540b222221053ab55b5a2bd990. --- ui/new/index.jsp | 1568 ++++++++++++++++++++++------------------------ 1 file changed, 756 insertions(+), 812 deletions(-) diff --git a/ui/new/index.jsp b/ui/new/index.jsp index 2d829ba5334..17185781259 100644 --- a/ui/new/index.jsp +++ b/ui/new/index.jsp @@ -1,812 +1,756 @@ - - -<%@ page import="java.util.Date" %> - -<% -long milliseconds = new Date().getTime(); -%> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Cloud.com CloudStack - - - - -
    - -
    -
    -
    - -
    -
    -
    -
      -
    1. -
      - -
      -
      -
      -
      2. -
    -
    - Advanced - -
    - - - -
    - - -
    - -
    -
    -
    -
    -
    -
    -
    - -
    - -
    -
    - - -
    -
    - -
    -
    - -
    - -
    - -
    - - - - - - - - - - - - - - - - - +<%@ page import="java.util.Date" %> + +<% +long milliseconds = new Date().getTime(); +%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Cloud.com CloudStack + + + + +
    + +
    +
    +
    + +
    +
    +
    +
      +
    1. +
      + +
      +
      +
      2. +
    +
    + Advanced + +
    + + + + + + +
    + + +
    + +
    +
    +
    +
    +
    +
    +
    + +
    + +
    +
    + + + +
    +
    + +
    +
    + +
    + +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + From 9b03017a0708e5bed92fe64e28c7fe04326ea117 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 16:09:06 -0700 Subject: [PATCH 063/244] bug 6354: return correct interval status 6354: resolved fixed --- server/src/com/cloud/server/ManagementServerImpl.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index bf66acedbcc..3709aa406a8 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -8376,7 +8376,11 @@ public class ManagementServerImpl implements ManagementServer { @Override public String getSnapshotIntervalTypes(long snapshotId){ String intervalTypes = ""; - List policies = _snapMgr.listPoliciesforSnapshot(snapshotId); + SnapshotVO snapshot = _snapshotDao.findById(snapshotId); + if(snapshot.getSnapshotType() == Snapshot.SnapshotType.MANUAL.ordinal() ) { + return "MANUAL"; + } + List policies = _snapMgr.listPoliciesforVolume(snapshot.getVolumeId()); for (SnapshotPolicyVO policy : policies){ if(!intervalTypes.isEmpty()){ intervalTypes += ","; From be5fa8222949412e8169e32a9d134b84f1d44821 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 16:24:57 -0700 Subject: [PATCH 064/244] remove snapshotpolicyRef --- .../com/cloud/server/ManagementServer.java | 2 +- .../cloud/storage/SnapshotPolicyRefVO.java | 57 ------------- .../storage/dao/SnapshotPolicyRefDao.java | 35 -------- .../storage/dao/SnapshotPolicyRefDaoImpl.java | 83 ------------------- .../cloud/api/commands/ListSnapshotsCmd.java | 2 +- .../cloud/server/ManagementServerImpl.java | 14 +--- .../storage/snapshot/SnapshotManager.java | 6 +- .../storage/snapshot/SnapshotManagerImpl.java | 23 +---- .../snapshot/SnapshotSchedulerImpl.java | 10 --- 9 files changed, 9 insertions(+), 223 deletions(-) delete mode 100644 core/src/com/cloud/storage/SnapshotPolicyRefVO.java delete mode 100644 core/src/com/cloud/storage/dao/SnapshotPolicyRefDao.java delete mode 100644 core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index 6aa4ff76b8a..75e4a19d5de 100755 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -1733,7 +1733,7 @@ public interface ManagementServer { * @return list of snapshots * @throws InvalidParameterValueException */ - List listSnapshots(Criteria c, String interval) throws InvalidParameterValueException; + List listSnapshots(Criteria c) throws InvalidParameterValueException; /** * find a single snapshot by id diff --git a/core/src/com/cloud/storage/SnapshotPolicyRefVO.java b/core/src/com/cloud/storage/SnapshotPolicyRefVO.java deleted file mode 100644 index ab06e6796f9..00000000000 --- a/core/src/com/cloud/storage/SnapshotPolicyRefVO.java +++ /dev/null @@ -1,57 +0,0 @@ -/** - * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. - * - * This software is licensed under the GNU General Public License v3 or later. - * - * It is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package com.cloud.storage; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.Table; - -@Entity -@Table(name="snapshot_policy_ref") -public class SnapshotPolicyRefVO { - - @Column(name="snap_id") - long snapshotId; - - @Column(name="volume_id") - long volumeId; - - @Column(name="policy_id") - long policyId; - - public SnapshotPolicyRefVO() { } - - public SnapshotPolicyRefVO(long snapshotId, long volumeId, long policyId) { - this.snapshotId = snapshotId; - this.volumeId = volumeId; - this.policyId = policyId; - } - - public long getSnapshotId() { - return snapshotId; - } - - public long getVolumeId() { - return snapshotId; - } - - public long getPolicyId() { - return policyId; - } -} diff --git a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDao.java b/core/src/com/cloud/storage/dao/SnapshotPolicyRefDao.java deleted file mode 100644 index c2ed3056df8..00000000000 --- a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDao.java +++ /dev/null @@ -1,35 +0,0 @@ -/** - * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. - * - * This software is licensed under the GNU General Public License v3 or later. - * - * It is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package com.cloud.storage.dao; - -import java.util.List; - -import com.cloud.storage.SnapshotPolicyRefVO; -import com.cloud.utils.db.GenericDao; - -public interface SnapshotPolicyRefDao extends GenericDao { - - SnapshotPolicyRefVO findBySnapPolicy(long snapshotId, long policyId); - - int removeSnapPolicy(long snapshotId, long policyId); - - List listByPolicyId(long policyId, long volumeId); - - List listBySnapshotId(long snapshotId); -} diff --git a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java b/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java deleted file mode 100644 index 73479ad727e..00000000000 --- a/core/src/com/cloud/storage/dao/SnapshotPolicyRefDaoImpl.java +++ /dev/null @@ -1,83 +0,0 @@ -/** - * Copyright (C) 2010 Cloud.com, Inc. All rights reserved. - * - * This software is licensed under the GNU General Public License v3 or later. - * - * It is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or any later version. - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - */ - -package com.cloud.storage.dao; - - -import java.util.List; - -import javax.ejb.Local; - -import com.cloud.storage.SnapshotPolicyRefVO; -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; - -@Local (value={SnapshotPolicyRefDao.class}) -public class SnapshotPolicyRefDaoImpl extends GenericDaoBase implements SnapshotPolicyRefDao { - protected final SearchBuilder snapPolicy; - protected final SearchBuilder snapSearch; - protected final SearchBuilder policySearch; - - protected SnapshotPolicyRefDaoImpl() { - snapPolicy = createSearchBuilder(); - snapPolicy.and("snapshotId", snapPolicy.entity().getSnapshotId(), SearchCriteria.Op.EQ); - snapPolicy.and("policyId", snapPolicy.entity().getPolicyId(), SearchCriteria.Op.EQ); - snapPolicy.done(); - - snapSearch = createSearchBuilder(); - snapSearch.and("snapshotId", snapSearch.entity().getSnapshotId(), SearchCriteria.Op.EQ); - snapSearch.done(); - - policySearch = createSearchBuilder(); - policySearch.and("policyId", policySearch.entity().getPolicyId(), SearchCriteria.Op.EQ); - policySearch.and("volumeId", policySearch.entity().getVolumeId(), SearchCriteria.Op.EQ); - policySearch.done(); - } - - @Override - public SnapshotPolicyRefVO findBySnapPolicy(long snapshotId, long policyId) { - SearchCriteria sc = snapPolicy.create(); - sc.setParameters("snapshotId", snapshotId); - sc.setParameters("policyId", policyId); - return findOneIncludingRemovedBy(sc); - } - - @Override - public int removeSnapPolicy(long snapshotId, long policyId) { - SearchCriteria sc = snapPolicy.create(); - sc.setParameters("snapshotId", snapshotId); - sc.setParameters("policyId", policyId); - return expunge(sc); - } - - @Override - public List listBySnapshotId(long snapshotId) { - SearchCriteria sc = snapSearch.create(); - sc.setParameters("snapshotId", snapshotId); - return listIncludingRemovedBy(sc); - } - - @Override - public List listByPolicyId(long policyId, long volumeId) { - SearchCriteria sc = policySearch.create(); - sc.setParameters("policyId", policyId); - sc.setParameters("volumeId", volumeId); - return listIncludingRemovedBy(sc); - } -} \ No newline at end of file diff --git a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java index 99f674276f3..e31de73034a 100644 --- a/server/src/com/cloud/api/commands/ListSnapshotsCmd.java +++ b/server/src/com/cloud/api/commands/ListSnapshotsCmd.java @@ -122,7 +122,7 @@ public class ListSnapshotsCmd extends BaseCmd { List snapshots = null; try { - snapshots = getManagementServer().listSnapshots(c, interval); + snapshots = getManagementServer().listSnapshots(c); } catch (InvalidParameterValueException e) { throw new ServerApiException(SNAPSHOT_INVALID_PARAM_ERROR, e.getMessage()); } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 3709aa406a8..0fefe15d245 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -6888,7 +6888,7 @@ public class ManagementServerImpl implements ManagementServer { @Override - public List listSnapshots(Criteria c, String interval) throws InvalidParameterValueException { + public List listSnapshots(Criteria c) throws InvalidParameterValueException { Filter searchFilter = new Filter(SnapshotVO.class, c.getOrderBy(), c.getAscending(), c.getOffset(), c.getLimit()); SearchCriteria sc = _snapshotDao.createSearchCriteria(); @@ -6935,18 +6935,6 @@ public class ManagementServerImpl implements ManagementServer { // Show only MANUAL and RECURRING snapshot types sc.addAnd("snapshotType", SearchCriteria.Op.NEQ, Snapshot.SnapshotType.TEMPLATE.ordinal()); } - if(interval != null && volumeId != null) { - IntervalType intervalType = DateUtil.IntervalType.getIntervalType(interval); - if(intervalType == null) { - throw new InvalidParameterValueException("Unsupported interval type " + intervalType); - } - SnapshotPolicyVO snapPolicy = _snapMgr.getPolicyForVolumeByInterval((Long)volumeId, (short)intervalType.ordinal()); - if (snapPolicy == null) { - s_logger.warn("Policy with interval "+ intervalType +" not assigned to volume: "+volumeId); - return new ArrayList(); - } - return _snapMgr.listSnapsforPolicy(snapPolicy.getId(), searchFilter); - } return _snapshotDao.search(sc, searchFilter); } diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManager.java b/server/src/com/cloud/storage/snapshot/SnapshotManager.java index 4b6d3c01cdc..04ca82ec7d6 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManager.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManager.java @@ -114,8 +114,9 @@ public interface SnapshotManager extends Manager { /** * Lists all snapshots for the volume which are created using schedule of the specified policy */ + /* List listSnapsforPolicy(long policyId, Filter filter); - + */ /** * List all policies which are assigned to the specified volume */ @@ -125,8 +126,9 @@ public interface SnapshotManager extends Manager { * List all policies to which a specified snapshot belongs. For ex: A snapshot * may belong to a hourly snapshot and a daily snapshot run at the same time */ + /* List listPoliciesforSnapshot(long snapshotId); - + */ /** * List all snapshots for a specified volume irrespective of the policy which * created the snapshot diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 98356d4bc3a..f8c9dafb76e 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -59,7 +59,6 @@ import com.cloud.host.dao.DetailsDao; import com.cloud.host.dao.HostDao; import com.cloud.serializer.GsonHelper; import com.cloud.storage.Snapshot; -import com.cloud.storage.SnapshotPolicyRefVO; import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.SnapshotScheduleVO; import com.cloud.storage.SnapshotVO; @@ -74,7 +73,6 @@ import com.cloud.storage.Volume.VolumeType; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.SnapshotPolicyDao; -import com.cloud.storage.dao.SnapshotPolicyRefDao; import com.cloud.storage.dao.SnapshotScheduleDao; import com.cloud.storage.dao.StoragePoolDao; import com.cloud.storage.dao.VMTemplateDao; @@ -116,7 +114,6 @@ public class SnapshotManagerImpl implements SnapshotManager { @Inject protected StoragePoolDao _storagePoolDao; @Inject protected EventDao _eventDao; @Inject protected SnapshotPolicyDao _snapshotPolicyDao = null; - @Inject protected SnapshotPolicyRefDao _snapPolicyRefDao = null; @Inject protected SnapshotScheduleDao _snapshotScheduleDao; @Inject protected DetailsDao _detailsDao; @Inject protected VMTemplateDao _templateDao; @@ -915,7 +912,7 @@ public class SnapshotManagerImpl implements SnapshotManager { public List listPoliciesforVolume(long volumeId) { return _snapshotPolicyDao.listByVolumeId(volumeId); } - +/* @Override public List listPoliciesforSnapshot(long snapshotId) { SearchCriteria sc = PoliciesForSnapSearch.create(); @@ -929,7 +926,7 @@ public class SnapshotManagerImpl implements SnapshotManager { sc.setJoinParameters("policy", "policyId", policyId); return _snapshotDao.search(sc, filter); } - +*/ @Override public List listSnapsforVolume(long volumeId) { @@ -1009,22 +1006,6 @@ public class SnapshotManagerImpl implements SnapshotManager { _totalRetries = NumbersUtil.parseInt(configDao.getValue("total.retries"), 4); _pauseInterval = 2*NumbersUtil.parseInt(configDao.getValue("ping.interval"), 60); - SearchBuilder policySearch = _snapPolicyRefDao.createSearchBuilder(); - policySearch.and("policyId", policySearch.entity().getPolicyId(), SearchCriteria.Op.EQ); - - PolicySnapshotSearch = _snapshotDao.createSearchBuilder(); - PolicySnapshotSearch.join("policy", policySearch, policySearch.entity().getSnapshotId(), PolicySnapshotSearch.entity().getId(), JoinBuilder.JoinType.INNER); - policySearch.done(); - PolicySnapshotSearch.done(); - - PoliciesForSnapSearch = _snapshotPolicyDao.createSearchBuilder(); - - SearchBuilder policyRefSearch = _snapPolicyRefDao.createSearchBuilder(); - policyRefSearch.and("snapshotId", policyRefSearch.entity().getSnapshotId(), SearchCriteria.Op.EQ); - - PoliciesForSnapSearch.join("policyRef", policyRefSearch, policyRefSearch.entity().getPolicyId(), PoliciesForSnapSearch.entity().getId(), JoinBuilder.JoinType.INNER); - policyRefSearch.done(); - PoliciesForSnapSearch.done(); s_logger.info("Snapshot Manager is configured."); return true; diff --git a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java index de4d09af9bd..c3159c258cf 100644 --- a/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotSchedulerImpl.java @@ -17,33 +17,25 @@ */ package com.cloud.storage.snapshot; -import java.util.ArrayList; -import java.util.Calendar; import java.util.Date; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Timer; import java.util.TimerTask; - import javax.ejb.Local; import javax.naming.ConfigurationException; import javax.persistence.EntityExistsException; - import org.apache.log4j.Logger; - import com.cloud.async.AsyncJobResult; import com.cloud.async.AsyncJobVO; import com.cloud.async.dao.AsyncJobDao; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.event.EventTypes; import com.cloud.storage.Snapshot; import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.SnapshotScheduleVO; import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.SnapshotPolicyDao; -import com.cloud.storage.dao.SnapshotPolicyRefDao; import com.cloud.storage.dao.SnapshotScheduleDao; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.utils.DateUtil; @@ -55,7 +47,6 @@ import com.cloud.utils.concurrency.TestClock; import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; /** * @@ -69,7 +60,6 @@ public class SnapshotSchedulerImpl implements SnapshotScheduler { @Inject protected SnapshotDao _snapshotDao; @Inject protected SnapshotScheduleDao _snapshotScheduleDao; @Inject protected SnapshotPolicyDao _snapshotPolicyDao; - @Inject protected SnapshotPolicyRefDao _snapshotPolicyRefDao; @Inject protected SnapshotManager _snapshotManager; @Inject protected StoragePoolHostDao _poolHostDao; From 675106d3e578bff37a3158148316cb27ab008335 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 16:48:13 -0700 Subject: [PATCH 065/244] remove SnapshotPolicyRefDao from components.xml.in --- client/tomcatconf/components.xml.in | 1 - 1 file changed, 1 deletion(-) diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in index c455fc4dd15..22aed9cbe20 100755 --- a/client/tomcatconf/components.xml.in +++ b/client/tomcatconf/components.xml.in @@ -102,7 +102,6 @@ - From bca96b107966ee4f4d9e4feeb069d9d22ca6d735 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 17:18:27 -0700 Subject: [PATCH 066/244] pass guest OS name instead of guest ID when start system VM --- .../agent/api/StartConsoleProxyCommand.java | 13 +++++-- .../cloud/agent/api/StartRouterCommand.java | 9 ++++- .../agent/api/StartSecStorageVmCommand.java | 12 ++++-- .../xen/resource/CitrixResourceBase.java | 12 +++--- .../consoleproxy/ConsoleProxyManagerImpl.java | 39 +++++++++++-------- .../com/cloud/network/NetworkManagerImpl.java | 18 ++++++++- .../SecondaryStorageManagerImpl.java | 17 +++++++- .../src/com/cloud/vm/UserVmManagerImpl.java | 12 +++--- 8 files changed, 93 insertions(+), 39 deletions(-) diff --git a/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java b/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java index c1a0c31bb6e..08661de1d5b 100644 --- a/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java +++ b/core/src/com/cloud/agent/api/StartConsoleProxyCommand.java @@ -33,14 +33,16 @@ public class StartConsoleProxyCommand extends AbstractStartCommand { private String urlPort; private String mgmt_host; private int mgmt_port; - private boolean sslEnabled; + private boolean sslEnabled; + private String guestOSDescription; protected StartConsoleProxyCommand() { } public StartConsoleProxyCommand(int networkRateMbps, int networkRateMulticastMbps, int proxyCmdPort, ConsoleProxyVO proxy, String vmName, String storageHost, - List vols, String vncPort, String urlPort, String mgmtHost, int mgmtPort, boolean sslEnabled) { + List vols, String vncPort, String urlPort, String mgmtHost, int mgmtPort, + boolean sslEnabled, String guestOSDescription) { super(vmName, storageHost, vols); this.networkRateMbps = networkRateMbps; this.networkRateMulticastMbps = networkRateMulticastMbps; @@ -50,7 +52,8 @@ public class StartConsoleProxyCommand extends AbstractStartCommand { this.urlPort = urlPort; this.mgmt_host = mgmtHost; this.mgmt_port = mgmtPort; - this.sslEnabled = sslEnabled; + this.sslEnabled = sslEnabled; + this.guestOSDescription = guestOSDescription; } @Override @@ -66,6 +69,10 @@ public class StartConsoleProxyCommand extends AbstractStartCommand { return networkRateMbps; } + public String getGuestOSDescription() { + return guestOSDescription; + } + public int getNetworkRateMulticastMbps() { return networkRateMulticastMbps; } diff --git a/core/src/com/cloud/agent/api/StartRouterCommand.java b/core/src/com/cloud/agent/api/StartRouterCommand.java index 913745273ca..5654c570de9 100755 --- a/core/src/com/cloud/agent/api/StartRouterCommand.java +++ b/core/src/com/cloud/agent/api/StartRouterCommand.java @@ -30,6 +30,7 @@ public class StartRouterCommand extends AbstractStartCommand { DomainRouterVO router; int networkRateMbps; int networkRateMulticastMbps; + private String guestOSDescription; protected StartRouterCommand() { super(); @@ -41,11 +42,13 @@ public class StartRouterCommand extends AbstractStartCommand { } public StartRouterCommand(DomainRouterVO router, int networkRateMbps, int networkRateMulticastMbps, - String routerName, String[] storageIps, List vols, boolean mirroredVols) { + String routerName, String[] storageIps, List vols, boolean mirroredVols, + String guestOSDescription ) { super(routerName, storageIps, vols, mirroredVols); this.router = router; this.networkRateMbps = networkRateMbps; this.networkRateMulticastMbps = networkRateMulticastMbps; + this.guestOSDescription = guestOSDescription; } public DomainRouter getRouter() { @@ -56,6 +59,10 @@ public class StartRouterCommand extends AbstractStartCommand { return networkRateMbps; } + public String getGuestOSDescription() { + return guestOSDescription; + } + public int getNetworkRateMulticastMbps() { return networkRateMulticastMbps; } diff --git a/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java b/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java index 19c0f30882e..74bd7f3b5bb 100644 --- a/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java +++ b/core/src/com/cloud/agent/api/StartSecStorageVmCommand.java @@ -33,14 +33,15 @@ public class StartSecStorageVmCommand extends AbstractStartCommand { private int proxyCmdPort; private String mgmt_host; private int mgmt_port; - private boolean sslCopy; + private boolean sslCopy; + private String guestOSDescription; protected StartSecStorageVmCommand() { } public StartSecStorageVmCommand(int networkRateMbps, int networkRateMulticastMbps, int proxyCmdPort, SecondaryStorageVmVO secStorageVm, String vmName, String storageHost, - List vols, String mgmtHost, int mgmtPort, boolean sslCopy) { + List vols, String mgmtHost, int mgmtPort, boolean sslCopy, String guestOSDescription) { super(vmName, storageHost, vols); this.networkRateMbps = networkRateMbps; this.networkRateMulticastMbps = networkRateMulticastMbps; @@ -49,7 +50,8 @@ public class StartSecStorageVmCommand extends AbstractStartCommand { this.mgmt_host = mgmtHost; this.mgmt_port = mgmtPort; - this.sslCopy = sslCopy; + this.sslCopy = sslCopy; + this.guestOSDescription = guestOSDescription; } @Override @@ -65,6 +67,10 @@ public class StartSecStorageVmCommand extends AbstractStartCommand { return networkRateMbps; } + public String getGuestOSDescription() { + return guestOSDescription; + } + public int getNetworkRateMulticastMbps() { return networkRateMulticastMbps; } diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index aaa7962af8b..0185485acfe 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -1118,7 +1118,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR bootArgs += " pod=" + _pod; bootArgs += " localgw=" + _localGateway; String result = startSystemVM(vmName, storage.getVlanId(), network, cmd.getVolumes(), bootArgs, storage.getGuestMacAddress(), storage.getGuestIpAddress(), storage - .getPrivateMacAddress(), storage.getPublicMacAddress(), cmd.getProxyCmdPort(), storage.getRamSize(), storage.getGuestOSId(), cmd.getNetworkRateMbps()); + .getPrivateMacAddress(), storage.getPublicMacAddress(), cmd.getProxyCmdPort(), storage.getRamSize(), cmd.getGuestOSDescription(), cmd.getNetworkRateMbps()); if (result == null) { return new StartSecStorageVmAnswer(cmd); } @@ -3103,7 +3103,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR String bootArgs = cmd.getBootArgs(); String result = startSystemVM(vmName, router.getVlanId(), network, cmd.getVolumes(), bootArgs, router.getGuestMacAddress(), router.getPrivateIpAddress(), router - .getPrivateMacAddress(), router.getPublicMacAddress(), 3922, router.getRamSize(), router.getGuestOSId(), cmd.getNetworkRateMbps()); + .getPrivateMacAddress(), router.getPublicMacAddress(), 3922, router.getRamSize(), cmd.getGuestOSDescription(), cmd.getNetworkRateMbps()); if (result == null) { networkUsage(router.getPrivateIpAddress(), "create", null); return new StartRouterAnswer(cmd); @@ -3118,7 +3118,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } protected String startSystemVM(String vmName, String vlanId, Network nw0, List vols, String bootArgs, String guestMacAddr, String privateIp, String privateMacAddr, - String publicMacAddr, int cmdPort, long ramSize, long guestOsId, int networkRateMbps) { + String publicMacAddr, int cmdPort, long ramSize, String getGuestOSDescription, int networkRateMbps) { setupLinkLocalNetwork(); VM vm = null; @@ -3136,9 +3136,9 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR Ternary mount = mounts.get(0); - Set templates = VM.getByNameLabel(conn, CitrixHelper.getGuestOsType(guestOsId)); + Set templates = VM.getByNameLabel(conn, getGuestOsType(getGuestOSDescription)); if (templates.size() == 0) { - String msg = " can not find systemvm template " + CitrixHelper.getGuestOsType(guestOsId) ; + String msg = " can not find systemvm template " + getGuestOsType(getGuestOSDescription) ; s_logger.warn(msg); return msg; @@ -3293,7 +3293,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR bootArgs += " localgw=" + _localGateway; String result = startSystemVM(vmName, proxy.getVlanId(), network, cmd.getVolumes(), bootArgs, proxy.getGuestMacAddress(), proxy.getGuestIpAddress(), proxy - .getPrivateMacAddress(), proxy.getPublicMacAddress(), cmd.getProxyCmdPort(), proxy.getRamSize(), proxy.getGuestOSId(), cmd.getNetworkRateMbps()); + .getPrivateMacAddress(), proxy.getPublicMacAddress(), cmd.getProxyCmdPort(), proxy.getRamSize(), cmd.getGuestOSDescription(), cmd.getNetworkRateMbps()); if (result == null) { return new StartConsoleProxyAnswer(cmd); } diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 02f927bc0ca..85c617fdb03 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -107,12 +107,14 @@ import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; +import com.cloud.storage.GuestOSVO; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateHostDao; import com.cloud.storage.dao.VolumeDao; @@ -218,24 +220,16 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach @Inject private AccountDao _accountDao; - @Inject - private VMTemplateHostDao _vmTemplateHostDao; - - @Inject - private AgentManager _agentMgr; - @Inject - private StorageManager _storageMgr; - @Inject - private HighAvailabilityManager _haMgr; + @Inject private VMTemplateHostDao _vmTemplateHostDao; + @Inject private AgentManager _agentMgr; + @Inject private StorageManager _storageMgr; + @Inject private HighAvailabilityManager _haMgr; @Inject NetworkManager _networkMgr; - @Inject AccountManager _accountMgr; - @Inject - private EventDao _eventDao; - @Inject - ServiceOfferingDao _offeringDao; - @Inject - NetworkOfferingDao _networkOfferingDao; + @Inject private EventDao _eventDao; + @Inject GuestOSDao _guestOSDao = null; + @Inject ServiceOfferingDao _offeringDao; + @Inject NetworkOfferingDao _networkOfferingDao; private IpAddrAllocator _IpAllocator; private ConsoleProxyListener _listener; @@ -651,13 +645,24 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach throw new CloudRuntimeException(msg); } + // Determine the VM's OS description + String guestOSDescription; + GuestOSVO guestOS = _guestOSDao.findById(proxy.getGuestOSId()); + if (guestOS == null) { + String msg = "Could not find guest OS description for OSId " + + proxy.getGuestOSId() + " for vm: " + proxy.getName(); + s_logger.debug(msg); + throw new CloudRuntimeException(msg); + } else { + guestOSDescription = guestOS.getName(); + } // _storageMgr.share(proxy, vols, null, true); // carry the console proxy port info over so that we don't // need to configure agent on this StartConsoleProxyCommand cmdStart = new StartConsoleProxyCommand(_networkRate, _multicastRate, _proxyCmdPort, proxy, proxy.getName(), "", vols, Integer.toString(_consoleProxyPort), - Integer.toString(_consoleProxyUrlPort), _mgmt_host, _mgmt_port, _sslEnabled); + Integer.toString(_consoleProxyUrlPort), _mgmt_host, _mgmt_port, _sslEnabled, guestOSDescription); if (s_logger.isDebugEnabled()) s_logger.debug("Sending start command for console proxy " + proxy.getName() + " to " + routingHost.getName()); try { diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index bd79579bdf1..4d3958e3ad5 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -120,11 +120,13 @@ import com.cloud.resource.Resource; import com.cloud.resource.Resource.ReservationStrategy; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; +import com.cloud.storage.GuestOSVO; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.DiskTemplateDao; +import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.StoragePoolDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateHostDao; @@ -212,6 +214,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager @Inject NetworkOfferingDao _networkOfferingDao = null; @Inject NetworkConfigurationDao _networkProfileDao = null; @Inject NicDao _nicDao; + @Inject GuestOSDao _guestOSDao = null; @Inject(adapter=NetworkGuru.class) Adapters _networkGurus; @@ -984,8 +987,21 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager try { String[] storageIps = new String[2]; + + // Determine the VM's OS description + String guestOSDescription; + GuestOSVO guestOS = _guestOSDao.findById(router.getGuestOSId()); + if (guestOS == null) { + String msg = "Could not find guest OS description for OSId " + + router.getGuestOSId() + " for vm: " + router.getName(); + s_logger.debug(msg); + throw new CloudRuntimeException(msg); + } else { + guestOSDescription = guestOS.getName(); + } + final StartRouterCommand cmdStartRouter = new StartRouterCommand(router, _networkRate, - _multicastRate, name, storageIps, vols, mirroredVols); + _multicastRate, name, storageIps, vols, mirroredVols, guestOSDescription); answer = _agentMgr.send(routingHost.getId(), cmdStartRouter); if (answer != null && answer.getResult()) { if (answer instanceof StartRouterAnswer){ diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 11fa385eb02..ae4d6672d5d 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -89,12 +89,14 @@ import com.cloud.network.dao.IPAddressDao; import com.cloud.offering.NetworkOffering; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; +import com.cloud.storage.GuestOSVO; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.StoragePoolDao; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.storage.dao.VMTemplateDao; @@ -205,6 +207,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V @Inject private EventDao _eventDao; @Inject private ServiceOfferingDao _offeringDao; @Inject private AccountManager _accountMgr; + @Inject GuestOSDao _guestOSDao = null; private IpAddrAllocator _IpAllocator; @@ -373,11 +376,23 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V } VolumeVO vol = vols.get(0); + // Determine the VM's OS description + String guestOSDescription; + GuestOSVO guestOS = _guestOSDao.findById(secStorageVm.getGuestOSId()); + if (guestOS == null) { + String msg = "Could not find guest OS description for OSId " + + secStorageVm.getGuestOSId() + " for vm: " + secStorageVm.getName(); + s_logger.debug(msg); + throw new CloudRuntimeException(msg); + } else { + guestOSDescription = guestOS.getName(); + } + // carry the secondary storage vm port info over so that we don't // need to configure agent on this StartSecStorageVmCommand cmdStart = new StartSecStorageVmCommand(_networkRate, _multicastRate, _secStorageVmCmdPort, secStorageVm, - secStorageVm.getName(), "", vols, _mgmt_host, _mgmt_port, _useSSlCopy); + secStorageVm.getName(), "", vols, _mgmt_host, _mgmt_port, _useSSlCopy, guestOSDescription); if (s_logger.isDebugEnabled()) s_logger.debug("Sending start command for secondary storage vm " diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 2d4711916a1..0112d6e454f 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -678,14 +678,12 @@ public class UserVmManagerImpl implements UserVmManager { String guestOSDescription; GuestOSVO guestOS = _guestOSDao.findById(vm.getGuestOSId()); if (guestOS == null) { - String description = "Could not find guest OS description for vm: " + vm.getName(); - s_logger.debug(description); - event.setDescription(description); - event.setLevel(EventVO.LEVEL_ERROR); - _eventDao.persist(event); - return null; + String msg = "Could not find guest OS description for OSId " + + vm.getGuestOSId() + " for vm: " + vm.getName(); + s_logger.debug(msg); + throw new CloudRuntimeException(msg); } else { - guestOSDescription = guestOS.getName(); + guestOSDescription = guestOS.getName(); } HashSet avoid = new HashSet(); From 43bd6d1d2d321935f2ecd7221405408cb4303f0c Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 17:23:38 -0700 Subject: [PATCH 067/244] remove guestOS list --- .../hypervisor/xen/resource/CitrixHelper.java | 65 ------------------- 1 file changed, 65 deletions(-) diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java index 23de8d0a0af..f89ff8ff57b 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java @@ -90,74 +90,9 @@ public class CitrixHelper { _guestOsMap.put("Windows XP SP2 (32-bit)", "Windows XP SP2"); _guestOsMap.put("Windows XP SP3 (32-bit)", "Windows XP SP3"); _guestOsMap.put("Other install media", "Other install media"); - - //access by index - _guestOsList.add("CentOS 4.5"); - _guestOsList.add("CentOS 4.6"); - _guestOsList.add("CentOS 4.7"); - _guestOsList.add("CentOS 4.8"); - _guestOsList.add("CentOS 5.0"); - _guestOsList.add("CentOS 5.0 x64"); - _guestOsList.add("CentOS 5.1"); - _guestOsList.add("CentOS 5.1 x64"); - _guestOsList.add("CentOS 5.2"); - _guestOsList.add("CentOS 5.2 x64"); - _guestOsList.add("CentOS 5.3"); - _guestOsList.add("CentOS 5.3 x64"); - _guestOsList.add("CentOS 5.4"); - _guestOsList.add("CentOS 5.4 x64"); - _guestOsList.add("Debian Lenny 5.0 (32-bit)"); - _guestOsList.add("Oracle Enterprise Linux 5.0"); - _guestOsList.add("Oracle Enterprise Linux 5.0 x64"); - _guestOsList.add("Oracle Enterprise Linux 5.1"); - _guestOsList.add("Oracle Enterprise Linux 5.1 x64"); - _guestOsList.add("Oracle Enterprise Linux 5.2"); - _guestOsList.add("Oracle Enterprise Linux 5.2 x64"); - _guestOsList.add("Oracle Enterprise Linux 5.3"); - _guestOsList.add("Oracle Enterprise Linux 5.3 x64"); - _guestOsList.add("Oracle Enterprise Linux 5.4"); - _guestOsList.add("Oracle Enterprise Linux 5.4 x64"); - _guestOsList.add("Red Hat Enterprise Linux 4.5"); - _guestOsList.add("Red Hat Enterprise Linux 4.6"); - _guestOsList.add("Red Hat Enterprise Linux 4.7"); - _guestOsList.add("Red Hat Enterprise Linux 4.8"); - _guestOsList.add("Red Hat Enterprise Linux 5.0"); - _guestOsList.add("Red Hat Enterprise Linux 5.0 x64"); - _guestOsList.add("Red Hat Enterprise Linux 5.1"); - _guestOsList.add("Red Hat Enterprise Linux 5.1 x64"); - _guestOsList.add("Red Hat Enterprise Linux 5.2"); - _guestOsList.add("Red Hat Enterprise Linux 5.2 x64"); - _guestOsList.add("Red Hat Enterprise Linux 5.3"); - _guestOsList.add("Red Hat Enterprise Linux 5.3 x64"); - _guestOsList.add("Red Hat Enterprise Linux 5.4"); - _guestOsList.add("Red Hat Enterprise Linux 5.4 x64"); - _guestOsList.add("SUSE Linux Enterprise Server 9 SP4"); - _guestOsList.add("SUSE Linux Enterprise Server 10 SP1"); - _guestOsList.add("SUSE Linux Enterprise Server 10 SP1 x64"); - _guestOsList.add("SUSE Linux Enterprise Server 10 SP2"); - _guestOsList.add("SUSE Linux Enterprise Server 10 SP2 x64"); - _guestOsList.add("Other install media"); - _guestOsList.add("SUSE Linux Enterprise Server 11"); - _guestOsList.add("SUSE Linux Enterprise Server 11 x64"); - _guestOsList.add("Windows 7"); - _guestOsList.add("Windows 7 x64"); - _guestOsList.add("Windows Server 2003"); - _guestOsList.add("Windows Server 2003 x64"); - _guestOsList.add("Windows Server 2008"); - _guestOsList.add("Windows Server 2008 x64"); - _guestOsList.add("Windows Server 2008 R2 x64"); - _guestOsList.add("Windows 2000 SP4"); - _guestOsList.add("Windows Vista"); - _guestOsList.add("Windows XP SP2"); - _guestOsList.add("Windows XP SP3"); - _guestOsList.add("Other install media"); } public static String getGuestOsType(String stdType) { return _guestOsMap.get(stdType); } - - public static String getGuestOsType(long guestOsId) { - return _guestOsList.get((int) (guestOsId-1)); - } } From f31f8adde5af7c31f93477e44a9f9c36c34177c9 Mon Sep 17 00:00:00 2001 From: NIKITA Date: Tue, 28 Sep 2010 17:49:09 -0700 Subject: [PATCH 068/244] issue in Instance popup --- ui/css/main.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/css/main.css b/ui/css/main.css index 6c1b0dd20a1..2630d7b8adb 100644 --- a/ui/css/main.css +++ b/ui/css/main.css @@ -5433,7 +5433,7 @@ a:hover.add_newtemplatebutton { left:10px; background: #FFF repeat top left; border:1px solid #CCC; - z-index:1000; + z-index:1005; } .vmactions_dropdownbox_closebutton { From 6761a96b30f97a6bff677a77c5a36465ec2f05f8 Mon Sep 17 00:00:00 2001 From: NIKITA Date: Wed, 29 Sep 2010 17:35:13 -0700 Subject: [PATCH 069/244] New Ui for Dashboard User --- ui/new/css/main.css | 94 ++++ ui/new/images/db_accounticon.png | Bin 0 -> 500 bytes ui/new/images/db_runningbg.gif | Bin 0 -> 384 bytes ui/new/images/db_runninicon.gif | Bin 0 -> 3505 bytes ui/new/images/db_stoppedbg.gif | Bin 0 -> 393 bytes ui/new/images/db_stoppedicon.gif | Bin 0 -> 3575 bytes ui/new/images/db_totalbg.gif | Bin 0 -> 626 bytes ui/new/images/db_totalicon.gif | Bin 0 -> 3590 bytes ui/new/images/dbaccounts_headerbg.gif | Bin 0 -> 189 bytes ui/new/jsp/dashboard.jsp | 663 +++++++++++++++++--------- 10 files changed, 524 insertions(+), 233 deletions(-) create mode 100644 ui/new/images/db_accounticon.png create mode 100644 ui/new/images/db_runningbg.gif create mode 100644 ui/new/images/db_runninicon.gif create mode 100644 ui/new/images/db_stoppedbg.gif create mode 100644 ui/new/images/db_stoppedicon.gif create mode 100644 ui/new/images/db_totalbg.gif create mode 100644 ui/new/images/db_totalicon.gif create mode 100644 ui/new/images/dbaccounts_headerbg.gif diff --git a/ui/new/css/main.css b/ui/new/css/main.css index 77b46d49ab2..57d80b0c569 100644 --- a/ui/new/css/main.css +++ b/ui/new/css/main.css @@ -2905,4 +2905,98 @@ a:hover.search_button { padding:0; cursor:pointer; cursor:hand; +} + +.db_resourcebox { + width:75%; + height:126px; + margin:5px auto; + padding:0; +} + +.db_resourcebox_top { + width:100%; + height:75px; + float:left; + margin:0; + padding:0; +} + +.db_resourcebox_iconbox { + width:50%; + height:75px; + float:left; + margin:0; + padding:0; +} + +.db_resourcebox_icons { + width:90px; + height:53px; + margin:18px auto 0; + padding:0; +} + +.db_resourcebox_textbox { + width:50%; + height:75px; + float:left; + margin:0; + padding:0; +} + +.db_resourcebox_textbox p{ + width:auto; + height:auto; + float:left; + font-size:13px; + font-weight:bold; + color:#333; + margin:40px 0 0 0; + padding:0; +} + +.db_resourcebox_bot { + width:100%; + height:51px; + float:left; + margin:0; + padding:0; +} + +.db_resourcebox_VMnumber { + width:100%; + height:auto; + float:left; + font-size:21px; + font-weight:bold; + text-align:center; + margin:0; + padding:0; +} + +.db_resourcebox_VMnumber span { + font-size:30px; +} + +.db_resourcebox_VMnumber.running { + color:#687201; +} + +.db_resourcebox_VMnumber.stopped { + color:#c10202; +} + +.db_resourcebox_VMnumber.total { + color:#064f88; +} + +.dbaccounts_rows { + width:100%; + height:21px; + float:left; + background:#cccccc; + margin:0; + padding:5px 0 5px 0; + border-bottom:1px solid #999; } \ No newline at end of file diff --git a/ui/new/images/db_accounticon.png b/ui/new/images/db_accounticon.png new file mode 100644 index 0000000000000000000000000000000000000000..5f32d56731a0aa9ea37028f906ee400d161facd8 GIT binary patch literal 500 zcmVdZoEbojA3uJ4 z00{rmb) zpFVlQbaHWV-3DS;VE8`-@j;=(glsg>0AC=s1}b8JVPH^#!ngw632?y1#MhR`xg|5 qoD77)f1s^QEKny9qX7iIfCvCaKgWn2M<3e&0000r;{PX9}uV25ueEIVI`}dnSZ{E9i z@4A}|MBC;A3uIP zdGh4lyLZo?J-c=5*8ThUU%h(u{Q2{T4U)TOo^Y6g>-#=9wn|NDVTO~R=I|X`rd&MVAoG3kI>Qto}Geu_4nIk-Z z!2t!}>+N82|o79e-J9+l(-K%!spyJ^p+{ca|mpgTu>+HF6 d{1-1>Qoedk=*G>PvUl!s-hc2w{jnp1H2~QI$ff`Q literal 0 HcmV?d00001 diff --git a/ui/new/images/db_runninicon.gif b/ui/new/images/db_runninicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..8850a30e58949783de9c1f046a548ff113eb3518 GIT binary patch literal 3505 zcmV;i4Nme$Nk%w1VOjt+0QUd@|NsB~{{Hp#^&6JY>+9>Osi}<2jtXf#M3$H?AP-0^5Nm(_V)JW^Zoq%{L<3W0000S zDlq`X@!j3sdW{Eb(es($_=3~&*4EZz&G8DU;#bJ(-17VY$nx3Q*(D?+5vby$-T5lH z>S>v)oZR(^%HMK^23gYitmOK#;rwA@W0czXi`nyd)ASS*6Oq&G6Q$xv$L;v|`1<<# zoZR_|)$)SC)w1IBD$Da5v*%jQ^aHBi((e1A-1Q(aID^>p@9*zX%<*E-^a`ZhoSdAK zlauiJ{X5C+zUKV^!ti;s#cO{Af4$Li)9j++^b;K+h{oGX&hrMo@n*^FXwvL`xy^yN zumZH>sp9u|dU^oI?UUE@CYsV6$M40_U!mdqOsm<9-1u_N?+vKoB*OCmy6S?|`3=VP zA;|M8%k6r$$$irI3#Z_+;P#813KOjAeA)Js%G-gH2!@ymmZm0wjwF=B%?_&McCf;2 zfdv4^^=)^0zRn_biWiaB`8%lFrPS)F-}_>Un6c;j0J!B14Gg>O|Am_kRJx4fWYxZeN&_5{iLxx<4E!S)i# z_JfU)E-x={ZEffA^@i8@WNtCD+38GYa<=IBzv%Xun3zq~@k2pBUu_iy!S?(A{5w27 z3LPMLf`$G4{THO<^YinNkdTdxjlAIR^Y-^Y%=CZC>Qch(PrdRNyYXMc><7r^=;-Kr z*!}0{=O7>=A^8LV00000EC2ui09pVw000R8009UbNU)&6g9L>ML&&h9!-o(f8We`3 z&lo@$^HAx7rI*ByAVW6XwFgkL9v*P0Oo7A0o>N=Ih@46Dp|DS|IAZbOfy}s{WXSQv zu_tEDqey$z*s_ycsUk&6m70=h>XcGM$YI$s4r$E*V8e^%OsG?npipA;;xt9}tm>gAOOH;SXsf}!hluS?boSuR60A!v*NTbhNzI(O zp2Wz>exkLf2aq1Lt7G4ur90HxJ-YAzQFA9s^u8tZgjmnMJ$pT^&x74n0}7DtK!Dh{ ze;I-ui@I&wkGFbM=Hi9{4z9HGW19w6`!3!sL| z!UYr5VQM$18lh^Mkuc!utFXrZ>Z%2PPB=pnQS^ZX5>WI|K_9i$vPBe^-hl)yI1tfC z6j6MG#5Y@H+6ftn$nc>Npsu0qwk@=?%{J|XTgN5j`eN=VvZf0wB(*AegCLB2BW$y@ ztWpXcM+kyMDP*XD0~A{@GD9tx3K9h^JsdH^76#9-4h!u3@PH%~SA4+57-xL3A{=+@ z@y8y!qr%7}m#ohW3m+oL4Dfzqa0TONCB`l(>~ZT1j2xo!uu;r#NX~*B(hmqMv;cu2 z4mVpneYDSm|Q z2Nq(8k%9+NoDxF}VaIUFA*XPVM(UOC4FM&v#~yneh1V{H28Ble!|uHI?)&c8M6N;# zZ&Y!^=*TB;x*uK~LB=O!RDc8)rQGcW9HYa*OAK)Mk^J72m?8f7;)j3x?Hb^oz8snS z?*8th5VQ3&_P}C=6)||B|Ni{f-~|U{@B{N|@P=fl0ShyzK@FNw11l)d3%uYT_zXe5 z3I>i1>C0gHA|QkgdhmlF{J{M5(S$Bo0Tm{^p9=5Sg=AR43q?3ZGTP7vD-59vLpX#e zWZ*y>qQZqKyx-pc%n%1d81aZlGy@tmr~wRW-~k*2p%jH+ff8)(25sm<18B&_F4Ay| zUFZP^j}B21&?5 zR>A`E)7laWu?z($pb7ODgCi$7$$Hd-16!!aGR825NK&#M3gEyvhG0oYf^w2XYsDT1 z$I4c&QVM_kBNTCQhFaS447m7!6-oAlCwK!Ec~Af$mQe^oD1ZvcOeQi5(Eu4xVHs4& z12mE8$Yo5k4QlYhDHOm+Wu}sLtqdnCVHpHcnDdIAqb%jZRCNV1`Vhz_F)driQ=IBOeNuLM^W2pfD}QvUW0b)K zmiR_XPg({$0K*)NkU<|#F@$9R!wz^=Lkh_7(!K(tsj%!LDPkGR^pU~CJ+V-4+4Z>m>o7g3I;vbH6f^df$*+979xX5)u8BCjvGKk=~Nic>q^3V)Tpkk+% zQ0`1!U<()I!?`;ZK@1w;0uhwK5=}j9RoA;w#$w>T@Wp@ud<)zS5O=ssn8R_)z+YR~ z;;hPDsT~?H1YppOye$}k6JjDQ(eh{i1@;S6Rl0~8W212W3s2J;dk8T(By zh?mUdCcpO%p4h>N@9T{(i~t&LP_dRp@C!hcViz8Og)9CriAltQ2k$V&A4XtLO=v>P;I~^Pv2ZtG3L7{B#VSsRa|v+_ zIFw=r@4&GQ-rf-#3JSZ3Q!#57jAeMJ3R4&THE^8xX$$t zX2I)O_)Q%D(1m>!&52Y@ViA8}0yIF;;9tN37SZU!EB?TPYFoS7HpsTN9ewR?`=AOu zxP++2P404siW}2d2M9pG4Q>Q`8Z;m=3Q#}~MrS(~Hdq7`n30bvm|_G?h{eA_O>j{E zAr`Ti#2-XGiGmmW3p{|u7gTY9P?-DTQX9X+F z%!6q7z|9UPI3iv#i7(WA<}nBLE51;LNg!Ya1(<-)hfegO8-3{VfRmi!0fr5%-~}U( zItq%-gGI#o)06l#E2@y~Zd)7F_#VM4oN;Ea^8gX}t^xvnzJj*9{q1m%yWHKr_K-_` zKE3V2gB{_qU~}QM{fbz;LKSO|yyPcO`N~_K0C$hNH~5f> zFCfAdOc;SHZoveFFFxCdK*S_wUgk-h-Uf(p#>}N)`P$pQ@+&Yw=B4fpPE>;rz~{pz z20;Ac8-Daf+(1RBgh3E$bn#R z0xB4TGFXD}P=huI4LIl?0Z(1cF-gisiT zQOF|>KmZQ-fLMry4(Ja?NP;z}gE+DyP{ztZTJF&NQm%91BjT2inxgISBQj;*oJ60hjr+LcgO`k z_=7eWhJM(DfGCJ-=!ox^h~+nmiTHkw$cB;V4`ld+J#r&?h>7r^iBH&xo~VY7_yVE0 zh~>A4G+>ISxQ1~kiL7WNuGoXdsDxtphqPFWY

    #=!|a|hZ!J=lh}lnSd7M)joFBd f$ry!nNQX2Mj^e0_-&l=yc#W2*jp~?#0RaFzU<1mx literal 0 HcmV?d00001 diff --git a/ui/new/images/db_stoppedbg.gif b/ui/new/images/db_stoppedbg.gif new file mode 100644 index 0000000000000000000000000000000000000000..b0fe3b9c88326ed53eb81974a7258d340396b539 GIT binary patch literal 393 zcmZ?wbhEHbWM=4OxXQrr^y$+lPo6w}{P@wMM-Lu6xOVN@{{8zeUAlDc+_{}QcOE)) z=*Ep3ckbM|ef##UTet4ryZ7+n!z)*=+`oVS?%lg5PMo-K;lkOoXV0HMf8fA@y?gf_ zKYskkkt4fy?K*Sj%*BfrFJHcV{rdH*SFi5dx9{}n(>HJ4Jay{S?%lih?Aded*s;Th z51%}Fa>tGxM~@!ezJ2?_g9jN%2Z}#gz?yVGB*;$;Y|9)P3OsbA`cEtolFYE0AJACh zHI;AOjW?o)-j;Db*dU>!Is0t?mMGiI-FJI-#N1nP`)%KzIR96_#TyzM6o<-J)&PK1%@_ax literal 0 HcmV?d00001 diff --git a/ui/new/images/db_stoppedicon.gif b/ui/new/images/db_stoppedicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..52248916ee8c02038d8cac2f82959feaa8de8631 GIT binary patch literal 3575 zcmVlq%W^2vO&E4JIRn7Dm$?`{4 zSxC(D+S=N?ySq5c@`Z(k+1c6H*w}K^^Tox*!NI}e;^H$nIm+t#0K@Ca2M44E1_r9( zxd;e^mYdlI2Al;2*4EZsY;nrU$^ZZW9V;;h%2p$ns-jWYEyio7?mesN!XHdZOL=TF~~aRA$jFn~ z^_1KB6Q$x;#qH+>1&k*tA~HC#;ryc9^-09-lf%?dyW)G!=ZV$xoZI=`^8MW7=6H&b zvf}iM+4C;D>}z>_uCA^dv*)Y_2Ub*8iJhdI;P*Pp>jSFZD$DcHN=nwUvTc8ba?$NI zK}4~!v0~8l3Z&e|-R7K}oRgE2zUKXEdVv7K@PgR%qT=)u9U)83^9H{0rKP1yOH23t z`~tM&d3kta$?B=%_W;N3P+nuD6&4-G?;n`dq2c@~%I;`)evRAsXVdF7KSB+t;UvTK zlh*S9y6S?|`6n(hA;|L$#`S&D_tNhBhS%>nqSV^N#0#h3vf%b&ad#7}>X;G|eA)J4 zx884ohYSr34yxqn8X5q{^{LV zUvGATK0(pj;0Vg^=IH67*XVhMiwv&d1jqDnf{A&7gsI~14Z7?C$M?${8|v!n;6ptmH7w^=y8Et_lhPwCM}5&{78Z_;j(ajPbiCfa==j;$*b>S11;O@u*!^~gju*S}3LPL9q~vjHaByyJb$)@E zn3z7y^9RW0A^8LV00000EC2ui09pVw000R8009UbNU)&6g95=FJH`v4!-o(fN}Onr z*9Arn2CZ79XH|(@duxp0)4YMml{S{Y$uhC6gV;0^&q z=9%Y(Zk-dv5*sqYNi2U55`~w4a1w>0KKw*Tp`38?gQ1M9@dF#4pkWF+BXsKN2vTuxdtFXrZ>S`AORAB3^xK?mZIZONzMHEaJ_(v?Utg%ECOZWh6 z6FK~`#1i8~G0qxm{ILldkYr)R4>EMx#<$>-z>h3X_#%uj{7f-LI-`sdLLRcl3u`sG z)>{SwhEOt2vCz`cN+@>tU`Q09put8HOsqjk3$avc$P%#J@Iwo0jI%@w;*5Y#7$K;u zZaS>U(t#`_mn?Dz9YABn$}G3+^2*TEn`;s+P+X27E#y1S!#;Ro77TJU!AA=`v_Od> ziWp+-#fltlh$8h^Faik*6yRQ_g9H+k zL-gAcw4ewlO~@e!3`P|H&BNb-xBYiHJb|yyh;XtxF|U1OfZ>)X$#67(Sqp=?_sX5=!A?Obq7=r}R0EX+mpbleT!y;NRh8Ha31vq#?0BiBT z#HlZR1;9lb{NRV-*`R~D_<#sUNWu~}uL3$qVG5Uo00f)@0s4z!3{Qar1dO2w5_o|d z+@L=img5syh+q%@Ye>TwTCe~}Okx4>fJ7$RV1pctqCSRD!YYc80FF?h3X|Z5Q!Ky@ zU)-S>#khbk-arBf_+lCt;6*lO!4nA3!VwVQ27ipv4T(cy2$aaj45on6(=zpM(RKp9B}|5oY4nFIDiYtOeQk>uz)OZ!5Li8 z12nnNhe$eOnr>jj7)s%QM=CRMm3!qYap8w&JY$yUL?<(HF$7(%qaE+yhA&sR3q8<+ z7757bJo3r^&wj390SVXzA`mf;dFX+l1`Q}J{-KRUz~B=H?Wfd;0L$W8^r9EF0WH7q z1xs+WqaN+(6G&hS3(R1iWdKDCR=Uz;#J~i1&_oRG0E|T3AqH+JMNE@H(_+lS1To;k zDI^euEU7aVVHetB%afm1kR7k3Ek!O$?%!tP?CHedxH0hxxz zGFGvT{bMk?M%l^Q;|XKkfms=O0C=e3rD_E#P-RL}oZ{dPZAAnQ{_uw}IO7f`00vBF zdX0JitkeO9h`~HC5QAb&)DMJYtYahlN66Z;YxWqxWx00QL!d*m2Z*k8J6i}7SogXn zP=jo-p#}_Cmj}S0h8~u|iBtSk6WP6~31(q}dvy1w7)ZeaOn?D3XyUhE1*u23%F&SW z_Y1+Whkyqx-~nLvxeb`Ebh9xB>#E_wvzP^3v-{FJEC2_)kN^+nYl1@D!xe=H@hpl_ zj5mljyCz741oW_8HB9siPoOMilbc)_8~6!0&hceC;9Te`_y8){LLnyn;3ChWzSxMx z1!$0hRj6SO%GiK1wjhmHV4@kyPzESWtcGN$;SKdwt%E1ZiX5By375rjn$e8o8(&uc zz&Pe{34E+zU65e|(Rf3V_lyBz3?dYAxWFn>AqY%h0u?pLhbRQG0Ty7Q27=gvGF$3bN~yW4z;L9O=>Kl3}vR?h6T`3)*nZ=5j9{zGlpDbdUSUX2mnMV zT9A(^vmhVM*uWMx&}czCVgt>n0T8yZY)MFB4xj)90*LX3Kxm8zfe3@PwVmxSbUP5> z_BOY*-Mhvq;1cMtMS@+81X5r^5`q9iG(ZtzVywae(l~-D1W|*2`@7#P2)Mvy{qKTH zp$ava!lxF_@P>Qp5OENP1uS3<=h`9;25|KOywM0z1RNDCkc23dagQp9VgpD2Ks2#e zzH&jJ0u`7Lgt0Nfa+Z^!22vn{DXwq{hx@$Y77&NTtznH4h=U3s(D(t&K?+GgI_9o$ z#i45;4Jkaj<|}`MDlkC?u4^6Z#8w3vs(=X*%m5A#NW0qC&i1ye-5qd}lRL~X0TiI% z$2sZ-DQX}INe>$n!*)d#0$y-`6C30kP(?EkUHBS20_0UNh1q3fcNDOr@++vk;E#9&CbVv7OkAG@k7$Pf*2&R>(U+h2 z=NCcxgJ1q0r2qWx7eVspuZwO};sp3VK_m9C2Lbs1|Nqy2062gI_uDd-LjFarkQ zf+iS)D_|oWSc5irgB(}^aNs69$b)BqgE_(@LO6s(ScFD+gh*I~0nh+U*o01a07)2y zQaFWFD1|ye1z4DcS_lGF$RiQ(gNhHw~%atMYX zP=|JShaeD#44?zXH+oz+hk%HOAg}_2I3t&*d6frxinxfOhlrijHzO;+4h@inVo-^e z*Z^YihJZ+icUXvr_<5iggE82L?pKPYXo`I(iYBOtnkOTKh=*}lhn}c;p*V`dSBeuz zfe*Ngyx5Bmn2Qroio++0jrfSKXoqGPiJz#5qIiq$H-WzBgwi;TOz4XfD2%~JjK%1R zD-2!pB^krJtj4@r;($&JUDklq*&06VapqKp6l literal 0 HcmV?d00001 diff --git a/ui/new/images/db_totalbg.gif b/ui/new/images/db_totalbg.gif new file mode 100644 index 0000000000000000000000000000000000000000..1efccb50c343badb95d60c57692905565cd47950 GIT binary patch literal 626 zcmZ?wbhEHbWM=4Oc*el+;@jUxpME|2`se`|iiR4?l0e{r=?3@26jWUw-lV$i26R@4Y$uZeW!toQGyk^j%sY4O-l?}w`oKZK!$)+F*`ClkC4T0t{&|6mmsGE?U%P%? z_SS8&yZ1OAJbbA6MCsXc`IoPp-x$5)`S8*Dv(s0*?@~X1@&5U1_MeN1i^p+8LT|IM zkXFfo4G(+UWt6*4;*7)Q aXC1RGN?$BFuvxurzC$O6s-uYjgEav8-Y8Q5 literal 0 HcmV?d00001 diff --git a/ui/new/images/db_totalicon.gif b/ui/new/images/db_totalicon.gif new file mode 100644 index 0000000000000000000000000000000000000000..643beb20a13a5c55bd462227913c5581d3355899 GIT binary patch literal 3590 zcmV+h4*Bs%Nk%w1VOjt+0QUd@==S{@md^#I+l9l}+3faK&GgdJ(x#@Shq}s)%;U7R zw&(TzNzC(vgoQZE@)*hT%F4)hdDQgH-Q^Le;z-8reu#{t-T8^i-zvH4tmOKf-1TXhtXk0a=l1=S+xT~Q zc}c3-6Q$zk_57UN`IFJ=vf=!*;`H9{_=(l>u*A-Pz0x5uIE&fyh{oJqf{vNs_#3n5 zrP1D@-1SOJOXc+ZD$Dbg%G=xR_gBX5g4pw7(e%^g?V{rKoSd9ld4-gel;rdKz2^M@ z!ti;s#mCm(I?3#F)9e!+Ay!mYO3w4tm|eVlh^Wb%IqD-?vf%c^(byBL>U`Pu=JfpC=DN+}G*zI;Y!hcX|NF^{Lh}BX_x-8j?+mWsud%TWy6o!r{Q}4LFwOP^#_$2H z-e=SM39RHGAtHs$?#0yG0kr80u;jnR#{|jx4Z-$~j*s8!@8In6Iy*gu*!UN_@#XgY z!-o(fN}OoW znj$P@=D?a`N6@Pa$ta2(N%CP3Cv!~HxRlQwGj`1`&gV?MWg+M3ST;j3hBCA_>QZOIWs0UCXv@+XZmr z%AHFWZZk4PF5mz=mJwGXqx>=&D-DM|944C8UCg+#V-i$0x3CGHZ78$uegm zmIi~F!3?tL)2Qd}A(H1)jV)1Xd~&^I%j_*UVt;be`co8XGm@nqJ~xQ*VWpMI9B=>^Tyo*Xm*s@nfDdGr>BBqkDC2?))bw*>dZ%1*1cXO`atj}H zERi7}pe)fRD2iM_2cDpSLgW%hq|?I|qg=2`HzY(VDG6tcNoJaBu6f285p?Ql1RHG7 zO*a@!QVuldL89uatgdoo5s2pL3o|(IaYUj^q=Q8|e0%~1 zBThW%LZoIyE3E`R%tHeW4UE~zw#5|F$G6~qD+MmNL@-GNaj-hYy6m>Q?gdx;@klzl zChChNlDN^sA4^CA#uoVqfyE;!+;RjKe;naU4LziQ@DVAXLqa<`AVA5*7~2AcEgEyI zF%%$gEb_-1cR{K+?xyVS6)8AO$R8=ln@++LjAD->q_ojY9x1?(!Xt#dyeq_n0R0Cc zuShI`28AHt^wS71QN`3$S8a9Gh%|As%3M=00}M1}kO3hnWB`NMDG&k*Gi|g%N)$fB zAotv2%S{LjWst4327LGb-FG1>B$0#)fe$XY;ei*f!T?Q7;tI-Kr(DD$VpncCE2o@Y z2F|2FbHNd;oN&U~C$K^YD;bo5dgT$2uyiJ{#~wQygx9{f?YI-JiPjiEzOEj?2Oqp5 zcsy~1=*TBu`UzR|0LCa_Ot8cylHi@i9-{9d%n5tck$meCWFp4+!2M5f8F#Oj# zT4bUS<;x)8n2^2>dhmk-fFA}FP`?s>fdY%*Q2|;}fc&}8g{{~@0kS{@R+s<{Xvkj- z2@wh>?BIbrh~WzVUsypgu%Qr0OkxtnkOUAqv4bKcp$X}?2sE^U0cgM?4!6if2DG9E z87Kf2#pp#Ww!#UcC_p@B&SlC1U~T5k$KwT zoxG@rJQNZCjZk!CofRBh?gkn{8yNJU2sNk(sZl=)IP?OgV1Yy>nhh3|01lpD0UVqW z2sp3+4XnUuHa2<;}F-xEK$$Als@0X6{S z2pvjPhYkS{6Fq5C194GjgrNkUNC!qG8U{ElLmrQC0v}k>3T!L`4q)9vGr*wHvMvLs zsobL`R>{ZoX(9n|jjLP}U;z)1suo2hY8}F0(WIXAq#51lM|S`RrV3&QeBeVCumOh> zIOC!k9S1%n>VQA603RG+!8LGd&24)2vukBSHs?y$xDLUt7{F^@DR2rvl;E|nEkPI_ zOO7!AaNxBta7I1sunkbO!la&%tw&3sixQ~AwkGAk3F1)#4uruIIDM;6r~6Y2SogZt zO~7gIx>^c&;|;G3gLrkJi>J!gqHu`E4whjy2D}y!>WBp(=BtZqTtf|im2C+EkpVjp zHw-wn0ci(JTI?E_4ju@kYV&FdZ2-c&;*GE_oJ)>dTp$N0fJGSIpbZdcLmT1P1tz%h z;Zoo?4A}^S8k~FB@CMkxFpjZ|t&3ppu67Lq00B7E5aAwkpc-=kLmMst3t9L96PN&j z4E|vXKY#!Qn2>=VJ{*fu*jB}1V89%nic>l`VFF+dvzW(BW->d$uC7>cUO6EH6maAJ z!4c+%ZRb#cJxC%2|L8CZ{=p3ogW$=2a56V!00a;KK^u;6#2ZRciUL$a4H9dI2XsK` zN?ZEUnASlrHr9YR02k=!RHy#H2pPa45#l(5D~e5TVn;w9$p+Q24*-m4`y1Ml5P&13jP6*( z0uv~ZK{##@<#mfY5wpO=xy?NbhyQsNiFg7gRw0T5Wb5M~54p%eUJfsTi3=kCFhIZm z?e8H3Kn9NRaEFr&f>=BO*SxN^xKRLtS#YD>IhTRCQSgLSKtL1*NV?LO&h(})T@+AH zx+ow3ft9m7+P?^ZDRzMZSqNYk+7Q4SrtxQ8o1NWdH+!xtJ_~VB{q1m%yWHnacR5`B z-<$Y>))OI%Ld#+oKtQ+JaqR~v`yt{;9z3ppJ_{Al{qc~WyC_=VZzEX#@|a)4FBb8G zA8^9+cL;#!M^F0Dlm7ImAN?JWPzw>b{`Ihrz3gWXdpThK_PEcz?ssqbK{nL#$bh== zhrbFgl;cat2U9KL!2ISn9~kGreFdgZ{pwr)`qX!gFBdmhj4>9SPKED07!_0>-P*TsDK;@gEM%8 zhrokcPzhGJ0xOUTsXz?G5CdKq1I7@B#xM+IcnoGphQlC+#_)wPz=c|fg;rPzTEK%t zXoH&|gCNL(5GaCcK!Y}@gIZ99S-6E=IEKS;3?q<;W3Y(d(1_pTUSb`?_fiqZxI5>q>SP6qzh+~L|Ban%W7>SaY z3%ZC3yx5Drhzh!x3zgW2nV5*37=~^5hE_<5bx4CTn1?0^g?(6qI+zBpn1x&jhO@Yd zws?!UNQuHoiH%^1#JGr?c#NM&457G;K{$lY_>2UQiXX^_( z_>bp^hRE24>KKZmIEradilzvUB-oG*DTAwMkJT86ff$DtiG>)Mkro+;6gh_pDTFup Mj(F&h4jB*tJ2~jv=Kufz literal 0 HcmV?d00001 diff --git a/ui/new/images/dbaccounts_headerbg.gif b/ui/new/images/dbaccounts_headerbg.gif new file mode 100644 index 0000000000000000000000000000000000000000..8adfbfa0ca75466fd7c50e42e2ccdc518ba6006e GIT binary patch literal 189 zcmZ?wbhEHbWMhzIIKsdX6%`d69K3MhLSJ9sw6wHo)20;`7S5S7r?$3s)v8t5+1atN zvEkw2j*gCHWn~j4OlWRy?&|7Vwrp8qVxotK2LmCX_>%>!L||iIN>J(x%H+zZ zT9fl|pTCZK3GZEtMeqIIOCMN} - -<%@ page import="com.cloud.utils.*" %> - -<% - Locale browserLocale = request.getLocale(); - CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); -%> - -

    -
    - Event
    -

    - Dashboard -

    -
    - -
    - -
    -
    -
    -
    - System Wide Capacity
    -
    -
    -
    - - -
    -
    -
    -
    -
    -
    -

    - Public IP Addresses

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Private IP Addresses

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Memory Allocated

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - CPU

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Primary Storage Allocated

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Primary Storage Used

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Secondary Storage Used

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - General Alerts
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - No Recent Alerts -
    -
    -
    - -
    -
    -
    -
    - Hosts Alerts
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - No Recent Alerts -
    -
    -
    -
    - - +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> + +
    +
    + Dashboard
    +

    + Dashboard +

    +
    + +
    + + + + +
    +
    +
    +
    + System Wide Capacity
    +
    +
    +
    + + +
    +
    +
    +
    +
    +
    +

    + Public IP Addresses

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + Private IP Addresses

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + Memory Allocated

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + CPU

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + Primary Storage Allocated

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + Primary Storage Used

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +

    + Secondary Storage Used

    +
    +

    + Used: N/A +

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    + General Alerts
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + No Recent Alerts +
    +
    +
    + +
    +
    +
    +
    + Hosts Alerts
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + No Recent Alerts +
    +
    +
    +
    + + + + + + + + + + + + + + +
    +
    +
    +
    + Public IPs
    +
    +
    +
    +
    +
    Available Public IPs:
    +
    +
    +
    Unlimited
    +
    +
    +
    +
    +
    Owned Public IPs:
    +
    +
    +
    5
    +
    +
    + +
    + + +
    +
    +
    +
    + Recent Errors
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    Error's Name
    +
    Error Description will appear here
    +
    +
    +
    09/29/2010 15:20:10
    +
    +
    + +
    +
    +
    +
    +
    +
    Error's Name
    +
    Error Description will appear here
    +
    +
    +
    09/29/2010 15:20:10
    +
    +
    + +
    +
    +
    +
    +
    +
    Error's Name
    +
    Error Description will appear here
    +
    +
    +
    09/29/2010 15:20:10
    +
    +
    +
    + + + +
    +
    +
    +
    + Account
    +
    +
    +
    + My Account
    +
    + +
    + +
    +
    +
    Account ID
    +
    +
    +
    3
    +
    +
    + +
    +
    +
    Account
    +
    +
    +
    Niki
    +
    +
    + +
    +
    +
    Type
    +
    +
    +
    User
    +
    +
    + +
    +
    +
    Domain
    +
    +
    +
    Root
    +
    +
    + + + +
    + + \ No newline at end of file From b8c8aacca313923a184ff6c7a84ce167ae88eb95 Mon Sep 17 00:00:00 2001 From: anthony Date: Wed, 29 Sep 2010 18:38:01 -0700 Subject: [PATCH 070/244] bug 6326: correctly update poolsToAvoid status 6326: resolved fixed --- .../com/cloud/storage/StorageManagerImpl.java | 23 ++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 1d885992095..3dfca37b085 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -537,10 +537,13 @@ public class StorageManagerImpl implements StorageManager { DiskProfile dskCh = new DiskProfile(volume.getId(), volume.getVolumeType(), volume.getName(), 0, virtualsize, null, false, false, null); + int retry = 0; // Determine what pod to store the volume in while ((pod = _agentMgr.findPod(null, null, dc, account.getId(), podsToAvoid)) != null) { + podsToAvoid.add(pod.first().getId()); // Determine what storage pool to store the volume in while ((pool = findStoragePool(dskCh, dc, pod.first(), null, null, null, null, poolsToAvoid)) != null) { + poolsToAvoid.add(pool); volumeFolder = pool.getPath(); if (s_logger.isDebugEnabled()) { s_logger.debug("Attempting to create volume from snapshotId: " + snapshot.getId() + " on storage pool " + pool.getName()); @@ -558,6 +561,15 @@ public class StorageManagerImpl implements StorageManager { } success = true; break; // break out of the "find storage pool" loop + } else { + retry++; + if( retry >= 3 ) { + _volsDao.expunge(volumeId); + String msg = "Unable to create volume from snapshot " + snapshot.getId() + " after retrying 3 times, due to " + details; + s_logger.debug(msg); + throw new CloudRuntimeException(msg); + + } } s_logger.warn("Unable to create volume on pool " + pool.getName() + ", reason: " + details); @@ -566,11 +578,16 @@ public class StorageManagerImpl implements StorageManager { if (success) { break; // break out of the "find pod" loop - } else { - podsToAvoid.add(pod.first().getId()); - } + } } + if( !success ) { + _volsDao.expunge(volumeId); + String msg = "Unable to create volume from snapshot " + snapshot.getId() + " due to " + details; + s_logger.debug(msg); + throw new CloudRuntimeException(msg); + + } // Update the volume in the database Transaction txn = Transaction.currentTxn(); txn.start(); From 211b4c5da2b4582d2b434b8d6b53883347ccb407 Mon Sep 17 00:00:00 2001 From: edison Date: Fri, 20 Aug 2010 14:22:18 -0700 Subject: [PATCH 071/244] hybrid --- .../com/cloud/service/ServiceOfferingVO.java | 14 ++++++++--- .../configuration/ConfigurationManager.java | 3 ++- .../ConfigurationManagerImpl.java | 6 ++--- .../cloud/server/ConfigurationServerImpl.java | 23 +++++++++++++++---- setup/db/create-schema.sql | 1 + 5 files changed, 36 insertions(+), 11 deletions(-) diff --git a/core/src/com/cloud/service/ServiceOfferingVO.java b/core/src/com/cloud/service/ServiceOfferingVO.java index d5d4b4d7ce6..ad67ce26114 100644 --- a/core/src/com/cloud/service/ServiceOfferingVO.java +++ b/core/src/com/cloud/service/ServiceOfferingVO.java @@ -52,7 +52,10 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering private int multicastRateMbps; @Column(name="ha_enabled") - private boolean offerHA; + private boolean offerHA; + + @Column(name="hypervisor_type") + private String hypervisorType; @Column(name="guest_ip_type") @Enumerated(EnumType.STRING) @@ -62,7 +65,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering super(); } - public ServiceOfferingVO(String name, int cpu, int ramSize, int speed, int rateMbps, int multicastRateMbps, boolean offerHA, String displayText, NetworkOffering.GuestIpType guestIpType, boolean useLocalStorage, boolean recreatable, String tags) { + public ServiceOfferingVO(String name, int cpu, int ramSize, int speed, int rateMbps, int multicastRateMbps, boolean offerHA, String displayText, NetworkOffering.GuestIpType guestIpType, boolean useLocalStorage, boolean recreatable, String tags, String hyperVirsoType) { super(name, displayText, false, tags, recreatable, useLocalStorage); this.cpu = cpu; this.ramSize = ramSize; @@ -70,7 +73,8 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.rateMbps = rateMbps; this.multicastRateMbps = multicastRateMbps; this.offerHA = offerHA; - this.guestIpType = guestIpType; + this.guestIpType = guestIpType; + this.hypervisorType = hyperVirsoType; } @Override @@ -142,5 +146,9 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public NetworkOffering.GuestIpType getGuestIpType() { return guestIpType; + } + + public String gethypervisorType() { + return hypervisorType; } } diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java index f7f8e780541..effa09e832a 100644 --- a/server/src/com/cloud/configuration/ConfigurationManager.java +++ b/server/src/com/cloud/configuration/ConfigurationManager.java @@ -25,6 +25,7 @@ import com.cloud.dc.VlanVO; import com.cloud.dc.Vlan.VlanType; import com.cloud.exception.InternalErrorException; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.hypervisor.Hypervisor; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.utils.component.Manager; @@ -56,7 +57,7 @@ public interface ConfigurationManager extends Manager { * @param useVirtualNetwork * @return ID */ - ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean useVirtualNetwork, String tags); + ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean useVirtualNetwork, String tags, Hypervisor.Type hyperVisor); /** * Updates a service offering diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 50db6d6fd9f..377d409ba88 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -50,6 +50,7 @@ import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; import com.cloud.exception.InternalErrorException; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.hypervisor.Hypervisor; import com.cloud.network.dao.IPAddressDao; import com.cloud.offering.NetworkOffering; import com.cloud.service.ServiceOfferingVO; @@ -831,15 +832,14 @@ public class ConfigurationManagerImpl implements ConfigurationManager { return zone; } - @Override - public ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean useVirtualNetwork, String tags) { + public ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean useVirtualNetwork, String tags, Hypervisor.Type hyperVisor) { String networkRateStr = _configDao.getValue("network.throttling.rate"); String multicastRateStr = _configDao.getValue("multicast.throttling.rate"); int networkRate = ((networkRateStr == null) ? 200 : Integer.parseInt(networkRateStr)); int multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr)); NetworkOffering.GuestIpType guestIpType = useVirtualNetwork ? NetworkOffering.GuestIpType.Virtualized : NetworkOffering.GuestIpType.DirectSingle; tags = cleanupTags(tags); - ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, multicastRate, offerHA, displayText, guestIpType, localStorageRequired, false, tags); + ServiceOfferingVO offering = new ServiceOfferingVO(name, cpu, ramSize, speed, networkRate, multicastRate, offerHA, displayText, guestIpType, localStorageRequired, false, tags, hyperVisor.toString()); if ((offering = _serviceOfferingDao.persist(offering)) != null) { saveConfigurationEvent(userId, null, EventTypes.EVENT_SERVICE_OFFERING_CREATE, "Successfully created new service offering with name: " + name + ".", "soId=" + offering.getId(), "name=" + name, "numCPUs=" + cpu, "ram=" + ramSize, "cpuSpeed=" + speed, diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index a678f157817..954b30ac193 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -48,6 +48,7 @@ import com.cloud.dc.DataCenterVO; import com.cloud.domain.DomainVO; import com.cloud.exception.InternalErrorException; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.SnapshotPolicyVO; import com.cloud.storage.dao.SnapshotPolicyDao; import com.cloud.user.User; @@ -136,11 +137,25 @@ public class ConfigurationServerImpl implements ConfigurationServer { } // Save Direct Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.KVM); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.KVM); // Save Virtual Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.KVM); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.KVM); + + // Save Direct Networking service offerings + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.XenServer); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.XenServer); + // Save Virtual Networking service offerings + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.XenServer); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.XenServer); + + // Save Direct Networking service offerings + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.VMware); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null, Hypervisor.Type.VMware); + // Save Virtual Networking service offerings + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.VMware); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.VMware); // Save default disk offerings _configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Small", "Small Disk, 5 GB", 5, null); _configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Medium", "Medium Disk, 20 GB", 20, null); diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index c8bf22d315d..bc35275d3e3 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -870,6 +870,7 @@ CREATE TABLE `cloud`.`service_offering` ( `mc_rate` smallint unsigned default 10 COMMENT 'mcast rate throttle mbits/s', `ha_enabled` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT 'Enable HA', `guest_ip_type` varchar(255) NOT NULL DEFAULT 'Virtualized' COMMENT 'Type of guest network -- direct or virtualized', + `hypervisor_type` varchar(255) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From 3aef9f408ec91cacda75b0759c1bf13a25af59e8 Mon Sep 17 00:00:00 2001 From: edison Date: Fri, 20 Aug 2010 16:31:42 -0700 Subject: [PATCH 072/244] step1 --- core/src/com/cloud/dc/ClusterVO.java | 12 ++++++++++++ .../impl/UserConcentratedAllocator.java | 8 ++++---- .../consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../kvm/discoverer/KvmServerDiscoverer.java | 9 +++++++++ .../xen/discoverer/XcpServerDiscoverer.java | 7 +++++++ .../com/cloud/network/NetworkManagerImpl.java | 2 +- .../cloud/server/ConfigurationServerImpl.java | 12 ++++++------ .../com/cloud/server/ManagementServerImpl.java | 2 +- .../allocator/LocalStoragePoolAllocator.java | 16 ++++++++-------- .../secondary/SecondaryStorageManagerImpl.java | 2 +- server/src/com/cloud/test/DatabaseConfig.java | 2 +- setup/db/create-schema.sql | 1 + 12 files changed, 52 insertions(+), 23 deletions(-) diff --git a/core/src/com/cloud/dc/ClusterVO.java b/core/src/com/cloud/dc/ClusterVO.java index 24c4eaa5779..b8f9f6b3d13 100644 --- a/core/src/com/cloud/dc/ClusterVO.java +++ b/core/src/com/cloud/dc/ClusterVO.java @@ -45,6 +45,10 @@ public class ClusterVO implements Cluster { @Column(name="pod_id") long podId; + @Column(name="hypervisor_type") + String hypervisorType; + + public ClusterVO() { } @@ -70,6 +74,14 @@ public class ClusterVO implements Cluster { return podId; } + public String getHypervisorType() { + return hypervisorType; + } + + public void setHypervisorType(String hy) { + hypervisorType = hy; + } + public ClusterVO(long clusterId) { this.id = clusterId; } diff --git a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java index 1b7147211df..d5aa748380c 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java @@ -244,14 +244,14 @@ public class UserConcentratedAllocator implements PodAllocator { so = _offeringDao.findById(userVm.getServiceOfferingId()); } else if(vm.getType() == VirtualMachine.Type.ConsoleProxy) { so = new ServiceOfferingVO("Fake Offering For DomP", 1, - _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else { assert(false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } if(capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 85c617fdb03..5e04c9db629 100644 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -2303,7 +2303,7 @@ public class ConsoleProxyManagerImpl implements ConsoleProxyManager, VirtualMach _networkRate = ((networkRateStr == null) ? 200 : Integer.parseInt(networkRateStr)); _multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr)); _serviceOffering = new ServiceOfferingVO("Fake Offering For DomP", 1, _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, - useLocalStorage, true, null); + useLocalStorage, true, null, null); _serviceOffering.setUniqueName("Cloud.com-ConsoleProxy"); _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); _template = _templateDao.findConsoleProxyTemplate(); diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index 9b910ec0f3b..d3ec8623fde 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -21,11 +21,14 @@ import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; import com.cloud.agent.api.StartupCommand; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.ClusterVO; +import com.cloud.dc.dao.ClusterDao; import com.cloud.exception.DiscoveryException; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.Status.Event; import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.kvm.resource.KvmDummyResourceBase; import com.cloud.hypervisor.xen.resource.CitrixResourceBase; import com.cloud.resource.Discoverer; @@ -47,6 +50,7 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, private String _hostIp; private int _waitTime = 3; /*wait for 3 minutes*/ @Inject HostDao _hostDao = null; + @Inject ClusterDao _clusterDao; @Override public boolean processAnswer(long agentId, long seq, Answer[] answers) { @@ -224,6 +228,11 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, kvmResource.configure("kvm agent", params); kvmResource.setRemoteAgent(true); resources.put(kvmResource, details); + + /*set cluster hypervisor type to xenserver*/ + ClusterVO clu = _clusterDao.findById(clusterId); + clu.setHypervisorType(Hypervisor.Type.KVM.toString()); + _clusterDao.update(clusterId, clu); return resources; } catch (Exception e) { String msg = " can't setup agent, due to " + e.toString() + " - " + e.getMessage(); diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 527d1ee1f1a..fad4985d035 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -50,6 +50,7 @@ import com.cloud.host.HostInfo; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.Hypervisor; import com.cloud.hypervisor.xen.resource.CitrixResourceBase; import com.cloud.hypervisor.xen.resource.XcpServerResource; import com.cloud.hypervisor.xen.resource.XenServerResource; @@ -245,6 +246,12 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if (!addHostsToPool(url, conn, dcId, podId, clusterId, resources)) { return null; } + + /*set cluster hypervisor type to xenserver*/ + ClusterVO clu = _clusterDao.findById(clusterId); + clu.setHypervisorType(Hypervisor.Type.XenServer.toString()); + _clusterDao.update(clusterId, clu); + } catch (SessionAuthenticationFailed e) { s_logger.warn("Authentication error", e); return null; diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 4d3958e3ad5..14eb6810379 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -1873,7 +1873,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager String multicastRateStr = _configDao.getValue("multicast.throttling.rate"); _networkRate = ((networkRateStr == null) ? 200 : Integer.parseInt(networkRateStr)); _multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr)); - _offering = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, useLocalStorage, true, null); + _offering = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, useLocalStorage, true, null, null); _offering.setUniqueName("Cloud.Com-SoftwareRouter"); _offering = _serviceOfferingDao.persistSystemServiceOffering(_offering); _template = _templateDao.findRoutingTemplate(); diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 954b30ac193..ca9ef45d861 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -119,14 +119,14 @@ public class ConfigurationServerImpl implements ConfigurationServer { _configDao.update("hypervisor.type", "xenserver"); s_logger.debug("ConfigurationServer changed the hypervisor type to \"xenserver\"."); - _configDao.update("secondary.storage.vm", "true"); - s_logger.debug("ConfigurationServer made secondary storage vm required."); + //_configDao.update("secondary.storage.vm", "true"); + //s_logger.debug("ConfigurationServer made secondary storage vm required."); - _configDao.update("secstorage.encrypt.copy", "true"); - s_logger.debug("ConfigurationServer made secondary storage copy encrypted."); + //_configDao.update("secstorage.encrypt.copy", "true"); + //s_logger.debug("ConfigurationServer made secondary storage copy encrypted."); - _configDao.update("secstorage.secure.copy.cert", "realhostip"); - s_logger.debug("ConfigurationServer made secondary storage copy use realhostip."); + //_configDao.update("secstorage.secure.copy.cert", "realhostip"); + //s_logger.debug("ConfigurationServer made secondary storage copy use realhostip."); } boolean externalIpAlloator = Boolean.parseBoolean(_configDao.getValue("direct.attach.network.externalIpAllocator.enabled")); diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 0fefe15d245..edee8753ca2 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -4433,7 +4433,7 @@ public class ManagementServerImpl implements ManagementServer { @Override public ServiceOfferingVO createServiceOffering(long userId, String name, int cpu, int ramSize, int speed, String displayText, boolean localStorageRequired, boolean offerHA, boolean useVirtualNetwork, String tags) { - return _configMgr.createServiceOffering(userId, name, cpu, ramSize, speed, displayText, localStorageRequired, offerHA, useVirtualNetwork, tags); + return _configMgr.createServiceOffering(userId, name, cpu, ramSize, speed, displayText, localStorageRequired, offerHA, useVirtualNetwork, tags, null); } @Override diff --git a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java index ed0b313c223..9d32d1a6740 100644 --- a/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java @@ -146,14 +146,14 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { so = _offeringDao.findById(userVm.getServiceOfferingId()); } else if(vm.getType() == VirtualMachine.Type.ConsoleProxy) { so = new ServiceOfferingVO("Fake Offering For DomP", 1, - _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else { assert(false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } long usedMemory = calcHostAllocatedCpuMemoryCapacity(vmOnHost, CapacityVO.CAPACITY_TYPE_MEMORY); @@ -243,14 +243,14 @@ public class LocalStoragePoolAllocator extends FirstFitStoragePoolAllocator { so = _offeringDao.findById(userVm.getServiceOfferingId()); } else if(vm.getType() == VirtualMachine.Type.ConsoleProxy) { so = new ServiceOfferingVO("Fake Offering For DomP", 1, - _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + _proxyRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.SecondaryStorageVm) { - so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else if(vm.getType() == VirtualMachine.Type.DomainRouter) { - so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For DomR", 1, _routerRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } else { assert(false) : "Unsupported system vm type"; - so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null); + so = new ServiceOfferingVO("Fake Offering For unknow system VM", 1, 128, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, false, true, null, null); } if(capacityType == CapacityVO.CAPACITY_TYPE_MEMORY) { diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index ae4d6672d5d..1b5da217d23 100644 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -1390,7 +1390,7 @@ public class SecondaryStorageManagerImpl implements SecondaryStorageVmManager, V String multicastRateStr = _configDao.getValue("multicast.throttling.rate"); _networkRate = ((networkRateStr == null) ? 200 : Integer.parseInt(networkRateStr)); _multicastRate = ((multicastRateStr == null) ? 10 : Integer.parseInt(multicastRateStr)); - _serviceOffering = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, useLocalStorage, true, null); + _serviceOffering = new ServiceOfferingVO("Fake Offering For Secondary Storage VM", 1, _secStorageVmRamSize, 0, 0, 0, false, null, NetworkOffering.GuestIpType.Virtualized, useLocalStorage, true, null, null); _serviceOffering.setUniqueName("Cloud.com-SecondaryStorage"); _serviceOffering = _offeringDao.persistSystemServiceOffering(_serviceOffering); _template = _templateDao.findConsoleProxyTemplate(); diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java index b51a99f3af4..7633f0bd734 100644 --- a/server/src/com/cloud/test/DatabaseConfig.java +++ b/server/src/com/cloud/test/DatabaseConfig.java @@ -741,7 +741,7 @@ public class DatabaseConfig { useLocalStorage = false; } - ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, nwRate, mcRate, ha, displayText, type, useLocalStorage, false, null); + ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, nwRate, mcRate, ha, displayText, type, useLocalStorage, false, null, null); ServiceOfferingDaoImpl dao = ComponentLocator.inject(ServiceOfferingDaoImpl.class); try { dao.persist(serviceOffering); diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index bc35275d3e3..f38555120df 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -162,6 +162,7 @@ CREATE TABLE `cloud`.`cluster` ( `name` varchar(255) NOT NULL COMMENT 'name for the cluster', `pod_id` bigint unsigned NOT NULL COMMENT 'pod id', `data_center_id` bigint unsigned NOT NULL COMMENT 'data center id', + `hypervisor_type` varchar(255) NOT NULL, PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From edb16aa117d5ce4af1190d633db04671c2090e91 Mon Sep 17 00:00:00 2001 From: edison Date: Fri, 20 Aug 2010 19:42:02 -0700 Subject: [PATCH 073/244] change storage allocator policy based on hypervisor --- .../com/cloud/offering/ServiceOffering.java | 1 + .../kvm/discoverer/KvmServerDiscoverer.java | 11 +++++++- .../xen/discoverer/XcpServerDiscoverer.java | 2 +- .../cloud/migration/ServiceOffering21VO.java | 3 +++ .../cloud/server/ConfigurationServerImpl.java | 26 +++++++------------ .../AbstractStoragePoolAllocator.java | 9 +++++++ setup/db/templates.xenserver.sql | 8 +++++- 7 files changed, 40 insertions(+), 20 deletions(-) diff --git a/api/src/com/cloud/offering/ServiceOffering.java b/api/src/com/cloud/offering/ServiceOffering.java index 87ff831d32e..9a80cce643e 100755 --- a/api/src/com/cloud/offering/ServiceOffering.java +++ b/api/src/com/cloud/offering/ServiceOffering.java @@ -67,4 +67,5 @@ public interface ServiceOffering { */ boolean getUseLocalStorage(); + public String gethypervisorType(); } diff --git a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java index d3ec8623fde..bdefd1062ce 100644 --- a/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/kvm/discoverer/KvmServerDiscoverer.java @@ -203,7 +203,16 @@ public class KvmServerDiscoverer extends DiscovererBase implements Discoverer, sshConnection.connect(null, 60000, 60000); if (!sshConnection.authenticateWithPassword(username, password)) { - throw new Exception("Unable to authenticate"); + s_logger.debug("Failed to authenticate"); + return null; + } + + /*Is a KVM host?*/ + sshSession = sshConnection.openSession(); + sshSession.execCommand("lsmod|grep kvm >& /dev/null"); + if (sshSession.getExitStatus() != 0) { + s_logger.debug("It's not a KVM enabled machine"); + return null; } if (!sshExecuteCmd(sshConnection, "lsmod|grep kvm >& /dev/null", 3)) { diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index fad4985d035..3192267b834 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -120,7 +120,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L if (conn == null) { String msg = "Unable to get a connection to " + url; s_logger.debug(msg); - throw new RuntimeException(msg); + return null; } String pod; diff --git a/server/src/com/cloud/migration/ServiceOffering21VO.java b/server/src/com/cloud/migration/ServiceOffering21VO.java index 31ba534831c..50cd6442a06 100644 --- a/server/src/com/cloud/migration/ServiceOffering21VO.java +++ b/server/src/com/cloud/migration/ServiceOffering21VO.java @@ -124,4 +124,7 @@ public class ServiceOffering21VO extends DiskOffering21VO implements ServiceOffe public NetworkOffering.GuestIpType getGuestIpType() { return guestIpType; } + public String gethypervisorType() { + return null; + } } diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index ca9ef45d861..b13dd930f3e 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -137,25 +137,17 @@ public class ConfigurationServerImpl implements ConfigurationServer { } // Save Direct Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.KVM); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.KVM); - // Save Virtual Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.KVM); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.KVM); - + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "KVM, Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.KVM); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "KVM, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.KVM); + // Save Direct Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.XenServer); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.XenServer); - // Save Virtual Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.XenServer); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.XenServer); - + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Xenserver, Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.XenServer); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Xenserver, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.XenServer); + // Save Direct Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.VMware); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null, Hypervisor.Type.VMware); - // Save Virtual Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Virtual Networking", 1, 512, 500, "Small Instance, Virtual Networking, $0.05 per hour", false, false, true, null, Hypervisor.Type.VMware); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Virtual Networking", 1, 1024, 1000, "Medium Instance, Virtual Networking, $0.10 per hour", false, false, true, null, Hypervisor.Type.VMware); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "VMware, Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.VMware); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "VMware, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null, Hypervisor.Type.VMware); + // Save default disk offerings _configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Small", "Small Disk, 5 GB", 5, null); _configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Medium", "Medium Disk, 20 GB", 20, null); diff --git a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java index bd67360e645..eefb6fa65ef 100644 --- a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java @@ -31,6 +31,8 @@ import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.deploy.DeployDestination; +import com.cloud.dc.ClusterVO; +import com.cloud.dc.dao.ClusterDao; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.server.StatsCollector; @@ -74,6 +76,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement @Inject VolumeDao _volumeDao; @Inject StoragePoolHostDao _poolHostDao; @Inject ConfigurationDao _configDao; + @Inject ClusterDao _clusterDao; int _storageOverprovisioningFactor; long _extraBytesPerVolume = 0; Random _rand; @@ -142,6 +145,12 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement return false; } + /*hypervisor type is correct*/ + Long clusterId = pool.getClusterId(); + ClusterVO cluster = _clusterDao.findById(clusterId); + if (!cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) { + return false; + } // check the used size against the total size, skip this host if it's greater than the configured // capacity check "storage.capacity.threshold" if (sc != null) { diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql index 02651fd99a8..3ad78940d06 100644 --- a/setup/db/templates.xenserver.sql +++ b/setup/db/templates.xenserver.sql @@ -1,7 +1,13 @@ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones) VALUES (1, 'routing', 'SystemVM Template', 0, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/releases/2.2/systemvm.vhd.bz2', 'bcc7f290f4c27ab4d0fe95d1012829ea', 0, 'SystemVM Template', 'VHD', 15, 0, 1); INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones) - VALUES (2, 'centos53-x86_64', 'CentOS 5.3(x86_64) no GUI', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(x86_64) no GUI', 'VHD', 12, 1, 1); + VALUES (2, 'centos53-x86_64', 'CentOS 5.3(x86_64) no GUI(Xenserver)', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(x86_64) no GUI', 'VHD', 12, 1, 1); + +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones) + VALUES (3, 'routing', 'DomR Template(KVM)', 0, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/a88232bf-6a18-38e7-aeee-c1702725079f.qcow2.bz2', 'e39c55e93ae96bd43bfd588ca6ee3269', 'DomR Template', 0, 'QCOW2', 21, 0, 1); +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones) + VALUES (4, 'centos55-x86_64', 'CentOS 5.5(x86_64) no GUI(KVM)', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', '1da20ae69b54f761f3f733dce97adcc0', 'CentOS 5.5(x86_64) no GUI', 0, 'QCOW2', 9, 1, 1); + INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (1, 'CentOS'); INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (2, 'Debian'); From 6ef55309943f144e4b1f4dab11d02019fa5c7572 Mon Sep 17 00:00:00 2001 From: edison Date: Fri, 20 Aug 2010 20:08:26 -0700 Subject: [PATCH 074/244] hypervisor type in cluster can be null --- setup/db/create-schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index f38555120df..a39e618a810 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -162,7 +162,7 @@ CREATE TABLE `cloud`.`cluster` ( `name` varchar(255) NOT NULL COMMENT 'name for the cluster', `pod_id` bigint unsigned NOT NULL COMMENT 'pod id', `data_center_id` bigint unsigned NOT NULL COMMENT 'data center id', - `hypervisor_type` varchar(255) NOT NULL, + `hypervisor_type` varchar(255), PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; From e2282ba80004db6abe1e30325d8c7380f7d69489 Mon Sep 17 00:00:00 2001 From: edison Date: Fri, 20 Aug 2010 20:19:21 -0700 Subject: [PATCH 075/244] don't throw exceptions when you can't add host --- .../hypervisor/xen/discoverer/XcpServerDiscoverer.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index 3192267b834..de780e6964a 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -264,7 +264,11 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L } catch (UnknownHostException e) { s_logger.warn("Unable to resolve the host name", e); return null; - } finally { + } catch (Exception e) { + s_logger.debug("other exceptions: " + e.toString()); + return null; + } + finally { if (conn != null) { try{ Session.logout(conn); From 7c4fe92a9feea284a14716834ebaebe9ef429947 Mon Sep 17 00:00:00 2001 From: edison Date: Thu, 26 Aug 2010 14:24:29 -0700 Subject: [PATCH 076/244] s/VMWare/Vmware --- server/src/com/cloud/server/ConfigurationServerImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index b13dd930f3e..0d22521dd63 100644 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -145,8 +145,8 @@ public class ConfigurationServerImpl implements ConfigurationServer { _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "Xenserver, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null,Hypervisor.Type.XenServer); // Save Direct Networking service offerings - _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "VMware, Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.VMware); - _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "VMware, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null, Hypervisor.Type.VMware); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Small Instance, Direct Networking", 1, 512, 500, "VMware, Small Instance, Direct Networking, $0.05 per hour", false, false, false, null, Hypervisor.Type.VmWare); + _configMgr.createServiceOffering(User.UID_SYSTEM, "Medium Instance, Direct Networking", 1, 1024, 1000, "VMware, Medium Instance, Direct Networking, $0.10 per hour", false, false, false, null, Hypervisor.Type.VmWare); // Save default disk offerings _configMgr.createDiskOffering(User.UID_SYSTEM, DomainVO.ROOT_DOMAIN, "Small", "Small Disk, 5 GB", 5, null); From b3427fc634fad465a7c5769ce42585885a567199 Mon Sep 17 00:00:00 2001 From: edison Date: Thu, 26 Aug 2010 15:34:18 -0700 Subject: [PATCH 077/244] don't remove template --- .../src/com/cloud/storage/download/DownloadMonitorImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 17e97562a78..a559a67c101 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -483,7 +483,7 @@ public class DownloadMonitorImpl implements DownloadMonitor { } } - for (String uniqueName: templateInfo.keySet()) { + /*for (String uniqueName: templateInfo.keySet()) { TemplateInfo tInfo = templateInfo.get(uniqueName); DeleteTemplateCommand dtCommand = new DeleteTemplateCommand(tInfo.getInstallPath()); long result = send(sserverId, dtCommand, null); @@ -497,7 +497,7 @@ public class DownloadMonitorImpl implements DownloadMonitor { logEvent(1L, EventTypes.EVENT_TEMPLATE_DELETE, description, EventVO.LEVEL_INFO); s_logger.info(description); - } + }*/ } From da5bd82b5f62d3fb20b419821b7926eed404b56d Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 27 Aug 2010 17:03:00 -0700 Subject: [PATCH 078/244] Add vmware template info to hybrid branch --- setup/db/templates.xenserver.sql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql index 3ad78940d06..694f6c7dab9 100644 --- a/setup/db/templates.xenserver.sql +++ b/setup/db/templates.xenserver.sql @@ -8,6 +8,10 @@ INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones) VALUES (4, 'centos55-x86_64', 'CentOS 5.5(x86_64) no GUI(KVM)', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', '1da20ae69b54f761f3f733dce97adcc0', 'CentOS 5.5(x86_64) no GUI', 0, 'QCOW2', 9, 1, 1); +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones) + VALUES (5, 'blank', 'BlankVM', 1, now(), 'ext3', 0, 32, 1, 'http://nfs1.lab.vmops.com/templates/vmware/blankvm.tar.bz2', '3eff7ce3d25cf9433efde8b245c63fcb', 0, 'BlankVM', 'VMDK', 47, 1, 1); +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones) + VALUES (6, 'winxpsp3', 'WindowsXP-SP3', 1, now(), 'ntfs', 0, 32, 1, 'http://nfs1.lab.vmops.com/templates/vmware/winxpsp3.tar.bz2', '385e67d17a2cb3795bd0b0fb7f88dc5e', 0, 'WindowsXP-SP3', 'VMDK', 16, 1, 1); INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (1, 'CentOS'); INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (2, 'Debian'); From 9c67a9f58507b8ac3a176e89e2bf7e421c42a9b2 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 27 Aug 2010 17:22:49 -0700 Subject: [PATCH 079/244] Update vcenter address to vmware demo instance --- setup/db/templates.vmware.sql | 1 + setup/db/templates.xenserver.sql | 2 ++ 2 files changed, 3 insertions(+) diff --git a/setup/db/templates.vmware.sql b/setup/db/templates.vmware.sql index 34075a3aac7..7f346ab1476 100644 --- a/setup/db/templates.vmware.sql +++ b/setup/db/templates.vmware.sql @@ -78,5 +78,6 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (62, INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (63, 5, 'Other (32-bit)', 'Other (32-bit)'); INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (64, 5, 'Other (64-bit)', 'Other (64-bit)'); + -- temporarily added for vmware, will be moved when vmware support is fully in-place INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, `password`) VALUES('VSphere', 'vsphere-1.lab.vmops.com', 'Administrator', 'Suite219'); diff --git a/setup/db/templates.xenserver.sql b/setup/db/templates.xenserver.sql index 694f6c7dab9..329cab65789 100644 --- a/setup/db/templates.xenserver.sql +++ b/setup/db/templates.xenserver.sql @@ -82,4 +82,6 @@ INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (58, INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (59, 7, 'Other install media', 'Ubuntu'); INSERT INTO `cloud`.`guest_os` (id, category_id, name, display_name) VALUES (60, 7, 'Other install media', 'Other'); +-- temporarily added for vmware, will be moved when vmware support is fully in-place +INSERT INTO `cloud`.`host_master`(`type`, `service_address`, `admin`, `password`) VALUES('VSphere', '192.168.90.238', 'Administrator', 'Suite219'); From 6ae1c8fa3127a9cdf6de6fa627ed61e8e3213e1c Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 27 Aug 2010 18:30:25 -0700 Subject: [PATCH 080/244] Enable logging for deploydb and add support for hypervisor type in service offering --- server/src/com/cloud/test/DatabaseConfig.java | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java index 7633f0bd734..8fb5fc5104c 100644 --- a/server/src/com/cloud/test/DatabaseConfig.java +++ b/server/src/com/cloud/test/DatabaseConfig.java @@ -42,6 +42,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.apache.log4j.Logger; +import org.apache.log4j.xml.DOMConfigurator; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -56,6 +57,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDaoImpl; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.dao.DiskOfferingDaoImpl; +import com.cloud.utils.PropertiesUtil; import com.cloud.utils.component.ComponentLocator; import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; @@ -332,6 +334,15 @@ public class DatabaseConfig { public static void main(String[] args) { System.setProperty("javax.xml.parsers.DocumentBuilderFactory", "com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl"); System.setProperty("javax.xml.parsers.SAXParserFactory", "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"); + + File file = PropertiesUtil.findConfigFile("log4j-cloud.xml"); + if(file != null) { + System.out.println("Log4j configuration from : " + file.getAbsolutePath()); + DOMConfigurator.configureAndWatch(file.getAbsolutePath(), 10000); + } else { + System.out.println("Configure log4j with default properties"); + } + if (args.length < 1) { s_logger.error("error starting database config, missing initial data file"); } else { @@ -715,6 +726,7 @@ public class DatabaseConfig { int ramSize = Integer.parseInt(_currentObjectParams.get("ramSize")); int speed = Integer.parseInt(_currentObjectParams.get("speed")); String useLocalStorageValue = _currentObjectParams.get("useLocalStorage"); + String hypervisorType = _currentObjectParams.get("hypervisorType"); // int nwRate = Integer.parseInt(_currentObjectParams.get("nwRate")); // int mcRate = Integer.parseInt(_currentObjectParams.get("mcRate")); @@ -741,7 +753,7 @@ public class DatabaseConfig { useLocalStorage = false; } - ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, nwRate, mcRate, ha, displayText, type, useLocalStorage, false, null, null); + ServiceOfferingVO serviceOffering = new ServiceOfferingVO(name, cpu, ramSize, speed, nwRate, mcRate, ha, displayText, type, useLocalStorage, false, null, hypervisorType); ServiceOfferingDaoImpl dao = ComponentLocator.inject(ServiceOfferingDaoImpl.class); try { dao.persist(serviceOffering); From 9db2925b777a44168eb0811714fbd512105e0eed Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 27 Aug 2010 20:01:06 -0700 Subject: [PATCH 081/244] Make database config recognize service offering change --- .../src/com/cloud/storage/download/DownloadMonitorImpl.java | 4 +++- server/src/com/cloud/test/DatabaseConfig.java | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index a559a67c101..db971ec0fe8 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -417,7 +417,9 @@ public class DownloadMonitorImpl implements DownloadMonitor { if (storageHost == null) { s_logger.warn("Huh? Agent id " + sserverId + " does not correspond to a row in hosts table?"); return; - } Set toBeDownloaded = new HashSet(); + } + + Set toBeDownloaded = new HashSet(); List allTemplates = _templateDao.listAllInZone(storageHost.getDataCenterId()); VMTemplateVO rtngTmplt = _templateDao.findRoutingTemplate(); VMTemplateVO defaultBuiltin = _templateDao.findDefaultBuiltinTemplate(); diff --git a/server/src/com/cloud/test/DatabaseConfig.java b/server/src/com/cloud/test/DatabaseConfig.java index 8fb5fc5104c..98cafed8368 100644 --- a/server/src/com/cloud/test/DatabaseConfig.java +++ b/server/src/com/cloud/test/DatabaseConfig.java @@ -124,6 +124,7 @@ public class DatabaseConfig { fieldNames.add("ramSize"); fieldNames.add("speed"); fieldNames.add("useLocalStorage"); + fieldNames.add("hypervisorType"); fieldNames.add("diskSpace"); fieldNames.add("nwRate"); fieldNames.add("mcRate"); From cb1bbd49e476fe8bd9c894c04200c6ca685de3c2 Mon Sep 17 00:00:00 2001 From: edison Date: Sat, 28 Aug 2010 13:29:03 -0700 Subject: [PATCH 082/244] add a public.ip option in console-proxy agent.properties --- .../agent/resource/consoleproxy/ConsoleProxyResource.java | 5 +++++ console-proxy/conf.dom0/agent.properties.in | 1 + 2 files changed, 6 insertions(+) diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index 4696b98b426..f350fc8c9ad 100644 --- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -82,6 +82,7 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe String _localgw; String _eth1ip; String _eth1mask; + String _pubIp; @Override public Answer executeRequest(final Command cmd) { @@ -158,6 +159,8 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe fillNetworkInformation(cmd); cmd.setProxyPort(_proxyPort); cmd.setProxyVmId(_proxyVmId); + if(_pubIp != null) + cmd.setPublicIpAddress(_pubIp); return new StartupCommand[] {cmd}; } @@ -222,6 +225,8 @@ public class ConsoleProxyResource extends ServerResourceBase implements ServerRe } } + _pubIp = (String)params.get("public.ip"); + if(s_logger.isInfoEnabled()) s_logger.info("Receive proxyVmId in ConsoleProxyResource configuration as " + _proxyVmId); diff --git a/console-proxy/conf.dom0/agent.properties.in b/console-proxy/conf.dom0/agent.properties.in index 100f6532af8..7eaf336e198 100644 --- a/console-proxy/conf.dom0/agent.properties.in +++ b/console-proxy/conf.dom0/agent.properties.in @@ -2,6 +2,7 @@ instance=ConsoleProxy consoleproxy.httpListenPort=8002 +public.ip=65.19.181.3 #resource= the java class, which agent load to execute resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource From a3b8412b2d41fecfeb8ce999c7b74e49d9ee437c Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Sun, 29 Aug 2010 12:19:04 -0700 Subject: [PATCH 083/244] test code to verify vmware FaultTolerance feature --- core/test/com/cloud/vmware/TestVMWare.java | 46 ++++++++++++++++++++-- 1 file changed, 43 insertions(+), 3 deletions(-) diff --git a/core/test/com/cloud/vmware/TestVMWare.java b/core/test/com/cloud/vmware/TestVMWare.java index 6ec9c9f3d3e..1b9ad224a3f 100644 --- a/core/test/com/cloud/vmware/TestVMWare.java +++ b/core/test/com/cloud/vmware/TestVMWare.java @@ -624,7 +624,7 @@ public class TestVMWare { private void powerOnVm() throws Exception { ManagedObjectReference morVm = new ManagedObjectReference(); morVm.setType("VirtualMachine"); - morVm.set_value("vm-66"); + morVm.set_value("vm-480"); cb.getServiceConnection3().getService().powerOnVM_Task(morVm, null); } @@ -822,6 +822,44 @@ public class TestVMWare { this.printContent(ocs); } + private void testFT() throws Exception { + + ManagedObjectReference morVm = new ManagedObjectReference(); + morVm.setType("VirtualMachine"); + morVm.set_value("vm-480"); + + ManagedObjectReference morHost = new ManagedObjectReference(); + morHost.setType("HostSystem"); + morHost.set_value("host-470"); + + System.out.println("Create secondary VM"); + ManagedObjectReference morTask = cb.getServiceConnection3().getService().createSecondaryVM_Task(morVm, morHost); + String result = cb.getServiceUtil3().waitForTask(morTask); + + System.out.println("Create secondary VM resutl : " + result); + } + + private void testFTEnable() throws Exception { + ManagedObjectReference morVm = new ManagedObjectReference(); + morVm.setType("VirtualMachine"); + morVm.set_value("vm-480"); + + ManagedObjectReference morHost = new ManagedObjectReference(); + morHost.setType("HostSystem"); + morHost.set_value("host-470"); + + ManagedObjectReference morSecondaryVm = new ManagedObjectReference(); + morSecondaryVm.setType("VirtualMachine"); + morSecondaryVm.set_value("vm-485"); + + System.out.println("Enable FT"); + ManagedObjectReference morTask = cb.getServiceConnection3().getService().enableSecondaryVM_Task(morVm, + morSecondaryVm, morHost); + String result = cb.getServiceUtil3().waitForTask(morTask); + + System.out.println("Enable FT resutl : " + result); + } + public static void main(String[] args) throws Exception { setupLog4j(); TestVMWare client = new TestVMWare(); @@ -840,7 +878,7 @@ public class TestVMWare { // client.listInventoryFolders(); // client.listDataCenters(); - // client.powerOnVm(); + client.powerOnVm(); // client.createSnapshot(); // client.registerTemplate(); // client.createVmFromTemplate(); @@ -849,7 +887,9 @@ public class TestVMWare { // client.createDatacenter(); // client.getPropertyWithPath(); - client.getHostVMs(); + // client.getHostVMs(); + // client.testFT(); + // client.testFTEnable(); cb.disConnect(); } catch (Exception e) { From 3f832c0c08026077ecdc6aa06f7c27083565fe8e Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 9 Sep 2010 18:52:01 -0700 Subject: [PATCH 084/244] Test with OVF importing --- core/test/com/cloud/vmware/TestVMWare.java | 227 ++++++++++++++++++++- 1 file changed, 226 insertions(+), 1 deletion(-) diff --git a/core/test/com/cloud/vmware/TestVMWare.java b/core/test/com/cloud/vmware/TestVMWare.java index 1b9ad224a3f..76ecc489d7a 100644 --- a/core/test/com/cloud/vmware/TestVMWare.java +++ b/core/test/com/cloud/vmware/TestVMWare.java @@ -1,12 +1,23 @@ package com.cloud.vmware; +import java.io.BufferedInputStream; +import java.io.BufferedOutputStream; +import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.io.InputStreamReader; +import java.net.URL; import java.rmi.RemoteException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.net.ssl.HostnameVerifier; +import javax.net.ssl.HttpsURLConnection; +import javax.net.ssl.SSLSession; + import org.apache.log4j.xml.DOMConfigurator; import com.cloud.utils.PropertiesUtil; @@ -15,6 +26,13 @@ import com.vmware.vim25.HostIpConfig; import com.vmware.vim25.HostVirtualNicSpec; import com.vmware.vim25.HostConfigManager; import com.vmware.vim25.HostPortGroupSpec; +import com.vmware.vim25.HttpNfcLeaseDeviceUrl; +import com.vmware.vim25.HttpNfcLeaseInfo; +import com.vmware.vim25.HttpNfcLeaseState; +import com.vmware.vim25.OvfCreateImportSpecParams; +import com.vmware.vim25.OvfCreateImportSpecResult; +import com.vmware.vim25.OvfFileItem; +import com.vmware.vim25.OvfNetworkMapping; import com.vmware.vim25.VirtualMachineConfigSpec; import com.vmware.vim25.VirtualDeviceConfigSpecOperation; import com.vmware.vim25.VirtualEthernetCard; @@ -40,6 +58,18 @@ import com.vmware.vim25.TraversalSpec; public class TestVMWare { private static ExtendedAppUtil cb; + static { + try { + javax.net.ssl.TrustManager[] trustAllCerts = new javax.net.ssl.TrustManager[1]; + javax.net.ssl.TrustManager tm = new TrustAllManager(); + trustAllCerts[0] = tm; + javax.net.ssl.SSLContext sc = javax.net.ssl.SSLContext.getInstance("SSL"); + sc.init(null, trustAllCerts, null); + javax.net.ssl.HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory()); + } catch (Exception e) { + } + } + private static void setupLog4j() { File file = PropertiesUtil.findConfigFile("log4j-cloud.xml"); @@ -860,6 +890,174 @@ public class TestVMWare { System.out.println("Enable FT resutl : " + result); } + private void importOVF() throws Exception { + ManagedObjectReference morHost = new ManagedObjectReference(); + morHost.setType("HostSystem"); + morHost.set_value("host-223"); + + ManagedObjectReference morRp = new ManagedObjectReference(); + morRp.setType("ResourcePool"); + morRp.set_value("resgroup-222"); + + ManagedObjectReference morDs = new ManagedObjectReference(); + morDs.setType("Datastore"); + morDs.set_value("datastore-30"); + + ManagedObjectReference morVmFolder = new ManagedObjectReference(); + morVmFolder.setType("Folder"); + morVmFolder.set_value("group-v3"); + + ManagedObjectReference morNetwork = new ManagedObjectReference(); + morNetwork.setType("Network"); + morNetwork.set_value("network-32"); + + ManagedObjectReference morOvf = cb.getServiceConnection3().getServiceContent().getOvfManager(); + + OvfCreateImportSpecParams importSpecParams = new OvfCreateImportSpecParams(); + importSpecParams.setHostSystem(morHost); + importSpecParams.setLocale("US"); + importSpecParams.setEntityName("winxpsp3-ovf-deployed"); + importSpecParams.setDeploymentOption(""); + importSpecParams.setDiskProvisioning("thin"); + +/* + OvfNetworkMapping networkMapping = new OvfNetworkMapping(); + networkMapping.setName("VM Network"); + networkMapping.setNetwork(morNetwork); // network); + importSpecParams.setNetworkMapping(new OvfNetworkMapping[] { networkMapping }); +*/ + importSpecParams.setPropertyMapping(null); + + String ovfDescriptor = readOvfContent("C:\\research\\vmware\\winxpsp3-ovf\\winxpsp3-ovf.ovf"); + OvfCreateImportSpecResult ovfImportResult = cb.getServiceConnection3().getService().createImportSpec( + morOvf, ovfDescriptor, morRp, morDs, importSpecParams); + + if(ovfImportResult != null) { + long totalBytes = addTotalBytes(ovfImportResult); + + ManagedObjectReference morLease = cb.getServiceConnection3().getService().importVApp(morRp, + ovfImportResult.getImportSpec(), morVmFolder, morHost); + + HttpNfcLeaseState state; + for(;;) { + state = (HttpNfcLeaseState)cb.getServiceUtil3().getDynamicProperty(morLease, "state"); + if(state == HttpNfcLeaseState.ready || state == HttpNfcLeaseState.error) + break; + } + + if(state == HttpNfcLeaseState.ready) { + HttpNfcLeaseInfo httpNfcLeaseInfo = (HttpNfcLeaseInfo)cb.getServiceUtil3().getDynamicProperty(morLease, "info"); + HttpNfcLeaseDeviceUrl[] deviceUrls = httpNfcLeaseInfo.getDeviceUrl(); + long bytesAlreadyWritten = 0; + for (HttpNfcLeaseDeviceUrl deviceUrl : deviceUrls) { + + String deviceKey = deviceUrl.getImportKey(); + for (OvfFileItem ovfFileItem : ovfImportResult.getFileItem()) { + if (deviceKey.equals(ovfFileItem.getDeviceId())) { + System.out.println("Import key==OvfFileItem device id: " + deviceKey); + System.out.println("device URL: " + deviceUrl.getUrl()); + + String absoluteFile = "C:\\research\\vmware\\winxpsp3-ovf\\" + ovfFileItem.getPath(); + String urlToPost = deviceUrl.getUrl().replace("*", "esxhost-1.lab.vmops.com"); + + uploadVmdkFile(ovfFileItem.isCreate(), absoluteFile, urlToPost, bytesAlreadyWritten, totalBytes); + bytesAlreadyWritten += ovfFileItem.getSize(); + System.out.println("Completed uploading the VMDK file:" + absoluteFile); + } + } + } + cb.getServiceConnection3().getService().httpNfcLeaseProgress(morLease, 100); + cb.getServiceConnection3().getService().httpNfcLeaseComplete(morLease); + } + } + } + + private static void uploadVmdkFile(boolean put, String diskFilePath, String urlStr, long bytesAlreadyWritten, long totalBytes) throws IOException { + HttpsURLConnection.setDefaultHostnameVerifier(new HostnameVerifier() { + public boolean verify(String urlHostName, SSLSession session) { + return true; + } + }); + + HttpsURLConnection conn = (HttpsURLConnection) new URL(urlStr).openConnection(); + + conn.setDoOutput(true); + conn.setUseCaches(false); + + int CHUCK_LEN = 64*1024; + conn.setChunkedStreamingMode(CHUCK_LEN); + conn.setRequestMethod(put? "PUT" : "POST"); // Use a post method to write the file. + conn.setRequestProperty("Connection", "Keep-Alive"); + conn.setRequestProperty("Content-Type", "application/x-vnd.vmware-streamVmdk"); + conn.setRequestProperty("Content-Length", Long.toString(new File(diskFilePath).length())); + BufferedOutputStream bos = new BufferedOutputStream(conn.getOutputStream()); + BufferedInputStream diskis = new BufferedInputStream(new FileInputStream(diskFilePath)); + int bytesAvailable = diskis.available(); + int bufferSize = Math.min(bytesAvailable, CHUCK_LEN); + byte[] buffer = new byte[bufferSize]; + long totalBytesWritten = 0; + while (true) { + int bytesRead = diskis.read(buffer, 0, bufferSize); + if (bytesRead == -1) + { + System.out.println("Total bytes written: " + totalBytesWritten); + break; + } + totalBytesWritten += bytesRead; + bos.write(buffer, 0, bufferSize); + bos.flush(); + System.out.println("Total bytes written: " + totalBytesWritten); + +/* + int progressPercent = (int) (((bytesAlreadyWritten + totalBytesWritten) * 100) / totalBytes); + leaseUpdater.setPercent(progressPercent); +*/ + } + diskis.close(); + bos.flush(); + bos.close(); + conn.disconnect(); + } + + public static long addTotalBytes(OvfCreateImportSpecResult ovfImportResult) { + OvfFileItem[] fileItemArr = ovfImportResult.getFileItem(); + long totalBytes = 0; + if (fileItemArr != null) { + for (OvfFileItem fi : fileItemArr) { + printOvfFileItem(fi); + totalBytes += fi.getSize(); + } + } + return totalBytes; + } + + private static void printOvfFileItem(OvfFileItem fi) { + System.out.println("================ OvfFileItem ================"); + System.out.println("chunkSize: " + fi.getChunkSize()); + System.out.println("create: " + fi.isCreate()); + System.out.println("deviceId: " + fi.getDeviceId()); + System.out.println("path: " + fi.getPath()); + System.out.println("size: " + fi.getSize()); + System.out.println("=============================================="); + } + + public static String readOvfContent(String ovfFilePath) throws IOException { + StringBuffer strContent = new StringBuffer(); + BufferedReader in = new BufferedReader(new InputStreamReader(new FileInputStream(ovfFilePath))); + String lineStr; + while ((lineStr = in.readLine()) != null) { + strContent.append(lineStr); + } + + in.close(); + return strContent.toString(); + } + + public static String escapeSpecialChars(String str) { + str = str.replaceAll("<", "<"); + return str.replaceAll(">", ">"); // do not escape "&" -> "&", "\"" -> """ + } + public static void main(String[] args) throws Exception { setupLog4j(); TestVMWare client = new TestVMWare(); @@ -878,7 +1076,7 @@ public class TestVMWare { // client.listInventoryFolders(); // client.listDataCenters(); - client.powerOnVm(); + // client.powerOnVm(); // client.createSnapshot(); // client.registerTemplate(); // client.createVmFromTemplate(); @@ -890,10 +1088,37 @@ public class TestVMWare { // client.getHostVMs(); // client.testFT(); // client.testFTEnable(); + + client.importOVF(); cb.disConnect(); } catch (Exception e) { e.printStackTrace(); } } + + public static class TrustAllManager implements javax.net.ssl.TrustManager, javax.net.ssl.X509TrustManager { + + public java.security.cert.X509Certificate[] getAcceptedIssuers() { + return null; + } + + public boolean isServerTrusted(java.security.cert.X509Certificate[] certs) { + return true; + } + + public boolean isClientTrusted(java.security.cert.X509Certificate[] certs) { + return true; + } + + public void checkServerTrusted(java.security.cert.X509Certificate[] certs, String authType) + throws java.security.cert.CertificateException { + return; + } + public void checkClientTrusted(java.security.cert.X509Certificate[] certs, String authType) + throws java.security.cert.CertificateException { + return; + } + } } + From 4534299092d14459f849135186b2dc2d3ddcc9ac Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 10 Sep 2010 10:34:00 -0700 Subject: [PATCH 085/244] Improve SynchronizationEvent --- .../com/cloud/utils/concurrency/SynchronizationEvent.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java b/utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java index 93da2b093ef..e5f8416f1ab 100644 --- a/utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java +++ b/utils/src/com/cloud/utils/concurrency/SynchronizationEvent.java @@ -45,7 +45,7 @@ public class SynchronizationEvent { } } - public boolean waitEvent() { + public boolean waitEvent() throws InterruptedException { synchronized(this) { if(signalled) return true; @@ -57,12 +57,13 @@ public class SynchronizationEvent { return signalled; } catch (InterruptedException e) { s_logger.debug("unexpected awaken signal in wait()"); + throw e; } } } } - public boolean waitEvent(long timeOutMiliseconds) { + public boolean waitEvent(long timeOutMiliseconds) throws InterruptedException { synchronized(this) { if(signalled) return true; @@ -73,7 +74,7 @@ public class SynchronizationEvent { } catch (InterruptedException e) { // TODO, we don't honor time out semantics when the waiting thread is interrupted s_logger.debug("unexpected awaken signal in wait(...)"); - return false; + throw e; } } } From e12f9ad19d65dda489c092bb5d6705833d2224a5 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 10 Sep 2010 16:47:00 -0700 Subject: [PATCH 086/244] Allow Script to execute under a specified working directory --- utils/src/com/cloud/utils/script/Script.java | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/utils/src/com/cloud/utils/script/Script.java b/utils/src/com/cloud/utils/script/Script.java index 88f4c356543..264601a0c3e 100755 --- a/utils/src/com/cloud/utils/script/Script.java +++ b/utils/src/com/cloud/utils/script/Script.java @@ -52,6 +52,7 @@ public class Script implements Callable { private static final ScheduledExecutorService s_executors = Executors.newScheduledThreadPool(10, new NamedThreadFactory("Script")); + String _workDir; ArrayList _command; long _timeout; Process _process; @@ -105,6 +106,10 @@ public class Script implements Callable { _command.add(value); return this; } + + public void setWorkDir(String workDir) { + _workDir = workDir; + } protected String buildCommandLine(String[] command) { StringBuilder builder = new StringBuilder(); @@ -159,6 +164,9 @@ public class Script implements Callable { try { ProcessBuilder pb = new ProcessBuilder(command); pb.redirectErrorStream(true); + if(_workDir != null) + pb.directory(new File(_workDir)); + _process = pb.start(); if (_process == null) { _logger.warn("Unable to execute: " + buildCommandLine(command)); From 5b2740f3f9c7e2fef9f600cf512cdca507e2d52d Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Fri, 10 Sep 2010 21:17:19 -0700 Subject: [PATCH 087/244] Change VMware template extenstion to ova --- api/src/com/cloud/storage/Storage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java index 81d94ad0331..b18ad9f7346 100644 --- a/api/src/com/cloud/storage/Storage.java +++ b/api/src/com/cloud/storage/Storage.java @@ -23,7 +23,7 @@ public class Storage { RAW(false, false, false), VHD(true, true, true), ISO(false, false, false), - VMDK(true, true, true, "vmw.tar"); + VMDK(true, true, true, "ova"); private final boolean thinProvisioned; private final boolean supportSparse; From d33d1a632d7a07a73be853fa09332d3aec6c7b8e Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 13 Sep 2010 14:39:58 -0700 Subject: [PATCH 088/244] Switch from VMDK to OVA on vmware image format --- api/src/com/cloud/storage/Storage.java | 2 +- core/src/com/cloud/storage/template/VmdkProcessor.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/src/com/cloud/storage/Storage.java b/api/src/com/cloud/storage/Storage.java index b18ad9f7346..6905255e678 100644 --- a/api/src/com/cloud/storage/Storage.java +++ b/api/src/com/cloud/storage/Storage.java @@ -23,7 +23,7 @@ public class Storage { RAW(false, false, false), VHD(true, true, true), ISO(false, false, false), - VMDK(true, true, true, "ova"); + OVA(true, true, true, "ova"); private final boolean thinProvisioned; private final boolean supportSparse; diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index d1e522196b1..1d46fc63950 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -26,7 +26,7 @@ public class VmdkProcessor implements Processor { } s_logger.info("Template processing. templatePath: " + templatePath + ", templateName: " + templateName); - String templateFilePath = templatePath + File.separator + templateName + "." + ImageFormat.VMDK.getFileExtension(); + String templateFilePath = templatePath + File.separator + templateName + "." + ImageFormat.OVA.getFileExtension(); if (!_storage.exists(templateFilePath)) { if(s_logger.isInfoEnabled()) s_logger.info("Unable to find the vmware template file: " + templateFilePath); @@ -34,8 +34,8 @@ public class VmdkProcessor implements Processor { } FormatInfo info = new FormatInfo(); - info.format = ImageFormat.VMDK; - info.filename = templateName + "." + ImageFormat.VMDK.getFileExtension(); + info.format = ImageFormat.OVA; + info.filename = templateName + "." + ImageFormat.OVA.getFileExtension(); info.size = _storage.getSize(templateFilePath); info.virtualSize = info.size; return info; From b262e0ec2c5a6f6909cee2771f38b3b11179bb07 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 13 Sep 2010 16:23:00 -0700 Subject: [PATCH 089/244] add vmware template post-processing --- .../com/cloud/storage/template/VmdkProcessor.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index 1d46fc63950..02d40cdeecc 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -10,6 +10,7 @@ import org.apache.log4j.Logger; import com.cloud.exception.InternalErrorException; import com.cloud.storage.StorageLayer; import com.cloud.storage.Storage.ImageFormat; +import com.cloud.utils.script.Script; public class VmdkProcessor implements Processor { private static final Logger s_logger = Logger.getLogger(VmdkProcessor.class); @@ -33,11 +34,25 @@ public class VmdkProcessor implements Processor { return null; } + s_logger.info("Template processing - untar OVA package. templatePath: " + templatePath + ", templateName: " + templateName); + File templateFile = new File(templatePath); + Script command = new Script(true, "tar", 0, s_logger); + command.add("-xf", templatePath); + command.setWorkDir(templateFile.getParent()); + String result = command.execute(); + if (result != null) { + s_logger.info("failed to untar OVA package due to " + result + ". templatePath: " + templatePath + ", templateName: " + templateName); + return null; + } + FormatInfo info = new FormatInfo(); info.format = ImageFormat.OVA; info.filename = templateName + "." + ImageFormat.OVA.getFileExtension(); info.size = _storage.getSize(templateFilePath); info.virtualSize = info.size; + + // delete original OVA file + templateFile.delete(); return info; } From f81491d5bdb823c9c6afab16aa2ad66826f3647a Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Mon, 13 Sep 2010 17:14:59 -0700 Subject: [PATCH 090/244] Fixes to VmdkProcessor --- core/src/com/cloud/storage/template/VmdkProcessor.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/core/src/com/cloud/storage/template/VmdkProcessor.java b/core/src/com/cloud/storage/template/VmdkProcessor.java index 02d40cdeecc..6e6df9ebf28 100644 --- a/core/src/com/cloud/storage/template/VmdkProcessor.java +++ b/core/src/com/cloud/storage/template/VmdkProcessor.java @@ -35,9 +35,11 @@ public class VmdkProcessor implements Processor { } s_logger.info("Template processing - untar OVA package. templatePath: " + templatePath + ", templateName: " + templateName); - File templateFile = new File(templatePath); + String templateFileFullPath = templatePath + templateName + "." + ImageFormat.OVA.getFileExtension(); + File templateFile = new File(templateFileFullPath); + Script command = new Script(true, "tar", 0, s_logger); - command.add("-xf", templatePath); + command.add("-xf", templateFileFullPath); command.setWorkDir(templateFile.getParent()); String result = command.execute(); if (result != null) { From 72e8b767fed556949561f675878b64f0fadef6c6 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Wed, 15 Sep 2010 10:43:30 -0700 Subject: [PATCH 091/244] Mount secondary storage as a datastore to implement ISO attachment --- core/src/com/cloud/agent/api/AttachIsoCommand.java | 9 +++++++++ core/src/com/cloud/storage/StorageManager.java | 2 +- server/src/com/cloud/server/ManagementServerImpl.java | 5 +++-- server/src/com/cloud/storage/StorageManagerImpl.java | 7 +++---- server/src/com/cloud/vm/UserVmManagerImpl.java | 11 ++++++++--- 5 files changed, 24 insertions(+), 10 deletions(-) diff --git a/core/src/com/cloud/agent/api/AttachIsoCommand.java b/core/src/com/cloud/agent/api/AttachIsoCommand.java index 6073ab553f7..f4e3fcc46bc 100644 --- a/core/src/com/cloud/agent/api/AttachIsoCommand.java +++ b/core/src/com/cloud/agent/api/AttachIsoCommand.java @@ -21,6 +21,7 @@ package com.cloud.agent.api; public class AttachIsoCommand extends Command { private String vmName; + private String storeUrl; private String isoPath; private boolean attach; @@ -49,4 +50,12 @@ public class AttachIsoCommand extends Command { public boolean isAttach() { return attach; } + + public String getStoreUrl() { + return storeUrl; + } + + public void setStoreUrl(String url) { + storeUrl = url; + } } diff --git a/core/src/com/cloud/storage/StorageManager.java b/core/src/com/cloud/storage/StorageManager.java index e75267963a7..d5e447e4e1b 100755 --- a/core/src/com/cloud/storage/StorageManager.java +++ b/core/src/com/cloud/storage/StorageManager.java @@ -138,7 +138,7 @@ public interface StorageManager extends Manager { * @param datacenterId * @return absolute ISO path */ - public String getAbsoluteIsoPath(long templateId, long dataCenterId); + public Pair getAbsoluteIsoPath(long templateId, long dataCenterId); /** * Returns the URL of the secondary storage host diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index edee8753ca2..16e361dd4d6 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -2399,10 +2399,11 @@ public class ManagementServerImpl implements ManagementServer { UserVmVO started = null; if (isIso) { - String isoPath = _storageMgr.getAbsoluteIsoPath(templateId, dataCenterId); + Pair isoPath = _storageMgr.getAbsoluteIsoPath(templateId, dataCenterId); + assert(isoPath != null); try { - started = _vmMgr.startVirtualMachine(userId, created.getId(), password, isoPath, startEventId); + started = _vmMgr.startVirtualMachine(userId, created.getId(), password, isoPath.first(), startEventId); } catch (ExecutionException e) { diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index 3dfca37b085..c9c3fc912c5 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -1174,8 +1174,7 @@ public class StorageManagerImpl implements StorageManager { return null; } - @Override - public String getAbsoluteIsoPath(long templateId, long dataCenterId) { + public Pair getAbsoluteIsoPath(long templateId, long dataCenterId) { String isoPath = null; List storageHosts = _hostDao.listBy(Host.Type.SecondaryStorage, dataCenterId); @@ -1184,12 +1183,12 @@ public class StorageManagerImpl implements StorageManager { VMTemplateHostVO templateHostVO = _vmTemplateHostDao.findByHostTemplate(storageHost.getId(), templateId); if (templateHostVO != null) { isoPath = storageHost.getStorageUrl() + "/" + templateHostVO.getInstallPath(); - break; + return new Pair(isoPath, storageHost.getStorageUrl()); } } } - return isoPath; + return null; } @Override diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 0112d6e454f..83d3c85d3a4 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -527,15 +527,18 @@ public class UserVmManagerImpl implements UserVmManager { } // Get the path of the ISO - String isoPath = _storageMgr.getAbsoluteIsoPath(isoId, vm.getDataCenterId()); + Pair isoPathPair = _storageMgr.getAbsoluteIsoPath(isoId, vm.getDataCenterId()); + String isoPath; String isoName = _templateDao.findById(isoId).getName(); - if (isoPath == null) { + if (isoPathPair == null) { // we can't send a null path to the ServerResource, so return false if we are unable to find the isoPath if (isoName.startsWith("xs-tools")) isoPath = isoName; else return false; + } else { + isoPath = isoPathPair.first(); } String vmName = vm.getInstanceName(); @@ -545,6 +548,8 @@ public class UserVmManagerImpl implements UserVmManager { return false; AttachIsoCommand cmd = new AttachIsoCommand(vmName, isoPath, attach); + if(isoPathPair != null) + cmd.setStoreUrl(isoPathPair.second()); Answer a = _agentMgr.easySend(vm.getHostId(), cmd); return (a != null); } @@ -670,7 +675,7 @@ public class UserVmManagerImpl implements UserVmManager { } else { Long isoId = vm.getIsoId(); if (isoId != null) { - isoPath = _storageMgr.getAbsoluteIsoPath(isoId, vm.getDataCenterId()); + isoPath = _storageMgr.getAbsoluteIsoPath(isoId, vm.getDataCenterId()).first(); } } From 2337a9d99f740da269e794282d404d3316eac0da Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Wed, 15 Sep 2010 13:38:22 -0700 Subject: [PATCH 092/244] Fix a NPE in AbstractStoragePoolAllocator.java when creating standalone volume --- .../cloud/storage/allocator/AbstractStoragePoolAllocator.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java index eefb6fa65ef..cf6471018cf 100644 --- a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java @@ -146,9 +146,11 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement } /*hypervisor type is correct*/ + // TODO : when creating a standalone volume, offering is passed as NULL, need to + // refine the logic of checking hypervisorType based on offering info Long clusterId = pool.getClusterId(); ClusterVO cluster = _clusterDao.findById(clusterId); - if (!cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) { + if (offering != null && !cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) { return false; } // check the used size against the total size, skip this host if it's greater than the configured From 86d59bdddd464ceffcee27096544675d3ed4bae7 Mon Sep 17 00:00:00 2001 From: Kelven Yang Date: Thu, 16 Sep 2010 11:50:57 -0700 Subject: [PATCH 093/244] Implement CreateVolume/AttachVolue for vmware --- core/src/com/cloud/agent/api/AttachVolumeCommand.java | 10 +++++++++- server/src/com/cloud/vm/UserVmManagerImpl.java | 4 ++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/core/src/com/cloud/agent/api/AttachVolumeCommand.java b/core/src/com/cloud/agent/api/AttachVolumeCommand.java index ca07733a91e..0ac47dd7e2e 100644 --- a/core/src/com/cloud/agent/api/AttachVolumeCommand.java +++ b/core/src/com/cloud/agent/api/AttachVolumeCommand.java @@ -25,6 +25,7 @@ public class AttachVolumeCommand extends Command { boolean attach; String vmName; StoragePoolType pooltype; + String poolUuid; String volumeFolder; String volumePath; String volumeName; @@ -83,5 +84,12 @@ public class AttachVolumeCommand extends Command { public void setDeviceId(Long deviceId) { this.deviceId = deviceId; } - + + public String getPoolUuid() { + return poolUuid; + } + + public void setPoolUuid(String poolUuid) { + this.poolUuid = poolUuid; + } } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 83d3c85d3a4..20770994d9a 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -387,7 +387,9 @@ public class UserVmManagerImpl implements UserVmManager { AttachVolumeAnswer answer = null; Long hostId = vm.getHostId(); if (sendCommand) { + StoragePoolVO volumePool = _storagePoolDao.findById(volume.getPoolId()); AttachVolumeCommand cmd = new AttachVolumeCommand(true, vm.getInstanceName(), volume.getPoolType(), volume.getFolder(), volume.getPath(), volume.getName(), deviceId); + cmd.setPoolUuid(volumePool.getUuid()); try { answer = (AttachVolumeAnswer)_agentMgr.send(hostId, cmd); @@ -481,6 +483,8 @@ public class UserVmManagerImpl implements UserVmManager { if (sendCommand) { AttachVolumeCommand cmd = new AttachVolumeCommand(false, vm.getInstanceName(), volume.getPoolType(), volume.getFolder(), volume.getPath(), volume.getName(), deviceId!=0 ? deviceId : volume.getDeviceId()); + StoragePoolVO volumePool = _storagePoolDao.findById(volume.getPoolId()); + cmd.setPoolUuid(volumePool.getUuid()); try { answer = _agentMgr.send(vm.getHostId(), cmd); From 8943cc67459958ef933ddfecc57059eafbc5b9c3 Mon Sep 17 00:00:00 2001 From: edison Date: Thu, 16 Sep 2010 13:22:14 -0700 Subject: [PATCH 094/244] create volume Conflicts: api/src/com/cloud/vm/VmCharacteristics.java core/src/com/cloud/dc/ClusterVO.java core/src/com/cloud/server/ManagementServer.java server/src/com/cloud/network/NetworkManager.java server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java --- api/src/com/cloud/hypervisor/Hypervisor.java | 29 +- core/.project | 49 +- core/src/com/cloud/dc/ClusterVO.java | 9 + .../com/cloud/server/ManagementServer.java | 9 +- .../src/com/cloud/storage/StorageManager.java | 4 +- core/src/com/cloud/storage/VMTemplateVO.java | 24 +- .../storage/dao/LaunchPermissionDaoImpl.java | 2 +- .../com/cloud/storage/dao/VMTemplateDao.java | 5 +- .../cloud/storage/dao/VMTemplateDaoImpl.java | 18 +- server/.project | 49 +- .../cloud/api/commands/CreateVolumeCmd.java | 5 +- .../cloud/api/commands/ListTemplatesCmd.java | 5 +- .../api/commands/RegisterTemplateCmd.java | 2 +- .../executor/VolumeOperationExecutor.java | 2 +- .../async/executor/VolumeOperationParam.java | 11 + .../xen/discoverer/XcpServerDiscoverer.java | 2 +- .../src/com/cloud/network/NetworkManager.java | 3 +- .../com/cloud/network/NetworkManagerImpl.java | 2 +- .../cloud/server/ManagementServerImpl.java | 7 +- .../com/cloud/storage/StorageManagerImpl.java | 9 +- .../AbstractStoragePoolAllocator.java | 7 + setup/db/create-schema.sql | 1 + setup/db/templates.sql | 425 ++++++++++++++++++ 23 files changed, 615 insertions(+), 64 deletions(-) create mode 100644 setup/db/templates.sql diff --git a/api/src/com/cloud/hypervisor/Hypervisor.java b/api/src/com/cloud/hypervisor/Hypervisor.java index c938bba26e4..89bb66a8a82 100644 --- a/api/src/com/cloud/hypervisor/Hypervisor.java +++ b/api/src/com/cloud/hypervisor/Hypervisor.java @@ -19,13 +19,38 @@ package com.cloud.hypervisor; public class Hypervisor { - public static enum Type { + public static enum HypervisorType { None, //for storage hosts Xen, XenServer, KVM, VmWare, VirtualBox, - Parralels; + Parralels, + Any; /*If you don't care about the hypervisor type*/ + } + + public static HypervisorType getType(String hypervisor) { + if (hypervisor == null) { + return HypervisorType.None; + } + + if (hypervisor.equalsIgnoreCase("Xen")) { + return HypervisorType.Xen; + } else if (hypervisor.equalsIgnoreCase("XenServer")) { + return HypervisorType.XenServer; + } else if (hypervisor.equalsIgnoreCase("KVM")) { + return HypervisorType.KVM; + } else if (hypervisor.equalsIgnoreCase("VmWare")) { + return HypervisorType.VmWare; + } else if (hypervisor.equalsIgnoreCase("VirtualBox")) { + return HypervisorType.VirtualBox; + } else if (hypervisor.equalsIgnoreCase("Parralels")) { + return HypervisorType.Parralels; + } else if (hypervisor.equalsIgnoreCase("Any")) { + return HypervisorType.Any; + } else { + return HypervisorType.None; + } } } diff --git a/core/.project b/core/.project index 9884df8b9ca..5adc59b78b4 100644 --- a/core/.project +++ b/core/.project @@ -1,17 +1,32 @@ - - - core - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + core + + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder.launch + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/New_Builder.launch + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/core/src/com/cloud/dc/ClusterVO.java b/core/src/com/cloud/dc/ClusterVO.java index b8f9f6b3d13..f2215b3a3a1 100644 --- a/core/src/com/cloud/dc/ClusterVO.java +++ b/core/src/com/cloud/dc/ClusterVO.java @@ -24,6 +24,7 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; +import com.cloud.hypervisor.Hypervisor; import com.cloud.org.Cluster; import com.cloud.utils.NumbersUtil; @@ -99,4 +100,12 @@ public class ClusterVO implements Cluster { ClusterVO that = (ClusterVO)obj; return this.id == that.id; } + + public Hypervisor.Type getHypervisorType() { + return Hypervisor.getType(hypervisorType); + } + + public void setHypervisorType(String hy) { + hypervisorType = hy; + } } diff --git a/core/src/com/cloud/server/ManagementServer.java b/core/src/com/cloud/server/ManagementServer.java index 75e4a19d5de..1c84ccf8a22 100755 --- a/core/src/com/cloud/server/ManagementServer.java +++ b/core/src/com/cloud/server/ManagementServer.java @@ -53,6 +53,8 @@ import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; import com.cloud.host.HostStats; import com.cloud.host.HostVO; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.info.ConsoleProxyInfo; import com.cloud.network.FirewallRuleVO; import com.cloud.network.IPAddressVO; @@ -484,11 +486,12 @@ public interface ManagementServer { * @param zoneId - id of the zone to create this volume on * @param diskOfferingId - id of the disk offering to create this volume with * @param size - size of the volume + * @param hyperType - hypervisor type * @return true if success, false if not */ VolumeVO createVolume(long accountId, long userId, String name, long zoneId, long diskOfferingId, long startEventId, long size) throws InternalErrorException; - long createVolumeAsync(long accountId, long userId, String name, long zoneId, long diskOfferingId, long size) throws InvalidParameterValueException, InternalErrorException, ResourceAllocationException; - + + long createVolumeAsync(long userId, long accountId, String name, long zoneId, long diskOfferingId, long size) throws InvalidParameterValueException, InternalErrorException, ResourceAllocationException; /** * Finds the root volume of the VM * @param vmId @@ -1814,7 +1817,7 @@ public interface ManagementServer { * @param zoneId optional zoneid to limit search * @return list of templates */ - List listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId) throws InvalidParameterValueException; + List listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId, HypervisorType hyperType) throws InvalidParameterValueException; /** * Search for disk offerings based on search criteria diff --git a/core/src/com/cloud/storage/StorageManager.java b/core/src/com/cloud/storage/StorageManager.java index d5e447e4e1b..534b37aeebe 100755 --- a/core/src/com/cloud/storage/StorageManager.java +++ b/core/src/com/cloud/storage/StorageManager.java @@ -36,6 +36,8 @@ import com.cloud.exception.ResourceInUseException; import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; import com.cloud.host.HostVO; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.hypervisor.Hypervisor.Type; import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.Volume.VolumeType; import com.cloud.user.Account; @@ -211,7 +213,7 @@ public interface StorageManager extends Manager { * @param size * @return VolumeVO */ - VolumeVO createVolume(long accountId, long userId, String name, DataCenterVO dc, DiskOfferingVO diskOffering, long startEventId, long size); + VolumeVO createVolume(long accountId, long userId, String name, DataCenterVO dc, DiskOfferingVO diskOffering, long startEventId, long size, Hypervisor.Type hyperType); /** * Marks the specified volume as destroyed in the management server database. The expunge thread will delete the volume from its storage pool. diff --git a/core/src/com/cloud/storage/VMTemplateVO.java b/core/src/com/cloud/storage/VMTemplateVO.java index e46a3bcc66e..2ef9f017fe2 100644 --- a/core/src/com/cloud/storage/VMTemplateVO.java +++ b/core/src/com/cloud/storage/VMTemplateVO.java @@ -32,6 +32,7 @@ import javax.persistence.Temporal; import javax.persistence.TemporalType; import com.cloud.async.AsyncInstanceCreateStatus; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.Storage.FileSystem; import com.cloud.storage.Storage.ImageFormat; import com.cloud.utils.db.GenericDao; @@ -104,7 +105,11 @@ public class VMTemplateVO implements VirtualMachineTemplate { private boolean prepopulate = false; @Column(name="cross_zones") - private boolean crossZones = false; + private boolean crossZones = false; + + @Column(name="hypervisor_type") + private String hypervisorType; + public String getUniqueName() { return uniqueName; @@ -120,11 +125,11 @@ public class VMTemplateVO implements VirtualMachineTemplate { /** * Proper constructor for a new vm template. */ - public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, FileSystem fs, String url, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable) { - this(id, generateUniqueName(id, accountId, name), name, format, isPublic, featured, fs, url, null, requiresHvm, bits, accountId, cksum, displayText, enablePassword, guestOSId, bootable); + public VMTemplateVO(long id, String name, ImageFormat format, boolean isPublic, boolean featured, FileSystem fs, String url, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, Hypervisor.Type hyperType) { + this(id, generateUniqueName(id, accountId, name), name, format, isPublic, featured, fs, url, null, requiresHvm, bits, accountId, cksum, displayText, enablePassword, guestOSId, bootable, hyperType); } - public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, FileSystem fs, String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable) { + public VMTemplateVO(Long id, String uniqueName, String name, ImageFormat format, boolean isPublic, boolean featured, FileSystem fs, String url, Date created, boolean requiresHvm, int bits, long accountId, String cksum, String displayText, boolean enablePassword, long guestOSId, boolean bootable, Hypervisor.Type hyperType) { this.id = id; this.name = name; this.publicTemplate = isPublic; @@ -141,7 +146,8 @@ public class VMTemplateVO implements VirtualMachineTemplate { this.format = format; this.created = created; this.guestOSId = guestOSId; - this.bootable = bootable; + this.bootable = bootable; + this.hypervisorType = hyperType.toString(); } public boolean getEnablePassword() { @@ -289,6 +295,14 @@ public class VMTemplateVO implements VirtualMachineTemplate { public boolean isCrossZones() { return crossZones; } + + public Hypervisor.Type getHypervisorType() { + return Hypervisor.getType(hypervisorType); + } + + public void setHypervisorType(Hypervisor.Type hyper) { + hypervisorType = hyper.toString(); + } @Override public boolean equals(Object that) { diff --git a/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java b/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java index 990523bb6da..fd6eda64a99 100644 --- a/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java +++ b/core/src/com/cloud/storage/dao/LaunchPermissionDaoImpl.java @@ -140,7 +140,7 @@ public class LaunchPermissionDaoImpl extends GenericDaoBase { public List findIsosByIdAndPath(Long domainId, Long accountId, String path); public List listReadyTemplates(); public List listByAccountId(long accountId); - public List searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Account account, DomainVO domain, Integer pageSize, Long startIndex, Long zoneId); + public List searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Account account, DomainVO domain, Integer pageSize, Long startIndex, Long zoneId, Hypervisor.Type hyperType); public long addTemplateToZone(VMTemplateVO tmplt, long zoneId); public List listAllInZone(long dataCenterId); + + public List listByHypervisorType(Hypervisor.Type hyperType); } diff --git a/core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index ed62b751e5f..f8172ae2277 100644 --- a/core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/core/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -32,6 +32,7 @@ import javax.naming.ConfigurationException; import org.apache.log4j.Logger; import com.cloud.domain.DomainVO; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.Storage; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateZoneVO; @@ -131,6 +132,13 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem SearchCriteria sc = AccountIdSearch.create(); sc.setParameters("accountId", accountId); return listBy(sc); + } + + @Override + public List listByHypervisorType(Hypervisor.Type hyperType) { + SearchCriteria sc = createSearchCriteria(); + sc.addAnd("hypervisor_type", SearchCriteria.Op.EQ, hyperType.toString()); + return listBy(sc); } @Override @@ -174,7 +182,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem } @Override - public List searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Account account, DomainVO domain, Integer pageSize, Long startIndex, Long zoneId) { + public List searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Account account, DomainVO domain, Integer pageSize, Long startIndex, Long zoneId, Hypervisor.Type hyperType) { Transaction txn = Transaction.currentTxn(); txn.start(); List templates = new ArrayList(); @@ -225,7 +233,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem whereClause += " AND "; } - sql += whereClause + getExtrasWhere(templateFilter, name, keyword, isIso, bootable) + getOrderByLimit(pageSize, startIndex); + sql += whereClause + getExtrasWhere(templateFilter, name, keyword, isIso, bootable, hyperType) + getOrderByLimit(pageSize, startIndex); pstmt = txn.prepareStatement(sql); rs = pstmt.executeQuery(); @@ -259,7 +267,7 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem return templates; } - private String getExtrasWhere(TemplateFilter templateFilter, String name, String keyword, boolean isIso, Boolean bootable) { + private String getExtrasWhere(TemplateFilter templateFilter, String name, String keyword, boolean isIso, Boolean bootable, Hypervisor.Type hyperType) { String sql = ""; if (keyword != null) { sql += " t.name LIKE \"%" + keyword + "%\" AND"; @@ -275,6 +283,10 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem if (bootable != null) { sql += " AND t.bootable = " + bootable; + } + + if (hyperType != null) { + sql += " AND t.hypervisor_type = " + hyperType.toString(); } sql += " AND t.removed IS NULL"; diff --git a/server/.project b/server/.project index 493e8001f75..78621356fbd 100644 --- a/server/.project +++ b/server/.project @@ -1,17 +1,32 @@ - - - server - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - + + + server + + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/ant build.launch + + + + + org.eclipse.ui.externaltools.ExternalToolBuilder + full,incremental, + + + LaunchConfigHandle + <project>/.externalToolBuilders/org.eclipse.jdt.core.javabuilder (1).launch + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/server/src/com/cloud/api/commands/CreateVolumeCmd.java b/server/src/com/cloud/api/commands/CreateVolumeCmd.java index 9e63a551ee4..b3fa27d58b9 100644 --- a/server/src/com/cloud/api/commands/CreateVolumeCmd.java +++ b/server/src/com/cloud/api/commands/CreateVolumeCmd.java @@ -28,6 +28,7 @@ import com.cloud.api.BaseCmd; import com.cloud.api.ServerApiException; import com.cloud.async.executor.VolumeOperationResultObject; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.hypervisor.Hypervisor; import com.cloud.serializer.SerializerHelper; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.Snapshot; @@ -49,6 +50,7 @@ public class CreateVolumeCmd extends BaseCmd { s_properties.add(new Pair(BaseCmd.Properties.DISK_OFFERING_ID, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.SNAPSHOT_ID, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.SIZE, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.HYPERVISOR_TYPE, Boolean.FALSE)); } public String getName() { @@ -74,6 +76,7 @@ public class CreateVolumeCmd extends BaseCmd { Long diskOfferingId = (Long) params.get(BaseCmd.Properties.DISK_OFFERING_ID.getName()); Long snapshotId = (Long)params.get(BaseCmd.Properties.SNAPSHOT_ID.getName()); Long size = (Long)params.get(BaseCmd.Properties.SIZE.getName()); + Hypervisor.Type hyperType = Hypervisor.getType((String)params.get(BaseCmd.Properties.HYPERVISOR_TYPE.getName())); if (account == null) { // Admin API call @@ -184,7 +187,7 @@ public class CreateVolumeCmd extends BaseCmd { if (useSnapshot) { jobId = getManagementServer().createVolumeFromSnapshotAsync(userId, account.getId(), snapshotId, name); } else { - jobId = getManagementServer().createVolumeAsync(userId, account.getId(), name, zoneId, diskOfferingId, size); + jobId = getManagementServer().createVolumeAsync(userId, account.getId(), name, zoneId, diskOfferingId, size, hyperType); } if (jobId == 0) { diff --git a/server/src/com/cloud/api/commands/ListTemplatesCmd.java b/server/src/com/cloud/api/commands/ListTemplatesCmd.java index b55fe57ce0d..84bbd693be7 100644 --- a/server/src/com/cloud/api/commands/ListTemplatesCmd.java +++ b/server/src/com/cloud/api/commands/ListTemplatesCmd.java @@ -29,6 +29,7 @@ import com.cloud.api.ServerApiException; import com.cloud.async.AsyncJobVO; import com.cloud.dc.DataCenterVO; import com.cloud.host.HostVO; +import com.cloud.hypervisor.Hypervisor; import com.cloud.storage.GuestOS; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; @@ -57,6 +58,7 @@ public class ListTemplatesCmd extends BaseCmd { s_properties.add(new Pair(BaseCmd.Properties.PAGE, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.PAGESIZE, Boolean.FALSE)); s_properties.add(new Pair(BaseCmd.Properties.ZONE_ID, Boolean.FALSE)); + s_properties.add(new Pair(BaseCmd.Properties.HYPERVISOR_TYPE, Boolean.FALSE)); } @@ -83,6 +85,7 @@ public class ListTemplatesCmd extends BaseCmd { Integer page = (Integer)params.get(BaseCmd.Properties.PAGE.getName()); Integer pageSize = (Integer)params.get(BaseCmd.Properties.PAGESIZE.getName()); Long zoneId = (Long)params.get(BaseCmd.Properties.ZONE_ID.getName()); + Hypervisor.Type hyperType = Hypervisor.getType((String)params.get(BaseCmd.Properties.HYPERVISOR_TYPE.getName())); boolean isAdmin = false; Long accountId = null; @@ -136,7 +139,7 @@ public class ListTemplatesCmd extends BaseCmd { List templates = null; try { - templates = getManagementServer().listTemplates(id, name, keyword, templateFilter, false, null, accountId, pageSize, startIndex, zoneId); + templates = getManagementServer().listTemplates(id, name, keyword, templateFilter, false, null, accountId, pageSize, startIndex, zoneId, hyperType); } catch (Exception e) { throw new ServerApiException(BaseCmd.INTERNAL_ERROR, e.getMessage()); } diff --git a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java index 01a9150e1a0..a1abb00a883 100755 --- a/server/src/com/cloud/api/commands/RegisterTemplateCmd.java +++ b/server/src/com/cloud/api/commands/RegisterTemplateCmd.java @@ -58,7 +58,7 @@ public class RegisterTemplateCmd extends BaseCmd { s_properties.add(new Pair(BaseCmd.Properties.FORMAT, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.OS_TYPE_ID, Boolean.TRUE)); s_properties.add(new Pair(BaseCmd.Properties.ZONE_ID, Boolean.TRUE)); - + s_properties.add(new Pair(BaseCmd.Properties.HYPERVISOR_TYPE, Boolean.FALSE)); } diff --git a/server/src/com/cloud/async/executor/VolumeOperationExecutor.java b/server/src/com/cloud/async/executor/VolumeOperationExecutor.java index 750bf2f6f9e..92380c226cd 100644 --- a/server/src/com/cloud/async/executor/VolumeOperationExecutor.java +++ b/server/src/com/cloud/async/executor/VolumeOperationExecutor.java @@ -62,7 +62,7 @@ public class VolumeOperationExecutor extends BaseAsyncJobExecutor { if (op == VolumeOp.Create) { eventType = EventTypes.EVENT_VOLUME_CREATE; failureDescription = "Failed to create volume"; - volume = asyncMgr.getExecutorContext().getManagementServer().createVolume(param.getUserId(), param.getAccountId(), param.getName(), param.getZoneId(), param.getDiskOfferingId(), param.getEventId(), param.getSize()); + volume = asyncMgr.getExecutorContext().getManagementServer().createVolume(param.getUserId(), param.getAccountId(), param.getName(), param.getZoneId(), param.getDiskOfferingId(), param.getEventId(), param.getSize(), param.getHyperType()); if (volume.getStatus() == AsyncInstanceCreateStatus.Corrupted) { asyncMgr.completeAsyncJob(getJob().getId(), AsyncJobResult.STATUS_FAILED, BaseCmd.INTERNAL_ERROR, "Failed to create volume."); } else { diff --git a/server/src/com/cloud/async/executor/VolumeOperationParam.java b/server/src/com/cloud/async/executor/VolumeOperationParam.java index b59ddd51f2f..463aaadb227 100644 --- a/server/src/com/cloud/async/executor/VolumeOperationParam.java +++ b/server/src/com/cloud/async/executor/VolumeOperationParam.java @@ -18,6 +18,8 @@ package com.cloud.async.executor; +import com.cloud.hypervisor.Hypervisor; + public class VolumeOperationParam { public enum VolumeOp { Create, Attach, Detach;} @@ -32,6 +34,7 @@ public class VolumeOperationParam { private String name; private long diskOfferingId; private long size; + Hypervisor.Type hypervisorType; // Used for Attach and Detach private long vmId; @@ -132,4 +135,12 @@ public class VolumeOperationParam { public void setSize(long size){ this.size = size; } + + public Hypervisor.Type getHyperType() { + return hypervisorType; + } + + public void setHyperType(Hypervisor.Type hyperType) { + hypervisorType = hyperType; + } } diff --git a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java index de780e6964a..e6a1bf454d3 100644 --- a/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java +++ b/server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java @@ -491,7 +491,7 @@ public class XcpServerDiscoverer extends DiscovererBase implements Discoverer, L Long id; if (tmplt == null) { id = _tmpltDao.getNextInSequence(Long.class, "id"); - VMTemplateVO template = new VMTemplateVO(id, xenPVISO.getTemplateName(), xenPVISO.getTemplateName(), ImageFormat.ISO , true, true, FileSystem.cdfs, "/opt/xensource/packages/iso/xs-tools-5.5.0.iso", null, true, 64, Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false); + VMTemplateVO template = new VMTemplateVO(id, xenPVISO.getTemplateName(), xenPVISO.getTemplateName(), ImageFormat.ISO , true, true, FileSystem.cdfs, "/opt/xensource/packages/iso/xs-tools-5.5.0.iso", null, true, 64, Account.ACCOUNT_ID_SYSTEM, null, "xen-pv-drv-iso", false, 1, false, null); _tmpltDao.persist(template); } else { id = _tmpltDao.findByName(xenPVISO.getTemplateName()).getId(); diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java index f312714c638..37a3fc977cc 100644 --- a/server/src/com/cloud/network/NetworkManager.java +++ b/server/src/com/cloud/network/NetworkManager.java @@ -33,6 +33,7 @@ import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InsufficientVirtualNetworkCapcityException; import com.cloud.exception.ResourceAllocationException; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.service.ServiceOfferingVO; import com.cloud.user.AccountVO; @@ -147,7 +148,7 @@ public interface NetworkManager extends Manager { * @param so service offering associated with this request * @return public ip address. */ - public String assignSourceNatIpAddress(AccountVO account, DataCenterVO dc, String domain, ServiceOfferingVO so, long startEventId) throws ResourceAllocationException; + public String assignSourceNatIpAddress(AccountVO account, DataCenterVO dc, String domain, ServiceOfferingVO so, long startEventId, HypervisorType hyperType) throws ResourceAllocationException; /** * @param fwRules list of rules to be updated diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index 14eb6810379..f554753d615 100644 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -255,7 +255,7 @@ public class NetworkManagerImpl implements NetworkManager, VirtualMachineManager } @Override @DB - public String assignSourceNatIpAddress(AccountVO account, final DataCenterVO dc, final String domain, final ServiceOfferingVO serviceOffering, long startEventId) throws ResourceAllocationException { + public String assignSourceNatIpAddress(AccountVO account, final DataCenterVO dc, final String domain, final ServiceOfferingVO serviceOffering, long startEventId, HypervisorType hyperType) throws ResourceAllocationException { if (serviceOffering.getGuestIpType() == NetworkOffering.GuestIpType.DirectDual || serviceOffering.getGuestIpType() == NetworkOffering.GuestIpType.DirectSingle) { return null; } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index 16e361dd4d6..b7c7b59c235 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -160,7 +160,7 @@ import com.cloud.host.HostStats; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; -import com.cloud.hypervisor.Hypervisor; +import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.info.ConsoleProxyInfo; import com.cloud.network.FirewallRuleVO; import com.cloud.network.IPAddressVO; @@ -1853,6 +1853,7 @@ public class ManagementServerImpl implements ManagementServer { param.setDiskOfferingId(diskOfferingId); param.setEventId(eventId); param.setSize(size); + param.setHyperType(hyperType); Gson gson = GsonHelper.getBuilder().create(); @@ -4365,7 +4366,7 @@ public class ManagementServerImpl implements ManagementServer { } @Override - public List listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId) throws InvalidParameterValueException { + public List listTemplates(Long templateId, String name, String keyword, TemplateFilter templateFilter, boolean isIso, Boolean bootable, Long accountId, Integer pageSize, Long startIndex, Long zoneId, Hypervisor.Type hyperType) throws InvalidParameterValueException { VMTemplateVO template = null; if (templateId != null) { template = _templateDao.findById(templateId); @@ -4394,7 +4395,7 @@ public class ManagementServerImpl implements ManagementServer { List templates = new ArrayList(); if (template == null) { - templates = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, bootable, account, domain, pageSize, startIndex, zoneId); + templates = _templateDao.searchTemplates(name, keyword, templateFilter, isIso, bootable, account, domain, pageSize, startIndex, zoneId, hyperType); } else { templates = new ArrayList(); templates.add(template); diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index c9c3fc912c5..7911e923b03 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -339,7 +339,7 @@ public class StorageManagerImpl implements StorageManager { } else { offering = _offeringDao.findById(vol.getDiskOfferingId()); } - VolumeVO created = createVolume(create, vm, template, dc, pod, host.getClusterId(), offering, diskOffering, new ArrayList(),0); + VolumeVO created = createVolume(create, vm, template, dc, pod, host.getClusterId(), offering, diskOffering, new ArrayList(),0, Hypervisor.Type.Any); if (created == null) { break; } @@ -719,9 +719,10 @@ public class StorageManagerImpl implements StorageManager { return new Pair(vdiUUID, basicErrMsg); } - @DB - protected VolumeVO createVolume(VolumeVO volume, VMInstanceVO vm, VMTemplateVO template, DataCenterVO dc, HostPodVO pod, Long clusterId, - ServiceOfferingVO offering, DiskOfferingVO diskOffering, List avoids, long size) { + @DB + @Override + public VolumeVO createVolume(VolumeVO volume, VMInstanceVO vm, VMTemplateVO template, DataCenterVO dc, HostPodVO pod, Long clusterId, + ServiceOfferingVO offering, DiskOfferingVO diskOffering, List avoids, long size, Hypervisor.Type hyperType) { StoragePoolVO pool = null; final HashSet avoidPools = new HashSet(avoids); diff --git a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java index cf6471018cf..71e2e493ceb 100644 --- a/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java +++ b/server/src/com/cloud/storage/allocator/AbstractStoragePoolAllocator.java @@ -144,6 +144,13 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement if (!poolIsCorrectType(dskCh, pool, vm)) { return false; } + + /*hypervisor type is correct*/ + Long clusterId = pool.getClusterId(); + ClusterVO cluster = _clusterDao.findById(clusterId); + if (!cluster.getHypervisorType().equalsIgnoreCase(offering.gethypervisorType())) { + return false; + } /*hypervisor type is correct*/ // TODO : when creating a standalone volume, offering is passed as NULL, need to diff --git a/setup/db/create-schema.sql b/setup/db/create-schema.sql index a39e618a810..747eb44c96c 100755 --- a/setup/db/create-schema.sql +++ b/setup/db/create-schema.sql @@ -550,6 +550,7 @@ CREATE TABLE `cloud`.`vm_template` ( `bootable` int(1) unsigned NOT NULL default 1 COMMENT 'true if this template represents a bootable ISO', `prepopulate` int(1) unsigned NOT NULL default 0 COMMENT 'prepopulate this template to primary storage', `cross_zones` int(1) unsigned NOT NULL default 0 COMMENT 'Make this template available in all zones', + `hypervisor_type` varchar(255) COMMENT 'hypervisor that the template is belonged to', PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/setup/db/templates.sql b/setup/db/templates.sql new file mode 100644 index 00000000000..5b6a8865ce6 --- /dev/null +++ b/setup/db/templates.sql @@ -0,0 +1,425 @@ +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (1, 'routing', 'SystemVM Template', 0, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/releases/2.2/systemvm.vhd.bz2', 'bcc7f290f4c27ab4d0fe95d1012829ea', 0, 'SystemVM Template', 'VHD', 15, 0, 1, 'Xenserver'); +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (2, 'centos53-x86_64', 'CentOS 5.3(x86_64) no GUI', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/f59f18fb-ae94-4f97-afd2-f84755767aca.vhd.bz2', 'b63d854a9560c013142567bbae8d98cf', 0, 'CentOS 5.3(x86_64) no GUI', 'VHD', 12, 1, 1, 'Xenserver'); + +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (3, 'routing', 'DomR Template', 0, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/a88232bf-6a18-38e7-aeee-c1702725079f.qcow2.bz2', 'e39c55e93ae96bd43bfd588ca6ee3269', 'DomR Template', 0, 'QCOW2', 21, 0, 1, 'KVM'); +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, display_text, enable_password, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (4, 'centos55-x86_64', 'CentOS 5.5(x86_64) no GUI', 1, now(), 'ext3', 0, 64, 1, 'http://download.cloud.com/templates/builtin/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2', '1da20ae69b54f761f3f733dce97adcc0', 'CentOS 5.5(x86_64) no GUI', 0, 'QCOW2', 9, 1, 1, 'KVM'); + +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (5, 'blank', 'BlankVM', 1, now(), 'ext3', 0, 32, 1, 'http://nfs1.lab.vmops.com/templates/vmware/blankvm.tar.bz2', '3eff7ce3d25cf9433efde8b245c63fcb', 0, 'BlankVM', 'VMDK', 47, 1, 1, 'VMware'); + +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (6, 'winxpsp3', 'WindowsXP-SP3', 1, now(), 'ntfs', 0, 32, 1, 'http://nfs1.lab.vmops.com/templates/vmware/winxpsp3.tar.bz2', '385e67d17a2cb3795bd0b0fb7f88dc5e', 0, 'WindowsXP-SP3', 'VMDK', 16, 1, 1, 'VMware'); + + +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (1, 'CentOS'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (2, 'Debian'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (3, 'Oracle'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (4, 'RedHat'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (5, 'SUSE'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (6, 'Windows'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (7, 'Other'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (8, 'Novel'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (9, 'Unix'); +INSERT INTO `cloud`.`guest_os_category` (id, name) VALUES (10, 'Ubuntu'); + + +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (1, 1, 'CentOS 4.5 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (2, 1, 'CentOS 4.6 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (3, 1, 'CentOS 4.7 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (4, 1, 'CentOS 4.8 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (5, 1, 'CentOS 5.0 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (6, 1, 'CentOS 5.0 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (7, 1, 'CentOS 5.1 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (8, 1, 'CentOS 5.1 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (9, 1, 'CentOS 5.2 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (10, 1, 'CentOS 5.2 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (11, 1, 'CentOS 5.3 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (12, 1, 'CentOS 5.3 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (13, 1, 'CentOS 5.4 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (14, 1, 'CentOS 5.4 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (15, 2, 'Debian GNU/Linux 5.0 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (16, 3, 'Oracle Enterprise Linux 5.0 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (17, 3, 'Oracle Enterprise Linux 5.0 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (18, 3, 'Oracle Enterprise Linux 5.1 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (19, 3, 'Oracle Enterprise Linux 5.1 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (20, 3, 'Oracle Enterprise Linux 5.2 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (21, 3, 'Oracle Enterprise Linux 5.2 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (22, 3, 'Oracle Enterprise Linux 5.3 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (23, 3, 'Oracle Enterprise Linux 5.3 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (24, 3, 'Oracle Enterprise Linux 5.4 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (25, 3, 'Oracle Enterprise Linux 5.4 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (26, 4, 'Red Hat Enterprise Linux 4.5 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (27, 4, 'Red Hat Enterprise Linux 4.6 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (28, 4, 'Red Hat Enterprise Linux 4.7 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (29, 4, 'Red Hat Enterprise Linux 4.8 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (30, 4, 'Red Hat Enterprise Linux 5.0 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (31, 4, 'Red Hat Enterprise Linux 5.0 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (32, 4, 'Red Hat Enterprise Linux 5.1 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (33, 4, 'Red Hat Enterprise Linux 5.1 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (34, 4, 'Red Hat Enterprise Linux 5.2 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (35, 4, 'Red Hat Enterprise Linux 5.2 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (36, 4, 'Red Hat Enterprise Linux 5.3 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (37, 4, 'Red Hat Enterprise Linux 5.3 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (38, 4, 'Red Hat Enterprise Linux 5.4 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (39, 4, 'Red Hat Enterprise Linux 5.4 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (40, 5, 'SUSE Linux Enterprise Server 9 SP4 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (41, 5, 'SUSE Linux Enterprise Server 10 SP1 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (42, 5, 'SUSE Linux Enterprise Server 10 SP1 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (43, 5, 'SUSE Linux Enterprise Server 10 SP2 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (44, 5, 'SUSE Linux Enterprise Server 10 SP2 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (45, 5, 'SUSE Linux Enterprise Server 10 SP3 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (46, 5, 'SUSE Linux Enterprise Server 11 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (47, 5, 'SUSE Linux Enterprise Server 11 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (48, 6, 'Windows 7 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (49, 6, 'Windows 7 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (50, 6, 'Windows Server 2003 Enterprise Edition(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (51, 6, 'Windows Server 2003 Enterprise Edition(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (52, 6, 'Windows Server 2008 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (53, 6, 'Windows Server 2008 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (54, 6, 'Windows Server 2008 R2 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (55, 6, 'Windows 2000 Server SP4 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (56, 6, 'Windows Vista (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (57, 6, 'Windows XP SP2 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (58, 6, 'Windows XP SP3 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (59, 10, 'Other Ubuntu (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (60, 7, 'Other (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (61, 6, 'Windows 2000 Server'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (62, 6, 'Windows 98'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (63, 6, 'Windows 95'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (64, 6, 'Windows NT 4'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (65, 6, 'Windows 3.1'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (66, 4, 'Red Hat Enterprise Linux 3(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (67, 4, 'Red Hat Enterprise Linux 3(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (68, 7, 'Open Enterprise Server'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (69, 7, 'Asianux 3(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (70, 7, 'Asianux 3(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (72, 2, 'Debian GNU/Linux 5(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (73, 2, 'Debian GNU/Linux 4(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (74, 2, 'Debian GNU/Linux 4(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (75, 7, 'Other 2.6x Linux (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (76, 7, 'Other 2.6x Linux (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (77, 8, 'Novell Netware 6.x'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (78, 8, 'Novell Netware 5.1'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (79, 9, 'Sun Solaris 10(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (80, 9, 'Sun Solaris 10(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (81, 9, 'Sun Solaris 9(Experimental)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (82, 9, 'Sun Solaris 8(Experimental)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (83, 9, 'FreeBSD (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (84, 9, 'FreeBSD (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (85, 9, 'SCO OpenServer 5'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (86, 9, 'SCO UnixWare 7'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (87, 6, 'Windows Server 2003 DataCenter Edition(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (88, 6, 'Windows Server 2003 DataCenter Edition(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (89, 6, 'Windows Server 2003 Standard Edition(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (90, 6, 'Windows Server 2003 Standard Edition(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (91, 6, 'Windows Server 2003 Web Edition'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (92, 6, 'Microsoft Small Bussiness Server 2003'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (93, 6, 'Windows XP (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (94, 6, 'Windows XP (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (95, 6, 'Windows 2000 Advanced Server'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (96, 5, 'SUSE Linux Enterprise 8(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (97, 5, 'SUSE Linux Enterprise 8(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (98, 7, 'Other Linux (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (99, 7, 'Other Linux (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (100, 10, 'Other Ubuntu (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (101, 6, 'Windows Vista (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (102, 6, 'DOS'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (103, 7, 'Other (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (104, 7, 'OS/2'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (105, 6, 'Windows 2000 Professional'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (106, 4, 'Red Hat Enterprise Linux 4(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (107, 5, 'SUSE Linux Enterprise 9(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (108, 5, 'SUSE Linux Enterprise 9(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (109, 5, 'SUSE Linux Enterprise 10(32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (110, 5, 'SUSE Linux Enterprise 10(64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (111, 1, 'CentOS 5.5 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (112, 1, 'CentOS 5.5 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (113, 4, 'Red Hat Enterprise Linux 5.5 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (114, 4, 'Red Hat Enterprise Linux 5.5 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (115, 4, 'Fedora 13'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (116, 4, 'Fedora 12'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (117, 4, 'Fedora 11'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (118, 4, 'Fedora 10'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (119, 4, 'Fedora 9'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (120, 4, 'Fedora 8'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (121, 10, 'Ubuntu 10.04 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (122, 10, 'Ubuntu 9.10 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (123, 10, 'Ubuntu 9.04 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (124, 10, 'Ubuntu 8.10 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (125, 10, 'Ubuntu 8.04 (32-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (126, 10, 'Ubuntu 10.04 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (127, 10, 'Ubuntu 9.10 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (128, 10, 'Ubuntu 9.04 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (129, 10, 'Ubuntu 8.10 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (130, 10, 'Ubuntu 8.04 (64-bit)'); +INSERT INTO `cloud`.`guest_os` (id, category_id, display_name) VALUES (131, 10, 'Red Hat Enterprise Linux 2'); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 4.5 (32-bit)', 1); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 4.6 (32-bit)', 2); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 4.7 (32-bit)', 3); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 4.8 (32-bit)', 4); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.0 (32-bit)', 5); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.0 (64-bit)', 6); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.1 (32-bit)', 7); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.1 (32-bit)', 8); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.2 (32-bit)', 9); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.2 (64-bit)', 10); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.3 (32-bit)', 11); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.3 (64-bit)', 12); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.4 (32-bit)', 13); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'CentOS 5.4 (64-bit)', 14); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Debian Lenny 5.0 (32-bit)', 15); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.0 (32-bit)', 16); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.0 (64-bit)', 17); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.1 (32-bit)', 18); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.1 (64-bit)', 19); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.2 (32-bit)', 20); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.2 (64-bit)', 21); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.3 (32-bit)', 22); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.3 (64-bit)', 23); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.4 (32-bit)', 24); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Oracle Enterprise Linux 5.4 (64-bit)', 25); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 4.5 (32-bit)', 26); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 4.6 (32-bit)', 27); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 4.7 (32-bit)', 28); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 4.8 (32-bit)', 29); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.0 (32-bit)', 30); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.0 (64-bit)', 31); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.1 (32-bit)', 32); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.1 (64-bit)', 33); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.2 (32-bit)', 34); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.2 (64-bit)', 35); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.3 (32-bit)', 36); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.3 (64-bit)', 37); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.4 (32-bit)', 38); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Red Hat Enterprise Linux 5.4 (64-bit)', 39); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 9 SP4 (32-bit)', 40); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 10 SP1 (32-bit)', 41); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 10 SP1 (64-bit)', 42); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 10 SP2 (32-bit)', 43); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 10 SP2 (64-bit)', 44); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 10 SP3 (64-bit)', 45); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 11 (32-bit)', 46); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'SUSE Linux Enterprise Server 11 (64-bit)', 47); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows 7 (32-bit)', 48); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows 7 (64-bit)', 49); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2003 (32-bit)', 50); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2003 (64-bit)', 51); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2008 (32-bit)', 52); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2008 (64-bit)', 53); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Server 2008 R2 (64-bit)', 54); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows 2000 SP4 (32-bit)', 55); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows Vista (32-bit)', 56); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows XP SP2 (32-bit)', 57); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Windows XP SP3 (32-bit)', 58); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Other install media', 59); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Other install media', 100); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Other install media', 60); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("XenServer", 'Other install media', 103); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 121); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 126); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 122); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 127); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 123); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 128); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 124); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 129); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 125); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('XenServer', 'Other install media', 130); + + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 7(32-bit)', 48); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 7(64-bit)', 49); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2008 R2(64-bit)', 54); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2008(32-bit)', 52); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2008(64-bit)', 53); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Enterprise Edition (32-bit)', 50); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Enterprise Edition (64-bit)', 51); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Datacenter Edition (32-bit)', 87); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Datacenter Edition (64-bit)', 88); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Standard Edition (32-bit)', 89); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Standard Edition (64-bit)', 90); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Server 2003, Web Edition', 91); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Small Bussiness Server 2003', 92); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Vista (32-bit)', 56); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows Vista (64-bit)', 101); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows XP Professional (32-bit)', 93); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows XP Professional (32-bit)', 57); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows XP Professional (32-bit)', 58); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows XP Professional (64-bit)', 94); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 2000 Advanced Server', 95); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 2000 Server', 61); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 2000 Professional', 105); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 2000 Server', 55); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 98', 62); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 95', 63); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows NT 4', 64); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Microsoft Windows 3.1', 65); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(32-bit)', 30); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(32-bit)', 32); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(32-bit)', 34); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(32-bit)', 36); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(32-bit)', 38); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(64-bit)', 31); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(64-bit)', 33); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(64-bit)', 35); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(64-bit)', 37); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 5(64-bit)', 39); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 4(32-bit)', 26); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 4(32-bit)', 27); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 4(32-bit)', 28); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 4(32-bit)', 29); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 4(64-bit)', 106); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 3(32-bit)', 66); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 3(64-bit)', 67); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Red Hat Enterprise Linux 2', 131); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 11(32-bit)', 46); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 11(64-bit)', 47); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(32-bit)', 41); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(32-bit)', 43); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(64-bit)', 42); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(64-bit)', 44); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(64-bit)', 45); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(32-bit)', 109); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 10(64-bit)', 110); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 8/9(32-bit)', 40); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 8/9(32-bit)', 96); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 8/9(64-bit)', 97); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 8/9(32-bit)', 107); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Suse Linux Enterprise 8/9(64-bit)', 108); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Open Enterprise Server', 68); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Asianux 3(32-bit)', 69); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Asianux 3(64-bit)', 70); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Debian GNU/Linux 5(32-bit)', 15); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Debian GNU/Linux 5(64-bit)', 72); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Debian GNU/Linux 4(32-bit)', 73); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Debian GNU/Linux 4(64-bit)', 74); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 59); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 121); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 122); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 123); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 124); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (32-bit)', 125); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 100); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 126); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 127); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 128); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 129); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Ubuntu Linux (64-bit)', 130); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other 2.6x Linux (32-bit)', 75); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other 2.6x Linux (64-bit)', 76); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other Linux (32-bit)', 98); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other Linux (64-bit)', 99); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Novell Netware 6.x', 77); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Novell Netware 5.1', 78); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Sun Solaris 10(32-bit)', 79); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Sun Solaris 10(64-bit)', 80); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Sun Solaris 9(Experimental)', 81); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Sun Solaris 8(Experimental)', 82); + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'FreeBSD (32-bit)', 83); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'FreeBSD (64-bit)', 84); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'OS/2', 104); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'SCO OpenServer 5', 85); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'SCO UnixWare 7', 86); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'DOS', 102); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other (32-bit)', 60); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ("VmWare", 'Other (64-bit)', 103); + + + +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 4.5', 1); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 4.6', 2); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 4.7', 3); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 4.8', 4); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.0', 5); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.0', 6); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.1', 7); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.1', 8); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.2', 9); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.2', 10); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.3', 11); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.3', 12); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.4', 13); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.4', 14); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.5', 111); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'CentOS 5.5', 112); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 4.5', 26); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 4.6', 27); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 4.7', 28); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 4.8', 29); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.0', 30); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.0', 31); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.1', 32); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.1', 33); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.2', 34); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.2', 35); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.3', 36); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.3', 37); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.4', 38); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.4', 39); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.5', 113); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 5.5', 114); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 4', 106); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 3', 66); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 3', 67); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Red Hat Enterprise Linux 2', 131); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 13', 115); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 12', 116); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 11', 117); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 10', 118); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 9', 119); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Fedora 8', 120); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 10.04', 121); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 10.04', 126); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 9.10', 122); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 9.10', 127); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 9.04', 123); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 9.04', 128); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 8.10', 124); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 8.10', 129); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 8.04', 125); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Ubuntu 8.04', 130); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Debian GNU/Linux 5', 15); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Debian GNU/Linux 5', 72); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Debian GNU/Linux 4', 73); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Debian GNU/Linux 4', 74); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Linux 2.6x', 75); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Linux 2.6x', 76); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Ubuntu', 59); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Ubuntu', 100); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Linux', 98); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other Linux', 99); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 7', 48); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 7', 49); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 50); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 51); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 87); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 88); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 89); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 90); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 91); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2003', 92); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2008', 52); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Server 2008', 53); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 2000', 55); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 2000', 61); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 2000', 95); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows 98', 62); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Vista', 56); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows Vista', 101); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows XP SP2', 57); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows XP SP3', 58); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows XP ', 93); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Windows XP ', 94); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'DOS', 102); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 60); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_name, guest_os_name, guest_os_id) VALUES ('KVM', 'Other', 103); + From 67cc587603a4c0c5a7babe11e508fb7fff303962 Mon Sep 17 00:00:00 2001 From: will Date: Thu, 16 Sep 2010 18:07:02 -0700 Subject: [PATCH 095/244] Adding some prelim UI to support multiple hypervisors in the hybrid branch --- ui/jsp/tab_instances.jsp | 13 +++++++++++++ ui/jsp/tab_templates.jsp | 10 +++++++++- ui/scripts/cloud.core.instances.js | 6 ++++-- ui/scripts/cloud.core.templates.js | 5 +++-- 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/ui/jsp/tab_instances.jsp b/ui/jsp/tab_instances.jsp index 856ca9189c8..318b9cc17bd 100755 --- a/ui/jsp/tab_instances.jsp +++ b/ui/jsp/tab_instances.jsp @@ -533,6 +533,13 @@ long milliseconds = new Date().getTime(); Availability Zone: + +
      @@ -819,6 +826,12 @@ long milliseconds = new Date().getTime();
    +
    +
    + Hypervisor:
    +
    +
    +
    Template:
    diff --git a/ui/jsp/tab_templates.jsp b/ui/jsp/tab_templates.jsp index 9242b056254..a952484408e 100755 --- a/ui/jsp/tab_templates.jsp +++ b/ui/jsp/tab_templates.jsp @@ -256,7 +256,15 @@ long milliseconds = new Date().getTime(); - + +
  • + + +
    • +
  • + + +
  • - - -
    • -
    -
    -
    -
    -
    -

    - Public IP Addresses

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Private IP Addresses

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Memory Allocated

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - CPU

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Primary Storage Allocated

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Primary Storage Used

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -

    - Secondary Storage Used

    -
    -

    - Used: N/A -

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -
    -
    -
    -
    - General Alerts
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - No Recent Alerts -
    -
    -
    - -
    -
    -
    -
    - Hosts Alerts
    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - No Recent Alerts -
    -
    -
    -
    - - - - - - - - - - - - - - -
    -
    -
    -
    - Public IPs
    -
    -
    -
    -
    -
    Available Public IPs:
    -
    -
    -
    Unlimited
    -
    -
    -
    -
    -
    Owned Public IPs:
    -
    -
    -
    5
    -
    -
    - -
    - - -
    -
    -
    -
    - Recent Errors
    -
    -
    - -
    -
    -
    -
    -
    -
    -
    -
    Error's Name
    -
    Error Description will appear here
    -
    -
    -
    09/29/2010 15:20:10
    -
    -
    - -
    -
    -
    -
    -
    -
    Error's Name
    -
    Error Description will appear here
    -
    -
    -
    09/29/2010 15:20:10
    -
    -
    - -
    -
    -
    -
    -
    -
    Error's Name
    -
    Error Description will appear here
    -
    -
    -
    09/29/2010 15:20:10
    -
    -
    -
    - - - -
    -
    -
    -
    - Account
    -
    -
    -
    - My Account
    -
    - -
    - -
    -
    -
    Account ID
    -
    -
    -
    3
    -
    -
    - -
    -
    -
    Account
    -
    -
    -
    Niki
    -
    -
    - -
    -
    -
    Type
    -
    -
    -
    User
    -
    -
    - -
    -
    -
    Domain
    -
    -
    -
    Root
    -
    -
    - - - -
    - - \ No newline at end of file +<%@ page import="java.util.*" %> + +<%@ page import="com.cloud.utils.*" %> + +<% + Locale browserLocale = request.getLocale(); + CloudResourceBundle t = CloudResourceBundle.getBundle("resources/resource", browserLocale); +%> +
    +
    + Dashboard
    +

    + Dashboard +

    +
    + + + + + + + + + + + + diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index 78d00e576d4..aa9c28b777b 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -1,5 +1,7 @@ function afterLoadDashboardJSP() { if (isAdmin()) { + showDashboard("dashboard_admin"); + var sessionExpired = false; var zones = null; var noZones = false; @@ -204,17 +206,28 @@ function afterLoadDashboardJSP() { } else if (isDomainAdmin()) { - + showDashboard("dashboard_domainadmin"); } else if(isUser()) { - + showDashboard("dashboard_user"); } else { //no role - logout(false); - return; + logout(false); } } +function showDashboard(dashboardToShow) { + var allDashboards = ["dashboard_admin", "dashboard_domainadmin", "dashboard_user"]; + for(var i=0; i < allDashboards.length; i++) { + dashboard = allDashboards[i]; + if(dashboard == dashboardToShow) + $("#"+dashboard).show(); + else + $("#"+dashboard).hide(); + } +} + +//*** dashboard admin (begin) *** function capacityBarChart($capacity, percentused) { var percentused2 = (percentused + "%"); $capacity.find("#percentused").text(percentused2); @@ -225,4 +238,6 @@ function capacityBarChart($capacity, percentused) { $capacity.find("#bar_chart").removeClass().addClass("db_barbox mid").css("width", percentused2); else if (percentused > 80 ) $capacity.find("#bar_chart").removeClass().addClass("db_barbox high").css("width", percentused2); -} \ No newline at end of file +} +//*** dashboard admin (end) *** + diff --git a/ui/new/scripts/cloud.core2.js b/ui/new/scripts/cloud.core2.js index f1461f9c185..028b8f5e786 100644 --- a/ui/new/scripts/cloud.core2.js +++ b/ui/new/scripts/cloud.core2.js @@ -836,14 +836,14 @@ function isAdmin() { return (g_role == 1); } -function isUser() { - return (g_role == 0); -} - function isDomainAdmin() { return (g_role == 2); } +function isUser() { + return (g_role == 0); +} + function setDateField(dateValue, dateField, htmlMarkup) { if (dateValue != null && dateValue.length > 0) { var disconnected = new Date(); From c7790d73ff577d6fdc17833b8321b6c5d5f2b442 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 2 Oct 2010 12:38:49 -0700 Subject: [PATCH 156/244] new UI - dashboard of user - implement Resources section, My Account section. --- ui/new/jsp/dashboard.jsp | 14 +++--- ui/new/scripts/cloud.core2.dashboard.js | 67 +++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 7 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 8d5fdf2bc0a..4f4c7df5b84 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -269,7 +269,7 @@
    - 24 VM(s)
    + ? VM(s)
    @@ -287,7 +287,7 @@
    - 24 VM(s)
    + ? VM(s)
    @@ -305,7 +305,7 @@
    - 48 VM(s)
    + ? VM(s)
    @@ -422,7 +422,7 @@
    - 3
    +
    @@ -432,7 +432,7 @@
    - Niki
    +
    @@ -442,7 +442,7 @@
    - User
    +
    @@ -452,7 +452,7 @@
    - Root
    +
    diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index aa9c28b777b..b4f8deb2985 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -210,6 +210,73 @@ function afterLoadDashboardJSP() { } else if(isUser()) { showDashboard("dashboard_user"); + + //$("#launch_test").hide(); + $.ajax({ + cache: false, + data: createURL("command=listAccounts"), + dataType: "json", + success: function(json) { + var accounts = json.listaccountsresponse.account; + if (accounts != null && accounts.length > 0) { + var statJSON = accounts[0]; + /* + var sent = parseInt(statJSON.sentbytes); + var rec = parseInt(statJSON.receivedbytes); + + if(sent==0 && rec==0) + $("#network_bandwidth_panel").hide(); + else + $("#network_bandwidth_panel").show(); + + $("#menutab_role_user").show(); + $("#menutab_role_root").hide(); + $("#menutab_role_domain").hide(); + $("#tab_dashboard_user").show(); + $("#tab_dashboard_root, #tab_dashboard_domain, #loading_gridtable").hide(); + + // This is in bytes, so let's change to KB + sent = Math.round(sent / 1024); + rec = Math.round(rec / 1024); + $("#db_sent").text(sent + "KB"); + $("#db_received").text(rec + "KB"); + $("#db_available_public_ips").text(statJSON.ipavailable); + $("#db_owned_public_ips").text(statJSON.iptotal); + */ + $("#db_running_vms").text(statJSON.vmrunning); + $("#db_stopped_vms").text(statJSON.vmstopped); + $("#db_total_vms").text(statJSON.vmtotal); + //$("#db_avail_vms").text(statJSON.vmavailable); + $("#db_account_id").text(statJSON.id); + $("#db_account").text(statJSON.name); + $("#db_type").text(toRole(statJSON.accounttype)); + $("#db_domain").text(statJSON.domain); + } + + // Events + $.ajax({ + data: createURL("command=listEvents&level=ERROR"), + dataType: "json", + success: function(json) { + var events = json.listeventsresponse.event; + if (events != null && events.length > 0) { + var errorGrid = $("#error_grid_content").empty(); + var length = (events.length>=3) ? 3 : events.length; + for (var i = 0; i < length; i++) { + var errorTemplate = $("#recent_error_template").clone(true); + errorTemplate.find("#db_error_type").text(events[i].type); + errorTemplate.find("#db_error_msg").text(fromdb(events[i].description)); + setDateField(events[i].created, errorTemplate.find("#db_error_date")); + errorGrid.append(errorTemplate.show()); + } + } + } + }); + }, + beforeSend: function(XMLHttpRequest) { + return true; + } + }); } else { //no role logout(false); From 58a850c374cb4ed3425efcaf60e11b6d4d88e2a9 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 2 Oct 2010 12:45:51 -0700 Subject: [PATCH 157/244] new UI - dashboad of user - implement Public IPs section. --- ui/new/jsp/dashboard.jsp | 4 ++-- ui/new/scripts/cloud.core2.dashboard.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index 4f4c7df5b84..cc306befbc5 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -327,7 +327,7 @@
    - Unlimited
    +
    @@ -338,7 +338,7 @@
    - 5
    +
    diff --git a/ui/new/scripts/cloud.core2.dashboard.js b/ui/new/scripts/cloud.core2.dashboard.js index b4f8deb2985..b638a64bdc9 100644 --- a/ui/new/scripts/cloud.core2.dashboard.js +++ b/ui/new/scripts/cloud.core2.dashboard.js @@ -240,9 +240,9 @@ function afterLoadDashboardJSP() { rec = Math.round(rec / 1024); $("#db_sent").text(sent + "KB"); $("#db_received").text(rec + "KB"); - $("#db_available_public_ips").text(statJSON.ipavailable); - $("#db_owned_public_ips").text(statJSON.iptotal); */ + $("#db_available_public_ips").text(statJSON.ipavailable); + $("#db_owned_public_ips").text(statJSON.iptotal); $("#db_running_vms").text(statJSON.vmrunning); $("#db_stopped_vms").text(statJSON.vmstopped); $("#db_total_vms").text(statJSON.vmtotal); From ac82ee7dc29e3852a34ac264e3f3fa6d888b4b0b Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sat, 2 Oct 2010 15:10:01 -0700 Subject: [PATCH 158/244] new UI - dashboard of user - implement Recent Errors section. --- ui/new/jsp/dashboard.jsp | 104 +++++++----------------- ui/new/scripts/cloud.core2.dashboard.js | 75 ++++++++--------- 2 files changed, 69 insertions(+), 110 deletions(-) diff --git a/ui/new/jsp/dashboard.jsp b/ui/new/jsp/dashboard.jsp index cc306befbc5..4a2001d7dfc 100644 --- a/ui/new/jsp/dashboard.jsp +++ b/ui/new/jsp/dashboard.jsp @@ -14,7 +14,7 @@ - + - - + - + - + - - - + + + + diff --git a/ui/new/scripts/cloud.core2.instance.js b/ui/new/scripts/cloud.core2.instance.js index 48137f4ee7d..dc3c8bc3b24 100644 --- a/ui/new/scripts/cloud.core2.instance.js +++ b/ui/new/scripts/cloud.core2.instance.js @@ -69,14 +69,8 @@ function clickInstanceGroupHeader($arrowIcon) { initDialog("dialog_attach_iso"); initDialog("dialog_change_name"); initDialog("dialog_change_group"); - - activateDialog($("#dialog_change_service_offering").dialog({ - width: 600, - autoOpen: false, - modal: true, - zIndex: 2000 - })); - + initDialog("dialog_change_service_offering"); + activateDialog($("#dialog_create_template").dialog({ width: 400, autoOpen: false, @@ -914,7 +908,7 @@ function doChangeService($t, selectedItemsInMidMenu, vmListAPIMap) { $("#dialog_change_service_offering") .dialog('option', 'buttons', { - "Change": function() { + "OK": function() { var thisDialog = $(this); thisDialog.dialog("close"); @@ -1282,7 +1276,7 @@ function doCreateTemplateFromVmVolume($actionLink, listAPIMap, $subgridItem) { $("#dialog_create_template") .dialog('option', 'buttons', { - "Create": function() { + "OK": function() { var thisDialog = $(this); thisDialog.dialog("close"); From 4fda60cce00a946ee0963dc7a609a8f51b3ed8ec Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 3 Oct 2010 11:22:13 -0700 Subject: [PATCH 163/244] new UI - localize create template of disk volume dialog. --- .../classes/resources/resource.properties | 6 + ui/new/jsp/instance.jsp | 104 +++++++++--------- ui/new/scripts/cloud.core2.instance.js | 1 - 3 files changed, 58 insertions(+), 53 deletions(-) diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index daf03658290..f2b791ada78 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -8,3 +8,9 @@ please.specify.the.new.group.you.want.to.assign.the.virtual.machine.to = Please group.name = Group Name after.changing.service.offering.you.must.restart.the.virtual.machine.for.new.service.offering.to.take.effect = After changing service offering, you must restart the virtual machine for the new service offering to take effect. service.offering = Service Offering +creating.a.template.of.disk.volume.could.take.up.to.several.hours.depending.on.the.size.of.the.disk.volume = Creating a template of disk volume could take up to several hours depending on the size of the disk volume +name = Name +display.text = Display Text +os.type = OS Type +public = Public +password.enabled = Password Enabled diff --git a/ui/new/jsp/instance.jsp b/ui/new/jsp/instance.jsp index 9d97e43e0e0..72464236396 100644 --- a/ui/new/jsp/instance.jsp +++ b/ui/new/jsp/instance.jsp @@ -765,57 +765,6 @@ - - - - +
    +
    +
    + <%=t.t("crossZones")%>:
    +
    +
    +
    +
    +
    +
    @@ -252,3 +262,16 @@
    + + + + + diff --git a/ui/new/scripts/cloud.core2.iso.js b/ui/new/scripts/cloud.core2.iso.js index 65fddf021a9..f985fefa956 100644 --- a/ui/new/scripts/cloud.core2.iso.js +++ b/ui/new/scripts/cloud.core2.iso.js @@ -151,6 +151,9 @@ function afterLoadIsoJSP() { }); //initialize dialog box *** + initDialog("dialog_confirmation_delete_iso_all_zones"); + initDialog("dialog_confirmation_delete_iso"); + activateDialog($("#dialog_copy_iso").dialog({ width:300, autoOpen: false, @@ -213,13 +216,14 @@ function isoJsonToDetailsTab(jsonObj) { if(jsonObj.size != null) $detailsTab.find("#size").text(convertBytes(parseInt(jsonObj.size))); - + var status = "Ready"; if (jsonObj.isready == "false") status = jsonObj.isostatus; $detailsTab.find("#status").text(status); - - setBooleanField(jsonObj.bootable, $detailsTab.find("#bootable")); + + setBooleanField(jsonObj.bootable, $detailsTab.find("#bootable")); + setBooleanField(jsonObj.crossZones, $detailsTab.find("#crossZones")); setDateField(jsonObj.created, $detailsTab.find("#created")); @@ -348,14 +352,13 @@ function doDeleteIso($actionLink, listAPIMap, $detailsTab) { if (zoneId != null) moreCriteria.push("&zoneid="+zoneId); - var htmlMsg; + var $dialog1; if(jsonObj.crossZones == "true") - htmlMsg = "

    ISO "+name+" is used by all zones. Please confirm you want to delete it from all zones.

    "; + $dialog1 = $("#dialog_confirmation_delete_iso_all_zones"); else - htmlMsg = "

    Please confirm you want to delete ISO "+name+".

    "; - - $("#dialog_confirmation") - .html(htmlMsg) + $dialog1 = $("#dialog_confirmation_delete_iso"); + + $dialog1 .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); From fcbcbb720106f28e7bd3118978f651e33a9a9fec Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 3 Oct 2010 18:10:55 -0700 Subject: [PATCH 171/244] new UI - localize delete template for single zone dialog, delete template for all zones dialog. --- .../WEB-INF/classes/resources/resource.properties | 2 ++ ui/new/jsp/template.jsp | 12 ++++++++++++ ui/new/scripts/cloud.core2.template.js | 14 ++++++++------ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 27da32e667e..53a3f177047 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -22,4 +22,6 @@ please.confirm.you.want.to.enable.HA.for.your.virtual.machine.once.HA.is.enabled please.confirm.you.want.to.disable.HA.for.the.virtual.machine.once.HA.is.disabled.the.virtual.machine.will.no.longer.be.automatically.restarted.in.the.event.of.a.failure = Please confirm you want to disable HA for the virtual machine. Once HA is disabled, the virtual machine will no longer be be automatically restarted in the event of a failure. the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The ISO is used by all zones. Please confirm you want to delete it from all zones. please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete the ISO +the.template.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The template is used by all zones. Please confirm you want to delete it from all zones. +please.confirm.you.want.to.delete.the.template = Please confirm you want to delete the template diff --git a/ui/new/jsp/template.jsp b/ui/new/jsp/template.jsp index e6170b9d823..898622d14ff 100644 --- a/ui/new/jsp/template.jsp +++ b/ui/new/jsp/template.jsp @@ -333,3 +333,15 @@ + + + + diff --git a/ui/new/scripts/cloud.core2.template.js b/ui/new/scripts/cloud.core2.template.js index 135a7652330..1a6ead76c46 100644 --- a/ui/new/scripts/cloud.core2.template.js +++ b/ui/new/scripts/cloud.core2.template.js @@ -152,6 +152,9 @@ function afterLoadTemplateJSP() { }); //initialize dialog box *** + initDialog("dialog_confirmation_delete_template_all_zones"); + initDialog("dialog_confirmation_delete_template"); + activateDialog($("#dialog_add_template").dialog({ width:450, autoOpen: false, @@ -438,14 +441,13 @@ function doDeleteTemplate($actionLink, listAPIMap, $detailsTab) { if (zoneId != null) moreCriteria.push("&zoneid="+zoneId); - var htmlMsg; + var $dialog1; if(jsonObj.crossZones == "true") - htmlMsg = "

    Template "+name+" is used by all zones. Please confirm you want to delete it from all zones.

    "; + $dialog1 = $("#dialog_confirmation_delete_template_all_zones"); else - htmlMsg = "

    Please confirm you want to delete template "+name+".

    "; - - $("#dialog_confirmation") - .html(htmlMsg) + $dialog1 = $("#dialog_confirmation_delete_template"); + + $dialog1 .dialog('option', 'buttons', { "Confirm": function() { $(this).dialog("close"); From 12db8ca6133732dd91a507d651fa2469da97cfcf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Sun, 3 Oct 2010 19:31:56 -0700 Subject: [PATCH 172/244] new UI - accounts page - localize resource limits dialog, disable account dialog, lock account dialog, enable account dialog. --- .../classes/resources/resource.properties | 10 +++++++ ui/new/jsp/account.jsp | 26 ++++++++++++------- ui/new/scripts/cloud.core2.account.js | 24 +++-------------- ui/new/scripts/cloud.core2.instance.js | 10 ++----- ui/new/scripts/cloud.core2.js | 23 +++++++++++----- 5 files changed, 49 insertions(+), 44 deletions(-) diff --git a/client/WEB-INF/classes/resources/resource.properties b/client/WEB-INF/classes/resources/resource.properties index 53a3f177047..8b1c06f5ec1 100644 --- a/client/WEB-INF/classes/resources/resource.properties +++ b/client/WEB-INF/classes/resources/resource.properties @@ -24,4 +24,14 @@ the.ISO.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones please.confirm.you.want.to.delete.the.ISO = Please confirm you want to delete the ISO the.template.is.used.by.all.zones.please.confirm.you.want.to.delete.it.from.all.zones = The template is used by all zones. Please confirm you want to delete it from all zones. please.confirm.you.want.to.delete.the.template = Please confirm you want to delete the template +please.specify.limits.to.the.various.resources.-1.means.the.resource.has.no.limits = Please specify limits to the various resources. -1 means the resource has no limits. +instance.limit = Instance Limit +public.ip.limit = Public IP Limit +disk.volume.limit = Disk Volume Limit +snapshot.limit = Snapshot Limit +template.limit = Template Limit +please.confirm.you.want.to.disable.account.that.will.prevent.account.access.to.the.cloud.and.shut.down.all.existing.virtual.machines = Please confirm you want to disable account that will prevent account access to the cloud and shut down all existing virtual machines. +please.confirm.you.want.to.lock.account.that.will.prevent.account.access.to.the.cloud = Please confirm you want to lock account that will prevent account access to the cloud. +please.confirm.you.want.to.enable.account = Please confirm you want to enable account. + diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index 9b39eddd060..99446c9aed3 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -142,32 +142,34 @@ @@ -389,8 +236,8 @@ long milliseconds = new Date().getTime();
    - Instances
    - Instances + Instance + <%=t.t("instance")%> @@ -401,8 +248,8 @@ long milliseconds = new Date().getTime();
    - Instances
    - Instances + Instance + <%=t.t("instance")%>
    @@ -411,14 +258,14 @@ long milliseconds = new Date().getTime();
    - Routers
    - Routers + Router
    + <%=t.t("router")%>
    - Storage
    + System
    System
    @@ -430,7 +277,7 @@ long milliseconds = new Date().getTime();
    Host
    - Hosts + Host @@ -439,7 +286,7 @@ long milliseconds = new Date().getTime();
    Host
    - Hosts + Host
    @@ -449,8 +296,8 @@ long milliseconds = new Date().getTime();
    - storage
    - Storage + Storage + <%=t.t("storage")%> @@ -458,29 +305,29 @@ long milliseconds = new Date().getTime();
    - storage
    + Primary Storage
    Primary Storage
    - storage
    + secondary Storage
    secondary Storage
    - storage
    - Volumes + Volume
    + <%=t.t("volume")%>
    - storage
    - Snapshots + Snapshot
    + <%=t.t("snapshot")%>
    @@ -490,8 +337,8 @@ long milliseconds = new Date().getTime();
    - Network
    - Network + IP Address + <%=t.t("ip.address")%> @@ -499,17 +346,10 @@ long milliseconds = new Date().getTime();
    - Network
    - IP Addresses + IP Address
    + <%=t.t("ip.address")%>
    - -
    -
    -
    - Network
    - Network Groups -
    -
    +
    @@ -517,8 +357,8 @@ long milliseconds = new Date().getTime();
    - Templates
    - Templates + Template
    + <%=t.t("template")%>
    @@ -527,33 +367,33 @@ long milliseconds = new Date().getTime();
    - Templates
    - Template + Template
    + <%=t.t("template")%>
    -
    + My Template
    - My Templates
    + <%=t.t("my.template")%>
    -
    + Featured Template
    - Featured
    + <%=t.t("featured.template")%>
    -
    + Community Template
    - Community
    + <%=t.t("community.template")%>
    @@ -563,7 +403,7 @@ long milliseconds = new Date().getTime();
    Templates
    - ISO + <%=t.t("iso")%>
    @@ -572,7 +412,7 @@ long milliseconds = new Date().getTime();
    - My ISOs
    + <%=t.t("my.iso")%>
    @@ -580,7 +420,7 @@ long milliseconds = new Date().getTime();
    - Featured
    + <%=t.t("featured.iso")%>
    @@ -588,7 +428,7 @@ long milliseconds = new Date().getTime();
    - Community
    + <%=t.t("community.iso")%>
    @@ -600,8 +440,8 @@ long milliseconds = new Date().getTime();
    - Accounts
    - Accounts + Account + <%=t.t("account")%> @@ -609,8 +449,8 @@ long milliseconds = new Date().getTime();
    - Accounts
    - Accounts + Account
    + <%=t.t("account")%>
    @@ -621,7 +461,7 @@ long milliseconds = new Date().getTime();
    Domain
    - Domain + <%=t.t("domain")%> @@ -630,7 +470,7 @@ long milliseconds = new Date().getTime();
    Domain
    - Domain + <%=t.t("domain")%>
    @@ -640,8 +480,8 @@ long milliseconds = new Date().getTime();
    - Events
    - Events + Event + <%=t.t("event")%> @@ -649,15 +489,15 @@ long milliseconds = new Date().getTime();
    - Events
    - Events + Event
    + <%=t.t("event")%>
    - Events
    - Alerts + Alert
    + <%=t.t("alert")%>
    @@ -708,7 +548,7 @@ long milliseconds = new Date().getTime(); <%=t.t("ip.address")%> diff --git a/ui/new/jsp/account.jsp b/ui/new/jsp/account.jsp index 99446c9aed3..ac92ce2a965 100644 --- a/ui/new/jsp/account.jsp +++ b/ui/new/jsp/account.jsp @@ -27,15 +27,10 @@ -
    -
    +