Forgot to add converters to modules
Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/382393b0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/382393b0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/382393b0 Branch: refs/heads/jclouds-101 Commit: 382393b07c4e785832626b2c3e506b92291bbed0 Parents: 0b7a1b4 Author: Andrew Bayer <[email protected]> Authored: Thu Jun 13 10:43:33 2013 -0700 Committer: Andrew Bayer <[email protected]> Committed: Thu Jun 13 10:43:33 2013 -0700 ---------------------------------------------------------------------- .../compute/config/CloudStackComputeServiceContextModule.java | 5 +++++ .../v2_0/compute/config/NovaComputeServiceContextModule.java | 6 ++++++ 2 files changed, 11 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/382393b0/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java index b4924be..f8fbf09 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java @@ -31,6 +31,7 @@ import javax.inject.Singleton; import org.jclouds.cloudstack.CloudStackClient; import org.jclouds.cloudstack.compute.CloudStackComputeService; +import org.jclouds.cloudstack.compute.functions.IngressRuleToIpPermission; import org.jclouds.cloudstack.compute.functions.OrphanedGroupsByZoneId; import org.jclouds.cloudstack.compute.functions.ServiceOfferingToHardware; import org.jclouds.cloudstack.compute.functions.TemplateToImage; @@ -45,6 +46,7 @@ import org.jclouds.cloudstack.compute.strategy.BasicNetworkOptionsConverter; import org.jclouds.cloudstack.compute.strategy.CloudStackComputeServiceAdapter; import org.jclouds.cloudstack.compute.strategy.OptionsConverter; import org.jclouds.cloudstack.domain.FirewallRule; +import org.jclouds.cloudstack.domain.IngressRule; import org.jclouds.cloudstack.domain.IPForwardingRule; import org.jclouds.cloudstack.domain.Network; import org.jclouds.cloudstack.domain.NetworkType; @@ -75,6 +77,7 @@ import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.domain.Location; +import org.jclouds.net.domain.IpPermission; import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier; @@ -109,6 +112,8 @@ public class CloudStackComputeServiceContextModule extends }).to(CloudStackComputeServiceAdapter.class); bind(new TypeLiteral<Function<VirtualMachine, NodeMetadata>>() { }).to(VirtualMachineToNodeMetadata.class); + bind(new TypeLiteral<Function<IngressRule, IpPermission>>() { + }).to(IngressRuleToIpPermission.class); bind(new TypeLiteral<Function<Template, org.jclouds.compute.domain.Image>>() { }).to(TemplateToImage.class); bind(new TypeLiteral<Function<ServiceOffering, org.jclouds.compute.domain.Hardware>>() { http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/382393b0/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java ---------------------------------------------------------------------- diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java index 92a19b3..cfd2f77 100644 --- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java +++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/config/NovaComputeServiceContextModule.java @@ -38,12 +38,14 @@ import org.jclouds.compute.domain.Image; import org.jclouds.compute.domain.NodeMetadata; import org.jclouds.compute.domain.OperatingSystem; import org.jclouds.compute.domain.OsFamily; +import org.jclouds.compute.domain.SecurityGroupRule; import org.jclouds.compute.extensions.ImageExtension; import org.jclouds.compute.options.TemplateOptions; import org.jclouds.compute.strategy.impl.CreateNodesWithGroupEncodedIntoNameThenAddToSet; import org.jclouds.domain.Location; import org.jclouds.domain.LoginCredentials; import org.jclouds.functions.IdentityFunction; +import org.jclouds.net.domain.IpPermission; import org.jclouds.openstack.nova.v2_0.compute.NovaComputeService; import org.jclouds.openstack.nova.v2_0.compute.NovaComputeServiceAdapter; import org.jclouds.openstack.nova.v2_0.compute.extensions.NovaImageExtension; @@ -52,6 +54,7 @@ import org.jclouds.openstack.nova.v2_0.compute.functions.FlavorInZoneToHardware; import org.jclouds.openstack.nova.v2_0.compute.functions.ImageInZoneToImage; import org.jclouds.openstack.nova.v2_0.compute.functions.ImageToOperatingSystem; import org.jclouds.openstack.nova.v2_0.compute.functions.OrphanedGroupsByZoneId; +import org.jclouds.openstack.nova.v2_0.compute.functions.SecurityGroupRuleToIpPermisison; import org.jclouds.openstack.nova.v2_0.compute.functions.ServerInZoneToNodeMetadata; import org.jclouds.openstack.nova.v2_0.compute.loaders.CreateUniqueKeyPair; import org.jclouds.openstack.nova.v2_0.compute.loaders.FindSecurityGroupOrCreate; @@ -108,6 +111,9 @@ public class NovaComputeServiceContextModule extends bind(new TypeLiteral<Function<ServerInZone, NodeMetadata>>() { }).to(ServerInZoneToNodeMetadata.class); + bind(new TypeLiteral<Function<SecurityGroupRule, IpPermission>>() { + }).to(SecurityGroupRuleToIpPermission.class); + bind(new TypeLiteral<Function<Set<? extends NodeMetadata>, Multimap<String, String>>>() { }).to(OrphanedGroupsByZoneId.class);
