git commit: updated refs/heads/master to ec32ea3

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master 84c44b631 - ec32ea30f


Housekeeping, properly declare required maven version and update build plugin 
versions to recent versions


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

Branch: refs/heads/master
Commit: ec32ea30f7b3e5351e661786955d9fa0929047bd
Parents: 84c44b6
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 11:58:58 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 11:58:58 2015 +0100

--
 plugins/hypervisors/hyperv/pom.xml   |  3 --
 plugins/user-authenticators/ldap/pom.xml |  2 +-
 pom.xml  | 40 ++-
 tools/checkstyle/pom.xml |  8 +-
 4 files changed, 35 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/hypervisors/hyperv/pom.xml
--
diff --git a/plugins/hypervisors/hyperv/pom.xml 
b/plugins/hypervisors/hyperv/pom.xml
index 9e658f6..e09fb43 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -70,7 +70,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 configuration
   executablejava/executable
   mainClasscom.cloud.agent.AgentShell/mainClass
@@ -124,7 +123,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 executions
   execution
 phasecompile/phase
@@ -144,7 +142,6 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-surefire-plugin/artifactId
-version2.12/version
 configuration
 excludes
   excludenone/exclude

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/user-authenticators/ldap/pom.xml
--
diff --git a/plugins/user-authenticators/ldap/pom.xml 
b/plugins/user-authenticators/ldap/pom.xml
index 22cdeb7..d24a5be 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
   plugin
 groupIdorg.codehaus.gmaven/groupId
 artifactIdgmaven-plugin/artifactId
-version1.3/version
+version1.5/version
 configuration
   providerSelection1.7/providerSelection
 /configuration

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e63769e..d3694bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,10 @@
 systemjira/system
 urlhttps://issues.apache.org/jira/browse/CLOUDSTACK/url
   /issueManagement
+  
+  prerequisites
+maven3.0.4/maven
+  /prerequisites
 
   properties
 cs.jdk.version1.7/cs.jdk.version
@@ -92,10 +96,10 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.11/cs.checkstyle.version
-cs.mycila.license.version2.5/cs.mycila.license.version
-cs.findbugs.version2.5.3/cs.findbugs.version
-cs.javadoc.version2.9.1/cs.javadoc.version
+cs.checkstyle.version2.13/cs.checkstyle.version
+cs.mycila.license.version2.7/cs.mycila.license.version
+cs.findbugs.version3.0.0/cs.findbugs.version
+cs.javadoc.version2.10.1/cs.javadoc.version
 cs.opensaml.version2.6.1/cs.opensaml.version
   /properties
 
@@ -612,7 +616,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-release-plugin/artifactId
-  version2.2.1/version
+  version2.5.1/version
   executions
 execution
   iddefault/id
@@ -695,12 +699,12 @@
 plugin
   groupIdorg.apache.tomcat.maven/groupId
   artifactIdtomcat7-maven-plugin/artifactId
-  version2.0/version
+  version2.2/version
 /plugin
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-antrun-plugin/artifactId
-  version1.7/version
+  version1.8/version
 /plugin
 plugin
   groupIdorg.apache.rat/groupId
@@ -837,7 +841,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-compiler-plugin/artifactId
-  version2.5.1/version
+ 

git commit: updated refs/heads/master to eb9fba4

[hugo]

Repository: cloudstack
Updated Branches:
  refs/heads/master ec32ea30f - eb9fba4fe


Seems we are hitting bug MCHECKSTYLE-250


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

Branch: refs/heads/master
Commit: eb9fba4feaded3cb18e64e44f7d601e82653f39b
Parents: ec32ea3
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 14:03:34 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 14:03:34 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb9fba4f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d3694bc..66fe7f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.13/cs.checkstyle.version
+cs.checkstyle.version2.11/cs.checkstyle.version
 cs.mycila.license.version2.7/cs.mycila.license.version
 cs.findbugs.version3.0.0/cs.findbugs.version
 cs.javadoc.version2.10.1/cs.javadoc.version

git commit: updated refs/heads/master to e8a54f4

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master eb9fba4fe - e8a54f471


CID-1114606 use of MAX_VALUE and longValue() on Integer


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

Branch: refs/heads/master
Commit: e8a54f471c3c2b8c0dc7bc0105646456ad7c317a
Parents: eb9fba4
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 16:24:29 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 16:24:29 2015 +0100

--
 .../cloud/configuration/ConfigurationManagerImpl.java   | 12 ++--
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a54f47/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 3d5214d..d1a0887 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2020,14 +2020,14 @@ public class ConfigurationManagerImpl extends 
ManagerBase implements Configurati
 }
 }
 
