Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed cidr list parse error

This commit is contained in:
Adrian Cole 2011-12-21 22:26:03 -08:00
parent d1f4339c84
commit cc147a6ec6
2 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
View File

@ -18,10 +18,10 @@
*/
package org.jclouds.cloudstack.domain;
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import com.google.common.base.Joiner;
import com.google.common.base.Splitter;
import com.google.common.collect.ImmutableSet;
import com.google.gson.annotations.SerializedName;
@ -137,18 +137,12 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
@SerializedName("virtualmachinename")
private String virtualMachineName;
@SerializedName("cidrlist")
private Set<String> CIDRs = ImmutableSet.of();
private String CIDRs = "";
@SerializedName("privateendport")
private int privateEndPort;
@SerializedName("publicendport")
private int publicEndPort;
// for deserializer
PortForwardingRule() {
}
public PortForwardingRule(long id, String iPAddress, long iPAddressId, int privatePort, String protocol,
int publicPort, String state, String virtualMachineDisplayName, long virtualMachineId,
String virtualMachineName, Set<String> CIDRs, int privateEndPort, int publicEndPort) {
@ -162,7 +156,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
this.virtualMachineDisplayName = virtualMachineDisplayName;
this.virtualMachineId = virtualMachineId;
this.virtualMachineName = virtualMachineName;
this.CIDRs = new HashSet<String>(CIDRs);
this.CIDRs = Joiner.on(' ').join(CIDRs);
this.privateEndPort = privateEndPort;
this.publicEndPort = publicEndPort;
}
@ -246,7 +240,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
* @return the cidr list to forward traffic from
*/
public Set<String> getCIDRs() {
return Collections.unmodifiableSet(CIDRs);
return ImmutableSet.copyOf(Splitter.on(' ').split(CIDRs));
}
/**

3
apis/cloudstack/src/test/resources/listipforwardingrulesresponse.json
View File

@ -11,7 +11,8 @@
"ipaddress": "10.27.27.64",
"startport": 22,
"endport": 22,
"state": "Active"
"state": "Active",
"cidrlist":""
}]
}
}