git commit: updated refs/heads/master to a5902f1

[sebgoa]

Repository: cloudstack
Updated Branches:
  refs/heads/master 044c5e0ee -> a5902f1db


CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords

Signed-off-by: Sebastien Goasguen 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a5902f1d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a5902f1d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a5902f1d

Branch: refs/heads/master
Commit: a5902f1db4b14012ecd1d5660257655e9dfe4354
Parents: 044c5e0
Author: Olivier Lemasle 
Authored: Sun Jun 8 17:59:17 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue Jun 10 03:11:35 2014 -0400

--
 .../api/response/UsageRecordResponse.java   | 24 +
 api/src/org/apache/cloudstack/usage/Usage.java  |  6 +++
 .../src/com/cloud/usage/UsageVMInstanceVO.java  | 17 ++
 engine/schema/src/com/cloud/usage/UsageVO.java  | 46 
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 28 +++---
 server/src/com/cloud/api/ApiResponseHelper.java |  4 ++
 setup/db/db/schema-430to440.sql |  5 ++
 .../usage/parser/VMInstanceUsageParser.java | 57 +---
 8 files changed, 161 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5902f1d/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java 
b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
index 5e2e85d..87a085c 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -101,6 +101,18 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 @Param(description = "virtual size of resource")
 private Long virtualSize;
 
+@SerializedName(ApiConstants.CPU_NUMBER)
+@Param(description = "number of cpu of resource")
+private Long cpuNumber;
+
+@SerializedName(ApiConstants.CPU_SPEED)
+@Param(description = "speed of each cpu of resource")
+private Long cpuSpeed;
+
+@SerializedName(ApiConstants.MEMORY)
+@Param(description = "memory allocated for the resource")
+private Long memory;
+
 @SerializedName(ApiConstants.START_DATE)
 @Param(description = "start date of the usage record")
 private String startDate;
@@ -229,4 +241,16 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 public void setVirtualSize(Long virtualSize) {
 this.virtualSize = virtualSize;
 }
+
+public void setCpuNumber(Long cpuNumber) {
+this.cpuNumber = cpuNumber;
+}
+
+public void setCpuSpeed(Long cpuSpeed) {
+this.cpuSpeed = cpuSpeed;
+}
+
+public void setMemory(Long memory) {
+this.memory = memory;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5902f1d/api/src/org/apache/cloudstack/usage/Usage.java
--
diff --git a/api/src/org/apache/cloudstack/usage/Usage.java 
b/api/src/org/apache/cloudstack/usage/Usage.java
index 20dc189..fe35390 100644
--- a/api/src/org/apache/cloudstack/usage/Usage.java
+++ b/api/src/org/apache/cloudstack/usage/Usage.java
@@ -40,6 +40,12 @@ public interface Usage {
 
 public String getVmName();
 
+public Long getCpuCores();
+
+public Long getCpuSpeed();
+
+public Long getMemory();
+
 public Long getOfferingId();
 
 public Long getTemplateId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a5902f1d/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
--
diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java 
b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
index 06d4876..1e7b424 100644
--- a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
+++ b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
@@ -86,6 +86,23 @@ public class UsageVMInstanceVO {
 this.endDate = endDate;
 }
 
+public UsageVMInstanceVO(int usageType, long zoneId, long accountId, long 
vmInstanceId, String vmName, long serviceOfferingId, long templateId,
+Long cpuSpeed, Long cpuCores, Long memory, String hypervisorType, 
Date startDate, Date endDate) {
+this.usageType = usageType;
+this.zoneId = zoneId;
+this.accountId = accountId;
+this.vmInstanceId = vmInstanceId;
+this.vmName = vmName;
+this.serviceOfferingId = serviceOfferingId;
+this.templateId = templateId;
+this.cpuSpeed = cpuSpeed;
+this.cpuCores = cpuCore

git commit: updated refs/heads/4.4-forward to a1f278e

[sebgoa]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward a4b401f29 -> a1f278e9d


CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords

Signed-off-by: Sebastien Goasguen 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1f278e9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1f278e9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1f278e9

Branch: refs/heads/4.4-forward
Commit: a1f278e9d47e8029d58df6d3aae13495965ca434
Parents: a4b401f
Author: Olivier Lemasle 
Authored: Sun Jun 8 17:59:17 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue Jun 10 03:12:29 2014 -0400

--
 .../api/response/UsageRecordResponse.java   | 24 +
 api/src/org/apache/cloudstack/usage/Usage.java  |  6 +++
 .../src/com/cloud/usage/UsageVMInstanceVO.java  | 17 ++
 engine/schema/src/com/cloud/usage/UsageVO.java  | 46 
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 28 +++---
 server/src/com/cloud/api/ApiResponseHelper.java |  4 ++
 setup/db/db/schema-430to440.sql |  5 ++
 .../usage/parser/VMInstanceUsageParser.java | 57 +---
 8 files changed, 161 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f278e9/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java 
b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
index 5e2e85d..87a085c 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -101,6 +101,18 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 @Param(description = "virtual size of resource")
 private Long virtualSize;
 
+@SerializedName(ApiConstants.CPU_NUMBER)
+@Param(description = "number of cpu of resource")
+private Long cpuNumber;
+
+@SerializedName(ApiConstants.CPU_SPEED)
+@Param(description = "speed of each cpu of resource")
+private Long cpuSpeed;
+
+@SerializedName(ApiConstants.MEMORY)
+@Param(description = "memory allocated for the resource")
+private Long memory;
+
 @SerializedName(ApiConstants.START_DATE)
 @Param(description = "start date of the usage record")
 private String startDate;
@@ -229,4 +241,16 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 public void setVirtualSize(Long virtualSize) {
 this.virtualSize = virtualSize;
 }
+
+public void setCpuNumber(Long cpuNumber) {
+this.cpuNumber = cpuNumber;
+}
+
+public void setCpuSpeed(Long cpuSpeed) {
+this.cpuSpeed = cpuSpeed;
+}
+
+public void setMemory(Long memory) {
+this.memory = memory;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f278e9/api/src/org/apache/cloudstack/usage/Usage.java
--
diff --git a/api/src/org/apache/cloudstack/usage/Usage.java 
b/api/src/org/apache/cloudstack/usage/Usage.java
index 20dc189..fe35390 100644
--- a/api/src/org/apache/cloudstack/usage/Usage.java
+++ b/api/src/org/apache/cloudstack/usage/Usage.java
@@ -40,6 +40,12 @@ public interface Usage {
 
 public String getVmName();
 
+public Long getCpuCores();
+
+public Long getCpuSpeed();
+
+public Long getMemory();
+
 public Long getOfferingId();
 
 public Long getTemplateId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1f278e9/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
--
diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java 
b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
index 06d4876..1e7b424 100644
--- a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
+++ b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
@@ -86,6 +86,23 @@ public class UsageVMInstanceVO {
 this.endDate = endDate;
 }
 
+public UsageVMInstanceVO(int usageType, long zoneId, long accountId, long 
vmInstanceId, String vmName, long serviceOfferingId, long templateId,
+Long cpuSpeed, Long cpuCores, Long memory, String hypervisorType, 
Date startDate, Date endDate) {
+this.usageType = usageType;
+this.zoneId = zoneId;
+this.accountId = accountId;
+this.vmInstanceId = vmInstanceId;
+this.vmName = vmName;
+this.serviceOfferingId = serviceOfferingId;
+this.templateId = templateId;
+this.cpuSpeed = cpuSpeed;
+this.cpuCores

git commit: updated refs/heads/4.4-forward to 390e498

[koushik]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward a1f278e9d -> 390e498dc


Fixed issues reported by coverity NPEs, unwritten field access and self 
assignment

Signed-off-by: Koushik Das 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/390e498d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/390e498d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/390e498d

Branch: refs/heads/4.4-forward
Commit: 390e498dc58a89f0b060c50e5b796061bc97342e
Parents: a1f278e
Author: Rajani Karuturi 
Authored: Tue Jun 10 13:52:43 2014 +0530
Committer: Koushik Das 
Committed: Tue Jun 10 14:23:43 2014 +0530

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 49 +++-
 1 file changed, 27 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/390e498d/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 9b63043..4502365 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -775,8 +775,9 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
 try {
 orchestrateStart(vmUuid, params, planToDeploy, planner);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = startVmThroughJobQueue(vmUuid, 
params, planToDeploy, planner);
@@ -1352,8 +1353,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateStop(vmUuid, cleanUpEvenIfUnableToStop);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 
 } else {
@@ -1451,7 +1453,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Unable to transition the state but we're 
moving on because it's forced stop");
 }
-if (state == State.Starting || state == State.Migrating) {
+if ((state == State.Starting) || (state == State.Migrating) || 
(state == State.Stopping)) {
 if (work != null) {
 doCleanup = true;
 } else {
@@ -1460,8 +1462,6 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 throw new CloudRuntimeException("Work item not found, We 
cannot stop " + vm + " when it is in state " + vm.getState());
 }
-} else if (state == State.Stopping) {
-doCleanup = true;
 }
 
 if (doCleanup) {
@@ -1681,8 +1681,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateStorageMigration(vmUuid, destPool);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = 
migrateVmStorageThroughJobQueue(vmUuid, destPool);
@@ -1775,8 +1776,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateMigrate(vmUuid, srcHostId, dest);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = migrateVmThroughJobQueue(vmUuid, 
srcHostId, dest);
@@ -2072,8 +2074,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateMigrateWithStorage(vmUuid, srcHostId, destHostId, 
volumeToPool);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 
 } else {
@@ -2418,8 +2421,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try

git commit: updated refs/heads/master to b666a1f

[koushik]

Repository: cloudstack
Updated Branches:
  refs/heads/master a5902f1db -> b666a1f3a


Fixed issues reported by coverity NPEs, unwritten field access and self 
assignment

Signed-off-by: Koushik Das 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b666a1f3
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b666a1f3
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b666a1f3

Branch: refs/heads/master
Commit: b666a1f3a5bcd17663af1675e82759c3ff8cbeb9
Parents: a5902f1
Author: Rajani Karuturi 
Authored: Tue Jun 10 13:52:43 2014 +0530
Committer: Koushik Das 
Committed: Tue Jun 10 14:34:47 2014 +0530

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 49 +++-
 1 file changed, 27 insertions(+), 22 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b666a1f3/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index 25c67db..4aa5fc8 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -773,8 +773,9 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
 try {
 orchestrateStart(vmUuid, params, planToDeploy, planner);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = startVmThroughJobQueue(vmUuid, 
params, planToDeploy, planner);
@@ -1350,8 +1351,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateStop(vmUuid, cleanUpEvenIfUnableToStop);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 
 } else {
@@ -1449,7 +1451,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Unable to transition the state but we're 
moving on because it's forced stop");
 }
-if (state == State.Starting || state == State.Migrating) {
+if ((state == State.Starting) || (state == State.Migrating) || 
(state == State.Stopping)) {
 if (work != null) {
 doCleanup = true;
 } else {
@@ -1458,8 +1460,6 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 throw new CloudRuntimeException("Work item not found, We 
cannot stop " + vm + " when it is in state " + vm.getState());
 }
-} else if (state == State.Stopping) {
-doCleanup = true;
 }
 
 if (doCleanup) {
@@ -1679,8 +1679,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateStorageMigration(vmUuid, destPool);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = 
migrateVmStorageThroughJobQueue(vmUuid, destPool);
@@ -1773,8 +1774,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateMigrate(vmUuid, srcHostId, dest);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 } else {
 Outcome outcome = migrateVmThroughJobQueue(vmUuid, 
srcHostId, dest);
@@ -2071,8 +2073,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
 orchestrateMigrateWithStorage(vmUuid, srcHostId, destHostId, 
volumeToPool);
 } finally {
-if (VmJobEnabled.value())
+if (placeHolder != null) {
 _workJobDao.expunge(placeHolder.getId());
+}
 }
 
 } else {
@@ -2417,8 +2420,9 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 try {
   

Build failed in Jenkins: cloudstack-rat-master #4858

[Apache Jenkins Server]

See 

--
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Started by an SCM change
Building remotely on ubuntu5 (Ubuntu ubuntu) in workspace 

 > git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git --version
FATAL: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
hudson.plugins.git.GitException: Failed to fetch from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:623)
at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:855)
at hudson.plugins.git.GitSCM.checkout(GitSCM.java:880)
at hudson.model.AbstractProject.checkout(AbstractProject.java:1414)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:671)
at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:88)
at 
hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:580)
at hudson.model.Run.execute(Run.java:1676)
at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
at hudson.model.ResourceController.execute(ResourceController.java:88)
at hudson.model.Executor.run(Executor.java:231)
Caused by: hudson.plugins.git.GitException: Failed to connect to 
https://git-wip-us.apache.org/repos/asf/cloudstack.git (exception: 
java.net.SocketException: Connection reset)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.checkCredentials(CliGitAPIImpl.java:1960)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1137)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$200(CliGitAPIImpl.java:87)
at 
org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:257)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:153)
at 
org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:146)
at hudson.remoting.UserRequest.perform(UserRequest.java:118)
at hudson.remoting.UserRequest.perform(UserRequest.java:48)
at hudson.remoting.Request$2.run(Request.java:328)
at 
hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72)
at java.util.concurrent.FutureTask.run(FutureTask.java:262)
at 
java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)
at 
java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)
at java.lang.Thread.run(Thread.java:745)

