Merge branch 'master' into vim51_win8
Conflicts:
setup/db/db/schema-40to410.sql
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8b9c45b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8b9c45b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8b9c45b9
Branch: refs/heads/master
Commit: 8b9c45b96d955b38d3fcefb0fc77b7e65a1cfa7b
Parents: 737dac2 d67d435
Author: Min Chen <[email protected]>
Authored: Fri Mar 1 16:46:58 2013 -0800
Committer: Min Chen <[email protected]>
Committed: Fri Mar 1 16:46:58 2013 -0800
----------------------------------------------------------------------
agent/pom.xml | 2 -
.../org/apache/cloudstack/api/ApiConstants.java | 4 +
.../bridge/persist/dao/CloudStackUserDaoImpl.java | 2 +
client/pom.xml | 22 +--
client/tomcatconf/componentContext.xml.in | 3 +
client/tomcatconf/components.xml.in | 1 +
debian/cloudstack-agent.install | 10 +-
debian/cloudstack-common.install | 2 -
debian/cloudstack-management.install | 6 +-
debian/cloudstack-usage.install | 4 +-
debian/control | 2 +-
debian/rules | 104 ++++++-----
docs/en-US/add-clusters-ovm.xml | 6 +-
docs/en-US/added-error-codes.xml | 2 +-
docs/en-US/aws-ec2-configuration.xml | 5 +-
docs/en-US/aws-ec2-user-setup.xml | 4 +-
...change-console-proxy-ssl-certificate-domain.xml | 4 +-
docs/en-US/citrix-xenserver-installation.xml | 8 +-
docs/en-US/console-proxy.xml | 4 +-
docs/en-US/create-bare-metal-template.xml | 1 -
docs/en-US/creating-vms.xml | 2 +-
docs/en-US/dedicated-ha-hosts.xml | 2 +-
docs/en-US/shared-networks.xml | 3 +-
docs/en-US/upload-existing-volume-to-vm.xml | 6 +-
docs/en-US/using-vpn-with-mac.xml | 15 ++-
docs/en-US/using-vpn-with-windows.xml | 10 +-
packaging/centos63/cloud-agent.rc | 4 +-
packaging/centos63/cloud.spec | 1 -
packaging/debian/init/cloud-agent | 8 +-
packaging/debian/init/cloud-usage | 2 +-
packaging/debian/replace.properties | 26 ++--
plugins/hypervisors/kvm/pom.xml | 9 +-
.../src/com/cloud/ucs/database/UcsBladeDao.java | 5 +-
.../com/cloud/ucs/database/UcsBladeDaoImpl.java | 10 +-
.../ucs/src/com/cloud/ucs/database/UcsBladeVO.java | 27 ++-
.../src/com/cloud/ucs/database/UcsManagerDao.java | 5 +-
.../com/cloud/ucs/database/UcsManagerDaoImpl.java | 10 +-
.../src/com/cloud/ucs/database/UcsManagerVO.java | 12 +-
.../com/cloud/ucs/manager/AddUcsManagerCmd.java | 18 +-
.../cloud/ucs/manager/AddUcsManagerResponse.java | 69 -------
.../ucs/manager/AssociateUcsProfileToBladeCmd.java | 18 +-
...sociateUcsProfileToBladesInClusterResponse.java | 22 ---
.../src/com/cloud/ucs/manager/ListUcsBladeCmd.java | 87 +++++++++
.../com/cloud/ucs/manager/ListUcsManagerCmd.java | 20 ++-
.../cloud/ucs/manager/ListUcsManagerResponse.java | 58 ------
.../com/cloud/ucs/manager/ListUcsProfileCmd.java | 16 +-
.../cloud/ucs/manager/ListUcsProfileResponse.java | 36 ----
.../src/com/cloud/ucs/manager/StringTemplate.java | 5 +-
.../com/cloud/ucs/manager/UcsBladeResponse.java | 84 +++++++++
.../ucs/src/com/cloud/ucs/manager/UcsCommands.java | 7 +-
.../src/com/cloud/ucs/manager/UcsHttpClient.java | 12 +-
.../ucs/src/com/cloud/ucs/manager/UcsManager.java | 18 +-
.../src/com/cloud/ucs/manager/UcsManagerImpl.java | 146 +++++++++++----
.../com/cloud/ucs/manager/UcsManagerResponse.java | 73 +++++++
.../com/cloud/ucs/manager/UcsProfileResponse.java | 37 ++++
.../src/com/cloud/ucs/structure/ComputeBlade.java | 7 +-
.../src/com/cloud/ucs/structure/UcsProfile.java | 9 +-
pom.xml | 4 +
server/pom.xml | 28 +++-
.../VpcVirtualNetworkApplianceManagerImpl.java | 29 ++--
server/test/com/cloud/upgrade/DbUpgrade22Test.java | 2 +
setup/db/db/schema-40to410.sql | 22 +++
tools/appliance/build.sh | 18 ++-
.../definitions/systemvmtemplate/postinstall.sh | 3 +-
ui/css/cloudstack3.css | 24 ++-
ui/images/bg-what-is-cloudstack.png | Bin 36083 -> 36116 bytes
ui/scripts/regions.js | 2 +-
ui/scripts/system.js | 89 +++++++++-
ui/scripts/ui-custom/regions.js | 9 +-
utils/src/com/cloud/utils/xmlobject/XmlObject.java | 5 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 13 ++
71 files changed, 884 insertions(+), 459 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8b9c45b9/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8b9c45b9/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8b9c45b9/setup/db/db/schema-40to410.sql
----------------------------------------------------------------------
diff --cc setup/db/db/schema-40to410.sql
index 936a9c7,2d024f1..809e264
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@@ -1651,8 -1651,29 +1651,30 @@@ CREATE TABLE `cloud`.`baremetal_pxe_dev
`device_type` varchar(255) DEFAULT NULL COMMENT 'type of the pxe device',
`physical_network_id` bigint unsigned DEFAULT NULL COMMENT 'id of the
physical network in to which external pxe device is added',
`host_id` bigint unsigned DEFAULT NULL COMMENT 'host id coresponding to the
external pxe device',
- PRIMARY KEY (`id`)
+ PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ CREATE TABLE `cloud`.`ucs_blade` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `uuid` varchar(40) UNIQUE,
+ `ucs_manager_id` bigint unsigned NOT NULL,
+ `host_id` bigint unsigned DEFAULT NULL,
+ `dn` varchar(512) NOT NULL,
+ `profile_dn` varchar(512) DEFAULT NULL,
+ PRIMARY KEY (`id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+ CREATE TABLE `cloud`.`ucs_manager` (
+ `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id',
+ `uuid` varchar(40) UNIQUE,
+ `zone_id` bigint unsigned NOT NULL,
+ `name` varchar(128) DEFAULT NULL,
+ `url` varchar(255) NOT NULL,
+ `username` varchar(255) NOT NULL,
+ `password` varchar(255) NOT NULL,
+ PRIMARY KEY (`id`)
+ ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+
SET foreign_key_checks = 1;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8b9c45b9/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
----------------------------------------------------------------------
diff --cc
vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
index e1399af,77862d1..621c091
--- a/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java
@@@ -1000,18 -999,19 +1000,19 @@@ public class HypervisorHostHelper
s_logger.error(msg);
throw new Exception(msg);
}
+ boolean importSuccess = true;
final HttpNfcLeaseMO leaseMo = new HttpNfcLeaseMO(context,
morLease);
HttpNfcLeaseState state = leaseMo.waitState(
- new HttpNfcLeaseState[] { HttpNfcLeaseState.ready,
HttpNfcLeaseState.error });
+ new HttpNfcLeaseState[] { HttpNfcLeaseState.READY,
HttpNfcLeaseState.ERROR });
try {
- if(state == HttpNfcLeaseState.ready) {
+ if(state == HttpNfcLeaseState.READY) {
final long totalBytes =
HttpNfcLeaseMO.calcTotalBytes(ovfImportResult);
- File ovfFile = new File(ovfFilePath);
-
+ File ovfFile = new File(ovfFilePath);
+
HttpNfcLeaseInfo httpNfcLeaseInfo =
leaseMo.getLeaseInfo();
- HttpNfcLeaseDeviceUrl[] deviceUrls =
httpNfcLeaseInfo.getDeviceUrl();
+ List<HttpNfcLeaseDeviceUrl> deviceUrls =
httpNfcLeaseInfo.getDeviceUrl();
long bytesAlreadyWritten = 0;
-
+
final HttpNfcLeaseMO.ProgressReporter progressReporter
= leaseMo.createProgressReporter();
try {
for (HttpNfcLeaseDeviceUrl deviceUrl :
deviceUrls) {
@@@ -1027,19 -1027,31 +1028,31 @@@
public
void action(Long param) {
progressReporter.reportProgress((int)(param * 100 / totalBytes));
}
- });
-
+ });
+
bytesAlreadyWritten +=
ovfFileItem.getSize();
- }
- }
+ }
+ }
}
+ } catch (Exception e) {
+ s_logger.error("Failed to complete file upload task. " +
e.getMessage());
+ // Set flag to cleanup the stale template left due to
failed import operation, if any
+ importSuccess = false;
+ throw e;
- } finally {
- progressReporter.close();
- }
+ } finally {
+ progressReporter.close();
+ }
+ if (bytesAlreadyWritten == totalBytes) {
- leaseMo.updateLeaseProgress(100);
- }
+ leaseMo.updateLeaseProgress(100);
+ }
+ }
- } finally {
+ } finally {
+ if (!importSuccess) {
+ s_logger.error("Aborting the lease on " + vmName + " after
import operation failed.");
+ leaseMo.abortLease();
+ } else {
- leaseMo.completeLease();
- }
+ leaseMo.completeLease();
}
}
++ }
}
