From 5a67fe73697be5254884294f151cf6e375bc00d6 Mon Sep 17 00:00:00 2001 From: Sanjay Tripathi Date: Wed, 5 Nov 2014 16:19:43 +0530 Subject: [PATCH 1/5] CLOUDSTACK-7842: wrong size column is getting updated with snapshot physical size in snapshot_store_ref table. Also fixed the issue that snapshot size with hypervisor XS >= 6.2.5 is not getting updated in snapshot_store_ref table. --- .../cloudstack/storage/snapshot/SnapshotObject.java | 2 +- .../datastore/ObjectInDataStoreManagerImpl.java | 3 ++- .../resource/Xenserver625StorageProcessor.java | 13 +++++++++---- .../resourcelimit/ResourceLimitManagerImpl.java | 2 +- .../cloud/storage/snapshot/SnapshotManagerImpl.java | 9 ++++----- 5 files changed, 17 insertions(+), 12 deletions(-) diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index da8d341e49b..c64f78fd01c 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -288,7 +288,7 @@ public class SnapshotObject implements SnapshotInfo { snapshotStore.setInstallPath(snapshotTO.getPath()); if (snapshotTO.getPhysicalSize() != null) { // For S3 delta snapshot, physical size is currently not set - snapshotStore.setSize(snapshotTO.getPhysicalSize()); + snapshotStore.setPhysicalSize(snapshotTO.getPhysicalSize()); } if (snapshotTO.getParentSnapshotPath() == null) { snapshotStore.setParentSnapshotId(0L); diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java index 82164ee06d8..fbce8609e6d 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/ObjectInDataStoreManagerImpl.java @@ -116,6 +116,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { ss.setRole(dataStore.getRole()); ss.setVolumeId(snapshotInfo.getVolumeId()); ss.setSize(snapshotInfo.getSize()); // this is the virtual size of snapshot in primary storage. + ss.setPhysicalSize(snapshotInfo.getSize()); // this physical size will get updated with actual size once the snapshot backup is done. SnapshotDataStoreVO snapshotDataStoreVO = snapshotDataStoreDao.findParent(dataStore.getRole(), dataStore.getId(), snapshotInfo.getVolumeId()); if (snapshotDataStoreVO != null) { ss.setParentSnapshotId(snapshotDataStoreVO.getSnapshotId()); @@ -156,7 +157,7 @@ public class ObjectInDataStoreManagerImpl implements ObjectInDataStoreManager { ss.setSnapshotId(obj.getId()); ss.setDataStoreId(dataStore.getId()); ss.setRole(dataStore.getRole()); - ss.setRole(dataStore.getRole()); + ss.setSize(snapshot.getSize()); ss.setVolumeId(snapshot.getVolumeId()); SnapshotDataStoreVO snapshotDataStoreVO = snapshotDataStoreDao.findParent(dataStore.getRole(), dataStore.getId(), snapshot.getVolumeId()); if (snapshotDataStoreVO != null) { diff --git a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java index f5310944a4e..20baffd6bf4 100644 --- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java +++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java @@ -329,8 +329,8 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { } } } - String backupUuid = dvdi.getUuid(conn); - return backupUuid; + String result = dvdi.getUuid(conn).concat("#").concat(dvdi.getPhysicalUtilisation(conn).toString()); + return result; } catch (Exception e) { String msg = "Exception in backupsnapshot stage due to " + e.toString(); s_logger.debug(msg); @@ -392,6 +392,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { String details = null; String snapshotBackupUuid = null; boolean fullbackup = Boolean.parseBoolean(options.get("fullSnapshot")); + Long physicalSize = null; try { SR primaryStorageSR = hypervisorResource.getSRByNameLabelandHost(conn, primaryStorageNameLabel); if (primaryStorageSR == null) { @@ -431,6 +432,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { hypervisorResource.checkForSuccess(conn, task); VDI backedVdi = Types.toVDI(task, conn); snapshotBackupUuid = backedVdi.getUuid(conn); + physicalSize = backedVdi.getPhysicalUtilisation(conn); if( destStore instanceof SwiftTO) { try { @@ -488,9 +490,11 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { throw new CloudRuntimeException("S3 upload of snapshots " + snapshotPaUuid + " failed"); } } else { - snapshotBackupUuid = backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, + String result = backupSnapshot(conn, primaryStorageSRUuid, localMountPoint, folder, secondaryStorageMountPath, snapshotUuid, prevBackupUuid, prevSnapshotUuid, isISCSI, wait); - + String[] tmp = result.split("#"); + snapshotBackupUuid = tmp[0]; + physicalSize = Long.parseLong(tmp[1]); finalPath = folder + File.separator + snapshotBackupUuid; } } @@ -499,6 +503,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor { SnapshotObjectTO newSnapshot = new SnapshotObjectTO(); newSnapshot.setPath(finalPath); + newSnapshot.setPhysicalSize(physicalSize); if (fullbackup) { newSnapshot.setParentSnapshotPath(null); } else { diff --git a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java index d15b68a4560..fd348af7496 100755 --- a/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java +++ b/server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java @@ -198,7 +198,7 @@ public class ResourceLimitManagerImpl extends ManagerBase implements ResourceLim templateSizeSearch.done(); snapshotSizeSearch = _snapshotDataStoreDao.createSearchBuilder(SumCount.class); - snapshotSizeSearch.select("sum", Func.SUM, snapshotSizeSearch.entity().getSize()); + snapshotSizeSearch.select("sum", Func.SUM, snapshotSizeSearch.entity().getPhysicalSize()); snapshotSizeSearch.and("state", snapshotSizeSearch.entity().getState(), Op.EQ); snapshotSizeSearch.and("storeRole", snapshotSizeSearch.entity().getRole(), Op.EQ); SearchBuilder join2 = _snapshotDao.createSearchBuilder(); diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 6d74636895e..369b42c8b41 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -434,7 +434,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, if (snapshotCheck.getState() != Snapshot.State.Error && snapshotCheck.getState() != Snapshot.State.Destroyed) _resourceLimitMgr.decrementResourceCount(snapshotCheck.getAccountId(), ResourceType.snapshot); if (snapshotCheck.getState() == Snapshot.State.BackedUp) - _resourceLimitMgr.decrementResourceCount(snapshotCheck.getAccountId(), ResourceType.secondary_storage, new Long(snapshotStoreRef.getSize())); + _resourceLimitMgr.decrementResourceCount(snapshotCheck.getAccountId(), ResourceType.secondary_storage, new Long(snapshotStoreRef.getPhysicalSize())); } return result; } catch (Exception e) { @@ -624,7 +624,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, if (Type.MANUAL == snapshot.getRecurringType()) { _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.snapshot); if (snapshotStoreRef != null) { - _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(snapshotStoreRef.getSize())); + _resourceLimitMgr.decrementResourceCount(accountId, ResourceType.secondary_storage, new Long(snapshotStoreRef.getPhysicalSize())); } } @@ -973,11 +973,10 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, try { postCreateSnapshot(volume.getId(), snapshotId, payload.getSnapshotPolicyId()); SnapshotDataStoreVO snapshotStoreRef = _snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Image); - // FIXME - snapshotStoreRef.getSize() refers to physical size, correct that UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, snapshot.getName(), - null, null, snapshotStoreRef.getSize(), volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); + null, null, snapshotStoreRef.getPhysicalSize(), volume.getSize(), snapshot.getClass().getName(), snapshot.getUuid()); // Correct the resource count of snapshot in case of delta snapshots. - _resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.secondary_storage, new Long(volume.getSize() - snapshotStoreRef.getSize())); + _resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), ResourceType.secondary_storage, new Long(volume.getSize() - snapshotStoreRef.getPhysicalSize())); } catch (Exception e) { s_logger.debug("post process snapshot failed", e); } From ddb2d9c60ebf121109392f202a724920137256b7 Mon Sep 17 00:00:00 2001 From: pdion891 Date: Wed, 5 Nov 2014 08:49:42 -0500 Subject: [PATCH 2/5] CLOUDSTACK-7822: merge, test sslcert ca --- server/test/resources/certs/root_chain.crt | 41 ++++++++++--------- server/test/resources/certs/root_chain.key | 27 ++++++++++++ .../test/resources/certs/rsa_ca_signed2.crt | 40 +++++++++--------- 3 files changed, 67 insertions(+), 41 deletions(-) create mode 100644 server/test/resources/certs/root_chain.key diff --git a/server/test/resources/certs/root_chain.crt b/server/test/resources/certs/root_chain.crt index 2ed80858532..b46d839d4e1 100644 --- a/server/test/resources/certs/root_chain.crt +++ b/server/test/resources/certs/root_chain.crt @@ -1,22 +1,23 @@ -----BEGIN CERTIFICATE----- -MIIDnTCCAoWgAwIBAgIJALXV1B5/vewgMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV -BAYTAkFVMQ0wCwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0Rl -djENMAsGA1UEAwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTAe -Fw0xMzEwMjExNjAxMDdaFw0xNjEwMjAxNjAxMDdaMGUxCzAJBgNVBAYTAkFVMQ0w -CwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0RldjENMAsGA1UE -AwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBALQZLQa2R64GRCuoh59VFvKoXnAM+4H4sW9E -jiURT/CeH6rbD0IbEMZZ3o84VfQw1zDsVXN/GXq3IEMp8uBBpWJuZRBF1UeDMYlB -bouMqUGL05Ov51zK2aQK/83S8MoQI7KV1FGJNti4iwUzemG1fClrBqjCFJQKmv8y -0z1UaeniAR7ygedIB4I2Y4a/DxtI0e2EsS0TcViwKHGrLArO0GfvNbH+tXqTaotF -X5eyinUFqQxT3JvnlIIernk0ly8c07mqOFbFqHrhFXxddD4pZrUetHXM2MKLdCMu -fvXsmMXSAgQ5F97GWmiDEJ9zMDxGoSmhTIN96FwPCRDr7e22lEsCAwEAAaNQME4w -HQYDVR0OBBYEFIxSziB7ssNqFvhV2MSf1GYvGHQYMB8GA1UdIwQYMBaAFIxSziB7 -ssNqFvhV2MSf1GYvGHQYMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEB -AB1rcxZL6xGuk8PSoBQ0imREcVf9BcEvGIC6uubPSXuoJ/gr584vo3pRJpTpHQyK -xUUwG6gCaDgAMYX177GBamGCt056ThSLKFROIPVrigZ5yY1NWznNq3zjWS4jIHkV -vGd+Gx8t3qYBhsn+v6Y6gRTjMOVQum+rvxvixG7n97DaxBnrwNWXbzZQ9spHrQsT -dsSF/kf9NKkWM0zKh+f/FSNmveJKKvZ+WQZC/MKUfc5VHjyLldXhrffcxzek/dOc -8YADSICSizvXCP/QjyVVl8dpKr/3c00r16Ei3QQaFhHES0bv/sKLnTwQwKDfJthu -bQj7M/XGWi33JQgoMHktYhI= +MIID3TCCAsWgAwIBAgIJAPjwxbyQ1zxmMA0GCSqGSIb3DQEBBQUAMIGDMQswCQYD +VQQGEwJDUzEPMA0GA1UECAwGQXBhY2hlMRMwEQYDVQQHDApDbG91ZFN0YWNrMRow +GAYDVQQKDBFBcGFjaGUgQ2xvdWRTdGFjazEOMAwGA1UECwwFdGVzdHMxIjAgBgkq +hkiG9w0BCQEWE3BkaW9uODkxQGFwYWNoZS5vcmcwIBcNMTQxMTA1MDEyMDI2WhgP +MjExNDEwMTIwMTIwMjZaMIGDMQswCQYDVQQGEwJDUzEPMA0GA1UECAwGQXBhY2hl +MRMwEQYDVQQHDApDbG91ZFN0YWNrMRowGAYDVQQKDBFBcGFjaGUgQ2xvdWRTdGFj +azEOMAwGA1UECwwFdGVzdHMxIjAgBgkqhkiG9w0BCQEWE3BkaW9uODkxQGFwYWNo +ZS5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9FEa9/M5lOYNR +OjRnyb0OEDtja4jghiMSTAfhQJdOPr3g+zUYh6zGiWFBQddBtT8DqAAIJDtB7SPi +tnYUKz0/CwO94hyg6OMHr0xR9P9dUUmcKURDy/phh4bAuDn7oUiOY62J7I84dyNJ +40KO37qJgGBAtXsdcvLiLo7DXQJms1PDsuPlbVYHj2tHTRp/AneEU7DpmA8WeD+i +Q3LvWvBX1o9KxpelQE2duhzsoR3/virw+7xFdIFt8bTaeINB+I56RwJd6TFKNDg0 +10ipt03UvfYd8IHJO43BlmQhgRpvv+9780GJNkAXibUXvgqy0DBjJmmj1I5X8IWb +DJTLkPsdAgMBAAGjUDBOMB0GA1UdDgQWBBTkKiZL2xPX1L6dct/rNtVCVwfQoTAf +BgNVHSMEGDAWgBTkKiZL2xPX1L6dct/rNtVCVwfQoTAMBgNVHRMEBTADAQH/MA0G +CSqGSIb3DQEBBQUAA4IBAQBC8PDJ+0zV2SyHx7p3KCj5TzNdfT+szsZNICqGOY97 +qx+kGfuJLoDgO3mTH3TXyy/krVaL466Fo5RcMFTvVQAcg8uBQIVWfSvug/wVGvQ6 +kCIowTCpDMN5G6VtFe8IWpBCVkLAvl/Qu3t2RIyLzCxR2yIPiqQGW1ldHyEQdA3o +sg74nNVURFQeosFpwcTrbu7FgOlHCjti8i2R7tlaXx7YCMwAjL5yr/ScUIMJyTPG +JdyPy03WYPc6eDQPm5eKIQUXGXT97Q3h0IaDXiRJzrrW7x5zj+Dy68qDq2legojT +6g0OC0H18K0+W02BPWVN4ZtmvSYpCQVSPvc0rnjSEuDw -----END CERTIFICATE----- diff --git a/server/test/resources/certs/root_chain.key b/server/test/resources/certs/root_chain.key new file mode 100644 index 00000000000..ce080d47c54 --- /dev/null +++ b/server/test/resources/certs/root_chain.key @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEAvRRGvfzOZTmDUTo0Z8m9DhA7Y2uI4IYjEkwH4UCXTj694Ps1 +GIesxolhQUHXQbU/A6gACCQ7Qe0j4rZ2FCs9PwsDveIcoOjjB69MUfT/XVFJnClE +Q8v6YYeGwLg5+6FIjmOtieyPOHcjSeNCjt+6iYBgQLV7HXLy4i6Ow10CZrNTw7Lj +5W1WB49rR00afwJ3hFOw6ZgPFng/okNy71rwV9aPSsaXpUBNnboc7KEd/74q8Pu8 +RXSBbfG02niDQfiOekcCXekxSjQ4NNdIqbdN1L32HfCByTuNwZZkIYEab7/ve/NB +iTZAF4m1F74KstAwYyZpo9SOV/CFmwyUy5D7HQIDAQABAoIBAQCX5XcjX7nLlhWJ +prG9A1OOvbmIGDaA8SGxrETUT5h98meGGyk/iJdjc7Aexa8RCXMTE97aq4izYLfo +hN59O3NbdxTNcZ3AIvdoEArG+IRBynDRNFG0CWUe/sphfl6OaLYqNaePWux/1y4R +SLIKp29q0SgCNAkw0kyPKgnkpo6sQ1hnDQQMMRxFBjTthFLXfPNxemElpFQ2kIT/ +ZsC6uEkbJZksaZyz0Ht/XoC8NbB2H9IzgZ4jcbhptwr2FkFiTbTfVocigM4/JtTC +KBrm1Y6r4Gmct1KUfrxACVbMXSA+QsKIDhgHqGQqBLQEpTDD1BFwRxCpxWp+1HyI +u9h1awjdAoGBAOVIp+tyG23EsgVhVkRhN2j/nnmC6QXXpBJE6u9s9xQbTDdR4vu6 +jHQXEEf25DG0Nx8y+WftIgmNQLoo2dQCo/bbCmEbvw0u1InhvThSU/vVl53Mvz+D +NlvhRL/v2g/8uRAffK/nqK6f+/sUXvYLoALgrnOjYm41YOoRV2AG3KdvAoGBANMc +WcKc8jQVq+TvOJG+C0PRXURupWFPBthvAxSz8BF0CAyp2NzT4Kj00iP9X+5wtDiD +dkFlXl4DNQxZObR7QQyqFnZ0ZfRbxBl3qutFUmvI4VcmSXjejA3xvO0McOUoY55m +ijPqIIKyq9RZ3hHaLRCF89Xi7kLU8pRrFmeFTmAzAoGAPUfJ+Zep1RC5M87sK6KA +GMQZKwjeFv2nkGpzEELjVrBlEnQEYptdZrmzVEicfNxZzzDkj+5FJqBmKFs6vPtn +r1aj04iC65cUnzWCSUdXwvs3ZqmOg/8hzDTNFy+X7KXzIGgJ/0m/P8zqoBS1vLUm +sx4yAh4s9J+3o1e3Lqcm2mkCgYAVBZeyl2pO4XGShHe/m4sHn8uHyvTQ8cuetb86 +yog3VLSQfkFIDBks+eQLDWoGFlb74ate67cv6WXY6vGiFTvvBOjjtseIQ7MNTitI +7kg8z24Q/ZEHZjHQGahUeo6rYxA4b8GHVeMS4LPXm3NPl8gxAwW64LQVF5toSBmd +CVs6nQKBgQC1OxmoVGF+rxCNYCz1z2rmf86Frc8sVMucIxflZwHwvzbgiZb9B+3O +RfosKheWlXcng13ZtbMw72kEG2yMyaOhQ7uIzgVm4GU3Up6BrFTggfyZpKjoRHS7 +QgYvtlPYUOh8xfJ19zcVHGUT3dAoxZQPSSKR9GwVX+CxqkybVvz+bQ== +-----END RSA PRIVATE KEY----- diff --git a/server/test/resources/certs/rsa_ca_signed2.crt b/server/test/resources/certs/rsa_ca_signed2.crt index fb74f17574b..e52271de8ed 100644 --- a/server/test/resources/certs/rsa_ca_signed2.crt +++ b/server/test/resources/certs/rsa_ca_signed2.crt @@ -1,23 +1,21 @@ -----BEGIN CERTIFICATE----- -MIID1TCCAr2gAwIBAgIJALXV1B5/vewhMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV -BAYTAkFVMQ0wCwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0Rl -djENMAsGA1UEAwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTAe -Fw0xMzEwMjExNjE4MjJaFw0xNDEwMjExNjE4MjJaMHIxCzAJBgNVBAYTAkFVMRMw -EQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0 -eSBMdGQxDTALBgNVBAMMBFN5ZWQxHDAaBgkqhkiG9w0BCQEWDXN5ZWRAdGVzdC5j -b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpkHkV6ZHhkYc3Y92i -YllHGbSnXIzwnbaYcfIB5NRldbxyts2Hp8HttxG0rH5DgEMdqfOowqYITe2/hAop -ZqLuAuwEj0tlPJ/hoVnZeHlCuBps+/nWkanA0DgkwiVksm7UoWM736dkmhLf03FI -A0/pOsUYranCJAGO26BmNQnocjuoWHZRZINKFNVwgNLrCGkhIu4Dk4o6Rnto0oew -kwUUVogpUJ6hPFU+8eIV0BAxertuiv6bQC/dG4MhVLl9nRB+XSnf+UAMgH3ay1em -t8CL4pAlBmctt08LcaLeJBVWH0tsdx/QUuo/5iL61I/eQi4thLureM+bhzDq3/JN -DYzfAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg -R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR2LIRfVveDgQB3dC7TOYhX -BEv71DAfBgNVHSMEGDAWgBSMUs4ge7LDahb4VdjEn9RmLxh0GDANBgkqhkiG9w0B -AQUFAAOCAQEAPjN/sdLcPfMh5ep29vp/7JTh6dUYnBNATYaXxx8j2XdnMCKeRfgP -WOJur8HDPSayWWKKlztiQbJV5jDS5vyuMWI1a5/KIAQlOJep+anpR1QnQaX4/M4Z -YUJo1fPs6tg47dXRpZZaJ+Hqwh0ZftCQoUq/sBxawXf6sbxsjoUmzxQLBqzYo1LJ -jwxBs6C9aM8LDHFz4TVlyclSFQXiLMosj1jLBQ+TqzCxS6qOfJeMM9STXI9W3F2k -duXeceqOwEkh8aeSUIztYFpX34d4SA4DDX5GUEaOeOR/abnXjH52vE6tM/m7NOve -5+I/BrlT3heRqiD6Z2ofSsFhG86YeF9Q3w== +MIIDhjCCAm4CCQCKnxCO3XZA3TANBgkqhkiG9w0BAQUFADCBgzELMAkGA1UEBhMC +Q1MxDzANBgNVBAgMBkFwYWNoZTETMBEGA1UEBwwKQ2xvdWRTdGFjazEaMBgGA1UE +CgwRQXBhY2hlIENsb3VkU3RhY2sxDjAMBgNVBAsMBXRlc3QyMSIwIAYJKoZIhvcN +AQkBFhNwZGlvbjg5MUBhcGFjaGUub3JnMCAXDTE0MTEwNTAyMjUwN1oYDzIxMTQx +MDEyMDIyNTA3WjCBgzELMAkGA1UEBhMCQ1MxDzANBgNVBAgMBkFwYWNoZTETMBEG +A1UEBwwKQ2xvdWRTdGFjazEaMBgGA1UECgwRQXBhY2hlIENsb3VkU3RhY2sxDjAM +BgNVBAsMBXRlc3QyMSIwIAYJKoZIhvcNAQkBFhNwZGlvbjg5MUBhcGFjaGUub3Jn +MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvRRGvfzOZTmDUTo0Z8m9 +DhA7Y2uI4IYjEkwH4UCXTj694Ps1GIesxolhQUHXQbU/A6gACCQ7Qe0j4rZ2FCs9 +PwsDveIcoOjjB69MUfT/XVFJnClEQ8v6YYeGwLg5+6FIjmOtieyPOHcjSeNCjt+6 +iYBgQLV7HXLy4i6Ow10CZrNTw7Lj5W1WB49rR00afwJ3hFOw6ZgPFng/okNy71rw +V9aPSsaXpUBNnboc7KEd/74q8Pu8RXSBbfG02niDQfiOekcCXekxSjQ4NNdIqbdN +1L32HfCByTuNwZZkIYEab7/ve/NBiTZAF4m1F74KstAwYyZpo9SOV/CFmwyUy5D7 +HQIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQA0kW4ph+cROIUIDue4A4DAl+RUi4MS +lkyWL90eo6vvX3oW53N9U7QV3gvZAG3hxD9XJHL7wf6SXNutLe2G7Vv5HhWtM6k4 +9RhDMH+nLbBFz6YHyN1aGMRTFbzLYTcXiLJhK5oeoZTh50zVGjoFuXvpcfKznqPq +kaL+R3sElN/pyKdvacKbMNQHVgJqPEbMIPU+eizrVQJ/Dx5/A7GqdCBWXdwY6m3z +/zPckpSMa7m2JdNsA5Dl/w5DosRupVVfqLwxnOkhofaxvx7WEo0YNKbk8M7Diu6n +5Z6yC+DxhE5SrMkuwpF95AlVx3pY+AGc0cOItgCqeBE8K3AUxIYhUwS9 -----END CERTIFICATE----- From f86eb522e259d9356f8a8647972a9f245ffe2ebe Mon Sep 17 00:00:00 2001 From: pdion891 Date: Wed, 5 Nov 2014 10:46:36 -0500 Subject: [PATCH 3/5] commented broken unit test --- .../org/apache/cloudstack/network/lb/CertServiceTest.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java index 1292ce1d710..572d0cf9d87 100755 --- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java +++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java @@ -242,7 +242,6 @@ public class CertServiceTest { certService.uploadSslCert(uploadCmd); } - /* @Test public void runUploadSslCertBadChain() throws IOException, IllegalAccessException, NoSuchFieldException { Assume.assumeTrue(isOpenJdk() || isJCEInstalled()); @@ -297,9 +296,7 @@ public class CertServiceTest { assertTrue(e.getMessage().contains("Invalid certificate chain")); } } - */ - /* @Test public void runUploadSslCertNoRootCert() throws IOException, IllegalAccessException, NoSuchFieldException { @@ -356,9 +353,7 @@ public class CertServiceTest { } } - */ - /* @Test public void runUploadSslCertNoChain() throws IOException, IllegalAccessException, NoSuchFieldException { @@ -409,7 +404,6 @@ public class CertServiceTest { } } - */ /* @Test From 11808ae7fb73390c862e09ce0c7d01edf4e8ea62 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 5 Nov 2014 13:26:42 -0800 Subject: [PATCH 4/5] CLOUDSTACK-7850: UI > Instances > detailView > Attach ISO option > ISO dropdown > should list only ISOs belonging to the same zone. --- ui/scripts/instances.js | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index b46c343657a..3d5f9b8f87c 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -973,8 +973,12 @@ var items = []; var map = {}; $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=featured"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'featured', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso; @@ -988,8 +992,12 @@ } }); $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=community"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'community', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso; @@ -1005,8 +1013,12 @@ } }); $.ajax({ - url: createURL("listIsos&isReady=true&isofilter=selfexecutable"), - dataType: "json", + url: createURL("listIsos"), + data: { + isofilter: 'selfexecutable', + isReady: true, + zoneid: args.context.instances[0].zoneid + }, async: false, success: function(json) { var isos = json.listisosresponse.iso; From d969364dafbd8a75eda01337839d2b69c7a74122 Mon Sep 17 00:00:00 2001 From: Rajani Karuturi Date: Wed, 5 Nov 2014 16:56:13 +0530 Subject: [PATCH 5/5] Fixed coverity issue CID 11461 (#1 of 1): DLS: Dead local store (FB.DLS_DEAD_LOCAL_STORE) --- .../src/org/apache/cloudstack/api/command/LDAPConfigCmd.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java index a586ae87c4c..a138e7ddd4a 100644 --- a/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java +++ b/plugins/user-authenticators/ldap/src/org/apache/cloudstack/api/command/LDAPConfigCmd.java @@ -30,7 +30,6 @@ import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.LDAPConfigResponse; -import org.apache.cloudstack.api.response.LdapConfigurationResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.framework.config.dao.ConfigurationDao; import org.apache.cloudstack.framework.config.impl.ConfigurationVO; @@ -227,7 +226,7 @@ public class LDAPConfigCmd extends BaseCmd { } private boolean updateLDAP() { - LdapConfigurationResponse response = _ldapManager.addConfiguration(hostname, port); + _ldapManager.addConfiguration(hostname, port); /** * There is no query filter now. It is derived from ldap.user.object and ldap.search.group.principle