Jenkins build is back to normal : cloudstack-rat-master #4859

[Apache Jenkins Server]

See 

git commit: updated refs/heads/4.4-forward to c5ee5ad

[saksham]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 390e498dc -> c5ee5ad5c


CLOUDSTACK-6864: UploadSSlCert API requires double encoding of URL params


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c5ee5ad5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c5ee5ad5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c5ee5ad5

Branch: refs/heads/4.4-forward
Commit: c5ee5ad5c828d9f0b128e3d7280a30dcf717e045
Parents: 390e498
Author: Saksham Srivastava 
Authored: Mon Jun 9 12:24:30 2014 +0530
Committer: Saksham Srivastava 
Committed: Tue Jun 10 16:26:05 2014 +0530

--
 .../cloudstack/network/lb/CertServiceImpl.java  | 25 
 .../cloudstack/network/lb/CertServiceTest.java  | 62 ++--
 2 files changed, 41 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5ee5ad5/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
--
diff --git a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java 
b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
index ba71d63..c2c155d 100644
--- a/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
+++ b/server/src/org/apache/cloudstack/network/lb/CertServiceImpl.java
@@ -18,8 +18,6 @@ package org.apache.cloudstack.network.lb;
 
 import java.io.IOException;
 import java.io.StringReader;
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
 import java.security.InvalidAlgorithmParameterException;
 import java.security.InvalidKeyException;
 import java.security.KeyPair;
@@ -53,18 +51,17 @@ import javax.crypto.NoSuchPaddingException;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import org.apache.commons.io.IOUtils;
-import org.apache.log4j.Logger;
-import org.bouncycastle.jce.provider.BouncyCastleProvider;
-import org.bouncycastle.openssl.PEMReader;
-import org.bouncycastle.openssl.PasswordFinder;
-
 import org.apache.cloudstack.acl.SecurityChecker;
 import org.apache.cloudstack.api.command.user.loadbalancer.DeleteSslCertCmd;
 import org.apache.cloudstack.api.command.user.loadbalancer.ListSslCertsCmd;
 import org.apache.cloudstack.api.command.user.loadbalancer.UploadSslCertCmd;
 import org.apache.cloudstack.api.response.SslCertResponse;
 import org.apache.cloudstack.context.CallContext;
+import org.apache.commons.io.IOUtils;
+import org.apache.log4j.Logger;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.openssl.PEMReader;
+import org.bouncycastle.openssl.PasswordFinder;
 
 import com.cloud.event.ActionEvent;
 import com.cloud.event.EventTypes;
