Build failed in Jenkins: cloudstack-marvin-41 #463

[Apache Jenkins Server]

See 

Changes:

[likitha.shetty] CLOUDSTACK-308. ec2-describe-instances - Instance type should 
return right service offering name

--
[...truncated 3075 lines...]
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] Surefire report directory: 

[INFO] 
---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

Results :

Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

[JENKINS] Recording test results
[INFO] 
[INFO] --- maven

git commit: updated refs/heads/master to aac9224

[weizhou]

Updated Branches:
  refs/heads/master 1eb744fa1 -> aac922450


CLOUDSTACK-3143: add response in the response string (ui change)


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

Branch: refs/heads/master
Commit: aac922450c500c8ba4b10d61fad66fb0ec6c7d7a
Parents: 1eb744f
Author: Wei Zhou 
Authored: Mon Jun 24 09:18:41 2013 +0200
Committer: Wei Zhou 
Committed: Mon Jun 24 09:18:41 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aac92245/ui/scripts/network.js
--
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d18e796..fbd8b01 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4123,7 +4123,7 @@
   dataType: 'json',
   async: true,
   success: function(data) {
-var jobID = data.revokesecuritygroupingress.jobid;
+var jobID = 
data.revokesecuritygroupingressresponse.jobid;
 
 args.response.success({
   _custom: {
@@ -4295,7 +4295,7 @@
   dataType: 'json',
   async: true,
   success: function(data) {
-var jobID = data.revokesecuritygroupegress.jobid;
+var jobID = 
data.revokesecuritygroupegressresponse.jobid;
 
 args.response.success({
   _custom: {

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

[radhika]

Updated Branches:
  refs/heads/master aac922450 -> 4f4567384


CLOUDSTACK-757


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

Branch: refs/heads/master
Commit: 4f45673849dd8147c0ee95c160d7dc4e6762fcb8
Parents: aac9224
Author: Radhika PC 
Authored: Mon Jun 24 13:12:18 2013 +0530
Committer: Radhika PC 
Committed: Mon Jun 24 13:12:59 2013 +0530

--
 docs/en-US/add-gateway-vpc.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f456738/docs/en-US/add-gateway-vpc.xml
--
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
index 5ef8b63..6aaa5d0 100644
--- a/docs/en-US/add-gateway-vpc.xml
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -156,6 +156,10 @@
   
   
 Blacklisting Routes
-
+&PRODUCT; enables you to block a list of routes so that they are not 
assigned to any of
+  the VPC private gateways. Specify the list of routes that you want to 
blacklist in the
+blacklisted.routes global parameter. Note that the 
parameter update affects only new
+  static route creations. If you block an existing static route, it 
remains intact and
+  continue functioning. 
   
 

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

[jayapal]

CLOUDSTACK-1578 vmware:Egress default policy configurable using network 
offering on vmware


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

Branch: refs/heads/master
Commit: 9121191f702bc431add8235fa4cd636d9ee2310e
Parents: c22e7d0
Author: Jayapal 
Authored: Thu Jun 20 16:31:01 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9121191f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index c35024c..5040443 100755
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -764,12 +764,20 @@ public class VmwareResource implements 
StoragePoolResource, ServerResource, Vmwa
 String[] results = new String[cmd.getRules().length];
 FirewallRuleTO[] allrules = cmd.getRules();
 FirewallRule.TrafficType trafficType = allrules[0].getTrafficType();
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 String[][] rules = cmd.generateFwRules();
 String args = "";
 args += " -F ";
 if (trafficType == FirewallRule.TrafficType.Egress){
 args+= " -E ";
+if (egressDefault.equals("true")) {
+args+= " -P 1 ";
+} else if (egressDefault.equals("System")) {
+args+= " -P 2 ";
+} else {
+args+= " -P 0 ";
+}
 }
 
 StringBuilder sb = new StringBuilder();

[1/5] git commit: updated refs/heads/master to bb50c0d

[jayapal]

Updated Branches:
  refs/heads/master 4f4567384 -> bb50c0d2d


CLOUDSTACK-1578 Egress default policy configurable using network offering in 
xenserver with VR as firewall provider


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

Branch: refs/heads/master
Commit: 6a7ae637dd3043c1fcf432c4e7037037f07def04
Parents: 4f45673
Author: Jayapal 
Authored: Thu Jun 20 16:27:02 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:00 2013 +0530

--
 api/src/com/cloud/offering/NetworkOffering.java |  1 +
 .../org/apache/cloudstack/api/ApiConstants.java |  1 +
 .../admin/network/CreateNetworkOfferingCmd.java | 10 ++
 .../api/response/NetworkOfferingResponse.java   |  7 
 .../api/routing/NetworkElementCommand.java  |  1 +
 .../com/cloud/network/rules/FirewallRuleVO.java |  7 
 .../com/cloud/offerings/NetworkOfferingVO.java  | 10 +-
 .../debian/config/root/firewallRule_egress.sh   | 26 +++---
 .../xen/resource/CitrixResourceBase.java|  8 +
 server/src/com/cloud/api/ApiResponseHelper.java |  1 +
 .../configuration/ConfigurationManager.java |  2 +-
 .../configuration/ConfigurationManagerImpl.java | 10 --
 .../com/cloud/network/NetworkManagerImpl.java   | 37 +---
 .../network/firewall/FirewallManagerImpl.java   | 31 
 .../VirtualNetworkApplianceManagerImpl.java | 32 -
 .../cloud/network/rules/FirewallManager.java|  1 +
 .../cloud/server/ConfigurationServerImpl.java   |  2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |  5 +++
 .../cloud/vpc/MockConfigurationManagerImpl.java |  2 +-
 .../CreateNetworkOfferingTest.java  | 20 +--
 setup/db/db/schema-410to420.sql |  1 +
 21 files changed, 173 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/com/cloud/offering/NetworkOffering.java
--
diff --git a/api/src/com/cloud/offering/NetworkOffering.java 
b/api/src/com/cloud/offering/NetworkOffering.java
index 5f522eb..43312db 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -127,5 +127,6 @@ public interface NetworkOffering extends 
InfrastructureEntity, InternalIdentity,
 boolean getInternalLb();
 
 boolean getPublicLb();
+boolean getEgressDefaultPolicy();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 50832a3..8ac7c3f 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -121,6 +121,7 @@ public class ApiConstants {
 public static final String IS_PORTABLE = "isportable";
 public static final String IS_PUBLIC = "ispublic";
 public static final String IS_PERSISTENT = "ispersistent";
+public static final String EGRESS_DEFAULT_POLICY = "egressdefaultpolicy";
 public static final String IS_READY = "isready";
 public static final String IS_RECURSIVE = "isrecursive";
 public static final String ISO_FILTER = "isofilter";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index febb0c3..94e263c 100644
--- 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -99,6 +99,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
" Supported keys are internallbprovider/publiclbprovider with 
service provider as a value")
 protected Map details;
 
+@Parameter(name=ApiConstants.EGRESS_DEFAULT_POLICY, 
type=CommandType.BOOLEAN, description="true if default guest network egress 
policy is allow; false if default egress policy is deny")
+private Boolean egressDefaultPolicy;
+
 /
 /// Accessors ///
 /
@@ -162,6 +165,13 @

[5/5] git commit: updated refs/heads/master to bb50c0d

[jayapal]

CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering 
on SRX firewall


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

Branch: refs/heads/master
Commit: c22e7d00523ed3b194984d080355080ab1c881dd
Parents: 6a7ae63
Author: Jayapal 
Authored: Thu Jun 20 16:28:09 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 .../com/cloud/agent/api/to/FirewallRuleTO.java  | 19 -
 .../network/resource/JuniperSrxResource.java| 86 ++--
 scripts/network/juniper/security-policy-add.xml |  3 +-
 .../ExternalFirewallDeviceManagerImpl.java  | 24 ++
 4 files changed, 86 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22e7d00/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
--
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java 
b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index f296aa4..29d9c6f 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -53,6 +53,9 @@ public class FirewallRuleTO implements InternalIdentity {
 private Integer icmpType;
 private Integer icmpCode;
 private FirewallRule.TrafficType trafficType;
+private String guestCidr;
+private boolean defaultEgressPolicy;
+private FirewallRule.FirewallRuleType type;
 
 protected FirewallRuleTO() {
 }
@@ -110,9 +113,12 @@ public class FirewallRuleTO implements InternalIdentity {
 this(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), revokeState, alreadyAdded, 
purpose,rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode());
 }
 
-public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType) {
+public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType, String guestCidr, boolean 
defaultEgressPolicy, FirewallRule.FirewallRuleType type) {
 this(rule.getId(), guestVlanTag, null, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), 
rule.getState()==State.Revoke, rule.getState()==State.Active, 
rule.getPurpose(), rule.getSourceCidrList(), rule.getIcmpType(), 
rule.getIcmpCode());
 this.trafficType = trafficType;
+this.defaultEgressPolicy = defaultEgressPolicy;
+this.guestCidr = guestCidr;
+this.type = type;
 }
 
 public FirewallRule.TrafficType getTrafficType(){
@@ -170,4 +176,15 @@ public class FirewallRuleTO implements InternalIdentity {
 return purpose;
 }
 
+public boolean isDefaultEgressPolicy() {
+return defaultEgressPolicy;
+}
+
+public String getGuestCidr() {
+return guestCidr;
+}
+
+public FirewallRule.FirewallRuleType getType() {
+return type;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22e7d00/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
--
diff --git 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index fd065d5..3d3d797 100644
--- 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringReader;
+import java.lang.String;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
@@ -321,7 +322,8 @@ public class JuniperSrxResource implements ServerResource {
 STATIC_NAT("staticnat"),
 DESTINATION_NAT("destnat"),
 VPN("vpn"),
-SECURITYPOLICY_EGRESS("egress");
+SECURITYPOLICY_EGRESS("egress"),
+SECURITYPOLICY_EGRESS_DEFAULT("egress-default");
 
 private String identifier;
 
@@ -828,15 +830,37 @@ public class JuniperSrxResource implements ServerResource 
{
 if (rules[0].getTrafficType() == FirewallRule.TrafficType.Egress) {
 Map> activeRules = 
getActiveFirewallEgressRules(rules);
 Set guestVlans = activeRules.keySet();
-List cidrs = new ArrayList();
+   // List cidrs = new ArrayList();
+boolean d

[4/5] git commit: updated refs/heads/master to bb50c0d

[jayapal]

CLOUDSTACK-3148 failed to create private gw with default acl id


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

Branch: refs/heads/master
Commit: bb50c0d2d654e9a18c8bb04660ae407c54c6ac35
Parents: 0cd8f9e
Author: Jayapal 
Authored: Mon Jun 24 12:56:27 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb50c0d2/server/src/com/cloud/network/vpc/VpcManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java 
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index fb9e9b7..93413b4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1389,7 +1389,7 @@ public class VpcManagerImpl extends ManagerBase 
implements VpcManager, VpcProvis
 if ( aclVO == null) {
 throw new InvalidParameterValueException("Invalid network acl 
id passed ");
 }
-if (aclVO.getVpcId() != vpcId ) {
+if ((aclVO.getVpcId() != vpcId) && !(aclId == 
NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW)) {
 throw new InvalidParameterValueException("Private gateway and 
network acl are not in the same vpc");
 }
 

[3/5] git commit: updated refs/heads/master to bb50c0d

[jayapal]

CLOUDSTACK-1578 kvm:Egress default policy configurable using network offering 
on kvm


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

Branch: refs/heads/master
Commit: 0cd8f9e7316759f7634a7057cb4b40c98c27b8ae
Parents: 9121191
Author: Jayapal 
Authored: Thu Jun 20 16:32:11 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cd8f9e7/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index dae1c85..4f0ccec 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -224,6 +224,7 @@ public class VirtualRoutingResource implements Manager {
 results[i] = "Failed";
 }
 String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 if (routerIp == null) {
 return new SetFirewallRulesAnswer(cmd, false, results);
@@ -239,6 +240,13 @@ public class VirtualRoutingResource implements Manager {
 
 if (trafficType == FirewallRule.TrafficType.Egress){
 command.add("-E");
+if (egressDefault.equals("true")) {
+command.add("-P ", "1");
+} else if (egressDefault.equals("System")) {
+command.add("-P ", "2");
+} else {
+command.add("-P ", "0");
+}
 }
 
 StringBuilder sb = new StringBuilder();

Build failed in Jenkins: cloudstack-apidocs-41 #425

[Apache Jenkins Server]

See 

--
[...truncated 3065 lines...]
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] [INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] No sources to compile

Build failed in Jenkins: cloudstack-marvin-41 #464

[Apache Jenkins Server]

See 

--
[...truncated 3075 lines...]
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Compiling 18 source files to 

[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
--- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[INFO] Nothing to compile - all classes are up to date
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

Results :

Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

[JENKINS] Recording test results
[INFO] 
[INFO] --- maven-war-plugin:2.1.1:war (default-war) @ cloud-engine-service ---
[INFO] Packaging webapp
[INFO] Assembling webapp [cloud-engine-service

git commit: updated refs/heads/master to dc24203

[likithas]

Updated Branches:
  refs/heads/master bb50c0d2d -> dc242039b


CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back 
because the transactions are not committed.


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

Branch: refs/heads/master
Commit: dc242039b3f13531d9969ba104c63395e0db3b18
Parents: bb50c0d
Author: Likitha Shetty 
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty 
Committed: Mon Jun 24 14:21:59 2013 +0530

--
 .../bridge/persist/dao/CloudStackConfigurationDaoImpl.java   | 3 ++-
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++
 .../com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java  | 1 +
 awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java| 8 
 awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java | 8 
 awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java| 8 
 .../com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java | 1 +
 7 files changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6770a9c..bc77ea1 100644
--- 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -54,7 +54,8 @@ public class CloudStackConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index f0d05d3..8021eb6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -50,6 +50,7 @@ public class CloudStackSvcOfferingDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index 5aac396..f7e1da6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -55,6 +55,7 @@ public class CloudStackUserDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 67abf81..2223254 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -44,10 +44,10 @@ public class MHostDaoImpl extends GenericDaoBase implements MHost
SearchCriteria sc = NameSearch.create();
sc.setParameters("MHostKey", hostKey);
return findOneBy(sc);
-   
-   }finally {
-   txn.close();
-   }
+} finally {
+txn.commit();
+txn.close();
+}
}
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index cce0f83..ea7d264 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -43,7 +43,8 @@ public class OfferingDaoImpl extends 
GenericDaoBase impl
 try {
 txn.start();
 return listAll().size();
-}finally {
+} finally {
+txn.commit();
 txn.close();
 }

@@ -61,8 

git commit: updated refs/heads/master-6-17-stable to f00ebad

[likithas]

Updated Branches:
  refs/heads/master-6-17-stable 383e4e712 -> f00ebad1c


CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back 
because the transactions are not committed.


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

Branch: refs/heads/master-6-17-stable
Commit: f00ebad1c526eee12804809fc4ccaa5cadbc7f2a
Parents: 383e4e7
Author: Likitha Shetty 
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty 
Committed: Mon Jun 24 14:22:13 2013 +0530

--
 .../bridge/persist/dao/CloudStackConfigurationDaoImpl.java   | 3 ++-
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++
 .../com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java  | 1 +
 awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java| 8 
 awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java | 8 
 awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java| 8 
 .../com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java | 1 +
 7 files changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f00ebad1/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6770a9c..bc77ea1 100644
--- 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -54,7 +54,8 @@ public class CloudStackConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/f00ebad1/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index f0d05d3..8021eb6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -50,6 +50,7 @@ public class CloudStackSvcOfferingDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/f00ebad1/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index 5aac396..f7e1da6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -55,6 +55,7 @@ public class CloudStackUserDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/f00ebad1/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 67abf81..2223254 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -44,10 +44,10 @@ public class MHostDaoImpl extends GenericDaoBase implements MHost
SearchCriteria sc = NameSearch.create();
sc.setParameters("MHostKey", hostKey);
return findOneBy(sc);
-   
-   }finally {
-   txn.close();
-   }
+} finally {
+txn.commit();
+txn.close();
+}
}
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f00ebad1/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index cce0f83..ea7d264 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -43,7 +43,8 @@ public class OfferingDaoImpl extends 
GenericDaoBase impl
 try {
 txn.start();
 return listAll().size();
-}finally {
+} finally {
+txn.commit();
 txn.close();
 

git commit: updated refs/heads/4.1 to de25885

[likithas]

Updated Branches:
  refs/heads/4.1 e6b5e72e0 -> de2588516


CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back 
because the transactions are not committed.


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

Branch: refs/heads/4.1
Commit: de2588516b02e5e5dee3061d1dba8d76b0167045
Parents: e6b5e72
Author: Likitha Shetty 
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty 
Committed: Mon Jun 24 14:23:17 2013 +0530

--
 .../bridge/persist/dao/CloudStackConfigurationDaoImpl.java   | 3 ++-
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++
 .../com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java  | 1 +
 awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java| 8 
 awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java | 8 
 awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java| 8 
 .../com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java | 1 +
 7 files changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6770a9c..bc77ea1 100644
--- 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -54,7 +54,8 @@ public class CloudStackConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index f0d05d3..8021eb6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -50,6 +50,7 @@ public class CloudStackSvcOfferingDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index f108a20..506443e 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -61,6 +61,7 @@ public class CloudStackUserDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 67abf81..2223254 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -44,10 +44,10 @@ public class MHostDaoImpl extends GenericDaoBase implements MHost
SearchCriteria sc = NameSearch.create();
sc.setParameters("MHostKey", hostKey);
return findOneBy(sc);
-   
-   }finally {
-   txn.close();
-   }
+} finally {
+txn.commit();
+txn.close();
+}
}
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/de258851/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index cce0f83..ea7d264 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -43,7 +43,8 @@ public class OfferingDaoImpl extends 
GenericDaoBase impl
 try {
 txn.start();
 return listAll().size();
-}finally {
+} finally {
+txn.commit();
 txn.close();
 }

@@ -61,8 +62,8 

[4/6] git commit: updated refs/heads/master-6-17-stable to 4f75062

[jayapal]

CLOUDSTACK-1578 kvm:Egress default policy configurable using network offering 
on kvm


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

Branch: refs/heads/master-6-17-stable
Commit: 95ee2854a84a102d7375b12e5bf51c196d4c07ba
Parents: 50724d4
Author: Jayapal 
Authored: Thu Jun 20 16:32:11 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 14:30:23 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/95ee2854/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index dae1c85..4f0ccec 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -224,6 +224,7 @@ public class VirtualRoutingResource implements Manager {
 results[i] = "Failed";
 }
 String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 if (routerIp == null) {
 return new SetFirewallRulesAnswer(cmd, false, results);
@@ -239,6 +240,13 @@ public class VirtualRoutingResource implements Manager {
 
 if (trafficType == FirewallRule.TrafficType.Egress){
 command.add("-E");
+if (egressDefault.equals("true")) {
+command.add("-P ", "1");
+} else if (egressDefault.equals("System")) {
+command.add("-P ", "2");
+} else {
+command.add("-P ", "0");
+}
 }
 
 StringBuilder sb = new StringBuilder();

[5/6] git commit: updated refs/heads/master-6-17-stable to 4f75062

[jayapal]

CLOUDSTACK-3148 failed to create private gw with default acl id


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

Branch: refs/heads/master-6-17-stable
Commit: 4f75062648da8e56bd53aaddefd2798eca7293f3
Parents: 95ee285
Author: Jayapal 
Authored: Mon Jun 24 12:56:27 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 14:30:23 2013 +0530

--
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f750626/server/src/com/cloud/network/vpc/VpcManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java 
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index fb9e9b7..93413b4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1389,7 +1389,7 @@ public class VpcManagerImpl extends ManagerBase 
implements VpcManager, VpcProvis
 if ( aclVO == null) {
 throw new InvalidParameterValueException("Invalid network acl 
id passed ");
 }
-if (aclVO.getVpcId() != vpcId ) {
+if ((aclVO.getVpcId() != vpcId) && !(aclId == 
NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW)) {
 throw new InvalidParameterValueException("Private gateway and 
network acl are not in the same vpc");
 }
 

[2/6] git commit: updated refs/heads/master-6-17-stable to 4f75062

[jayapal]

CLOUDSTACK-1578 Egress default policy configurable using network offering in 
xenserver with VR as firewall provider


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

Branch: refs/heads/master-6-17-stable
Commit: 32b43d2b174496a5a0ae21024062247f6166374c
Parents: f00ebad
Author: Jayapal 
Authored: Mon Jun 24 14:24:49 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 14:30:22 2013 +0530

--
 api/src/com/cloud/offering/NetworkOffering.java |  1 +
 .../org/apache/cloudstack/api/ApiConstants.java |  1 +
 .../admin/network/CreateNetworkOfferingCmd.java | 10 ++
 .../api/response/NetworkOfferingResponse.java   |  7 
 .../api/routing/NetworkElementCommand.java  |  1 +
 .../com/cloud/network/rules/FirewallRuleVO.java |  7 
 .../com/cloud/offerings/NetworkOfferingVO.java  | 10 +-
 .../debian/config/root/firewallRule_egress.sh   | 26 +++---
 .../xen/resource/CitrixResourceBase.java|  8 +
 server/src/com/cloud/api/ApiResponseHelper.java |  1 +
 .../configuration/ConfigurationManager.java |  2 +-
 .../configuration/ConfigurationManagerImpl.java | 12 +--
 .../com/cloud/network/NetworkManagerImpl.java   | 37 +---
 .../network/firewall/FirewallManagerImpl.java   | 31 
 .../VirtualNetworkApplianceManagerImpl.java | 32 -
 .../cloud/network/rules/FirewallManager.java|  1 +
 .../cloud/server/ConfigurationServerImpl.java   |  2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |  5 +++
 .../cloud/vpc/MockConfigurationManagerImpl.java |  2 +-
 .../CreateNetworkOfferingTest.java  | 20 +--
 setup/db/db/schema-410to420.sql |  1 +
 21 files changed, 175 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32b43d2b/api/src/com/cloud/offering/NetworkOffering.java
--
diff --git a/api/src/com/cloud/offering/NetworkOffering.java 
b/api/src/com/cloud/offering/NetworkOffering.java
index 5f522eb..43312db 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -127,5 +127,6 @@ public interface NetworkOffering extends 
InfrastructureEntity, InternalIdentity,
 boolean getInternalLb();
 
 boolean getPublicLb();
+boolean getEgressDefaultPolicy();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32b43d2b/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index b43f06c..c4dba5d 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -117,6 +117,7 @@ public class ApiConstants {
 public static final String IS_PORTABLE = "isportable";
 public static final String IS_PUBLIC = "ispublic";
 public static final String IS_PERSISTENT = "ispersistent";
+public static final String EGRESS_DEFAULT_POLICY = "egressdefaultpolicy";
 public static final String IS_READY = "isready";
 public static final String IS_RECURSIVE = "isrecursive";
 public static final String ISO_FILTER = "isofilter";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/32b43d2b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index febb0c3..94e263c 100644
--- 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -99,6 +99,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
" Supported keys are internallbprovider/publiclbprovider with 
service provider as a value")
 protected Map details;
 
+@Parameter(name=ApiConstants.EGRESS_DEFAULT_POLICY, 
type=CommandType.BOOLEAN, description="true if default guest network egress 
policy is allow; false if default egress policy is deny")
+private Boolean egressDefaultPolicy;
+
 /
 /// Accessors ///
 /
@@ -162,6 +165,13 @@ public class CreateNetworkOfferingCmd extends Ba

[1/6] git commit: updated refs/heads/network_acl to 9a5912a

[jayapal]

Updated Branches:
  refs/heads/master-6-17-stable f00ebad1c -> 4f7506264
  refs/heads/network_acl 0396ef9c2 -> 9a5912a3f


CLOUDSTACK-2364: fixed private gateway creation in VPC - the vnet for the 
private gateway network is not stored in data_center_vnet table


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

Branch: refs/heads/network_acl
Commit: 9a5912a3f0dbb045e73391301d78a7ee33a6d630
Parents: 0396ef9
Author: Alena Prokharchyk 
Authored: Tue May 7 13:02:29 2013 -0700
Committer: Jayapal 
Committed: Thu May 9 11:00:56 2013 +0530

--
 .../com/cloud/network/NetworkManagerImpl.java   | 39 +++-
 1 file changed, 22 insertions(+), 17 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9a5912a3/server/src/com/cloud/network/NetworkManagerImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java 
b/server/src/com/cloud/network/NetworkManagerImpl.java
index 7d349fd..73ec160 100755
--- a/server/src/com/cloud/network/NetworkManagerImpl.java
+++ b/server/src/com/cloud/network/NetworkManagerImpl.java
@@ -2005,23 +2005,28 @@ public class NetworkManagerImpl extends ManagerBase 
implements NetworkManager, L
 if (_networksDao.countByZoneAndUri(zoneId, uri) > 0) {
 throw new InvalidParameterValueException("Network with 
vlan " + vlanId + " already exists in zone " + zoneId);
 } else {
-DataCenterVnetVO dcVnet = 
_datacenterVnetDao.findVnet(zoneId, vlanId.toString()).get(0);
-// Fail network creation if specified vlan is dedicated to 
a different account
-if (dcVnet.getAccountGuestVlanMapId() != null) {
-Long accountGuestVlanMapId = 
dcVnet.getAccountGuestVlanMapId();
-AccountGuestVlanMapVO map = 
_accountGuestVlanMapDao.findById(accountGuestVlanMapId);
-if (map.getAccountId() != owner.getAccountId()) {
-throw new InvalidParameterValueException("Vlan " + 
vlanId + " is dedicated to a different account");
-}
-// Fail network creation if owner has a dedicated range of 
vlans but the specified vlan belongs to the system pool
-} else {
-List maps = 
_accountGuestVlanMapDao.listAccountGuestVlanMapsByAccount(owner.getAccountId());
-if (maps != null && !maps.isEmpty()) {
-int vnetsAllocatedToAccount = 
_datacenterVnetDao.countVnetsAllocatedToAccount(zoneId, owner.getAccountId());
-int vnetsDedicatedToAccount = 
_datacenterVnetDao.countVnetsDedicatedToAccount(zoneId, owner.getAccountId());
-if (vnetsAllocatedToAccount < 
vnetsDedicatedToAccount) {
-throw new 
InvalidParameterValueException("Specified vlan " + vlanId + " doesn't belong" +
-" to the vlan range dedicated to the 
owner "+ owner.getAccountName());
+List dcVnets = 
_datacenterVnetDao.findVnet(zoneId, vlanId.toString());
+//for the network that is created as part of private 
gateway,
+//the vnet is not coming from the data center vnet table, 
so the list can be empty
+if (!dcVnets.isEmpty()) {
+DataCenterVnetVO dcVnet = dcVnets.get(0);
+// Fail network creation if specified vlan is 
dedicated to a different account
+if (dcVnet.getAccountGuestVlanMapId() != null) {
+Long accountGuestVlanMapId = 
dcVnet.getAccountGuestVlanMapId();
+AccountGuestVlanMapVO map = 
_accountGuestVlanMapDao.findById(accountGuestVlanMapId);
+if (map.getAccountId() != owner.getAccountId()) {
+throw new InvalidParameterValueException("Vlan 
" + vlanId + " is dedicated to a different account");
+}
+// Fail network creation if owner has a dedicated 
range of vlans but the specified vlan belongs to the system pool
+} else {
+List maps = 
_accountGuestVlanMapDao.listAccountGuestVlanMapsByAccount(owner.getAccountId());
+if (maps != null && !maps.isEmpty()) {
+int vnetsAllocatedToAccount = 
_datacenterVnetDao.countVnetsAllocated

[6/6] git commit: updated refs/heads/master-6-17-stable to 4f75062

[jayapal]

CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering 
on SRX firewall


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

Branch: refs/heads/master-6-17-stable
Commit: 07034b620620d084ee50810ba986d1b15fa16e9b
Parents: 32b43d2
Author: Jayapal 
Authored: Thu Jun 20 16:28:09 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 14:30:23 2013 +0530

--
 .../com/cloud/agent/api/to/FirewallRuleTO.java  | 19 -
 .../network/resource/JuniperSrxResource.java| 86 ++--
 scripts/network/juniper/security-policy-add.xml |  3 +-
 .../ExternalFirewallDeviceManagerImpl.java  | 24 ++
 4 files changed, 86 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07034b62/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
--
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java 
b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index f296aa4..29d9c6f 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -53,6 +53,9 @@ public class FirewallRuleTO implements InternalIdentity {
 private Integer icmpType;
 private Integer icmpCode;
 private FirewallRule.TrafficType trafficType;
+private String guestCidr;
+private boolean defaultEgressPolicy;
+private FirewallRule.FirewallRuleType type;
 
 protected FirewallRuleTO() {
 }
@@ -110,9 +113,12 @@ public class FirewallRuleTO implements InternalIdentity {
 this(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), revokeState, alreadyAdded, 
purpose,rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode());
 }
 
-public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType) {
+public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType, String guestCidr, boolean 
defaultEgressPolicy, FirewallRule.FirewallRuleType type) {
 this(rule.getId(), guestVlanTag, null, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), 
rule.getState()==State.Revoke, rule.getState()==State.Active, 
rule.getPurpose(), rule.getSourceCidrList(), rule.getIcmpType(), 
rule.getIcmpCode());
 this.trafficType = trafficType;
+this.defaultEgressPolicy = defaultEgressPolicy;
+this.guestCidr = guestCidr;
+this.type = type;
 }
 
 public FirewallRule.TrafficType getTrafficType(){
@@ -170,4 +176,15 @@ public class FirewallRuleTO implements InternalIdentity {
 return purpose;
 }
 
+public boolean isDefaultEgressPolicy() {
+return defaultEgressPolicy;
+}
+
+public String getGuestCidr() {
+return guestCidr;
+}
+
+public FirewallRule.FirewallRuleType getType() {
+return type;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/07034b62/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
--
diff --git 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index fd065d5..3d3d797 100644
--- 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringReader;
+import java.lang.String;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
@@ -321,7 +322,8 @@ public class JuniperSrxResource implements ServerResource {
 STATIC_NAT("staticnat"),
 DESTINATION_NAT("destnat"),
 VPN("vpn"),
-SECURITYPOLICY_EGRESS("egress");
+SECURITYPOLICY_EGRESS("egress"),
+SECURITYPOLICY_EGRESS_DEFAULT("egress-default");
 
 private String identifier;
 
@@ -828,15 +830,37 @@ public class JuniperSrxResource implements ServerResource 
{
 if (rules[0].getTrafficType() == FirewallRule.TrafficType.Egress) {
 Map> activeRules = 
getActiveFirewallEgressRules(rules);
 Set guestVlans = activeRules.keySet();
-List cidrs = new ArrayList();
+   // List cidrs = new ArrayList();
+ 

[3/6] git commit: updated refs/heads/master-6-17-stable to 4f75062

[jayapal]

CLOUDSTACK-1578 vmware:Egress default policy configurable using network 
offering on vmware


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

Branch: refs/heads/master-6-17-stable
Commit: 50724d4dfc98ac17567ac45bf59a3c0c6e2ea70c
Parents: 07034b6
Author: Jayapal 
Authored: Thu Jun 20 16:31:01 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 14:30:23 2013 +0530

--
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/50724d4d/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 1af4239..20e02b2 100755
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -743,12 +743,20 @@ public class VmwareResource implements 
StoragePoolResource, ServerResource, Vmwa
 String[] results = new String[cmd.getRules().length];
 FirewallRuleTO[] allrules = cmd.getRules();
 FirewallRule.TrafficType trafficType = allrules[0].getTrafficType();
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 String[][] rules = cmd.generateFwRules();
 String args = "";
 args += " -F ";
 if (trafficType == FirewallRule.TrafficType.Egress){
 args+= " -E ";
+if (egressDefault.equals("true")) {
+args+= " -P 1 ";
+} else if (egressDefault.equals("System")) {
+args+= " -P 2 ";
+} else {
+args+= " -P 0 ";
+}
 }
 
 StringBuilder sb = new StringBuilder();

Build failed in Jenkins: cloudstack-apidocs-41 #426

[Apache Jenkins Server]

See 

Changes:

[likitha.shetty] CLOUDSTACK-305. Everytime a SOAP call is made some 
transactions are rolled back because the transactions are not committed.

--
[...truncated 3061 lines...]
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] Compiling 18 source files to 

[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

Build failed in Jenkins: cloudstack-marvin-41 #465

[Apache Jenkins Server]

See 

Changes:

[likitha.shetty] CLOUDSTACK-305. Everytime a SOAP call is made some 
transactions are rolled back because the transactions are not committed.

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---

Build failed in Jenkins: cloudstack-apidocs-41 #427

[Apache Jenkins Server]

See 

--
[...truncated 3061 lines...]
[INFO] [INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:

Build failed in Jenkins: cloudstack-marvin-41 #466

[Apache Jenkins Server]

See 

--
[...truncated 3075 lines...]
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---[INFO] Copying 3 resources

[INFO] 
[INFO] Compiling 18 source files to 

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

---
 T E S T S
---

Results :

Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

[JENKINS] Recording test results
[INFO] 
[INFO] --- maven-war-plugin:2.1.1:war (default-war) @ cloud-engine-service ---
[INFO] Packaging webapp
[INFO] Assembling webapp [cloud-engine-service

git commit: updated refs/heads/master to 90838d7

[radhika]

Updated Branches:
  refs/heads/master dc242039b -> 90838d729


CLOUDSTACK-757


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

Branch: refs/heads/master
Commit: 90838d7292bf646a910f2a385f536f29effaf883
Parents: dc24203
Author: Radhika PC 
Authored: Mon Jun 24 16:16:43 2013 +0530
Committer: Radhika PC 
Committed: Mon Jun 24 16:17:30 2013 +0530

--
 docs/en-US/add-gateway-vpc.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90838d72/docs/en-US/add-gateway-vpc.xml
--
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
index 6aaa5d0..9a270f9 100644
--- a/docs/en-US/add-gateway-vpc.xml
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -158,8 +158,9 @@
 Blacklisting Routes
 &PRODUCT; enables you to block a list of routes so that they are not 
assigned to any of
   the VPC private gateways. Specify the list of routes that you want to 
blacklist in the
-blacklisted.routes global parameter. Note that the 
parameter update affects only new
-  static route creations. If you block an existing static route, it 
remains intact and
-  continue functioning. 
+blacklisted.routes global parameter. Note that the 
parameter update affects
+  only new static route creations. If you block an existing static route, 
it remains intact and
+  continue functioning. You cannot add a static route if the route is 
blacklisted for the zone.
+
   
 

git commit: updated refs/heads/master-6-17-stable to 1aed960

[kishan]

Updated Branches:
  refs/heads/master-6-17-stable 4f7506264 -> 1aed9602c


CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL


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

Branch: refs/heads/master-6-17-stable
Commit: 1aed9602c380a46592a44047299ca7b496b590a6
Parents: 4f75062
Author: Kishan Kavala 
Authored: Mon Jun 24 16:16:14 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 16:16:14 2013 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1aed9602/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index 25cd887..f88f600 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1298,8 +1298,12 @@ public class NetworkServiceImpl extends ManagerBase 
implements  NetworkService {
 throw new InvalidParameterValueException("Unable to find 
specified NetworkACL");
 }
 
-if(!vpcId.equals(acl.getVpcId())){
-throw new InvalidParameterValueException("ACL: "+aclId+" 
do not belong to the VPC");
+if(aclId != NetworkACL.DEFAULT_DENY && aclId != 
NetworkACL.DEFAULT_ALLOW) {
+//ACL is not default DENY/ALLOW
+// ACL should be associated with a VPC
+if(!vpcId.equals(acl.getVpcId())){
+throw new InvalidParameterValueException("ACL: 
"+aclId+" do not belong to the VPC");
+}
 }
 }
 network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, 
displayText, gateway, cidr, vlanId, 

git commit: updated refs/heads/master to 7c46cc9

[kishan]

Updated Branches:
  refs/heads/master 90838d729 -> 7c46cc958


CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL


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

Branch: refs/heads/master
Commit: 7c46cc958049c815337f42bfde788bbe9fba4811
Parents: 90838d7
Author: Kishan Kavala 
Authored: Mon Jun 24 16:16:14 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 16:22:02 2013 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c46cc95/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index e7de69e..5e900bb 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1298,8 +1298,12 @@ public class NetworkServiceImpl extends ManagerBase 
implements  NetworkService {
 throw new InvalidParameterValueException("Unable to find 
specified NetworkACL");
 }
 
-if(!vpcId.equals(acl.getVpcId())){
-throw new InvalidParameterValueException("ACL: "+aclId+" 
do not belong to the VPC");
+if(aclId != NetworkACL.DEFAULT_DENY && aclId != 
NetworkACL.DEFAULT_ALLOW) {
+//ACL is not default DENY/ALLOW
+// ACL should be associated with a VPC
+if(!vpcId.equals(acl.getVpcId())){
+throw new InvalidParameterValueException("ACL: 
"+aclId+" do not belong to the VPC");
+}
 }
 }
 network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, 
displayText, gateway, cidr, vlanId, 

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

[sateesh]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/master
Commit: 390022c4eaa1d7c6de9e89006f56defc0eb0ebd2
Parents: 3c88dd4 7c46cc9
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 11:07:25 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 11:07:25 2013 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--

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

[sateesh]

Updated Branches:
  refs/heads/master 7c46cc958 -> 390022c4e


CLOUDSTACK-3151 [VMware] CloudStack does case sensitive processing of names of 
VMware objects.

Signed-off-by: Sateesh Chodapuneedi 


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

Branch: refs/heads/master
Commit: 3c88dd4f801fe255d918fd1de6a962a8ab4fda4d
Parents: 90838d7
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 11:06:16 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 11:06:16 2013 +0530

--
 .../src/com/cloud/hypervisor/vmware/util/VmwareClient.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c88dd4f/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
--
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
index 87c7909..1b75e2d 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -24,17 +24,17 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 
-
 import com.vmware.vim25.DynamicProperty;
 import com.vmware.vim25.InvalidCollectorVersionFaultMsg;
 import com.vmware.vim25.InvalidPropertyFaultMsg;
 import com.vmware.vim25.LocalizedMethodFault;
 import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.ObjectContent;
 import com.vmware.vim25.ObjectSpec;
 import com.vmware.vim25.ObjectUpdate;
 import com.vmware.vim25.ObjectUpdateKind;
@@ -51,7 +51,6 @@ import com.vmware.vim25.TraversalSpec;
 import com.vmware.vim25.UpdateSet;
 import com.vmware.vim25.VimPortType;
 import com.vmware.vim25.VimService;
-import com.vmware.vim25.ObjectContent;
 
 /**
  * A wrapper class to handle Vmware vsphere connection and disconnection.
@@ -554,7 +553,7 @@ public class VmwareClient {
 if (type == null || type.equals(mor.getType())) {
 if (propary.size() > 0) {
 String propval = (String) propary.get(0).getVal();
-if (propval != null && name.equals(propval))
+if (propval != null && name.equalsIgnoreCase(propval))
 return mor;
 }
 }

git commit: updated refs/heads/master-6-17-stable to 4926262

[kishan]

Updated Branches:
  refs/heads/master-6-17-stable 1aed9602c -> 492626220


CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule


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

Branch: refs/heads/master-6-17-stable
Commit: 4926262201646d18b5d8ba973ef81a04c364d0aa
Parents: 1aed960
Author: Kishan Kavala 
Authored: Mon Jun 24 17:13:52 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:13:52 2013 +0530

--
 .../src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49262622/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index b0c807e..4c97869 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -308,7 +308,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem(aclItemCmd.getSourcePortStart(), 
aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(),
-aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction());
+aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber());
 
 return 
_networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(),
 aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), 
aclItemCmd.getSourceCidrList(), aclItemCmd.getIcmpCode(),
@@ -316,7 +316,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 private void validateNetworkACLItem(Integer portStart, Integer portEnd, 
List sourceCidrList, String protocol, Integer icmpCode,
-Integer icmpType, String action) {
+Integer icmpType, String action, 
Integer number) {
 
 if (portStart != null && !NetUtils.isValidPort(portStart)) {
 throw new InvalidParameterValueException("publicPort is an invalid 
value: " + portStart);
@@ -388,6 +388,11 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 throw new InvalidParameterValueException("Invalid action. 
Allowed actions are Allow and Deny");
 }
 }
+
+//Check for valid number
+if(number != null && number < 1){
+throw new InvalidParameterValueException("Invalid number. Number 
cannot be < 1");
+}
 }
 
 @Override
@@ -526,7 +531,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem((sourcePortStart == null) ? 
aclItem.getSourcePortStart() : sourcePortStart, (sourcePortEnd == null) ? 
aclItem.getSourcePortEnd() : sourcePortEnd,
-sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action);
+sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action, number);
 
 return _networkAclMgr.updateNetworkACLItem(id, protocol, 
sourceCidrList, trafficType, action, number, sourcePortStart,
 sourcePortEnd, icmpCode, icmpType);

git commit: updated refs/heads/master to bd5ad44

[kishan]

Updated Branches:
  refs/heads/master 390022c4e -> bd5ad442d


CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule


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

Branch: refs/heads/master
Commit: bd5ad442d0f82467cf10fea409511a5dea0a5704
Parents: 390022c
Author: Kishan Kavala 
Authored: Mon Jun 24 17:13:52 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:20:29 2013 +0530

--
 .../src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd5ad442/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index b0c807e..4c97869 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -308,7 +308,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem(aclItemCmd.getSourcePortStart(), 
aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(),
-aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction());
+aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber());
 
 return 
_networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(),
 aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), 
aclItemCmd.getSourceCidrList(), aclItemCmd.getIcmpCode(),
@@ -316,7 +316,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 private void validateNetworkACLItem(Integer portStart, Integer portEnd, 
List sourceCidrList, String protocol, Integer icmpCode,
-Integer icmpType, String action) {
+Integer icmpType, String action, 
Integer number) {
 
 if (portStart != null && !NetUtils.isValidPort(portStart)) {
 throw new InvalidParameterValueException("publicPort is an invalid 
value: " + portStart);
@@ -388,6 +388,11 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 throw new InvalidParameterValueException("Invalid action. 
Allowed actions are Allow and Deny");
 }
 }
+
+//Check for valid number
+if(number != null && number < 1){
+throw new InvalidParameterValueException("Invalid number. Number 
cannot be < 1");
+}
 }
 
 @Override
@@ -526,7 +531,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem((sourcePortStart == null) ? 
aclItem.getSourcePortStart() : sourcePortStart, (sourcePortEnd == null) ? 
aclItem.getSourcePortEnd() : sourcePortEnd,
-sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action);
+sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action, number);
 
 return _networkAclMgr.updateNetworkACLItem(id, protocol, 
sourceCidrList, trafficType, action, number, sourcePortStart,
 sourcePortEnd, icmpCode, icmpType);

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

[Apache Jenkins Server]

See 

Changes:

[kishan] CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule

--
[...truncated 2392 lines...]
[INFO] Deleting 

 (includes = [**/*], excludes = [])
[INFO] Building Apache CloudStack Plugin - Hypervisor OracleVM 4.2.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-plugin-hypervisor-ovm ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] Compiling 18 source files to 

[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-plugin-hypervisor-ovm ---

Results :

Tests run: 0, Failures: 0, Errors: 0, Skipped: 0

[JENKINS] Recording test results
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ cloud-plugin-hypervisor-ovm 
---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-plugin-hypervisor-ovm/4.2.0-SNAPSHOT/cloud-plugin-hypervisor-ovm-4.2.0-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-plugin-hypervisor-ovm/4.2.0-SNAPSHOT/cloud-plugin-hypervisor-ovm-4.2.0-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-plugin-hypervisor-ovm ---
[INFO] [INFO] Deleting 

 (includes = [**/*], excludes = [])

[INFO] 
[INFO] Building Apache CloudStack Plugin - Open vSwitch 4.2.0-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-plugin-network-ovs ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-plugin-network-ovs ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-plugin-network-ovs ---
[INFO] [INFO] Compiling 23 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-plugin-network-ovs ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-reso

git commit: updated refs/heads/master to e9df9c2

[sateesh]

Updated Branches:
  refs/heads/master bd5ad442d -> e9df9c29b


CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is 
still associated with that zone.

Check if there exists any VMware DC already associated with this zone. Deny 
zone deletion if true.

Signed-off-by: Sateesh Chodapuneedi 


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

Branch: refs/heads/master
Commit: e9df9c29bde4374e443c91ed91e2706b6074082f
Parents: bd5ad44
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 12:11:31 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 12:11:31 2013 +0530

--
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9df9c29/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 425c8be..89a640d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1301,6 +1301,12 @@ public class ConfigurationManagerImpl extends 
ManagerBase implements Configurati
 physicalNetworks.add(2, "there are physical networks in this zone");
 tablesToCheck.add(physicalNetworks);
 
+List vmwareDcs = new ArrayList();
+vmwareDcs.add(0, "vmware_data_center_zone_map");
+vmwareDcs.add(1, "zone_id");
+vmwareDcs.add(2, "there are VMware datacenters associated with this 
zone. Remove VMware DC from this zone.");
+tablesToCheck.add(vmwareDcs);
+
 for (List table : tablesToCheck) {
 String tableName = table.get(0);
 String column = table.get(1);

git commit: updated refs/heads/master-6-17-stable to 0d84197

[kishan]

Updated Branches:
  refs/heads/master-6-17-stable 492626220 -> 0d841971b


CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not 
be allowed. Check for associated tiers/gateways before deletion


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

Branch: refs/heads/master-6-17-stable
Commit: 0d841971b52a647a30a6ae641eda908425a6a2bb
Parents: 4926262
Author: Kishan Kavala 
Authored: Mon Jun 24 17:53:15 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:53:15 2013 +0530

--
 .../src/com/cloud/network/vpc/dao/VpcGatewayDao.java|  2 ++
 .../com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java|  8 
 .../com/cloud/network/vpc/NetworkACLManagerImpl.java| 12 
 3 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d841971/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
index 24d9deb..42144b6 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
@@ -30,4 +30,6 @@ public interface VpcGatewayDao extends 
GenericDao{
 Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String 
ipaddr);
 
 List listByVpcIdAndType(long vpcId, VpcGateway.Type type);
+
+List listByAclIdAndType(long aclId, VpcGateway.Type type);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d841971/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
index 6a2f8bd..a8cb2b3 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -41,6 +41,7 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 AllFieldsSearch.and("type", AllFieldsSearch.entity().getType(), 
SearchCriteria.Op.EQ);
 AllFieldsSearch.and("networkid", 
AllFieldsSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.and("ipaddress", 
AllFieldsSearch.entity().getIp4Address(), SearchCriteria.Op.EQ);
+AllFieldsSearch.and("aclId", 
AllFieldsSearch.entity().getNetworkACLId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.done();
 }
 
@@ -86,4 +87,11 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 return listBy(sc);
 }
 
+@Override
+public List listByAclIdAndType(long aclId, VpcGateway.Type 
type) {
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("aclId", aclId);
+sc.setParameters("type", type);
+return listBy(sc);
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d841971/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index c2d092a..4881b73 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -122,6 +122,18 @@ public class NetworkACLManagerImpl extends ManagerBase 
implements NetworkACLMana
 if(aclItems.size() > 0){
 throw new CloudRuntimeException("ACL is not empty. Cannot delete 
network ACL: "+acl.getUuid());
 }
+
+List networks = _networkDao.listByAclId(acl.getId());
+if(networks != null && networks.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+networks.size()+" tier(s). Cannot delete network ACL: "+acl.getUuid());
+}
+
+List pvtGateways = 
_vpcGatewayDao.listByAclIdAndType(acl.getId(), VpcGateway.Type.Private);
+
+if(pvtGateways != null && pvtGateways.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+pvtGateways.size()+" private gateway(s). Cannot delete network ACL: 
"+acl.getUuid());
+}
+
 return _networkACLDao.remove(acl.getId());
 }
 

Jenkins build is back to normal : cloudstack-apidocs-master #897

[Apache Jenkins Server]

See 

git commit: updated refs/heads/master to da00066

[kishan]

Updated Branches:
  refs/heads/master e9df9c29b -> da0006618


CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not 
be allowed. Check for associated tiers/gateways before deletion


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

Branch: refs/heads/master
Commit: da0006618f5bd33cea1e51e65208ade2ebcfaf7b
Parents: e9df9c2
Author: Kishan Kavala 
Authored: Mon Jun 24 17:53:15 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:58:29 2013 +0530

--
 .../src/com/cloud/network/vpc/dao/VpcGatewayDao.java|  2 ++
 .../com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java|  8 
 .../com/cloud/network/vpc/NetworkACLManagerImpl.java| 12 
 3 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
index 24d9deb..42144b6 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
@@ -30,4 +30,6 @@ public interface VpcGatewayDao extends 
GenericDao{
 Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String 
ipaddr);
 
 List listByVpcIdAndType(long vpcId, VpcGateway.Type type);
+
+List listByAclIdAndType(long aclId, VpcGateway.Type type);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
index 6a2f8bd..a8cb2b3 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -41,6 +41,7 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 AllFieldsSearch.and("type", AllFieldsSearch.entity().getType(), 
SearchCriteria.Op.EQ);
 AllFieldsSearch.and("networkid", 
AllFieldsSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.and("ipaddress", 
AllFieldsSearch.entity().getIp4Address(), SearchCriteria.Op.EQ);
+AllFieldsSearch.and("aclId", 
AllFieldsSearch.entity().getNetworkACLId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.done();
 }
 
@@ -86,4 +87,11 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 return listBy(sc);
 }
 
+@Override
+public List listByAclIdAndType(long aclId, VpcGateway.Type 
type) {
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("aclId", aclId);
+sc.setParameters("type", type);
+return listBy(sc);
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index c2d092a..4881b73 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -122,6 +122,18 @@ public class NetworkACLManagerImpl extends ManagerBase 
implements NetworkACLMana
 if(aclItems.size() > 0){
 throw new CloudRuntimeException("ACL is not empty. Cannot delete 
network ACL: "+acl.getUuid());
 }
+
+List networks = _networkDao.listByAclId(acl.getId());
+if(networks != null && networks.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+networks.size()+" tier(s). Cannot delete network ACL: "+acl.getUuid());
+}
+
+List pvtGateways = 
_vpcGatewayDao.listByAclIdAndType(acl.getId(), VpcGateway.Type.Private);
+
+if(pvtGateways != null && pvtGateways.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+pvtGateways.size()+" private gateway(s). Cannot delete network ACL: 
"+acl.getUuid());
+}
+
 return _networkACLDao.remove(acl.getId());
 }
 

Build failed in Jenkins: cloudstack-apidocs-41 #428

[Apache Jenkins Server]

See 

--
[...truncated 3061 lines...]
[INFO] [INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] [INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] 
Deleting 


[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] [INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin

Build failed in Jenkins: cloudstack-marvin-41 #467

[Apache Jenkins Server]

See 

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

Resu

Build failed in Jenkins: cloudstack-apidocs-41 #429

[Apache Jenkins Server]

See 

--
[...truncated 3061 lines...]
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] 
[INFO] 
[INFO] 
Deleting 


[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] Compiling 18 source files to 

[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] [INFO] Deleting 


[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:re

Build failed in Jenkins: cloudstack-marvin-41 #468

[Apache Jenkins Server]

See 

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

---
 T E S T S
---

Resu

git commit: updated refs/heads/master-6-17-stable to 3c214ab

[nitin]

Updated Branches:
  refs/heads/master-6-17-stable 0d841971b -> 3c214aba9


CLOUDSTACK-2916: admin is not able to login through UI after setting GP 
"cluster.cpu.allocated.capacity.notificationthreshold" to some string
CLOUDSTACK-2457:  No check for input values,special character,-ive values can 
be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"

Added validation for float values and checking limit for weight based 
parameters by creating a set of parameters.
Signed off by : nitin mehta


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

Branch: refs/heads/master-6-17-stable
Commit: 3c214aba97fc5e7507fe2e175f5f7a0f745557fe
Parents: 0d84197
Author: Harikrishna Patnala 
Authored: Mon Jun 24 19:57:29 2013 +0530
Committer: Nitin Mehta 
Committed: Mon Jun 24 19:59:17 2013 +0530

--
 .../configuration/ConfigurationManagerImpl.java | 36 
 test/integration/smoke/test_scale_vm.py | 13 +--
 2 files changed, 46 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c214aba/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 60e23e5..9c5f135 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -323,6 +323,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 private int _maxVolumeSizeInGb = 
Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
 private long _defaultPageSize = 
Long.parseLong(Config.DefaultPageSize.getDefaultValue());
 protected Set configValuesForValidation;
+private Set weightBasedParametersForValidation;
 
 @Override
 public boolean configure(final String name, final Map 
params) throws ConfigurationException {
@@ -335,6 +336,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
Long.parseLong(Config.DefaultPageSize.getDefaultValue()));
 
 populateConfigValuesForValidationSet();
+weightBasedParametersForValidation();
 return true;
 }
 
@@ -360,6 +362,28 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 configValuesForValidation.add("incorrect.login.attempts.allowed");
 }
 
+private void weightBasedParametersForValidation() {
+weightBasedParametersForValidation = new HashSet();
+
weightBasedParametersForValidation.add(Config.CPUCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PrivateIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.SecondaryStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.VlanCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.DirectNetworkPublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.LocalStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.CPUCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.AgentLoadThreshold.key());
+
weightBasedParametersForValidation.add(Config.VmUserDispersionWeight.key());
+
+
+}
+
 @Override
 public boolean start() {
 
@@ -692,6 +716,18 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 }
 }
 
+if (type.equals(Float.class)) {
+try {
+Float val = Float.parseFloat(value);
+if (weightBasedParametersForValidation.contains(name) && (val 
< 0f || val > 1f)) {
+throw new InvalidParameterValueException("Please enter a 
value between 0 a

git commit: updated refs/heads/master to f7b1d3d

[nitin]

Updated Branches:
  refs/heads/master da0006618 -> f7b1d3d8d


CLOUDSTACK-2916: admin is not able to login through UI after setting GP 
"cluster.cpu.allocated.capacity.notificationthreshold" to some string
CLOUDSTACK-2457:  No check for input values,special character,-ive values can 
be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"

Added validation for float values and checking limit for weight based 
parameters by creating a set of parameters.
Signed off by : nitin mehta


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

Branch: refs/heads/master
Commit: f7b1d3d8d5be58a8032fc79eec4dd5711226b93a
Parents: da00066
Author: Harikrishna Patnala 
Authored: Mon Jun 24 19:57:29 2013 +0530
Committer: Nitin Mehta 
Committed: Mon Jun 24 20:00:09 2013 +0530

--
 .../configuration/ConfigurationManagerImpl.java | 36 
 test/integration/smoke/test_scale_vm.py | 13 +--
 2 files changed, 46 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7b1d3d8/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 89a640d..704162e 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -324,6 +324,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 private int _maxVolumeSizeInGb = 
Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
 private long _defaultPageSize = 
Long.parseLong(Config.DefaultPageSize.getDefaultValue());
 protected Set configValuesForValidation;
+private Set weightBasedParametersForValidation;
 
 @Override
 public boolean configure(final String name, final Map 
params) throws ConfigurationException {
@@ -336,6 +337,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 Long.parseLong(Config.DefaultPageSize.getDefaultValue()));
 
 populateConfigValuesForValidationSet();
+weightBasedParametersForValidation();
 return true;
 }
 
@@ -361,6 +363,28 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 configValuesForValidation.add("incorrect.login.attempts.allowed");
 }
 
+private void weightBasedParametersForValidation() {
+weightBasedParametersForValidation = new HashSet();
+
weightBasedParametersForValidation.add(Config.CPUCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PrivateIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.SecondaryStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.VlanCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.DirectNetworkPublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.LocalStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.CPUCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.AgentLoadThreshold.key());
+
weightBasedParametersForValidation.add(Config.VmUserDispersionWeight.key());
+
+
+}
+
 @Override
 public boolean start() {
 
@@ -733,6 +757,18 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 }
 }
 
+if (type.equals(Float.class)) {
+try {
+Float val = Float.parseFloat(value);
+if (weightBasedParametersForValidation.contains(name) && (val 
< 0f || val > 1f)) {
+throw new InvalidParameterValueException("Please enter a 
value between 0 and 1 for the configurat

git commit: updated refs/heads/master-6-17-stable to ad33e6d

[nitin]

Updated Branches:
  refs/heads/master-6-17-stable 3c214aba9 -> ad33e6d47


CLOUDSTACK-2181: Scale down is allowed when one resource(say cpu) is being 
scale up and other resource (say ram) is
 being scale down ;but not allowed when both resources are being scaledown
Signed off by : Nitin Mehta


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

Branch: refs/heads/master-6-17-stable
Commit: ad33e6d475adf1abf45e3d983aaaba71460f1c3b
Parents: 3c214ab
Author: Harikrishna Patnala 
Authored: Mon Jun 24 12:09:44 2013 +0530
Committer: Nitin Mehta 
Committed: Mon Jun 24 20:00:44 2013 +0530

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ad33e6d4/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 e8ea024..4be6c18 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1161,9 +1161,9 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Use
 int currentMemory = currentServiceOffering.getRamSize();
 int currentSpeed = currentServiceOffering.getSpeed();
 
-if(newSpeed <= currentSpeed
-   && newMemory <= currentMemory
-   && newCpu<= currentCpu){
+// Don't allow to scale when (Any of the new values less than current 
values) OR (All current and new values are same)
+if( (newSpeed < currentSpeed || newMemory < currentMemory || newCpu < 
currentCpu)
+||  ( newSpeed == currentSpeed && newMemory == currentMemory 
&& newCpu == currentCpu)){
 throw new InvalidParameterValueException("Only scaling up the vm 
is supported, new service offering should have both cpu and memory greater than 
the old values");
 }
 

Build failed in Jenkins: cloudstack-apidocs-41 #430

[Apache Jenkins Server]

See 

--
[...truncated 3061 lines...]
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:reso

Build failed in Jenkins: cloudstack-marvin-41 #469

[Apache Jenkins Server]

See 

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

Resu

Build failed in Jenkins: cloudstack-apidocs-41 #431

[Apache Jenkins Server]

See 

--
[...truncated 3061 lines...]
[INFO] [INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] 
[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2

Build failed in Jenkins: cloudstack-marvin-41 #470

[Apache Jenkins Server]

See 

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Building jar: 


[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/0/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] [INFO] Deleting 


[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-service ---

Resu

git commit: updated refs/heads/master to 0b4e0b3

[jessicawang]

Updated Branches:
  refs/heads/master f7b1d3d8d -> 0b4e0b307


BUG-ID: CS-17733 - make detailView widget to pass jsonObj to tagger widget, so 
dataProvider  in tagger widget is able to pass projectid to listTags API.

Reviewed-by: Brian


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

Branch: refs/heads/master
Commit: 0b4e0b307f896acb005ac98ebca346e4674790e9
Parents: f7b1d3d
Author: Jessica Wang 
Authored: Sat Jun 22 16:29:05 2013 -0700
Committer: Jessica Wang 
Committed: Mon Jun 24 11:30:35 2013 -0700

--
 ui/scripts/sharedFunctions.js   | 4 
 ui/scripts/ui/widgets/detailView.js | 3 ++-
 ui/scripts/ui/widgets/tagger.js | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b4e0b30/ui/scripts/sharedFunctions.js
--
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 86dc68e..dd9a7d6 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -821,6 +821,10 @@ cloudStack.api = {
   data.projectid=args.context.projects[0].id;
 }
 
+   if(args.jsonObj != null && 
args.jsonObj.projectid != null && data.projectid == null) {
+ data.projectid = args.jsonObj.projectid;
+   }
+   
 $.ajax({
   url: createURL('listTags'),
   data: data,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b4e0b30/ui/scripts/ui/widgets/detailView.js
--
diff --git a/ui/scripts/ui/widgets/detailView.js 
b/ui/scripts/ui/widgets/detailView.js
index ab1fe9b..356d9f2 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1178,7 +1178,8 @@
   !$detailView.data('view-args').compact) {
 $('').tagger(
   $.extend(true, {}, tabs.tags, {
-context: $detailView.data('view-args').context
+context: $detailView.data('view-args').context,
+   jsonObj: 
$detailView.data('view-args').jsonObj
   })
 ).appendTo($detailView.find('.main-groups'));
   }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0b4e0b30/ui/scripts/ui/widgets/tagger.js
--
diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 0f297eb..9af6fb7 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -115,6 +115,7 @@
   $.widget('cloudStack.tagger', {
 _init: function(args) {
   var context = this.options.context;
+   var jsonObj = this.options.jsonObj;
   var dataProvider = this.options.dataProvider;
   var actions = this.options.actions;
   var $container = this.element.addClass('tagger');
@@ -209,6 +210,7 @@
   $loading.appendTo($container);
   dataProvider({
 context: context,
+   jsonObj: jsonObj,
 response: {
   success: function(args) {
 var data = args.data;

git commit: updated refs/heads/master-6-17-stable to 81264cd

[jessicawang]

Updated Branches:
  refs/heads/master-6-17-stable ad33e6d47 -> 81264cdd9


BUG-ID: CS-17733 - make detailView widget to pass jsonObj to tagger widget, so 
dataProvider  in tagger widget is able to pass projectid to listTags API.

Reviewed-by: Brian


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

Branch: refs/heads/master-6-17-stable
Commit: 81264cdd9e27922dd07a12d6052d81b2e0619b52
Parents: ad33e6d
Author: Jessica Wang 
Authored: Sat Jun 22 16:29:05 2013 -0700
Committer: Jessica Wang 
Committed: Mon Jun 24 11:32:21 2013 -0700

--
 ui/scripts/sharedFunctions.js   | 4 
 ui/scripts/ui/widgets/detailView.js | 3 ++-
 ui/scripts/ui/widgets/tagger.js | 2 ++
 3 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81264cdd/ui/scripts/sharedFunctions.js
--
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 86dc68e..dd9a7d6 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -821,6 +821,10 @@ cloudStack.api = {
   data.projectid=args.context.projects[0].id;
 }
 
+   if(args.jsonObj != null && 
args.jsonObj.projectid != null && data.projectid == null) {
+ data.projectid = args.jsonObj.projectid;
+   }
+   
 $.ajax({
   url: createURL('listTags'),
   data: data,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81264cdd/ui/scripts/ui/widgets/detailView.js
--
diff --git a/ui/scripts/ui/widgets/detailView.js 
b/ui/scripts/ui/widgets/detailView.js
index ab1fe9b..356d9f2 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -1178,7 +1178,8 @@
   !$detailView.data('view-args').compact) {
 $('').tagger(
   $.extend(true, {}, tabs.tags, {
-context: $detailView.data('view-args').context
+context: $detailView.data('view-args').context,
+   jsonObj: 
$detailView.data('view-args').jsonObj
   })
 ).appendTo($detailView.find('.main-groups'));
   }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/81264cdd/ui/scripts/ui/widgets/tagger.js
--
diff --git a/ui/scripts/ui/widgets/tagger.js b/ui/scripts/ui/widgets/tagger.js
index 0f297eb..9af6fb7 100644
--- a/ui/scripts/ui/widgets/tagger.js
+++ b/ui/scripts/ui/widgets/tagger.js
@@ -115,6 +115,7 @@
   $.widget('cloudStack.tagger', {
 _init: function(args) {
   var context = this.options.context;
+   var jsonObj = this.options.jsonObj;
   var dataProvider = this.options.dataProvider;
   var actions = this.options.actions;
   var $container = this.element.addClass('tagger');
@@ -209,6 +210,7 @@
   $loading.appendTo($container);
   dataProvider({
 context: context,
+   jsonObj: jsonObj,
 response: {
   success: function(args) {
 var data = args.data;

git commit: updated refs/heads/vmsync to e7c3479

[kelveny]

Updated Branches:
  refs/heads/vmsync 4254cb85c -> e7c34793f


Fix unit test issue in non-oss build, temporarily disable dipendency of 
external network-elements like F5, NetScalar


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

Branch: refs/heads/vmsync
Commit: e7c34793fe6057805ccc2439e9a05d0f1eb331da
Parents: 4254cb8
Author: Kelven Yang 
Authored: Mon Jun 24 12:19:02 2013 -0700
Committer: Kelven Yang 
Committed: Mon Jun 24 12:19:02 2013 -0700

--
 client/pom.xml  | 2 ++
 .../cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java| 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7c34793/client/pom.xml
--
diff --git a/client/pom.xml b/client/pom.xml
index ab758eb..047cef8 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -590,6 +590,7 @@
 
   
 
+
 
   vmware
   

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e7c34793/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
--
diff --git 
a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
 
b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
index de08c93..f169fe5 100644
--- 
a/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
+++ 
b/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
@@ -32,6 +32,7 @@ import junit.framework.TestCase;
 
 import org.apache.cloudstack.api.command.admin.zone.AddVmwareDcCmd;
 import org.apache.cloudstack.api.command.admin.zone.RemoveVmwareDcCmd;
+import org.apache.cloudstack.context.CallContext;
 import org.apache.cloudstack.test.utils.SpringUtils;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -89,7 +90,7 @@ import com.cloud.user.Account;
 import com.cloud.user.AccountManager;
 import com.cloud.user.AccountService;
 import com.cloud.user.AccountVO;
-import com.cloud.user.UserContext;
+import com.cloud.user.UserVO;
 import com.cloud.user.dao.AccountDao;
 import com.cloud.utils.component.ComponentContext;
 import com.cloud.utils.exception.CloudRuntimeException;
@@ -175,7 +176,7 @@ public class VmwareDatacenterApiUnitTest {
 acct.setType(Account.ACCOUNT_TYPE_ADMIN);
 acct.setAccountName("admin");
 acct.setDomainId(domainId);
-UserContext.registerContext(1, acct, null, true);
+CallContext.register(new UserVO(1), new AccountVO(2L), null);
 
 when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct);
 

git commit: updated refs/heads/master to 388e80e

[pranavs]

Updated Branches:
  refs/heads/master 0b4e0b307 -> 388e80efb


making fields required when adding a vmwareDC to a cloudstack zone


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

Branch: refs/heads/master
Commit: 388e80efb1bcde46475cd0b5ad6c1862dedb0b68
Parents: 0b4e0b3
Author: Pranav Saxena 
Authored: Tue Jun 25 01:12:42 2013 +0530
Committer: Pranav Saxena 
Committed: Tue Jun 25 01:12:42 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/388e80ef/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 0a8ea7e..ae6924e 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5711,7 +5711,7 @@
   title: 'Add VMware datacenter',
   fields: {
 name: { 
-  label: 'label.name',
+  label: 'DC Name',
   validation: { required: true }
 },
 vcenter: { 
@@ -5720,12 +5720,12 @@
 },
 username: {
   label: 'label.username',
-  validation: { required: false }
+  validation: { required: true }
 },
 password: {
   label: 'label.password',
   isPassword: true,
-  validation: { required: false }
+  validation: { required: true }
 },
   }
 },

git commit: updated refs/heads/master-6-17-stable to 1ab0dcd

[pranavs]

Updated Branches:
  refs/heads/master-6-17-stable 81264cdd9 -> 1ab0dcdd6


making fields required when adding a vmwareDC to a cloudstack zone


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

Branch: refs/heads/master-6-17-stable
Commit: 1ab0dcdd6afce50034c885a30c2eeb3ee300dd9b
Parents: 81264cd
Author: Pranav Saxena 
Authored: Tue Jun 25 01:12:42 2013 +0530
Committer: Pranav Saxena 
Committed: Tue Jun 25 01:16:28 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ab0dcdd/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f2e78b5..03ac411 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -5385,7 +5385,7 @@
   title: 'Add VMware datacenter',
   fields: {
 name: { 
-  label: 'label.name',
+  label: 'DC Name',
   validation: { required: true }
 },
 vcenter: { 
@@ -5394,12 +5394,12 @@
 },
 username: {
   label: 'label.username',
-  validation: { required: false }
+  validation: { required: true }
 },
 password: {
   label: 'label.password',
   isPassword: true,
-  validation: { required: false }
+  validation: { required: true }
 },
   }
 },

git commit: updated refs/heads/master to 8b2aae0

[alena1108]

Updated Branches:
  refs/heads/master 388e80efb -> 8b2aae0bf


CLOUDSTACK-3169: ipAssoc - set account id of the ip to the project account. 
Used to be set to the network owner which is System in Shared network case, and 
the further verification used to fail because of that


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

Branch: refs/heads/master
Commit: 8b2aae0bfecde3db7e804a328fc99b136513bee7
Parents: 388e80e
Author: Alena Prokharchyk 
Authored: Mon Jun 24 15:25:05 2013 -0700
Committer: Alena Prokharchyk 
Committed: Mon Jun 24 15:25:05 2013 -0700

--
 .../user/address/AssociateIPAddrCmd.java| 47 +---
 1 file changed, 40 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8b2aae0b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
index b99ca63..c97a5e4 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java
@@ -16,21 +16,42 @@
 // under the License.
 package org.apache.cloudstack.api.command.user.address;
 
+import java.util.List;
+
+import org.apache.cloudstack.api.APICommand;
+import org.apache.cloudstack.api.ApiConstants;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.BaseAsyncCmd;
+import org.apache.cloudstack.api.BaseAsyncCreateCmd;
+import org.apache.cloudstack.api.BaseCmd;
+import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.api.response.DomainResponse;
+import org.apache.cloudstack.api.response.IPAddressResponse;
+import org.apache.cloudstack.api.response.NetworkResponse;
+import org.apache.cloudstack.api.response.ProjectResponse;
+import org.apache.cloudstack.api.response.RegionResponse;
+import org.apache.cloudstack.api.response.VpcResponse;
+import org.apache.cloudstack.api.response.ZoneResponse;
+import org.apache.log4j.Logger;
+
 import com.cloud.async.AsyncJob;
 import com.cloud.dc.DataCenter;
 import com.cloud.dc.DataCenter.NetworkType;
 import com.cloud.event.EventTypes;
-import com.cloud.exception.*;
+import com.cloud.exception.ConcurrentOperationException;
+import com.cloud.exception.InsufficientAddressCapacityException;
+import com.cloud.exception.InsufficientCapacityException;
+import com.cloud.exception.InvalidParameterValueException;
+import com.cloud.exception.PermissionDeniedException;
+import com.cloud.exception.ResourceAllocationException;
+import com.cloud.exception.ResourceUnavailableException;
 import com.cloud.network.IpAddress;
 import com.cloud.network.Network;
 import com.cloud.network.vpc.Vpc;
+import com.cloud.projects.Project;
 import com.cloud.user.Account;
 import com.cloud.user.UserContext;
-import org.apache.cloudstack.api.*;
-import org.apache.cloudstack.api.response.*;
-import org.apache.log4j.Logger;
-
-import java.util.List;
 
 @APICommand(name = "associateIpAddress", description="Acquires and associates 
a public IP to an account.", responseObject=IPAddressResponse.class)
 public class AssociateIPAddrCmd extends BaseAsyncCreateCmd {
@@ -175,7 +196,19 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd 
{
 if (accountName != null && domainId != null) {
 Account account = _accountService.finalizeOwner(caller, 
accountName, domainId, projectId);
 return account.getId();
-} else if (networkId != null){
+} else if (projectId != null) {
+Project project = _projectService.getProject(projectId);
+if (project != null) {
+if (project.getState() == Project.State.Active) {
+return project.getProjectAccountId();
+} else {
+throw new PermissionDeniedException("Can't add resources 
to the project with specified projectId in state="
+   + project.getState() + " as it's no longer active");
+}
+} else {
+throw new InvalidParameterValueException("Unable to find 
project by id");
+}
+   } else if (networkId != null){
 Network network = _networkService.getNetwork(networkId);
 return network.getAccountId();
 } else if (vpcId != null) {

git commit: updated refs/heads/4.1 to 654caca

[higster]

Updated Branches:
  refs/heads/4.1 de2588516 -> 654caca53


CLOUDSTACK-3098: Fix for CentOS/RHEL


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

Branch: refs/heads/4.1
Commit: 654caca5331c8a036c7c6c6e39faff5b9e57b5d8
Parents: de25885
Author: Geoff Higginbottom 
Authored: Mon Jun 24 22:33:06 2013 +
Committer: Geoff Higginbottom 
Committed: Mon Jun 24 22:33:06 2013 +

--
 docs/en-US/management-server-install-client.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/654caca5/docs/en-US/management-server-install-client.xml
--
diff --git a/docs/en-US/management-server-install-client.xml 
b/docs/en-US/management-server-install-client.xml
index 47d6b3e..1796142 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -46,7 +46,7 @@
 Before setting up the Management Server, download vhd-util from 
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util";>vhd-util.
 If the Management Server is RHEL or CentOS, copy vhd-util to
-  /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.
+  /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.
 If the Management Server is Ubuntu, copy vhd-util to
   /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.
   

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

[higster]

Updated Branches:
  refs/heads/master 8b2aae0bf -> adeddc2c6


CLOUDSTACK-3098: Fix for CentOS/RHEL


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

Branch: refs/heads/master
Commit: b5cfe74c66439d8a25de5d3abf064d35f938ee7c
Parents: 388e80e
Author: Geoff Higginbottom 
Authored: Mon Jun 24 22:33:06 2013 +
Committer: Geoff Higginbottom 
Committed: Mon Jun 24 22:36:50 2013 +

--
 docs/en-US/management-server-install-client.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b5cfe74c/docs/en-US/management-server-install-client.xml
--
diff --git a/docs/en-US/management-server-install-client.xml 
b/docs/en-US/management-server-install-client.xml
index 47d6b3e..1796142 100644
--- a/docs/en-US/management-server-install-client.xml
+++ b/docs/en-US/management-server-install-client.xml
@@ -46,7 +46,7 @@
 Before setting up the Management Server, download vhd-util from 
http://download.cloud.com.s3.amazonaws.com/tools/vhd-util";>vhd-util.
 If the Management Server is RHEL or CentOS, copy vhd-util to
-  /usr/lib64/cloud/common/scripts/vm/hypervisor/xenserver.
+  /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver.
 If the Management Server is Ubuntu, copy vhd-util to
   /usr/lib/cloud/common/scripts/vm/hypervisor/xenserver.
   

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

[higster]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/master
Commit: adeddc2c676c946b1385860d5ebf1728b30617ab
Parents: b5cfe74 8b2aae0
Author: Geoff Higginbottom 
Authored: Mon Jun 24 22:37:29 2013 +
Committer: Geoff Higginbottom 
Committed: Mon Jun 24 22:37:29 2013 +

--
 .../user/address/AssociateIPAddrCmd.java| 47 +---
 1 file changed, 40 insertions(+), 7 deletions(-)
--

Build failed in Jenkins: cloudstack-apidocs-41 #432

[Apache Jenkins Server]

See 

Changes:

[geoff.higginbttom] CLOUDSTACK-3098: Fix for CentOS/RHEL

--
[...truncated 3061 lines...]

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-testclient ---
[INFO] Installing 
 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT.pom
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-testclient/4.1.1-SNAPSHOT/cloud-testclient-4.1.1-SNAPSHOT-tests.jar
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Engine Storage integration test Component 
4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] Nothing to compile - all classes are up to date
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom
[INFO] 
[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] Deleting 

[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

Build failed in Jenkins: cloudstack-marvin-41 #471

[Apache Jenkins Server]

See 

Changes:

[geoff.higginbttom] CLOUDSTACK-3098: Fix for CentOS/RHEL

--
[...truncated 3071 lines...]
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] No sources to compile

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-storage-integration-test ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-storage-integration-test ---
[INFO] Copying 3 resources
[INFO] [INFO] Compiling 18 source files to 


[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Tests are skipped.

[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ 
cloud-engine-storage-integration-test ---
[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ 
cloud-engine-storage-integration-test ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-site-plugin:3.1:attach-descriptor (attach-descriptor) @ 
cloud-engine-storage-integration-test ---
[INFO] Tests are skipped.
[INFO] 
[INFO] --- maven-surefire-plugin:2.12:test (default) @ 
cloud-engine-storage-integration-test ---
[INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.jar
[INFO] [INFO] Installing 

 to 
/home/jenkins/jenkins-slave/maven-repositories/1/org/apache/cloudstack/cloud-engine-storage-integration-test/4.1.1-SNAPSHOT/cloud-engine-storage-integration-test-4.1.1-SNAPSHOT.pom

[INFO] --- maven-install-plugin:2.3.1:install (default-install) @ 
cloud-engine-storage-integration-test ---
[INFO] [INFO] Deleting 


[INFO] 
[INFO] Building Apache CloudStack Cloud Engine Service 4.1.1-SNAPSHOT
[INFO] 
[INFO] 
[INFO] --- maven-clean-plugin:2.5:clean (default-clean) @ cloud-engine-service 
---
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.3:process (default) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-resources-plugin:2.5:resources (default-resources) @ 
cloud-engine-service ---
[INFO] [INFO] Nothing to compile - all classes are up to date

[INFO] --- maven-compiler-plugin:2.5.1:compile (default-compile) @ 
cloud-engine-service ---
[debug] execute contextualize
[INFO] [INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] skip non existing resourceDirectory 

[INFO] Copying 3 resources

[INFO] --- maven-resources-plugin:2.5:testResources (default-testResources) @ 
cloud-engine-service ---
[INFO] No sources to compile
[INFO] 
[INFO] --- maven-compiler-plugin:2.5.1:testCompile (default-testCompile) @ 
cloud-engine-service ---
[INFO] [INFO] Surefire report directory: 


---
 T E S T S
---

[INFO] --- maven

git commit: updated refs/heads/master-6-17-stable to 4e80c3d

[jessicawang]

Updated Branches:
  refs/heads/master-6-17-stable 1ab0dcdd6 -> 4e80c3dbb


CLOUDSTACK-3166: UI - VPC section - configure VPC - tier - STATIC NATS - fix a 
bug that listView showed nothing.


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

Branch: refs/heads/master-6-17-stable
Commit: 4e80c3dbb4eab4e0f59efeac433f7e30059b96d8
Parents: 1ab0dcd
Author: Jessica Wang 
Authored: Mon Jun 24 16:33:56 2013 -0700
Committer: Jessica Wang 
Committed: Mon Jun 24 16:35:49 2013 -0700

--
 ui/scripts/vpc.js | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e80c3db/ui/scripts/vpc.js
--
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 759364d..773409f 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1397,7 +1397,11 @@
 listView.listView.dataProvider = function(args) {
   $.ajax({
 url: createURL('listPublicIpAddresses'),
-data: { networkid: args.context.networks[0].id, isstaticnat: true 
},
+data: { 
+  networkid: args.context.networks[0].id, 
+  isstaticnat: true,
+  listall: true
+},
 success: function(json) {
   args.response.success({
 data: json.listpublicipaddressesresponse.publicipaddress
@@ -3498,7 +3502,10 @@
 $.ajax({
   url: createURL('listPublicIpAddresses'),
   async: false,
-  data: { 'vpcid': args.context.vpc[0].id },
+  data: { 
+   vpcid: args.context.vpc[0].id,
+   listAll: true
+  },
   success: function(json) {
 publicIpAddresses = json.listpublicipaddressesresponse;
   },

git commit: updated refs/heads/master to af91a8a

[jessicawang]

Updated Branches:
  refs/heads/master adeddc2c6 -> af91a8ac8


CLOUDSTACK-3166: UI - VPC section - configure VPC - tier - STATIC NATS - fix a 
bug that listView showed nothing.


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

Branch: refs/heads/master
Commit: af91a8ac8de4ce73bafd8caf9b2cc1bd73bdb444
Parents: adeddc2
Author: Jessica Wang 
Authored: Mon Jun 24 16:33:56 2013 -0700
Committer: Jessica Wang 
Committed: Mon Jun 24 16:37:22 2013 -0700

--
 ui/scripts/vpc.js | 11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af91a8ac/ui/scripts/vpc.js
--
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index 759364d..773409f 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -1397,7 +1397,11 @@
 listView.listView.dataProvider = function(args) {
   $.ajax({
 url: createURL('listPublicIpAddresses'),
-data: { networkid: args.context.networks[0].id, isstaticnat: true 
},
+data: { 
+  networkid: args.context.networks[0].id, 
+  isstaticnat: true,
+  listall: true
+},
 success: function(json) {
   args.response.success({
 data: json.listpublicipaddressesresponse.publicipaddress
@@ -3498,7 +3502,10 @@
 $.ajax({
   url: createURL('listPublicIpAddresses'),
   async: false,
-  data: { 'vpcid': args.context.vpc[0].id },
+  data: { 
+   vpcid: args.context.vpc[0].id,
+   listAll: true
+  },
   success: function(json) {
 publicIpAddresses = json.listpublicipaddressesresponse;
   },

[30/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3124: Deletion of ACL associated with a tier/ pvt gateway should not 
be allowed. Check for associated tiers/gateways before deletion


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

Branch: refs/heads/vmsync
Commit: da0006618f5bd33cea1e51e65208ade2ebcfaf7b
Parents: e9df9c2
Author: Kishan Kavala 
Authored: Mon Jun 24 17:53:15 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:58:29 2013 +0530

--
 .../src/com/cloud/network/vpc/dao/VpcGatewayDao.java|  2 ++
 .../com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java|  8 
 .../com/cloud/network/vpc/NetworkACLManagerImpl.java| 12 
 3 files changed, 22 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
index 24d9deb..42144b6 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDao.java
@@ -30,4 +30,6 @@ public interface VpcGatewayDao extends 
GenericDao{
 Long getNetworkAclIdForPrivateIp(long vpcId, long networkId, String 
ipaddr);
 
 List listByVpcIdAndType(long vpcId, VpcGateway.Type type);
+
+List listByAclIdAndType(long aclId, VpcGateway.Type type);
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java 
b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
index 6a2f8bd..a8cb2b3 100644
--- a/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/vpc/dao/VpcGatewayDaoImpl.java
@@ -41,6 +41,7 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 AllFieldsSearch.and("type", AllFieldsSearch.entity().getType(), 
SearchCriteria.Op.EQ);
 AllFieldsSearch.and("networkid", 
AllFieldsSearch.entity().getNetworkId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.and("ipaddress", 
AllFieldsSearch.entity().getIp4Address(), SearchCriteria.Op.EQ);
+AllFieldsSearch.and("aclId", 
AllFieldsSearch.entity().getNetworkACLId(), SearchCriteria.Op.EQ);
 AllFieldsSearch.done();
 }
 
@@ -86,4 +87,11 @@ public class VpcGatewayDaoImpl extends 
GenericDaoBase implem
 return listBy(sc);
 }
 
+@Override
+public List listByAclIdAndType(long aclId, VpcGateway.Type 
type) {
+SearchCriteria sc = AllFieldsSearch.create();
+sc.setParameters("aclId", aclId);
+sc.setParameters("type", type);
+return listBy(sc);
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da000661/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
index c2d092a..4881b73 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLManagerImpl.java
@@ -122,6 +122,18 @@ public class NetworkACLManagerImpl extends ManagerBase 
implements NetworkACLMana
 if(aclItems.size() > 0){
 throw new CloudRuntimeException("ACL is not empty. Cannot delete 
network ACL: "+acl.getUuid());
 }
+
+List networks = _networkDao.listByAclId(acl.getId());
+if(networks != null && networks.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+networks.size()+" tier(s). Cannot delete network ACL: "+acl.getUuid());
+}
+
+List pvtGateways = 
_vpcGatewayDao.listByAclIdAndType(acl.getId(), VpcGateway.Type.Private);
+
+if(pvtGateways != null && pvtGateways.size() > 0){
+throw new CloudRuntimeException("ACL is still associated with 
"+pvtGateways.size()+" private gateway(s). Cannot delete network ACL: 
"+acl.getUuid());
+}
+
 return _networkACLDao.remove(acl.getId());
 }
 

[11/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3143: add response in the response string


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

Branch: refs/heads/vmsync
Commit: 5f06500ed47815b904ceecad911eb340854d91d4
Parents: 3e430cc
Author: Sebastien Goasguen 
Authored: Sun Jun 23 23:32:56 2013 -0400
Committer: Sebastien Goasguen 
Committed: Sun Jun 23 23:32:56 2013 -0400

--
 .../command/user/securitygroup/RevokeSecurityGroupEgressCmd.java   | 2 +-
 .../command/user/securitygroup/RevokeSecurityGroupIngressCmd.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f06500e/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
index 8e7f2ec..c03d3e4 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupEgressCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.Account;
 public class RevokeSecurityGroupEgressCmd extends BaseAsyncCmd {
 public static final Logger s_logger = 
Logger.getLogger(RevokeSecurityGroupEgressCmd.class.getName());
 
-private static final String s_name = "revokesecuritygroupegress";
+private static final String s_name = "revokesecuritygroupegressresponse";
 
 // ///
 // // API parameters /

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5f06500e/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
 
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
index 1d45064..c2fdb8b 100644
--- 
a/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/securitygroup/RevokeSecurityGroupIngressCmd.java
@@ -35,7 +35,7 @@ import com.cloud.user.Account;
 public class RevokeSecurityGroupIngressCmd extends BaseAsyncCmd {
 public static final Logger s_logger = 
Logger.getLogger(RevokeSecurityGroupIngressCmd.class.getName());
 
-private static final String s_name = "revokesecuritygroupingress";
+private static final String s_name = "revokesecuritygroupingressresponse";
 
 // ///
 // // API parameters /

[13/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

ntier apps


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

Branch: refs/heads/vmsync
Commit: f3fa54e732fc24013f551089805fd9900a9b0797
Parents: 1a50e2f
Author: Radhika PC 
Authored: Mon Jun 24 09:50:00 2013 +0530
Committer: Radhika PC 
Committed: Mon Jun 24 09:51:32 2013 +0530

--
 docs/en-US/add-gateway-vpc.xml | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f3fa54e7/docs/en-US/add-gateway-vpc.xml
--
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
index a081faf..5ef8b63 100644
--- a/docs/en-US/add-gateway-vpc.xml
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -22,7 +22,8 @@
   Adding a Private Gateway to a VPC
   A private gateway can be added by the root admin only. The VPC private 
network has 1:1
 relationship with the NIC of the physical network. You can configure 
multiple private gateways
-to a single VPC. No gateways with duplicated VLAN and IP are allowed in 
the same data center.
+to a single VPC. No gateways with duplicated VLAN and IP are allowed in 
the same data
+center.
   
 
   Log in to the &PRODUCT; UI as an administrator or end user.
@@ -148,4 +149,13 @@
   private gateway interface are blocked. You can change this default 
behaviour while creating a
   private gateway.
   
+  
+Creating a Static Route
+&PRODUCT; enables you to specify routing for the VPN connection you 
create. You can enter
+  one or CIDR addresses to indicate which traffic is to be routed back to 
the gateway.
+  
+  
+Blacklisting Routes
+
+  
 

[14/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3151 [VMware] CloudStack does case sensitive processing of names of 
VMware objects.

Signed-off-by: Sateesh Chodapuneedi 


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

Branch: refs/heads/vmsync
Commit: 3c88dd4f801fe255d918fd1de6a962a8ab4fda4d
Parents: 90838d7
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 11:06:16 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 11:06:16 2013 +0530

--
 .../src/com/cloud/hypervisor/vmware/util/VmwareClient.java| 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3c88dd4f/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
--
diff --git a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java 
b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
index 87c7909..1b75e2d 100644
--- a/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
+++ b/vmware-base/src/com/cloud/hypervisor/vmware/util/VmwareClient.java
@@ -24,17 +24,17 @@ import java.util.Map;
 import java.util.StringTokenizer;
 
 import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.SSLSession;
 import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLSession;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.handler.MessageContext;
 
-
 import com.vmware.vim25.DynamicProperty;
 import com.vmware.vim25.InvalidCollectorVersionFaultMsg;
 import com.vmware.vim25.InvalidPropertyFaultMsg;
 import com.vmware.vim25.LocalizedMethodFault;
 import com.vmware.vim25.ManagedObjectReference;
+import com.vmware.vim25.ObjectContent;
 import com.vmware.vim25.ObjectSpec;
 import com.vmware.vim25.ObjectUpdate;
 import com.vmware.vim25.ObjectUpdateKind;
@@ -51,7 +51,6 @@ import com.vmware.vim25.TraversalSpec;
 import com.vmware.vim25.UpdateSet;
 import com.vmware.vim25.VimPortType;
 import com.vmware.vim25.VimService;
-import com.vmware.vim25.ObjectContent;
 
 /**
  * A wrapper class to handle Vmware vsphere connection and disconnection.
@@ -554,7 +553,7 @@ public class VmwareClient {
 if (type == null || type.equals(mor.getType())) {
 if (propary.size() > 0) {
 String propval = (String) propary.get(0).getVal();
-if (propval != null && name.equals(propval))
+if (propval != null && name.equalsIgnoreCase(propval))
 return mor;
 }
 }

[35/50] [abbrv] merge is complete

[ahuang]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/server/src/com/cloud/vm/UserVmManagerImpl.java
--
diff --cc server/src/com/cloud/vm/UserVmManagerImpl.java
index 52580b6,66103fb..ae96297
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@@ -58,15 -59,16 +58,18 @@@ import org.apache.cloudstack.api.comman
  import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
  import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd;
  import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd;
 +import org.apache.cloudstack.context.CallContext;
  import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity;
  import org.apache.cloudstack.engine.service.api.OrchestrationService;
+ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateDataFactory;
+ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo;
 +import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 +import org.apache.cloudstack.framework.jobs.Outcome;
  import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
  import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
+ import org.apache.cloudstack.storage.to.TemplateObjectTO;
  
  import com.cloud.agent.AgentManager;
 -import com.cloud.agent.AgentManager.OnError;
  import com.cloud.agent.api.Answer;
  import com.cloud.agent.api.GetVmDiskStatsAnswer;
  import com.cloud.agent.api.GetVmDiskStatsCommand;
@@@ -75,11 -77,15 +78,11 @@@ import com.cloud.agent.api.GetVmStatsCo
  import com.cloud.agent.api.PvlanSetupCommand;
  import com.cloud.agent.api.StartAnswer;
  import com.cloud.agent.api.StopAnswer;
 -import com.cloud.agent.api.UnPlugNicAnswer;
 -import com.cloud.agent.api.UnPlugNicCommand;
  import com.cloud.agent.api.VmDiskStatsEntry;
  import com.cloud.agent.api.VmStatsEntry;
+ import com.cloud.agent.api.to.DiskTO;
  import com.cloud.agent.api.to.NicTO;
  import com.cloud.agent.api.to.VirtualMachineTO;
- import com.cloud.agent.api.to.VolumeTO;
  import com.cloud.agent.manager.Commands;
  import com.cloud.alert.AlertManager;
  import com.cloud.api.ApiDBUtils;
@@@ -1702,7 -1708,8 +1700,8 @@@ public class UserVmManagerImpl extends 
  Long id = cmd.getId();
  Long osTypeId = cmd.getOsTypeId();
  String userData = cmd.getUserData();
 +Account caller = CallContext.current().getCallingAccount();
+ Boolean isDynamicallyScalable = cmd.isDynamicallyScalable();
 -Account caller = UserContext.current().getCaller();
  
  // Input validation
  UserVmVO vmInstance = null;
@@@ -2869,30 -2893,11 +2885,11 @@@
  vm.setDetails(details);
  
  if (vm.getIsoId() != null) {
- String isoPath = null;
- 
- VirtualMachineTemplate template = _templateDao.findById(vm
- .getIsoId());
- if (template == null || template.getFormat() != ImageFormat.ISO) {
- throw new CloudRuntimeException(
- "Can not find ISO in vm_template table for id "
- + vm.getIsoId());
- }
- 
- Pair isoPathPair = templateMgr.getAbsoluteIsoPath(
- template.getId(), vm.getDataCenterId());
- 
- if (template.getTemplateType() == TemplateType.PERHOST) {
- isoPath = template.getName();
- } else {
- if (isoPathPair == null) {
- s_logger.warn("Couldn't get absolute iso path");
- return false;
- } else {
- isoPath = isoPathPair.first();
 -TemplateInfo template = 
this.templateMgr.prepareIso(vm.getIsoId(), vm.getDataCenterId());
++TemplateInfo template = templateMgr.prepareIso(vm.getIsoId(), 
vm.getDataCenterId());
+ if (template == null){
+ s_logger.error("Failed to prepare ISO on secondary or cache 
storage");
+ throw new CloudRuntimeException("Failed to prepare ISO on 
secondary or cache storage");
 -}
 +}
- }
- 
  if (template.isBootable()) {
  profile.setBootLoaderType(BootloaderType.CD);
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/server/test/com/cloud/agent/MockAgentManagerImpl.java
--

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/server/test/com/cloud/async/TestAsyncJobManager.java
--
diff --cc server/test/com/cloud/async/TestAsyncJobManager.java
index 6b4788b,e323393..8e27247
--- a/server/test/com/cloud/async/TestAsyncJobManager.java
+++ b/server/test/com/cloud/async/TestAsyncJobManager.java
@@@ -223,24 -157,96 +223,24 @@@ public class 

[15/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/vmsync
Commit: 390022c4eaa1d7c6de9e89006f56defc0eb0ebd2
Parents: 3c88dd4 7c46cc9
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 11:07:25 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 11:07:25 2013 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--

[22/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-1578 kvm:Egress default policy configurable using network offering 
on kvm


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

Branch: refs/heads/vmsync
Commit: 0cd8f9e7316759f7634a7057cb4b40c98c27b8ae
Parents: 9121191
Author: Jayapal 
Authored: Thu Jun 20 16:32:11 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0cd8f9e7/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
--
diff --git 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
index dae1c85..4f0ccec 100755
--- 
a/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
+++ 
b/core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
@@ -224,6 +224,7 @@ public class VirtualRoutingResource implements Manager {
 results[i] = "Failed";
 }
 String routerIp = cmd.getAccessDetail(NetworkElementCommand.ROUTER_IP);
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 if (routerIp == null) {
 return new SetFirewallRulesAnswer(cmd, false, results);
@@ -239,6 +240,13 @@ public class VirtualRoutingResource implements Manager {
 
 if (trafficType == FirewallRule.TrafficType.Egress){
 command.add("-E");
+if (egressDefault.equals("true")) {
+command.add("-P ", "1");
+} else if (egressDefault.equals("System")) {
+command.add("-P ", "2");
+} else {
+command.add("-P ", "0");
+}
 }
 
 StringBuilder sb = new StringBuilder();

[23/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3148 failed to create private gw with default acl id


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

Branch: refs/heads/vmsync
Commit: bb50c0d2d654e9a18c8bb04660ae407c54c6ac35
Parents: 0cd8f9e
Author: Jayapal 
Authored: Mon Jun 24 12:56:27 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 server/src/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bb50c0d2/server/src/com/cloud/network/vpc/VpcManagerImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java 
b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
index fb9e9b7..93413b4 100644
--- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java
+++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java
@@ -1389,7 +1389,7 @@ public class VpcManagerImpl extends ManagerBase 
implements VpcManager, VpcProvis
 if ( aclVO == null) {
 throw new InvalidParameterValueException("Invalid network acl 
id passed ");
 }
-if (aclVO.getVpcId() != vpcId ) {
+if ((aclVO.getVpcId() != vpcId) && !(aclId == 
NetworkACL.DEFAULT_DENY || aclId == NetworkACL.DEFAULT_ALLOW)) {
 throw new InvalidParameterValueException("Private gateway and 
network acl are not in the same vpc");
 }
 

[16/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-308. ec2-describe-instances - Instance type should return right 
service offering name


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

Branch: refs/heads/vmsync
Commit: 77674721cacba4bdf446c048118f10c474c92f03
Parents: f3fa54e
Author: Likitha Shetty 
Authored: Mon Jun 24 11:07:19 2013 +0530
Committer: Likitha Shetty 
Committed: Mon Jun 24 11:29:12 2013 +0530

--
 .../com/cloud/bridge/model/CloudStackServiceOfferingVO.java | 9 +++--
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java| 4 ++--
 awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77674721/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
--
diff --git a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java 
b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
index de2941e..f63301a 100644
--- a/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
+++ b/awsapi/src/com/cloud/bridge/model/CloudStackServiceOfferingVO.java
@@ -30,7 +30,10 @@ public class CloudStackServiceOfferingVO {
 @Id
 @Column(name="id")
 private String id;
-
+
+@Column(name="uuid")
+private String uuid;
+
 @Column(name="name")
 private String name;
 
@@ -61,7 +64,9 @@ public class CloudStackServiceOfferingVO {
 public void setDomainId(String domainId) {
 this.domainId = domainId;
 }
-
 
+public String getUuid() {
+return uuid;
+}
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77674721/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index 8cca13e..f0d05d3 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -58,13 +58,13 @@ public class CloudStackSvcOfferingDaoImpl extends 
GenericDaoBase searchByID = 
createSearchBuilder();
-searchByID.and("id", searchByID.entity().getName(), 
SearchCriteria.Op.EQ);
+searchByID.and("uuid", searchByID.entity().getUuid(), 
SearchCriteria.Op.EQ);
 searchByID.done();
 Transaction txn = Transaction.open(Transaction.CLOUD_DB);
 try {
 txn.start();
 SearchCriteria sc = 
searchByID.create();
-sc.setParameters("id", id);
+sc.setParameters("uuid", id);
 return findOneBy(sc);
 
 }finally {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/77674721/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
--
diff --git a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java 
b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
index 1859bb8..f24bfed 100644
--- a/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
+++ b/awsapi/src/com/cloud/bridge/service/core/ec2/EC2Engine.java
@@ -1772,7 +1772,7 @@ public class EC2Engine extends ManagerBase {
 private String serviceOfferingIdToInstanceType( String serviceOfferingId ) 
throws Exception {
 try{
 
-CloudStackServiceOfferingVO offering =  
scvoDao.getSvcOfferingById(serviceOfferingId); 
//dao.getSvcOfferingById(serviceOfferingId);
+CloudStackServiceOfferingVO offering =  
scvoDao.getSvcOfferingById(serviceOfferingId);
 if(offering == null){
 logger.warn( "No instanceType match for serviceOfferingId: [" 
+ serviceOfferingId + "]" );
 return "m1.small";

[50/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

merge from head


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

Branch: refs/heads/vmsync
Commit: 049dd7242e7778eaa4a5ac9b68dc3d2f7a3fb1e6
Parents: 7b7db05 e7c3479
Author: Alex Huang 
Authored: Mon Jun 24 16:51:59 2013 -0700
Committer: Alex Huang 
Committed: Mon Jun 24 16:51:59 2013 -0700

--
 client/pom.xml| 2 ++
 .../com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java  | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/049dd724/client/pom.xml
--

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/049dd724/plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/VmwareDatacenterApiUnitTest.java
--

[20/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-757


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

Branch: refs/heads/vmsync
Commit: 4f45673849dd8147c0ee95c160d7dc4e6762fcb8
Parents: aac9224
Author: Radhika PC 
Authored: Mon Jun 24 13:12:18 2013 +0530
Committer: Radhika PC 
Committed: Mon Jun 24 13:12:59 2013 +0530

--
 docs/en-US/add-gateway-vpc.xml | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f456738/docs/en-US/add-gateway-vpc.xml
--
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
index 5ef8b63..6aaa5d0 100644
--- a/docs/en-US/add-gateway-vpc.xml
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -156,6 +156,10 @@
   
   
 Blacklisting Routes
-
+&PRODUCT; enables you to block a list of routes so that they are not 
assigned to any of
+  the VPC private gateways. Specify the list of routes that you want to 
blacklist in the
+blacklisted.routes global parameter. Note that the 
parameter update affects only new
+  static route creations. If you block an existing static route, it 
remains intact and
+  continue functioning. 
   
 

[21/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-1578 Egress default policy configurable using network offering in 
xenserver with VR as firewall provider


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

Branch: refs/heads/vmsync
Commit: 6a7ae637dd3043c1fcf432c4e7037037f07def04
Parents: 4f45673
Author: Jayapal 
Authored: Thu Jun 20 16:27:02 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:00 2013 +0530

--
 api/src/com/cloud/offering/NetworkOffering.java |  1 +
 .../org/apache/cloudstack/api/ApiConstants.java |  1 +
 .../admin/network/CreateNetworkOfferingCmd.java | 10 ++
 .../api/response/NetworkOfferingResponse.java   |  7 
 .../api/routing/NetworkElementCommand.java  |  1 +
 .../com/cloud/network/rules/FirewallRuleVO.java |  7 
 .../com/cloud/offerings/NetworkOfferingVO.java  | 10 +-
 .../debian/config/root/firewallRule_egress.sh   | 26 +++---
 .../xen/resource/CitrixResourceBase.java|  8 +
 server/src/com/cloud/api/ApiResponseHelper.java |  1 +
 .../configuration/ConfigurationManager.java |  2 +-
 .../configuration/ConfigurationManagerImpl.java | 10 --
 .../com/cloud/network/NetworkManagerImpl.java   | 37 +---
 .../network/firewall/FirewallManagerImpl.java   | 31 
 .../VirtualNetworkApplianceManagerImpl.java | 32 -
 .../cloud/network/rules/FirewallManager.java|  1 +
 .../cloud/server/ConfigurationServerImpl.java   |  2 +-
 .../cloud/network/MockFirewallManagerImpl.java  |  5 +++
 .../cloud/vpc/MockConfigurationManagerImpl.java |  2 +-
 .../CreateNetworkOfferingTest.java  | 20 +--
 setup/db/db/schema-410to420.sql |  1 +
 21 files changed, 173 insertions(+), 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/com/cloud/offering/NetworkOffering.java
--
diff --git a/api/src/com/cloud/offering/NetworkOffering.java 
b/api/src/com/cloud/offering/NetworkOffering.java
index 5f522eb..43312db 100644
--- a/api/src/com/cloud/offering/NetworkOffering.java
+++ b/api/src/com/cloud/offering/NetworkOffering.java
@@ -127,5 +127,6 @@ public interface NetworkOffering extends 
InfrastructureEntity, InternalIdentity,
 boolean getInternalLb();
 
 boolean getPublicLb();
+boolean getEgressDefaultPolicy();
 
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/org/apache/cloudstack/api/ApiConstants.java
--
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java 
b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 50832a3..8ac7c3f 100755
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -121,6 +121,7 @@ public class ApiConstants {
 public static final String IS_PORTABLE = "isportable";
 public static final String IS_PUBLIC = "ispublic";
 public static final String IS_PERSISTENT = "ispersistent";
+public static final String EGRESS_DEFAULT_POLICY = "egressdefaultpolicy";
 public static final String IS_READY = "isready";
 public static final String IS_RECURSIVE = "isrecursive";
 public static final String ISO_FILTER = "isofilter";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6a7ae637/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
--
diff --git 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
index febb0c3..94e263c 100644
--- 
a/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/admin/network/CreateNetworkOfferingCmd.java
@@ -99,6 +99,9 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
" Supported keys are internallbprovider/publiclbprovider with 
service provider as a value")
 protected Map details;
 
+@Parameter(name=ApiConstants.EGRESS_DEFAULT_POLICY, 
type=CommandType.BOOLEAN, description="true if default guest network egress 
policy is allow; false if default egress policy is deny")
+private Boolean egressDefaultPolicy;
+
 /
 /// Accessors ///
 /
@@ -162,6 +165,13 @@ public class CreateNetworkOfferingCmd extends BaseCmd {
 

[28/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3149: Allow default ACLs when creating tier with ACL


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

Branch: refs/heads/vmsync
Commit: 7c46cc958049c815337f42bfde788bbe9fba4811
Parents: 90838d7
Author: Kishan Kavala 
Authored: Mon Jun 24 16:16:14 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 16:22:02 2013 +0530

--
 server/src/com/cloud/network/NetworkServiceImpl.java | 8 ++--
 1 file changed, 6 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7c46cc95/server/src/com/cloud/network/NetworkServiceImpl.java
--
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java 
b/server/src/com/cloud/network/NetworkServiceImpl.java
index e7de69e..5e900bb 100755
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -1298,8 +1298,12 @@ public class NetworkServiceImpl extends ManagerBase 
implements  NetworkService {
 throw new InvalidParameterValueException("Unable to find 
specified NetworkACL");
 }
 
-if(!vpcId.equals(acl.getVpcId())){
-throw new InvalidParameterValueException("ACL: "+aclId+" 
do not belong to the VPC");
+if(aclId != NetworkACL.DEFAULT_DENY && aclId != 
NetworkACL.DEFAULT_ALLOW) {
+//ACL is not default DENY/ALLOW
+// ACL should be associated with a VPC
+if(!vpcId.equals(acl.getVpcId())){
+throw new InvalidParameterValueException("ACL: 
"+aclId+" do not belong to the VPC");
+}
 }
 }
 network = _vpcMgr.createVpcGuestNetwork(networkOfferingId, name, 
displayText, gateway, cidr, vlanId, 

[08/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Add iptables-persistent service in guest OS.

cloud-passwd-srvr depends on iptables-persistent.


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

Branch: refs/heads/vmsync
Commit: 3123fe6bbad5c9e216f52c7fa882db4c2b6b5d91
Parents: bdfce2b
Author: Hiroaki KAWAI 
Authored: Mon Jun 24 11:14:16 2013 +0900
Committer: Hiroaki KAWAI 
Committed: Mon Jun 24 11:14:16 2013 +0900

--
 patches/systemvm/debian/buildsystemvm.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3123fe6b/patches/systemvm/debian/buildsystemvm.sh
--
diff --git a/patches/systemvm/debian/buildsystemvm.sh 
b/patches/systemvm/debian/buildsystemvm.sh
index d8a6da7..dac785c 100755
--- a/patches/systemvm/debian/buildsystemvm.sh
+++ b/patches/systemvm/debian/buildsystemvm.sh
@@ -409,7 +409,9 @@ services() {
   chroot . chkconfig xl2tpd off
   chroot . chkconfig --add cloud-early-config
   chroot . chkconfig cloud-early-config on
-  chroot . chkconfig --add cloud-passwd-srvr 
+  chroot . chkconfig --add iptables-persistent
+  chroot . chkconfig iptables-persistent off
+  chroot . chkconfig --force --add cloud-passwd-srvr
   chroot . chkconfig cloud-passwd-srvr off
   chroot . chkconfig --add cloud
   chroot . chkconfig cloud off

[18/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3155 [VMware] Deletion of zone should not be allowed if VMware DC is 
still associated with that zone.

Check if there exists any VMware DC already associated with this zone. Deny 
zone deletion if true.

Signed-off-by: Sateesh Chodapuneedi 


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

Branch: refs/heads/vmsync
Commit: e9df9c29bde4374e443c91ed91e2706b6074082f
Parents: bd5ad44
Author: Sateesh Chodapuneedi 
Authored: Mon Jun 24 12:11:31 2013 +0530
Committer: Sateesh Chodapuneedi 
Committed: Mon Jun 24 12:11:31 2013 +0530

--
 .../src/com/cloud/configuration/ConfigurationManagerImpl.java  | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e9df9c29/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 425c8be..89a640d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -1301,6 +1301,12 @@ public class ConfigurationManagerImpl extends 
ManagerBase implements Configurati
 physicalNetworks.add(2, "there are physical networks in this zone");
 tablesToCheck.add(physicalNetworks);
 
+List vmwareDcs = new ArrayList();
+vmwareDcs.add(0, "vmware_data_center_zone_map");
+vmwareDcs.add(1, "zone_id");
+vmwareDcs.add(2, "there are VMware datacenters associated with this 
zone. Remove VMware DC from this zone.");
+tablesToCheck.add(vmwareDcs);
+
 for (List table : tablesToCheck) {
 String tableName = table.get(0);
 String column = table.get(1);

[26/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-305. Everytime a SOAP call is made some transactions are rolled back 
because the transactions are not committed.


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

Branch: refs/heads/vmsync
Commit: dc242039b3f13531d9969ba104c63395e0db3b18
Parents: bb50c0d
Author: Likitha Shetty 
Authored: Mon Jun 24 14:02:19 2013 +0530
Committer: Likitha Shetty 
Committed: Mon Jun 24 14:21:59 2013 +0530

--
 .../bridge/persist/dao/CloudStackConfigurationDaoImpl.java   | 3 ++-
 .../bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java | 2 ++
 .../com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java  | 1 +
 awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java| 8 
 awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java | 8 
 awsapi/src/com/cloud/bridge/persist/dao/SHostDaoImpl.java| 8 
 .../com/cloud/bridge/persist/dao/UserCredentialsDaoImpl.java | 1 +
 7 files changed, 18 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
index 6770a9c..bc77ea1 100644
--- 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
+++ 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackConfigurationDaoImpl.java
@@ -54,7 +54,8 @@ public class CloudStackConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
--
diff --git 
a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
index f0d05d3..8021eb6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackSvcOfferingDaoImpl.java
@@ -50,6 +50,7 @@ public class CloudStackSvcOfferingDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
index 5aac396..f7e1da6 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/CloudStackUserDaoImpl.java
@@ -55,6 +55,7 @@ public class CloudStackUserDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
index 67abf81..2223254 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/MHostDaoImpl.java
@@ -44,10 +44,10 @@ public class MHostDaoImpl extends GenericDaoBase implements MHost
SearchCriteria sc = NameSearch.create();
sc.setParameters("MHostKey", hostKey);
return findOneBy(sc);
-   
-   }finally {
-   txn.close();
-   }
+} finally {
+txn.commit();
+txn.close();
+}
}
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc242039/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
--
diff --git a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java 
b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
index cce0f83..ea7d264 100644
--- a/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
+++ b/awsapi/src/com/cloud/bridge/persist/dao/OfferingDaoImpl.java
@@ -43,7 +43,8 @@ public class OfferingDaoImpl extends 
GenericDaoBase impl
 try {
 txn.start();
 return listAll().size();
-}finally {
+} finally {
+txn.commit();
 txn.close();
 }

@@ -61,8 +62,8 @@ public class OfferingDaoImpl extends 
GenericDaoBase i

[03/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-1999: Fix cloud/cloudstack due to new packaging


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

Branch: refs/heads/vmsync
Commit: 2e06da552c9561c0ec8612d47b39e66b78bf1cb3
Parents: 5bfae23
Author: Sebastien Goasguen 
Authored: Wed Apr 17 12:24:52 2013 -0400
Committer: Joe Brockmeier 
Committed: Sun Jun 23 13:48:26 2013 -0500

--
 docs/en-US/about-password-encryption.xml | 2 +-
 docs/en-US/management-server-install-db-external.xml | 2 +-
 docs/en-US/management-server-install-db-local.xml| 4 ++--
 docs/en-US/management-server-install-multi-node.xml  | 4 ++--
 docs/en-US/region-add.xml| 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/about-password-encryption.xml
--
diff --git a/docs/en-US/about-password-encryption.xml 
b/docs/en-US/about-password-encryption.xml
index 6c11c57..a13ff60 100644
--- a/docs/en-US/about-password-encryption.xml
+++ b/docs/en-US/about-password-encryption.xml
@@ -60,6 +60,6 @@
 over a known port.
   The encryption type, database secret key, and Management Server secret 
key are set during
 &PRODUCT; installation. They are all parameters to the &PRODUCT; database 
setup script
-(cloud-setup-databases). The default values are file, password, and 
password. It is, of course,
+(cloudstack-setup-databases). The default values are file, password, and 
password. It is, of course,
 highly recommended that you change these to more secure keys.
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-db-external.xml
--
diff --git a/docs/en-US/management-server-install-db-external.xml 
b/docs/en-US/management-server-install-db-external.xml
index a28dee5..2950720 100644
--- a/docs/en-US/management-server-install-db-external.xml
+++ b/docs/en-US/management-server-install-db-external.xml
@@ -132,7 +132,7 @@ bind-address = 0.0.0.0
  server node IP. If not specified, the local IP address will be 
used.
 
   
-  cloud-setup-databases 
cloud:@ \
+  cloudstack-setup-databases 
cloud:@ \
 --deploy-as=root: \
 -e  \
 -m  \

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-db-local.xml
--
diff --git a/docs/en-US/management-server-install-db-local.xml 
b/docs/en-US/management-server-install-db-local.xml
index 310327f..ff5ab60 100644
--- a/docs/en-US/management-server-install-db-local.xml
+++ b/docs/en-US/management-server-install-db-local.xml
@@ -135,7 +135,7 @@ binlog-format = 'ROW'
 server node IP. If not specified, the local IP address will be 
used.
 
   
-  cloud-setup-databases 
cloud:@localhost \
+  cloudstack-setup-databases 
cloud:@localhost \
 --deploy-as=root: \
 -e  \
 -m  \
@@ -160,7 +160,7 @@ binlog-format = 'ROW'
 
   Now that the database is set up, you can finish configuring the OS 
for the Management
 Server. This command will set up iptables, sudoers, and start the 
Management Server.
-  # 
cloud-setup-management
+  # 
cloudstack-setup-management
   You should see the message “&PRODUCT; Management Server setup is 
done.”
 
   

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2e06da55/docs/en-US/management-server-install-multi-node.xml
--
diff --git a/docs/en-US/management-server-install-multi-node.xml 
b/docs/en-US/management-server-install-multi-node.xml
index 21cf28f..ae925bf 100644
--- a/docs/en-US/management-server-install-multi-node.xml
+++ b/docs/en-US/management-server-install-multi-node.xml
@@ -53,12 +53,12 @@ linkend="sect-source-buildrpm"/> or  as
   Configure the database client. Note the absence of the --deploy-as 
argument in this
 case. (For more details about the arguments to this command, see .) 
-  # cloud-setup-databases 
cloud:dbpassword@dbhost 
-e encryption_type -m 
management_server_key -k 
database_key -i 
management_server_ip
+  # cloudstack-setup-databases 
cloud:dbpassword@dbhost 
-e encryption_type -m 
management_server_key -k 
database_key -i 
management_

[32/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

finished up the conversion to using outcome


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

Branch: refs/heads/vmsync
Commit: c0febea950e52acbba9035a85b8641da83416c43
Parents: 4254cb8
Author: Alex Huang 
Authored: Mon Jun 17 20:32:19 2013 -0700
Committer: Alex Huang 
Committed: Mon Jun 24 10:16:35 2013 -0700

--
 .../src/com/cloud/vm/VirtualMachineManager.java |   2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 134 ---
 .../lb/ElasticLoadBalancerManagerImpl.java  |   2 +-
 .../lb/InternalLoadBalancerVMManagerImpl.java   |   2 +-
 .../cloud/ha/HighAvailabilityManagerImpl.java   |  14 +-
 .../VirtualNetworkApplianceManagerImpl.java |   2 +-
 .../com/cloud/server/ManagementServerImpl.java  |   4 +-
 .../storage/StoragePoolAutomationImpl.java  |   2 +-
 .../vm/snapshot/VMSnapshotManagerImpl.java  |   2 +-
 .../vm/VmWorkMockVirtualMachineManagerImpl.java |   5 +-
 10 files changed, 71 insertions(+), 98 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0febea9/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java
--
diff --git a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java 
b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java
index e1365e2..92f05f0 100644
--- a/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java
+++ b/engine/components-api/src/com/cloud/vm/VirtualMachineManager.java
@@ -126,7 +126,7 @@ public interface VirtualMachineManager extends Manager {
  */
 Outcome start(String vmUuid, 
Map params, DeploymentPlan planToDeploy);
 
-void advanceStop(String vmUuid, boolean cleanup) throws 
ResourceUnavailableException, OperationTimedoutException,
+Outcome stop(String vmUuid, boolean cleanup) throws 
ResourceUnavailableException, OperationTimedoutException,
 ConcurrentOperationException;
 
 void advanceExpunge(String vmUuid) throws ResourceUnavailableException, 
OperationTimedoutException,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c0febea9/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 141fcb4..3a308a9 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -401,7 +401,7 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
 return;
 }
 
-advanceStop(vmUuid, false);
+stop(vmUuid, false);
 
 vm = _vmDao.findByUuid(vmUuid);
 try {
@@ -995,14 +995,15 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 
 @Override
 public void easyStop(String vmUuid) {
+Outcome outcome = stop(vmUuid, false);
 try {
-advanceStop(vmUuid, false);
-} catch (OperationTimedoutException e) {
-throw new CloudRuntimeException(e).add(VirtualMachine.class, 
vmUuid);
-} catch (ConcurrentOperationException e) {
-throw new CloudRuntimeException(e).add(VirtualMachine.class, 
vmUuid);
-} catch (ResourceUnavailableException e) {
-throw new CloudRuntimeException(e).add(VirtualMachine.class, 
vmUuid);
+outcome.get(_jobTimeout.value(), TimeUnit.MILLISECONDS);
+} catch (InterruptedException e) {
+throw new CloudRuntimeException("Interrupted while stopping vm " + 
vmUuid, e);
+} catch (java.util.concurrent.ExecutionException e) {
+throw new CloudRuntimeException("Unable to stop the VM", e);
+} catch (TimeoutException e) {
+throw new CloudRuntimeException("Unable to stop the VM due to 
timeout", e);
 }
 }
 
@@ -1094,8 +1095,8 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 
 @Override
-public void advanceStop(final String vmUuid, boolean forced) throws 
ResourceUnavailableException,
-OperationTimedoutException, ConcurrentOperationException {
+@DB
+public Outcome stop(final String vmUuid, boolean forced) {
 CallContext cc = CallContext.current();
 Account account = cc.getCallingAccount();
 User user = cc.getCallingUser();
@@ -1103,73 +1104,44 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implem

[42/50] [abbrv] merge is complete

[ahuang]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
--
diff --cc server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
index 000,d4c9560..f6d7b40
mode 00,100644..100644
--- a/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
+++ b/server/src/com/cloud/api/query/dao/TemplateJoinDaoImpl.java
@@@ -1,0 -1,462 +1,463 @@@
+ // Licensed to the Apache Software Foundation (ASF) under one
+ // or more contributor license agreements.  See the NOTICE file
+ // distributed with this work for additional information
+ // regarding copyright ownership.  The ASF licenses this file
+ // to you under the Apache License, Version 2.0 (the
+ // "License"); you may not use this file except in compliance
+ // with the License.  You may obtain a copy of the License at
+ //
+ //   http://www.apache.org/licenses/LICENSE-2.0
+ //
+ // Unless required by applicable law or agreed to in writing,
+ // software distributed under the License is distributed on an
+ // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ // KIND, either express or implied.  See the License for the
+ // specific language governing permissions and limitations
+ // under the License.
+ package com.cloud.api.query.dao;
+ 
+ import java.util.ArrayList;
+ import java.util.HashMap;
+ import java.util.List;
+ import java.util.Map;
+ 
+ import javax.ejb.Local;
+ import javax.inject.Inject;
+ 
++import org.apache.log4j.Logger;
++import org.springframework.stereotype.Component;
++
+ import org.apache.cloudstack.api.BaseCmd;
+ import org.apache.cloudstack.api.response.TemplateResponse;
+ import org.apache.cloudstack.api.response.TemplateZoneResponse;
++import org.apache.cloudstack.context.CallContext;
+ import 
org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine;
+ import org.apache.cloudstack.engine.subsystem.api.storage.TemplateState;
 -import org.apache.log4j.Logger;
 -import org.springframework.stereotype.Component;
+ 
+ import com.cloud.api.ApiDBUtils;
+ import com.cloud.api.ApiResponseHelper;
+ import com.cloud.api.query.vo.ResourceTagJoinVO;
+ import com.cloud.api.query.vo.TemplateJoinVO;
+ import com.cloud.configuration.dao.ConfigurationDao;
+ import com.cloud.storage.Storage;
 -import com.cloud.storage.VMTemplateHostVO;
+ import com.cloud.storage.Storage.TemplateType;
++import com.cloud.storage.VMTemplateHostVO;
+ import com.cloud.storage.VMTemplateStorageResourceAssoc.Status;
+ import com.cloud.template.VirtualMachineTemplate;
+ import com.cloud.user.Account;
 -import com.cloud.user.UserContext;
+ import com.cloud.utils.db.GenericDaoBase;
+ import com.cloud.utils.db.SearchBuilder;
+ import com.cloud.utils.db.SearchCriteria;
+ 
+ 
+ @Component
+ @Local(value={TemplateJoinDao.class})
+ public class TemplateJoinDaoImpl extends GenericDaoBase 
implements TemplateJoinDao {
+ 
+ 
+ 
+ public static final Logger s_logger = 
Logger.getLogger(TemplateJoinDaoImpl.class);
+ 
+ @Inject
+ private ConfigurationDao  _configDao;
+ 
+ private final SearchBuilder tmpltSearch;
+ 
+ private final SearchBuilder tmpltIdSearch;
+ 
+ private final SearchBuilder tmpltZoneSearch;
+ 
+ private final SearchBuilder activeTmpltSearch;
+ 
+ 
+ protected TemplateJoinDaoImpl() {
+ 
+ tmpltSearch = createSearchBuilder();
+ tmpltSearch.and("idIN", tmpltSearch.entity().getId(), 
SearchCriteria.Op.IN);
+ tmpltSearch.done();
+ 
+ tmpltIdSearch = createSearchBuilder();
+ tmpltIdSearch.and("id", tmpltIdSearch.entity().getId(), 
SearchCriteria.Op.EQ);
+ tmpltIdSearch.done();
+ 
+ tmpltZoneSearch = createSearchBuilder();
+ tmpltZoneSearch.and("id", tmpltZoneSearch.entity().getId(), 
SearchCriteria.Op.EQ);
+ tmpltZoneSearch.and("dataCenterId", 
tmpltZoneSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ);
+ tmpltZoneSearch.and("state", tmpltZoneSearch.entity().getState(), 
SearchCriteria.Op.EQ);
+ tmpltZoneSearch.done();
+ 
+ activeTmpltSearch = createSearchBuilder();
+ activeTmpltSearch.and("store_id", 
activeTmpltSearch.entity().getDataStoreId(), SearchCriteria.Op.EQ);
+ activeTmpltSearch.and("type", 
activeTmpltSearch.entity().getTemplateType(), SearchCriteria.Op.EQ);
+ activeTmpltSearch.done();
+ 
+ // select distinct pair (template_id, zone_id)
 -this._count = "select count(distinct id) from template_view WHERE ";
++_count = "select count(distinct id) from template_view WHERE ";
+ }
+ 
+ 
+ 
+ 
+ @Override
+ public TemplateResponse newTemplateResponse(TemplateJoinVO template) {
+ TemplateResponse templateResponse = new TemplateResponse();
+ templateResponse.setId(template.getUuid());
+ templateResponse.setName(template.getName());
+ templateResponse.setDisplayText(template.getDisplay

[27/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-757


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

Branch: refs/heads/vmsync
Commit: 90838d7292bf646a910f2a385f536f29effaf883
Parents: dc24203
Author: Radhika PC 
Authored: Mon Jun 24 16:16:43 2013 +0530
Committer: Radhika PC 
Committed: Mon Jun 24 16:17:30 2013 +0530

--
 docs/en-US/add-gateway-vpc.xml | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/90838d72/docs/en-US/add-gateway-vpc.xml
--
diff --git a/docs/en-US/add-gateway-vpc.xml b/docs/en-US/add-gateway-vpc.xml
index 6aaa5d0..9a270f9 100644
--- a/docs/en-US/add-gateway-vpc.xml
+++ b/docs/en-US/add-gateway-vpc.xml
@@ -158,8 +158,9 @@
 Blacklisting Routes
 &PRODUCT; enables you to block a list of routes so that they are not 
assigned to any of
   the VPC private gateways. Specify the list of routes that you want to 
blacklist in the
-blacklisted.routes global parameter. Note that the 
parameter update affects only new
-  static route creations. If you block an existing static route, it 
remains intact and
-  continue functioning. 
+blacklisted.routes global parameter. Note that the 
parameter update affects
+  only new static route creations. If you block an existing static route, 
it remains intact and
+  continue functioning. You cannot add a static route if the route is 
blacklisted for the zone.
+
   
 

[01/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Updated Branches:
  refs/heads/vmsync e7c34793f -> 049dd7242


CLOUDSTACK-2679: Install docs could point to more accurate XenServer download 
page


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

Branch: refs/heads/vmsync
Commit: 145c10ec3f88fb27350f0843231714e49276d0ac
Parents: d53f1c0
Author: Joe Brockmeier 
Authored: Sun Jun 23 13:17:31 2013 -0500
Committer: Joe Brockmeier 
Committed: Sun Jun 23 13:17:31 2013 -0500

--
 docs/en-US/citrix-xenserver-installation.xml | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/145c10ec/docs/en-US/citrix-xenserver-installation.xml
--
diff --git a/docs/en-US/citrix-xenserver-installation.xml 
b/docs/en-US/citrix-xenserver-installation.xml
index a5118d7..9ea632a 100644
--- a/docs/en-US/citrix-xenserver-installation.xml
+++ b/docs/en-US/citrix-xenserver-installation.xml
@@ -103,7 +103,10 @@
 >https://www.citrix.com/English/ss/downloads/, download 
the appropriate version
   of XenServer for your &PRODUCT; version (see ). Install it using 
the Citrix XenServer
-  Installation Guide.
+Installation Guide.
+Older Versions of XenServer
+Note that you can download the most recent release of XenServer 
without having a Citrix account. If you wish to download older versions, you 
will need to create an account and look through the download archives.
+
   
   
 After installation, perform the following configuration steps, 
which are described in

[09/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

upgrade debian systemvm to wheezy

New kvm libvirt requres virtio-console (/dev/vport*), so
upgrading debian guest base OS to wheezy.


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

Branch: refs/heads/vmsync
Commit: 009da930580fba039b4b8a7532a8a6809d00ed02
Parents: 3123fe6
Author: Hiroaki KAWAI 
Authored: Mon Jun 24 11:16:40 2013 +0900
Committer: Hiroaki KAWAI 
Committed: Mon Jun 24 11:16:40 2013 +0900

--
 patches/systemvm/debian/buildsystemvm.sh | 27 ---
 1 file changed, 12 insertions(+), 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/009da930/patches/systemvm/debian/buildsystemvm.sh
--
diff --git a/patches/systemvm/debian/buildsystemvm.sh 
b/patches/systemvm/debian/buildsystemvm.sh
index dac785c..c2fe344 100755
--- a/patches/systemvm/debian/buildsystemvm.sh
+++ b/patches/systemvm/debian/buildsystemvm.sh
@@ -50,8 +50,8 @@ baseimage() {
   
   mount -o loop,offset=$offset $IMAGELOC  $MOUNTPOINT
   
-  #debootstrap --variant=minbase 
--keyring=/usr/share/keyrings/debian-archive-keyring.gpg squeeze $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
-  debootstrap --variant=minbase --arch=i386 squeeze $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
+  #debootstrap --variant=minbase 
--keyring=/usr/share/keyrings/debian-archive-keyring.gpg wheezy $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
+  debootstrap --variant=minbase --arch=i386 wheezy $MOUNTPOINT 
http://${APT_PROXY}${DEBIAN_MIRROR}
 }
 
 
@@ -63,11 +63,14 @@ EOF
   fi
 
   cat > etc/apt/sources.list << EOF
-deb http://ftp.us.debian.org/debian/ squeeze main contrib non-free
-deb-src http://ftp.us.debian.org/debian/ squeeze main contrib non-free
+deb http://ftp.us.debian.org/debian/ wheezy main contrib non-free
+deb-src http://ftp.us.debian.org/debian/ wheezy main contrib non-free
 
-deb http://security.debian.org/ squeeze/updates main
-deb-src http://security.debian.org/ squeeze/updates main
+deb http://security.debian.org/ wheezy/updates main
+deb-src http://security.debian.org/ wheezy/updates main
+
+deb http://ftp.us.debian.org/debian/ wheezy-backports main
+deb-src http://ftp.us.debian.org/debian/ wheezy-backports main
 EOF
 
   cat >> etc/apt/apt.conf << EOF
@@ -347,7 +350,7 @@ packages() {
   export DEBIAN_FRONTEND DEBIAN_PRIORITY DEBCONF_DB_OVERRIDE
 
   #basic stuff
-  chroot .  apt-get --no-install-recommends -q -y --force-yes install rsyslog 
logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables 
openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget  
python bzip2 sed gawk diff grep gzip less tar telnet ftp rsync traceroute 
psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip 
unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
+  chroot .  apt-get --no-install-recommends -q -y --force-yes install rsyslog 
logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables 
openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget  
python bzip2 sed gawk diffutils grep gzip less tar telnet ftp rsync traceroute 
psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip 
unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
   #fix hostname in openssh-server generated keys
   sed -i "s/root@\(.*\)$/root@systemvm/g" etc/ssh/ssh_host_*.pub
 
@@ -373,14 +376,8 @@ packages() {
   #ipcalc
   chroot . apt-get --no-install-recommends -q -y --force-yes install ipcalc
 
-  echo "* getting sun jre 6*"
-  chroot . echo 'sun-java6-bin shared/accepted-sun-dlj-v1-1 boolean true
-   sun-java6-jre shared/accepted-sun-dlj-v1-1 boolean true
-   sun-java6-jre sun-java6-jre/stopthread boolean true
-   sun-java6-jre sun-java6-jre/jcepolicy note
-   sun-java6-bin shared/present-sun-dlj-v1-1 note
-   sun-java6-jre shared/present-sun-dlj-v1-1 note ' | chroot . 
debconf-set-selections
-  chroot .  apt-get --no-install-recommends -q -y install  sun-java6-jre 
+  echo "* getting jre 7 *"
+  chroot .  apt-get --no-install-recommends -q -y install 
openjdk-7-jre-headless
 }
 
 

[12/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack


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

Branch: refs/heads/vmsync
Commit: 1a50e2fddcb39b89adec71c6f7591a0e22764a13
Parents: 5f06500 5c4578e
Author: Sebastien Goasguen 
Authored: Sun Jun 23 23:33:45 2013 -0400
Committer: Sebastien Goasguen 
Committed: Sun Jun 23 23:33:45 2013 -0400

--
 docs/en-US/Release_Notes.xml|  9 ++---
 docs/en-US/about-password-encryption.xml|  2 +-
 docs/en-US/citrix-xenserver-installation.xml|  5 ++-
 docs/en-US/database-replication.xml | 12 +--
 .../management-server-install-db-external.xml   |  2 +-
 .../management-server-install-db-local.xml  |  4 +--
 .../management-server-install-multi-node.xml|  4 +--
 docs/en-US/region-add.xml   |  6 ++--
 patches/systemvm/debian/buildsystemvm.sh| 37 ++--
 .../debian/config/etc/init.d/cloud-early-config |  5 ++-
 10 files changed, 47 insertions(+), 39 deletions(-)
--

[24/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-1578 vmware:Egress default policy configurable using network 
offering on vmware


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

Branch: refs/heads/vmsync
Commit: 9121191f702bc431add8235fa4cd636d9ee2310e
Parents: c22e7d0
Author: Jayapal 
Authored: Thu Jun 20 16:31:01 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 .../com/cloud/hypervisor/vmware/resource/VmwareResource.java | 8 
 1 file changed, 8 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9121191f/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index c35024c..5040443 100755
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -764,12 +764,20 @@ public class VmwareResource implements 
StoragePoolResource, ServerResource, Vmwa
 String[] results = new String[cmd.getRules().length];
 FirewallRuleTO[] allrules = cmd.getRules();
 FirewallRule.TrafficType trafficType = allrules[0].getTrafficType();
+String egressDefault = 
cmd.getAccessDetail(NetworkElementCommand.FIREWALL_EGRESS_DEFAULT);
 
 String[][] rules = cmd.generateFwRules();
 String args = "";
 args += " -F ";
 if (trafficType == FirewallRule.TrafficType.Egress){
 args+= " -E ";
+if (egressDefault.equals("true")) {
+args+= " -P 1 ";
+} else if (egressDefault.equals("System")) {
+args+= " -P 2 ";
+} else {
+args+= " -P 0 ";
+}
 }
 
 StringBuilder sb = new StringBuilder();

[48/50] [abbrv] merge is complete

[ahuang]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
--
diff --cc 
api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
index cc62d9c,5fbe106..8d34cf9
--- 
a/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
+++ 
b/api/src/org/apache/cloudstack/api/command/user/volume/ExtractVolumeCmd.java
@@@ -16,12 -16,9 +16,10 @@@
  // under the License.
  package org.apache.cloudstack.api.command.user.volume;
  
--import java.net.URISyntaxException;
- 
 +import org.apache.log4j.Logger;
  
  import org.apache.cloudstack.api.APICommand;
 +import org.apache.cloudstack.api.ApiCommandJobType;
  import org.apache.cloudstack.api.ApiConstants;
  import org.apache.cloudstack.api.ApiErrorCode;
  import org.apache.cloudstack.api.BaseAsyncCmd;
@@@ -96,10 -95,10 +94,12 @@@ public class ExtractVolumeCmd extends B
  return s_name;
  }
  
 -public AsyncJob.Type getInstanceType() {
 -return AsyncJob.Type.Volume;
++@Override
 +public ApiCommandJobType getInstanceType() {
 +return ApiCommandJobType.Volume;
  }
  
++@Override
  public Long getInstanceId() {
  return getId();
  }
@@@ -127,33 -126,26 +127,26 @@@
  
  @Override
  public void execute(){
- try {
- CallContext.current().setEventDetails("Volume Id: "+getId());
- Long uploadId = _mgr.extractVolume(this);
- if (uploadId != null){
- Upload uploadInfo = _entityMgr.findById(Upload.class, 
uploadId);
 -UserContext.current().setEventDetails("Volume Id: " + getId());
++CallContext.current().setEventDetails("Volume Id: " + getId());
+ String uploadUrl = _volumeService.extractVolume(this);
+ if (uploadUrl != null) {
 -ExtractResponse response = new ExtractResponse();
 -response.setResponseName(getCommandName());
 -response.setObjectName("volume");
 -Volume vol = _entityMgr.findById(Volume.class, id);
 -response.setId(vol.getUuid());
 -response.setName(vol.getName());
 -DataCenter zone = _entityMgr.findById(DataCenter.class, zoneId);
 -response.setZoneId(zone.getUuid());
 -response.setZoneName(zone.getName());
 -response.setMode(mode);
 +ExtractResponse response = new ExtractResponse();
 +response.setResponseName(getCommandName());
 +response.setObjectName("volume");
 +Volume vol = _entityMgr.findById(Volume.class, id);
 +response.setId(vol.getUuid());
 +response.setName(vol.getName());
 +DataCenter zone = _entityMgr.findById(DataCenter.class, 
zoneId);
 +response.setZoneId(zone.getUuid());
 +response.setZoneName(zone.getName());
 +response.setMode(mode);
- response.setUploadId(uploadInfo.getUuid());
- response.setState(uploadInfo.getUploadState().toString());
+ response.setState(Upload.Status.DOWNLOAD_URL_CREATED.toString());
 -Account account = _entityMgr.findById(Account.class, 
getEntityOwnerId());
 -response.setAccountId(account.getUuid());
 +Account account = _entityMgr.findById(Account.class, 
getEntityOwnerId());
 +response.setAccountId(account.getUuid());
- response.setUrl(uploadInfo.getUploadUrl());
- this.setResponseObject(response);
+ response.setUrl(uploadUrl);
 -this.setResponseObject(response);
 -} else {
 -throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed 
to extract volume");
 -}
++setResponseObject(response);
 +} else {
 +throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, 
"Failed to extract volume");
 +}
- } catch (URISyntaxException ex) {
- s_logger.info(ex);
- throw new ServerApiException(ApiErrorCode.PARAM_ERROR, 
ex.getMessage());
- }
  }
  }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java
--

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
--
diff --cc api/src/org/apache/cloudstack/api/response/ClusterResponse.java
index 5d9bb05,68aa892..c9e909b
--- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
+++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java
@@@ -47,10 -45,7 +47,7 @@@ public class ClusterR

[37/50] [abbrv] merge is complete

[ahuang]

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7b7db056/server/src/com/cloud/storage/upload/UploadListener.java
--
diff --cc server/src/com/cloud/storage/upload/UploadListener.java
index 038cc38,d3b7af9..5d7a4ba
--- a/server/src/com/cloud/storage/upload/UploadListener.java
+++ b/server/src/com/cloud/storage/upload/UploadListener.java
@@@ -24,15 -23,18 +23,21 @@@ import java.util.Map
  import java.util.Timer;
  import java.util.TimerTask;
  
+ import javax.inject.Inject;
+ 
 +import org.apache.log4j.Level;
 +import org.apache.log4j.Logger;
 +
  import org.apache.cloudstack.api.command.user.iso.ExtractIsoCmd;
  import org.apache.cloudstack.api.command.user.template.ExtractTemplateCmd;
  import org.apache.cloudstack.api.command.user.volume.ExtractVolumeCmd;
  import org.apache.cloudstack.api.response.ExtractResponse;
+ import org.apache.cloudstack.engine.subsystem.api.storage.DataStore;
+ import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint;
+ import org.apache.cloudstack.engine.subsystem.api.storage.EndPointSelector;
+ import org.apache.cloudstack.framework.async.AsyncCompletionCallback;
 -import org.apache.log4j.Level;
 -import org.apache.log4j.Logger;
 +import org.apache.cloudstack.framework.jobs.AsyncJobManager;
 +import org.apache.cloudstack.jobs.JobInfo;
  
  import com.cloud.agent.Listener;
  import com.cloud.agent.api.AgentControlAnswer;
@@@ -46,9 -48,9 +51,8 @@@ import com.cloud.agent.api.storage.Uplo
  import com.cloud.agent.api.storage.UploadProgressCommand;
  import com.cloud.agent.api.storage.UploadProgressCommand.RequestType;
  import com.cloud.api.ApiDBUtils;
 -import com.cloud.async.AsyncJobManager;
 -import com.cloud.async.AsyncJobResult;
 +import com.cloud.api.ApiSerializerHelper;
- import com.cloud.exception.AgentUnavailableException;
- import com.cloud.host.HostVO;
+ import com.cloud.host.Host;
  import com.cloud.storage.Storage;
  import com.cloud.storage.Upload.Status;
  import com.cloud.storage.Upload.Type;
@@@ -59,401 -61,420 +63,420 @@@ import com.cloud.utils.exception.CloudR
  
  public class UploadListener implements Listener {
  
- 
 -private static final class StatusTask extends TimerTask {
 -private final UploadListener ul;
 -private final RequestType reqType;
 +  private static final class StatusTask extends TimerTask {
 +  private final UploadListener ul;
 +  private final RequestType reqType;
  
-   public StatusTask( UploadListener ul,  RequestType req) {
-   reqType = req;
+ public StatusTask(UploadListener ul, RequestType req) {
 -this.reqType = req;
 -this.ul = ul;
 -}
++reqType = req;
 +  this.ul = ul;
 +  }
  
 -@Override
 -public void run() {
 -ul.sendCommand(reqType);
 +  @Override
 +  public void run() {
 +ul.sendCommand(reqType);
  
 -}
 -}
 +  }
 +  }
  
 -private static final class TimeoutTask extends TimerTask {
 -private final UploadListener ul;
 +  private static final class TimeoutTask extends TimerTask {
 +  private final UploadListener ul;
  
-   public TimeoutTask( UploadListener ul) {
+ public TimeoutTask(UploadListener ul) {
 -this.ul = ul;
 -}
 +  this.ul = ul;
 +  }
  
 -@Override
 -public void run() {
 -ul.checkProgress();
 -}
 -}
 +  @Override
 +  public void run() {
 +ul.checkProgress();
 +  }
 +  }
  
 -public static final Logger s_logger = 
Logger.getLogger(UploadListener.class.getName());
 -public static final int SMALL_DELAY = 100;
 -public static final long STATUS_POLL_INTERVAL = 1L;
 +  public static final Logger s_logger = 
Logger.getLogger(UploadListener.class.getName());
 +  public static final int SMALL_DELAY = 100;
 +  public static final long STATUS_POLL_INTERVAL = 1L;
  
-   public static final String UPLOADED=Status.UPLOADED.toString();
-   public static final String NOT_UPLOADED=Status.NOT_UPLOADED.toString();
-   public static final String UPLOAD_ERROR=Status.UPLOAD_ERROR.toString();
-   public static final String 
UPLOAD_IN_PROGRESS=Status.UPLOAD_IN_PROGRESS.toString();
-   public static final String UPLOAD_ABANDONED=Status.ABANDONED.toString();
-   public static final Map responseNameMap;
-   static{
-   MaptempMap = new HashMap();
+ public static final String UPLOADED = Status.UPLOADED.toString();
+ public static final String NOT_UPLOADED = Status.NOT_UPLOADED.toString();
+ public static final String UPLOAD_ERROR = Status.UPLOAD_ERROR.toString();
+ public static final String UPLOAD_IN_PROGRESS = 
Status.UPLOAD_IN_P

[25/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-1578 SRX: Egress default policy configurable using network offering 
on SRX firewall


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

Branch: refs/heads/vmsync
Commit: c22e7d00523ed3b194984d080355080ab1c881dd
Parents: 6a7ae63
Author: Jayapal 
Authored: Thu Jun 20 16:28:09 2013 +0530
Committer: Jayapal 
Committed: Mon Jun 24 13:37:01 2013 +0530

--
 .../com/cloud/agent/api/to/FirewallRuleTO.java  | 19 -
 .../network/resource/JuniperSrxResource.java| 86 ++--
 scripts/network/juniper/security-policy-add.xml |  3 +-
 .../ExternalFirewallDeviceManagerImpl.java  | 24 ++
 4 files changed, 86 insertions(+), 46 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22e7d00/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
--
diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java 
b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
index f296aa4..29d9c6f 100644
--- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
+++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java
@@ -53,6 +53,9 @@ public class FirewallRuleTO implements InternalIdentity {
 private Integer icmpType;
 private Integer icmpCode;
 private FirewallRule.TrafficType trafficType;
+private String guestCidr;
+private boolean defaultEgressPolicy;
+private FirewallRule.FirewallRuleType type;
 
 protected FirewallRuleTO() {
 }
@@ -110,9 +113,12 @@ public class FirewallRuleTO implements InternalIdentity {
 this(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), revokeState, alreadyAdded, 
purpose,rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode());
 }
 
-public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType) {
+public FirewallRuleTO(FirewallRule rule, String guestVlanTag, 
FirewallRule.TrafficType trafficType, String guestCidr, boolean 
defaultEgressPolicy, FirewallRule.FirewallRuleType type) {
 this(rule.getId(), guestVlanTag, null, rule.getProtocol(), 
rule.getSourcePortStart(), rule.getSourcePortEnd(), 
rule.getState()==State.Revoke, rule.getState()==State.Active, 
rule.getPurpose(), rule.getSourceCidrList(), rule.getIcmpType(), 
rule.getIcmpCode());
 this.trafficType = trafficType;
+this.defaultEgressPolicy = defaultEgressPolicy;
+this.guestCidr = guestCidr;
+this.type = type;
 }
 
 public FirewallRule.TrafficType getTrafficType(){
@@ -170,4 +176,15 @@ public class FirewallRuleTO implements InternalIdentity {
 return purpose;
 }
 
+public boolean isDefaultEgressPolicy() {
+return defaultEgressPolicy;
+}
+
+public String getGuestCidr() {
+return guestCidr;
+}
+
+public FirewallRule.FirewallRuleType getType() {
+return type;
+}
 }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c22e7d00/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
--
diff --git 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
index fd065d5..3d3d797 100644
--- 
a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
+++ 
b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.io.StringReader;
+import java.lang.String;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
 import java.util.ArrayList;
@@ -321,7 +322,8 @@ public class JuniperSrxResource implements ServerResource {
 STATIC_NAT("staticnat"),
 DESTINATION_NAT("destnat"),
 VPN("vpn"),
-SECURITYPOLICY_EGRESS("egress");
+SECURITYPOLICY_EGRESS("egress"),
+SECURITYPOLICY_EGRESS_DEFAULT("egress-default");
 
 private String identifier;
 
@@ -828,15 +830,37 @@ public class JuniperSrxResource implements ServerResource 
{
 if (rules[0].getTrafficType() == FirewallRule.TrafficType.Egress) {
 Map> activeRules = 
getActiveFirewallEgressRules(rules);
 Set guestVlans = activeRules.keySet();
-List cidrs = new ArrayList();
+   // List cidrs = new ArrayList();
+boolean d

[17/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-2181: Scale down is allowed when one resource(say cpu) is being 
scale up and other resource (say ram) is
 being scale down ;but not allowed when both resources are being scaledown
Signed off by : Nitin Mehta


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

Branch: refs/heads/vmsync
Commit: 1eb744fa1600f9400e407c6e3615da40b18758c1
Parents: 7767472
Author: Harikrishna Patnala 
Authored: Mon Jun 24 12:09:44 2013 +0530
Committer: Nitin Mehta 
Committed: Mon Jun 24 12:09:55 2013 +0530

--
 server/src/com/cloud/vm/UserVmManagerImpl.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1eb744fa/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 7b3b1bc..66103fb 100755
--- a/server/src/com/cloud/vm/UserVmManagerImpl.java
+++ b/server/src/com/cloud/vm/UserVmManagerImpl.java
@@ -1160,9 +1160,9 @@ public class UserVmManagerImpl extends ManagerBase 
implements UserVmManager, Use
 int currentMemory = currentServiceOffering.getRamSize();
 int currentSpeed = currentServiceOffering.getSpeed();
 
-if(newSpeed <= currentSpeed
-   && newMemory <= currentMemory
-   && newCpu<= currentCpu){
+// Don't allow to scale when (Any of the new values less than current 
values) OR (All current and new values are same)
+if( (newSpeed < currentSpeed || newMemory < currentMemory || newCpu < 
currentCpu)
+||  ( newSpeed == currentSpeed && newMemory == currentMemory 
&& newCpu == currentCpu)){
 throw new InvalidParameterValueException("Only scaling up the vm 
is supported, new service offering should have both cpu and memory greater than 
the old values");
 }
 

[34/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

migration working


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

Branch: refs/heads/vmsync
Commit: a49109ae0bc25271c8d71f529ab52f5749a3b6bb
Parents: 95fe42c
Author: Alex Huang 
Authored: Mon Jun 24 13:31:11 2013 -0700
Committer: Alex Huang 
Committed: Mon Jun 24 13:31:11 2013 -0700

--
 .../com/cloud/vm/VirtualMachineManagerImpl.java | 130 +--
 .../test/com/cloud/vm/VmWorkTest.java   |   6 +-
 .../cloud/vm/VmWorkTestApiJobDispatcher.java|   5 +-
 3 files changed, 66 insertions(+), 75 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a49109ae/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 a1c2db4..97a3990 100755
--- a/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
+++ b/engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
@@ -56,6 +56,7 @@ import org.apache.cloudstack.framework.jobs.impl.OutcomeImpl;
 import org.apache.cloudstack.framework.messagebus.MessageBus;
 import org.apache.cloudstack.framework.messagebus.MessageDispatcher;
 import org.apache.cloudstack.framework.messagebus.MessageHandler;
+import org.apache.cloudstack.jobs.JobInfo;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.vm.jobs.VmWorkJobDao;
 import org.apache.cloudstack.vm.jobs.VmWorkJobVO;
@@ -511,7 +512,7 @@ public class VirtualMachineManagerImpl extends ManagerBase 
implements VirtualMac
 
 _executor = Executors.newScheduledThreadPool(1, new 
NamedThreadFactory("Vm-Operations-Cleanup"));
 
-_agentMgr.registerForHost)Events(this, true, true, true);
+_agentMgr.registerForHostEvents(this, true, true, true);
 
 RootVolumeSearch = _entityMgr.createSearchBuilder(VolumeVO.class);
 VolumeVO rvsEntity = RootVolumeSearch.entity();
@@ -1002,10 +1003,10 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 VmWorkJobVO.Step prevStep = work.getStep();
 _workJobDao.updateStep(work.getId(), 
VmWorkJobVO.Step.Release);
 if (prevStep == VmWorkJobVO.Step.Started || prevStep 
== VmWorkJobVO.Step.Starting) {
-cleanup(vmGuru, vmProfile, work, 
VirtualMachine.Event.OperationFailed, false);
+cleanup(vmGuru, vmProfile, work, false);
 } else {
 //if step is not starting/started, send cleanup 
command with force=true
-cleanup(vmGuru, vmProfile, work, 
VirtualMachine.Event.OperationFailed, true);
+cleanup(vmGuru, vmProfile, work, true);
 }
 }
 }
@@ -1225,7 +1226,7 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 }
 
 if (doCleanup) {
-if (cleanup(vmGuru, new VirtualMachineProfileImpl(vm), work, 
VirtualMachine.Event.StopRequested, forced)) {
+if (cleanup(vmGuru, new VirtualMachineProfileImpl(vm), work, 
forced)) {
 try {
 if (s_logger.isDebugEnabled()) {
 s_logger.debug("Updating work item to Done, id:" + 
work.getId());
@@ -1589,25 +1590,57 @@ public class VirtualMachineManagerImpl extends 
ManagerBase implements VirtualMac
 
 _alertMgr.sendAlert(alertType, fromHost.getDataCenterId(), 
fromHost.getPodId(), "Unable to migrate vm " + vm.getInstanceName() + " from 
host " + fromHost.getName()
 + " in zone " + dest.getDataCenter().getName() + " and 
pod " + dest.getPod().getName(), "Migrate Command failed.  Please check logs.");
+
+boolean cleanup = false;
 try {
-_agentMgr.send(dstHostId, new Commands(cleanup(vm)), null);
-} catch (AgentUnavailableException ae) {
-s_logger.info("Looks like the destination Host is 
unavailable for cleanup");
+cleanupMigration(work, dstVm, vm, false);
+cleanup = true;
+} catch (Exception ae) {
+s_logger.warn("Unable to cleanup migration for " + vm);
 }
 
-try {
-stateTransitTo(vm, VirtualMachine.Event.Opera

[07/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Remove unused code

The files xt_CHECKSUM.ko, iptables_1.4.8-3local1checksum1_i386
and xe-guest-utilities_5.6.0-595_i386 does not exist in the
repo now.


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

Branch: refs/heads/vmsync
Commit: bdfce2bc7e349949112876fa21c55b4bd7d6248a
Parents: 0015ac8
Author: Hiroaki KAWAI 
Authored: Mon Jun 24 11:09:09 2013 +0900
Committer: Hiroaki KAWAI 
Committed: Mon Jun 24 11:09:09 2013 +0900

--
 patches/systemvm/debian/buildsystemvm.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bdfce2bc/patches/systemvm/debian/buildsystemvm.sh
--
diff --git a/patches/systemvm/debian/buildsystemvm.sh 
b/patches/systemvm/debian/buildsystemvm.sh
index 5134f89..d8a6da7 100755
--- a/patches/systemvm/debian/buildsystemvm.sh
+++ b/patches/systemvm/debian/buildsystemvm.sh
@@ -477,9 +477,9 @@ scriptdir=$(dirname $PWD/$0)
 
 rm -rf /tmp/systemvm
 mkdir -p /tmp/systemvm
-cp ./xt_CHECKSUM.ko /tmp/systemvm
-cp ./iptables_1.4.8-3local1checksum1_i386.deb /tmp/systemvm
-cp ./xe-guest-utilities_5.6.0-595_i386.deb /tmp/systemvm
+#cp ./xt_CHECKSUM.ko /tmp/systemvm
+#cp ./iptables_1.4.8-3local1checksum1_i386.deb /tmp/systemvm
+#cp ./xe-guest-utilities_5.6.0-595_i386.deb /tmp/systemvm
 
 rm -f $IMAGELOC
 begin=$(date +%s)

[05/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Removing a redundant step (stop service twice in upgrade 4.0 to 4.1). Hack Day.


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

Branch: refs/heads/vmsync
Commit: 84ecc11841c73bc5442d00f68f00334e11cba7f6
Parents: 2a8297b
Author: Joe Brockmeier 
Authored: Sun Jun 23 14:14:19 2013 -0500
Committer: Joe Brockmeier 
Committed: Sun Jun 23 14:14:19 2013 -0500

--
 docs/en-US/Release_Notes.xml | 5 -
 1 file changed, 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84ecc118/docs/en-US/Release_Notes.xml
--
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 8843f4c..4a27cd2 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -4642,11 +4642,6 @@ under the License.
   # mysqldump -u root -p cloud > 
cloudstack-backup.sql
 
 
-  Whether you're upgrading a Red Hat/CentOS based system or 
Ubuntu based system,
-you're going to need to stop the CloudStack management server 
before proceeding.
-  # service 
cloud-management stop
-
-
   If you have made changes to
   /etc/cloud/management/components.xml, 
you'll need to carry these
 over manually to the new file,

[06/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

More edits to release notes.


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

Branch: refs/heads/vmsync
Commit: 0015ac8bd32a1b7042427811e8e3f8fb33a8e5e8
Parents: 84ecc11
Author: Joe Brockmeier 
Authored: Sun Jun 23 16:17:42 2013 -0500
Committer: Joe Brockmeier 
Committed: Sun Jun 23 16:17:42 2013 -0500

--
 docs/en-US/Release_Notes.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0015ac8b/docs/en-US/Release_Notes.xml
--
diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml
index 4a27cd2..a4fcd47 100644
--- a/docs/en-US/Release_Notes.xml
+++ b/docs/en-US/Release_Notes.xml
@@ -5593,7 +5593,7 @@ service cloudstack-agent start
   $ sudo apt-get install 
cloudstack-management
 
 
-  You will need to manually install the 
cloudstack-agent
+  On KVM hosts, you will need to manually install the 
cloudstack-agent
 package:
   $ sudo apt-get install 
cloudstack-agent
   During the installation of 
cloudstack-agent, APT will copy
@@ -5616,7 +5616,7 @@ service cloudstack-agent start
 service cloud-agent stop
 killall jsvc
 service cloudstack-agent start
-
+  
 
 
   During the upgrade, log4j-cloud.xml 
was simply copied over,

[31/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-2916: admin is not able to login through UI after setting GP 
"cluster.cpu.allocated.capacity.notificationthreshold" to some string
CLOUDSTACK-2457:  No check for input values,special character,-ive values can 
be assigne to GLobal parameter "cluster.cpu.allocated.capacity.disablethreshold"

Added validation for float values and checking limit for weight based 
parameters by creating a set of parameters.
Signed off by : nitin mehta


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

Branch: refs/heads/vmsync
Commit: f7b1d3d8d5be58a8032fc79eec4dd5711226b93a
Parents: da00066
Author: Harikrishna Patnala 
Authored: Mon Jun 24 19:57:29 2013 +0530
Committer: Nitin Mehta 
Committed: Mon Jun 24 20:00:09 2013 +0530

--
 .../configuration/ConfigurationManagerImpl.java | 36 
 test/integration/smoke/test_scale_vm.py | 13 +--
 2 files changed, 46 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f7b1d3d8/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 89a640d..704162e 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -324,6 +324,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 private int _maxVolumeSizeInGb = 
Integer.parseInt(Config.MaxVolumeSize.getDefaultValue());
 private long _defaultPageSize = 
Long.parseLong(Config.DefaultPageSize.getDefaultValue());
 protected Set configValuesForValidation;
+private Set weightBasedParametersForValidation;
 
 @Override
 public boolean configure(final String name, final Map 
params) throws ConfigurationException {
@@ -336,6 +337,7 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 Long.parseLong(Config.DefaultPageSize.getDefaultValue()));
 
 populateConfigValuesForValidationSet();
+weightBasedParametersForValidation();
 return true;
 }
 
@@ -361,6 +363,28 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 configValuesForValidation.add("incorrect.login.attempts.allowed");
 }
 
+private void weightBasedParametersForValidation() {
+weightBasedParametersForValidation = new HashSet();
+
weightBasedParametersForValidation.add(Config.CPUCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.PrivateIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.SecondaryStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.VlanCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.DirectNetworkPublicIpCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.LocalStorageCapacityThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageAllocatedCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.StorageCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.CPUCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.MemoryCapacityDisableThreshold.key());
+
weightBasedParametersForValidation.add(Config.AgentLoadThreshold.key());
+
weightBasedParametersForValidation.add(Config.VmUserDispersionWeight.key());
+
+
+}
+
 @Override
 public boolean start() {
 
@@ -733,6 +757,18 @@ public class ConfigurationManagerImpl extends ManagerBase 
implements Configurati
 }
 }
 
+if (type.equals(Float.class)) {
+try {
+Float val = Float.parseFloat(value);
+if (weightBasedParametersForValidation.contains(name) && (val 
< 0f || val > 1f)) {
+throw new InvalidParameterValueException("Please enter a 
value between 0 and 1 for the configuration parameter: "+ name);
+}
+} catc

[02/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-2679: Install docs could point to more accurate XenServer download 
page


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

Branch: refs/heads/vmsync
Commit: 5bfae23a1e2031f79f60d9354a4bab986bf1ecd6
Parents: 145c10e 3e430cc
Author: Joe Brockmeier 
Authored: Sun Jun 23 13:17:46 2013 -0500
Committer: Joe Brockmeier 
Committed: Sun Jun 23 13:17:46 2013 -0500

--
 tools/marvin/marvin/TestCaseExecuteEngine.py | 43 ++-
 1 file changed, 27 insertions(+), 16 deletions(-)
--

[19/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3143: add response in the response string (ui change)


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

Branch: refs/heads/vmsync
Commit: aac922450c500c8ba4b10d61fad66fb0ec6c7d7a
Parents: 1eb744f
Author: Wei Zhou 
Authored: Mon Jun 24 09:18:41 2013 +0200
Committer: Wei Zhou 
Committed: Mon Jun 24 09:18:41 2013 +0200

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aac92245/ui/scripts/network.js
--
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index d18e796..fbd8b01 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -4123,7 +4123,7 @@
   dataType: 'json',
   async: true,
   success: function(data) {
-var jobID = data.revokesecuritygroupingress.jobid;
+var jobID = 
data.revokesecuritygroupingressresponse.jobid;
 
 args.response.success({
   _custom: {
@@ -4295,7 +4295,7 @@
   dataType: 'json',
   async: true,
   success: function(data) {
-var jobID = data.revokesecuritygroupegress.jobid;
+var jobID = 
data.revokesecuritygroupegressresponse.jobid;
 
 args.response.success({
   _custom: {

[10/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

cloud-early-config: add device file existence check

If device file was not found, then it should be logged.


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

Branch: refs/heads/vmsync
Commit: 5c4578ef26adcc51e059963144174c955ba5542b
Parents: 009da93
Author: Hiroaki KAWAI 
Authored: Mon Jun 24 11:24:42 2013 +0900
Committer: Hiroaki KAWAI 
Committed: Mon Jun 24 11:24:42 2013 +0900

--
 patches/systemvm/debian/config/etc/init.d/cloud-early-config | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5c4578ef/patches/systemvm/debian/config/etc/init.d/cloud-early-config
--
diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config 
b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
index b215271..f93c39d 100755
--- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config
+++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config
@@ -112,6 +112,9 @@ get_boot_params() {
   sed -i "s/%/ /g" /var/cache/cloud/cmdline
   ;;
  kvm)
+  if [ ! -e /dev/vport0p1 ]; then
+log_it "/dev/vport0p1 not loaded, perhaps guest kernel is too 
old." && exit 2
+  fi
   while read line; do
 if [[ $line == cmdline:* ]]; then
   cmd=${line//cmdline:/}
@@ -133,7 +136,7 @@ get_boot_params() {
   mount -t ntfs /dev/sdb1 $EXTRA_MOUNT
   cp -f $EXTRA_MOUNT/cmdline /var/cache/cloud/cmdline
   umount $EXTRA_MOUNT
-  ;;  
+  ;;
   esac
 
 }

[04/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

Adding instructions for restarting MySQL on Debian/Ubuntu systems, since the 
name of the service differs. Found during Hack Day.


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

Branch: refs/heads/vmsync
Commit: 2a8297bee5417a76fbe87dd0361dbfecdeb76022
Parents: 2e06da5
Author: Joe Brockmeier 
Authored: Sun Jun 23 14:05:19 2013 -0500
Committer: Joe Brockmeier 
Committed: Sun Jun 23 14:05:58 2013 -0500

--
 docs/en-US/database-replication.xml | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a8297be/docs/en-US/database-replication.xml
--
diff --git a/docs/en-US/database-replication.xml 
b/docs/en-US/database-replication.xml
index bb14457..8ca8071 100644
--- a/docs/en-US/database-replication.xml
+++ b/docs/en-US/database-replication.xml
@@ -37,10 +37,14 @@ server_id=1
 The server_id must be unique with respect to other servers. The 
recommended way to achieve this is to give the master an ID of 1 and each slave 
a sequential number greater than 1, so that the servers are numbered 1, 2, 3, 
etc.
 
 
-Restart the MySQL service:
+Restart the MySQL service. On RHEL/CentOS systems, use:
 
 # service mysqld restart
 
+On Debian/Ubuntu systems, use:
+
+# service mysql restart
+
 
 
 Create a replication account on the master and give it 
privileges. We will use the "cloud-repl" user with the password "password". 
This assumes that master and slave run on the 172.16.1.0/24 network.
@@ -90,10 +94,14 @@ innodb_lock_wait_timeout=600
 
 
 
-Restart MySQL.
+Restart MySQL. Use "mysqld" on RHEL/CentOS systems:
 
 # service mysqld restart
 
+On Ubuntu/Debian systems use "mysql."
+
+# service mysql restart
+
 
 
 Instruct the slave to connect to and replicate from the master. 
Replace the IP address, password, log file, and position with the values you 
have used in the previous steps.

[29/50] [abbrv] git commit: updated refs/heads/vmsync to 049dd72

[ahuang]

CLOUDSTACK-3084: Added check to disallow -ve number for ACL rule


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

Branch: refs/heads/vmsync
Commit: bd5ad442d0f82467cf10fea409511a5dea0a5704
Parents: 390022c
Author: Kishan Kavala 
Authored: Mon Jun 24 17:13:52 2013 +0530
Committer: Kishan Kavala 
Committed: Mon Jun 24 17:20:29 2013 +0530

--
 .../src/com/cloud/network/vpc/NetworkACLServiceImpl.java | 11 ---
 1 file changed, 8 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bd5ad442/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
--
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java 
b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
index b0c807e..4c97869 100644
--- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
+++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -308,7 +308,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem(aclItemCmd.getSourcePortStart(), 
aclItemCmd.getSourcePortEnd(), aclItemCmd.getSourceCidrList(),
-aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction());
+aclItemCmd.getProtocol(), aclItemCmd.getIcmpCode(), 
aclItemCmd.getIcmpType(), aclItemCmd.getAction(), aclItemCmd.getNumber());
 
 return 
_networkAclMgr.createNetworkACLItem(aclItemCmd.getSourcePortStart(),
 aclItemCmd.getSourcePortEnd(), aclItemCmd.getProtocol(), 
aclItemCmd.getSourceCidrList(), aclItemCmd.getIcmpCode(),
@@ -316,7 +316,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 private void validateNetworkACLItem(Integer portStart, Integer portEnd, 
List sourceCidrList, String protocol, Integer icmpCode,
-Integer icmpType, String action) {
+Integer icmpType, String action, 
Integer number) {
 
 if (portStart != null && !NetUtils.isValidPort(portStart)) {
 throw new InvalidParameterValueException("publicPort is an invalid 
value: " + portStart);
@@ -388,6 +388,11 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 throw new InvalidParameterValueException("Invalid action. 
Allowed actions are Allow and Deny");
 }
 }
+
+//Check for valid number
+if(number != null && number < 1){
+throw new InvalidParameterValueException("Invalid number. Number 
cannot be < 1");
+}
 }
 
 @Override
@@ -526,7 +531,7 @@ public class NetworkACLServiceImpl extends ManagerBase 
implements NetworkACLServ
 }
 
 validateNetworkACLItem((sourcePortStart == null) ? 
aclItem.getSourcePortStart() : sourcePortStart, (sourcePortEnd == null) ? 
aclItem.getSourcePortEnd() : sourcePortEnd,
-sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action);
+sourceCidrList, protocol, icmpCode, (icmpType == null) ? 
aclItem.getIcmpType() : icmpType, action, number);
 
 return _networkAclMgr.updateNetworkACLItem(id, protocol, 
sourceCidrList, trafficType, action, number, sourcePortStart,
 sourcePortEnd, icmpCode, icmpType);

git commit: updated refs/heads/vmsync to 4f709ab

[ahuang]

Updated Branches:
  refs/heads/vmsync 049dd7242 -> 4f709abd6


Merge fixes.  Now started


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

Branch: refs/heads/vmsync
Commit: 4f709abd6abf9ed4c304c6a626f2456c85dafffd
Parents: 049dd72
Author: Alex Huang 
Authored: Mon Jun 24 18:04:48 2013 -0700
Committer: Alex Huang 
Committed: Mon Jun 24 18:04:48 2013 -0700

--
 .../storage/test/DirectAgentManagerSimpleImpl.java| 10 --
 setup/db/db/schema-410to420.sql   |  5 -
 2 files changed, 15 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f709abd/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
--
diff --git 
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
 
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
index 8c4571f..e7d7b6d 100644
--- 
a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
+++ 
b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentManagerSimpleImpl.java
@@ -34,14 +34,11 @@ import com.cloud.agent.StartupCommandProcessor;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.Command;
 import com.cloud.agent.api.SetupCommand;
-import com.cloud.agent.api.StartupCommand;
-import com.cloud.agent.manager.AgentAttache;
 import com.cloud.agent.manager.Commands;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.dao.ClusterDao;
 import com.cloud.exception.AgentUnavailableException;
-import com.cloud.exception.ConnectionException;
 import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.OperationTimedoutException;
 import com.cloud.host.HostEnvironment;
@@ -241,13 +238,6 @@ public class DirectAgentManagerSimpleImpl extends 
ManagerBase implements AgentMa
 }
 
 @Override
-public AgentAttache handleDirectConnectAgent(HostVO host, StartupCommand[] 
cmds, ServerResource resource,
-boolean forRebalance) throws ConnectionException {
-// TODO Auto-generated method stub
-return null;
-}
-
-@Override
 public boolean agentStatusTransitTo(HostVO host, Event e, long msId) {
 // TODO Auto-generated method stub
 return false;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f709abd/setup/db/db/schema-410to420.sql
--
diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql
index 75088e5..3996042 100644
--- a/setup/db/db/schema-410to420.sql
+++ b/setup/db/db/schema-410to420.sql
@@ -94,11 +94,8 @@ CREATE TABLE `cloud`.`image_store` (
   PRIMARY KEY(`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
-<<< HEAD
 ALTER TABLE `cloud`.`async_job` ADD COLUMN `related` CHAR(40) NOT NULL;
 
-ALTER TABLE `cloud`.`vm_template` ADD COLUMN `image_data_store_id` bigint 
unsigned;
-===
 CREATE TABLE `cloud`.`image_store_details` (
   `id` bigint unsigned UNIQUE NOT NULL AUTO_INCREMENT COMMENT 'id',
   `store_id` bigint unsigned NOT NULL COMMENT 'store the detail is related to',
@@ -228,8 +225,6 @@ CREATE TABLE  `cloud`.`volume_store_ref` (
   INDEX `i_volume_store_ref__volume_id`(`volume_id`)
 ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8;
 
->>> master
-
 ALTER TABLE `cloud`.`service_offering` ADD COLUMN `is_volatile` tinyint(1) 
unsigned NOT NULL DEFAULT 0  COMMENT 'true if the vm needs to be volatile, 
i.e., on every reboot of vm from API root disk is discarded and creates a new 
root disk';
 
 ALTER TABLE `cloud`.`networks` ADD COLUMN `network_cidr` VARCHAR(18) COMMENT 
'The network cidr for the isolated guest network which uses IP Reservation 
facility.For networks not using IP reservation, network_cidr is always null.';

git commit: updated refs/heads/vmsync to 3174134

[ahuang]

Updated Branches:
  refs/heads/vmsync 4f709abd6 -> 3174134b3


get nonoss built


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

Branch: refs/heads/vmsync
Commit: 3174134b325d6915a57ac2bf6aafbe95f0f7c6f8
Parents: 4f709ab
Author: Alex Huang 
Authored: Mon Jun 24 19:52:53 2013 -0700
Committer: Alex Huang 
Committed: Mon Jun 24 19:52:53 2013 -0700

--
 .../vmware/VmwareServerDiscoverer.java  |  19 ++-
 .../manager/VmwareStorageManagerImpl.java   |   2 +-
 .../vmware/resource/VmwareResource.java |  11 +-
 .../cloud/network/resource/F5BigIpResource.java | 142 +--
 4 files changed, 86 insertions(+), 88 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3174134b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
--
diff --git 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
index 855a950..6f4be05 100755
--- 
a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
+++ 
b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
@@ -23,20 +23,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
-import javax.annotation.PostConstruct;
 import javax.ejb.Local;
 import javax.inject.Inject;
 import javax.naming.ConfigurationException;
 
 import org.apache.log4j.Logger;
+
+import com.vmware.vim25.ClusterDasConfigInfo;
+import com.vmware.vim25.ManagedObjectReference;
+
 import org.apache.cloudstack.api.ApiConstants;
-import org.springframework.beans.NullValueInNestedPathException;
 
 import com.cloud.agent.api.StartupCommand;
 import com.cloud.agent.api.StartupRoutingCommand;
 import com.cloud.alert.AlertManager;
 import com.cloud.configuration.Config;
-import com.cloud.configuration.dao.ConfigurationDao;
 import com.cloud.dc.ClusterDetailsDao;
 import com.cloud.dc.ClusterVO;
 import com.cloud.dc.DataCenter.NetworkType;
@@ -67,7 +68,6 @@ import com.cloud.network.PhysicalNetwork;
 import com.cloud.network.VmwareTrafficLabel;
 import com.cloud.network.dao.CiscoNexusVSMDeviceDao;
 import com.cloud.network.element.CiscoNexusVSMElement;
-import com.cloud.network.element.CiscoNexusVSMElementService;
 import com.cloud.resource.Discoverer;
 import com.cloud.resource.DiscovererBase;
 import com.cloud.resource.ResourceManager;
@@ -81,9 +81,6 @@ import com.cloud.storage.dao.VMTemplateDao;
 import com.cloud.user.Account;
 import com.cloud.utils.UriUtils;
 
-import com.vmware.vim25.ClusterDasConfigInfo;
-import com.vmware.vim25.ManagedObjectReference;
-
 
 @Local(value = Discoverer.class)
 public class VmwareServerDiscoverer extends DiscovererBase implements
@@ -129,7 +126,7 @@ public class VmwareServerDiscoverer extends DiscovererBase 
implements
}

@Override
-public Map> find(long dcId, 
Long podId, Long clusterId, URI url, 
+public Map> find(long dcId, 
Long podId, Long clusterId, URI url,
String username, String password, List hostTags) throws 
DiscoveryException {
 
if(s_logger.isInfoEnabled())
@@ -364,7 +361,7 @@ public class VmwareServerDiscoverer extends DiscovererBase 
implements
details.put("url", hostMo.getHostName());
details.put("username", username);
details.put("password", password);
-   String guid = morHost.getType() + ":" + 
morHost.getPresetParams()
+String guid = morHost.getType() + ":" + morHost.getValue()
+ "@" + url.getHost();
details.put("guid", guid);
 
@@ -490,7 +487,7 @@ public class VmwareServerDiscoverer extends DiscovererBase 
implements
"ClusterComputeResource"))
return false;
 
-   if 
(!morParent.getPresetParams().equals(morCluster.getPresetParams()))
+if (!morParent.getValue().equals(morCluster.getValue()))
return false;
}
}
@@ -713,7 +710,7 @@ public class VmwareServerDiscoverer extends DiscovererBase 
implements
 return VirtualSwitchType.NexusDistributedVirtualSwitch;
 else if(useDVS)
 return VirtualSwitchType.VMwareDistributedVirtualSwitch;
-else 
+

git commit: updated refs/heads/master to f706f67

[kawai]

Updated Branches:
  refs/heads/master af91a8ac8 -> f706f6757


Add class check before cast

DataTO might be one of SnapshotObjectTO, TemplateObjectTO
or VolumeObjectTO


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

Branch: refs/heads/master
Commit: f706f6757cdfcfb3fb9a288ea88e9796bc1e82d0
Parents: af91a8a
Author: Hiroaki KAWAI 
Authored: Tue Jun 25 12:41:11 2013 +0900
Committer: Hiroaki KAWAI 
Committed: Tue Jun 25 12:48:01 2013 +0900

--
 .../kvm/resource/LibvirtComputingResource.java  | 22 ++--
 1 file changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/f706f675/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
--
diff --git 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
index 46003e9..60cde8c 100755
--- 
a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
+++ 
b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
@@ -3446,17 +3446,17 @@ ServerResource {
 
 }
 
-VolumeObjectTO volumeObjectTO = (VolumeObjectTO)data;
-
-if ((volumeObjectTO.getBytesReadRate() != null) && 
(volumeObjectTO.getBytesReadRate()  > 0))
-disk.setBytesReadRate(volumeObjectTO.getBytesReadRate());
-if ((volumeObjectTO.getBytesWriteRate() != null) && 
(volumeObjectTO.getBytesWriteRate() > 0))
-disk.setBytesWriteRate(volumeObjectTO.getBytesWriteRate());
-if ((volumeObjectTO.getIopsReadRate() != null) && 
(volumeObjectTO.getIopsReadRate() > 0))
-disk.setIopsReadRate(volumeObjectTO.getIopsReadRate());
-if ((volumeObjectTO.getIopsWriteRate() != null) && 
(volumeObjectTO.getIopsWriteRate() > 0))
-disk.setIopsWriteRate(volumeObjectTO.getIopsWriteRate());
-
+if (data instanceof VolumeObjectTO) {
+VolumeObjectTO volumeObjectTO = (VolumeObjectTO)data;
+if ((volumeObjectTO.getBytesReadRate() != null) && 
(volumeObjectTO.getBytesReadRate()  > 0))
+disk.setBytesReadRate(volumeObjectTO.getBytesReadRate());
+if ((volumeObjectTO.getBytesWriteRate() != null) && 
(volumeObjectTO.getBytesWriteRate() > 0))
+disk.setBytesWriteRate(volumeObjectTO.getBytesWriteRate());
+if ((volumeObjectTO.getIopsReadRate() != null) && 
(volumeObjectTO.getIopsReadRate() > 0))
+disk.setIopsReadRate(volumeObjectTO.getIopsReadRate());
+if ((volumeObjectTO.getIopsWriteRate() != null) && 
(volumeObjectTO.getIopsWriteRate() > 0))
+disk.setIopsWriteRate(volumeObjectTO.getIopsWriteRate());
+}
 vm.getDevices().addDevice(disk);
 }