CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding

Jayapal · Jayapal · commit 37c4015d4dd3 · 2014-02-10T14:28:33.000+05:30
diff --git a/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/firewall/CreatePortForwardingRuleCmd.java
@@ -18,6 +18,7 @@
 
 import java.util.List;
 
+import com.cloud.utils.net.NetUtils;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.api.APICommand;
@@ -334,7 +335,7 @@ public void create() {
 
         Ip privateIp = getVmSecondaryIp();
         if (privateIp != null) {
-            if (!privateIp.isIp4()) {
+            if (!NetUtils.isValidIp(privateIp.toString())) {
                 throw new InvalidParameterValueException("Invalid vm ip address");
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@`
`18`	`18`
`19`	`19`	`import java.util.List;`
`20`	`20`
	`21`	`+import com.cloud.utils.net.NetUtils;`
`21`	`22`	`import org.apache.log4j.Logger;`
`22`	`23`
`23`	`24`	`import org.apache.cloudstack.api.APICommand;`
`@@ -334,7 +335,7 @@ public void create() {`
`334`	`335`
`335`	`336`	`Ip privateIp = getVmSecondaryIp();`
`336`	`337`	`if (privateIp != null) {`
`337`		`- if (!privateIp.isIp4()) {`
	`338`	`+ if (!NetUtils.isValidIp(privateIp.toString())) {`
`338`	`339`	`throw new InvalidParameterValueException("Invalid vm ip address");`
`339`	`340`	`}`
`340`	`341`	`}`