[1/2] git commit: updated refs/heads/master to a963fd3

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master 1e4695b9a -> a963fd34b


CLOUDSTACK-7111 Empty commandlist must return a succes


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

Branch: refs/heads/master
Commit: a963fd34b55b7b69a65745ae0f875f6d712b69d6
Parents: 5651a13
Author: Hugo Trippaers 
Authored: Fri Jul 18 09:27:40 2014 +0200
Committer: Hugo Trippaers 
Committed: Fri Jul 18 09:28:42 2014 +0200

--
 .../agent/resource/virtualnetwork/VirtualRoutingResource.java| 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a963fd34/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 1c08446..5c1ee0d 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -168,6 +168,10 @@ public class VirtualRoutingResource {
 
 
 private Answer applyConfig(NetworkElementCommand cmd, List 
cfg) {
+if (cfg.isEmpty()) {
+return new Answer(cmd, true, "Nothing to do");
+}
+
 List results = new ArrayList();
 List details = new ArrayList();
 boolean finalResult = false;

[2/2] git commit: updated refs/heads/master to a963fd3

[hugo]

Remove duplicated code


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

Branch: refs/heads/master
Commit: 5651a13cfde96b91dd40858490c4a450321624ef
Parents: 1e4695b
Author: Hugo Trippaers 
Authored: Thu Jul 17 12:13:48 2014 +0200
Committer: Hugo Trippaers 
Committed: Fri Jul 18 09:28:42 2014 +0200

--
 .../virtualnetwork/VirtualRoutingResource.java  | 44 +++-
 .../kvm/resource/LibvirtComputingResource.java  | 23 --
 2 files changed, 14 insertions(+), 53 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5651a13c/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index 00501e3..1c08446 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -193,7 +193,6 @@ public class VirtualRoutingResource {
 }
 }
 
-
 private CheckS2SVpnConnectionsAnswer execute(CheckS2SVpnConnectionsCommand 
cmd) {
 
 StringBuffer buff = new StringBuffer();
@@ -226,7 +225,7 @@ public class VirtualRoutingResource {
 }
 }
 
-protected Answer execute(CheckRouterCommand cmd) {
+private Answer execute(CheckRouterCommand cmd) {
 final ExecutionResult result = 
_vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.RVR_CHECK, null);
 if (!result.isSuccess()) {
 return new CheckRouterAnswer(cmd, result.getDetails());
@@ -234,7 +233,7 @@ public class VirtualRoutingResource {
 return new CheckRouterAnswer(cmd, result.getDetails(), true);
 }
 
-protected Answer execute(GetDomRVersionCmd cmd) {
+private Answer execute(GetDomRVersionCmd cmd) {
 final ExecutionResult result = 
_vrDeployer.executeInVR(cmd.getRouterAccessIp(), VRScripts.VERSION, null);
 if (!result.isSuccess()) {
 return new GetDomRVersionAnswer(cmd, "GetDomRVersionCmd failed");
@@ -246,7 +245,6 @@ public class VirtualRoutingResource {
 return new GetDomRVersionAnswer(cmd, result.getDetails(), lines[0], 
lines[1]);
 }
 
-
 public boolean configure(final String name, final Map 
params) throws ConfigurationException {
 _name = name;
 
@@ -270,44 +268,12 @@ public class VirtualRoutingResource {
 return true;
 }
 
-public String connect(final String ipAddress) {
+public boolean connect(final String ipAddress) {
 return connect(ipAddress, _port);
 }
 
-public String connect(final String ipAddress, final int port) {
-for (int i = 0; i <= _retry; i++) {
-SocketChannel sch = null;
-try {
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Trying to connect to " + ipAddress);
-}
-sch = SocketChannel.open();
-sch.configureBlocking(true);
-
-final InetSocketAddress addr = new 
InetSocketAddress(ipAddress, port);
-sch.connect(addr);
-return null;
-} catch (final IOException e) {
-if (s_logger.isDebugEnabled()) {
-s_logger.debug("Could not connect to " + ipAddress);
-}
-} finally {
-if (sch != null) {
-try {
-sch.close();
-} catch (final IOException e) {
-}
-}
-}
-try {
-Thread.sleep(_sleep);
-} catch (final InterruptedException e) {
-}
-}
-
-s_logger.debug("Unable to logon to " + ipAddress);
-
-return "Unable to connect";
+public boolean connect(final String ipAddress, final int port) {
+return connect(ipAddress, port, _sleep);
 }
 
 public boolean connect(final String ipAddress, int retry, int sleep) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5651a13c/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index d4d663c..2ebab78 100755
--- 
a/plugins/hyper

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

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Remove duplicated code

[htrippaers] CLOUDSTACK-7111 Empty commandlist must return a succes

--
Started by an SCM change
Building remotely on ubuntu-6 (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 a963fd34b55b7b69a65745ae0f875f6d712b69d6 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f a963fd34b55b7b69a65745ae0f875f6d712b69d6
 > git rev-list 1e4695b9aa5e42f26b84b47349fd81e567deb7e9
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson9068141939591210681.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
/tmp/hudson9068141939591210681.sh: line 2: 
/home/jenkins/tools/maven/latest2/bin/mvn: No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

git commit: updated refs/heads/master to 733a7ba

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master a963fd34b -> 733a7ba8c


Put in a note that will hopefully prevent a bunch of systemvm build failures


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

Branch: refs/heads/master
Commit: 733a7ba8c113bb95bb77009c858d8503a9658df4
Parents: a963fd3
Author: Hugo Trippaers 
Authored: Fri Jul 18 10:18:19 2014 +0200
Committer: Hugo Trippaers 
Committed: Fri Jul 18 10:18:19 2014 +0200

--
 tools/appliance/definitions/systemvm64template/definition.rb | 7 +++
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 7 +++
 2 files changed, 14 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/733a7ba8/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index f9308a0..bee7db7 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -1,3 +1,10 @@
+#
+# NOTE: Before changing the version of the debian image make
+# sure it is added to the userContent of jenkins.buildacloud.org
+# and the copy task is updated on the systemvm builds
+# This will prevent the inevitable build failure once the iso is
+# removed from the debian mirrors
+#
 Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/733a7ba8/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index fcaab4d..ab65f53 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -1,3 +1,10 @@
+#
+# NOTE: Before changing the version of the debian image make
+# sure it is added to the userContent of jenkins.buildacloud.org
+# and the copy task is updated on the systemvm builds
+# This will prevent the inevitable build failure once the iso is
+# removed from the debian mirrors
+#
 Veewee::Definition.declare({
   :cpu_count => '1',
   :memory_size=> '256',

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

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Put in a note that will hopefully prevent a bunch of systemvm 
build failures

--
[...truncated 176 lines...]
Receiving objects:  45% (229842/510760), 41.50 MiB | 2.70 MiB/s   
Receiving objects:  46% (234950/510760), 45.67 MiB | 2.74 MiB/s   
Receiving objects:  46% (235930/510760), 45.67 MiB | 2.74 MiB/s   
Receiving objects:  47% (240058/510760), 48.14 MiB | 3.03 MiB/s   
Receiving objects:  48% (245165/510760), 50.85 MiB | 3.41 MiB/s   
Receiving objects:  48% (245990/510760), 50.85 MiB | 3.41 MiB/s   
Receiving objects:  49% (250273/510760), 53.81 MiB | 3.89 MiB/s   
Receiving objects:  50% (255380/510760), 57.02 MiB | 4.37 MiB/s   
Receiving objects:  50% (257485/510760), 57.02 MiB | 4.37 MiB/s   
Receiving objects:  51% (260488/510760), 60.48 MiB | 4.86 MiB/s   
Receiving objects:  52% (265596/510760), 64.18 MiB | 5.35 MiB/s   
Receiving objects:  52% (266637/510760), 64.18 MiB | 5.35 MiB/s   
Receiving objects:  53% (270703/510760), 64.18 MiB | 5.35 MiB/s   
Receiving objects:  54% (275811/510760), 68.14 MiB | 5.86 MiB/s   
Receiving objects:  55% (280918/510760), 68.14 MiB | 5.86 MiB/s   
Receiving objects:  56% (286026/510760), 68.14 MiB | 5.86 MiB/s   
Receiving objects:  57% (291134/510760), 68.14 MiB | 5.86 MiB/s   
Receiving objects:  58% (296241/510760), 72.27 MiB | 6.34 MiB/s   
Receiving objects:  59% (301349/510760), 72.27 MiB | 6.34 MiB/s   
Receiving objects:  59% (303259/510760), 72.27 MiB | 6.34 MiB/s   
Receiving objects:  60% (306456/510760), 72.27 MiB | 6.34 MiB/s   
Receiving objects:  61% (311564/510760), 80.54 MiB | 7.15 MiB/s   
Receiving objects:  61% (316148/510760), 80.54 MiB | 7.15 MiB/s   
Receiving objects:  62% (316672/510760), 80.54 MiB | 7.15 MiB/s   
Receiving objects:  63% (321779/510760), 83.10 MiB | 7.12 MiB/s   
Receiving objects:  63% (324945/510760), 84.92 MiB | 6.87 MiB/s   
Receiving objects:  64% (326887/510760), 84.92 MiB | 6.87 MiB/s   
Receiving objects:  65% (331994/510760), 86.61 MiB | 6.53 MiB/s   
Receiving objects:  65% (336525/510760), 88.56 MiB | 6.20 MiB/s   
Receiving objects:  66% (337102/510760), 90.39 MiB | 5.78 MiB/s   
Receiving objects:  66% (339093/510760), 91.70 MiB | 5.19 MiB/s   
Receiving objects:  67% (342210/510760), 93.28 MiB | 4.63 MiB/s   
Receiving objects:  68% (347317/510760), 93.28 MiB | 4.63 MiB/s   
Receiving objects:  68% (351605/510760), 95.11 MiB | 4.05 MiB/s   
Receiving objects:  69% (352425/510760), 95.11 MiB | 4.05 MiB/s   
Receiving objects:  70% (357532/510760), 97.18 MiB | 3.65 MiB/s   
Receiving objects:  71% (362640/510760), 99.46 MiB | 3.59 MiB/s   
Receiving objects:  71% (366217/510760), 99.46 MiB | 3.59 MiB/s   
Receiving objects:  72% (367748/510760), 99.46 MiB | 3.59 MiB/s   
Receiving objects:  73% (372855/510760), 101.24 MiB | 3.58 MiB/s   
Receiving objects:  74% (377963/510760), 102.74 MiB | 3.54 MiB/s   
Receiving objects:  74% (379598/510760), 102.74 MiB | 3.54 MiB/s   
Receiving objects:  74% (381602/510760), 106.40 MiB | 3.51 MiB/s   
Receiving objects:  75% (383070/510760), 108.57 MiB | 3.70 MiB/s   
Receiving objects:  75% (386588/510760), 110.98 MiB | 3.88 MiB/s   
Receiving objects:  76% (388178/510760), 116.57 MiB | 4.25 MiB/s   
Receiving objects:  76% (388385/510760), 116.57 MiB | 4.25 MiB/s   
Receiving objects:  76% (388397/510760), 123.11 MiB | 4.80 MiB/s   
Receiving objects:  76% (389177/510760), 130.55 MiB | 5.74 MiB/s   
Receiving objects:  77% (393286/510760), 134.62 MiB | 6.22 MiB/s   
Receiving objects:  78% (398393/510760), 134.62 MiB | 6.22 MiB/s   
Receiving objects:  78% (400448/510760), 143.54 MiB | 7.19 MiB/s   
Receiving objects:  78% (400448/510760), 153.38 MiB | 8.15 MiB/s   
Receiving objects:  78% (400610/510760), 158.69 MiB | 8.64 MiB/s   
Receiving objects:  78% (400753/510760), 169.97 MiB | 9.59 MiB/s   
Receiving objects:  78% (400797/510760), 182.11 MiB | 10.53 MiB/s   
Receiving objects:  79% (403501/510760), 188.47 MiB | 10.98 MiB/s   
Receiving objects:  79% (408125/510760), 195.06 MiB | 11.43 MiB/s   
Receiving objects:  80% (408608/510760), 195.06 MiB | 11.43 MiB/s   
Receiving objects:  81% (413716/510760), 201.87 MiB | 11.87 MiB/s   
Receiving objects:  81% (417252/510760), 216.12 MiB | 12.74 MiB/s   
Receiving objects:  81% (417253/510760), 231.18 MiB | 13.58 MiB/s   
Receiving objects:  81% (417672/510760), 238.89 MiB | 13.96 MiB/s   
Receiving objects:  81% (417716/510760), 255.15 MiB | 14.79 MiB/s   
Receiving objects:  82% (418824/510760), 255.15 MiB | 14.79 MiB/s   
Receiving objects:  82% (420136/510760), 271.88 MiB | 15.53 MiB/s   
Receiving objects:  83% (423931/510760), 280.79 MiB | 15.94 MiB/s   
Receiving objects:  84% (429039/510760), 280.79 MiB | 15.94 MiB/s   
Receiving objects:  85% (434146/510760), 280.79 MiB | 15.94 MiB/s   
Receiving objects:  86% (439254/510760), 280.79 MiB | 15.94 MiB/s   
Receiving objects:

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

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Put in a note that will hopefully prevent a bunch of systemvm 
build failures

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

Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git init 
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 config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
 > 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 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 733a7ba8c113bb95bb77009c858d8503a9658df4 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 733a7ba8c113bb95bb77009c858d8503a9658df4
 > git rev-list a963fd34b55b7b69a65745ae0f875f6d712b69d6
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson2763580314393751993.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
/tmp/hudson2763580314393751993.sh: line 2: 
/home/jenkins/tools/maven/latest2/bin/mvn: No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

git commit: updated refs/heads/master to 0069037

[jayapal]

Repository: cloudstack
Updated Branches:
  refs/heads/master 733a7ba8c -> 006903757


CLOUDSTACK-7113: Ability to reset password when Router VM is stopped
With this improvement password reset also happens when router is in stopped 
state on resetPasswordCmd and restoreVM


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

Branch: refs/heads/master
Commit: 0069037573247e2cbe545e8d01d609040444e453
Parents: 733a7ba
Author: Harikrishna Patnala 
Authored: Wed Jul 16 15:33:13 2014 +0530
Committer: Jayapal 
Committed: Fri Jul 18 14:37:44 2014 +0530

--
 .../network/element/VirtualRouterElement.java   | 20 ++-
 server/src/com/cloud/vm/UserVmManagerImpl.java  | 35 ++--
 2 files changed, 51 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00690375/server/src/com/cloud/network/element/VirtualRouterElement.java
--
diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java 
b/server/src/com/cloud/network/element/VirtualRouterElement.java
index 3fcf578..fd15ee3 100755
--- a/server/src/com/cloud/network/element/VirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VirtualRouterElement.java
@@ -74,6 +74,7 @@ import 
com.cloud.network.lb.LoadBalancingRule.LbStickinessPolicy;
 import com.cloud.network.lb.LoadBalancingRulesManager;
 import com.cloud.network.router.VirtualRouter.Role;
 import com.cloud.network.router.VpcVirtualNetworkApplianceManager;
+import com.cloud.network.router.VirtualRouter;
 import com.cloud.network.rules.FirewallRule;
 import com.cloud.network.rules.LbStickinessMethod;
 import com.cloud.network.rules.LbStickinessMethod.StickinessMethodType;
@@ -89,6 +90,7 @@ import com.cloud.user.AccountManager;
 import com.cloud.utils.Pair;
 import com.cloud.utils.component.AdapterBase;
 import com.cloud.utils.db.QueryBuilder;
+import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.utils.db.SearchCriteria.Op;
 import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.vm.DomainRouterVO;
@@ -681,7 +683,23 @@ NetworkMigrationResponder, AggregatedCommandExecutor {
 @SuppressWarnings("unchecked")
 VirtualMachineProfile uservm = vm;
 
-return _routerMgr.savePasswordToRouter(network, nic, uservm, routers);
+// If any router is running then send save password command otherwise 
save the password in DB
+for (VirtualRouter router : routers) {
+if (router.getState() == State.Running) {
+return _routerMgr.savePasswordToRouter(network, nic, uservm, 
routers);
+}
+}
+String password = (String) 
uservm.getParameter(VirtualMachineProfile.Param.VmPassword);
+String password_encrypted = DBEncryptionUtil.encrypt(password);
+UserVmVO userVmVO = _userVmDao.findById(vm.getId());
+
+_userVmDao.loadDetails(userVmVO);
+userVmVO.setDetail("password", password_encrypted);
+_userVmDao.saveDetails(userVmVO);
+
+userVmVO.setUpdateParameters(true);
+_userVmDao.update(userVmVO.getId(), userVmVO);
+return true;
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/00690375/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java 
b/server/src/com/cloud/vm/UserVmManagerImpl.java
index d0bc186..2de6f86 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -261,6 +261,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
 import com.cloud.utils.exception.ExecutionException;
 import com.cloud.utils.fsm.NoTransitionException;
 import com.cloud.utils.net.NetUtils;
+import com.cloud.utils.crypt.DBEncryptionUtil;
 import com.cloud.vm.VirtualMachine.State;
 import com.cloud.vm.dao.InstanceGroupDao;
 import com.cloud.vm.dao.InstanceGroupVMMapDao;
@@ -3439,7 +3440,11 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 
 String password = "saved_password";
 if (template.getEnablePassword()) {
-password = generateRandomPassword();
+if (vm.getDetail("password") != null) {
+password = 
DBEncryptionUtil.decrypt(vm.getDetail("password"));
+ } else {
+password = generateRandomPassword();
+ }
 }
 
 if (!validPassword(password)) {
@@ -3479,6 +3484,9 @@ public class UserVm

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

[Apache Jenkins Server]

See 

Changes:

[jayapal] CLOUDSTACK-7113: Ability to reset password when Router VM is stopped

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

Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git init 
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 config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
 > 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 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 0069037573247e2cbe545e8d01d609040444e453 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 0069037573247e2cbe545e8d01d609040444e453
 > git rev-list 733a7ba8c113bb95bb77009c858d8503a9658df4
[cloudstack-rat-master] $ /bin/bash -xe /tmp/hudson8691921540153778195.sh
+ /home/jenkins/tools/maven/latest2/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
/tmp/hudson8691921540153778195.sh: line 2: 
/home/jenkins/tools/maven/latest2/bin/mvn: No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu-6 (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 0069037573247e2cbe545e8d01d609040444e453 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 0069037573247e2cbe545e8d01d609040444e453
 > git rev-list 0069037573247e2cbe545e8d01d609040444e453
FATAL: Couldn?t find any executable in /home/hudson/tools/maven/latest2
Build step 'Invoke top-level Maven targets' marked build as failure
Archiving artifacts

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu-6 (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 0069037573247e2cbe545e8d01d609040444e453 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 0069037573247e2cbe545e8d01d609040444e453
 > git rev-list 0069037573247e2cbe545e8d01d609040444e453
Unpacking 
http://archive.apache.org/dist/maven/binaries/apache-maven-2.0.10-bin.zip to 
/home/hudson/tools/maven/apache-maven-2.0.10 on ubuntu-6
[cloudstack-rat-master] $ /home/hudson/tools/maven/apache-maven-2.0.10/bin/mvn 
--projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
Unable to parse command line options: Unrecognized option: 
--projects=org.apache.cloudstack:cloudstack

usage: mvn [options] [] []

Options:
 -q,--quietQuiet output - only show errors
 -C,--strict-checksums Fail the build if checksums don't match
 -c,--lax-checksumsWarn if checksums don't match
 -P,--activate-profilesComma-delimited list of profiles to
   activate
 -ff,--fail-fast   Stop at first failure in reactorized builds
 -fae,--fail-at-endOnly fail the build afterwards; allow all
   non-impacted builds to continue
 -B,--batch-mode   Run in non-interactive (batch) mode
 -fn,--fail-never  NEVER fail the build, regardless of project
   result
 -up,--update-plugins  Synonym for cpu
 -N,--non-recursiveDo not recurse into sub-projects
 -npr,--no-plugin-registry Don't use ~/.m2/plugin-registry.xml for
   plugin versions
 -U,--update-snapshots Forces a check for updated releases and
   snapshots on remote repositories
 -cpu,--check-plugin-updates   Force upToDate check for any relevant
   registered plugins
 -npu,--no-plugin-updates  Suppress upToDate check for any relevant
   registered plugins
 -D,--define   Define a system property
 -X,--debugProduce execution debug output
 -e,--errors   Produce execution error messages
 -f,--file Force the use of an alternate POM file.
 -h,--help Display help information
 -o,--offline  Work offline
 -r,--reactor  Execute goals for project found in the
   reactor
 -s,--settings Alternate path for the user settings file
 -v,--version  Display version information
Build step 'Invoke top-level Maven targets' marked build as failure
Archiving artifacts

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu-6 (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 0069037573247e2cbe545e8d01d609040444e453 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 0069037573247e2cbe545e8d01d609040444e453
 > git rev-list 0069037573247e2cbe545e8d01d609040444e453
[cloudstack-rat-master] $ /home/hudson/tools/maven/apache-maven-2.0.10/bin/mvn 
org.apache.rat:apache-rat-plugin:0.10:check 
--projects=org.apache.cloudstack:cloudstack
Unable to parse command line options: Unrecognized option: 
--projects=org.apache.cloudstack:cloudstack

usage: mvn [options] [] []

Options:
 -q,--quietQuiet output - only show errors
 -C,--strict-checksums Fail the build if checksums don't match
 -c,--lax-checksumsWarn if checksums don't match
 -P,--activate-profilesComma-delimited list of profiles to
   activate
 -ff,--fail-fast   Stop at first failure in reactorized builds
 -fae,--fail-at-endOnly fail the build afterwards; allow all
   non-impacted builds to continue
 -B,--batch-mode   Run in non-interactive (batch) mode
 -fn,--fail-never  NEVER fail the build, regardless of project
   result
 -up,--update-plugins  Synonym for cpu
 -N,--non-recursiveDo not recurse into sub-projects
 -npr,--no-plugin-registry Don't use ~/.m2/plugin-registry.xml for
   plugin versions
 -U,--update-snapshots Forces a check for updated releases and
   snapshots on remote repositories
 -cpu,--check-plugin-updates   Force upToDate check for any relevant
   registered plugins
 -npu,--no-plugin-updates  Suppress upToDate check for any relevant
   registered plugins
 -D,--define   Define a system property
 -X,--debugProduce execution debug output
 -e,--errors   Produce execution error messages
 -f,--file Force the use of an alternate POM file.
 -h,--help Display help information
 -o,--offline  Work offline
 -r,--reactor  Execute goals for project found in the
   reactor
 -s,--settings Alternate path for the user settings file
 -v,--version  Display version information
Build step 'Invoke top-level Maven targets' marked build as failure
Archiving artifacts

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu-5 (Ubuntu ubuntu) in workspace 

Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git init 
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 config remote.origin.url 
 > https://git-wip-us.apache.org/repos/asf/cloudstack.git
 > git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/*
 > 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 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 0069037573247e2cbe545e8d01d609040444e453 (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 0069037573247e2cbe545e8d01d609040444e453
 > git rev-list 0069037573247e2cbe545e8d01d609040444e453
Unpacking 
http://archive.apache.org/dist/maven/binaries/apache-maven-2.0.10-bin.zip to 
/home/hudson/tools/maven/apache-maven-2.0.10 on ubuntu-5
[cloudstack-rat-master] $ /home/hudson/tools/maven/apache-maven-2.0.10/bin/mvn 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   Apache CloudStack Developer Tools - Checkstyle Configuration
[INFO]   Apache CloudStack
[INFO]   Apache CloudStack Maven Conventions Parent
[INFO]   Apache CloudStack Framework - Managed Context
[INFO]   Apache CloudStack Utils
[INFO]   Apache CloudStack Framework
[INFO]   Apache CloudStack Framework - Event Notification
[INFO]   Apache CloudStack Framework - Configuration
[INFO]   Apache CloudStack API
[INFO]   Apache CloudStack Framework - REST
[INFO]   Apache CloudStack Framework - IPC
[INFO]   Apache CloudStack Cloud Engine
[INFO]   Apache CloudStack Cloud Engine API
[INFO]   Apache CloudStack Framework - Security
[INFO]   Apache CloudStack Core
[INFO]   Apache CloudStack Agents
[INFO]   Apache CloudStack Framework - Clustering
[INFO]   Apache CloudStack Framework - Event Notification
[INFO]   Apache CloudStack Cloud Engine Schema Component
[INFO]   Apache CloudStack Framework - Jobs
[INFO]   Apache CloudStack Cloud Engine Internal Components API
[INFO]   Apache CloudStack Server
[INFO]   Apache CloudStack Usage Server
[INFO]   Apache CloudStack Cloud Engine Orchestration Component
[INFO]   Apache CloudStack Cloud Services
[INFO]   Apache CloudStack Secondary Storage
[INFO]   Apache CloudStack Secondary Storage Service
[INFO]   Apache CloudStack Engine Storage Component
[INFO]   Apache CloudStack Engine Storage Volume Component
[INFO]   Apache CloudStack Engine Storage Image Component
[INFO]   Apache CloudStack Engine Storage Data Motion Component
[INFO]   Apache CloudStack Engine Storage Cache Component
[INFO]   Apache CloudStack Engine Storage Snapshot Component
[INFO]   Apache CloudStack Cloud Engine API
[INFO]   Apache CloudStack Cloud Engine Service
[INFO]   Apache CloudStack Plugin POM
[INFO]   Apache CloudStack Plugin - API Rate Limit
[INFO]   Apache CloudStack Plugin - Storage Volume default provider
[INFO]   Apache CloudStack Plugin - Storage Volume SolidFire Provider
[INFO]   Apache CloudStack Plugin - API SolidFire
[INFO]   Apache CloudStack Plugin - API Discovery
[INFO]   Apache CloudStack Plugin - ACL Static Role Based
[INFO]   Apache CloudStack Plugin - Host Anti-Affinity Processor
[INFO]   Apache CloudStack Plugin - Explicit Dedication Processor
[INFO]   Apache CloudStack Plugin - User Concentrated Pod Deployment Planner
[INFO]   Apache CloudStack Plugin - User Dispersing Deployment Planner
[INFO]   Apache CloudStack Plugin - Implicit Dedication Planner
[INFO]   Apache CloudStack Plugin - Skip Heurestics Planner
[INFO]   Apache CloudStack Plugin - Host Allocator Random
[INFO]   Apache CloudStack Plugin - Dedicated Resources
[INFO]   Apache CloudStack Plugin - Hypervisor OracleVM
[INFO]   Apache CloudStack Plugin - Open vSwitch
[INFO]   Apache CloudStack Plugin - Hypervisor XenServer
[INFO]   Apache CloudStack Plugin - Hypervisor KVM
[INFO]   Apache CloudStack Plugin - RabbitMQ Event Bus
[INFO]   Apache CloudStack Plugin - In Memory Event Bus
[INFO]   Apache CloudStack Plugin - Hypervisor Baremetal
[INFO]   Apache CloudStack Plugin - Hypervisor UCS
[INFO]   Apache CloudStack Plugin - Hypervisor Hyper-V
[INFO]   Apache CloudStack Plugin - Network Elastic Load Balancer
[INFO]   Apache CloudStack Plugin - Network Internal Load Balancer
[INFO]   Apache CloudStack Framework - Spring Life C

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

[Apache Jenkins Server]

See 

--
[...truncated 14 lines...]
[INFO] Scanning for projects...
[INFO] Reactor build order: 
[INFO]   Apache CloudStack Developer Tools - Checkstyle Configuration
[INFO]   Apache CloudStack
[INFO]   Apache CloudStack Maven Conventions Parent
[INFO]   Apache CloudStack Framework - Managed Context
[INFO]   Apache CloudStack Utils
[INFO]   Apache CloudStack Framework
[INFO]   Apache CloudStack Framework - Event Notification
[INFO]   Apache CloudStack Framework - Configuration
[INFO]   Apache CloudStack API
[INFO]   Apache CloudStack Framework - REST
[INFO]   Apache CloudStack Framework - IPC
[INFO]   Apache CloudStack Cloud Engine
[INFO]   Apache CloudStack Cloud Engine API
[INFO]   Apache CloudStack Framework - Security
[INFO]   Apache CloudStack Core
[INFO]   Apache CloudStack Agents
[INFO]   Apache CloudStack Framework - Clustering
[INFO]   Apache CloudStack Framework - Event Notification
[INFO]   Apache CloudStack Cloud Engine Schema Component
[INFO]   Apache CloudStack Framework - Jobs
[INFO]   Apache CloudStack Cloud Engine Internal Components API
[INFO]   Apache CloudStack Server
[INFO]   Apache CloudStack Usage Server
[INFO]   Apache CloudStack Cloud Engine Orchestration Component
[INFO]   Apache CloudStack Cloud Services
[INFO]   Apache CloudStack Secondary Storage
[INFO]   Apache CloudStack Secondary Storage Service
[INFO]   Apache CloudStack Engine Storage Component
[INFO]   Apache CloudStack Engine Storage Volume Component
[INFO]   Apache CloudStack Engine Storage Image Component
[INFO]   Apache CloudStack Engine Storage Data Motion Component
[INFO]   Apache CloudStack Engine Storage Cache Component
[INFO]   Apache CloudStack Engine Storage Snapshot Component
[INFO]   Apache CloudStack Cloud Engine API
[INFO]   Apache CloudStack Cloud Engine Service
[INFO]   Apache CloudStack Plugin POM
[INFO]   Apache CloudStack Plugin - API Rate Limit
[INFO]   Apache CloudStack Plugin - Storage Volume default provider
[INFO]   Apache CloudStack Plugin - Storage Volume SolidFire Provider
[INFO]   Apache CloudStack Plugin - API SolidFire
[INFO]   Apache CloudStack Plugin - API Discovery
[INFO]   Apache CloudStack Plugin - ACL Static Role Based
[INFO]   Apache CloudStack Plugin - Host Anti-Affinity Processor
[INFO]   Apache CloudStack Plugin - Explicit Dedication Processor
[INFO]   Apache CloudStack Plugin - User Concentrated Pod Deployment Planner
[INFO]   Apache CloudStack Plugin - User Dispersing Deployment Planner
[INFO]   Apache CloudStack Plugin - Implicit Dedication Planner
[INFO]   Apache CloudStack Plugin - Skip Heurestics Planner
[INFO]   Apache CloudStack Plugin - Host Allocator Random
[INFO]   Apache CloudStack Plugin - Dedicated Resources
[INFO]   Apache CloudStack Plugin - Hypervisor OracleVM
[INFO]   Apache CloudStack Plugin - Open vSwitch
[INFO]   Apache CloudStack Plugin - Hypervisor XenServer
[INFO]   Apache CloudStack Plugin - Hypervisor KVM
[INFO]   Apache CloudStack Plugin - RabbitMQ Event Bus
[INFO]   Apache CloudStack Plugin - In Memory Event Bus
[INFO]   Apache CloudStack Plugin - Hypervisor Baremetal
[INFO]   Apache CloudStack Plugin - Hypervisor UCS
[INFO]   Apache CloudStack Plugin - Hypervisor Hyper-V
[INFO]   Apache CloudStack Plugin - Network Elastic Load Balancer
[INFO]   Apache CloudStack Plugin - Network Internal Load Balancer
[INFO]   Apache CloudStack Framework - Spring Life Cycle
[INFO]   Apache CloudStack Plugin - Network Juniper Contrail
[INFO]   Apache CloudStack Plugin - Palo Alto
[INFO]   Apache CloudStack Plugin - Network Netscaler
[INFO]   Apache CloudStack Plugin - Network Nicira NVP
[INFO]   Apache CloudStack Plugin - BigSwitch Virtual Network Segment
[INFO]   Apache CloudStack Plugin - Midokura Midonet
[INFO]   Apache CloudStack Plugin - Stratosphere SSP
[INFO]   Apache CloudStack Plugin - Network Opendaylight
[INFO]   Apache CloudStack Plugin - Storage Allocator Random
[INFO]   Apache CloudStack Plugin - User Authenticator LDAP
[INFO]   Apache CloudStack Plugin - User Authenticator MD5
[INFO]   Apache CloudStack Plugin - User Authenticator Plain Text
[INFO]   Apache CloudStack Plugin - User Authenticator SHA256 Salted
[INFO]   Apache CloudStack Plugin - Dns Notifier Example
[INFO]   Apache CloudStack Plugin - Storage Image S3
[INFO]   Apache CloudStack Plugin - Storage Image Swift provider
[INFO]   Apache CloudStack Plugin - Storage Image default provider
[INFO]   Apache CloudStack Plugin - Storage Image sample provider
[INFO]   Apache CloudStack Plugin - Storage Volume Nexenta Provider
[INFO]   Apache CloudStack Plugin - Storage Volume CloudByte Provider
[INFO]   Apache CloudStack Plugin - Storage Volume sample provider
[INFO]   Apache CloudStack Plugin - SNMP Alerts
[INFO]   Apache CloudStack Plugin - Syslog Alerts
[INFO]   Apache CloudStack Plugin - Network VXLAN
[INFO]   Apache CloudStack Framework - Spring Module
[INFO]   Apache CloudStack Secondary Storage Contr

git commit: updated refs/heads/master to 6c2acda

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master 006903757 -> 6c2acda5a


Fixup licenses and enfore the license check in this plugin


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

Branch: refs/heads/master
Commit: 6c2acda5a3e4d295c20ff06573dcdf96c1962408
Parents: 0069037
Author: Hugo Trippaers 
Authored: Fri Jul 18 11:38:29 2014 +0200
Committer: Hugo Trippaers 
Committed: Fri Jul 18 11:40:51 2014 +0200

--
 plugins/storage/volume/cloudbyte/pom.xml| 43 ++---
 .../storage-volume-cloudbyte/module.properties  |  3 +
 .../spring-storage-volume-cloudbyte-context.xml | 30 -
 .../ElastistorPrimaryDataStoreDriver.java   | 45 --
 .../ElastistorPrimaryDataStoreLifeCycle.java| 40 ++--
 .../provider/ElastistorHostListener.java| 19 ++
 .../ElastistorPrimaryDataStoreProvider.java | 42 +++--
 .../storage/datastore/util/ElastistorUtil.java  | 64 ++--
 .../util/ElastistorVolumeApiService.java| 37 +--
 .../util/ElastistorVolumeApiServiceImpl.java| 42 +++--
 .../util/ListElastistorInterfaceCmd.java| 20 +-
 .../util/ListElastistorInterfaceResponse.java   |  3 +
 .../datastore/util/ListElastistorPoolCmd.java   | 20 +-
 .../util/ListElastistorPoolResponse.java|  3 +
 .../datastore/util/ListElastistorVolumeCmd.java | 20 +-
 .../util/ListElastistorVolumeResponse.java  |  3 +
 16 files changed, 277 insertions(+), 157 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c2acda5/plugins/storage/volume/cloudbyte/pom.xml
--
diff --git a/plugins/storage/volume/cloudbyte/pom.xml 
b/plugins/storage/volume/cloudbyte/pom.xml
index b9496e5..8ef0c29 100755
--- a/plugins/storage/volume/cloudbyte/pom.xml
+++ b/plugins/storage/volume/cloudbyte/pom.xml
@@ -1,13 +1,23 @@
-
+
 http://maven.apache.org/POM/4.0.0"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd";>
   4.0.0
@@ -66,6 +76,19 @@
   
 
   
+  
+com.mycila
+license-maven-plugin
+
+  
+cloudstack-checklicence
+process-classes
+
+  check
+
+  
+
+  
 
   
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c2acda5/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties
--
diff --git 
a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties
 
b/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties
index 730e376..92cd58f 100755
--- 
a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties
+++ 
b/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/module.properties
@@ -1,3 +1,4 @@
+#
 # 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
@@ -14,5 +15,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+#
+
 name=storage-volume-cloudbyte
 parent=storage
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c2acda5/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml
--
diff --git 
a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml
 
b/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml
index 4a56482..ee4b9a3 100755
--- 
a/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml
+++ 
b/plugins/storage/volume/cloudbyte/resources/META-INF/cloudstack/storage-volume-cloudbyte/spring-storage-volume-cloudbyte-context.xml
@@ -1,20 +1,22 @@
 
 http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6c2acda

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

[Apache Jenkins Server]

See 

Changes:

[htrippaers] Fixup licenses and enfore the license check in this plugin

--
[...truncated 4298 lines...]
[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/jquery-ui/css/jquery-ui.css
[INFO] Exclude: ui/lib/jquery-ui/index.html
[INFO] Exclude: ui/lib/jquery-ui/js/jquery-ui.js
[INFO] Exclude: ui/lib/jquery.cookies.js
[INFO] Exclude: ui/lib/jquery.easing.js
[INFO] Exclude: ui/lib/jquery.js
[INFO] Exclude: ui/lib/jquery.md5.js
[INFO] Exclude: ui/lib/jquery.validate.js
[INFO] Exclude: ui/lib/qunit/qunit.css
[INFO] Exclude: ui/lib/qunit/qunit.js
[INFO] Exclude: ui/lib/reset.css
[INFO] Exclude: ui/lib/require.js
[INFO] Exclude: systemvm/conf/agent.properties
[INFO] Exclude: systemvm/conf/environment.properties
[INFO] Exclude: systemvm/js/jquery.js
[INFO] Exclude: systemvm/patches/debian/systemvm.vmx
[INFO] Exclude: systemvm/patches/debian/config/root/.ssh/authorized_keys
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/httpd.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/ports.conf
[INFO] Exclude: 
systemvm/patches/debian/config/etc/apache2/sites-available/default
[INFO] Exclude: 
systemvm/patches/debian/config/etc/apache2/sites-available/default-ssl
[INFO] Exclude: systemvm/patches/debian/config/etc/apache2/vhostexample.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/dnsmasq.conf.tmpl
[INFO] Exclude: systemvm/patches/debian/config/etc/vpcdnsmasq.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/ssh/sshd_config
[INFO] Exclude: systemvm/patches/debian/config/etc/rsyslog.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/logrotate.conf
[INFO] Exclude: systemvm/patches/debian/config/etc/logrotate.d/*
[INFO] Exclude: systemvm/patches/debian/config/etc/sysctl.conf
[INFO] Exclude: 
systemvm/patches/debian/config/root/redundant_router/keepalived.conf.templ
[INFO] Exclude: 
systemvm/patches/debian/config/root/redundant_router/arping_gateways.sh.templ
[INFO] Exclude: 
systemvm/patches/debian/config/root/redundant_router/conntrackd.conf.templ
[INFO] Exclude: systemvm/patches/debian/vpn/etc/ipsec.conf
[INFO] Exclude: systemvm/patches/de

git commit: updated refs/heads/master to c1aed55

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master 6c2acda5a -> c1aed5558


More rat fixes


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

Branch: refs/heads/master
Commit: c1aed5558365363c07e594300952230a7be9d45f
Parents: 6c2acda
Author: Hugo Trippaers 
Authored: Fri Jul 18 11:52:27 2014 +0200
Committer: Hugo Trippaers 
Committed: Fri Jul 18 11:52:27 2014 +0200

--
 .../DotNet/ServerResource/.nuget/NuGet.targets  | 20 
 .../hypervisors/hyperv/conf/agent.properties| 17 +
 2 files changed, 37 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1aed555/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets
--
diff --git 
a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets 
b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets
index a56da24..b7cd8dd 100644
--- a/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets
+++ b/plugins/hypervisors/hyperv/DotNet/ServerResource/.nuget/NuGet.targets
@@ -1,4 +1,24 @@
 
+
 http://schemas.microsoft.com/developer/msbuild/2003";>
 
 $(MSBuildProjectDirectory)\..\

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c1aed555/plugins/hypervisors/hyperv/conf/agent.properties
--
diff --git a/plugins/hypervisors/hyperv/conf/agent.properties 
b/plugins/hypervisors/hyperv/conf/agent.properties
index 4e61451..fe3798f 100644
--- a/plugins/hypervisors/hyperv/conf/agent.properties
+++ b/plugins/hypervisors/hyperv/conf/agent.properties
@@ -1,3 +1,20 @@
+# 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.
+
 #Storage
 #Tue Feb 12 10:08:17 GMT 2013
 local.storage.path=E\:\\Disks\\Disks

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

[Apache Jenkins Server]

See 

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

[muralireddy]

Repository: cloudstack
Updated Branches:
  refs/heads/master c1aed5558 -> 2f293f42d


CLOUDSTACK-7129: Non-admin user can use deleteNetwork with shared
networks

fix ensures only admin users can delete shared network


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

Branch: refs/heads/master
Commit: 2f293f42d567b1218cb083250707eeffc5324dc3
Parents: c1aed55
Author: Murali Reddy 
Authored: Fri Jul 18 17:51:02 2014 +0530
Committer: Murali Reddy 
Committed: Fri Jul 18 17:52:09 2014 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f293f42/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index c5d7134..b154fd9 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1838,6 +1838,11 @@ public class NetworkServiceImpl extends ManagerBase 
implements  NetworkService {
 
 Account owner = _accountMgr.getAccount(network.getAccountId());
 
+// Only Admin can delete Shared networks
+if (network.getGuestType() == GuestType.Shared && 
!_accountMgr.isAdmin(caller.getId())) {
+throw new InvalidParameterValueException("Only Admins can delete 
network with guest type " + GuestType.Shared);
+}
+
 // Perform permission check
 _accountMgr.checkAccess(caller, null, true, network);
 

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

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4-forward c8ca15b95 -> ec49669f1


CLOUDSTACK-7024: Resolved cleanup issue in test script


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

Branch: refs/heads/4.4-forward
Commit: ec49669f1cf525b207889ae13a8a2b01a0271933
Parents: c8ca15b
Author: Ashutosh K 
Authored: Fri Jul 18 01:14:42 2014 -0400
Committer: Girish Shilamkar 
Committed: Fri Jul 18 02:19:00 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec49669f/test/integration/component/test_project_usage.py
--
diff --git a/test/integration/component/test_project_usage.py 
b/test/integration/component/test_project_usage.py
index 5e0dda5..e8ed1b1 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -720,7 +720,7 @@ class TestTemplateUsage(cloudstackTestCase):
  account=cls.account.name,
  domainid=cls.account.domainid
  )
-cls._cleanup.append(cls.account)
+cls._cleanup.insert(-1, cls.project)
 cls.service_offering = ServiceOffering.create(
 cls.api_client,
 cls.services["service_offering"])

git commit: updated refs/heads/master to 5f87056

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/master 2f293f42d -> 5f87056e9


CLOUDSTACK-7024: Resolved cleanup issue in test script


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

Branch: refs/heads/master
Commit: 5f87056e950e0cae042d0c836f10a091800b8dbc
Parents: 2f293f4
Author: Ashutosh K 
Authored: Fri Jul 18 01:14:42 2014 -0400
Committer: Girish Shilamkar 
Committed: Fri Jul 18 02:31:33 2014 -0400

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f87056e/test/integration/component/test_project_usage.py
--
diff --git a/test/integration/component/test_project_usage.py 
b/test/integration/component/test_project_usage.py
index 5e0dda5..e8ed1b1 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -720,7 +720,7 @@ class TestTemplateUsage(cloudstackTestCase):
  account=cls.account.name,
  domainid=cls.account.domainid
  )
-cls._cleanup.append(cls.account)
+cls._cleanup.insert(-1, cls.project)
 cls.service_offering = ServiceOffering.create(
 cls.api_client,
 cls.services["service_offering"])

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu3 (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 5f87056e950e0cae042d0c836f10a091800b8dbc (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 5f87056e950e0cae042d0c836f10a091800b8dbc
 > git rev-list 5f87056e950e0cae042d0c836f10a091800b8dbc
[cloudstack-rat-master] $ /home/hudson/tools/maven/apache-maven-2.2.1/bin/mvn 
mvn --projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Invalid task 'mvn': you must specify a valid lifecycle phase, or a goal 
in the format plugin:goal or pluginGroupId:pluginArtifactId:pluginVersion:goal
[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 3 seconds
[INFO] Finished at: Fri Jul 18 13:22:23 UTC 2014
[INFO] Final Memory: 16M/177M
[INFO] 
Build step 'Invoke top-level Maven targets' marked build as failure
Archiving artifacts
Sending artifact delta relative to cloudstack-rat-master #5065
Archived 1 artifacts
Archive block size is 32768
Received 17 blocks and 7862 bytes
Compression is 98.6%
Took 52 ms

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

[Apache Jenkins Server]

See 

--
Started by user hugo
Building remotely on ubuntu3 (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 5f87056e950e0cae042d0c836f10a091800b8dbc (origin/master)
 > git config core.sparsecheckout
 > git checkout -f 5f87056e950e0cae042d0c836f10a091800b8dbc
 > git rev-list 5f87056e950e0cae042d0c836f10a091800b8dbc
[cloudstack-rat-master] $ /home/hudson/tools/maven/apache-maven-2.2.1/bin/mvn 
mvn --projects=org.apache.cloudstack:cloudstack 
org.apache.rat:apache-rat-plugin:0.10:check
[INFO] Scanning for projects...
[INFO] 
[ERROR] BUILD FAILURE
[INFO] 
[INFO] Invalid task 'mvn': you must specify a valid lifecycle phase, or a goal 
in the format plugin:goal or pluginGroupId:pluginArtifactId:pluginVersion:goal
[INFO] 
[INFO] For more information, run Maven with the -e switch
[INFO] 
[INFO] Total time: 3 seconds
[INFO] Finished at: Fri Jul 18 13:24:36 UTC 2014
[INFO] Final Memory: 16M/177M
[INFO] 
Build step 'Invoke top-level Maven targets' marked build as failure
Archiving artifacts
Sending artifact delta relative to cloudstack-rat-master #5065
Archived 1 artifacts
Archive block size is 32768
Received 17 blocks and 7862 bytes
Compression is 98.6%
Took 69 ms

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

[Apache Jenkins Server]

See 

git commit: updated refs/heads/master to 24da72f

[girish]

Repository: cloudstack
Updated Branches:
  refs/heads/master 5f87056e9 -> 24da72f37


CLOUDSTACK-7130: Adding BugId to failed test cases


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

Branch: refs/heads/master
Commit: 24da72f37395a6bb612ea1d073db0155289cf000
Parents: 5f87056
Author: Gaurav Aradhye 
Authored: Fri Jul 18 02:52:20 2014 -0400
Committer: Girish Shilamkar 
Committed: Fri Jul 18 04:09:43 2014 -0400

--
 test/integration/smoke/test_volumes.py | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/24da72f3/test/integration/smoke/test_volumes.py
--
diff --git a/test/integration/smoke/test_volumes.py 
b/test/integration/smoke/test_volumes.py
index 7fbcc21..c6c0acc 100644
--- a/test/integration/smoke/test_volumes.py
+++ b/test/integration/smoke/test_volumes.py
@@ -113,7 +113,7 @@ class TestCreateVolume(cloudstackTestCase):
 self.dbclient = self.testClient.getDbConnection()
 self.cleanup = []
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true", BugId="CLOUDSTACK-7130")
 def test_01_create_volume(self):
 """Test Volume creation for all Disk Offerings (incl. custom)
 """
@@ -343,7 +343,7 @@ class TestVolumes(cloudstackTestCase):
 cleanup_resources(self.apiClient, self.cleanup)
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true", BugId="CLOUDSTACK-7130")
 def test_02_attach_volume(self):
 """Attach a created Volume to a Running VM
 """
@@ -389,7 +389,7 @@ class TestVolumes(cloudstackTestCase):
 (self.virtual_machine.ipaddress, e))
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false", BugId="CLOUDSTACK-7130")
 def test_03_download_attached_volume(self):
 """Download a Volume attached to a VM
 """
@@ -411,7 +411,7 @@ class TestVolumes(cloudstackTestCase):
 with self.assertRaises(Exception):
 self.apiClient.extractVolume(cmd)
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false", BugId="CLOUDSTACK-7130")
 def test_04_delete_attached_volume(self):
 """Delete a Volume attached to a VM
 """
@@ -432,7 +432,7 @@ class TestVolumes(cloudstackTestCase):
 with self.assertRaises(Exception):
 self.apiClient.deleteVolume(cmd)
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="false", BugId="CLOUDSTACK-7130")
 def test_05_detach_volume(self):
 """Detach a Volume attached to a VM
 """
@@ -474,7 +474,7 @@ class TestVolumes(cloudstackTestCase):
  )
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true", BugId="CLOUDSTACK-7130")
 def test_06_download_detached_volume(self):
 """Download a Volume unattached to an VM
 """
@@ -511,7 +511,7 @@ class TestVolumes(cloudstackTestCase):
 % (extract_vol.url, self.volume.id)
 )
 
-@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true")
+@attr(tags = ["advanced", "advancedns", "smoke", "basic"], 
required_hardware="true", BugId="CLOUDSTACK-7130")
 def test_07_resize_fail(self):
 """Test resize (negative) non-existent volume"""
 # Verify the size is the new size is what we wanted it to be.
@@ -729,7 +729,7 @@ class TestVolumes(cloudstackTestCase):
 time.sleep(30)
 return
 
-@attr(tags = ["advanced", "advancedns", "smoke","basic"], 
required_hardware="false")
+@attr(tags = ["advanced", "advancedns", "smoke","basic"], 
required_hardware="false", BugId="CLOUDSTACK-7130")
 def test_09_delete_detached_volume(self):
 """Delete a Volume unattached to an VM
 """

git commit: updated refs/heads/master to 9fb93fe

[edison]

Repository: cloudstack
Updated Branches:
  refs/heads/master 24da72f37 -> 9fb93fe5b


CLOUDSTACK-7110: introduced by c1116142a3cd356e1e8da5404be150a07752b5d5, if 
it's a data volume, mgt server doesn't send image format to agent


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

Branch: refs/heads/master
Commit: 9fb93fe5b3d330d75cc5a58613beea92e9138372
Parents: 24da72f
Author: Edison Su 
Authored: Fri Jul 18 12:03:10 2014 -0700
Committer: Edison Su 
Committed: Fri Jul 18 12:03:10 2014 -0700

--
 .../kvm/storage/KVMStorageProcessor.java| 36 
 1 file changed, 22 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9fb93fe5/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
index 22575ee..9b1c9de 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStorageProcessor.java
@@ -351,7 +351,7 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 
 return new CopyCmdAnswer(newVol);
 } catch (CloudRuntimeException e) {
-s_logger.debug("Failed to create volume: " + e.toString());
+s_logger.debug("Failed to create volume: ", e);
 return new CopyCmdAnswer(e.toString());
 }
 }
@@ -403,6 +403,7 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 newVol.setPath(volumeName);
 return new CopyCmdAnswer(newVol);
 } catch (CloudRuntimeException e) {
+s_logger.debug("Failed to ccopyVolumeFromImageCacheToPrimary: ", 
e);
 return new CopyCmdAnswer(e.toString());
 } finally {
 if (secondaryStoragePool != null) {
@@ -448,6 +449,7 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 newVol.setFormat(destFormat);
 return new CopyCmdAnswer(newVol);
 } catch (CloudRuntimeException e) {
+s_logger.debug("Failed to copyVolumeFromPrimaryToSecondary: ", e);
 return new CopyCmdAnswer(e.toString());
 } finally {
 if (secondaryStoragePool != null) {
@@ -554,7 +556,7 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 newTemplate.setName(templateName);
 return new CopyCmdAnswer(newTemplate);
 } catch (Exception e) {
-s_logger.debug("Failed to create template from volume: " + 
e.toString());
+s_logger.debug("Failed to createTemplateFromVolume: ", e);
 return new CopyCmdAnswer(e.toString());
 } finally {
 if (secondaryStorage != null) {
@@ -754,10 +756,10 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 newSnapshot.setPhysicalSize(size);
 return new CopyCmdAnswer(newSnapshot);
 } catch (LibvirtException e) {
-s_logger.debug("Failed to backup snapshot: " + e.toString());
+s_logger.debug("Failed to backup snapshot: ", e);
 return new CopyCmdAnswer(e.toString());
 } catch (CloudRuntimeException e) {
-s_logger.debug("Failed to backup snapshot: " + e.toString());
+s_logger.debug("Failed to backup snapshot: ", e);
 return new CopyCmdAnswer(e.toString());
 } finally {
 try {
@@ -1008,11 +1010,11 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 
 return new AttachAnswer(disk);
 } catch (LibvirtException e) {
-s_logger.debug("Failed to attach volume: " + vol.getPath() + ", 
due to " + e.toString());
+s_logger.debug("Failed to attach volume: " + vol.getPath() + ", 
due to ", e);
 storagePoolMgr.disconnectPhysicalDisk(primaryStore.getPoolType(), 
primaryStore.getUuid(), vol.getPath());
 return new AttachAnswer(e.toString());
 } catch (InternalErrorException e) {
-s_logger.debug("Failed to attach volume: " + vol.getPath() + ", 
due to " + e.toString());
+s_logger.debug("Failed to attach volume: " + vol.getPath() + ", 
due to ", e);
 return new AttachAnswer(e.toString());
 }
 }
@@ -1034,10 +1036,10 @@ public class KVMStorageProcessor implements 
StorageProcessor {
 
 r

git commit: updated refs/heads/master to 51c1410

[edison]

Repository: cloudstack
Updated Branches:
  refs/heads/master 9fb93fe5b -> 51c14106d


CLOUDSTACK-7123: set the timeout to 60s, when run the file command


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

Branch: refs/heads/master
Commit: 51c14106d8858769ac8f3cc0d8f3f357254c0509
Parents: 9fb93fe
Author: Edison Su 
Authored: Fri Jul 18 12:07:36 2014 -0700
Committer: Edison Su 
Committed: Fri Jul 18 12:07:36 2014 -0700

--
 utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/51c14106/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
--
diff --git a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java 
b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
index bad94de..a3f3a68 100644
--- a/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/template/TemplateUtils.java
@@ -34,7 +34,7 @@ public class TemplateUtils {
 if (isCompressedExtension(url)) {
 command = "file -z ";
 }
-String output = Script.runSimpleBashScript(command + path + " | cut 
-d: -f2", 1000);
+String output = Script.runSimpleBashScript(command + path + " | cut 
-d: -f2", 6);
 
 // vmdk
 if ((output.contains("VMware") || output.contains("data")) && 
isCorrectExtension(url, "vmdk")) {

git commit: updated refs/heads/master to cfcc4a0

[amoghvk]

Repository: cloudstack
Updated Branches:
  refs/heads/master 51c14106d -> cfcc4a076


CLOUDSTACK-6358: KVM mappings for CentOS 6.x and RHEL 6.x


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

Branch: refs/heads/master
Commit: cfcc4a076dd740d6deed48084132946a55ed08d1
Parents: 51c1410
Author: amoghvk 
Authored: Thu Jul 17 14:16:35 2014 -0700
Committer: amoghvk 
Committed: Fri Jul 18 15:10:10 2014 -0700

--
 server/src/com/cloud/hypervisor/KVMGuru.java |  2 +-
 setup/db/db/schema-430to440.sql  | 78 ---
 2 files changed, 57 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfcc4a07/server/src/com/cloud/hypervisor/KVMGuru.java
--
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java 
b/server/src/com/cloud/hypervisor/KVMGuru.java
index 287b0d2..80279ad 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -62,7 +62,7 @@ public class KVMGuru extends HypervisorGuruBase implements 
HypervisorGuru {
 HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
 GuestOSHypervisorVO guestOsMapping = 
_guestOsHypervisorDao.findByOsIdAndHypervisor(guestOS.getId(), 
getHypervisorType().toString(), host.getHypervisorVersion());
 if (guestOsMapping == null) {
-to.setPlatformEmulator(null);
+to.setPlatformEmulator("Other");
 } else {
 to.setPlatformEmulator(guestOsMapping.getGuestOsName());
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/cfcc4a07/setup/db/db/schema-430to440.sql
--
diff --git a/setup/db/db/schema-430to440.sql b/setup/db/db/schema-430to440.sql
index 607c506..cff38d0 100644
--- a/setup/db/db/schema-430to440.sql
+++ b/setup/db/db/schema-430to440.sql
@@ -1689,6 +1689,62 @@ CREATE TABLE `cloud`.`network_acl_item_cidrs` (
 ALTER TABLE `cloud`.`load_balancer_healthcheck_policies` ADD COLUMN `display` 
tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the policy can be displayed to 
the end user';
 ALTER TABLE `cloud`.`load_balancer_stickiness_policies` ADD COLUMN `display` 
tinyint(1) NOT NULL DEFAULT '1' COMMENT 'True if the policy can be displayed to 
the end user';
 
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.6', 141, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.6', 142, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.7', 161, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.7', 162, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.8', 173, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.8', 174, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.9', 175, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 5.9', 176, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 6.0', 143, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 
VALUES (UUID(),'KVM', 'default', 'CentOS 6.0', 144, now(), 0);
+INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` (uuid,hypervisor_type, 
hypervisor_version, guest_os_name, guest_os_id, created, is_user_defined) 

git commit: updated refs/heads/master to 1bb3ea8

[edison]

Repository: cloudstack
Updated Branches:
  refs/heads/master cfcc4a076 -> 1bb3ea8b7


CLOUDSTACK-6918: iterate through pending works in cancel maitenance


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

Branch: refs/heads/master
Commit: 1bb3ea8b7a7447e2ad444b403facbcee67ffde4f
Parents: cfcc4a0
Author: Edison Su 
Authored: Fri Jul 18 15:38:59 2014 -0700
Committer: Edison Su 
Committed: Fri Jul 18 15:39:30 2014 -0700

--
 server/src/com/cloud/storage/StoragePoolAutomationImpl.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1bb3ea8b/server/src/com/cloud/storage/StoragePoolAutomationImpl.java
--
diff --git a/server/src/com/cloud/storage/StoragePoolAutomationImpl.java 
b/server/src/com/cloud/storage/StoragePoolAutomationImpl.java
index 8ff759d..59bd2a5 100644
--- a/server/src/com/cloud/storage/StoragePoolAutomationImpl.java
+++ b/server/src/com/cloud/storage/StoragePoolAutomationImpl.java
@@ -372,7 +372,6 @@ public class StoragePoolAutomationImpl implements 
StoragePoolAutomation {
 _storagePoolWorkDao.update(work.getId(), work);
 }
 }
-return true;
 } catch (Exception e) {
 s_logger.debug("Failed start vm", e);
 throw new CloudRuntimeException(e.toString());

git commit: updated refs/heads/master to 849049a

[mlsorensen]

Repository: cloudstack
Updated Branches:
  refs/heads/master 1bb3ea8b7 -> 849049a2f


KVM: Allow changing VM video card via agent.properties. This change in
LibvirtVMDef can also be leveraged to add the option to service offering
or template hardware selection (as nic and disk types do).


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

Branch: refs/heads/master
Commit: 849049a2f0eac8f889dbb96bd77ea569e8901a48
Parents: 1bb3ea8
Author: Marcus Sorensen 
Authored: Fri Jul 18 16:40:09 2014 -0600
Committer: Marcus Sorensen 
Committed: Fri Jul 18 16:52:51 2014 -0600

--
 .../kvm/resource/LibvirtComputingResource.java  | 10 +
 .../hypervisor/kvm/resource/LibvirtVMDef.java   | 22 
 2 files changed, 32 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849049a2/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 2ebab78..627c1fd 100755
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -230,6 +230,7 @@ import 
com.cloud.hypervisor.kvm.resource.LibvirtVMDef.InterfaceDef.guestNetType;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.SerialDef;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.TermPolicy;
 import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VirtioSerialDef;
+import com.cloud.hypervisor.kvm.resource.LibvirtVMDef.VideoDef;
 import com.cloud.hypervisor.kvm.storage.KVMPhysicalDisk;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePool;
 import com.cloud.hypervisor.kvm.storage.KVMStoragePoolManager;
@@ -450,6 +451,8 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 protected String _guestCpuMode;
 protected String _guestCpuModel;
 protected boolean _noKvmClock;
+protected String _videoHw;
+protected int _videoRam;
 private final Map  _pifs = new HashMap();
 private final Map _vmStats = new 
ConcurrentHashMap();
 
@@ -800,6 +803,10 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 _noMemBalloon = true;
 }
 
+_videoHw = (String) params.get("vm.video.hardware");
+value = (String) params.get("vm.video.ram");
+_videoRam = NumbersUtil.parseInt(value, 0);
+
 value = (String)params.get("host.reserved.mem.mb");
 _dom0MinMem = NumbersUtil.parseInt(value, 0) * 1024 * 1024;
 
@@ -3747,6 +3754,9 @@ public class LibvirtComputingResource extends 
ServerResourceBase implements Serv
 devices.addDevice(vserial);
 }
 
+VideoDef videoCard = new VideoDef(_videoHw, _videoRam);
+devices.addDevice(videoCard);
+
 ConsoleDef console = new ConsoleDef("pty", null, null, (short)0);
 devices.addDevice(console);
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/849049a2/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
index 8084035..6b29e9c 100644
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java
@@ -1060,6 +1060,28 @@ public class LibvirtVMDef {
 }
 }
 
+public static class VideoDef {
+private String _videoModel;
+private int _videoRam;
+
+public VideoDef(String videoModel, int videoRam) {
+_videoModel = videoModel;
+_videoRam = videoRam;
+}
+
+@Override
+public String toString() {
+StringBuilder videoBuilder = new StringBuilder();
+if (_videoModel != null && !_videoModel.isEmpty() && _videoRam != 
0){
+videoBuilder.append("\n");
+videoBuilder.append("\n");
+videoBuilder.append("\n");
+return videoBuilder.toString();
+}
+return "";
+}
+}
+
 public static class VirtioSerialDef {
 private final String _name;
 priv

git commit: updated refs/heads/master to d05549e

[anthonyxu]

Repository: cloudstack
Updated Branches:
  refs/heads/master 849049a2f -> d05549e16


XS task object may disappear, change the log level


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

Branch: refs/heads/master
Commit: d05549e16b9b892a52d64d6915770f804b019a05
Parents: 849049a
Author: Anthony Xu 
Authored: Fri Jul 18 16:05:54 2014 -0700
Committer: Anthony Xu 
Committed: Fri Jul 18 16:05:54 2014 -0700

--
 .../hypervisor/xenserver/resource/CitrixResourceBase.java   | 9 -
 1 file changed, 4 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d05549e1/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
index 5881d68..a2b9625 100644
--- 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
+++ 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java
@@ -676,8 +676,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 try {
 task.destroy(conn);
 } catch (Exception e1) {
-s_logger.warn("unable to destroy task(" + task.toString()
-+ ") on host(" + _host.uuid + ") due to ", e1);
+s_logger.debug("unable to destroy task(" + task.toString() 
+ ") on host(" + _host.uuid + ") due to " +  e1.toString());
 }
 }
 }
@@ -3502,8 +3501,8 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 if (task != null) {
 try {
 task.destroy(conn);
-} catch (Exception e1) {
-s_logger.warn("unable to destroy task(" + task.toString() 
+ ") on host(" + _host.uuid + ") due to ", e1);
+} catch (Exception e) {
+s_logger.debug("unable to destroy task(" + task.toString() 
+ ") on host(" + _host.uuid + ") due to " + e.toString());
 }
 }
 }
@@ -3542,7 +3541,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 try {
 task.destroy(conn);
 } catch (Exception e1) {
-s_logger.warn("unable to destroy task(" + task.toString() 
+ ") on host(" + _host.uuid + ") due to ", e1);
+s_logger.debug("unable to destroy task(" + task.toString() 
+ ") on host(" + _host.uuid + ") due to " + e1.toString());
 }
 }
 }

git commit: updated refs/heads/4.4 to 5ad2b4f

[frankzhang]

Repository: cloudstack
Updated Branches:
  refs/heads/4.4 72a62403d -> 5ad2b4fed


fix iptables chain name too long (must be under 30 chars)


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

Branch: refs/heads/4.4
Commit: 5ad2b4feda7f188550eb2c7acc31812621e646c9
Parents: 72a6240
Author: Frank.Zhang 
Authored: Fri Jul 18 17:30:18 2014 -0700
Committer: Frank.Zhang 
Committed: Fri Jul 18 17:30:18 2014 -0700

--
 scripts/vm/hypervisor/xenserver/vmops  |   12 +-
 scripts/vm/hypervisor/xenserver/vmops.orig | 1495 +++
 2 files changed, 1505 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ad2b4fe/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index 3f25a2e..04dfb5d 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -250,6 +250,8 @@ def chain_name(vm_name):
 if vm_name.startswith('i-') or vm_name.startswith('r-'):
 if vm_name.endswith('untagged'):
 return '-'.join(vm_name.split('-')[:-1])
+if len(vm_name) > 28:
+vm_name = vm_name[0:27]
 return vm_name
 
 def chain_name_def(vm_name):
@@ -257,11 +259,17 @@ def chain_name_def(vm_name):
 if vm_name.endswith('untagged'):
 return '-'.join(vm_name.split('-')[:-2]) + "-def"
 return '-'.join(vm_name.split('-')[:-1]) + "-def"
+
+if len(vm_name) > 28:
+vm_name = vm_name[0:27]
 return vm_name
   
 def egress_chain_name(vm_name):
-return chain_name(vm_name) + "-eg"
-  
+name = chain_name(vm_name) + "-eg"
+if len(name) > 28:
+name = name[0:27]
+return name
+
 @echo
 def can_bridge_firewall(session, args):
 try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5ad2b4fe/scripts/vm/hypervisor/xenserver/vmops.orig
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops.orig 
b/scripts/vm/hypervisor/xenserver/vmops.orig
new file mode 100755
index 000..3f25a2e
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/vmops.orig
@@ -0,0 +1,1495 @@
+#!/usr/bin/python
+# 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.
+
+# Version @VERSION@
+#
+# A plugin for executing script needed by vmops cloud 
+
+import os, sys, time
+import XenAPIPlugin
+if os.path.exists("/opt/xensource/sm"):
+sys.path.extend(["/opt/xensource/sm/", "/usr/local/sbin/", "/sbin/"])
+if os.path.exists("/usr/lib/xcp/sm"):
+sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
+import base64
+import socket
+import stat
+import tempfile
+import util
+import subprocess
+import zlib
+import cloudstack_pluginlib as lib
+import logging
+from util import CommandException
+
+lib.setup_logging("/var/log/cloud/vmops.log")
+
+def echo(fn):
+def wrapped(*v, **k):
+name = fn.__name__
+logging.debug(" VMOPS enter  %s " % name )
+res = fn(*v, **k)
+logging.debug(" VMOPS exit  %s " % name )
+return res
+return wrapped
+
+@echo
+def add_to_VCPUs_params_live(session, args):
+key = args['key']
+value = args['value']
+vmname = args['vmname']
+try:
+cmd = ["bash", "/opt/cloud/bin/add_to_vcpus_params_live.sh", vmname, 
key, value]
+txt = util.pread2(cmd)
+except:
+return 'false'
+return 'true'
+
+@echo
+def setup_iscsi(session, args):
+   uuid=args['uuid']
+   try:
+   cmd = ["bash", "/opt/cloud/bin/setup_iscsi.sh", uuid]
+   txt = util.pread2(cmd)
+   except:
+   txt = ''
+   return txt
+ 
+
+@echo
+def getgateway(session, args):
+mgmt_ip = args['mgmtIP']
+try:
+cmd = ["bash", "/opt/cloud/bin/network_info.sh", "-g", mgmt_ip]
+txt

git commit: updated refs/heads/master to 88f8666

[frankzhang]

Repository: cloudstack
Updated Branches:
  refs/heads/master d05549e16 -> 88f866645


fix iptables chain name too long (must be under 30 chars)


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

Branch: refs/heads/master
Commit: 88f866645b1aa3f373691a43586f2aa56150b0c3
Parents: d05549e
Author: Frank.Zhang 
Authored: Fri Jul 18 17:30:18 2014 -0700
Committer: Frank.Zhang 
Committed: Fri Jul 18 17:31:06 2014 -0700

--
 scripts/vm/hypervisor/xenserver/vmops  |   12 +-
 scripts/vm/hypervisor/xenserver/vmops.orig | 1495 +++
 2 files changed, 1505 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88f86664/scripts/vm/hypervisor/xenserver/vmops
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops 
b/scripts/vm/hypervisor/xenserver/vmops
index 2fd0619..539d7de 100755
--- a/scripts/vm/hypervisor/xenserver/vmops
+++ b/scripts/vm/hypervisor/xenserver/vmops
@@ -250,6 +250,8 @@ def chain_name(vm_name):
 if vm_name.startswith('i-') or vm_name.startswith('r-'):
 if vm_name.endswith('untagged'):
 return '-'.join(vm_name.split('-')[:-1])
+if len(vm_name) > 28:
+vm_name = vm_name[0:27]
 return vm_name
 
 def chain_name_def(vm_name):
@@ -257,11 +259,17 @@ def chain_name_def(vm_name):
 if vm_name.endswith('untagged'):
 return '-'.join(vm_name.split('-')[:-2]) + "-def"
 return '-'.join(vm_name.split('-')[:-1]) + "-def"
+
+if len(vm_name) > 28:
+vm_name = vm_name[0:27]
 return vm_name
   
 def egress_chain_name(vm_name):
-return chain_name(vm_name) + "-eg"
-  
+name = chain_name(vm_name) + "-eg"
+if len(name) > 28:
+name = name[0:27]
+return name
+
 @echo
 def can_bridge_firewall(session, args):
 try:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/88f86664/scripts/vm/hypervisor/xenserver/vmops.orig
--
diff --git a/scripts/vm/hypervisor/xenserver/vmops.orig 
b/scripts/vm/hypervisor/xenserver/vmops.orig
new file mode 100755
index 000..3f25a2e
--- /dev/null
+++ b/scripts/vm/hypervisor/xenserver/vmops.orig
@@ -0,0 +1,1495 @@
+#!/usr/bin/python
+# 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.
+
+# Version @VERSION@
+#
+# A plugin for executing script needed by vmops cloud 
+
+import os, sys, time
+import XenAPIPlugin
+if os.path.exists("/opt/xensource/sm"):
+sys.path.extend(["/opt/xensource/sm/", "/usr/local/sbin/", "/sbin/"])
+if os.path.exists("/usr/lib/xcp/sm"):
+sys.path.extend(["/usr/lib/xcp/sm/", "/usr/local/sbin/", "/sbin/"])
+import base64
+import socket
+import stat
+import tempfile
+import util
+import subprocess
+import zlib
+import cloudstack_pluginlib as lib
+import logging
+from util import CommandException
+
+lib.setup_logging("/var/log/cloud/vmops.log")
+
+def echo(fn):
+def wrapped(*v, **k):
+name = fn.__name__
+logging.debug(" VMOPS enter  %s " % name )
+res = fn(*v, **k)
+logging.debug(" VMOPS exit  %s " % name )
+return res
+return wrapped
+
+@echo
+def add_to_VCPUs_params_live(session, args):
+key = args['key']
+value = args['value']
+vmname = args['vmname']
+try:
+cmd = ["bash", "/opt/cloud/bin/add_to_vcpus_params_live.sh", vmname, 
key, value]
+txt = util.pread2(cmd)
+except:
+return 'false'
+return 'true'
+
+@echo
+def setup_iscsi(session, args):
+   uuid=args['uuid']
+   try:
+   cmd = ["bash", "/opt/cloud/bin/setup_iscsi.sh", uuid]
+   txt = util.pread2(cmd)
+   except:
+   txt = ''
+   return txt
+ 
+
+@echo
+def getgateway(session, args):
+mgmt_ip = args['mgmtIP']
+try:
+cmd = ["bash", "/opt/cloud/bin/network_info.sh", "-g", mgmt_ip]
+ 

git commit: updated refs/heads/master to 08d7b46

[mtutkowski]

Repository: cloudstack
Updated Branches:
  refs/heads/master 88f866645 -> 08d7b46be


Update to volume-resize logic


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

Branch: refs/heads/master
Commit: 08d7b46be748794773df1f549d3b3dc98068861f
Parents: 88f8666
Author: Mike Tutkowski 
Authored: Fri Jul 18 12:02:52 2014 -0600
Committer: Mike Tutkowski 
Committed: Sat Jul 19 00:42:04 2014 -0600

--
 .../driver/SolidFirePrimaryDataStoreDriver.java |  2 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java | 24 
 2 files changed, 20 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08d7b46b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
--
diff --git 
a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
 
b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
index 5a23fcf..2228c59 100644
--- 
a/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
+++ 
b/plugins/storage/volume/solidfire/src/org/apache/cloudstack/storage/datastore/driver/SolidFirePrimaryDataStoreDriver.java
@@ -423,7 +423,7 @@ public class SolidFirePrimaryDataStoreDriver implements 
PrimaryDataStoreDriver {
 SolidFireUtil.modifySolidFireVolume(sfConnection, sfVolumeId, 
sfVolume.getTotalSize(), payload.newMinIops, payload.newMaxIops,
 getDefaultBurstIops(storagePoolId, payload.newMaxIops));
 
-VolumeVO volume = _volumeDao.findById(sfVolumeId);
+VolumeVO volume = _volumeDao.findById(volumeInfo.getId());
 
 volume.setMinIops(payload.newMinIops);
 volume.setMaxIops(payload.newMaxIops);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08d7b46b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
--
diff --git a/server/src/com/cloud/storage/VolumeApiServiceImpl.java 
b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
index 49cb520..64d6bc0 100644
--- a/server/src/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/com/cloud/storage/VolumeApiServiceImpl.java
@@ -733,12 +733,12 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
 DiskOfferingVO diskOffering = 
_diskOfferingDao.findById(volume.getDiskOfferingId());
 DiskOfferingVO newDiskOffering = 
_diskOfferingDao.findById(cmd.getNewDiskOfferingId());
 
-/* Only works for KVM/XenServer/VMware for now, and volumes with 
'None' since they're just allocated in DB */
+/* Only works for KVM/XenServer/VMware (or "Any") for now, and volumes 
with 'None' since they're just allocated in DB */
 
 HypervisorType hypervisorType = 
_volsDao.getHypervisorType(volume.getId());
 
 if (hypervisorType != HypervisorType.KVM && hypervisorType != 
HypervisorType.XenServer &&
-hypervisorType != HypervisorType.VMware && hypervisorType != 
HypervisorType.None) {
+hypervisorType != HypervisorType.VMware && hypervisorType != 
HypervisorType.Any && hypervisorType != HypervisorType.None) {
 throw new InvalidParameterValueException("CloudStack currently 
only supports volumes marked as the KVM, VMware, or XenServer hypervisor type 
for resize.");
 }
 
@@ -808,6 +808,10 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
 throw new InvalidParameterValueException("There are no tags on 
the current disk offering. The new disk offering needs to have no tags, as 
well.");
 }
 
+if (!areIntegersEqual(diskOffering.getHypervisorSnapshotReserve(), 
newDiskOffering.getHypervisorSnapshotReserve())) {
+throw new InvalidParameterValueException("The hypervisor 
snapshot reverse on the new and old disk offerings must be equal.");
+}
+
 if (newDiskOffering.getDomainId() != null) {
 // not a public offering; check access
 
_configMgr.checkDiskOfferingAccess(CallContext.current().getCallingAccount(), 
newDiskOffering);
@@ -945,6 +949,18 @@ public class VolumeApiServiceImpl extends ManagerBase 
implements VolumeApiServic
 newDiskOffering != null ? cmd.getNewDiskOfferingId() : null, 
shrinkOk);
 }
 
+private static boolean areIntegersEqu