Switch EC2 from its own IpPermission and IpProtocol to org.jclouds.net.domain ones
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/77417cbc Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/77417cbc Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/77417cbc Branch: refs/heads/jclouds-101 Commit: 77417cbc327a527b60c3b45d61961b1b41765a73 Parents: 30e309d Author: Andrew Bayer <[email protected]> Authored: Thu Jun 13 09:40:59 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Thu Jun 13 09:40:59 2013 -0700 ---------------------------------------------------------------------- .../clojure/org/jclouds/ec2/security_group2.clj | 6 +- .../BindIpPermissionToIndexedFormParams.java | 2 +- .../BindIpPermissionsToIndexedFormParams.java | 2 +- .../loaders/CreateSecurityGroupIfNeeded.java | 2 +- .../org/jclouds/ec2/domain/IpPermission.java | 189 ------------------- .../java/org/jclouds/ec2/domain/IpProtocol.java | 48 ----- .../org/jclouds/ec2/domain/SecurityGroup.java | 1 + .../ec2/services/SecurityGroupAsyncClient.java | 2 +- .../ec2/services/SecurityGroupClient.java | 2 +- .../org/jclouds/ec2/util/IpPermissions.java | 22 +-- .../jclouds/ec2/xml/IpPermissionHandler.java | 8 +- ...plicationArchitecturesEC2ClientLiveTest.java | 2 +- .../jclouds/ec2/EBSBootEC2ClientLiveTest.java | 2 +- .../ec2/compute/EC2ComputeServiceLiveTest.java | 2 +- .../CreateSecurityGroupIfNeededTest.java | 2 +- .../services/SecurityGroupAsyncClientTest.java | 2 +- .../services/SecurityGroupClientLiveTest.java | 8 +- .../org/jclouds/ec2/util/IpPermissionsTest.java | 2 +- ...scribeSecurityGroupsResponseHandlerTest.java | 4 +- .../org/jclouds/net/domain/IpPermission.java | 2 +- .../java/org/jclouds/net/domain/IpProtocol.java | 12 +- .../services/AWSSecurityGroupAsyncClient.java | 2 +- .../ec2/services/AWSSecurityGroupClient.java | 2 +- .../compute/AWSEC2ComputeServiceLiveTest.java | 2 +- .../DescribeSecurityGroupsResponseTest.java | 6 +- .../AWSSecurityGroupAsyncClientTest.java | 4 +- .../AWSSecurityGroupClientLiveTest.java | 6 +- 27 files changed, 59 insertions(+), 285 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/clojure/org/jclouds/ec2/security_group2.clj ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/clojure/org/jclouds/ec2/security_group2.clj b/apis/ec2/src/main/clojure/org/jclouds/ec2/security_group2.clj index bc000a2..a6bc49c 100644 --- a/apis/ec2/src/main/clojure/org/jclouds/ec2/security_group2.clj +++ b/apis/ec2/src/main/clojure/org/jclouds/ec2/security_group2.clj @@ -21,9 +21,9 @@ org.jclouds.ec2.security-group2 (:require (org.jclouds [compute2 :as compute]) [org.jclouds.ec2.ebs2 :as ebs]) - (:import org.jclouds.ec2.domain.IpProtocol - org.jclouds.ec2.domain.SecurityGroup - org.jclouds.ec2.services.SecurityGroupClient)) + (:import org.jclouds.ec2.domain.SecurityGroup + org.jclouds.ec2.services.SecurityGroupClient + org.jclouds.net.domain.IpProtocol)) (defn #^SecurityGroupClient sg-service http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionToIndexedFormParams.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionToIndexedFormParams.java index f90e938..403f592 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionToIndexedFormParams.java @@ -19,9 +19,9 @@ package org.jclouds.ec2.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.util.IpPermissions; import org.jclouds.http.HttpRequest; +import org.jclouds.net.domain.IpPermission; import org.jclouds.rest.Binder; /** http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java index d9260f9..4bead83 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/binders/BindIpPermissionsToIndexedFormParams.java @@ -19,9 +19,9 @@ package org.jclouds.ec2.binders; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.util.IpPermissions; import org.jclouds.http.HttpRequest; +import org.jclouds.net.domain.IpPermission; import org.jclouds.rest.Binder; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java index 0d54164..de3b906 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeeded.java @@ -27,10 +27,10 @@ import org.jclouds.compute.reference.ComputeServiceConstants; import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.compute.domain.RegionAndName; import org.jclouds.ec2.compute.domain.RegionNameAndIngressRules; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.services.SecurityGroupClient; import org.jclouds.logging.Logger; +import org.jclouds.net.domain.IpProtocol; import com.google.common.base.Predicate; import com.google.common.cache.CacheLoader; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java deleted file mode 100644 index 91c75e7..0000000 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpPermission.java +++ /dev/null @@ -1,189 +0,0 @@ -/* - * 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 org.jclouds.ec2.domain; - -import static com.google.common.base.Preconditions.checkNotNull; - -import java.util.Set; - -import com.google.common.base.Objects; -import com.google.common.collect.ImmutableMultimap; -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Iterables; -import com.google.common.collect.LinkedHashMultimap; -import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; - -/** - * - * @see <a href= - * "http://docs.amazonwebservices.com/AWSEC2/latest/APIReference/ApiReference-ItemType-IpPermissionType.html"; - * /> - * @author Adrian Cole - */ -public class IpPermission { - public static Builder builder() { - return new Builder(); - } - - public static class Builder { - private int fromPort; - private int toPort; - private IpProtocol ipProtocol; - private Multimap<String, String> userIdGroupPairs = LinkedHashMultimap.create(); - private Set<String> groupIds = Sets.newLinkedHashSet(); - private Set<String> ipRanges = Sets.newLinkedHashSet(); - - public Builder fromPort(int fromPort) { - this.fromPort = fromPort; - return this; - } - - public Builder toPort(int toPort) { - this.toPort = toPort; - return this; - } - - public Builder ipProtocol(IpProtocol ipProtocol) { - this.ipProtocol = checkNotNull(ipProtocol, "ipProtocol"); - return this; - } - - public Builder userIdGroupPair(String userId, String groupNameOrId) { - this.userIdGroupPairs.put(checkNotNull(userId, "userId"), checkNotNull(groupNameOrId, "groupNameOrId of %s", userId)); - return this; - } - - public Builder userIdGroupPairs(Multimap<String, String> userIdGroupPairs) { - this.userIdGroupPairs.putAll(checkNotNull(userIdGroupPairs, "userIdGroupPairs")); - return this; - } - - public Builder ipRange(String ipRange) { - this.ipRanges.add(ipRange); - return this; - } - - public Builder ipRanges(Iterable<String> ipRanges) { - Iterables.addAll(this.ipRanges, checkNotNull(ipRanges, "ipRanges")); - return this; - } - - public Builder groupId(String groupId) { - this.groupIds.add(checkNotNull(groupId, "groupId")); - return this; - } - - public Builder groupIds(Iterable<String> groupIds) { - Iterables.addAll(this.groupIds, checkNotNull(groupIds, "groupIds")); - return this; - } - - public IpPermission build() { - return new IpPermission(ipProtocol, fromPort, toPort, userIdGroupPairs, groupIds, ipRanges); - } - } - - private final int fromPort; - private final int toPort; - private final Multimap<String, String> userIdGroupPairs; - private final Set<String> groupIds; - private final IpProtocol ipProtocol; - private final Set<String> ipRanges; - - public IpPermission(IpProtocol ipProtocol, int fromPort, int toPort, Multimap<String, String> userIdGroupPairs, - Iterable<String> groupIds, Iterable<String> ipRanges) { - this.fromPort = fromPort; - this.toPort = toPort; - this.userIdGroupPairs = ImmutableMultimap.copyOf(checkNotNull(userIdGroupPairs, "userIdGroupPairs")); - this.ipProtocol = checkNotNull(ipProtocol, "ipProtocol"); - this.groupIds = ImmutableSet.copyOf(checkNotNull(groupIds, "groupIds")); - this.ipRanges = ImmutableSet.copyOf(checkNotNull(ipRanges, "ipRanges")); - } - - /** - * Start of port range for the TCP and UDP protocols, or an ICMP type number. - * An ICMP type number of -1 indicates a wildcard (i.e., any ICMP type - * number). - */ - public int getFromPort() { - return fromPort; - } - - /** - * End of port range for the TCP and UDP protocols, or an ICMP code. An ICMP - * code of -1 indicates a wildcard (i.e., any ICMP code). - */ - public int getToPort() { - return toPort; - } - - /** - * List of security group and user ID pairs. - */ - public Multimap<String, String> getUserIdGroupPairs() { - return userIdGroupPairs; - } - - /** - * List of security group Ids - */ - public Set<String> getGroupIds() { - return groupIds; - } - - /** - * IP protocol - */ - public IpProtocol getIpProtocol() { - return ipProtocol; - } - - /** - * IP ranges. - */ - public Set<String> getIpRanges() { - return ipRanges; - } - - @Override - public int hashCode() { - return Objects.hashCode(fromPort, toPort, groupIds, ipProtocol, ipRanges, userIdGroupPairs); - } - - @Override - public boolean equals(Object obj) { - if (this == obj) - return true; - if (obj == null || getClass() != obj.getClass()) - return false; - IpPermission that = IpPermission.class.cast(obj); - return Objects.equal(this.fromPort, that.fromPort) && Objects.equal(this.toPort, that.toPort) - && Objects.equal(this.groupIds, that.groupIds) && Objects.equal(this.ipProtocol, that.ipProtocol) - && Objects.equal(this.ipRanges, that.ipRanges) - && Objects.equal(this.userIdGroupPairs, that.userIdGroupPairs); - } - - @Override - public String toString() { - return Objects.toStringHelper(this).omitNullValues().add("fromPort", fromPort == -1 ? null : fromPort) - .add("toPort", toPort == -1 ? null : toPort).add("groupIds", groupIds.size() == 0 ? null : groupIds) - .add("ipProtocol", ipProtocol).add("ipRanges", ipRanges.size() == 0 ? null : ipRanges) - .add("userIdGroupPairs", userIdGroupPairs.size() == 0 ? null : userIdGroupPairs).toString(); - } - -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpProtocol.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpProtocol.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpProtocol.java deleted file mode 100644 index 41e771c..0000000 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/IpProtocol.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * 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 org.jclouds.ec2.domain; - -import static com.google.common.base.Preconditions.checkNotNull; - -/** - * @author Adrian Cole - * - */ -public enum IpProtocol { - - TCP, UDP, ICMP, ALL, UNRECOGNIZED; - - public String value() { - return this == ALL ? "-1" : name().toLowerCase(); - } - - @Override - public String toString() { - return value(); - } - - public static IpProtocol fromValue(String protocol) { - try { - if (protocol.equalsIgnoreCase("-1")) - return ALL; - return valueOf(checkNotNull(protocol, "protocol").toUpperCase()); - } catch (IllegalArgumentException e) { - return UNRECOGNIZED; - } - } - -} http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java index ca5cdbb..caccebc 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java @@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.net.domain.IpPermission; import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java index 4d074ee..0de10f9 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupAsyncClient.java @@ -30,12 +30,12 @@ import org.jclouds.Fallbacks.VoidOnNotFoundOr404; import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.binders.BindGroupNamesToIndexedFormParams; import org.jclouds.ec2.binders.BindUserIdGroupPairToSourceSecurityGroupFormParams; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java index 3874bfb..23c8272 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/services/SecurityGroupClient.java @@ -17,10 +17,10 @@ package org.jclouds.ec2.services; import java.util.Set; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.net.domain.IpProtocol; /** * Provides access to EC2 via their REST API. http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java b/apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java index ac32cda..9c938f0 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/util/IpPermissions.java @@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull; import java.util.Map; import java.util.Map.Entry; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.util.Maps2; import com.google.common.annotations.Beta; @@ -58,7 +58,7 @@ public class IpPermissions extends IpPermission { headers.put("IpPermissions.%d.ToPort", permission.getToPort() + ""); String prefix = "IpPermissions.%d.IpRanges."; int i = 0; - for (String cidrIp : checkNotNull(permission.getIpRanges(), "cidrIps")) { + for (String cidrIp : checkNotNull(permission.getCidrBlocks(), "cidrIps")) { headers.put(prefix + i++ + ".CidrIp", cidrIp); } prefix = "IpPermissions.%d.Groups."; @@ -68,15 +68,15 @@ public class IpPermissions extends IpPermission { } prefix = "IpPermissions.%d.Groups."; i = 0; - for (Entry<String, String> userIdGroupNamePair : checkNotNull(permission.getUserIdGroupPairs(), - "userIdGroupNamePairs").entries()) { - headers.put(prefix + i + ".UserId", userIdGroupNamePair.getKey()); - headers.put(prefix + i + ".GroupName", userIdGroupNamePair.getValue()); + for (Entry<String, String> tenantIdGroupNamePair : checkNotNull(permission.getTenantIdGroupNamePairs(), + "tenantIdGroupNamePairs").entries()) { + headers.put(prefix + i + ".UserId", tenantIdGroupNamePair.getKey()); + headers.put(prefix + i + ".GroupName", tenantIdGroupNamePair.getValue()); i++; } prefix = "IpPermissions.%d.IpRanges."; i = 0; - for (String cidrIp : checkNotNull(permission.getIpRanges(), "cidrIps")) { + for (String cidrIp : checkNotNull(permission.getCidrBlocks(), "cidrIps")) { headers.put(prefix + i++ + ".CidrIp", cidrIp); } return Multimaps.forMap(Maps2.transformKeys(headers, new Function<String, String>() { @@ -165,7 +165,7 @@ public class IpPermissions extends IpPermission { } public IpPermissions toVPCSecurityGroups(Iterable<String> groupIds) { - return new IpPermissions(getIpProtocol(), getFromPort(), getToPort(), getUserIdGroupPairs(), groupIds, + return new IpPermissions(getIpProtocol(), getFromPort(), getToPort(), getTenantIdGroupNamePairs(), groupIds, ImmutableSet.<String> of()); } } @@ -189,8 +189,8 @@ public class IpPermissions extends IpPermission { checkNotNull(groupName, "groupName"))); } - public IpPermissions toEC2SecurityGroups(Multimap<String, String> userIdGroupNamePairs) { - return new IpPermissions(getIpProtocol(), getFromPort(), getToPort(), userIdGroupNamePairs, getGroupIds(), + public IpPermissions toEC2SecurityGroups(Multimap<String, String> tenantIdGroupNamePairs) { + return new IpPermissions(getIpProtocol(), getFromPort(), getToPort(), tenantIdGroupNamePairs, getGroupIds(), ImmutableSet.<String> of()); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java index 5b4dc6d..980ef35 100644 --- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java +++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/IpPermissionHandler.java @@ -19,9 +19,9 @@ package org.jclouds.ec2.xml; import static org.jclouds.util.SaxUtils.currentOrNull; import static org.jclouds.util.SaxUtils.equalsOrSuffix; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.http.functions.ParseSax; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.xml.sax.SAXException; /** @@ -66,14 +66,14 @@ public class IpPermissionHandler extends ParseSax.HandlerForGeneratedRequestWith // EC2) builder.toPort(Integer.parseInt(currentOrNegative(currentText))); } else if (equalsOrSuffix(qName, "cidrIp")) { - builder.ipRange(currentOrNull(currentText)); + builder.cidrBlock(currentOrNull(currentText)); } else if (equalsOrSuffix(qName, "userId")) { this.userId = currentOrNull(currentText); } else if (equalsOrSuffix(qName, "groupName") || equalsOrSuffix(qName, "groupId")) { this.groupId = currentOrNull(currentText); } else if (equalsOrSuffix(qName, "item")) { if (userId != null && groupId != null) - builder.userIdGroupPair(userId, groupId); + builder.tenantIdGroupNamePair(userId, groupId); userId = groupId = null; } currentText = new StringBuilder(); http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java index 584e6d9..1fc8de9 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/CloudApplicationArchitecturesEC2ClientLiveTest.java @@ -40,7 +40,6 @@ import org.jclouds.ec2.domain.BlockDevice; import org.jclouds.ec2.domain.Image.EbsBlockDevice; import org.jclouds.ec2.domain.InstanceState; import org.jclouds.ec2.domain.InstanceType; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; import org.jclouds.ec2.domain.Reservation; @@ -49,6 +48,7 @@ import org.jclouds.ec2.domain.Volume.InstanceInitiatedShutdownBehavior; import org.jclouds.ec2.predicates.InstanceHasIpAddress; import org.jclouds.ec2.predicates.InstanceStateRunning; import org.jclouds.http.HttpResponseException; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.predicates.SocketOpen; import org.jclouds.scriptbuilder.ScriptBuilder; import org.jclouds.scriptbuilder.domain.OsFamily; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java index 67af652..3b8bd75 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ClientLiveTest.java @@ -42,7 +42,6 @@ import org.jclouds.ec2.domain.Image.Architecture; import org.jclouds.ec2.domain.Image.ImageType; import org.jclouds.ec2.domain.InstanceState; import org.jclouds.ec2.domain.InstanceType; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.Reservation; import org.jclouds.ec2.domain.RootDeviceType; @@ -58,6 +57,7 @@ import org.jclouds.ec2.predicates.VolumeAttached; import org.jclouds.ec2.predicates.VolumeAvailable; import org.jclouds.http.HttpResponseException; import org.jclouds.io.Payloads; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.predicates.SocketOpen; import org.jclouds.scriptbuilder.InitScript; import org.jclouds.scriptbuilder.domain.OsFamily; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java index 67db38b..6334c9a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/EC2ComputeServiceLiveTest.java @@ -39,7 +39,6 @@ import org.jclouds.ec2.EC2ApiMetadata; import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.compute.options.EC2TemplateOptions; import org.jclouds.ec2.domain.BlockDevice; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.PublicIpInstanceIdPair; import org.jclouds.ec2.domain.RunningInstance; @@ -51,6 +50,7 @@ import org.jclouds.ec2.services.ElasticBlockStoreClient; import org.jclouds.ec2.services.InstanceClient; import org.jclouds.ec2.services.KeyPairClient; import org.jclouds.ec2.services.SecurityGroupClient; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.scriptbuilder.domain.Statements; import org.jclouds.sshj.config.SshjSshClientModule; import org.jclouds.util.InetAddresses2; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java index 85358b3..9597e1a 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/compute/loaders/CreateSecurityGroupIfNeededTest.java @@ -29,10 +29,10 @@ import java.util.concurrent.ExecutionException; import org.jclouds.ec2.compute.domain.RegionAndName; import org.jclouds.ec2.compute.domain.RegionNameAndIngressRules; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.services.SecurityGroupClient; +import org.jclouds.net.domain.IpProtocol; import org.testng.annotations.Test; import com.google.common.base.Predicate; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupAsyncClientTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupAsyncClientTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupAsyncClientTest.java index 24360d7..c22a279 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupAsyncClientTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupAsyncClientTest.java @@ -22,12 +22,12 @@ import java.io.IOException; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.UserIdGroupPair; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ReleasePayloadAndReturn; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java index 0f25935..c6d02d2 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/services/SecurityGroupClientLiveTest.java @@ -30,10 +30,10 @@ import java.util.Set; import org.jclouds.compute.internal.BaseComputeServiceContextLiveTest; import org.jclouds.ec2.EC2ApiMetadata; import org.jclouds.ec2.EC2Client; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.domain.UserIdGroupPair; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; @@ -174,7 +174,7 @@ public class SecurityGroupClientLiveTest extends BaseComputeServiceContextLiveTe assertEventually(new GroupHasPermission(client, group2Name, new Predicate<IpPermission>() { @Override public boolean apply(IpPermission arg0) { - return arg0.getUserIdGroupPairs().equals(ImmutableMultimap.of(group.getOwnerId(), group1Name)); + return arg0.getTenantIdGroupNamePairs().equals(ImmutableMultimap.of(group.getOwnerId(), group1Name)); } })); @@ -191,7 +191,7 @@ public class SecurityGroupClientLiveTest extends BaseComputeServiceContextLiveTe @Override public boolean apply(IpPermission arg0) { return arg0.getIpProtocol() == IpProtocol.TCP && arg0.getFromPort() == 80 && arg0.getToPort() == 80 - && arg0.getIpRanges().equals(ImmutableSet.of("0.0.0.0/0")); + && arg0.getCidrBlocks().equals(ImmutableSet.of("0.0.0.0/0")); } } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java index 6d466b7..03a2549 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/util/IpPermissionsTest.java @@ -18,7 +18,7 @@ package org.jclouds.ec2.util; import static org.testng.Assert.assertEquals; -import org.jclouds.ec2.domain.IpProtocol; +import org.jclouds.net.domain.IpProtocol; import org.testng.annotations.Test; import com.google.common.collect.ImmutableSet; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java ---------------------------------------------------------------------- diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java index 8032aaa..5084069 100644 --- a/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java +++ b/apis/ec2/src/test/java/org/jclouds/ec2/xml/DescribeSecurityGroupsResponseHandlerTest.java @@ -21,10 +21,10 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.http.functions.ParseSax; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMultimap; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/compute/src/main/java/org/jclouds/net/domain/IpPermission.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java index 15bfe0c..d04af0c 100644 --- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java +++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java @@ -154,7 +154,7 @@ public class IpPermission implements Comparable<IpPermission> { private final IpProtocol ipProtocol; private final Set<String> cidrBlocks; - protected IpPermission(IpProtocol ipProtocol, int fromPort, int toPort, + public IpPermission(IpProtocol ipProtocol, int fromPort, int toPort, Multimap<String, String> tenantIdGroupNamePairs, Iterable<String> groupIds, Iterable<String> cidrBlocks) { this.fromPort = fromPort; this.toPort = toPort; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/compute/src/main/java/org/jclouds/net/domain/IpProtocol.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/net/domain/IpProtocol.java b/compute/src/main/java/org/jclouds/net/domain/IpProtocol.java index 50d4422..203f0f9 100644 --- a/compute/src/main/java/org/jclouds/net/domain/IpProtocol.java +++ b/compute/src/main/java/org/jclouds/net/domain/IpProtocol.java @@ -29,12 +29,22 @@ public enum IpProtocol { TCP, UDP, ICMP, ALL, UNRECOGNIZED; + public String value() { + return this == ALL ? "-1" : name().toLowerCase(); + } + + @Override + public String toString() { + return value(); + } + public static IpProtocol fromValue(String protocol) { try { + if (protocol.equalsIgnoreCase("-1")) + return ALL; return valueOf(checkNotNull(protocol, "protocol").toUpperCase()); } catch (IllegalArgumentException e) { return UNRECOGNIZED; } } - } http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java index 75a6f9b..25acb03 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClient.java @@ -33,12 +33,12 @@ import org.jclouds.aws.filters.FormSigner; import org.jclouds.ec2.binders.BindGroupIdsToIndexedFormParams; import org.jclouds.ec2.binders.BindIpPermissionToIndexedFormParams; import org.jclouds.ec2.binders.BindIpPermissionsToIndexedFormParams; -import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.SecurityGroupAsyncClient; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; import org.jclouds.javax.annotation.Nullable; import org.jclouds.location.functions.RegionToEndpointOrProviderIfNull; +import org.jclouds.net.domain.IpPermission; import org.jclouds.rest.annotations.BinderParam; import org.jclouds.rest.annotations.EndpointParam; import org.jclouds.rest.annotations.Fallback; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java index 383b0fd..ac3b301 100644 --- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java +++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClient.java @@ -18,10 +18,10 @@ package org.jclouds.aws.ec2.services; import java.util.Set; import org.jclouds.aws.ec2.options.CreateSecurityGroupOptions; -import org.jclouds.ec2.domain.IpPermission; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.SecurityGroupClient; import org.jclouds.javax.annotation.Nullable; +import org.jclouds.net.domain.IpPermission; import com.google.common.annotations.Beta; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java index 7ee0e9d..ae39523 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeServiceLiveTest.java @@ -48,11 +48,11 @@ import org.jclouds.compute.predicates.NodePredicates; import org.jclouds.domain.LoginCredentials; import org.jclouds.ec2.EC2Client; import org.jclouds.ec2.compute.EC2ComputeServiceLiveTest; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.KeyPair; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.InstanceClient; import org.jclouds.ec2.services.KeyPairClient; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.scriptbuilder.domain.Statements; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/parse/DescribeSecurityGroupsResponseTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/parse/DescribeSecurityGroupsResponseTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/parse/DescribeSecurityGroupsResponseTest.java index 40e49dd..8f948f5 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/parse/DescribeSecurityGroupsResponseTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/parse/DescribeSecurityGroupsResponseTest.java @@ -25,12 +25,12 @@ import static org.testng.Assert.assertEquals; import java.io.InputStream; import java.util.Set; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.xml.BaseEC2HandlerTest; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; import org.jclouds.http.functions.ParseSax; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.reflect.Invocation; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; @@ -69,7 +69,7 @@ public class DescribeSecurityGroupsResponseTest extends BaseEC2HandlerTest { // .vpcId("vpc-99999999") .ipPermission(IpPermission.builder() .ipProtocol(IpProtocol.ALL) - .userIdGroupPair("123123123123","sg-11111111").build()) + .tenantIdGroupNamePair("123123123123","sg-11111111").build()) // .ipPermissionEgress(IpPermission.builder() // .ipProtocol(IpProtocol.ALL) // .ipRange("0.0.0.0/0").build()) http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClientTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClientTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClientTest.java index 2ad3467..9ebead5 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClientTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupAsyncClientTest.java @@ -22,13 +22,13 @@ import java.io.IOException; import org.jclouds.Fallbacks.EmptySetOnNotFoundOr404; import org.jclouds.Fallbacks.VoidOnNotFoundOr404; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.util.IpPermissions; import org.jclouds.ec2.xml.DescribeSecurityGroupsResponseHandler; import org.jclouds.http.HttpRequest; import org.jclouds.http.functions.ParseSax; import org.jclouds.http.functions.ReleasePayloadAndReturn; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.jclouds.rest.internal.GeneratedHttpRequest; import org.testng.annotations.Test; http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/77417cbc/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClientLiveTest.java ---------------------------------------------------------------------- diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClientLiveTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClientLiveTest.java index 0ec81dd..76c7e91 100644 --- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClientLiveTest.java +++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/services/AWSSecurityGroupClientLiveTest.java @@ -21,11 +21,11 @@ import static org.testng.Assert.assertNotNull; import java.util.Set; -import org.jclouds.ec2.domain.IpPermission; -import org.jclouds.ec2.domain.IpProtocol; import org.jclouds.ec2.domain.SecurityGroup; import org.jclouds.ec2.services.SecurityGroupClientLiveTest; import org.jclouds.ec2.util.IpPermissions; +import org.jclouds.net.domain.IpPermission; +import org.jclouds.net.domain.IpProtocol; import org.testng.annotations.Test; import com.google.common.base.Predicate; @@ -69,7 +69,7 @@ public class AWSSecurityGroupClientLiveTest extends SecurityGroupClientLiveTest assertEventually(new GroupHasPermission(client, group2Name, new Predicate<IpPermission>() { @Override public boolean apply(IpPermission arg0) { - return arg0.getUserIdGroupPairs().equals(ImmutableMultimap.of(group.getOwnerId(), group1Name)) + return arg0.getTenantIdGroupNamePairs().equals(ImmutableMultimap.of(group.getOwnerId(), group1Name)) && arg0.getFromPort() == 80 && arg0.getToPort() == 80 && arg0.getIpProtocol() == IpProtocol.TCP; } }));
