git commit: updated refs/heads/master to aa4fea2
Repository: cloudstack
Updated Branches:
refs/heads/master 1d2f3300a -> aa4fea231
Fix for Test VM life Cycle Test suite- Failed to get Cent OS template
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/aa4fea23
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/aa4fea23
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/aa4fea23
Branch: refs/heads/master
Commit: aa4fea231db714f369f0ec5203a9407c98152984
Parents: 1d2f330
Author: sailajamada
Authored: Thu Sep 4 10:41:35 2014 +0530
Committer: sailajamada
Committed: Thu Sep 4 10:41:35 2014 +0530
--
tools/marvin/marvin/lib/common.py | 9 +++--
1 file changed, 7 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa4fea23/tools/marvin/marvin/lib/common.py
--
diff --git a/tools/marvin/marvin/lib/common.py
b/tools/marvin/marvin/lib/common.py
index 9e3d40c..72f78e3 100644
--- a/tools/marvin/marvin/lib/common.py
+++ b/tools/marvin/marvin/lib/common.py
@@ -288,11 +288,16 @@ def get_template(
Get the Templates pertaining to the inputs provided
'''
list_templatesout = apiclient.listTemplates(cmd)
-if validateList(list_templatesout)[0] != PASS:
+
+if list_templatesout is None:
+return FAILED
+
+if validateList(list_templatesout[0]) == FAIL:
return FAILED
for template in list_templatesout:
-if template.isready and template.templatetype == template_type:
+if template.isready and template.templatetype == template_type and
template.ostypename == ostype_desc:
+print("found template")
return template
'''
Return default first template, if no template matched
git commit: updated refs/heads/4.4 to e454acc
Repository: cloudstack
Updated Branches:
refs/heads/4.4 92339bca0 -> e454acc2c
CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e454acc2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e454acc2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e454acc2
Branch: refs/heads/4.4
Commit: e454acc2c02a549dd5e05091aa11cca14cbf6c7e
Parents: 92339bc
Author: Min Chen
Authored: Wed Sep 3 21:36:48 2014 -0700
Committer: Min Chen
Committed: Wed Sep 3 21:36:48 2014 -0700
--
.../storage/datastore/db/VolumeDataStoreVO.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e454acc2/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
--
diff --git
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index aa57e74..91d4ef7 100755
---
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
+++
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
@@ -350,12 +350,7 @@ public class VolumeDataStoreVO implements
StateObject 0) {
-refCnt--;
-}
-else {
-s_logger.warn("We should not try to decrement a zero reference
count even though our code has guarded");
-}
+this.refCnt = refCnt;
}
public void incrRefCnt() {
@@ -363,7 +358,12 @@ public class VolumeDataStoreVO implements
StateObject 0) {
+refCnt--;
+}
+else {
+s_logger.warn("We should not try to decrement a zero reference
count even though our code has guarded");
+}
}
public String getExtractUrl() {
git commit: updated refs/heads/master to 1d2f330
Repository: cloudstack
Updated Branches:
refs/heads/master 659eafffe -> 1d2f3300a
Adding support for SolidFire snapshots
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1d2f3300
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1d2f3300
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1d2f3300
Branch: refs/heads/master
Commit: 1d2f3300adab216fe962bb35d0c5a342ba4ec785
Parents: 659eaff
Author: Mike Tutkowski
Authored: Mon Aug 25 16:15:04 2014 -0600
Committer: Mike Tutkowski
Committed: Wed Sep 3 20:09:00 2014 -0600
--
.../api/storage/PrimaryDataStoreDriver.java | 9 +-
.../test/FakePrimaryDataStoreDriver.java| 5 +
.../storage/snapshot/SnapshotServiceImpl.java | 6 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 5 +
.../driver/NexentaPrimaryDataStoreDriver.java | 5 +
.../SamplePrimaryDataStoreDriverImpl.java | 5 +
.../driver/SolidFirePrimaryDataStoreDriver.java | 263 +--
.../storage/datastore/util/SolidFireUtil.java | 135 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 28 +-
.../com/cloud/storage/StorageManagerImpl.java | 4 +-
10 files changed, 405 insertions(+), 60 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d2f3300/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
--
diff --git
a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
index c4dfc5c..43d7d5a 100644
---
a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
+++
b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
@@ -32,7 +32,14 @@ public interface PrimaryDataStoreDriver extends
DataStoreDriver {
public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host,
DataStore dataStore);
-public long getVolumeSizeIncludingHypervisorSnapshotReserve(Volume volume,
StoragePool pool);
+// intended for managed storage (cloud.storage_pool.managed = true)
+// if not managed, return volume.getSize()
+public long getVolumeSizeIncludingHypervisorSnapshotReserve(Volume volume,
StoragePool storagePool);
+
+// intended for managed storage (cloud.storage_pool.managed = true)
+// if managed storage, return the total number of bytes currently in use
for the storage pool in question
+// if not managed storage, return 0
+public long getUsedBytes(StoragePool storagePool);
public void takeSnapshot(SnapshotInfo snapshot,
AsyncCompletionCallback callback);
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d2f3300/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
--
diff --git
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
index d277991..7d9cd72 100644
---
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
+++
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakePrimaryDataStoreDriver.java
@@ -55,6 +55,11 @@ public class FakePrimaryDataStoreDriver implements
PrimaryDataStoreDriver {
public void disconnectVolumeFromHost(VolumeInfo volumeInfo, Host host,
DataStore dataStore) {}
@Override
+public long getUsedBytes(StoragePool storagePool) {
+return 0;
+}
+
+@Override
public long getVolumeSizeIncludingHypervisorSnapshotReserve(Volume volume,
StoragePool pool) {
return volume.getSize();
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1d2f3300/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
--
diff --git
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
index 684b5bd..309f6d6 100644
---
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
+++
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotServiceImpl.java
@@ -316,10 +316,10 @@ public class SnapshotServiceImpl implements
SnapshotService {
}
try {
-CopyCmdAnswer answer = (CopyCmdAnswer)result.getA
git commit: updated refs/heads/master to 659eaff
Repository: cloudstack
Updated Branches:
refs/heads/master 801a98617 -> 659eafffe
CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version
is 6.1+" field when OS Type is not Windows since property
jsonObj.details.hypervisortoolsversion only applies to Windows - case sensitive
when comparing OS Type.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/659eafff
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/659eafff
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/659eafff
Branch: refs/heads/master
Commit: 659eafffe1c59ed8f4c4eb3e157fbdcdd7674879
Parents: 801a986
Author: Jessica Wang
Authored: Wed Sep 3 16:48:58 2014 -0700
Committer: Jessica Wang
Committed: Wed Sep 3 16:48:58 2014 -0700
--
ui/scripts/instances.js | 2 +-
ui/scripts/templates.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/659eafff/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 6870f5b..4d536e3 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1709,7 +1709,7 @@
break;
}
}
- if (ostypeName == undefined ||
ostypeName.indexOf("win") == -1) {
+ if (ostypeName == undefined ||
ostypeName.indexOf("Win") == -1) {
hiddenFields.push('xenserverToolsVersion61plus');
}
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/659eafff/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index cef6a2a..dbc60b0 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -868,7 +868,7 @@
break;
}
}
- if (ostypeName == undefined ||
ostypeName.indexOf("win") == -1) {
+ if (ostypeName == undefined ||
ostypeName.indexOf("Win") == -1) {
hiddenFields.push('xenserverToolsVersion61plus');
}
}
@@ -1241,7 +1241,7 @@
break;
}
}
- if (ostypeName
== undefined || ostypeName.indexOf("win") == -1) {
+ if (ostypeName
== undefined || ostypeName.indexOf("Win") == -1) {
hiddenFields.push('xenserverToolsVersion61plus');
}
}
git commit: updated refs/heads/master to 801a986
Repository: cloudstack
Updated Branches:
refs/heads/master 5811ebeee -> 801a98617
CLOUDSTACK-7483: UI > instance page, template page > hide "Original XS Version
is 6.1+" field when OS Type is not Windows since property
jsonObj.details.hypervisortoolsversion only applies to Windows.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/801a9861
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/801a9861
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/801a9861
Branch: refs/heads/master
Commit: 801a98617c4fbec46c9fab65a9f05608f5574991
Parents: 5811ebe
Author: Jessica Wang
Authored: Wed Sep 3 15:11:50 2014 -0700
Committer: Jessica Wang
Committed: Wed Sep 3 15:13:14 2014 -0700
--
ui/scripts/instances.js | 105 ++---
ui/scripts/templates.js | 265 +++
2 files changed, 232 insertions(+), 138 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/801a9861/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 7205999..6870f5b 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -15,7 +15,7 @@
// specific language governing permissions and limitations
// under the License.
(function($, cloudStack) {
-var vmMigrationHostObjs;
+var vmMigrationHostObjs, ostypeObjs;
var vmSnapshotAction = function(args) {
var action = {
@@ -1175,25 +1175,27 @@
},
osTypeId: {
label: 'label.os.type',
-select: function(args) {
-$.ajax({
-url: createURL("listOsTypes"),
-dataType: "json",
-async: true,
-success: function(json) {
-var ostypes =
json.listostypesresponse.ostype;
-var items = [];
-$(ostypes).each(function() {
-items.push({
-id: this.id,
-description:
this.description
-});
-});
-args.response.success({
-data: items
-});
-}
+select: function(args) {
+ if (ostypeObjs == undefined) {
+ $.ajax({
+ url:
createURL("listOsTypes"),
+ dataType: "json",
+ async: false,
+ success: function(json) {
+ ostypeObjs =
json.listostypesresponse.ostype;
+ }
+ });
+ }
+ var items = [];
+$(ostypeObjs).each(function() {
+items.push({
+id: this.id,
+description: this.description
+});
});
+args.response.success({
+data: items
+});
}
},
isPublic: {
@@ -1685,7 +1687,32 @@
}
if ('instances' in args.context &&
args.context.instances[0].hypervisor != 'XenServer') {
-
hiddenFields.push('xenserverToolsVersio
git commit: updated refs/heads/master to 5811ebe
Repository: cloudstack
Updated Branches:
refs/heads/master 5e55b6b47 -> 5811ebeee
if VM scale is disable, don't set any scale option for VM
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5811ebee
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5811ebee
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5811ebee
Branch: refs/heads/master
Commit: 5811ebeee7040c3af66d57671d4546a9d0547786
Parents: 5e55b6b
Author: Anthony Xu
Authored: Wed Sep 3 14:40:00 2014 -0700
Committer: Anthony Xu
Committed: Wed Sep 3 14:40:00 2014 -0700
--
.../discoverer/XcpServerDiscoverer.java | 1 +
.../xenserver/resource/CitrixResourceBase.java | 25 ++--
2 files changed, 14 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5811ebee/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
index 2fcd62b..ec3bc3a 100755
---
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
+++
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/discoverer/XcpServerDiscoverer.java
@@ -602,6 +602,7 @@ public class XcpServerDiscoverer extends DiscovererBase
implements Discoverer, L
if (answer != null && answer.getResult() && answer instanceof
SetupAnswer) {
host.setSetup(true);
host.setLastPinged((System.currentTimeMillis() >> 10) - 5 *
60);
+host.setHypervisorVersion(prodVersion);
_hostDao.update(host.getId(), host);
if (((SetupAnswer)answer).needReconnect()) {
throw new ConnectionException(false, "Reinitialize agent
after setup.");
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5811ebee/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 3ba8271..7e386a3 100644
---
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -1331,28 +1331,29 @@ public abstract class CitrixResourceBase implements
ServerResource, HypervisorRe
vmr.memoryStaticMax = getStaticMax(vmSpec.getOs(),
vmSpec.getBootloader() == BootloaderType.CD, vmSpec.getMinRam(),
vmSpec.getMaxRam());
vmr.memoryDynamicMin = vmSpec.getMinRam();
vmr.memoryDynamicMax = vmSpec.getMaxRam();
+if (guestOsTypeName.toLowerCase().contains("windows")) {
+vmr.VCPUsMax = (long)vmSpec.getCpus();
+} else {
+// XenServer has a documented limit of 16 vcpus per vm
+vmr.VCPUsMax = 2L * vmSpec.getCpus();
+if (vmr.VCPUsMax > 16)
+{
+vmr.VCPUsMax = 16L;
+}
+}
} else {
//scaling disallowed, set static memory target
if (vmSpec.isEnableDynamicallyScaleVm() && !isDmcEnabled(conn,
host)) {
s_logger.warn("Host " + host.getHostname(conn) + " does not
support dynamic scaling, so the vm " + vmSpec.getName() + " is not dynamically
scalable");
}
-vmr.memoryStaticMin = vmSpec.getMinRam();
+vmr.memoryStaticMin = vmSpec.getMaxRam();
vmr.memoryStaticMax = vmSpec.getMaxRam();
-vmr.memoryDynamicMin = vmSpec.getMinRam();
+vmr.memoryDynamicMin = vmSpec.getMaxRam();;
vmr.memoryDynamicMax = vmSpec.getMaxRam();
-}
-
-if (guestOsTypeName.toLowerCase().contains("windows")) {
vmr.VCPUsMax = (long)vmSpec.getCpus();
-} else {
-// XenServer has a documented limit of 16 vcpus per vm
-vmr.VCPUsMax = 2L * vmSpec.getCpus();
-if (vmr.VCPUsMax > 16)
-{
-vmr.VCPUsMax = 16L;
-}
}
+
vmr.VCPUsAtStartup = (long)vmSpec.getCpus();
vmr.consoles.clear();
git commit: updated refs/heads/master to 5e55b6b
Repository: cloudstack
Updated Branches:
refs/heads/master 672bb353b -> 5e55b6b47
CLOUDSTACK-7480: UI > instance page > change "XenServer Tools Version 6.1+
field" to "Original XS Version is 6.1+" because what the field really presents
is the original XenServer version when a VM is initially created.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e55b6b4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e55b6b4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e55b6b4
Branch: refs/heads/master
Commit: 5e55b6b478c9a919976e399eb9bf85cfd91c118b
Parents: 672bb35
Author: Jessica Wang
Authored: Wed Sep 3 11:37:24 2014 -0700
Committer: Jessica Wang
Committed: Wed Sep 3 11:37:34 2014 -0700
--
client/WEB-INF/classes/resources/messages.properties | 6 +++---
ui/scripts/instances.js | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e55b6b4/client/WEB-INF/classes/resources/messages.properties
--
diff --git a/client/WEB-INF/classes/resources/messages.properties
b/client/WEB-INF/classes/resources/messages.properties
index 65a44a6..4655973 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -1298,7 +1298,7 @@ label.openDaylight=OpenDaylight
label.assign.instance.another=Assign Instance to Another Account
label.network.addVM=Add network to VM
label.set.default.NIC=Set default NIC
-label.Xenserver.Tools.Version61plus=XenServer Tools Version 6.1\+
+label.Xenserver.Tools.Version61plus=Original XS Version is 6.1\+
label.supportsstrechedl2subnet=Supports Streched L2 Subnet
label.menu.vpc.offerings=VPC Offerings
label.vpc.offering=VPC Offering
@@ -1516,7 +1516,7 @@ label.virtual.networking=Virtual Networking
label.allow=Allow
label.deny=Deny
label.default.egress.policy=Default egress policy
-label.xenserver.tools.version.61.plus=XenServer Tools Version 6.1\+
+label.xenserver.tools.version.61.plus=Original XS Version is 6.1\+
label.gpu=GPU
label.vgpu.type=vGPU type
label.vgpu.video.ram=Video RAM
@@ -1866,7 +1866,7 @@ message.set.default.NIC.manual=Please manually update the
default NIC on the VM
message.instance.scaled.up.confirm=Do you really want to scale Up your
instance ?
message.copy.template.confirm=Are you sure you want to copy template?
message.template.copying=Template is being copied.
-message.XSTools61plus.update.failed=Failed to update XenServer Tools Version
6.1\+ field. Error\:
+message.XSTools61plus.update.failed=Failed to update Original XS Version is
6.1\+ field. Error\:
message.gslb.delete.confirm=Please confirm you want to delete this GSLB
message.portable.ip.delete.confirm=Please confirm you want to delete Portable
IP Range
message.gslb.lb.remove.confirm=Please confirm you want to remove load
balancing from GSLB
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e55b6b4/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d3eb2a4..7205999 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -936,14 +936,14 @@
//do nothing
} else if
(result.jobstatus == 2) {
cloudStack.dialog.notice({
- message:
"Failed to update XenServer Tools Version 6.1+ field. Error: " +
_s(result.jobresult.errortext)
+ message:
_s(result.jobresult.errortext)
});
}
}
},
error:
function(XMLHttpResponse) {
cloudStack.dialog.notice({
- message: "Failed to
update XenServer Tools Version 6.1+ field. Error: " +
parseXMLHttpResponse(XMLHttpResponse)
+ message:
parseXMLHttpResponse(XMLHttpResponse)
});
git commit: updated refs/heads/master to 672bb35
Repository: cloudstack
Updated Branches:
refs/heads/master dc3f0cbc6 -> 672bb353b
CLOUDSTACK-6236:fix a copy-and-paste error for decrRefCnt in
VolumeDataStoreVO.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/672bb353
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/672bb353
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/672bb353
Branch: refs/heads/master
Commit: 672bb353be2f159966f351ab2de914b433a934f9
Parents: dc3f0cb
Author: Min Chen
Authored: Wed Sep 3 10:33:11 2014 -0700
Committer: Min Chen
Committed: Wed Sep 3 10:33:11 2014 -0700
--
.../storage/datastore/db/VolumeDataStoreVO.java | 14 +++---
1 file changed, 7 insertions(+), 7 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/672bb353/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
--
diff --git
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
index aa57e74..91d4ef7 100755
---
a/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
+++
b/engine/schema/src/org/apache/cloudstack/storage/datastore/db/VolumeDataStoreVO.java
@@ -350,12 +350,7 @@ public class VolumeDataStoreVO implements
StateObject 0) {
-refCnt--;
-}
-else {
-s_logger.warn("We should not try to decrement a zero reference
count even though our code has guarded");
-}
+this.refCnt = refCnt;
}
public void incrRefCnt() {
@@ -363,7 +358,12 @@ public class VolumeDataStoreVO implements
StateObject 0) {
+refCnt--;
+}
+else {
+s_logger.warn("We should not try to decrement a zero reference
count even though our code has guarded");
+}
}
public String getExtractUrl() {
git commit: cloudmonkey: apply pep8 fixes
Repository: cloudstack-cloudmonkey
Updated Branches:
refs/heads/master 2d709cab3 -> d62f6b4c6
cloudmonkey: apply pep8 fixes
Signed-off-by: Rohit Yadav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/repo
Commit:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/commit/d62f6b4c
Tree:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/tree/d62f6b4c
Diff:
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/diff/d62f6b4c
Branch: refs/heads/master
Commit: d62f6b4c603ec69e56313d470f55121d6ee565e9
Parents: 2d709ca
Author: Rohit Yadav
Authored: Wed Sep 3 19:28:14 2014 +0200
Committer: Rohit Yadav
Committed: Wed Sep 3 19:28:14 2014 +0200
--
cloudmonkey/cloudmonkey.py | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack-cloudmonkey/blob/d62f6b4c/cloudmonkey/cloudmonkey.py
--
diff --git a/cloudmonkey/cloudmonkey.py b/cloudmonkey/cloudmonkey.py
index 1d3893d..9264d0e 100644
--- a/cloudmonkey/cloudmonkey.py
+++ b/cloudmonkey/cloudmonkey.py
@@ -432,7 +432,8 @@ class CloudMonkeyShell(cmd.Cmd, object):
setattr(self, key, value)
if key in ['host', 'port', 'path', 'protocol']:
key = 'url'
-self.url = "%s://%s:%s%s" % (self.protocol, self.host, self.port,
self.path)
+self.url = "%s://%s:%s%s" % (self.protocol, self.host,
+ self.port, self.path)
print "This option has been deprecated, please set 'url' instead"
print "This server url will be used:", self.url
write_config(self.get_attr, self.config_file)
@@ -567,8 +568,8 @@ def main():
description=__description__,
epilog="Try cloudmonkey [help|?]")
parser.add_argument("-c", "--config-file",
- dest="configFile", default=config_file,
- help="config file for cloudmonkey", metavar="FILE")
+dest="configFile", default=config_file,
+help="config file for cloudmonkey", metavar="FILE")
parser.add_argument("commands", nargs=argparse.REMAINDER,
help="api commands")
git commit: updated refs/heads/CLOUDSTACK-7468 to 5d11385
Repository: cloudstack
Updated Branches:
refs/heads/CLOUDSTACK-7468 [created] 5d11385c3
CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects
Signed-off-by: Will Stevens
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d11385c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d11385c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d11385c
Branch: refs/heads/CLOUDSTACK-7468
Commit: 5d11385c31ed43d5424f161533eeb2c3d61b7726
Parents: dc3f0cb
Author: Will Stevens
Authored: Tue Sep 2 15:25:41 2014 -0400
Committer: Will Stevens
Committed: Wed Sep 3 10:07:19 2014 -0400
--
.../user/loadbalancer/ListSslCertsCmd.java | 8 +++
.../user/loadbalancer/UploadSslCertCmd.java | 23 +++
.../api/response/SslCertResponse.java | 32 ++
.../cloudstack/network/lb/CertServiceImpl.java | 64 +---
.../cloudstack/network/lb/CertServiceTest.java | 63 ++-
5 files changed, 180 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d11385c/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index aaadebb..470968f 100644
---
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -29,6 +29,7 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
@@ -58,6 +59,9 @@ public class ListSslCertsCmd extends BaseCmd {
@Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType =
FirewallRuleResponse.class, required = false, description = "Loadbalancer Rule
Id")
private Long lbId;
+@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
entityType = ProjectResponse.class, required = false, description = "project
who owns the ssl cert")
+private Long projectId;
+
/
/// Accessors ///
/
@@ -74,6 +78,10 @@ public class ListSslCertsCmd extends BaseCmd {
return lbId;
}
+public Long getProjectId() {
+return projectId;
+}
+
/
/// API Implementation///
/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d11385c/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index 7b150a7..cd5bb27 100644
---
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -26,6 +26,8 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
@@ -62,6 +64,15 @@ public class UploadSslCertCmd extends BaseCmd {
@Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING,
description = "Password for the private key")
private String password;
+@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING,
description = "account who will own the ssl cert")
+private String accountName;
+
+@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
entityType = ProjectResponse.class, description = "an optional project for the
ssl cert")
+private Long projectId;
+
+@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID,
entityType = DomainResponse.class, description = "domain ID o
svn commit: r921124 - /websites/production/cloudstack/content/
Author: bhaisaab Date: Wed Sep 3 10:54:09 2014 New Revision: 921124 Log: Fix CloudStack event section, the fix was done by Sebastien Added: websites/production/cloudstack/content/ - copied from r921123, websites/staging/cloudstack/trunk/content/
git commit: updated refs/heads/4.3 to 61e551b
Repository: cloudstack Updated Branches: refs/heads/4.3 14bd15151 -> 61e551b5a Edit travis config and CHANGES file Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/61e551b5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/61e551b5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/61e551b5 Branch: refs/heads/4.3 Commit: 61e551b5ae23baa57cc5b5f44c6fb6f1a86c8c6c Parents: 14bd151 Author: Sebastien Goasguen Authored: Wed Sep 3 06:45:25 2014 -0400 Committer: Sebastien Goasguen Committed: Wed Sep 3 06:45:25 2014 -0400 -- .travis.yml | 4 ++-- CHANGES.md | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61e551b5/.travis.yml -- diff --git a/.travis.yml b/.travis.yml index 01a62bb..0788001 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,8 +24,8 @@ jdk: notifications: email: false env: -- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_iso test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning" -- TESTS="test_portable_publicip test_primary_storage test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers" +- TESTS="test_affinity_groups test_deploy_vms_with_varied_deploymentplanners test_disk_offerings test_global_settings test_guest_vlan_range test_multipleips_per_nic test_network test_non_contigiousvlan test_over_provisioning" +- TESTS="test_portable_publicip test_privategw_acl test_public_ip_range test_pvlan test_regions test_reset_vm_on_reboot test_resource_detail test_routers" - TESTS="test_secondary_storage test_service_offerings test_ssvm test_templates misc/test_deploy_vm test_vm_life_cycle test_volumes test_vpc_vpn" before_install: travis_wait 30 ./tools/travis/before_install.sh install: ./tools/travis/install.sh http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61e551b5/CHANGES.md -- diff --git a/CHANGES.md b/CHANGES.md index b26f49c..84d6a4a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -8,7 +8,9 @@ Version 4.3.1 - This is a bug fix release. The following issues were fixed: - + +CLOUDSTACK-6531: Stopping the route in case of command failures +CLOUDSTACK-6115: TravisCI configuration CLOUDSTACK-7405: allowing VR meta-data to be accessed without trailing slash CLOUDSTACK-7260: Management server not responding after some time for Vmware due to Oom (cannot create native thread). CLOUDSTACK-7038: Add mysql client dependency for mgmt server pkg for debian
git commit: updated refs/heads/4.4 to 92339bc
Repository: cloudstack
Updated Branches:
refs/heads/4.4 83d2fd45c -> 92339bca0
CLOUDSTACK-7468: Fixed the NetScaler SSL Termination behavior with Projects
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/92339bca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/92339bca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/92339bca
Branch: refs/heads/4.4
Commit: 92339bca0b0c8ecfc8b190e176dabfb0e8440f67
Parents: 83d2fd4
Author: Will Stevens
Authored: Tue Sep 2 15:25:41 2014 -0400
Committer: Will Stevens
Committed: Tue Sep 2 15:25:41 2014 -0400
--
.../user/loadbalancer/ListSslCertsCmd.java | 8 +++
.../user/loadbalancer/UploadSslCertCmd.java | 23 +++
.../api/response/SslCertResponse.java | 32 ++
.../cloudstack/network/lb/CertServiceImpl.java | 64 +---
.../cloudstack/network/lb/CertServiceTest.java | 63 ++-
5 files changed, 180 insertions(+), 10 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92339bca/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
index aaadebb..470968f 100644
---
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
@@ -29,6 +29,7 @@ import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.response.AccountResponse;
import org.apache.cloudstack.api.response.FirewallRuleResponse;
import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
@@ -58,6 +59,9 @@ public class ListSslCertsCmd extends BaseCmd {
@Parameter(name = ApiConstants.LBID, type = CommandType.UUID, entityType =
FirewallRuleResponse.class, required = false, description = "Loadbalancer Rule
Id")
private Long lbId;
+@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
entityType = ProjectResponse.class, required = false, description = "project
who owns the ssl cert")
+private Long projectId;
+
/
/// Accessors ///
/
@@ -74,6 +78,10 @@ public class ListSslCertsCmd extends BaseCmd {
return lbId;
}
+public Long getProjectId() {
+return projectId;
+}
+
/
/// API Implementation///
/
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/92339bca/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
--
diff --git
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
index 7b150a7..cd5bb27 100644
---
a/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
+++
b/api/src/org/apache/cloudstack/api/command/user/loadbalancer/UploadSslCertCmd.java
@@ -26,6 +26,8 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SslCertResponse;
import org.apache.cloudstack.context.CallContext;
@@ -62,6 +64,15 @@ public class UploadSslCertCmd extends BaseCmd {
@Parameter(name = ApiConstants.PASSWORD, type = CommandType.STRING,
description = "Password for the private key")
private String password;
+@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING,
description = "account who will own the ssl cert")
+private String accountName;
+
+@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID,
entityType = ProjectResponse.class, description = "an optional project for the
ssl cert")
+private Long projectId;
+
+@Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID,
entityType = DomainResponse.class, description = "domain ID of the account
owning the ssl cert")
+private L
svn commit: r921121 - in /websites/staging/cloudstack/trunk/content: ./ index.html
Author: buildbot Date: Wed Sep 3 10:22:50 2014 New Revision: 921121 Log: Staging update by buildbot for cloudstack Modified: websites/staging/cloudstack/trunk/content/ (props changed) websites/staging/cloudstack/trunk/content/index.html Propchange: websites/staging/cloudstack/trunk/content/ -- --- cms:source-revision (original) +++ cms:source-revision Wed Sep 3 10:22:50 2014 @@ -1 +1 @@ -1620604 +1622210 Modified: websites/staging/cloudstack/trunk/content/index.html == --- websites/staging/cloudstack/trunk/content/index.html (original) +++ websites/staging/cloudstack/trunk/content/index.html Wed Sep 3 10:22:50 2014 @@ -260,13 +260,13 @@ CloudStack Events -2014 CloudStack Collaboration Conference North America +2014 CloudStack Collaboration Conference Europe -Our next conference is April 9 - 11, 2014, in Denver Colorado. Aimed at users, developers and everybody else interested in Apache CloudStack, the CloudStack Collaboration Conference is the place to learn more about CloudStack or join developers to discuss the past, present and future. +Our next conference is November 19 - 21, 2014, in Budapest, Hungary. Aimed at users, developers and everybody else interested in Apache CloudStack, the CloudStack Collaboration Conference is the place to learn more about CloudStack or join developers to discuss the past, present and future. -Learn more about CCCNA14 at http://cloudstackcollab.org/";>cloudstackcollab.org. +Learn more about CCCEU14 at http://cloudstackcollab.org/";>cloudstackcollab.org. Upcoming CloudStack Related Events
svn commit: r1622210 - /cloudstack/site/trunk/content/index.mdtext
Author: sebgoa Date: Wed Sep 3 10:18:09 2014 New Revision: 1622210 URL: http://svn.apache.org/r1622210 Log: Replace Denver with Budapest Modified: cloudstack/site/trunk/content/index.mdtext Modified: cloudstack/site/trunk/content/index.mdtext URL: http://svn.apache.org/viewvc/cloudstack/site/trunk/content/index.mdtext?rev=1622210&r1=1622209&r2=1622210&view=diff == --- cloudstack/site/trunk/content/index.mdtext (original) +++ cloudstack/site/trunk/content/index.mdtext Wed Sep 3 10:18:09 2014 @@ -140,13 +140,13 @@ CloudStack Events -2014 CloudStack Collaboration Conference North America +2014 CloudStack Collaboration Conference Europe -Our next conference is April 9 - 11, 2014, in Denver Colorado. Aimed at users, developers and everybody else interested in Apache CloudStack, the CloudStack Collaboration Conference is the place to learn more about CloudStack or join developers to discuss the past, present and future. +Our next conference is November 19 - 21, 2014, in Budapest, Hungary. Aimed at users, developers and everybody else interested in Apache CloudStack, the CloudStack Collaboration Conference is the place to learn more about CloudStack or join developers to discuss the past, present and future. -Learn more about CCCNA14 at http://cloudstackcollab.org/";>cloudstackcollab.org. +Learn more about CCCEU14 at http://cloudstackcollab.org/";>cloudstackcollab.org. Upcoming CloudStack Related Events
[2/2] git commit: updated refs/heads/master to dc3f0cb
Improve the handling of the findbug exclude files Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc3f0cbc Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc3f0cbc Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc3f0cbc Branch: refs/heads/master Commit: dc3f0cbc6375d3f26fedde4f0b6a2a34b5794f83 Parents: 9b783d1 Author: Hugo Trippaers Authored: Wed Sep 3 10:39:48 2014 +0200 Committer: Hugo Trippaers Committed: Wed Sep 3 10:41:22 2014 +0200 -- agent/findbugsExcludeFilter.xml | 25 api/findbugsExcludeFilter.xml | 25 awsapi/findbugsExcludeFilter.xml| 25 core/findbugsExcludeFilter.xml | 25 engine/api/findbugsExcludeFilter.xml| 25 engine/components-api/findbugsExcludeFilter.xml | 25 engine/network/findbugsExcludeFilter.xml| 25 engine/orchestration/findbugsExcludeFilter.xml | 25 engine/schema/findbugsExcludeFilter.xml | 25 engine/service/findbugsExcludeFilter.xml| 25 engine/storage/cache/findbugsExcludeFilter.xml | 25 .../datamotion/findbugsExcludeFilter.xml| 25 engine/storage/findbugsExcludeFilter.xml| 25 engine/storage/image/findbugsExcludeFilter.xml | 25 .../storage/snapshot/findbugsExcludeFilter.xml | 25 engine/storage/volume/findbugsExcludeFilter.xml | 25 framework/cluster/findbugsExcludeFilter.xml | 23 --- framework/config/findbugsExcludeFilter.xml | 23 --- framework/db/findbugsExcludeFilter.xml | 23 --- framework/events/findbugsExcludeFilter.xml | 23 --- framework/ipc/findbugsExcludeFilter.xml | 23 --- framework/jobs/findbugsExcludeFilter.xml| 23 --- .../managed-context/findbugsExcludeFilter.xml | 25 framework/rest/findbugsExcludeFilter.xml| 23 --- framework/security/findbugsExcludeFilter.xml| 23 --- .../spring/lifecycle/findbugsExcludeFilter.xml | 23 --- .../spring/module/findbugsExcludeFilter.xml | 23 --- .../static-role-based/findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../snmp-alerts/findbugsExcludeFilter.xml | 25 .../syslog-alerts/findbugsExcludeFilter.xml | 25 plugins/api/discovery/findbugsExcludeFilter.xml | 25 .../api/rate-limit/findbugsExcludeFilter.xml| 25 .../findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../user-dispersing/findbugsExcludeFilter.xml | 25 .../inmemory/findbugsExcludeFilter.xml | 25 .../rabbitmq/findbugsExcludeFilter.xml | 25 .../netapp/findbugsExcludeFilter.xml| 25 .../skip-heurestics/findbugsExcludeFilter.xml | 25 .../random/findbugsExcludeFilter.xml| 25 .../baremetal/findbugsExcludeFilter.xml | 25 .../hyperv/findbugsExcludeFilter.xml| 25 .../hypervisors/kvm/findbugsExcludeFilter.xml | 25 .../hypervisors/ovm/findbugsExcludeFilter.xml | 25 .../simulator/findbugsExcludeFilter.xml | 25 .../hypervisors/ucs/findbugsExcludeFilter.xml | 25 .../vmware/findbugsExcludeFilter.xml| 25 .../xenserver/findbugsExcludeFilter.xml | 31 --- .../bigswitch-vns/findbugsExcludeFilter.xml | 25 .../brocade-vcs/findbugsExcludeFilter.xml | 25 .../cisco-vnmc/findbugsExcludeFilter.xml| 25 .../dns-notifier/findbugsExcludeFilter.xml | 25 .../findbugsExcludeFilter.xml | 25 .../f5/findbugsExcludeFilter.xml| 25 .../findbugsExcludeFilter.xml | 25 .../juniper-contrail/findbugsExcludeFilter.xml | 25 .../juniper-srx/findbugsExcludeFilter.xml | 25 .../midonet/findbugsExcludeFilter.xml | 25 .../netscaler/findbugsExcludeFilter.xml | 25 .../nicira-nvp/findbugsExcludeFilter.xml| 25 .../nuage-vsp/findbugsExcludeFilter.xml | 25 .../opendaylight/findbu
[1/2] Improve the handling of the findbug exclude files
Repository: cloudstack Updated Branches: refs/heads/master 9b783d19a -> dc3f0cbc6 http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml b/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/juniper-srx/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/midonet/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/midonet/findbugsExcludeFilter.xml b/plugins/network-elements/midonet/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/midonet/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/netscaler/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/netscaler/findbugsExcludeFilter.xml b/plugins/network-elements/netscaler/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/netscaler/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml b/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/nicira-nvp/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml b/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/nuage-vsp/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml b/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/opendaylight/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/ovs/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/ovs/findbugsExcludeFilter.xml b/plugins/network-elements/ovs/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/ovs/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml b/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/palo-alto/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml b/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/stratosphere-ssp/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc3f0cbc/plugins/network-elements/vxlan/findbugsExcludeFilter.xml -- diff --git a/plugins/network-elements/vxlan/findbugsExcludeFilter.xml b/plugins/network-elements/vxlan/findbugsExcludeFilter.xml deleted file mode 100644 index d372850..000 --- a/plugins/network-elements/vxlan/findbugsExcludeFilter.xml +++ /dev/null @@ -1,25
git commit: updated refs/heads/master to 9b783d1
Repository: cloudstack Updated Branches: refs/heads/master 396f29c13 -> 9b783d19a CLOUDSTACK-7228 Only shrink disk when CLVM is in use. Signed-off-by: SrikanteswaraRao Talluri Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9b783d19 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9b783d19 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9b783d19 Branch: refs/heads/master Commit: 9b783d19ad7e784d3751f4eaa2a672401d122a01 Parents: 396f29c Author: John Dilley Authored: Thu Aug 14 10:38:08 2014 + Committer: SrikanteswaraRao Talluri Committed: Wed Sep 3 12:30:59 2014 +0530 -- test/integration/smoke/test_volumes.py | 79 + 1 file changed, 47 insertions(+), 32 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9b783d19/test/integration/smoke/test_volumes.py -- diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index 579b0ae..bc0dcbb 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -30,7 +30,8 @@ from marvin.lib.base import (ServiceOffering, Account, Volume, Host, - DiskOffering) + DiskOffering, + StoragePool) from marvin.lib.common import (get_domain, get_zone, get_template) @@ -660,41 +661,55 @@ class TestVolumes(cloudstackTestCase): "Check if the data volume resized appropriately" ) -self.services["disk_offering"]["disksize"] = 10 -disk_offering_10_GB = DiskOffering.create( -self.apiclient, -self.services["disk_offering"] -) -self.cleanup.append(disk_offering_10_GB) +can_shrink = False -cmd= resizeVolume.resizeVolumeCmd() -cmd.id = self.volume.id -cmd.diskofferingid = disk_offering_10_GB.id -cmd.shrinkok = "true" +list_volume_response = Volume.list( +self.apiClient, +id=self.volume.id, +type='DATADISK' +) +storage_pool_id = [x.storageid for x in list_volume_response if x.id == self.volume.id][0] +storage = StoragePool.list(self.apiclient, id=storage_pool_id)[0] +# At present only CLVM supports shrinking volumes +if storage.type.lower() == "clvm": +can_shrink = True + +if can_shrink: +self.services["disk_offering"]["disksize"] = 10 +disk_offering_10_GB = DiskOffering.create( +self.apiclient, +self.services["disk_offering"] +) +self.cleanup.append(disk_offering_10_GB) -self.apiClient.resizeVolume(cmd) +cmd= resizeVolume.resizeVolumeCmd() +cmd.id = self.volume.id +cmd.diskofferingid = disk_offering_10_GB.id +cmd.shrinkok = "true" -count = 0 -success = False -while count < 3: -list_volume_response = Volume.list( -self.apiClient, -id=self.volume.id -) -for vol in list_volume_response: -if vol.id == self.volume.id and int(vol.size) == (int(disk_offering_10_GB.disksize) * (1024 ** 3)) and vol.state == 'Ready': -success = True -if success: -break -else: -time.sleep(10) -count += 1 +self.apiClient.resizeVolume(cmd) -self.assertEqual( - success, - True, - "Check if the root volume resized appropriately" - ) +count = 0 +success = False +while count < 3: +list_volume_response = Volume.list( +self.apiClient, +id=self.volume.id +) +for vol in list_volume_response