-if ((cpuNumber != null)  ((cpuNumber.intValue() = 0) || 
(cpuNumber.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu number value between 1 and 2147483647);
+if ((cpuNumber != null)  ((cpuNumber.intValue() = 0) || 
(cpuNumber.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu number value between 1 and  + 
Integer.MAX_VALUE);
 }
-if ((cpuSpeed != null)  ((cpuSpeed.intValue()  0) || 
(cpuSpeed.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu speed value between 1 and 2147483647);
+if ((cpuSpeed != null)  ((cpuSpeed.intValue()  0) || 
(cpuSpeed.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu speed value between 0 and  + 
Integer.MAX_VALUE);
 }
-if ((memory != null)  ((memory.intValue()  32) || 
(memory.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the memory value between 32 and 2147483647 MB);
+if ((memory != null)  ((memory.intValue()  32) || 
(memory.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the memory value between 32 and  + 
Integer.MAX_VALUE +  MB);
 }
 
 // check if valid domain

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a54f47/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 605306e..170c612 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -882,7 +882,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (serviceOffering.getCpu() == null) {
 String cpuNumber = 
customParameters.get(UsageEventVO.DynamicParameters.cpuNumber.name());
 if ((cpuNumber == null) || (NumbersUtil.parseInt(cpuNumber, 
-1) = 0)) {
-throw new InvalidParameterValueException(Invalid cpu 
cores value, specify a value between 1 and 2147483647);
+throw new InvalidParameterValueException(Invalid cpu 
cores value, specify a value between 1 and  + Integer.MAX_VALUE);
 }
 } else if 
(customParameters.containsKey(UsageEventVO.DynamicParameters.cpuNumber.name())) 
{
 throw new InvalidParameterValueException(The cpu cores of 
this offering id: + serviceOffering.getId()
@@ -892,7 +892,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (serviceOffering.getSpeed() == null) {
 String cpuSpeed = 
customParameters.get(UsageEventVO.DynamicParameters.cpuSpeed.name());
 if ((cpuSpeed == null) || (NumbersUtil.parseInt(cpuSpeed, -1) 
= 0)) {
- 

Git Push Summary

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader [created] 2c9cc1ecd

[4/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

CID-1114606 use of MAX_VALUE and longValue() on Integer


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

Branch: refs/heads/ui-template-uploader
Commit: e8a54f471c3c2b8c0dc7bc0105646456ad7c317a
Parents: eb9fba4
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 16:24:29 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 16:24:29 2015 +0100

--
 .../cloud/configuration/ConfigurationManagerImpl.java   | 12 ++--
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a54f47/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
--
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java 
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 3d5214d..d1a0887 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -2020,14 +2020,14 @@ public class ConfigurationManagerImpl extends 
ManagerBase implements Configurati
 }
 }
 
-if ((cpuNumber != null)  ((cpuNumber.intValue() = 0) || 
(cpuNumber.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu number value between 1 and 2147483647);
+if ((cpuNumber != null)  ((cpuNumber.intValue() = 0) || 
(cpuNumber.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu number value between 1 and  + 
Integer.MAX_VALUE);
 }
-if ((cpuSpeed != null)  ((cpuSpeed.intValue()  0) || 
(cpuSpeed.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu speed value between 1 and 2147483647);
+if ((cpuSpeed != null)  ((cpuSpeed.intValue()  0) || 
(cpuSpeed.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the cpu speed value between 0 and  + 
Integer.MAX_VALUE);
 }
-if ((memory != null)  ((memory.intValue()  32) || 
(memory.intValue()  2147483647))) {
-throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the memory value between 32 and 2147483647 MB);
+if ((memory != null)  ((memory.intValue()  32) || 
(memory.longValue()  Integer.MAX_VALUE))) {
+throw new InvalidParameterValueException(Failed to create service 
offering  + name + : specify the memory value between 32 and  + 
Integer.MAX_VALUE +  MB);
 }
 
 // check if valid domain

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e8a54f47/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 605306e..170c612 100644
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -882,7 +882,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (serviceOffering.getCpu() == null) {
 String cpuNumber = 
customParameters.get(UsageEventVO.DynamicParameters.cpuNumber.name());
 if ((cpuNumber == null) || (NumbersUtil.parseInt(cpuNumber, 
-1) = 0)) {
-throw new InvalidParameterValueException(Invalid cpu 
cores value, specify a value between 1 and 2147483647);
+throw new InvalidParameterValueException(Invalid cpu 
cores value, specify a value between 1 and  + Integer.MAX_VALUE);
 }
 } else if 
(customParameters.containsKey(UsageEventVO.DynamicParameters.cpuNumber.name())) 
{
 throw new InvalidParameterValueException(The cpu cores of 
this offering id: + serviceOffering.getId()
@@ -892,7 +892,7 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Vir
 if (serviceOffering.getSpeed() == null) {
 String cpuSpeed = 
customParameters.get(UsageEventVO.DynamicParameters.cpuSpeed.name());
 if ((cpuSpeed == null) || (NumbersUtil.parseInt(cpuSpeed, -1) 
= 0)) {
-throw new InvalidParameterValueException(Invalid cpu 
speed 

[5/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

CID-1114613 dead code removed


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

Branch: refs/heads/ui-template-uploader
Commit: 682c3af710ef002d49153f6e8b9db273378ab78d
Parents: e8a54f4
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 16:38:41 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 16:38:41 2015 +0100

--
 .../src/com/cloud/deploy/ImplicitDedicationPlanner.java| 2 --
 1 file changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/682c3af7/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
--
diff --git 
a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
 
b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
index bc3ff0a..9500cac 100644
--- 
a/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
+++ 
b/plugins/deployment-planners/implicit-dedication/src/com/cloud/deploy/ImplicitDedicationPlanner.java
@@ -308,8 +308,6 @@ public class ImplicitDedicationPlanner extends 
FirstFitPlanner implements Deploy
 // But the host where system vms are running is marked as 
shared and still be part of empty Hosts.
 // The scenario will fail where actual Empty hosts and uservms 
not running host.
 return PlannerResourceUsage.Dedicated;
-} else if (!preferred) {
-return PlannerResourceUsage.Dedicated;
 } else {
 if (!allOtherHosts.isEmpty()  (hostsToAvoid == null || 
!hostsToAvoid.containsAll(allOtherHosts))) {
 return PlannerResourceUsage.Shared;

[6/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

CID-1114614 dead code removed


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

Branch: refs/heads/ui-template-uploader
Commit: 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf
Parents: 682c3af
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 16:47:32 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 16:47:32 2015 +0100

--
 server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cba1c41/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java 
b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index f9a1586..3c0188d 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -266,9 +266,6 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase 
implements RemoteAcc
 Integer pskLength = _pskLength;
 if (pskLength != null  (pskLength  8 || pskLength  256)) {
 throw new ConfigurationException(Remote Access VPN: IPSec 
preshared key length should be between 8 and 256);
-} else if (pskLength == null) {
-s_logger.warn(Remote Access VPN configuration missing Preshared 
Key Length -- ignoring);
-return;
 }
 
 String[] range = ipRange.split(-);

[2/2] git commit: updated refs/heads/ui-template-uploader to a36d219

[bfederle]

Test custom file upload


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

Branch: refs/heads/ui-template-uploader
Commit: a36d2191ec69c8bafed2c2d98e3776f4a48c61c4
Parents: 70fe283
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 13:51:37 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 13:51:37 2015 -0800

--
 ui/scripts/ui/dialog.js | 65 ++--
 1 file changed, 57 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a36d2191/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index a510be9..ca5ce8b 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -476,9 +476,13 @@
 } else if (field.isFileUpload) {
 $input = $('input').attr({
 type: 'file',
-name: 'files[]',
-'data-url': '/upload.jsp'
+name: 'files[]'
 }).appendTo($value);
+
+// Add events
+$input.change(function(event) {
+$form.data('files', event.target.files);
+});
 } else if (field.isTokenInput) { // jquery.tokeninput.js
 isAsync = true;
 
@@ -678,12 +682,57 @@
 }
 }
 
-args.after({
-data: data,
-ref: args.ref, // For backwards compatibility; use context
-context: args.context,
-$form: $form
-});
+var uploadFiles = function() {
+// START A LOADING SPINNER HERE
+
+// Create a formdata object and add the files
+var data = new FormData();
+$.each($form.data('files'), function(key, value)
+   {
+   data.append(key, value);
+   });
+
+$.ajax({
+url: '/client/upload.json',
+type: 'POST',
+data: data,
+cache: false,
+dataType: 'json',
+processData: false, // Don't process the files
+contentType: false, // Set content type to false as 
jQuery will tell the server its a query string request
+success: function(data, textStatus, jqXHR)
+{
+if(typeof data.error === 'undefined')
+{
+// Success so call function to process the form
+debugger;
+//submitForm(event, data);
+}
+else
+{
+// Handle errors here
+console.log('ERRORS: ' + data.error);
+}
+},
+error: function(jqXHR, textStatus, errorThrown)
+{
+// Handle errors here
+console.log('ERRORS: ' + textStatus);
+// STOP LOADING SPINNER
+}
+});
+};
+
+if ($form.data('files')) {
+uploadFiles();
+} else {
+args.after({
+data: data,
+ref: args.ref, // For backwards compatibility; use 
context
+context: args.context,
+$form: $form
+});
+}
 
 return true;
 };

[1/2] git commit: updated refs/heads/ui-template-uploader to a36d219

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader 6d9542ff3 - a36d2191e


Add file upload field


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

Branch: refs/heads/ui-template-uploader
Commit: 70fe283b670e6f12d1b3ea05b7d41e6f81571ad1
Parents: 6d9542f
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 11:38:00 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 11:38:00 2015 -0800

--
 ui/scripts/ui/dialog.js | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/70fe283b/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index e5ac14b..a510be9 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -473,6 +473,12 @@
 if (field.defaultValue) {
 $input.val(strOrFunc(field.defaultValue));
 }
+} else if (field.isFileUpload) {
+$input = $('input').attr({
+type: 'file',
+name: 'files[]',
+'data-url': '/upload.jsp'
+}).appendTo($value);
 } else if (field.isTokenInput) { // jquery.tokeninput.js
 isAsync = true;
 

git commit: updated refs/heads/ui-template-uploader to ed903e3

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader ca824cb7f - ed903e358


Properly pass file upload response to success()


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

Branch: refs/heads/ui-template-uploader
Commit: ed903e3589f6edc37fdca121a7375310a3f465ac
Parents: ca824cb
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 15:16:25 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 15:16:25 2015 -0800

--
 ui/scripts/templates.js | 8 ++--
 ui/scripts/ui/dialog.js | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed903e35/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index de9beaf..297eb61 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -110,6 +110,9 @@
 title: 'label.action.register.template',
 docID: 'helpNetworkOfferingName',
 preFilter: cloudStack.preFilter.createTemplate,
+
+// Handles POST to upload server
+// -- standard action handler won't be called 
until success() callback
 fileUpload: {
 action: function(args) {
 var fileData = args.fileData;
@@ -121,9 +124,10 @@
 cache: false,
 dataType: 'json',
 processData: false, // Don't 
process the files
-contentType: false, // Set content 
type to false as jQuery will tell the server its a query string request
+contentType: false, // jQuery will 
tell the server this is a query string request
 success: function(uploadData, 
textStatus, jqXHR) {
-args.response.succes();
+// Files uploaded 
successfully; proceed to handle rest of action
+args.response.succes({ data: 
uploadData });
 },
 error: function(error) {
 args.response.error('Error 
uploading files');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ed903e35/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index b23fb56..98a9dfa 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -693,12 +693,12 @@
 context: args.context,
 uploadData: formData,
 response: {
-success: function() {
+success: function(successArgs) {
 $form.find('.loading-overlay').remove();
 $form.data('files', null);
 
 args.after({
-data: $.extend(data, { uploadData: 
uploadData }),
+data: $.extend(data, { uploadData: 
successArgs.data }),
 ref: args.ref, // For backwards 
compatibility; use context
 context: args.context,
 $form: $form

git commit: updated refs/heads/ui-template-uploader to 2188e19

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader ed903e358 - 2188e19ed


Fix callback handling


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

Branch: refs/heads/ui-template-uploader
Commit: 2188e19ed6b9364148e2135062c5b54324c7dda4
Parents: ed903e3
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 15:22:12 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 15:22:12 2015 -0800

--
 ui/scripts/templates.js | 2 +-
 ui/scripts/ui/dialog.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2188e19e/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 297eb61..51008cb 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -127,7 +127,7 @@
 contentType: false, // jQuery will 
tell the server this is a query string request
 success: function(uploadData, 
textStatus, jqXHR) {
 // Files uploaded 
successfully; proceed to handle rest of action
-args.response.succes({ data: 
uploadData });
+args.response.success({ data: 
uploadData });
 },
 error: function(error) {
 args.response.error('Error 
uploading files');

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2188e19e/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 98a9dfa..77bc3ff 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -689,9 +689,9 @@
 $.each($form.data('files'), function(key, value) {
 formData.append(key, value);
 });
-args.form.fileUpload({
+args.form.fileUpload.action({
 context: args.context,
-uploadData: formData,
+fileData: formData,
 response: {
 success: function(successArgs) {
 $form.find('.loading-overlay').remove();

git commit: updated refs/heads/ui-template-uploader to d2a928d

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader 2188e19ed - d2a928dbf


WIP: progress bar


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

Branch: refs/heads/ui-template-uploader
Commit: d2a928dbf6c5dcb17665122056ea9f73b3a9efc2
Parents: 2188e19
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 15:48:50 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 15:48:50 2015 -0800

--
 ui/scripts/templates.js | 14 +-
 1 file changed, 13 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d2a928db/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 51008cb..3ae46b7 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -116,8 +116,18 @@
 fileUpload: {
 action: function(args) {
 var fileData = args.fileData;
+var ajax = $.ajax({
+xhr: function() {
+var xhr = 
jQuery.ajaxSettings.xhr();
 
-$.ajax({
+if (xhr instanceof 
window.XMLHttpRequest) {
+
xhr.upload.addEventListener('progress', function(e) {
+console.log('progress 
- ', e);
+});
+}
+
+return xhr;
+},
 url: '/test-upload.php',
 type: 'POST',
 data: fileData,
@@ -133,6 +143,8 @@
 args.response.error('Error 
uploading files');
 }
 });
+
+debugger;
 }
 },
 fields: {

git commit: updated refs/heads/ui-template-uploader to ca824cb

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader a36d2191e - ca824cb7f


Add AJAX file upload handling


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

Branch: refs/heads/ui-template-uploader
Commit: ca824cb7fb367860286f2e725c64f606ac70ce86
Parents: a36d219
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 15:12:04 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 15:12:04 2015 -0800

--
 ui/scripts/templates.js | 21 ++
 ui/scripts/ui/dialog.js | 66 +---
 2 files changed, 52 insertions(+), 35 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca824cb7/ui/scripts/templates.js
--
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index bd7e8e9..de9beaf 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -110,6 +110,27 @@
 title: 'label.action.register.template',
 docID: 'helpNetworkOfferingName',
 preFilter: cloudStack.preFilter.createTemplate,
+fileUpload: {
+action: function(args) {
+var fileData = args.fileData;
+
+$.ajax({
+url: '/test-upload.php',
+type: 'POST',
+data: fileData,
+cache: false,
+dataType: 'json',
+processData: false, // Don't 
process the files
+contentType: false, // Set content 
type to false as jQuery will tell the server its a query string request
+success: function(uploadData, 
textStatus, jqXHR) {
+args.response.succes();
+},
+error: function(error) {
+args.response.error('Error 
uploading files');
+}
+});
+}
+},
 fields: {
 name: {
 label: 'label.name',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ca824cb7/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index ca5ce8b..b23fb56 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -683,48 +683,44 @@
 }
 
 var uploadFiles = function() {
-// START A LOADING SPINNER HERE
-
-// Create a formdata object and add the files
-var data = new FormData();
-$.each($form.data('files'), function(key, value)
-   {
-   data.append(key, value);
-   });
-
-$.ajax({
-url: '/client/upload.json',
-type: 'POST',
-data: data,
-cache: false,
-dataType: 'json',
-processData: false, // Don't process the files
-contentType: false, // Set content type to false as 
jQuery will tell the server its a query string request
-success: function(data, textStatus, jqXHR)
-{
-if(typeof data.error === 'undefined')
-{
-// Success so call function to process the form
-debugger;
-//submitForm(event, data);
-}
-else
-{
-// Handle errors here
-console.log('ERRORS: ' + data.error);
+var formData = new FormData();
+
+

git commit: updated refs/heads/ui-template-uploader to 7bcbf09

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader 2c9cc1ecd - 7bcbf09e2


Add fileuploader plugin


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

Branch: refs/heads/ui-template-uploader
Commit: 7bcbf09e2d6de10cb4a2a06290b1281810dd340c
Parents: 2c9cc1e
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 11:24:27 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 11:24:27 2015 -0800

--
 ui/index.jsp  |7 +
 ui/lib/jquery.fileupload.js   | 1466 
 ui/lib/jquery.iframe-transport.js |  217 +
 ui/scripts/templates.js   |4 +
 4 files changed, 1694 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bcbf09e/ui/index.jsp
--
diff --git a/ui/index.jsp b/ui/index.jsp
index 68abdf2..37c7d19 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -1737,6 +1737,12 @@
 script src=lib/date.js type=text/javascript/script
 script src=lib/jquery.cookies.js type=text/javascript/script
 script src=lib/jquery.md5.js type=text/javascript /script
+
+!-- File uploader --
+script src=lib/jquery.iframe-transport.js/script
+script src=lib/jquery.fileupload.js/script
+
+!-- require.js -- for plugin framework --
 script src=lib/require.js type=text/javascript/script
 
 !-- localized messages --
@@ -1758,6 +1764,7 @@
 script src=lib/flot/jquery.flot.threshold.js 
type=text/javascript/script
 !-- jquery.tokeninput.js --
 script src=lib/jquery.tokeninput.js type=text/javascript/script
+
 !-- CloudStack --
 script type=text/javascript 
src=scripts/ui/core.js?t=%=now%/script
 script type=text/javascript 
src=scripts/ui/utils.js?t=%=now%/script

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7bcbf09e/ui/lib/jquery.fileupload.js
--
diff --git a/ui/lib/jquery.fileupload.js b/ui/lib/jquery.fileupload.js
new file mode 100755
index 000..e99f309
--- /dev/null
+++ b/ui/lib/jquery.fileupload.js
@@ -0,0 +1,1466 @@
+/*
+ * jQuery File Upload Plugin 5.42.2
+ * https://github.com/blueimp/jQuery-File-Upload
+ *
+ * Copyright 2010, Sebastian Tschan
+ * https://blueimp.net
+ *
+ * Licensed under the MIT license:
+ * http://www.opensource.org/licenses/MIT
+ */
+
+/* jshint nomen:false */
+/* global define, require, window, document, location, Blob, FormData */
+
+(function (factory) {
+'use strict';
+if (typeof define === 'function'  define.amd) {
+// Register as an anonymous AMD module:
+define([
+'jquery',
+'jquery.ui.widget'
+], factory);
+} else if (typeof exports === 'object') {
+// Node/CommonJS:
+factory(
+require('jquery'),
+require('./vendor/jquery.ui.widget')
+);
+} else {
+// Browser globals:
+factory(window.jQuery);
+}
+}(function ($) {
+'use strict';
+
+// Detect file input support, based on
+// http://viljamis.com/blog/2012/file-upload-support-on-mobile/
+$.support.fileInput = !(new RegExp(
+// Handle devices which give false positives for the feature detection:
+'(Android (1\\.[0156]|2\\.[01]))' +
+'|(Windows Phone (OS 7|8\\.0))|(XBLWP)|(ZuneWP)|(WPDesktop)' +
+'|(w(eb)?OSBrowser)|(webOS)' +
+'|(Kindle/(1\\.0|2\\.[05]|3\\.0))'
+).test(window.navigator.userAgent) ||
+// Feature detection for all other devices:
+$('input type=file').prop('disabled'));
+
+// The FileReader API is not actually used, but works as feature detection,
+// as some Safari versions (5?) support XHR file uploads via the FormData 
API,
+// but not non-multipart XHR file uploads.
+// window.XMLHttpRequestUpload is not available on IE10, so we check for
+// window.ProgressEvent instead to detect XHR2 file upload capability:
+$.support.xhrFileUpload = !!(window.ProgressEvent  window.FileReader);
+$.support.xhrFormDataFileUpload = !!window.FormData;
+
+// Detect support for Blob slicing (required for chunked uploads):
+$.support.blobSlice = window.Blob  (Blob.prototype.slice ||
+Blob.prototype.webkitSlice || Blob.prototype.mozSlice);
+
+// Helper function to create drag handlers for 
dragover/dragenter/dragleave:
+function getDragHandler(type) {
+var isDragOver = type === 'dragover';
+return 

[2/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

Housekeeping, properly declare required maven version and update build plugin 
versions to recent versions


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

Branch: refs/heads/ui-template-uploader
Commit: ec32ea30f7b3e5351e661786955d9fa0929047bd
Parents: 84c44b6
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 11:58:58 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 11:58:58 2015 +0100

--
 plugins/hypervisors/hyperv/pom.xml   |  3 --
 plugins/user-authenticators/ldap/pom.xml |  2 +-
 pom.xml  | 40 ++-
 tools/checkstyle/pom.xml |  8 +-
 4 files changed, 35 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/hypervisors/hyperv/pom.xml
--
diff --git a/plugins/hypervisors/hyperv/pom.xml 
b/plugins/hypervisors/hyperv/pom.xml
index 9e658f6..e09fb43 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -70,7 +70,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 configuration
   executablejava/executable
   mainClasscom.cloud.agent.AgentShell/mainClass
@@ -124,7 +123,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 executions
   execution
 phasecompile/phase
@@ -144,7 +142,6 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-surefire-plugin/artifactId
-version2.12/version
 configuration
 excludes
   excludenone/exclude

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/user-authenticators/ldap/pom.xml
--
diff --git a/plugins/user-authenticators/ldap/pom.xml 
b/plugins/user-authenticators/ldap/pom.xml
index 22cdeb7..d24a5be 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
   plugin
 groupIdorg.codehaus.gmaven/groupId
 artifactIdgmaven-plugin/artifactId
-version1.3/version
+version1.5/version
 configuration
   providerSelection1.7/providerSelection
 /configuration

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e63769e..d3694bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,10 @@
 systemjira/system
 urlhttps://issues.apache.org/jira/browse/CLOUDSTACK/url
   /issueManagement
+  
+  prerequisites
+maven3.0.4/maven
+  /prerequisites
 
   properties
 cs.jdk.version1.7/cs.jdk.version
@@ -92,10 +96,10 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.11/cs.checkstyle.version
-cs.mycila.license.version2.5/cs.mycila.license.version
-cs.findbugs.version2.5.3/cs.findbugs.version
-cs.javadoc.version2.9.1/cs.javadoc.version
+cs.checkstyle.version2.13/cs.checkstyle.version
+cs.mycila.license.version2.7/cs.mycila.license.version
+cs.findbugs.version3.0.0/cs.findbugs.version
+cs.javadoc.version2.10.1/cs.javadoc.version
 cs.opensaml.version2.6.1/cs.opensaml.version
   /properties
 
@@ -612,7 +616,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-release-plugin/artifactId
-  version2.2.1/version
+  version2.5.1/version
   executions
 execution
   iddefault/id
@@ -695,12 +699,12 @@
 plugin
   groupIdorg.apache.tomcat.maven/groupId
   artifactIdtomcat7-maven-plugin/artifactId
-  version2.0/version
+  version2.2/version
 /plugin
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-antrun-plugin/artifactId
-  version1.7/version
+  version1.8/version
 /plugin
 plugin
   groupIdorg.apache.rat/groupId
@@ -837,7 +841,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-compiler-plugin/artifactId
-  version2.5.1/version
+  version3.2/version
   configuration
 

[3/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

Seems we are hitting bug MCHECKSTYLE-250


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

Branch: refs/heads/ui-template-uploader
Commit: eb9fba4feaded3cb18e64e44f7d601e82653f39b
Parents: ec32ea3
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 14:03:34 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 14:03:34 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb9fba4f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d3694bc..66fe7f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.13/cs.checkstyle.version
+cs.checkstyle.version2.11/cs.checkstyle.version
 cs.mycila.license.version2.7/cs.mycila.license.version
 cs.findbugs.version3.0.0/cs.findbugs.version
 cs.javadoc.version2.10.1/cs.javadoc.version

[7/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

Merge branch 'master' into ui-template-uploader


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

Branch: refs/heads/ui-template-uploader
Commit: 6d9542ff36b9fd47be9f7de03e1249622c7f49a6
Parents: 7bcbf09 3cba1c4
Author: Brian Federle brian.fede...@citrix.com
Authored: Tue Jan 6 11:25:21 2015 -0800
Committer: Brian Federle brian.fede...@citrix.com
Committed: Tue Jan 6 11:25:21 2015 -0800

--
 .../cloud/deploy/ImplicitDedicationPlanner.java |  2 --
 plugins/hypervisors/hyperv/pom.xml  |  3 --
 plugins/user-authenticators/ldap/pom.xml|  2 +-
 pom.xml | 38 +---
 server/src/com/cloud/configuration/Config.java  |  6 ++--
 .../configuration/ConfigurationManagerImpl.java | 12 +++
 .../consoleproxy/ConsoleProxyManagerImpl.java   | 18 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java |  3 --
 server/src/com/cloud/vm/UserVmManagerImpl.java  |  6 ++--
 .../SecondaryStorageManagerImpl.java| 20 +++
 setup/db/db/schema-442to450.sql |  2 ++
 tools/checkstyle/pom.xml|  8 -
 12 files changed, 69 insertions(+), 51 deletions(-)
--

[1/7] git commit: updated refs/heads/ui-template-uploader to 6d9542f

[bfederle]

Repository: cloudstack
Updated Branches:
  refs/heads/ui-template-uploader 7bcbf09e2 - 6d9542ff3


CLOUDSTACK-8140: CS fails to start after 
secstorage/consoleproxy.service.offering is set to uuid


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

Branch: refs/heads/ui-template-uploader
Commit: 84c44b63140e8acf2336549040bda9c0a8f2ff66
Parents: 2c9cc1e
Author: Wei Zhou w.z...@tech.leaseweb.com
Authored: Tue Jan 6 10:23:44 2015 +0100
Committer: Wei Zhou w.z...@tech.leaseweb.com
Committed: Tue Jan 6 10:23:44 2015 +0100

--
 server/src/com/cloud/configuration/Config.java  |  6 +++---
 .../consoleproxy/ConsoleProxyManagerImpl.java   | 18 --
 .../SecondaryStorageManagerImpl.java| 20 +---
 setup/db/db/schema-442to450.sql |  2 ++
 4 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c44b63/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index af4da6a..f9e9bdd 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1804,7 +1804,7 @@ public enum Config {
 ConsoleProxyServiceOffering(
 Advanced,
 ManagementServer.class,
-Long.class,
+String.class,
 consoleproxy.service.offering,
 null,
 Uuid of the service offering used by console proxy; if NULL - 
system offering will be used,
@@ -1812,10 +1812,10 @@ public enum Config {
 SecondaryStorageServiceOffering(
 Advanced,
 ManagementServer.class,
-Long.class,
+String.class,
 secstorage.service.offering,
 null,
-Service offering used by secondary storage; if NULL - system 
offering will be used,
+Uuid of the service offering used by secondary storage; if NULL - 
system offering will be used,
 null),
 HaTag(Advanced, ManagementServer.class, String.class, ha.tag, null, 
HA tag defining that the host marked with this tag can be used for HA purposes 
only, null),
 ImplicitHostTags(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c44b63/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
--
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 65930aa..bb64fa3 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -91,7 +91,6 @@ import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.rules.RulesManager;
-import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.offerings.dao.NetworkOfferingDao;
@@ -105,7 +104,6 @@ import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
@@ -196,8 +194,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 @Inject
 private ServiceOfferingDao _offeringDao;
 @Inject
-private DiskOfferingDao _diskOfferingDao;
-@Inject
 private NetworkOfferingDao _networkOfferingDao;
 @Inject
 private PrimaryDataStoreDao _storagePoolDao;
@@ -1267,13 +1263,15 @@ public class ConsoleProxyManagerImpl extends 
ManagerBase implements ConsoleProxy
 //check if there is a default service offering configured
 String cpvmSrvcOffIdStr = 
configs.get(Config.ConsoleProxyServiceOffering.key());
 if (cpvmSrvcOffIdStr != null) {
-DiskOffering diskOffering = 
_diskOfferingDao.findByUuid(cpvmSrvcOffIdStr);
-if (diskOffering == null) {
-diskOffering = 
_diskOfferingDao.findById(Long.parseLong(cpvmSrvcOffIdStr));
+_serviceOffering = _offeringDao.findByUuid(cpvmSrvcOffIdStr);
+if (_serviceOffering == null) {
+try {
+_serviceOffering = 

[02/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8136. [VMware] Create VM snapshot fails if a previous attempt to 
take the snapshot failed.
While looking for an ongoing VM snapshot task, check the task status to 
identify if the task is still running.


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

Branch: refs/heads/vmware-disk-controllers
Commit: 25a4f0dc530951e87fe357313dc983cb75aa8972
Parents: 13bdc1c
Author: Likitha Shetty likitha.she...@citrix.com
Authored: Tue Dec 30 14:16:00 2014 +0530
Committer: Likitha Shetty likitha.she...@citrix.com
Committed: Tue Dec 30 14:19:48 2014 +0530

--
 .../hypervisor/vmware/manager/VmwareStorageManagerImpl.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25a4f0dc/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
index 1981303..3aec7a4 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
@@ -37,6 +37,7 @@ import com.vmware.vim25.HostDatastoreBrowserSearchResults;
 import com.vmware.vim25.HostDatastoreBrowserSearchSpec;
 import com.vmware.vim25.ManagedObjectReference;
 import com.vmware.vim25.TaskInfo;
+import com.vmware.vim25.TaskInfoState;
 import com.vmware.vim25.VirtualDisk;
 
 import org.apache.cloudstack.storage.to.TemplateObjectTO;
@@ -1181,8 +1182,10 @@ public class VmwareStorageManagerImpl implements 
VmwareStorageManager {
 TaskInfo info = 
(TaskInfo)(context.getVimClient().getDynamicProperty(taskMor, info));
 
 if (info.getEntityName().equals(cmd.getVmName())  
info.getName().equalsIgnoreCase(CreateSnapshot_Task)) {
-s_logger.debug(There is already a VM snapshot task 
running, wait for it);
-context.getVimClient().waitForTask(taskMor);
+if (!(info.getState().equals(TaskInfoState.SUCCESS) || 
info.getState().equals(TaskInfoState.ERROR))) {
+s_logger.debug(There is already a VM snapshot task 
running, wait for it);
+context.getVimClient().waitForTask(taskMor);
+}
 }
 }
 

[10/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_tags.py
--
diff --git a/test/integration/component/test_tags.py 
b/test/integration/component/test_tags.py
index 2b05fbb..e323578 100644
--- a/test/integration/component/test_tags.py
+++ b/test/integration/component/test_tags.py
@@ -16,7 +16,7 @@
 # under the License.
  P1 tests for tags
 
-#Import Local Modules
+# Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.lib.utils import cleanup_resources
@@ -43,147 +43,149 @@ from marvin.lib.common import (get_zone,
 from marvin.codes import FAILED
 import time
 
+
 class Services:
+
 Test tags Services
 
 
 def __init__(self):
 self.services = {
-domain: {
-   name: Domain,
-},
-project: {
-name: Project,
-displaytext: Test project,
-},
-account: {
-email: administra...@clogeny.com,
-firstname: Test,
-lastname: User,
-username: test,
-# Random characters are appended for unique
-# username
-password: password,
- },
- user: {
-email: u...@clogeny.com,
-firstname: User,
-lastname: User,
-username: User,
-# Random characters are appended for unique
-# username
-password: password,
- },
-other_user: {
-email: otheru...@clogeny.com,
-firstname: Other,
-lastname: User,
-username: User,
-# Random characters are appended for unique
-# username
-password: password,
- },
- service_offering: {
-name: Tiny Instance,
-displaytext: Tiny Instance,
-cpunumber: 1,
-cpuspeed: 100,
-# in MHz
-memory: 128,
-# In MBs
-},
-disk_offering: {
-displaytext: Tiny Disk Offering,
-name: Tiny Disk Offering,
-disksize: 1
-},
-volume: {
-   diskname: Test Volume,
-},
-virtual_machine: {
-displayname: TestVM,
-username: root,
-password: password,
-ssh_port: 22,
-hypervisor: 'XenServer',
-privateport: 22,
-publicport: 22,
-protocol: 'TCP',
-},
-template: {
-displaytext: Cent OS Template,
-name: Cent OS Template,
-ostype: 'CentOS 5.3 (64-bit)',
-templatefilter: 'self',
-},
-iso:
-{
-displaytext: Dummy ISO,
-name: Dummy ISO,
-url: http://people.apache.org/~tsp/dummy.iso;,
-# Source URL where ISO is located
-isextractable: True,
-isfeatured: True,
-ispublic: False,
-ostype: 'CentOS 5.3 (64-bit)',
-mode: 'HTTP_DOWNLOAD',
-# Used in Extract template, value must be 
HTTP_DOWNLOAD
-},
-network_offering: {
-name: 

[17/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSATCK-8138: Fixed VmSnapshot revert issue in test_escalations_instances.py

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: 22d6565434e31a8c65953a9eb1b8bfeea1c0f1d0
Parents: eae9f0f
Author: Gaurav Aradhye gaurav.arad...@clogeny.com
Authored: Wed Dec 31 15:19:22 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:42:07 2015 +0530

--
 test/integration/component/test_escalations_instances.py | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/22d65654/test/integration/component/test_escalations_instances.py
--
diff --git a/test/integration/component/test_escalations_instances.py 
b/test/integration/component/test_escalations_instances.py
index 15eb6f1..ddae154 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -2622,9 +2622,6 @@ class TestInstances(cloudstackTestCase):
 Latest snapshot taken is not marked as current
 )
 
-# Stop Virtual machine befor reverting VM to a snapshot taken without 
memory
-vm_created.stop(self.userapiclient)
-
 # Reverting the VM to Snapshot 1
 VmSnapshot.revertToSnapshot(
 self.userapiclient,

[18/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CID-1261669 added comment to clarify false positive


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

Branch: refs/heads/vmware-disk-controllers
Commit: 54e5f28acec2e665a56b2c60a98d6eb8b045f5f1
Parents: 22d6565
Author: Daan Hoogland d...@onecht.net
Authored: Mon Jan 5 15:43:51 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Mon Jan 5 15:43:51 2015 +0100

--
 .../com/cloud/hypervisor/xenserver/resource/CitrixResourceBase.java | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/54e5f28a/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 f01153f..ccf4626 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
@@ -4244,6 +4244,7 @@ public abstract class CitrixResourceBase implements 
ServerResource, HypervisorRe
 if (cpuInfo.get(socket_count) != null) {
 _host.cpuSockets = 
Integer.parseInt(cpuInfo.get(socket_count));
 }
+// would hcs be null we would have thrown an exception on 
condition (_host.cpus = 0) by now
 for (final HostCpu hc : hcs) {
 _host.speed = hc.getSpeed(conn).intValue();
 break;

[04/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8141: UI  use Project view  Infrastructure  zone  physical 
network  Public traffic type  do not pass projectId to listNetworks API.


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

Branch: refs/heads/vmware-disk-controllers
Commit: b64fa34ce901f88a944f9f104310a8f53a827f0f
Parents: 61154b9
Author: Jessica Wang jessicaw...@apache.org
Authored: Fri Jan 2 11:33:57 2015 -0800
Committer: Jessica Wang jessicaw...@apache.org
Committed: Fri Jan 2 11:35:31 2015 -0800

--
 ui/scripts/system.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b64fa34c/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ad40ec1..88d0a78 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -601,7 +601,9 @@
 
 dataProvider: function (args) {
 $.ajax({
-url: 
createURL(listNetworkslistAll=truetrafficType=PublicisSystem=truezoneId= 
+ selectedZoneObj.id),
+url: 
createURL(listNetworkslistAll=truetrafficType=PublicisSystem=truezoneId= 
+ selectedZoneObj.id, {
+ignoreProject: true
+}),
 dataType: json,
 async: false,
 success: function (json) {

[13/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8130: Fixed test_escalations_templates.py - Removed test case 
dependency on each other

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: 17da2e9ce9894b67c32306fb36d02786d34ad0d0
Parents: 214d63e
Author: Ashutosh K ashut...@clogeny.com
Authored: Fri Dec 26 12:24:29 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:05:17 2015 +0530

--
 .../component/test_escalations_templates.py | 1001 +-
 1 file changed, 509 insertions(+), 492 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17da2e9c/test/integration/component/test_escalations_templates.py
--
diff --git a/test/integration/component/test_escalations_templates.py 
b/test/integration/component/test_escalations_templates.py
index 3dc24c1..a7787c7 100644
--- a/test/integration/component/test_escalations_templates.py
+++ b/test/integration/component/test_escalations_templates.py
@@ -16,15 +16,23 @@
 # under the License.
 
 # Import Local Modules
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.utils import (cleanup_resources,
+  validateList)
+from marvin.lib.base import (Account,
+ Zone,
+ Template,
+ Hypervisor)
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template,
+   list_os_types,
+   get_builtin_template_info)
 from marvin.codes import PASS
 from nose.plugins.attrib import attr
 import time
 
+
 class TestTemplates(cloudstackTestCase):
 
 @classmethod
@@ -36,23 +44,21 @@ class TestTemplates(cloudstackTestCase):
 cls.services = cls.testClient.getParsedTestDataConfig()
 # Get Domain, Zone, Template
 cls.domain = get_domain(cls.api_client)
-cls.zone = get_zone(cls.api_client, 
cls.testClient.getZoneForTests())
+cls.zone = get_zone(
+cls.api_client,
+cls.testClient.getZoneForTests())
 cls.template = get_template(
-cls.api_client,
-cls.zone.id,
-cls.services[ostype]
-)
+cls.api_client,
+cls.zone.id,
+cls.services[ostype]
+)
 cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services['mode'] = cls.zone.networktype
-cls.account = Account.create(
-cls.api_client,
-cls.services[account],
-domainid=cls.domain.id
-)
-# Getting authentication for user in newly created Account
-cls.user = cls.account.user[0]
-cls.userapiclient = 
cls.testClient.getUserApiClient(cls.user.username, cls.domain.name)
-cls._cleanup.append(cls.account)
+
+builtin_info = get_builtin_template_info(cls.api_client, 
cls.zone.id)
+cls.services[privatetemplate][url] = builtin_info[0]
+cls.services[privatetemplate][hypervisor] = builtin_info[1]
+cls.services[privatetemplate][format] = builtin_info[2]
 except Exception as e:
 cls.tearDownClass()
 raise Exception(Warning: Exception in setup : %s % e)
@@ -62,6 +68,17 @@ class TestTemplates(cloudstackTestCase):
 
 self.apiClient = self.testClient.getApiClient()
 self.cleanup = []
+self.account = Account.create(
+self.apiClient,
+self.services[account],
+domainid=self.domain.id
+)
+# Getting authentication for user in newly created Account
+self.user = self.account.user[0]
+self.userapiclient = self.testClient.getUserApiClient(
+self.user.username,
+self.domain.name)
+self.cleanup.append(self.account)
 
 def tearDown(self):
 # Clean up, terminate the created resources
@@ -102,10 +119,9 @@ class TestTemplates(cloudstackTestCase):
 

[22/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8140: CS fails to start after 
secstorage/consoleproxy.service.offering is set to uuid


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

Branch: refs/heads/vmware-disk-controllers
Commit: 84c44b63140e8acf2336549040bda9c0a8f2ff66
Parents: 2c9cc1e
Author: Wei Zhou w.z...@tech.leaseweb.com
Authored: Tue Jan 6 10:23:44 2015 +0100
Committer: Wei Zhou w.z...@tech.leaseweb.com
Committed: Tue Jan 6 10:23:44 2015 +0100

--
 server/src/com/cloud/configuration/Config.java  |  6 +++---
 .../consoleproxy/ConsoleProxyManagerImpl.java   | 18 --
 .../SecondaryStorageManagerImpl.java| 20 +---
 setup/db/db/schema-442to450.sql |  2 ++
 4 files changed, 26 insertions(+), 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c44b63/server/src/com/cloud/configuration/Config.java
--
diff --git a/server/src/com/cloud/configuration/Config.java 
b/server/src/com/cloud/configuration/Config.java
index af4da6a..f9e9bdd 100644
--- a/server/src/com/cloud/configuration/Config.java
+++ b/server/src/com/cloud/configuration/Config.java
@@ -1804,7 +1804,7 @@ public enum Config {
 ConsoleProxyServiceOffering(
 Advanced,
 ManagementServer.class,
-Long.class,
+String.class,
 consoleproxy.service.offering,
 null,
 Uuid of the service offering used by console proxy; if NULL - 
system offering will be used,
@@ -1812,10 +1812,10 @@ public enum Config {
 SecondaryStorageServiceOffering(
 Advanced,
 ManagementServer.class,
-Long.class,
+String.class,
 secstorage.service.offering,
 null,
-Service offering used by secondary storage; if NULL - system 
offering will be used,
+Uuid of the service offering used by secondary storage; if NULL - 
system offering will be used,
 null),
 HaTag(Advanced, ManagementServer.class, String.class, ha.tag, null, 
HA tag defining that the host marked with this tag can be used for HA purposes 
only, null),
 ImplicitHostTags(

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c44b63/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
--
diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java 
b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 65930aa..bb64fa3 100644
--- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -91,7 +91,6 @@ import com.cloud.network.dao.IPAddressVO;
 import com.cloud.network.dao.NetworkDao;
 import com.cloud.network.dao.NetworkVO;
 import com.cloud.network.rules.RulesManager;
-import com.cloud.offering.DiskOffering;
 import com.cloud.offering.NetworkOffering;
 import com.cloud.offering.ServiceOffering;
 import com.cloud.offerings.dao.NetworkOfferingDao;
@@ -105,7 +104,6 @@ import com.cloud.storage.Storage;
 import com.cloud.storage.StoragePoolStatus;
 import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
 import com.cloud.storage.VMTemplateVO;
-import com.cloud.storage.dao.DiskOfferingDao;
 import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
@@ -196,8 +194,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase 
implements ConsoleProxy
 @Inject
 private ServiceOfferingDao _offeringDao;
 @Inject
-private DiskOfferingDao _diskOfferingDao;
-@Inject
 private NetworkOfferingDao _networkOfferingDao;
 @Inject
 private PrimaryDataStoreDao _storagePoolDao;
@@ -1267,13 +1263,15 @@ public class ConsoleProxyManagerImpl extends 
ManagerBase implements ConsoleProxy
 //check if there is a default service offering configured
 String cpvmSrvcOffIdStr = 
configs.get(Config.ConsoleProxyServiceOffering.key());
 if (cpvmSrvcOffIdStr != null) {
-DiskOffering diskOffering = 
_diskOfferingDao.findByUuid(cpvmSrvcOffIdStr);
-if (diskOffering == null) {
-diskOffering = 
_diskOfferingDao.findById(Long.parseLong(cpvmSrvcOffIdStr));
+_serviceOffering = _offeringDao.findByUuid(cpvmSrvcOffIdStr);
+if (_serviceOffering == null) {
+try {
+_serviceOffering = 
_offeringDao.findById(Long.parseLong(cpvmSrvcOffIdStr));
+} catch (NumberFormatException ex) {

[20/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CID-1261670 added null check


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

Branch: refs/heads/vmware-disk-controllers
Commit: 5251fb2dc33bc2f5a3e04fe8928ee0e8645b6647
Parents: 251e88c
Author: Daan Hoogland d...@onecht.net
Authored: Mon Jan 5 16:01:13 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Mon Jan 5 16:01:13 2015 +0100

--
 .../cloudstack/storage/motion/AncientDataMotionStrategy.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5251fb2d/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
--
diff --git 
a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
 
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
index 203cfa4..17ab00e 100644
--- 
a/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
+++ 
b/engine/storage/datamotion/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java
@@ -190,7 +190,7 @@ public class AncientDataMotionStrategy implements 
DataMotionStrategy {
 // for template, we want to leave it on cache for 
performance reason
 if ((answer == null || !answer.getResult())  
srcForCopy.getRefCount()  2) {
 // cache object created by this copy, not already there
-s_logger.warn(Copy may not be handled correctly by 
agent(id:  + ep.getId() + ). +
+s_logger.warn(Copy may not be handled correctly by 
agent(id:  + (ep != null ? ep.getId() : \unspecified\) + ). +
Delete  + cacheType +  cache(id:  + 
cacheId +
   , uuid:  + cacheUuid + ));
 cacheMgr.deleteCacheObject(srcForCopy);

[11/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_snapshots.py
--
diff --git a/test/integration/component/test_snapshots.py 
b/test/integration/component/test_snapshots.py
index 4bb2dcf..5b8cdc7 100644
--- a/test/integration/component/test_snapshots.py
+++ b/test/integration/component/test_snapshots.py
@@ -16,142 +16,143 @@
 # under the License.
  P1 tests for Snapshots
 
-#Import Local Modules
-from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import   cloudstackTestCase
-
-from marvin.lib.base import (Snapshot,
- Template,
- VirtualMachine,
- Account,
- ServiceOffering,
- DiskOffering,
- Volume)
-
-from marvin.lib.common import   (get_domain,
- get_zone,
- get_template,
- list_events,
- list_volumes,
- list_snapshots,
- list_templates,
- list_virtual_machines,
- )
-
-from marvin.lib.utils import(cleanup_resources,
- format_volume_to_ext3,
- random_gen,
- is_snapshot_on_nfs,
- get_hypervisor_type)
-
-from marvin.cloudstackAPI importdetachVolume
-import time
+# Import Local Modules
+from nose.plugins.attrib import attr
+from marvin.cloudstackTestCase import cloudstackTestCase
+
+from marvin.lib.base import (Snapshot,
+ Template,
+ VirtualMachine,
+ Account,
+ ServiceOffering,
+ DiskOffering,
+ Volume)
+
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template,
+   list_events,
+   list_volumes,
+   list_snapshots,
+   list_templates,
+   list_virtual_machines,
+   )
 
+from marvin.lib.utils import (cleanup_resources,
+  format_volume_to_ext3,
+  random_gen,
+  is_snapshot_on_nfs,
+  get_hypervisor_type)
+
+from marvin.cloudstackAPI import detachVolume
+import time
 
 
 class Services:
+
 Test Snapshots Services
 
 
 def __init__(self):
 self.services = {
-account: {
-email: t...@test.com,
-firstname: Test,
-lastname: User,
-username: test,
-# Random characters are appended for unique
-# username
-password: password,
- },
- service_offering: {
-name: Tiny Instance,
-displaytext: Tiny Instance,
-cpunumber: 1,
-cpuspeed: 200,# in MHz
+account: {
+email: t...@test.com,
+firstname: Test,
+lastname: User,
+username: test,
+# Random characters are appended for unique
+# username
+password: password,
+},
+service_offering: {
+name: Tiny Instance,
+displaytext: Tiny Instance,
+cpunumber: 1,
+cpuspeed: 200,# in MHz
 memory: 256,  # In MBs
+},
+disk_offering: {
+displaytext: Small Disk,
+name: Small Disk,
+disksize: 1
+},
+server_with_disk:
+{
+displayname: Test VM -With Disk,
+username: root,
+password: password,
+ssh_port: 22,
+hypervisor: 'XenServer',
+privateport: 22,
+publicport: 22,
+

[24/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

Seems we are hitting bug MCHECKSTYLE-250


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

Branch: refs/heads/vmware-disk-controllers
Commit: eb9fba4feaded3cb18e64e44f7d601e82653f39b
Parents: ec32ea3
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 14:03:34 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 14:03:34 2015 +0100

--
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eb9fba4f/pom.xml
--
diff --git a/pom.xml b/pom.xml
index d3694bc..66fe7f7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -96,7 +96,7 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.13/cs.checkstyle.version
+cs.checkstyle.version2.11/cs.checkstyle.version
 cs.mycila.license.version2.7/cs.mycila.license.version
 cs.findbugs.version3.0.0/cs.findbugs.version
 cs.javadoc.version2.10.1/cs.javadoc.version

[12/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8124: Skipping snapshot tests on hyperv hypervisor

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: 214d63ee1eb393168c2f91a646a775cdaeb5cae8
Parents: 7f10e6f
Author: Gaurav Aradhye gaurav.arad...@clogeny.com
Authored: Wed Dec 24 16:30:28 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:04:37 2015 +0530

--
 .../component/test_project_limits.py|6 +-
 .../component/test_ps_domain_limits.py  |  480 +--
 test/integration/component/test_ps_limits.py|4 +-
 .../component/test_resource_limits.py   |   11 +-
 test/integration/component/test_snapshots.py| 1504 +-
 test/integration/component/test_ss_limits.py|4 +
 test/integration/component/test_tags.py | 2774 +-
 test/integration/component/test_templates.py|5 +-
 test/integration/component/test_usage.py| 1469 +-
 9 files changed, 3240 insertions(+), 3017 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_project_limits.py
--
diff --git a/test/integration/component/test_project_limits.py 
b/test/integration/component/test_project_limits.py
index d4fb92d..adae047 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.py
@@ -18,7 +18,7 @@
 
 #Import Local Modules
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import cloudstackTestCase
+from marvin.cloudstackTestCase import cloudstackTestCase,unittest
 #from marvin.cloudstackAPI import *
 from marvin.lib.utils import (cleanup_resources,
   validateList)
@@ -522,7 +522,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
 def setUpClass(cls):
 cls.testClient = super(TestResourceLimitsProject, 
cls).getClsTestClient()
 cls.api_client = cls.testClient.getApiClient()
-
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services = Services().services
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
 cls.services['mode'] = cls.zone.networktype
@@ -758,6 +758,8 @@ class TestResourceLimitsProject(cloudstackTestCase):
 # 5. Try to create another snapshot in this project. It should give
 #user an appropriate error and an alert should be generated.
 
+if self.hypervisor.lower() in ['hyperv']:
+raise self.skipTest(Snapshots feature is not supported on 
Hyper-V)
 self.debug(
 Updating snapshot resource limits for project: %s %
 self.project.id)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_ps_domain_limits.py
--
diff --git a/test/integration/component/test_ps_domain_limits.py 
b/test/integration/component/test_ps_domain_limits.py
index 268174f..f9aa023 100644
--- a/test/integration/component/test_ps_domain_limits.py
+++ b/test/integration/component/test_ps_domain_limits.py
@@ -46,25 +46,29 @@ from marvin.codes import (PASS,
   FAILED,
   RESOURCE_PRIMARY_STORAGE)
 
+
 class TestMultipleChildDomain(cloudstackTestCase):
 
 @classmethod
 def setUpClass(cls):
 cloudstackTestClient = super(TestMultipleChildDomain,
-   cls).getClsTestClient()
+ cls).getClsTestClient()
 cls.api_client = cloudstackTestClient.getApiClient()
+cls.hypervisor = cloudstackTestClient.getHypervisorInfo()
 # Fill services from the external config file
 cls.services = cloudstackTestClient.getParsedTestDataConfig()
 # Get Zone, Domain and templates
 cls.domain = get_domain(cls.api_client)
-cls.zone = get_zone(cls.api_client, 
cloudstackTestClient.getZoneForTests())
+cls.zone = get_zone(
+cls.api_client,
+cloudstackTestClient.getZoneForTests())
 cls.services[mode] = cls.zone.networktype
 
 cls.template = get_template(
-cls.api_client,
-cls.zone.id,
-cls.services[ostype]
-)
+cls.api_client,
+cls.zone.id,
+cls.services[ostype]
+ 

[07/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8063: list secondary Ips information on non-default nics in VM 
response


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

Branch: refs/heads/vmware-disk-controllers
Commit: 93429443d50eabd5c6e73a412b8935120e13c42d
Parents: 48aa7e1
Author: Wei Zhou w.z...@tech.leaseweb.com
Authored: Mon Jan 5 11:22:14 2015 +0100
Committer: Wei Zhou w.z...@tech.leaseweb.com
Committed: Mon Jan 5 11:22:14 2015 +0100

--
 .../src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java  | 12 
 1 file changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93429443/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
--
diff --git a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java 
b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
index 8ea142a..890b4bc 100644
--- a/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/UserVmJoinDaoImpl.java
@@ -358,6 +358,18 @@ public class UserVmJoinDaoImpl extends 
GenericDaoBaseUserVmJoinVO, Long implem
 nicResponse.setType(uvo.getGuestType().toString());
 }
 nicResponse.setIsDefault(uvo.isDefaultNic());
+ListNicSecondaryIpVO secondaryIps = 
ApiDBUtils.findNicSecondaryIps(uvo.getNicId());
+if (secondaryIps != null) {
+ListNicSecondaryIpResponse ipList = new 
ArrayListNicSecondaryIpResponse();
+for (NicSecondaryIpVO ip : secondaryIps) {
+NicSecondaryIpResponse ipRes = new 
NicSecondaryIpResponse();
+ipRes.setId(ip.getUuid());
+ipRes.setIpAddr(ip.getIp4Address());
+ipList.add(ipRes);
+}
+nicResponse.setSecondaryIps(ipList);
+}
+
 nicResponse.setObjectName(nic);
 userVmData.addNic(nicResponse);
 }

[19/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CID-1261671 added null check


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

Branch: refs/heads/vmware-disk-controllers
Commit: 251e88c4015093fad723c13b496065d6434871cc
Parents: 54e5f28
Author: Daan Hoogland d...@onecht.net
Authored: Mon Jan 5 15:55:33 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Mon Jan 5 15:55:33 2015 +0100

--
 engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java | 5 +
 1 file changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/251e88c4/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java 
b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
index 4c4fe86..223172e 100644
--- a/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
+++ b/engine/schema/src/com/cloud/domain/dao/DomainDaoImpl.java
@@ -150,6 +150,11 @@ public class DomainDaoImpl extends 
GenericDaoBaseDomainVO, Long implements Dom
 if (id != null  id.longValue() == Domain.ROOT_DOMAIN) {
 s_logger.error(Can not remove domain  + id +  as it is ROOT 
domain);
 return false;
+} else {
+if(id == null) {
+s_logger.error(Can not remove domain without id.);
+return false;
+}
 }
 
 DomainVO domain = findById(id);

[14/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8132: Fixed issue related to secondary storage count of template

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: f938a5e1c352971aa61e75a60935c735c3d3920c
Parents: 17da2e9
Author: Ashutosh K ashut...@clogeny.com
Authored: Mon Dec 29 03:34:37 2014 -0800
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:30:16 2015 +0530

--
 test/integration/component/test_ss_limits.py | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f938a5e1/test/integration/component/test_ss_limits.py
--
diff --git a/test/integration/component/test_ss_limits.py 
b/test/integration/component/test_ss_limits.py
index 22ab99c..32201d8 100644
--- a/test/integration/component/test_ss_limits.py
+++ b/test/integration/component/test_ss_limits.py
@@ -127,7 +127,7 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 except Exception as e:
 return [FAIL, e]
 return [PASS, None]
-
+ 
 @data(ROOT_DOMAIN_ADMIN, CHILD_DOMAIN_ADMIN)
 @attr(tags = [advanced], required_hardware=true)
 def test_01_register_template(self, value):
@@ -144,24 +144,28 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 response = self.setupAccount(value)
 self.assertEqual(response[0], PASS, response[1])
 
+apiclient = self.testClient.getUserApiClient(
+UserName=self.account.name,
+DomainName=self.account.domain)
+
 builtin_info = get_builtin_template_info(self.apiclient, self.zone.id)
 self.services[template_2][url] = builtin_info[0]
 self.services[template_2][hypervisor] = builtin_info[1]
 self.services[template_2][format] = builtin_info[2]
 
 try:
-template = Template.register(self.apiclient,
+template = Template.register(apiclient,
  self.services[template_2],
  zoneid=self.zone.id,
  account=self.account.name,
  domainid=self.account.domainid,
  hypervisor=self.hypervisor)
 
-template.download(self.apiclient)
+template.download(apiclient)
 except Exception as e:
 self.fail(Failed to register template: %s % e)
 
-templates = Template.list(self.apiclient,
+templates = Template.list(apiclient,
   templatefilter=\
   
self.services[template_2][templatefilter],
   id=template.id)
@@ -171,19 +175,19 @@ class TestSecondaryStorageLimits(cloudstackTestCase):
 templateSize = (templates[0].size / (1024**3))
 expectedCount = templateSize
 response = matchResourceCount(
-self.apiclient, expectedCount,
+apiclient, expectedCount,
 RESOURCE_SECONDARY_STORAGE,
 accountid=self.account.id)
 self.assertEqual(response[0], PASS, response[1])
 
 try:
-template.delete(self.apiclient)
+template.delete(apiclient)
 except Exception as e:
 self.fail(Failed to delete template: %s % e)
 
 expectedCount = 0
 response = matchResourceCount(
-self.apiclient, expectedCount,
+apiclient, expectedCount,
 RESOURCE_SECONDARY_STORAGE,
 accountid=self.account.id)
 self.assertEqual(response[0], PASS, response[1])

[09/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_templates.py
--
diff --git a/test/integration/component/test_templates.py 
b/test/integration/component/test_templates.py
index 753e71a..06b8c5f 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -284,7 +284,7 @@ class TestTemplates(cloudstackTestCase):
 
 cls.testClient = super(TestTemplates, cls).getClsTestClient()
 cls.api_client = cls.testClient.getApiClient()
-
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services = Services().services
 # Get Zone, Domain and templates
 cls.domain = get_domain(cls.api_client)
@@ -495,6 +495,9 @@ class TestTemplates(cloudstackTestCase):
 # 4. Deploy Virtual machine using this template
 # 5. VM should be in running state
 
+if self.hypervisor.lower() in ['hyperv']:
+self.skipTest(Snapshots feature is not supported on Hyper-V)
+
 userapiclient = self.testClient.getUserApiClient(
 UserName=self.account.name,
 DomainName=self.account.domain)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/214d63ee/test/integration/component/test_usage.py
--
diff --git a/test/integration/component/test_usage.py 
b/test/integration/component/test_usage.py
index 58cfbed..262a371 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -16,7 +16,7 @@
 # under the License.
  P1 tests for Snapshots
 
-#Import Local Modules
+# Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase, unittest
 from marvin.cloudstackAPI import deleteVolume
@@ -39,84 +39,86 @@ from marvin.lib.common import (get_zone,
get_domain,
get_template)
 
+
 class Services:
+
 Test Snapshots Services
 
 
 def __init__(self):
 self.services = {
-account: {
-email: t...@test.com,
-firstname: Test,
-lastname: User,
-username: test,
-# Random characters are appended for unique
-# username
-password: password,
- },
- service_offering: {
-name: Tiny Instance,
-displaytext: Tiny Instance,
-cpunumber: 1,
-cpuspeed: 100, # in MHz
-memory: 128, # In MBs
-},
-disk_offering: {
-displaytext: Small,
-name: Small,
-disksize: 1
-},
-volume: {
-   diskname: TestDiskServ,
-   },
-server: {
-displayname: TestVM,
-username: root,
-password: password,
-ssh_port: 22,
-hypervisor: 'XenServer',
-privateport: 22,
-publicport: 22,
-protocol: 'TCP',
-},
-templates: {
-displaytext: 'Template',
-name: 'Template',
-ostype: 'CentOS 5.3 (64-bit)',
-templatefilter: 'self',
-url: 
http://download.cloud.com/releases/2.0.0/UbuntuServer-10-04-64bit.qcow2.bz2;
-},
-iso: {
-  displaytext: Test ISO,
-  name: Test ISO,
-  url: 
http://people.apache.org/~tsp/dummy.iso;,
-  # Source URL where ISO is located
-  isextractable: True,
-  isfeatured: True,
-  ispublic: True,
-  ostype: 'CentOS 5.3 (64-bit)',
-},
-lbrule: {
-   

[05/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-7383: UI  Instances menu  detail view  TakeSnapshot action should 
be hidden when VM's hypervisor is LXC.


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

Branch: refs/heads/vmware-disk-controllers
Commit: 7fe1ed9dc81a92312cb273dc464d5f6d4259af05
Parents: b64fa34
Author: Jessica Wang jessicaw...@apache.org
Authored: Fri Jan 2 14:06:28 2015 -0800
Committer: Jessica Wang jessicaw...@apache.org
Committed: Fri Jan 2 14:12:15 2015 -0800

--
 ui/scripts/instances.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fe1ed9d/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d439c66..9ed0e16 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2435,7 +2435,7 @@
 allowedActions.push(restart);
 
 if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) 
-   || (jsonObj.hypervisor != 'LXC')) {
+(jsonObj.hypervisor != 'LXC')) {
 allowedActions.push(snapshot);
 }
 
@@ -2469,7 +2469,7 @@
 allowedActions.push(reinstall);
 
 if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) 
-   || (jsonObj.hypervisor != 'LXC')) {
+(jsonObj.hypervisor != 'LXC')) {
 allowedActions.push(snapshot);
 }
 

[23/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

Housekeeping, properly declare required maven version and update build plugin 
versions to recent versions


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

Branch: refs/heads/vmware-disk-controllers
Commit: ec32ea30f7b3e5351e661786955d9fa0929047bd
Parents: 84c44b6
Author: Hugo Trippaers htrippa...@schubergphilis.com
Authored: Tue Jan 6 11:58:58 2015 +0100
Committer: Hugo Trippaers htrippa...@schubergphilis.com
Committed: Tue Jan 6 11:58:58 2015 +0100

--
 plugins/hypervisors/hyperv/pom.xml   |  3 --
 plugins/user-authenticators/ldap/pom.xml |  2 +-
 pom.xml  | 40 ++-
 tools/checkstyle/pom.xml |  8 +-
 4 files changed, 35 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/hypervisors/hyperv/pom.xml
--
diff --git a/plugins/hypervisors/hyperv/pom.xml 
b/plugins/hypervisors/hyperv/pom.xml
index 9e658f6..e09fb43 100644
--- a/plugins/hypervisors/hyperv/pom.xml
+++ b/plugins/hypervisors/hyperv/pom.xml
@@ -70,7 +70,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 configuration
   executablejava/executable
   mainClasscom.cloud.agent.AgentShell/mainClass
@@ -124,7 +123,6 @@
   plugin
 groupIdorg.codehaus.mojo/groupId
 artifactIdexec-maven-plugin/artifactId
-version1.2.1/version
 executions
   execution
 phasecompile/phase
@@ -144,7 +142,6 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-surefire-plugin/artifactId
-version2.12/version
 configuration
 excludes
   excludenone/exclude

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/plugins/user-authenticators/ldap/pom.xml
--
diff --git a/plugins/user-authenticators/ldap/pom.xml 
b/plugins/user-authenticators/ldap/pom.xml
index 22cdeb7..d24a5be 100644
--- a/plugins/user-authenticators/ldap/pom.xml
+++ b/plugins/user-authenticators/ldap/pom.xml
@@ -24,7 +24,7 @@
   plugin
 groupIdorg.codehaus.gmaven/groupId
 artifactIdgmaven-plugin/artifactId
-version1.3/version
+version1.5/version
 configuration
   providerSelection1.7/providerSelection
 /configuration

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec32ea30/pom.xml
--
diff --git a/pom.xml b/pom.xml
index e63769e..d3694bc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -32,6 +32,10 @@
 systemjira/system
 urlhttps://issues.apache.org/jira/browse/CLOUDSTACK/url
   /issueManagement
+  
+  prerequisites
+maven3.0.4/maven
+  /prerequisites
 
   properties
 cs.jdk.version1.7/cs.jdk.version
@@ -92,10 +96,10 @@
 cs.target.dirtarget/cs.target.dir
 cs.daemon.version1.0.15/cs.daemon.version
 cs.jna.version4.0.0/cs.jna.version
-cs.checkstyle.version2.11/cs.checkstyle.version
-cs.mycila.license.version2.5/cs.mycila.license.version
-cs.findbugs.version2.5.3/cs.findbugs.version
-cs.javadoc.version2.9.1/cs.javadoc.version
+cs.checkstyle.version2.13/cs.checkstyle.version
+cs.mycila.license.version2.7/cs.mycila.license.version
+cs.findbugs.version3.0.0/cs.findbugs.version
+cs.javadoc.version2.10.1/cs.javadoc.version
 cs.opensaml.version2.6.1/cs.opensaml.version
   /properties
 
@@ -612,7 +616,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-release-plugin/artifactId
-  version2.2.1/version
+  version2.5.1/version
   executions
 execution
   iddefault/id
@@ -695,12 +699,12 @@
 plugin
   groupIdorg.apache.tomcat.maven/groupId
   artifactIdtomcat7-maven-plugin/artifactId
-  version2.0/version
+  version2.2/version
 /plugin
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-antrun-plugin/artifactId
-  version1.7/version
+  version1.8/version
 /plugin
 plugin
   groupIdorg.apache.rat/groupId
@@ -837,7 +841,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-compiler-plugin/artifactId
-  version2.5.1/version
+  version3.2/version
   configuration
 

[16/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8137: Fixed cleanup issue in sec group tests in 
test_escalations_instances.py

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: eae9f0f0b0904a9dad025d4278b5e9b4fdf02b5e
Parents: 1ee4188
Author: k...@clogeny.com k...@clogeny.com
Authored: Tue Dec 30 15:04:38 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:32:30 2015 +0530

--
 test/integration/component/test_escalations_instances.py | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/eae9f0f0/test/integration/component/test_escalations_instances.py
--
diff --git a/test/integration/component/test_escalations_instances.py 
b/test/integration/component/test_escalations_instances.py
index b089ed5..15eb6f1 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -3652,7 +3652,6 @@ class TestInstances(cloudstackTestCase):
 security_group,
 Security Group creation failed
 )
-self.cleanup.append(security_group)
 security_groups_list_size = security_groups_list_size + 1
 
 # Listing the networks again

[08/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8124: Skipping snapshot test cases on hyperv

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: 7f10e6fe0b6744dd6d3ce5942baa70dc19a1040a
Parents: 9342944
Author: Gaurav Aradhye gaurav.arad...@clogeny.com
Authored: Wed Dec 24 14:39:20 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 17:02:10 2015 +0530

--
 test/integration/component/test_blocker_bugs.py | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7f10e6fe/test/integration/component/test_blocker_bugs.py
--
diff --git a/test/integration/component/test_blocker_bugs.py 
b/test/integration/component/test_blocker_bugs.py
index f9530f0..8ba563f 100644
--- a/test/integration/component/test_blocker_bugs.py
+++ b/test/integration/component/test_blocker_bugs.py
@@ -731,7 +731,7 @@ class TestTemplates(cloudstackTestCase):
 
 cls.testClient = super(TestTemplates, cls).getClsTestClient()
 cls.api_client = cls.testClient.getApiClient()
-
+cls.hypervisor = cls.testClient.getHypervisorInfo()
 cls.services = Services().services
 # Get Zone, Domain and templates
 cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
@@ -857,6 +857,8 @@ class TestTemplates(cloudstackTestCase):
 # 4. Check the size of snapshot and template
 
 # Create a snapshot from the ROOTDISK
+if self.hypervisor.lower() in ['hyperv']:
+self.skipTest(Snapshots feature is not supported on Hyper-V)
 snapshot = Snapshot.create(
self.apiclient,
self.volume.id,
@@ -922,6 +924,8 @@ class TestTemplates(cloudstackTestCase):
 # 5. Template should be created succesfully
 
 # Create a snapshot from the ROOTDISK
+if self.hypervisor.lower() in ['hyperv']:
+self.skipTest(Snapshots feature is not supported on Hyper-V)
 snapshot = Snapshot.create(
self.apiclient,
self.volume.id,

[15/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8135: Fixed cleanup issue in test_escalations_instances.py

Signed-off-by: SrikanteswaraRao Talluri tall...@apache.org


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

Branch: refs/heads/vmware-disk-controllers
Commit: 1ee41888353d87f4972e6ccb492817133805a88e
Parents: f938a5e
Author: Ashutosh K ashut...@clogeny.com
Authored: Tue Dec 30 12:55:06 2014 +0530
Committer: SrikanteswaraRao Talluri tall...@apache.org
Committed: Mon Jan 5 18:31:52 2015 +0530

--
 test/integration/component/test_escalations_instances.py | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ee41888/test/integration/component/test_escalations_instances.py
--
diff --git a/test/integration/component/test_escalations_instances.py 
b/test/integration/component/test_escalations_instances.py
index 1e5ec53..b089ed5 100644
--- a/test/integration/component/test_escalations_instances.py
+++ b/test/integration/component/test_escalations_instances.py
@@ -2238,7 +2238,6 @@ class TestInstances(cloudstackTestCase):
 vm_created,
 VM creation failed
 )
-self.cleanup.append(vm_created)
 # Listing all the VMs for a user again for matching zone
 list_vms_after = VirtualMachine.list(
 self.userapiclient,

[03/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

CLOUDSTACK-8139: UI  create compute offering  server-side only supports one 
single host tag instead of multiple host tags. So, change UI to take in only 
one single host tag instead of multiple host tags in create compute dialog.


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

Branch: refs/heads/vmware-disk-controllers
Commit: 61154b92f73ecae5f5622eae53b3f0124a6709d5
Parents: 25a4f0d
Author: Jessica Wang jessicaw...@apache.org
Authored: Wed Dec 31 16:21:13 2014 -0800
Committer: Jessica Wang jessicaw...@apache.org
Committed: Fri Jan 2 11:17:35 2015 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/61154b92/ui/scripts/configuration.js
--
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 76b5b7b..3997e53 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -358,41 +358,9 @@
 });
 }
 },
-hostTags: {
-label: 'label.host.tags',
-docID: 'helpComputeOfferingHostTags',
-isTokenInput: true,
-dataProvider: function(args) {
-$.ajax({
-url: createURL(listHostTags),
-dataType: json,
-success: function(json) {
-var item = 
json.listhosttagsresponse.hosttag;
-var tags = [];
-
-if (item != null)
-{
-tags = $.map(item, 
function(tag) {
-return {
-   id: 
tag.name,
-   name: 
tag.name
-   };
-});
-}
-
-args.response.success({
-data: tags,
-hintText: 
_l('hint.type.part.host.tag'),
-noResultsText: 
_l('hint.no.host.tags')
-});
-},
-error: 
function(XMLHttpResponse) {
-var errorMsg = 
parseXMLHttpResponse(XMLHttpResponse);
-
-
args.response.error(errorMsg);
-}
-});
-}
+hostTags: { //Only one single host tag is 
supported at server-side. Multiple host tags are NOT supported at server-side.
+label: 'Host Tag',
+docID: 'helpComputeOfferingHostTags'   
 
 },
 cpuCap: {
 label: 'label.CPU.cap',
@@ -979,7 +947,7 @@
 label: 'label.storage.tags'
 },
 hosttags: {
-label: 'label.host.tags'
+label: 'Host Tag'
 },
 domain: {
 label: 'label.domain'

[01/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

Repository: cloudstack
Updated Branches:
  refs/heads/vmware-disk-controllers c7b23d0a1 - e8a54f471


CLOUDSTACK-8134. Worker VMs don't have MS id set in vCenter annotation 
'cloud.vm.workertag'.
Correctly register node info for a newly created VMware context.


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

Branch: refs/heads/vmware-disk-controllers
Commit: 13bdc1cef4ee0fae2f263777317c170302c49689
Parents: c7b23d0
Author: Likitha Shetty likitha.she...@citrix.com
Authored: Tue Dec 30 11:48:06 2014 +0530
Committer: Likitha Shetty likitha.she...@citrix.com
Committed: Tue Dec 30 11:52:56 2014 +0530

--
 .../VmwareSecondaryStorageResourceHandler.java  | 23 +---
 1 file changed, 10 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/13bdc1ce/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
 
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
index e67fed6..8a27799 100644
--- 
a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java
@@ -209,23 +209,20 @@ public class VmwareSecondaryStorageResourceHandler 
implements SecondaryStorageRe
 _resource.ensureOutgoingRuleForAddress(vCenterAddress);
 
 VmwareContext context = currentContext.get();
-if (context != null) {
-if(!context.validate()) {
-invalidateServiceContext(context);
-context = null;
-} else {
-context.registerStockObject(serviceconsole, 
cmd.getContextParam(serviceconsole));
-context.registerStockObject(manageportgroup, 
cmd.getContextParam(manageportgroup));
-context.registerStockObject(noderuninfo, 
cmd.getContextParam(noderuninfo));
-}
+if (context != null  !context.validate()) {
+invalidateServiceContext(context);
+context = null;
 }
-if(context == null) {
-s_logger.info(Open new VmwareContext. vCenter:  + 
vCenterAddress + , user:  + username + , password:  +
-StringUtils.getMaskedPasswordForDisplay(password));
+if (context == null) {
+s_logger.info(Open new VmwareContext. vCenter:  + 
vCenterAddress + , user:  + username + , password:  + 
StringUtils.getMaskedPasswordForDisplay(password));
 
VmwareSecondaryStorageContextFactory.setVcenterSessionTimeout(vCenterSessionTimeout);
 context = 
VmwareSecondaryStorageContextFactory.getContext(vCenterAddress, username, 
password);
 }
-
+if (context != null) {
+context.registerStockObject(serviceconsole, 
cmd.getContextParam(serviceconsole));
+context.registerStockObject(manageportgroup, 
cmd.getContextParam(manageportgroup));
+context.registerStockObject(noderuninfo, 
cmd.getContextParam(noderuninfo));
+}
 currentContext.set(context);
 return context;
 } catch (Exception e) {

[06/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4

[sateesh]

README: back to work

Signed-off-by: Rohit Yadav rohit.ya...@shapeblue.com


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

Branch: refs/heads/vmware-disk-controllers
Commit: 48aa7e1854eb3d747acd04257ede67ee813dac4e
Parents: 7fe1ed9
Author: Rohit Yadav rohit.ya...@shapeblue.com
Authored: Sun Jan 4 15:28:02 2015 +0530
Committer: Rohit Yadav rohit.ya...@shapeblue.com
Committed: Sun Jan 4 15:28:02 2015 +0530

--
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/48aa7e18/README.md
--
diff --git a/README.md b/README.md
index 71fdb8a..4ea9224 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Apache CloudStack [![Build 
Status](https://travis-ci.org/apache/cloudstack.svg?branch=master)](https://travis-ci.org/apache/cloudstack)
 [![Coverity Scan Build 
Status](https://scan.coverity.com/projects/943/badge.svg)](https://scan.coverity.com/projects/943)
 
-![Apache CloudStack](tools/logo/acslogo.jpg)
+![Apache CloudStack](tools/logo/apache_cloudstack.png)
 
 Apache CloudStack is open source software designed to deploy and manage large
 networks of virtual machines, as a highly available, highly scalable

git commit: updated refs/heads/master to 3cba1c4

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/master 682c3af71 - 3cba1c41f


CID-1114614 dead code removed


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

Branch: refs/heads/master
Commit: 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf
Parents: 682c3af
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 16:47:32 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 16:47:32 2015 +0100

--
 server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3cba1c41/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java 
b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
index f9a1586..3c0188d 100644
--- a/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
+++ b/server/src/com/cloud/network/vpn/RemoteAccessVpnManagerImpl.java
@@ -266,9 +266,6 @@ public class RemoteAccessVpnManagerImpl extends ManagerBase 
implements RemoteAcc
 Integer pskLength = _pskLength;
 if (pskLength != null  (pskLength  8 || pskLength  256)) {
 throw new ConfigurationException(Remote Access VPN: IPSec 
preshared key length should be between 8 and 256);
-} else if (pskLength == null) {
-s_logger.warn(Remote Access VPN configuration missing Preshared 
Key Length -- ignoring);
-return;
 }
 
 String[] range = ipRange.split(-);

git commit: updated refs/heads/master to bc235ed

[likithas]

Repository: cloudstack
Updated Branches:
  refs/heads/master 3cba1c41f - bc235ed5e


CLOUDSTACK-5485. Cannot process more than 5 concurrent snapshots.
Number of threads on SSVM agent for connection with MS (Agent-NioClient) 
should be configurable using global config 'workers'.


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

Branch: refs/heads/master
Commit: bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac
Parents: 3cba1c4
Author: Likitha Shetty likitha.she...@citrix.com
Authored: Tue Jan 6 15:33:47 2015 +0530
Committer: Likitha Shetty likitha.she...@citrix.com
Committed: Wed Jan 7 09:41:24 2015 +0530

--
 agent/src/com/cloud/agent/AgentShell.java | 3 +++
 .../cloudstack/secondarystorage/SecondaryStorageManagerImpl.java  | 2 ++
 2 files changed, 5 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc235ed5/agent/src/com/cloud/agent/AgentShell.java
--
diff --git a/agent/src/com/cloud/agent/AgentShell.java 
b/agent/src/com/cloud/agent/AgentShell.java
index 34e73ed..7f83476 100644
--- a/agent/src/com/cloud/agent/AgentShell.java
+++ b/agent/src/com/cloud/agent/AgentShell.java
@@ -229,6 +229,9 @@ public class AgentShell implements IAgentShell, Daemon {
 }
 
 _workers = NumberUtils.toInt(workers, 5);
+if (_workers = 0) {
+_workers = 5;
+}
 
 if (host == null) {
 host = getProperty(null, host);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bc235ed5/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
--
diff --git 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
index ccf3dcd..9883932 100644
--- 
a/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
+++ 
b/services/secondary-storage/controller/src/org/apache/cloudstack/secondarystorage/SecondaryStorageManagerImpl.java
@@ -1052,6 +1052,8 @@ public class SecondaryStorageManagerImpl extends 
ManagerBase implements Secondar
 
 buf.append( guid=).append(profile.getVirtualMachine().getHostName());
 
+buf.append( workers=).append(_configDao.getValue(workers));
+
 if (_configDao.isPremium()) {
 s_logger.debug(VmWare hypervisor configured, telling the ssvm to 
load the PremiumSecondaryStorageResource);
 buf.append( 
resource=com.cloud.storage.resource.PremiumSecondaryStorageResource);

Build failed in Jenkins: cloudstack-docs-master-adminguide #1538

[Apache Jenkins Server]

See 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/1538/changes

Changes:

[likitha.shetty] CLOUDSTACK-5485. Cannot process more than 5 concurrent 
snapshots.

--
Started by upstream project cloudstack-master-maven build number 4690
originally caused by:
 Started by an SCM change
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/
  git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
  git config remote.origin.url 
  https://git-wip-us.apache.org/repos/asf/cloudstack.git # timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git --version # timeout=10
  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} # timeout=10
Checking out Revision bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac (origin/master)
  git config core.sparsecheckout # timeout=10
  git checkout -f bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac
  git rev-list 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf # timeout=10
  git tag -a -f -m Jenkins Build #1538 
  jenkins-cloudstack-docs-master-adminguide-1538 # timeout=10
[cloudstack-docs-master-adminguide] $ /bin/bash -xe 
/tmp/hudson7757752957552987694.sh
+ dpkg -s publican
Package: publican
Status: install ok installed
Priority: optional
Section: perl
Installed-Size: 6538
Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
Architecture: all
Version: 2.8-2
Depends: perl, docbook-xml, docbook-xsl (= 1.76.1), fop, gettext, 
libarchive-zip-perl, libconfig-simple-perl, libdatetime-format-dateparse-perl, 
libdatetime-perl, libdbd-sqlite3-perl, libdbi-perl, libfile-copy-recursive-perl 
(= 0.38), libfile-find-rule-perl, libfile-pushd-perl, libfile-which-perl, 
libhtml-format-perl, libhtml-template-perl, libhtml-tree-perl (= 3.23-2), 
libimage-size-perl, libio-string-perl, liblocale-maketext-gettext-perl, 
liblocale-po-perl, libmakefile-parser-perl, libtemplate-perl, 
libsyntax-highlight-engine-kate-perl, libxml-libxml-perl (= 1.67), 
libxml-libxslt-perl (= 1.67), libxml-simple-perl, libxml-treebuilder-perl (= 
3.09-2), perlmagick, librsvg2-bin
Conffiles:
 /etc/bash_completion.d/_publican 162356337b99cc7b3150ac55e7243cfb
 /etc/publican-website.cfg c15214c57da2a556345c15a5fc8883ac
Description: Tool for publishing material authored in DocBook XML
 Publican is a DocBook XML publication system:
  * Publican ensures your document is valid,
  * Publican works to ensure your document is up to publishable standard,
  * Publican supports skinning to allow you to create your own presentation
rules and look, overriding many parts of the default style to meet your
publishing needs,
  * Publican automates producing documentation in several formats: plain text,
several variations of HTML output and PDF, hiding boring details.
Original-Maintainer: Mikhail Gusarov dotted...@debian.org
Homepage: https://fedorahosted.org/publican/
+ cp -a /usr/share/publican/Common_Content Common_Content
+ cp -R docs/publican-cloudstack Common_Content/cloudstack
cp: cannot stat `docs/publican-cloudstack': No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

Build failed in Jenkins: cloudstack-docs-master-adminguide #1539

[Apache Jenkins Server]

See 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/1539/changes

Changes:

[kishan] Trigger user stats aggregation job at midnight in usage aggregation 
timezone

[kishan] Skip older records which generate negative duration usage

--
Started by upstream project cloudstack-master-maven build number 4691
originally caused by:
 Started by an SCM change
Building remotely on ubuntu-4 (docker Ubuntu ubuntu4 ubuntu) in workspace 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/
Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git init 
  https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/ # 
  timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git --version # timeout=10
  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 # timeout=10
  git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
  timeout=10
  git config remote.origin.url 
  https://git-wip-us.apache.org/repos/asf/cloudstack.git # timeout=10
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} # timeout=10
Checking out Revision 84c25f7025ca0eb22c8229d9e9cb7e987cbe (origin/master)
  git config core.sparsecheckout # timeout=10
  git checkout -f 84c25f7025ca0eb22c8229d9e9cb7e987cbe
  git rev-list bc235ed5eb0f88c3c62542a3e06bdc28c7b49eac # timeout=10
  git tag -a -f -m Jenkins Build #1539 
  jenkins-cloudstack-docs-master-adminguide-1539 # timeout=10
[cloudstack-docs-master-adminguide] $ /bin/bash -xe 
/tmp/hudson4287104996086543928.sh
+ dpkg -s publican
dpkg-query: package 'publican' is not installed and no information is available
Use dpkg --info (= dpkg-deb --info) to examine archive files,
and dpkg --contents (= dpkg-deb --contents) to list their contents.
Build step 'Execute shell' marked build as failure
Archiving artifacts

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

[kishan]

Repository: cloudstack
Updated Branches:
  refs/heads/master 84c25f702 - 9eb8d538d


Network offering usage event should be logged for UserVms only


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

Branch: refs/heads/master
Commit: 42cecbb000416978a7edcef5d8c664dac4b52277
Parents: 84c25f7
Author: Kishan Kavala kis...@apache.org
Authored: Fri Nov 21 12:10:50 2014 +0530
Committer: Kishan Kavala kis...@apache.org
Committed: Wed Jan 7 12:29:11 2015 +0530

--
 .../src/com/cloud/vm/VirtualMachineManagerImpl.java   | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/42cecbb0/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
--
diff --git 
a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java 
b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
index e9cd79c..8accebe 100644
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -2925,8 +2925,11 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 s_logger.debug(Nic is plugged successfully for vm  + vm 
+  in network  + network + . Vm  is a part of network now);
 long isDefault = (nic.isDefaultNic()) ? 1 : 0;
 // insert nic's Id into DB as resource_name
-
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, 
vmVO.getAccountId(), vmVO.getDataCenterId(), vmVO.getId(),
-Long.toString(nic.getId()), 
network.getNetworkOfferingId(), null, isDefault, 
VirtualMachine.class.getName(), vmVO.getUuid(), vm.isDisplay());
+if(VirtualMachine.Type.User.equals(vmVO.getType())) {
+//Log usage event for user Vms only
+
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, 
vmVO.getAccountId(), vmVO.getDataCenterId(), vmVO.getId(),
+Long.toString(nic.getId()), 
network.getNetworkOfferingId(), null, isDefault, 
VirtualMachine.class.getName(), vmVO.getUuid(), vm.isDisplay());
+}
 return nic;
 } else {
 s_logger.warn(Failed to plug nic to the vm  + vm +  in 
network  + network);

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

[kishan]

For volumes created from template, do not log offering ID in VOLUME.CREATE in 
usage_event. Moved offering type to DiskOffering interface


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

Branch: refs/heads/master
Commit: 9eb8d538dd196f27e5194dd2e657afffdb9347eb
Parents: 42cecbb
Author: Kishan Kavala kis...@apache.org
Authored: Fri Nov 21 14:33:39 2014 +0530
Committer: Kishan Kavala kis...@apache.org
Committed: Wed Jan 7 12:31:41 2015 +0530

--
 api/src/com/cloud/offering/DiskOffering.java   | 6 ++
 .../cloudstack/engine/orchestration/VolumeOrchestrator.java| 4 +++-
 engine/schema/src/com/cloud/storage/DiskOfferingVO.java| 3 ---
 .../schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java  | 2 +-
 server/src/com/cloud/api/query/vo/DiskOfferingJoinVO.java  | 2 +-
 5 files changed, 11 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eb8d538/api/src/com/cloud/offering/DiskOffering.java
--
diff --git a/api/src/com/cloud/offering/DiskOffering.java 
b/api/src/com/cloud/offering/DiskOffering.java
index 928f713..c2069c2 100644
--- a/api/src/com/cloud/offering/DiskOffering.java
+++ b/api/src/com/cloud/offering/DiskOffering.java
@@ -34,6 +34,10 @@ public interface DiskOffering extends InfrastructureEntity, 
Identity, InternalId
 Inactive, Active,
 }
 
+public enum Type {
+Disk, Service
+};
+
 State getState();
 
 public enum DiskCacheMode {
@@ -114,4 +118,6 @@ public interface DiskOffering extends InfrastructureEntity, 
Identity, InternalId
 DiskCacheMode getCacheMode();
 
 void setCacheMode(DiskCacheMode cacheMode);
+
+Type getType();
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eb8d538/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
--
diff --git 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index 1b87ccf..396a49c 100644
--- 
a/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ 
b/engine/orchestration/src/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -712,7 +712,9 @@ public class VolumeOrchestrator extends ManagerBase 
implements VolumeOrchestrati
 
 Long offeringId = null;
 
-offeringId = offering.getId();
+if (offering.getType() == DiskOffering.Type.Disk) {
+offeringId = offering.getId();
+}
 
 UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VOLUME_CREATE, 
vol.getAccountId(), vol.getDataCenterId(), vol.getId(), vol.getName(), 
offeringId, vol.getTemplateId(), size,
 Volume.class.getName(), vol.getUuid(), 
vol.isDisplayVolume());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eb8d538/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
--
diff --git a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java 
b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
index 74f65ab..5de7f98 100644
--- a/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
+++ b/engine/schema/src/com/cloud/storage/DiskOfferingVO.java
@@ -44,9 +44,6 @@ import com.cloud.utils.db.GenericDao;
 @Inheritance(strategy = InheritanceType.JOINED)
 @DiscriminatorColumn(name = type, discriminatorType = 
DiscriminatorType.STRING, length = 32)
 public class DiskOfferingVO implements DiskOffering {
-public enum Type {
-Disk, Service
-};
 
 @Id
 @GeneratedValue(strategy = GenerationType.IDENTITY)

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9eb8d538/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java 
b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
index 818a5b5..ba84062 100644
--- a/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
+++ b/engine/schema/src/com/cloud/storage/dao/DiskOfferingDaoImpl.java
@@ -25,7 +25,7 @@ import javax.persistence.EntityExistsException;
 import org.springframework.stereotype.Component;
 
 import com.cloud.storage.DiskOfferingVO;
-import com.cloud.storage.DiskOfferingVO.Type;
+import com.cloud.offering.DiskOffering.Type;
 

Build failed in Jenkins: cloudstack-apidocs-master #1707

[Apache Jenkins Server]

See https://builds.apache.org/job/cloudstack-apidocs-master/1707/changes

Changes:

[likitha.shetty] CLOUDSTACK-5485. Cannot process more than 5 concurrent 
snapshots.

--
[...truncated 318 lines...]
[INFO] Apache CloudStack Plugin - Network Brocade VCS  SKIPPED
[INFO] Apache CloudStack Plugin - Midokura Midonet ... SKIPPED
[INFO] Apache CloudStack Plugin - Stratosphere SSP ... SKIPPED
[INFO] Apache CloudStack Plugin - Network Opendaylight ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Allocator Random  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator LDAP  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator MD5 . SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator Plain Text  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator SAML2  SKIPPED
[INFO] Apache CloudStack Plugin - User Authenticator SHA256 Salted  SKIPPED
[INFO] Apache CloudStack Plugin - Dns Notifier Example ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image S3 ... SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image Swift provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image default provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Image sample provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume Nexenta Provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume CloudByte Provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume sample provider  SKIPPED
[INFO] Apache CloudStack Plugin - SNMP Alerts  SKIPPED
[INFO] Apache CloudStack Plugin - Syslog Alerts .. SKIPPED
[INFO] Apache CloudStack Plugin - Network VXLAN .. SKIPPED
[INFO] Apache CloudStack Plugin - GloboDNS ... SKIPPED
[INFO] Apache CloudStack Framework - Spring Module ... SKIPPED
[INFO] Apache CloudStack Secondary Storage Controller  SKIPPED
[INFO] Apache CloudStack Client UI ... SKIPPED
[INFO] Apache CloudStack Console Proxy - RDP Client .. SKIPPED
[INFO] Apache CloudStack Console Proxy ... SKIPPED
[INFO] Apache CloudStack Console Proxy - Server .. SKIPPED
[INFO] Apache CloudStack Framework - QuickCloud .. SKIPPED
[INFO] 
[INFO] BUILD FAILURE
[INFO] 
[INFO] Total time: 11.903s
[INFO] Finished at: Wed Jan 07 05:15:39 UTC 2015
[INFO] Final Memory: 46M/439M
[INFO] 
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] Archiving disabled
[JENKINS] 

git commit: updated refs/heads/master to 4ac96d6

[kishan]

Repository: cloudstack
Updated Branches:
  refs/heads/master bc235ed5e - 4ac96d637


Trigger user stats aggregation job at midnight in usage aggregation timezone


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

Branch: refs/heads/master
Commit: 4ac96d637c9efe0db50dd707dd161426aeb54a13
Parents: bc235ed
Author: Kishan Kavala kis...@apache.org
Authored: Thu Nov 20 17:08:17 2014 +0530
Committer: Kishan Kavala kis...@apache.org
Committed: Wed Jan 7 11:17:24 2015 +0530

--
 .../VirtualNetworkApplianceManagerImpl.java | 25 +---
 1 file changed, 17 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4ac96d63/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
--
diff --git 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
index c505755..c9590fe 100644
--- 
a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
+++ 
b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
@@ -651,34 +651,36 @@ Configurable, StateListenerState, VirtualMachine.Event, 
VirtualMachine {
 s_logger.debug(router.stats.interval -  + _routerStatsInterval + 
 so not scheduling the router stats thread);
 }
 
-// Schedule Network stats update task
+//Schedule Network stats update task
+//Network stats aggregation should align with aggregation range
+//For daily aggregation, update stats at the end of the day
+//For hourly aggregation, update stats at the end of the hour
 final TimeZone usageTimezone = TimeZone.getTimeZone(_usageTimeZone);
 final Calendar cal = Calendar.getInstance(usageTimezone);
 cal.setTime(new Date());
-long endDate = 0;
+//aggDate is the time in millis when the aggregation should happen
+long aggDate = 0;
 final int HOURLY_TIME = 60;
 final int DAILY_TIME = 60 * 24;
 if (_usageAggregationRange == DAILY_TIME) {
-cal.roll(Calendar.DAY_OF_YEAR, false);
 cal.set(Calendar.HOUR_OF_DAY, 0);
 cal.set(Calendar.MINUTE, 0);
 cal.set(Calendar.SECOND, 0);
 cal.set(Calendar.MILLISECOND, 0);
 cal.roll(Calendar.DAY_OF_YEAR, true);
 cal.add(Calendar.MILLISECOND, -1);
-endDate = cal.getTime().getTime();
+aggDate = cal.getTime().getTime();
 _dailyOrHourly = true;
 } else if (_usageAggregationRange == HOURLY_TIME) {
-cal.roll(Calendar.HOUR_OF_DAY, false);
 cal.set(Calendar.MINUTE, 0);
 cal.set(Calendar.SECOND, 0);
 cal.set(Calendar.MILLISECOND, 0);
 cal.roll(Calendar.HOUR_OF_DAY, true);
 cal.add(Calendar.MILLISECOND, -1);
-endDate = cal.getTime().getTime();
+aggDate = cal.getTime().getTime();
 _dailyOrHourly = true;
 } else {
-endDate = cal.getTime().getTime();
+aggDate = cal.getTime().getTime();
 _dailyOrHourly = false;
 }
 
@@ -687,7 +689,14 @@ Configurable, StateListenerState, VirtualMachine.Event, 
VirtualMachine {
 _usageAggregationRange = UsageUtils.USAGE_AGGREGATION_RANGE_MIN;
 }
 
-_networkStatsUpdateExecutor.scheduleAtFixedRate(new 
NetworkStatsUpdateTask(), endDate - System.currentTimeMillis(), 
_usageAggregationRange * 60 * 1000,
+// We cannot schedule a job at specific time. Provide initial delay 
instead, from current time, so that the job runs at desired time
+long initialDelay = aggDate - System.currentTimeMillis();
+
+if( initialDelay  0){
+s_logger.warn(Initial delay for network usage stats update task 
is incorrect. Stats update task will run immediately);
+}
+
+_networkStatsUpdateExecutor.scheduleAtFixedRate(new 
NetworkStatsUpdateTask(), initialDelay, (_usageAggregationRange * 60 * 1000),
 TimeUnit.MILLISECONDS);
 
 if (_routerCheckInterval  0) {

git commit: updated refs/heads/master to 84c25f7

[kishan]

Repository: cloudstack
Updated Branches:
  refs/heads/master 4ac96d637 - 84c25f702


Skip older records which generate negative duration usage


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

Branch: refs/heads/master
Commit: 84c25f7025ca0eb22c8229d9e9cb7e987cbe
Parents: 4ac96d6
Author: Kishan Kavala kis...@apache.org
Authored: Thu Nov 20 17:34:44 2014 +0530
Committer: Kishan Kavala kis...@apache.org
Committed: Wed Jan 7 11:49:50 2015 +0530

--
 usage/src/com/cloud/usage/parser/IPAddressUsageParser.java  | 5 +
 usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java   | 5 +
 .../src/com/cloud/usage/parser/NetworkOfferingUsageParser.java  | 5 +
 usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java | 5 +
 usage/src/com/cloud/usage/parser/SecurityGroupUsageParser.java  | 5 +
 usage/src/com/cloud/usage/parser/StorageUsageParser.java| 5 +
 usage/src/com/cloud/usage/parser/VMInstanceUsageParser.java | 5 +
 usage/src/com/cloud/usage/parser/VPNUserUsageParser.java| 5 +
 usage/src/com/cloud/usage/parser/VolumeUsageParser.java | 5 +
 9 files changed, 45 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c25f70/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java
--
diff --git a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java 
b/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java
index adeff01..feee16b 100644
--- a/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java
+++ b/usage/src/com/cloud/usage/parser/IPAddressUsageParser.java
@@ -101,6 +101,11 @@ public class IPAddressUsageParser {
 IpAssignDate = startDate;
 }
 
+if (IpAssignDate.after(endDate)) {
+//Ignore records created after endDate
+continue;
+}
+
 long currentDuration = (IpReleaseDeleteDate.getTime() - 
IpAssignDate.getTime()) + 1; // make sure this is an inclusive check for 
milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
 updateIpUsageData(usageMap, key, usageIp.getId(), currentDuration);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c25f70/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java
--
diff --git a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java 
b/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java
index 1b813b7..31ff97d 100644
--- a/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java
+++ b/usage/src/com/cloud/usage/parser/LoadBalancerUsageParser.java
@@ -98,6 +98,11 @@ public class LoadBalancerUsageParser {
 lbCreateDate = startDate;
 }
 
+if (lbCreateDate.after(endDate)) {
+//Ignore records created after endDate
+continue;
+}
+
 long currentDuration = (lbDeleteDate.getTime() - 
lbCreateDate.getTime()) + 1; // make sure this is an inclusive check for 
milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
 updateLBUsageData(usageMap, key, usageLB.getId(), currentDuration);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c25f70/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java
--
diff --git a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java 
b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java
index 4a5a1d2..e54cd53 100644
--- a/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java
+++ b/usage/src/com/cloud/usage/parser/NetworkOfferingUsageParser.java
@@ -99,6 +99,11 @@ public class NetworkOfferingUsageParser {
 noCreateDate = startDate;
 }
 
+if (noCreateDate.after(endDate)) {
+//Ignore records created after endDate
+continue;
+}
+
 long currentDuration = (noDeleteDate.getTime() - 
noCreateDate.getTime()) + 1; // make sure this is an inclusive check for 
milliseconds (i.e. use n - m + 1 to find total number of millis to charge)
 
 updateNOUsageData(usageMap, key, usageNO.getVmInstanceId(), 
currentDuration);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84c25f70/usage/src/com/cloud/usage/parser/PortForwardingUsageParser.java
--
diff --git 

Build failed in Jenkins: cloudstack-apidocs-master #1708

[Apache Jenkins Server]

See https://builds.apache.org/job/cloudstack-apidocs-master/1708/changes

Changes:

[kishan] Trigger user stats aggregation job at midnight in usage aggregation 
timezone

[kishan] Skip older records which generate negative duration usage

--
[...truncated 855 lines...]
Downloaded: 
http://repo.maven.apache.org/maven2/javax/ejb/ejb-api/3.0/ejb-api-3.0.pom (149 
B at 1.4 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/com/googlecode/java-ipv6/java-ipv6/0.15/java-ipv6-0.15.pom
4/6 KB  
6/6 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/com/googlecode/java-ipv6/java-ipv6/0.15/java-ipv6-0.15.pom
 (6 KB at 58.8 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.pom
4/21 KB   
8/21 KB   
12/21 KB   
16/21 KB   
20/21 KB   
21/21 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/commons-configuration/commons-configuration/1.10/commons-configuration-1.10.pom
 (21 KB at 208.6 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/reflections/reflections/0.9.8/reflections-0.9.8.pom
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/reflections/reflections/0.9.8/reflections-0.9.8.pom
 (0 B at 0.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/reflections/reflections-parent/0.9.8/reflections-parent-0.9.8.pom
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/reflections/reflections-parent/0.9.8/reflections-parent-0.9.8.pom
 (0 B at 0.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.pom
   
Downloaded: 
http://repo.maven.apache.org/maven2/com/google/guava/guava/18.0/guava-18.0.pom 
(0 B at 0.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/com/google/guava/guava-parent/18.0/guava-parent-18.0.pom
   
Downloaded: 
http://repo.maven.apache.org/maven2/com/google/guava/guava-parent/18.0/guava-parent-18.0.pom
 (0 B at 0.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/javassist/javassist/3.12.1.GA/javassist-3.12.1.GA.pom
   
Downloaded: 
http://repo.maven.apache.org/maven2/javassist/javassist/3.12.1.GA/javassist-3.12.1.GA.pom
 (0 B at 0.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/owasp/esapi/esapi/2.1.0/esapi-2.1.0.pom
   
[WARNING] Failed to create parent directories for resolution tracking file 
/home/jenkins/.m2/repository/org/owasp/esapi/esapi/2.1.0/esapi-2.1.0.pom.lastUpdated
Downloading: 
http://repo.maven.apache.org/maven2/org/opensaml/opensaml/2.6.1/opensaml-2.6.1.pom
4/16 KB
8/16 KB   
12/16 KB   
14/16 KB   
16/16 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/opensaml/opensaml/2.6.1/opensaml-2.6.1.pom
 (16 KB at 100.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/opensaml/openws/1.5.1/openws-1.5.1.pom
4/14 KB
8/14 KB   
12/14 KB   
14/14 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/opensaml/openws/1.5.1/openws-1.5.1.pom 
(14 KB at 163.1 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/opensaml/xmltooling/1.4.1/xmltooling-1.4.1.pom
4/10 KB
8/10 KB   
10/10 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/opensaml/xmltooling/1.4.1/xmltooling-1.4.1.pom
 (10 KB at 120.0 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.pom
819/819 B   

Downloaded: 
http://repo.maven.apache.org/maven2/org/bouncycastle/bcprov-jdk15/1.46/bcprov-jdk15-1.46.pom
 (819 B at 10.1 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.pom
3/3 KB  
 
Downloaded: 
http://repo.maven.apache.org/maven2/ca/juliusdavies/not-yet-commons-ssl/0.3.9/not-yet-commons-ssl-0.3.9.pom
 (3 KB at 27.3 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/commons-net/commons-net/3.3/commons-net-3.3.pom
4/19 KB   
8/19 KB   
12/19 KB   
16/19 KB   
17/19 KB   
19/19 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/commons-net/commons-net/3.3/commons-net-3.3.pom
 (19 KB at 161.3 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/30/commons-parent-30.pom
4/55 KB
8/55 KB   
12/55 KB   
16/55 KB   
18/55 KB   
22/55 KB   
26/55 KB   
30/55 KB   
34/55 KB   
38/55 KB   
41/55 KB   
45/55 KB   
49/55 KB   
53/55 KB   
55/55 KB   
   
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/30/commons-parent-30.pom
 (55 KB at 354.2 KB/sec)
Downloading: 
http://repository.apache.org/snapshots/org/apache/cloudstack/cloud-framework-config/4.6.0-SNAPSHOT/maven-metadata.xml
   
Downloading: 
http://repository.apache.org/snapshots/org/apache/cloudstack/cloud-framework-db/4.6.0-SNAPSHOT/maven-metadata.xml
   
Downloading: 

Build failed in Jenkins: cloudstack-docs-master-adminguide #1540

[Apache Jenkins Server]

See 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/1540/changes

Changes:

[kishan] Network offering usage event should be logged for UserVms only

[kishan] For volumes created from template, do not log offering ID in 
VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface

--
Started by upstream project cloudstack-master-maven build number 4692
originally caused by:
 Started by an SCM change
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/
  git rev-parse --is-inside-work-tree # timeout=10
Fetching changes from the remote Git repository
  git config remote.origin.url 
  https://git-wip-us.apache.org/repos/asf/cloudstack.git # timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git --version # timeout=10
  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} # timeout=10
Checking out Revision 9eb8d538dd196f27e5194dd2e657afffdb9347eb (origin/master)
  git config core.sparsecheckout # timeout=10
  git checkout -f 9eb8d538dd196f27e5194dd2e657afffdb9347eb
  git rev-list 84c25f7025ca0eb22c8229d9e9cb7e987cbe # timeout=10
  git tag -a -f -m Jenkins Build #1540 
  jenkins-cloudstack-docs-master-adminguide-1540 # timeout=10
[cloudstack-docs-master-adminguide] $ /bin/bash -xe 
/tmp/hudson2377058653384488818.sh
+ dpkg -s publican
Package: publican
Status: install ok installed
Priority: optional
Section: perl
Installed-Size: 6538
Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
Architecture: all
Version: 2.8-2
Depends: perl, docbook-xml, docbook-xsl (= 1.76.1), fop, gettext, 
libarchive-zip-perl, libconfig-simple-perl, libdatetime-format-dateparse-perl, 
libdatetime-perl, libdbd-sqlite3-perl, libdbi-perl, libfile-copy-recursive-perl 
(= 0.38), libfile-find-rule-perl, libfile-pushd-perl, libfile-which-perl, 
libhtml-format-perl, libhtml-template-perl, libhtml-tree-perl (= 3.23-2), 
libimage-size-perl, libio-string-perl, liblocale-maketext-gettext-perl, 
liblocale-po-perl, libmakefile-parser-perl, libtemplate-perl, 
libsyntax-highlight-engine-kate-perl, libxml-libxml-perl (= 1.67), 
libxml-libxslt-perl (= 1.67), libxml-simple-perl, libxml-treebuilder-perl (= 
3.09-2), perlmagick, librsvg2-bin
Conffiles:
 /etc/bash_completion.d/_publican 162356337b99cc7b3150ac55e7243cfb
 /etc/publican-website.cfg c15214c57da2a556345c15a5fc8883ac
Description: Tool for publishing material authored in DocBook XML
 Publican is a DocBook XML publication system:
  * Publican ensures your document is valid,
  * Publican works to ensure your document is up to publishable standard,
  * Publican supports skinning to allow you to create your own presentation
rules and look, overriding many parts of the default style to meet your
publishing needs,
  * Publican automates producing documentation in several formats: plain text,
several variations of HTML output and PDF, hiding boring details.
Original-Maintainer: Mikhail Gusarov dotted...@debian.org
Homepage: https://fedorahosted.org/publican/
+ cp -a /usr/share/publican/Common_Content Common_Content
+ cp -R docs/publican-cloudstack Common_Content/cloudstack
cp: cannot stat `docs/publican-cloudstack': No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

Build failed in Jenkins: cloudstack-apidocs-master #1709

[Apache Jenkins Server]

See https://builds.apache.org/job/cloudstack-apidocs-master/1709/changes

Changes:

[kishan] Network offering usage event should be logged for UserVms only

[kishan] For volumes created from template, do not log offering ID in 
VOLUME.CREATE in usage_event. Moved offering type to DiskOffering interface

--
[...truncated 252 lines...]
[INFO] Apache CloudStack . SUCCESS [1.753s]
[INFO] Apache CloudStack Maven Conventions Parent  SUCCESS [3.707s]
[INFO] Apache CloudStack Framework - Managed Context . FAILURE [1.182s]
[INFO] Apache CloudStack Utils ... SKIPPED
[INFO] Apache CloudStack Framework ... SKIPPED
[INFO] Apache CloudStack Framework - Event Notification .. SKIPPED
[INFO] Apache CloudStack Framework - Configuration ... SKIPPED
[INFO] Apache CloudStack API . SKIPPED
[INFO] Apache CloudStack Framework - REST  SKIPPED
[INFO] Apache CloudStack Framework - IPC . SKIPPED
[INFO] Apache CloudStack Cloud Engine  SKIPPED
[INFO] Apache CloudStack Cloud Engine API  SKIPPED
[INFO] Apache CloudStack Framework - Security  SKIPPED
[INFO] Apache CloudStack Core  SKIPPED
[INFO] Apache CloudStack Agents .. SKIPPED
[INFO] Apache CloudStack Framework - Clustering .. SKIPPED
[INFO] Apache CloudStack Framework - Event Notification .. SKIPPED
[INFO] Apache CloudStack Cloud Engine Schema Component ... SKIPPED
[INFO] Apache CloudStack Framework - Jobs  SKIPPED
[INFO] Apache CloudStack Cloud Engine Internal Components API  SKIPPED
[INFO] Apache CloudStack Server .. SKIPPED
[INFO] Apache CloudStack Usage Server  SKIPPED
[INFO] Apache CloudStack Cloud Engine Orchestration Component  SKIPPED
[INFO] Apache CloudStack Cloud Services .. SKIPPED
[INFO] Apache CloudStack Secondary Storage ... SKIPPED
[INFO] Apache CloudStack Secondary Storage Service ... SKIPPED
[INFO] Apache CloudStack Engine Storage Component  SKIPPED
[INFO] Apache CloudStack Engine Storage Volume Component . SKIPPED
[INFO] Apache CloudStack Engine Storage Image Component .. SKIPPED
[INFO] Apache CloudStack Engine Storage Data Motion Component  SKIPPED
[INFO] Apache CloudStack Engine Storage Cache Component .. SKIPPED
[INFO] Apache CloudStack Engine Storage Snapshot Component  SKIPPED
[INFO] Apache CloudStack Cloud Engine API  SKIPPED
[INFO] Apache CloudStack Cloud Engine Service  SKIPPED
[INFO] Apache CloudStack Plugin POM .. SKIPPED
[INFO] Apache CloudStack Plugin - API Rate Limit . SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume default provider  SKIPPED
[INFO] Apache CloudStack Plugin - Storage Volume SolidFire Provider  SKIPPED
[INFO] Apache CloudStack Plugin - API SolidFire .. SKIPPED
[INFO] Apache CloudStack Plugin - API Discovery .. SKIPPED
[INFO] Apache CloudStack Plugin - ACL Static Role Based .. SKIPPED
[INFO] Apache CloudStack Plugin - Host Anti-Affinity Processor  SKIPPED
[INFO] Apache CloudStack Plugin - Explicit Dedication Processor  SKIPPED
[INFO] Apache CloudStack Plugin - User Concentrated Pod Deployment Planner  
SKIPPED
[INFO] Apache CloudStack Plugin - User Dispersing Deployment Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Implicit Dedication Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Skip Heurestics Planner  SKIPPED
[INFO] Apache CloudStack Plugin - Host Allocator Random .. SKIPPED
[INFO] Apache CloudStack Plugin - Dedicated Resources  SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor OracleVM  SKIPPED
[INFO] Apache CloudStack Plugin - Open vSwitch ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor XenServer ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor KVM . SKIPPED
[INFO] Apache CloudStack Plugin - RabbitMQ Event Bus . SKIPPED
[INFO] Apache CloudStack Plugin - In Memory Event Bus  SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor Baremetal ... SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor UCS . SKIPPED
[INFO] Apache CloudStack Plugin - Hypervisor Hyper-V . SKIPPED
[INFO] Apache CloudStack Plugin - Network Elastic Load Balancer  SKIPPED
[INFO] Apache CloudStack Plugin - Network Internal Load Balancer  SKIPPED
[INFO] Apache CloudStack Framework - Spring Life Cycle ... SKIPPED
[INFO] Apache CloudStack Plugin - Network Juniper Contrail  SKIPPED
[INFO] Apache CloudStack Plugin - Palo Alto .. SKIPPED
[INFO] Apache CloudStack Plugin - Network Netscaler .. SKIPPED
[INFO] Apache CloudStack Plugin - Network Nicira NVP . SKIPPED
[INFO] Apache CloudStack Plugin - BigSwitch Virtual Network Segment  SKIPPED
[INFO] Apache CloudStack Plugin - Network Brocade VCS  SKIPPED
[INFO] 

git commit: updated refs/heads/bugfix/TO-hierarchy-flatening to 6fa1bd8

[dahn]

Repository: cloudstack
Updated Branches:
  refs/heads/bugfix/TO-hierarchy-flatening [created] 6fa1bd8ca


nic shouldn't inherit from net but be part of it/hooked into it


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

Branch: refs/heads/bugfix/TO-hierarchy-flatening
Commit: 6fa1bd8ca63bcdc711bf0b4a1b2787d0a2dca7b9
Parents: 3cba1c4
Author: Daan Hoogland d...@onecht.net
Authored: Tue Jan 6 17:39:44 2015 +0100
Committer: Daan Hoogland d...@onecht.net
Committed: Tue Jan 6 17:39:44 2015 +0100

--
 api/src/com/cloud/agent/api/to/NicTO.java | 113 +++--
 1 file changed, 106 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6fa1bd8c/api/src/com/cloud/agent/api/to/NicTO.java
--
diff --git a/api/src/com/cloud/agent/api/to/NicTO.java 
b/api/src/com/cloud/agent/api/to/NicTO.java
index bd681f2..f16c411 100644
--- a/api/src/com/cloud/agent/api/to/NicTO.java
+++ b/api/src/com/cloud/agent/api/to/NicTO.java
@@ -16,9 +16,110 @@
 // under the License.
 package com.cloud.agent.api.to;
 
+import java.net.URI;
 import java.util.List;
 
-public class NicTO extends NetworkTO {
+import com.cloud.network.Networks.BroadcastDomainType;
+import com.cloud.network.Networks.TrafficType;
+
+public class NicTO {
+NetworkTO net;
+public BroadcastDomainType getBroadcastType() {
+return net.getBroadcastType();
+}
+
+public void setBroadcastType(BroadcastDomainType broadcastType) {
+net.setBroadcastType(broadcastType);
+}
+
+public void setIp(String ip) {
+net.setIp(ip);
+}
+
+public void setNetmask(String netmask) {
+net.setNetmask(netmask);
+}
+
+public void setGateway(String gateway) {
+net.setGateway(gateway);
+}
+
+public void setMac(String mac) {
+net.setMac(mac);
+}
+
+public void setDns1(String dns1) {
+net.setDns1(dns1);
+}
+
+public void setDns2(String dns2) {
+net.setDns2(dns2);
+}
+
+public void setType(TrafficType type) {
+net.setType(type);
+}
+
+public void setName(String name) {
+net.setName(name);
+}
+
+public String getName() {
+return net.getName();
+}
+
+public void setSecurityGroupEnabled(boolean enabled) {
+net.setSecurityGroupEnabled(enabled);
+}
+
+public String getIp() {
+return net.getIp();
+}
+
+public String getNetmask() {
+return net.getNetmask();
+}
+
+public String getGateway() {
+return net.getGateway();
+}
+
+public String getMac() {
+return net.getMac();
+}
+
+public String getDns1() {
+return net.getDns1();
+}
+
+public String getDns2() {
+return net.getDns2();
+}
+
+public TrafficType getType() {
+return net.getType();
+}
+
+public URI getBroadcastUri() {
+return net.getBroadcastUri();
+}
+
+public void setBroadcastUri(URI broadcastUri) {
+net.setBroadcastUri(broadcastUri);
+}
+
+public URI getIsolationUri() {
+return net.getIsolationUri();
+}
+
+public void setIsolationuri(URI isolationUri) {
+net.setIsolationuri(isolationUri);
+}
+
+public boolean isSecurityGroupEnabled() {
+return net.isSecurityGroupEnabled();
+}
+
 int deviceId;
 Integer networkRateMbps;
 Integer networkRateMulticastMbps;
@@ -28,7 +129,7 @@ public class NicTO extends NetworkTO {
 ListString nicSecIps;
 
 public NicTO() {
-super();
+net = new NetworkTO();
 }
 
 public void setDeviceId(int deviceId) {
@@ -67,19 +168,17 @@ public class NicTO extends NetworkTO {
 return pxeDisable;
 }
 
-@Override
 public String getUuid() {
 return nicUuid;
 }
 
-@Override
 public void setUuid(String uuid) {
 this.nicUuid = uuid;
 }
 
 @Override
 public String toString() {
-return new 
StringBuilder([Nic:).append(type).append(-).append(ip).append(-).append(broadcastUri).append(]).toString();
+return new 
StringBuilder([Nic:).append(net.type).append(-).append(net.ip).append(-).append(net.broadcastUri).append(]).toString();
 }
 
 public void setNicSecIps(ListString secIps) {
@@ -91,10 +190,10 @@ public class NicTO extends NetworkTO {
 }
 
 public String getNetworkUuid() {
-return super.getUuid();
+return net.getUuid();
 }
 
 public void setNetworkUuid(String uuid) {
-super.setUuid(uuid);
+net.setUuid(uuid);
 }
 }

Build failed in Jenkins: cloudstack-docs-master-adminguide #1537

[Apache Jenkins Server]

See https://builds.apache.org/job/cloudstack-docs-master-adminguide/1537/

--
Started by upstream project cloudstack-master-maven build number 4689
originally caused by:
 Started by user hugo
Building remotely on ubuntu3 (Ubuntu ubuntu legacy-ubuntu) in workspace 
https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/
Cloning the remote Git repository
Cloning repository https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git init 
  https://builds.apache.org/job/cloudstack-docs-master-adminguide/ws/ # 
  timeout=10
Fetching upstream changes from 
https://git-wip-us.apache.org/repos/asf/cloudstack.git
  git --version # timeout=10
  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 # timeout=10
  git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* # 
  timeout=10
  git config remote.origin.url 
  https://git-wip-us.apache.org/repos/asf/cloudstack.git # timeout=10
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} # timeout=10
Checking out Revision 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf (origin/master)
  git config core.sparsecheckout # timeout=10
  git checkout -f 3cba1c41fbcbae6612940714ad9e2e2a7ce4d7bf
First time build. Skipping changelog.
  git tag -a -f -m Jenkins Build #1537 
  jenkins-cloudstack-docs-master-adminguide-1537 # timeout=10
[cloudstack-docs-master-adminguide] $ /bin/bash -xe 
/tmp/hudson1567223394483554668.sh
+ dpkg -s publican
Package: publican
Status: install ok installed
Priority: optional
Section: perl
Installed-Size: 6538
Maintainer: Ubuntu Developers ubuntu-devel-disc...@lists.ubuntu.com
Architecture: all
Version: 2.8-2
Depends: perl, docbook-xml, docbook-xsl (= 1.76.1), fop, gettext, 
libarchive-zip-perl, libconfig-simple-perl, libdatetime-format-dateparse-perl, 
libdatetime-perl, libdbd-sqlite3-perl, libdbi-perl, libfile-copy-recursive-perl 
(= 0.38), libfile-find-rule-perl, libfile-pushd-perl, libfile-which-perl, 
libhtml-format-perl, libhtml-template-perl, libhtml-tree-perl (= 3.23-2), 
libimage-size-perl, libio-string-perl, liblocale-maketext-gettext-perl, 
liblocale-po-perl, libmakefile-parser-perl, libtemplate-perl, 
libsyntax-highlight-engine-kate-perl, libxml-libxml-perl (= 1.67), 
libxml-libxslt-perl (= 1.67), libxml-simple-perl, libxml-treebuilder-perl (= 
3.09-2), perlmagick, librsvg2-bin
Conffiles:
 /etc/bash_completion.d/_publican 162356337b99cc7b3150ac55e7243cfb
 /etc/publican-website.cfg c15214c57da2a556345c15a5fc8883ac
Description: Tool for publishing material authored in DocBook XML
 Publican is a DocBook XML publication system:
  * Publican ensures your document is valid,
  * Publican works to ensure your document is up to publishable standard,
  * Publican supports skinning to allow you to create your own presentation
rules and look, overriding many parts of the default style to meet your
publishing needs,
  * Publican automates producing documentation in several formats: plain text,
several variations of HTML output and PDF, hiding boring details.
Original-Maintainer: Mikhail Gusarov dotted...@debian.org
Homepage: https://fedorahosted.org/publican/
+ cp -a /usr/share/publican/Common_Content Common_Content
+ cp -R docs/publican-cloudstack Common_Content/cloudstack
cp: cannot stat `docs/publican-cloudstack': No such file or directory
Build step 'Execute shell' marked build as failure
Archiving artifacts

Build failed in Jenkins: cloudstack-apidocs-master #1706

[Apache Jenkins Server]

See https://builds.apache.org/job/cloudstack-apidocs-master/1706/

--
[...truncated 11020 lines...]
426/865 KB   
430/865 KB   
434/865 KB   
438/865 KB   
442/865 KB   
446/865 KB   
450/865 KB   
451/865 KB   
455/865 KB   
457/865 KB   
461/865 KB   
465/865 KB   
467/865 KB   
471/865 KB   
475/865 KB   
479/865 KB   
483/865 KB   
487/865 KB   
491/865 KB   
495/865 KB   
499/865 KB   
503/865 KB   
507/865 KB   
511/865 KB   
515/865 KB   
519/865 KB   
523/865 KB   
527/865 KB   
531/865 KB   
535/865 KB   
539/865 KB   
543/865 KB   
547/865 KB   
551/865 KB   
555/865 KB   
559/865 KB   
563/865 KB   
567/865 KB   
571/865 KB   
575/865 KB   
579/865 KB   
583/865 KB   
587/865 KB   
591/865 KB   
595/865 KB   
599/865 KB   
603/865 KB   
607/865 KB   
611/865 KB   
615/865 KB   
619/865 KB   
623/865 KB   
627/865 KB   
631/865 KB   
635/865 KB   
639/865 KB   
643/865 KB   
647/865 KB   
651/865 KB   
655/865 KB   
659/865 KB   
663/865 KB   
667/865 KB   
671/865 KB   
675/865 KB   
679/865 KB   
683/865 KB   
686/865 KB   
4/448 KB   686/865 KB   
8/448 KB   686/865 KB   
12/448 KB   686/865 KB   
16/448 KB   686/865 KB   
20/448 KB   686/865 KB   
24/448 KB   686/865 KB   
28/448 KB   686/865 KB   
32/448 KB   686/865 KB   
36/448 KB   686/865 KB   
40/448 KB   686/865 KB   
44/448 KB   686/865 KB   
48/448 KB   686/865 KB   
52/448 KB   686/865 KB   
56/448 KB   686/865 KB   
60/448 KB   686/865 KB   
64/448 KB   686/865 KB   
68/448 KB   686/865 KB   
72/448 KB   686/865 KB   
76/448 KB   686/865 KB   
80/448 KB   686/865 KB   
84/448 KB   686/865 KB   
88/448 KB   686/865 KB   
92/448 KB   686/865 KB   
96/448 KB   686/865 KB   
100/448 KB   686/865 KB   
104/448 KB   686/865 KB   
108/448 KB   686/865 KB   
112/448 KB   686/865 KB   
116/448 KB   686/865 KB   
120/448 KB   686/865 KB   
124/448 KB   686/865 KB   
128/448 KB   686/865 KB   
132/448 KB   686/865 KB   
136/448 KB   686/865 KB   
140/448 KB   686/865 KB   
144/448 KB   686/865 KB   
148/448 KB   686/865 KB   
152/448 KB   686/865 KB   
152/448 KB   690/865 KB   
156/448 KB   690/865 KB   
156/448 KB   690/865 KB   
160/448 KB   690/865 KB   
160/448 KB   693/865 KB   
164/448 KB   693/865 KB   
168/448 KB   693/865 KB   
168/448 KB   696/865 KB   
172/448 KB   696/865 KB   
176/448 KB   696/865 KB   
180/448 KB   696/865 KB   
180/448 KB   700/865 KB   
184/448 KB   700/865 KB   
188/448 KB   700/865 KB   
188/448 KB   704/865 KB   
192/448 KB   704/865 KB   
192/448 KB   708/865 KB   
196/448 KB   708/865 KB   
200/448 KB   708/865 KB   
200/448 KB   712/865 KB   
204/448 KB   712/865 KB   
204/448 KB   716/865 KB   
208/448 KB   716/865 KB   
212/448 KB   716/865 KB   
212/448 KB   720/865 KB   
216/448 KB   720/865 KB   
220/448 KB   720/865 KB   
220/448 KB   724/865 KB   
224/448 KB   724/865 KB   
224/448 KB   728/865 KB   
228/448 KB   728/865 KB   
232/448 KB   728/865 KB   
232/448 KB   732/865 KB   
236/448 KB   732/865 KB   
240/448 KB   732/865 KB   
240/448 KB   736/865 KB   
243/448 KB   736/865 KB   
243/448 KB   740/865 KB   
243/448 KB   744/865 KB   
243/448 KB   748/865 KB   
243/448 KB   752/865 KB   
243/448 KB   756/865 KB   
243/448 KB   760/865 KB   
243/448 KB   764/865 KB   
243/448 KB   768/865 KB   
243/448 KB   772/865 KB   
243/448 KB   776/865 KB   
243/448 KB   780/865 KB   
243/448 KB   784/865 KB   
243/448 KB   788/865 KB   
243/448 KB   792/865 KB   
243/448 KB   796/865 KB   
243/448 KB   800/865 KB   
243/448 KB   804/865 KB   
243/448 KB   808/865 KB   
243/448 KB   812/865 KB   
243/448 KB   816/865 KB   
243/448 KB   820/865 KB   
243/448 KB   824/865 KB   
243/448 KB   828/865 KB   
243/448 KB   832/865 KB   
243/448 KB   836/865 KB   
243/448 KB   840/865 KB   
243/448 KB   844/865 KB   
243/448 KB   848/865 KB   
243/448 KB   852/865 KB   
243/448 KB   856/865 KB   
243/448 KB   860/865 KB   
243/448 KB   864/865 KB   
243/448 KB   865/865 KB   
246/448 KB   865/865 KB   
250/448 KB   865/865 KB   
254/448 KB   865/865 KB   
258/448 KB   865/865 KB   
262/448 KB   865/865 KB   
265/448 KB   865/865 KB   
269/448 KB   865/865 KB   
270/448 KB   865/865 KB   
274/448 KB   865/865 KB   
278/448 KB   865/865 KB   
282/448 KB   865/865 KB   
286/448 KB   865/865 KB   
290/448 KB   865/865 KB   
294/448 KB   865/865 KB   
298/448 KB   865/865 KB   
302/448 KB   865/865 KB   
306/448 KB   865/865 KB   
310/448 KB   865/865 KB   
314/448 KB   865/865 KB   
318/448 KB   865/865 KB   
322/448 KB   865/865 KB   
326/448 KB   865/865 KB   
330/448 KB   865/865 KB   
334/448 KB   865/865 KB   
338/448 KB   865/865 KB   
342/448 KB   865/865 KB   
346/448 KB   865/865 KB   
350/448 KB   865/865 KB   
354/448 KB   865/865 KB   
358/448 KB   865/865 KB   
362/448 KB   865/865 KB   
366/448 KB   865/865 KB   
370/448 KB   865/865 KB   
374/448 KB   865/865 KB   
378/448 KB   865/865 KB   
382/448 KB   865/865 KB   
386/448 KB   865/865 KB   
390/448 KB