@@ -109,10 +106,10 @@ public class CertServiceImpl implements CertService {
 public SslCertResponse uploadSslCert(UploadSslCertCmd certCmd) {
 try {
 
-String cert = URLDecoder.decode(certCmd.getCert(), "UTF-8");
-String key = URLDecoder.decode(certCmd.getKey(), "UTF-8");
+String cert = certCmd.getCert();
+String key = certCmd.getKey();
 String password = certCmd.getPassword();
-String chain = certCmd.getChain() == null ? null : 
URLDecoder.decode(certCmd.getChain(), "UTF-8");
+String chain = certCmd.getChain();
 
 validate(cert, key, password, chain);
 s_logger.debug("Certificate Validation succeeded");
@@ -127,8 +124,8 @@ public class CertServiceImpl implements CertService {
 
 return createCertResponse(certVO, null);
 
-} catch (UnsupportedEncodingException e) {
-throw new CloudRuntimeException("Error decoding certificate data");
+} catch (Exception e) {
+throw new CloudRuntimeException("Error parsing certificate data " 
+ e.getMessage());
 }
 
 }
@@ -429,7 +426,7 @@ public class CertServiceImpl implements CertService {
 try {
 return (Certificate)certPem.readObject();
 } catch (Exception e) {
-throw new InvalidParameterValueException("Invalid Certificate 
format. Expected X509 certificate");
+throw new InvalidParameterValueException("Invalid Certificate 
format. Expected X509 certificate. Failed due to " + e.getMessage());
 } finally {
 IOUtils.closeQuietly(certPem);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c5ee5ad5/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
--
diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java 
b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
index a67a9ab..038845d 100644
--- a/server/test/org/apache/cloudstack/network/lb/

[3/5] git commit: updated refs/heads/4.4 to c934e7b

[dahn]

CLOUDSTACK-6710: Add missing OS mappings

(cherry picked from commit ac92b3690304ff224e7e2530ea7d8e39f28a05c3)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/04665ee2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/04665ee2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/04665ee2

Branch: refs/heads/4.4
Commit: 04665ee2564ee924c3b6379a34b9bca8a25b94b5
Parents: fc7d0b2
Author: amoghvk 
Authored: Mon Jun 9 14:59:31 2014 -0700
Committer: Daan Hoogland 
Committed: Tue Jun 10 13:18:08 2014 +0200

--
 setup/db/db/schema-430to440.sql | 706 +++
 1 file changed, 706 insertions(+)
--

[1/5] git commit: updated refs/heads/4.4 to c934e7b

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 6721701a5 -> c934e7b05


CLOUDSTACK-6603 [Upgrade]DB Exception while Autoscale monitoring after 
upgrading from 4.3 to 4.4

(cherry picked from commit c282bb3a1293fbbfdb306263ea52464862670fb3)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fc7d0b2a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fc7d0b2a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fc7d0b2a

Branch: refs/heads/4.4
Commit: fc7d0b2a333e510619f14528a72e35bbf9ed7045
Parents: 6721701
Author: Rajesh Battala 
Authored: Mon Jun 9 14:42:16 2014 +0530
Committer: Daan Hoogland 
Committed: Mon Jun 9 21:20:03 2014 +0200

--
 setup/db/db/schema-40to410.sql  | 1 -
 setup/db/db/schema-430to440.sql | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc7d0b2a/setup/db/db/schema-40to410.sql
--
diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql
index 65fb350..53b4a1a 100644
--- a/setup/db/db/schema-40to410.sql
+++ b/setup/db/db/schema-40to410.sql
@@ -367,7 +367,6 @@ CREATE TABLE `cloud`.`autoscale_vmgroups` (
   `max_members` int unsigned NOT NULL,
   `member_port` int unsigned NOT NULL,
   `interval` int unsigned NOT NULL,
-  `last_interval` datetime DEFAULT NULL,
   `profile_id` bigint unsigned NOT NULL,
   `state` varchar(255) NOT NULL COMMENT 'enabled or disabled, a vmgroup is 
disabled to stop autoscaling activity',
   `created` datetime NOT NULL COMMENT 'date created',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fc7d0b2a/setup/db/db/schema-430to440.sql
--
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index d149a65..d172b94 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -657,6 +657,7 @@ ALTER TABLE `cloud`.`vpc` ADD COLUMN `display` tinyint(1) 
NOT NULL DEFAULT '1' C
 ALTER TABLE `cloud`.`firewall_rules` ADD COLUMN `display` tinyint(1) NOT NULL 
DEFAULT '1' COMMENT 'True if the rule can be displayed to the end user';
 ALTER TABLE `cloud`.`autoscale_vmgroups` ADD COLUMN `display` tinyint(1) NOT 
NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`autoscale_vmprofiles` ADD COLUMN `display` tinyint(1) NOT 
NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
+ALTER TABLE `cloud`.`autoscale_vmgroups` ADD COLUMN `last_interval` datetime 
NULL DEFAULT NULL COMMENT 'last updated time';
 ALTER TABLE `cloud`.`network_acl_item` ADD COLUMN `display` tinyint(1) NOT 
NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`network_acl` ADD COLUMN `display` tinyint(1) NOT NULL 
DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';
 ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `display` tinyint(1) NOT 
NULL DEFAULT '1' COMMENT 'True if the entry can be displayed to the end user';

[5/5] git commit: updated refs/heads/4.4 to c934e7b

[dahn]

CLOUDSTACK-6850: Return cpu cores, cpu speed and memory in listUsageRecords

Signed-off-by: Sebastien Goasguen 
(cherry picked from commit a1f278e9d47e8029d58df6d3aae13495965ca434)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c934e7b0
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c934e7b0
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c934e7b0

Branch: refs/heads/4.4
Commit: c934e7b052c09df2fae52a005e69951ed0235574
Parents: b490da2
Author: Olivier Lemasle 
Authored: Sun Jun 8 17:59:17 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 13:39:43 2014 +0200

--
 .../api/response/UsageRecordResponse.java   | 24 +
 api/src/org/apache/cloudstack/usage/Usage.java  |  6 +++
 .../src/com/cloud/usage/UsageVMInstanceVO.java  | 17 ++
 engine/schema/src/com/cloud/usage/UsageVO.java  | 46 
 .../cloud/usage/dao/UsageVMInstanceDaoImpl.java | 28 +++---
 server/src/com/cloud/api/ApiResponseHelper.java |  4 ++
 setup/db/db/schema-430to440.sql |  5 ++
 .../usage/parser/VMInstanceUsageParser.java | 57 +---
 8 files changed, 161 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c934e7b0/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java 
b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
index 5e2e85d..87a085c 100644
--- a/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/UsageRecordResponse.java
@@ -101,6 +101,18 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 @Param(description = "virtual size of resource")
 private Long virtualSize;
 
+@SerializedName(ApiConstants.CPU_NUMBER)
+@Param(description = "number of cpu of resource")
+private Long cpuNumber;
+
+@SerializedName(ApiConstants.CPU_SPEED)
+@Param(description = "speed of each cpu of resource")
+private Long cpuSpeed;
+
+@SerializedName(ApiConstants.MEMORY)
+@Param(description = "memory allocated for the resource")
+private Long memory;
+
 @SerializedName(ApiConstants.START_DATE)
 @Param(description = "start date of the usage record")
 private String startDate;
@@ -229,4 +241,16 @@ public class UsageRecordResponse extends BaseResponse 
implements ControlledEntit
 public void setVirtualSize(Long virtualSize) {
 this.virtualSize = virtualSize;
 }
+
+public void setCpuNumber(Long cpuNumber) {
+this.cpuNumber = cpuNumber;
+}
+
+public void setCpuSpeed(Long cpuSpeed) {
+this.cpuSpeed = cpuSpeed;
+}
+
+public void setMemory(Long memory) {
+this.memory = memory;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c934e7b0/api/src/org/apache/cloudstack/usage/Usage.java
--
diff --git a/api/src/org/apache/cloudstack/usage/Usage.java 
b/api/src/org/apache/cloudstack/usage/Usage.java
index 20dc189..fe35390 100644
--- a/api/src/org/apache/cloudstack/usage/Usage.java
+++ b/api/src/org/apache/cloudstack/usage/Usage.java
@@ -40,6 +40,12 @@ public interface Usage {
 
 public String getVmName();
 
+public Long getCpuCores();
+
+public Long getCpuSpeed();
+
+public Long getMemory();
+
 public Long getOfferingId();
 
 public Long getTemplateId();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c934e7b0/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
--
diff --git a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java 
b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
index 06d4876..1e7b424 100644
--- a/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
+++ b/engine/schema/src/com/cloud/usage/UsageVMInstanceVO.java
@@ -86,6 +86,23 @@ public class UsageVMInstanceVO {
 this.endDate = endDate;
 }
 
+public UsageVMInstanceVO(int usageType, long zoneId, long accountId, long 
vmInstanceId, String vmName, long serviceOfferingId, long templateId,
+Long cpuSpeed, Long cpuCores, Long memory, String hypervisorType, 
Date startDate, Date endDate) {
+this.usageType = usageType;
+this.zoneId = zoneId;
+this.accountId = accountId;
+this.vmInstanceId = vmInstanceId;
+this.vmName = vmName;
+this.serviceOfferingId = serviceOfferingId;
+this.templateId = templateId;
+this.cpuSpeed = cpuSpeed;
+this.cpuCores = cpuCores;
+this.memory =

[4/5] git commit: updated refs/heads/4.4 to c934e7b

[dahn]

CLOUDSTACK-6358: Remove hardcoded VMware mappings, handle snapshots

(cherry picked from commit a4b401f29f83f2f0b467a9d05b509f951b5a3bca)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b490da25
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b490da25
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b490da25

Branch: refs/heads/4.4
Commit: b490da25ba57471d128426fd7ad4b347f4be
Parents: 04665ee
Author: amoghvk 
Authored: Mon Jun 9 17:06:26 2014 -0700
Committer: Daan Hoogland 
Committed: Tue Jun 10 13:18:56 2014 +0200

--
 .../vmsnapshot/DefaultVMSnapshotStrategy.java   | 12 --
 .../com/cloud/hypervisor/guru/VMwareGuru.java   | 11 +
 .../vmware/resource/VmwareResource.java | 24 +++-
 3 files changed, 39 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b490da25/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
--
diff --git 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
index 21f4968..bfc6d79 100644
--- 
a/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
+++ 
b/engine/storage/snapshot/src/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategy.java
@@ -136,7 +136,11 @@ public class DefaultVMSnapshotStrategy extends ManagerBase 
implements VMSnapshot
 HostVO host = hostDao.findById(hostId);
 GuestOSHypervisorVO guestOsMapping = 
guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), 
host.getHypervisorType().toString(), host.getHypervisorVersion());
 CreateVMSnapshotCommand ccmd = new 
CreateVMSnapshotCommand(userVm.getInstanceName(), target, volumeTOs, 
guestOS.getDisplayName(), userVm.getState());
-ccmd.setPlatformEmulator(guestOsMapping.getGuestOsName());
+if (guestOsMapping == null) {
+ccmd.setPlatformEmulator(null);
+} else {
+ccmd.setPlatformEmulator(guestOsMapping.getGuestOsName());
+}
 ccmd.setWait(_wait);
 
 answer = (CreateVMSnapshotAnswer)agentMgr.send(hostId, ccmd);
@@ -347,7 +351,11 @@ public class DefaultVMSnapshotStrategy extends ManagerBase 
implements VMSnapshot
 HostVO host = hostDao.findById(hostId);
 GuestOSHypervisorVO guestOsMapping = 
guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), 
host.getHypervisorType().toString(), host.getHypervisorVersion());
 RevertToVMSnapshotCommand revertToSnapshotCommand = new 
RevertToVMSnapshotCommand(vmInstanceName, vmSnapshotTO, volumeTOs, 
guestOS.getDisplayName());
-
revertToSnapshotCommand.setPlatformEmulator(guestOsMapping.getGuestOsName());
+if (guestOsMapping == null) {
+revertToSnapshotCommand.setPlatformEmulator(null);
+} else {
+
revertToSnapshotCommand.setPlatformEmulator(guestOsMapping.getGuestOsName());
+}
 
 RevertToVMSnapshotAnswer answer = 
(RevertToVMSnapshotAnswer)agentMgr.send(hostId, revertToSnapshotCommand);
 if (answer != null && answer.getResult()) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b490da25/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
index 77c45b2..08d12f2 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -81,11 +81,13 @@ import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO;
 import com.cloud.secstorage.CommandExecLogDao;
 import com.cloud.secstorage.CommandExecLogVO;
 import com.cloud.storage.DataStoreRole;
+import com.cloud.storage.GuestOSHypervisorVO;
 import com.cloud.storage.GuestOSVO;
 import com.cloud.storage.Storage;
 import com.cloud.storage.Volume;
 import com.cloud.storage.VolumeVO;
 import com.cloud.storage.dao.GuestOSDao;
+import com.cloud.storage.dao.GuestOSHypervisorDao;
 import com.cloud.storage.dao.VolumeDao;
 import com.cloud.storage.secondary.SecondaryStorageVmManager;
 import com.cloud.template.VirtualMachineTemplate.BootloaderType;
@@ -112,6 +114,8 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 @Inject
 private Gues

git commit: updated refs/heads/4.4-forward to 5bcd017

[saksham]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward c5ee5ad5c -> 5bcd017de


CLOUDSTACK-6654: Configkey parameters are not validated


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5bcd017d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5bcd017d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5bcd017d

Branch: refs/heads/4.4-forward
Commit: 5bcd017de6f421a6125406120b39fb8602276dc7
Parents: c5ee5ad
Author: Saksham Srivastava 
Authored: Tue Jun 10 18:27:54 2014 +0530
Committer: Saksham Srivastava 
Committed: Tue Jun 10 18:27:54 2014 +0530

--
 .../configuration/ConfigurationManagerImpl.java  | 19 ---
 1 file changed, 16 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5bcd017d/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 0dc067a..1549e12 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -701,12 +701,19 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 return "Invalid scope id provided for the parameter " + name;
 }
 }
+Class type = null;
 Config c = Config.getConfig(name);
 if (c == null) {
-s_logger.warn("Did not find configuration " + name + " in 
Config.java. Perhaps moved to ConfigDepot?");
-return null;
+s_logger.warn("Did not find configuration " + name + " in 
Config.java. Perhaps moved to ConfigDepot");
+ConfigKey configKey = _configDepot.get(name);
+if(configKey == null) {
+s_logger.warn("Did not find configuration " + name + " in 
ConfigDepot too.");
+return null;
+}
+type = configKey.type();
+} else {
+type = c.getType();
 }
-Class type = c.getType();
 
 if (value == null) {
 if (type.equals(Boolean.class)) {
@@ -765,6 +772,12 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 }
 }
 
+if(c == null ) {
+//range validation has to be done per case basis, for now
+//return in case of Configkey parameters
+return null;
+}
+
 String range = c.getRange();
 if (range == null) {
 return null;

git commit: updated refs/heads/master to bfccf43

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master b666a1f3a -> bfccf439c


By preloading some modules we fix two things. 1. Some sysctl settings like 
ip_conntrack_max are not set during boot because the module is not loaded at 
that time. 2. Passive ftp does not work through iptables without these modules.

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bfccf439
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bfccf439
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bfccf439

Branch: refs/heads/master
Commit: bfccf439cfe120f5d1380a642e8b798335e1cf2e
Parents: b666a1f
Author: Joris van Lieshout 
Authored: Wed May 21 15:22:15 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 15:42:40 2014 +0200

--
 .../definitions/systemvm64template/postinstall.sh| 11 +++
 .../definitions/systemvmtemplate/postinstall.sh  | 11 +++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfccf439/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh 
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 2e0ff13..8763a9f 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -195,6 +195,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -203,6 +213,7 @@ do_fixes() {
   fix_locale
   fix_conntrackd
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bfccf439/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh 
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 4b3990c..587d44d 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -185,6 +185,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -193,6 +203,7 @@ do_fixes() {
   fix_locale
   fix_conntrackd
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

git commit: updated refs/heads/master to 11f532b

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master bfccf439c -> 11f532bbe


blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not 
working because the include only works if the file ends with .conf.

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/11f532bb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/11f532bb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/11f532bb

Branch: refs/heads/master
Commit: 11f532bbecca08b41dd15d1abdf04957c84eebda
Parents: bfccf43
Author: Joris van Lieshout 
Authored: Wed May 21 15:53:00 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 15:45:15 2014 +0200

--
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel  | 1 -
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf | 1 +
 systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f532bb/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
deleted file mode 100644
index 1c140f0..000
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
+++ /dev/null
@@ -1 +0,0 @@
-blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f532bb/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
new file mode 100644
index 000..1c140f0
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -0,0 +1 @@
+blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/11f532bb/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
new file mode 100644
index 000..da3dbd9
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -0,0 +1 @@
+blacklist pcspkr
\ No newline at end of file

git commit: updated refs/heads/master to c54ce3c

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 11f532bbe -> c54ce3caf


If for some reason dnsmasq.log does not exist anymore logrotate will create it 
with nobody as owner. This will prevent dnsmasq deamon from logging to that 
file.

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c54ce3ca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c54ce3ca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c54ce3ca

Branch: refs/heads/master
Commit: c54ce3cafbc51febe71fb2a997dbfc8ac9167fb0
Parents: 11f532b
Author: Joris van Lieshout 
Authored: Wed May 21 17:10:07 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 15:51:03 2014 +0200

--
 systemvm/patches/debian/config/etc/logrotate.d/dnsmasq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c54ce3ca/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
--
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq 
b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 838415d3..2654590 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -8,6 +8,6 @@
 postrotate
 [ ! -f /var/run/dnsmasq/dnsmasq.pid ] || kill -USR2 `cat 
/var/run/dnsmasq/dnsmasq.pid`
 endscript
-create 0640 nobody root
+create 0640 dnsmasq root
 }
 

git commit: updated refs/heads/master to 2e83baa

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master c54ce3caf -> 2e83baaca


xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so these 
commands file. It does have xenstore-write and xenstore-rm so by adding a - 
this is fixed easily.

Signed-off-by: Daan Hoogland 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2e83baac
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2e83baac
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2e83baac

Branch: refs/heads/master
Commit: 2e83baaca2c998cfdda281301dffb09a1a20aa5c
Parents: c54ce3c
Author: Joris van Lieshout 
Authored: Thu May 22 15:25:45 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:06:58 2014 +0200

--
 systemvm/patches/debian/xe/xe-update-guest-attrs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e83baac/systemvm/patches/debian/xe/xe-update-guest-attrs
--
diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs 
b/systemvm/patches/debian/xe/xe-update-guest-attrs
index 30a4498..6c605be 100644
--- a/systemvm/patches/debian/xe/xe-update-guest-attrs
+++ b/systemvm/patches/debian/xe/xe-update-guest-attrs
@@ -74,7 +74,7 @@ xenstore_write_cached() {
 fi
 
 # try to write and update cache if successfull
-if $XENSTORE write "$key" "$newval" ; then
+if $XENSTORE-write "$key" "$newval" ; then
mkdir -p $(dirname "$cache")
echo -n "$newval" > "$cache"
XENSTORE_UPDATED=1
@@ -104,7 +104,7 @@ xenstore_rm_cached() {
return 1
 fi
 # try to write and update cache if successfull
-if $XENSTORE rm "$key" ; then
+if $XENSTORE-rm "$key" ; then
rm -rf "$cache"
XENSTORE_UPDATED=1
return 0

Build failed in Jenkins: cloudstack-rat-master #4861

[Apache Jenkins Server]

See 

Changes:

[daan] xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so 
these commands file. It does have xenstore-write and xenstore-rm so by adding a 
- this is fixed easily.

--
Started by an SCM change
Building remotely on ubuntu5 (Ubuntu ubuntu) in workspace 

 > git rev-parse --is-inside-work-tree
Fetching changes from the remote Git repository
 > git config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git --version
 > git fetch --tags --progress 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git 
 > +refs/heads/*:refs/remotes/origin/*
 > git rev-parse origin/master^{commit}
Checking out Revision 2e83baaca2c998cfdda281301dffb09a1a20aa5c (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 2e83baaca2c998cfdda281301dffb09a1a20aa5c
 > git rev-list c54ce3cafbc51febe71fb2a997dbfc8ac9167fb0
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson306265597695959.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[INFO] Building Apache CloudStack
[INFO]task-segment: [org.apache.rat:apache-rat-plugin:0.10:check]
[INFO] 
[INFO] [apache-rat:check {execution: default-cli}]
[INFO] 51 implicit excludes (use -debug for more details).
[INFO] Exclude: CHANGES
[INFO] Exclude: INSTALL.md
[INFO] Exclude: .idea/
[INFO] Exclude: **/*.log
[INFO] Exclude: **/*.patch
[INFO] Exclude: **/.classpath
[INFO] Exclude: **/.project
[INFO] Exclude: **/.idea/**
[INFO] Exclude: **/*.iml
[INFO] Exclude: **/.settings/**
[INFO] Exclude: .metadata/**
[INFO] Exclude: .git/**
[INFO] Exclude: .gitignore
[INFO] Exclude: **/*.crt
[INFO] Exclude: **/*.csr
[INFO] Exclude: **/*.key
[INFO] Exclude: **/authorized_keys
[INFO] Exclude: **/*.war
[INFO] Exclude: **/*.mar
[INFO] Exclude: **/*.jar
[INFO] Exclude: **/*.iso
[INFO] Exclude: **/*.tgz
[INFO] Exclude: **/*.zip
[INFO] Exclude: **/target/**
[INFO] Exclude: **/.vagrant
[INFO] Exclude: awsapi/overlays/**
[INFO] Exclude: build/build.number
[INFO] Exclude: services/console-proxy/server/js/jquery.js
[INFO] Exclude: debian/compat
[INFO] Exclude: debian/control
[INFO] Exclude: debian/dirs
[INFO] Exclude: debian/rules
[INFO] Exclude: dist/console-proxy/js/jquery.js
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/ServerResource.sln
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/packages/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/obj/**
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/bin/**
[INFO] Exclude: 
plugins/hypervisors/hyperv/DotNet/ServerResource/**/packages.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/App.config
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.csproj
[INFO] Exclude: plugins/hypervisors/hyperv/DotNet/ServerResource/**/*.settings
[INFO] Exclude: plugins/hypervisors/hyperv/conf/agent.properties
[INFO] Exclude: scripts/vm/systemvm/id_rsa.cloud
[INFO] Exclude: services/console-proxy/server/conf/agent.properties
[INFO] Exclude: services/console-proxy/server/conf/environment.properties
[INFO] Exclude: services/secondary-storage/conf/agent.properties
[INFO] Exclude: services/secondary-storage/conf/environment.properties
[INFO] Exclude: 
tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf
[INFO] Exclude: tools/appliance/definitions/devcloud/*
[INFO] Exclude: tools/appliance/definitions/systemvmtemplate/*
[INFO] Exclude: tools/appliance/definitions/systemvm64template/*
[INFO] Exclude: tools/appliance/definitions/builtin/*
[INFO] Exclude: tools/cli/cloudmonkey.egg-info/*
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/definition.rb
[INFO] Exclude: tools/devcloud/src/deps/boxes/basebox-build/preseed.cfg
[INFO] Exclude: tools/marvin/Marvin.egg-info/*
[INFO] Exclude: ui/lib/flot/jquery.colorhelpers.js
[INFO] Exclude: ui/lib/flot/jquery.flot.crosshair.js
[INFO] Exclude: ui/lib/flot/jquery.flot.fillbetween.js
[INFO] Exclude: ui/lib/flot/jquery.flot.image.js
[INFO] Exclude: ui/lib/flot/jquery.flot.js
[INFO] Exclude: ui/lib/flot/jquery.flot.navigate.js
[INFO] Exclude: ui/lib/flot/jquery.flot.pie.js
[INFO] Exclude: ui/lib/flot/jquery.flot.resize.js
[INFO] Exclude: ui/lib/flot/jquery.flot.selection.js
[INFO] Exclude: ui/lib/flot/jquery.flot.stack.js
[INFO] Exclude: ui/lib/flot/jquery.flot.symbol.js
[INFO] Exclude: ui/lib/flot/jquery.flot.threshold.js
[INFO] Exclude: ui/lib/jqu

git commit: updated refs/heads/master to b85dd95

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 2e83baaca -> b85dd956f


rats

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b85dd956
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b85dd956
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b85dd956

Branch: refs/heads/master
Commit: b85dd956f8187ea2810f4fd74728c0a430ce6ef4
Parents: 2e83baa
Author: Daan Hoogland 
Authored: Tue Jun 10 16:21:06 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:21:06 2014 +0200

--
 .../debian/config/etc/modprobe.d/aesni_intel.conf   | 16 
 .../debian/config/etc/modprobe.d/pcspkr.conf| 16 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b85dd956/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
index 1c140f0..2bc7cb1 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b85dd956/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
index da3dbd9..892b51f 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist pcspkr
\ No newline at end of file

git commit: updated refs/heads/4.4-forward to af4e868

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 5bcd017de -> af4e86854


By preloading some modules we fix two things. 1. Some sysctl settings like 
ip_conntrack_max are not set during boot because the module is not loaded at 
that time. 2. Passive ftp does not work through iptables without these modules.

Signed-off-by: Daan Hoogland 
(cherry picked from commit bfccf439cfe120f5d1380a642e8b798335e1cf2e)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/af4e8685
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/af4e8685
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/af4e8685

Branch: refs/heads/4.4-forward
Commit: af4e868547c215d511fbdd77f70e5e7b0303d3e5
Parents: 5bcd017
Author: Joris van Lieshout 
Authored: Wed May 21 15:22:15 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:24:17 2014 +0200

--
 .../definitions/systemvm64template/postinstall.sh| 11 +++
 .../definitions/systemvmtemplate/postinstall.sh  | 11 +++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af4e8685/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh 
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index f6e6cdd..b1e4430 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -188,6 +188,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -195,6 +205,7 @@ do_fixes() {
   fix_hostname
   fix_locale
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af4e8685/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh 
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 23e66dd..b3edeb7 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -178,6 +178,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -185,6 +195,7 @@ do_fixes() {
   fix_hostname
   fix_locale
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

[1/2] git commit: updated refs/heads/4.4-forward to 5eb0265

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward af4e86854 -> 5eb026534


blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not 
working because the include only works if the file ends with .conf.

Signed-off-by: Daan Hoogland 
(cherry picked from commit 11f532bbecca08b41dd15d1abdf04957c84eebda)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f94ff4ad
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f94ff4ad
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f94ff4ad

Branch: refs/heads/4.4-forward
Commit: f94ff4ad041c517b048ce8fc58ef3996b98aa685
Parents: af4e868
Author: Joris van Lieshout 
Authored: Wed May 21 15:53:00 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:25:19 2014 +0200

--
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel  | 1 -
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf | 1 +
 systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
deleted file mode 100644
index 1c140f0..000
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
+++ /dev/null
@@ -1 +0,0 @@
-blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
new file mode 100644
index 000..1c140f0
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -0,0 +1 @@
+blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f94ff4ad/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
new file mode 100644
index 000..da3dbd9
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -0,0 +1 @@
+blacklist pcspkr
\ No newline at end of file

git commit: updated refs/heads/4.4-forward to ed330d4

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 94bb5c29b -> ed330d4dc


xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so these 
commands file. It does have xenstore-write and xenstore-rm so by adding a - 
this is fixed easily.

Signed-off-by: Daan Hoogland 
(cherry picked from commit 2e83baaca2c998cfdda281301dffb09a1a20aa5c)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ed330d4d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ed330d4d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ed330d4d

Branch: refs/heads/4.4-forward
Commit: ed330d4dcdfbab70230e87654b5f7fb43db6c3ac
Parents: 94bb5c2
Author: Joris van Lieshout 
Authored: Thu May 22 15:25:45 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:27:28 2014 +0200

--
 systemvm/patches/debian/xe/xe-update-guest-attrs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed330d4d/systemvm/patches/debian/xe/xe-update-guest-attrs
--
diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs 
b/systemvm/patches/debian/xe/xe-update-guest-attrs
index 30a4498..6c605be 100644
--- a/systemvm/patches/debian/xe/xe-update-guest-attrs
+++ b/systemvm/patches/debian/xe/xe-update-guest-attrs
@@ -74,7 +74,7 @@ xenstore_write_cached() {
 fi
 
 # try to write and update cache if successfull
-if $XENSTORE write "$key" "$newval" ; then
+if $XENSTORE-write "$key" "$newval" ; then
mkdir -p $(dirname "$cache")
echo -n "$newval" > "$cache"
XENSTORE_UPDATED=1
@@ -104,7 +104,7 @@ xenstore_rm_cached() {
return 1
 fi
 # try to write and update cache if successfull
-if $XENSTORE rm "$key" ; then
+if $XENSTORE-rm "$key" ; then
rm -rf "$cache"
XENSTORE_UPDATED=1
return 0

[2/5] git commit: updated refs/heads/4.4 to 99aa7a0

[dahn]

blacklist pcspkr as cosmetic improvement. aesni_intel blacklisting was not 
working because the include only works if the file ends with .conf.

Signed-off-by: Daan Hoogland 
(cherry picked from commit 11f532bbecca08b41dd15d1abdf04957c84eebda)
(cherry picked from commit f94ff4ad041c517b048ce8fc58ef3996b98aa685)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3394d3c4
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3394d3c4
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3394d3c4

Branch: refs/heads/4.4
Commit: 3394d3c4f5a828f01cfc48939149daf66706b85e
Parents: 1e35431
Author: Joris van Lieshout 
Authored: Wed May 21 15:53:00 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:28:34 2014 +0200

--
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel  | 1 -
 systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf | 1 +
 systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf  | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
deleted file mode 100644
index 1c140f0..000
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel
+++ /dev/null
@@ -1 +0,0 @@
-blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
new file mode 100644
index 000..1c140f0
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -0,0 +1 @@
+blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3394d3c4/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
new file mode 100644
index 000..da3dbd9
--- /dev/null
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -0,0 +1 @@
+blacklist pcspkr
\ No newline at end of file

[5/5] git commit: updated refs/heads/4.4 to 99aa7a0

[dahn]

xenstore-utils on debian wheezy does not have /usr/sbin/xenstore so these 
commands file. It does have xenstore-write and xenstore-rm so by adding a - 
this is fixed easily.

Signed-off-by: Daan Hoogland 
(cherry picked from commit 2e83baaca2c998cfdda281301dffb09a1a20aa5c)
(cherry picked from commit ed330d4dcdfbab70230e87654b5f7fb43db6c3ac)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/99aa7a09
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/99aa7a09
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/99aa7a09

Branch: refs/heads/4.4
Commit: 99aa7a096ac53394fb55c9b26763fc1869409172
Parents: 8ff5ca0
Author: Joris van Lieshout 
Authored: Thu May 22 15:25:45 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:29:01 2014 +0200

--
 systemvm/patches/debian/xe/xe-update-guest-attrs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/99aa7a09/systemvm/patches/debian/xe/xe-update-guest-attrs
--
diff --git a/systemvm/patches/debian/xe/xe-update-guest-attrs 
b/systemvm/patches/debian/xe/xe-update-guest-attrs
index 30a4498..6c605be 100644
--- a/systemvm/patches/debian/xe/xe-update-guest-attrs
+++ b/systemvm/patches/debian/xe/xe-update-guest-attrs
@@ -74,7 +74,7 @@ xenstore_write_cached() {
 fi
 
 # try to write and update cache if successfull
-if $XENSTORE write "$key" "$newval" ; then
+if $XENSTORE-write "$key" "$newval" ; then
mkdir -p $(dirname "$cache")
echo -n "$newval" > "$cache"
XENSTORE_UPDATED=1
@@ -104,7 +104,7 @@ xenstore_rm_cached() {
return 1
 fi
 # try to write and update cache if successfull
-if $XENSTORE rm "$key" ; then
+if $XENSTORE-rm "$key" ; then
rm -rf "$cache"
XENSTORE_UPDATED=1
return 0

[3/5] git commit: updated refs/heads/4.4 to 99aa7a0

[dahn]

rats
(cherry picked from commit b85dd956f8187ea2810f4fd74728c0a430ce6ef4)

(cherry picked from commit 5eb026534929774d468976870979440b88f7a5b8)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4262080b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4262080b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4262080b

Branch: refs/heads/4.4
Commit: 4262080ba49fc8f0dc8c4f29f94159e3e8cbad50
Parents: 3394d3c
Author: Daan Hoogland 
Authored: Tue Jun 10 16:21:06 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:28:41 2014 +0200

--
 .../debian/config/etc/modprobe.d/aesni_intel.conf   | 16 
 .../debian/config/etc/modprobe.d/pcspkr.conf| 16 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
index 1c140f0..2bc7cb1 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4262080b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
index da3dbd9..892b51f 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist pcspkr
\ No newline at end of file

git commit: updated refs/heads/4.4-forward to 94bb5c2

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 5eb026534 -> 94bb5c29b


If for some reason dnsmasq.log does not exist anymore logrotate will create it 
with nobody as owner. This will prevent dnsmasq deamon from logging to that 
file.

Signed-off-by: Daan Hoogland 
(cherry picked from commit c54ce3cafbc51febe71fb2a997dbfc8ac9167fb0)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/94bb5c29
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/94bb5c29
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/94bb5c29

Branch: refs/heads/4.4-forward
Commit: 94bb5c29b293b5eebc21c67124d429a59736f11a
Parents: 5eb0265
Author: Joris van Lieshout 
Authored: Wed May 21 17:10:07 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:26:42 2014 +0200

--
 systemvm/patches/debian/config/etc/logrotate.d/dnsmasq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/94bb5c29/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
--
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq 
b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 838415d3..2654590 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -8,6 +8,6 @@
 postrotate
 [ ! -f /var/run/dnsmasq/dnsmasq.pid ] || kill -USR2 `cat 
/var/run/dnsmasq/dnsmasq.pid`
 endscript
-create 0640 nobody root
+create 0640 dnsmasq root
 }
 

[2/2] git commit: updated refs/heads/4.4-forward to 5eb0265

[dahn]

rats
(cherry picked from commit b85dd956f8187ea2810f4fd74728c0a430ce6ef4)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5eb02653
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5eb02653
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5eb02653

Branch: refs/heads/4.4-forward
Commit: 5eb026534929774d468976870979440b88f7a5b8
Parents: f94ff4a
Author: Daan Hoogland 
Authored: Tue Jun 10 16:21:06 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:25:55 2014 +0200

--
 .../debian/config/etc/modprobe.d/aesni_intel.conf   | 16 
 .../debian/config/etc/modprobe.d/pcspkr.conf| 16 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eb02653/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
index 1c140f0..2bc7cb1 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/aesni_intel.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist aesni_intel

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eb02653/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
--
diff --git a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf 
b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
index da3dbd9..892b51f 100644
--- a/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
+++ b/systemvm/patches/debian/config/etc/modprobe.d/pcspkr.conf
@@ -1 +1,17 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 blacklist pcspkr
\ No newline at end of file

[1/5] git commit: updated refs/heads/4.4 to 99aa7a0

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 c934e7b05 -> 99aa7a096


By preloading some modules we fix two things. 1. Some sysctl settings like 
ip_conntrack_max are not set during boot because the module is not loaded at 
that time. 2. Passive ftp does not work through iptables without these modules.

Signed-off-by: Daan Hoogland 
(cherry picked from commit bfccf439cfe120f5d1380a642e8b798335e1cf2e)
(cherry picked from commit af4e868547c215d511fbdd77f70e5e7b0303d3e5)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/1e35431d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e35431d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e35431d

Branch: refs/heads/4.4
Commit: 1e35431dec8f4cc58000b8d004c9aee5c228f62d
Parents: c934e7b
Author: Joris van Lieshout 
Authored: Wed May 21 15:22:15 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:28:22 2014 +0200

--
 .../definitions/systemvm64template/postinstall.sh| 11 +++
 .../definitions/systemvmtemplate/postinstall.sh  | 11 +++
 2 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e35431d/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh 
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index f6e6cdd..b1e4430 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -188,6 +188,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -195,6 +205,7 @@ do_fixes() {
   fix_hostname
   fix_locale
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e35431d/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh 
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 23e66dd..b3edeb7 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -178,6 +178,16 @@ fix_vhdutil() {
   chmod a+x /bin/vhd-util
 }
 
+# Preload these module otherwise the sysctl settings will not be set, and 
pasive ftp will not work.
+fix_modules() {
+  cat >> /etc/modules << EOF
+nf_conntrack_ipv4
+nf_conntrack
+nf_conntrack_ftp
+nf_nat_ftp
+EOF
+}
+
 do_fixes() {
   fix_nameserver
   fix_inittab
@@ -185,6 +195,7 @@ do_fixes() {
   fix_hostname
   fix_locale
   fix_vhdutil
+  fix_modules
 }
 
 configure_apache2() {

Jenkins build is back to normal : cloudstack-rat-master #4862

[Apache Jenkins Server]

See 

[4/5] git commit: updated refs/heads/4.4 to 99aa7a0

[dahn]

If for some reason dnsmasq.log does not exist anymore logrotate will create it 
with nobody as owner. This will prevent dnsmasq deamon from logging to that 
file.

Signed-off-by: Daan Hoogland 
(cherry picked from commit c54ce3cafbc51febe71fb2a997dbfc8ac9167fb0)
(cherry picked from commit 94bb5c29b293b5eebc21c67124d429a59736f11a)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ff5ca0b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ff5ca0b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ff5ca0b

Branch: refs/heads/4.4
Commit: 8ff5ca0b2f44ae3d4dd9f4dd11eaf94ff4fb740b
Parents: 4262080
Author: Joris van Lieshout 
Authored: Wed May 21 17:10:07 2014 +0200
Committer: Daan Hoogland 
Committed: Tue Jun 10 16:28:51 2014 +0200

--
 systemvm/patches/debian/config/etc/logrotate.d/dnsmasq | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ff5ca0b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
--
diff --git a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq 
b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
index 838415d3..2654590 100644
--- a/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
+++ b/systemvm/patches/debian/config/etc/logrotate.d/dnsmasq
@@ -8,6 +8,6 @@
 postrotate
 [ ! -f /var/run/dnsmasq/dnsmasq.pid ] || kill -USR2 `cat 
/var/run/dnsmasq/dnsmasq.pid`
 endscript
-create 0640 nobody root
+create 0640 dnsmasq root
 }
 

git commit: updated refs/heads/4.4-forward to 6482554

[jessicawang]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward ed330d4dc -> 64825549d


CLOUDSTACK-6889: UI - create network offering - remove non-needed parameters 
from API call whose size might exceed limit in some cases.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/64825549
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/64825549
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/64825549

Branch: refs/heads/4.4-forward
Commit: 64825549d2eb4e6c55b9cc2730e0ac895473f901
Parents: ed330d4
Author: Jessica Wang 
Authored: Tue Jun 10 14:26:58 2014 -0700
Committer: Jessica Wang 
Committed: Tue Jun 10 14:28:31 2014 -0700

--
 ui/scripts/configuration.js | 14 ++
 1 file changed, 6 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/64825549/ui/scripts/configuration.js
--
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 3823109..6a4aa42 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -2848,8 +2848,10 @@
 inputData['servicecapabilitylist[' 
+ serviceCapabilityIndex + '].capabilityvalue'] = 'internal';
 serviceCapabilityIndex++;
 } 
-} else if (value != '') { // Normal data
-inputData[key] = value;
+} else if (value != '') { // normal data 
(serviceData.length ==1), e.g. "name", "displayText", "networkRate", 
"guestIpType", "lbType" (unwanted), "availability" (unwated when value is 
"Optional"), "egresspolicy", "state" (unwanted), "status" (unwanted), 
"allocationstate" (unwanted) 
+if (!(key ==  "lbType"  || (key == 
"availability" && value == "Optional") || key == "state" || key == "status" || 
key == "allocationstate")) {
+inputData[key] = value;
+}  
  
 }
 });
 
@@ -2929,10 +2931,7 @@
 inputData['serviceProviderList[' + 
serviceProviderIndex + '].provider'] = value;
 serviceProviderIndex++;
 });
-
-if 
(args.$form.find('.form-item[rel=availability]').css("display") == "none")
-inputData['availability'] = 'Optional';
-
+
 if 
(args.$form.find('.form-item[rel=egresspolicy]').is(':visible')) {
 inputData['egressdefaultpolicy'] = 
formData.egresspolicy === 'ALLOW' ? true : false;
 } else {
@@ -2947,8 +2946,7 @@
 $.ajax({
 url: createURL('createNetworkOffering'),
 data: inputData,
-dataType: 'json',
-async: true,
+type: "POST", //use POST instead of GET 
since the API call might be overlong and exceed size limit
 success: function(data) {
 var item = 
data.createnetworkofferingresponse.networkoffering;
 

git commit: updated refs/heads/master to 9334f26

[jessicawang]

Repository: cloudstack
Updated Branches:
  refs/heads/master b85dd956f -> 9334f2608


CLOUDSTACK-6889: UI - create network offering - remove non-needed parameters 
from API call whose size might exceed limit in some cases.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9334f260
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9334f260
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9334f260

Branch: refs/heads/master
Commit: 9334f26084070dbd36fde97057a372b9d5517a91
Parents: b85dd95
Author: Jessica Wang 
Authored: Tue Jun 10 14:26:58 2014 -0700
Committer: Jessica Wang 
Committed: Tue Jun 10 14:29:19 2014 -0700

--
 ui/scripts/configuration.js | 10 --
 1 file changed, 4 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9334f260/ui/scripts/configuration.js
--
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index e76e8d4..2c5fadf 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -2926,9 +2926,11 @@
 inputData['servicecapabilitylist[' 
+ serviceCapabilityIndex + '].capabilityvalue'] = 'internal';
 serviceCapabilityIndex++;
 } 
-} else if (value != '') { // Normal data
+} else if (value != '') { // normal data 
(serviceData.length ==1), e.g. "name", "displayText", "networkRate", 
"guestIpType", "lbType" (unwanted), "availability" (unwated when value is 
"Optional"), "egresspolicy", "state" (unwanted), "status" (unwanted), 
"allocationstate" (unwanted) 
+if (!(key ==  "lbType"  || (key == 
"availability" && value == "Optional") || key == "state" || key == "status" || 
key == "allocationstate")) {
 inputData[key] = value;
 }
+}
 });
 
 for (var key1 in inputData) {
@@ -3008,9 +3010,6 @@
 serviceProviderIndex++;
 });
 
-if 
(args.$form.find('.form-item[rel=availability]').css("display") == "none")
-inputData['availability'] = 'Optional';
-
 if 
(args.$form.find('.form-item[rel=egresspolicy]').is(':visible')) {
 inputData['egressdefaultpolicy'] = 
formData.egresspolicy === 'ALLOW' ? true : false;
 } else {
@@ -3025,8 +3024,7 @@
 $.ajax({
 url: createURL('createNetworkOffering'),
 data: inputData,
-dataType: 'json',
-async: true,
+type: "POST", //use POST instead of GET 
since the API call might be overlong and exceed size limit
 success: function(data) {
 var item = 
data.createnetworkofferingresponse.networkoffering;
 

git commit: updated refs/heads/4.4-forward to 09a357f

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 64825549d -> 09a357fb9


CLOUDSTACK-6890:createVPC invoked by admin does not observe start flag.

Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/09a357fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/09a357fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/09a357fb

Branch: refs/heads/4.4-forward
Commit: 09a357fb90b48ed6e2725ea60e632a2ad5529f79
Parents: 6482554
Author: Min Chen 
Authored: Tue Jun 10 17:23:20 2014 -0700
Committer: Min Chen 
Committed: Tue Jun 10 17:23:20 2014 -0700

--
 .../api/command/admin/vpc/CreateVPCCmdByAdmin.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/09a357fb/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java 
b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
index f063cdb..25e6325 100644
--- 
a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
+++ 
b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.vpc;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
@@ -37,10 +38,14 @@ public class CreateVPCCmdByAdmin extends CreateVPCCmd {
 @Override
 public void execute() {
 Vpc vpc = null;
+boolean success = true;
 try {
- if (_vpcService.startVpc(getEntityId(), true)) {
-vpc = _entityMgr.findById(Vpc.class, getEntityId());
+if (isStart()) {
+success = _vpcService.startVpc(getEntityId(), true);
+} else {
+s_logger.debug("Not starting VPC as " + ApiConstants.START + 
"=false was passed to the API");
  }
+vpc = _entityMgr.findById(Vpc.class, getEntityId());
 } catch (ResourceUnavailableException ex) {
 s_logger.warn("Exception: ", ex);
 throw new 
ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());

git commit: updated refs/heads/master to e61dda7

[mchen]

Repository: cloudstack
Updated Branches:
  refs/heads/master 9334f2608 -> e61dda7d8


CLOUDSTACK-6890:createVPC invoked by admin does not observe start flag.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e61dda7d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e61dda7d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e61dda7d

Branch: refs/heads/master
Commit: e61dda7d82f24107c878906162aea65a67aa832e
Parents: 9334f26
Author: Min Chen 
Authored: Tue Jun 10 17:23:20 2014 -0700
Committer: Min Chen 
Committed: Tue Jun 10 17:35:15 2014 -0700

--
 .../api/command/admin/vpc/CreateVPCCmdByAdmin.java  | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e61dda7d/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java 
b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
index f063cdb..25e6325 100644
--- 
a/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
+++ 
b/api/src/org/apache/cloudstack/api/command/admin/vpc/CreateVPCCmdByAdmin.java
@@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.vpc;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.ApiErrorCode;
 import org.apache.cloudstack.api.ResponseObject.ResponseView;
 import org.apache.cloudstack.api.ServerApiException;
@@ -37,10 +38,14 @@ public class CreateVPCCmdByAdmin extends CreateVPCCmd {
 @Override
 public void execute() {
 Vpc vpc = null;
+boolean success = true;
 try {
- if (_vpcService.startVpc(getEntityId(), true)) {
-vpc = _entityMgr.findById(Vpc.class, getEntityId());
+if (isStart()) {
+success = _vpcService.startVpc(getEntityId(), true);
+} else {
+s_logger.debug("Not starting VPC as " + ApiConstants.START + 
"=false was passed to the API");
  }
+vpc = _entityMgr.findById(Vpc.class, getEntityId());
 } catch (ResourceUnavailableException ex) {
 s_logger.warn("Exception: ", ex);
 throw new 
ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage());

git commit: updated refs/heads/4.4-forward to 0190c93

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 09a357fb9 -> 0190c9366


CLOUDSTACK-6780: Resolved cleanup issue in portable ip test cases


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0190c936
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0190c936
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0190c936

Branch: refs/heads/4.4-forward
Commit: 0190c936689fc252e51b7c412283c128b5386b24
Parents: 09a357f
Author: Ashutosh K 
Authored: Tue May 27 07:02:04 2014 -0700
Committer: Girish Shilamkar 
Committed: Wed Jun 11 11:18:26 2014 +0530

--
 test/integration/component/test_portable_ip.py | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0190c936/test/integration/component/test_portable_ip.py
--
diff --git a/test/integration/component/test_portable_ip.py 
b/test/integration/component/test_portable_ip.py
index 847bb4a..77a5ab6 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -1103,21 +1103,27 @@ class TestDisassociatePublicIp(cloudstackTestCase):
 self.fail("Failed to create portable ip: %s" % e)
 
 try:
-self.user_account = Account.create(
+self.otherAccount = Account.create(
 self.apiclient,
 self.services["account"],
 domainid=self.domain.id
 )
+self.cleanup.append(self.otherAccount)
 
-self.api_client_user = self.testClient.getUserApiClient(
-UserName=self.user_account.name,
-DomainName=self.user_account.domain
+self.apiclientOtherAccount = self.testClient.getUserApiClient(
+UserName=self.otherAccount.name,
+DomainName=self.otherAccount.domain
 )
 
+# Trying to disassociate portable ip using
+# api client of other account than the one
+# used to create portable ip
 with self.assertRaises(Exception):
-portableip.delete(self.api_client_user)
-except Exception as e:
+portableip.delete(self.apiclientOtherAccount)
+
+# Disassociate IP using api client of account used to create it
 portableip.delete(self.apiclient)
+except Exception as e:
 self.fail("Exception while disassociating portable ip: %s" % e)
 return
 

git commit: updated refs/heads/master to 23280a4

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/master e61dda7d8 -> 23280a47b


CLOUDSTACK-6702 : [Windows]Due to Progress bar changes mysql path was not 
getting read. Fixing the same.

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23280a47
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23280a47
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23280a47

Branch: refs/heads/master
Commit: 23280a47b800fb434b1fa0d7ee0401a6777dec39
Parents: e61dda7
Author: Damodar Reddy 
Authored: Thu Jun 5 15:45:53 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:25:02 2014 +0530

--
 scripts/installer/windows/acs.wxs |  4 ++--
 setup/bindir/cloud-setup-databases.in | 11 +--
 2 files changed, 11 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23280a47/scripts/installer/windows/acs.wxs
--
diff --git a/scripts/installer/windows/acs.wxs 
b/scripts/installer/windows/acs.wxs
index 58af650..83bac54 100644
--- a/scripts/installer/windows/acs.wxs
+++ b/scripts/installer/windows/acs.wxs
@@ -258,10 +258,10 @@
   ExeCommand='[PYTHON_HOME]\python 
"[CSMANAGEMENT]\webapps\client\WEB-INF\classes\scripts\common\keys\ssl-keys.py" 
"[CSMANAGEMENT]\lib"'
   Execute="deferred" Return="check" />
 
 
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23280a47/setup/bindir/cloud-setup-databases.in
--
diff --git a/setup/bindir/cloud-setup-databases.in 
b/setup/bindir/cloud-setup-databases.in
index d9dc54f..272ff81 100755
--- a/setup/bindir/cloud-setup-databases.in
+++ b/setup/bindir/cloud-setup-databases.in
@@ -71,6 +71,7 @@ class DBDeployer(object):
 success = False
 magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate'
 tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 
'cloudstackmysql.tmp.sql')
+mysqlBinPath = None
 
 def preRun(self):
 def backUpDbDotProperties():
@@ -138,9 +139,12 @@ class DBDeployer(object):
 
 kwargs['port'] = self.port
 kwargs['host'] = self.host
-
+if self.mysqlBinPath is not None:
+  mysqlPath = '"' + self.mysqlBinPath + os.sep + "mysql" + '"'
+else:
+  mysqlPath = "mysql"
 try:
-mysqlCmds = ['mysql', '--user=%s'%kwargs['user'], 
'--host=%s'%kwargs['host'], '--port=%s'%kwargs['port']]
+mysqlCmds = [mysqlPath, '--user=%s'%kwargs['user'], 
'--host=%s'%kwargs['host'], '--port=%s'%kwargs['port']]
 if kwargs.has_key('passwd'):
 mysqlCmds.append('--password=%s'%kwargs['passwd'])
 file(self.tmpMysqlFile, 'w').write(text)
@@ -462,6 +466,8 @@ for example:
   self.encryptionKeyFile = self.options.encryptionKeyFile
 if self.options.encryptionJarPath:
   self.encryptionJarPath = self.options.encryptionJarPath
+if self.options.mysqlbinpath:
+  self.mysqlBinPath = self.options.mysqlbinpath
 
 def parseUserAndPassword(cred):
 stuff = cred.split(':')
@@ -582,6 +588,7 @@ for example:
 self.parser.add_option("-f", "--db-files-path", action="store", 
dest="dbFilesPath", help="The path to find sql files to create initial 
database(s)")
 self.parser.add_option("-j", "--encryption-jar-path", action="store", 
dest="encryptionJarPath", help="The path to the jasypt library to be used to 
encrypt the values in db.properties")
 self.parser.add_option("-n", "--encryption-key-file", action="store", 
dest="encryptionKeyFile", help="The name of the file in which encryption key to 
be generated")
+self.parser.add_option("-b", "--mysql-bin-path", action="store", 
dest="mysqlbinpath", help="The mysql installed bin path")
 
 (self.options, self.args) = self.parser.parse_args()
 parseCasualCredit()

git commit: updated refs/heads/4.4-forward to 06bcc8d

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 0190c9366 -> 06bcc8d9e


CLOUDSTACK-6877 Tagged the testcase with the bugId

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06bcc8d9
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06bcc8d9
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06bcc8d9

Branch: refs/heads/4.4-forward
Commit: 06bcc8d9eee802a3f5ada6bb7335ffe0cb7b3008
Parents: 0190c93
Author: Bharat Kumar 
Authored: Mon Jun 9 18:42:43 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:27:27 2014 +0530

--
 test/integration/smoke/test_secondary_storage.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06bcc8d9/test/integration/smoke/test_secondary_storage.py
--
diff --git a/test/integration/smoke/test_secondary_storage.py 
b/test/integration/smoke/test_secondary_storage.py
index 481d907..e037593 100644
--- a/test/integration/smoke/test_secondary_storage.py
+++ b/test/integration/smoke/test_secondary_storage.py
@@ -81,7 +81,7 @@ class TestSecStorageServices(cloudstackTestCase):
 raise Exception("Warning: Exception during cleanup : %s" % e)
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg", 
"selfservice"])
+@attr(tags = ["advanced", "advancedns", "smoke", "basic", "eip", "sg", 
"selfservice"],BugId="CLOUDSTACK-6877")
 def test_01_sys_vm_start(self):
 """Test system VM start
 """

git commit: updated refs/heads/master to dd26d4d

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/master 23280a47b -> dd26d4db6


CLOUDSTACK-6780: Resolved cleanup issue in portable ip test cases


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dd26d4db
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dd26d4db
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dd26d4db

Branch: refs/heads/master
Commit: dd26d4db63aa42da9da7bea0a31c541760c74125
Parents: 23280a4
Author: Ashutosh K 
Authored: Tue May 27 07:02:04 2014 -0700
Committer: Girish Shilamkar 
Committed: Wed Jun 11 11:29:17 2014 +0530

--
 test/integration/component/test_portable_ip.py | 18 --
 1 file changed, 12 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dd26d4db/test/integration/component/test_portable_ip.py
--
diff --git a/test/integration/component/test_portable_ip.py 
b/test/integration/component/test_portable_ip.py
index 847bb4a..77a5ab6 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -1103,21 +1103,27 @@ class TestDisassociatePublicIp(cloudstackTestCase):
 self.fail("Failed to create portable ip: %s" % e)
 
 try:
-self.user_account = Account.create(
+self.otherAccount = Account.create(
 self.apiclient,
 self.services["account"],
 domainid=self.domain.id
 )
+self.cleanup.append(self.otherAccount)
 
-self.api_client_user = self.testClient.getUserApiClient(
-UserName=self.user_account.name,
-DomainName=self.user_account.domain
+self.apiclientOtherAccount = self.testClient.getUserApiClient(
+UserName=self.otherAccount.name,
+DomainName=self.otherAccount.domain
 )
 
+# Trying to disassociate portable ip using
+# api client of other account than the one
+# used to create portable ip
 with self.assertRaises(Exception):
-portableip.delete(self.api_client_user)
-except Exception as e:
+portableip.delete(self.apiclientOtherAccount)
+
+# Disassociate IP using api client of account used to create it
 portableip.delete(self.apiclient)
+except Exception as e:
 self.fail("Exception while disassociating portable ip: %s" % e)
 return
 

git commit: updated refs/heads/4.4-forward to c7013c2

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 06bcc8d9e -> c7013c2ca


CLOUDSTACK-6876 Tagged the test_deploy_vgpu_enabled_vm with the relavent bug id.

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c7013c2c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c7013c2c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c7013c2c

Branch: refs/heads/4.4-forward
Commit: c7013c2ca326ad31047fb6bc689dabc2a6912030
Parents: 06bcc8d
Author: Bharat Kumar 
Authored: Mon Jun 9 18:30:13 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:30:05 2014 +0530

--
 test/integration/smoke/test_deploy_vgpu_enabled_vm.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c7013c2c/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
--
diff --git a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py 
b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
index 13fad61..fa33bdc 100644
--- a/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
+++ b/test/integration/smoke/test_deploy_vgpu_enabled_vm.py
@@ -152,7 +152,7 @@ class TestDeployvGPUenabledVM(cloudstackTestCase):
 self.account
 ]
 
-@attr(tags = ['advanced', 'simulator', 'basic', 'vgpu', 'provisioning'])
+@attr(tags = ['advanced', 'simulator', 'basic', 'vgpu', 
'provisioning'], BugId="CLOUDSTACK-6876")
 def test_deploy_vgpu_enabled_vm(self):
 """Test Deploy Virtual Machine
 

git commit: updated refs/heads/4.4-forward to 93c692e

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward c7013c2ca -> 93c692ea2


CLOUDSTACK-6878 Tagged the testcase test_01_snapshot_root_disk with the bugId

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93c692ea
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93c692ea
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93c692ea

Branch: refs/heads/4.4-forward
Commit: 93c692ea289a7e42dbe4d7051ee1aa78fbd51471
Parents: c7013c2
Author: Bharat Kumar 
Authored: Mon Jun 9 18:45:40 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:30:52 2014 +0530

--
 test/integration/smoke/test_snapshots.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c692ea/test/integration/smoke/test_snapshots.py
--
diff --git a/test/integration/smoke/test_snapshots.py 
b/test/integration/smoke/test_snapshots.py
index a960e70..a9be4e2 100644
--- a/test/integration/smoke/test_snapshots.py
+++ b/test/integration/smoke/test_snapshots.py
@@ -99,7 +99,7 @@ class TestSnapshotRootDisk(cloudstackTestCase):
 return
 
 @attr(speed = "slow")
-@attr(tags = ["advanced", "advancedns", "smoke", "provisioning"])
+@attr(tags = ["advanced", "advancedns", "smoke", "provisioning"], 
BugId="CLOUDSTACK-6878")
 def test_01_snapshot_root_disk(self):
 """Test Snapshot Root Disk
 """

git commit: updated refs/heads/4.4-forward to e58cc98

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward 93c692ea2 -> e58cc98c7


CLOUDSTACK-6875 Tagged the testcase with the bugId.

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e58cc98c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e58cc98c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e58cc98c

Branch: refs/heads/4.4-forward
Commit: e58cc98c74c1655f5b5da60f75f8269f800d
Parents: 93c692e
Author: Bharat Kumar 
Authored: Mon Jun 9 18:39:17 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:31:23 2014 +0530

--
 test/integration/smoke/test_volumes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e58cc98c/test/integration/smoke/test_volumes.py
--
diff --git a/test/integration/smoke/test_volumes.py 
b/test/integration/smoke/test_volumes.py
index 73c2722..d6db63f 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -708,7 +708,7 @@ class TestVolumes(cloudstackTestCase):
 time.sleep(30)
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke","basic", "selfservice"])
+@attr(tags = ["advanced", "advancedns", "smoke","basic", "selfservice"], 
BugId="CLOUDSTACK-6875")
 def test_09_delete_detached_volume(self):
 """Delete a Volume unattached to an VM
 """

git commit: updated refs/heads/4.4-forward to 0684608

[aprateek]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward e58cc98c7 -> 068460825


CLOUDSTACK-6879 Tagged the testcase test_vpc_site2site_vpn with the bugId

Signed-off-by: Abhinandan Prateek 


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/06846082
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/06846082
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/06846082

Branch: refs/heads/4.4-forward
Commit: 06846082515e9524fb6c6a28608c8b0d843aab2f
Parents: e58cc98
Author: Bharat Kumar 
Authored: Mon Jun 9 18:47:50 2014 +0530
Committer: Abhinandan Prateek 
Committed: Wed Jun 11 11:31:54 2014 +0530

--
 test/integration/smoke/test_vpc_vpn.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/06846082/test/integration/smoke/test_vpc_vpn.py
--
diff --git a/test/integration/smoke/test_vpc_vpn.py 
b/test/integration/smoke/test_vpc_vpn.py
index 03826e9..1b28447 100644
--- a/test/integration/smoke/test_vpc_vpn.py
+++ b/test/integration/smoke/test_vpc_vpn.py
@@ -159,7 +159,7 @@ class TestVpcSite2SiteVpn(cloudstackTestCase):
 
 cls.cleanup = [cls.account]
 
-@attr(tags=["advanced", "selfservice"])
+@attr(tags=["advanced", "selfservice"], BugId="CLOUDSTACK-6879")
 def test_vpc_site2site_vpn(self):
 """Test VPN in VPC"""