CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/46f8b6f3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/46f8b6f3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/46f8b6f3 Branch: refs/heads/planner_reserve Commit: 46f8b6f34a2a4b6c715d4850f159ff277ef6716f Parents: c94c71b Author: Jayapal <[email protected]> Authored: Tue May 14 15:35:56 2013 +0530 Committer: Kishan Kavala <[email protected]> Committed: Tue May 14 16:11:33 2013 +0530 ---------------------------------------------------------------------- .../src/com/cloud/network/NetworkServiceImpl.java | 4 ++-- .../cloud/network/vpc/NetworkACLServiceImpl.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46f8b6f3/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 eeea0f2..f3ec253 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -3777,12 +3777,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // VALIDATE IP INFO // if end ip is not specified, default it to startIp if (!NetUtils.isValidIp(startIp)) { - throw new InvalidParameterValueException("Invalid format for the startIp parameter"); + throw new InvalidParameterValueException("Invalid format for the ip address parameter"); } if (endIp == null) { endIp = startIp; } else if (!NetUtils.isValidIp(endIp)) { - throw new InvalidParameterValueException("Invalid format for the endIp parameter"); + throw new InvalidParameterValueException("Invalid format for the endIp address parameter"); } String cidr = null; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/46f8b6f3/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 ba8f489..ac59fab 100644 --- a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java +++ b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java @@ -176,7 +176,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ throw new InvalidParameterValueException("Unable to find specified vpc id"); } - if(aclId != NetworkACL.DEFAULT_DENY || aclId != NetworkACL.DEFAULT_ALLOW) { + if(aclId != NetworkACL.DEFAULT_DENY && aclId != NetworkACL.DEFAULT_ALLOW) { Vpc vpc = _vpcMgr.getVpc(acl.getVpcId()); if(vpc == null){ throw new InvalidParameterValueException("Unable to find Vpc associated with the NetworkACL");
