apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-2400 updated the error message and replacenetworkacl on private gateway

Browse Source
This commit is contained in:
Jayapal 2013-05-14 15:35:56 +05:30 committed by Kishan Kavala
parent c94c71b4ce
commit 46f8b6f34a
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -3777,12 +3777,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService {
// VALIDATE IP INFO // VALIDATE IP INFO
// if end ip is not specified, default it to startIp // if end ip is not specified, default it to startIp
if (!NetUtils.isValidIp(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) { if (endIp == null) {
endIp = startIp; endIp = startIp;
} else if (!NetUtils.isValidIp(endIp)) { } 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; String cidr = null;

2
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
View File

@ -176,7 +176,7 @@ public class NetworkACLServiceImpl extends ManagerBase implements NetworkACLServ
throw new InvalidParameterValueException("Unable to find specified vpc id"); 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()); Vpc vpc = _vpcMgr.getVpc(acl.getVpcId());
if(vpc == null){ if(vpc == null){
throw new InvalidParameterValueException("Unable to find Vpc associated with the NetworkACL"); throw new InvalidParameterValueException("Unable to find Vpc associated with the NetworkACL");