From be62b9bbfd3110f10261e0039498c12b2596d055 Mon Sep 17 00:00:00 2001 From: Zack Shoylev Date: Tue, 5 Aug 2014 07:39:44 -0500 Subject: [PATCH] Adds missing constructor properties --- .../jclouds/openstack/neutron/v2/domain/AllocationPool.java | 3 +++ .../openstack/neutron/v2/domain/ExternalGatewayInfo.java | 2 ++ .../jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java | 2 ++ .../org/jclouds/openstack/neutron/v2/domain/HostRoute.java | 2 ++ .../main/java/org/jclouds/openstack/neutron/v2/domain/IP.java | 2 ++ .../jclouds/openstack/neutron/v2/domain/NetworkSegment.java | 2 ++ .../jclouds/openstack/neutron/v2/domain/RouterInterface.java | 2 ++ 7 files changed, 15 insertions(+) diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java index 6df93cdc27..fa910e70bc 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java @@ -20,6 +20,8 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; +import java.beans.ConstructorProperties; + /** * A Neutron Subnet Allocation Pool * Contains a start and an end IP address describing the pool. @@ -33,6 +35,7 @@ public class AllocationPool { protected final String start; protected final String end; + @ConstructorProperties({"start", "end"}) protected AllocationPool(String start, String end) { this.start = start; this.end = end; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java index d66bc04355..608425176a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java @@ -21,6 +21,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * Information on the external gateway for the router @@ -32,6 +33,7 @@ public class ExternalGatewayInfo { @Named("enable_snat") protected final Boolean enableSnat; + @ConstructorProperties({"network_id", "enable_snat"}) protected ExternalGatewayInfo(String networkId, Boolean enableSnat) { this.networkId = networkId; this.enableSnat = enableSnat; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java index 6b7dfd81b1..f1947bf4ad 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java @@ -21,6 +21,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * This is used to provide additional DHCP-related options to Subnet. This is @@ -40,6 +41,7 @@ public class ExtraDhcpOption { @Named("opt_value") protected final String optionValue; + @ConstructorProperties({"id", "opt_name", "opt_value"}) protected ExtraDhcpOption(String id, String optionName, String optionValue) { this.id = id; this.optionName = optionName; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java index 04c3bda0b9..538699fddf 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java @@ -22,6 +22,7 @@ import com.google.common.base.Objects; import com.google.common.base.Objects.ToStringHelper; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * A Neutron Subnet Host Route @@ -35,6 +36,7 @@ public class HostRoute { @Named("nexthop") private final String nextHop; + @ConstructorProperties({"destination", "nexthop"}) protected HostRoute(String destinationCidr, String nextHop) { this.destinationCidr = destinationCidr; this.nextHop = nextHop; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java index 1885e99f16..86aa9e7e62 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java @@ -21,6 +21,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * Describes an IP address @@ -32,6 +33,7 @@ public class IP { @Named("subnet_id") protected final String subnetId; + @ConstructorProperties({"ip_address", "subnet_id"}) protected IP(String ipAddress, String subnetId) { this.ipAddress = ipAddress; this.subnetId = subnetId; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java index 3406746444..e7c031550a 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java @@ -21,6 +21,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * A Neutron Network Segment @@ -39,6 +40,7 @@ public class NetworkSegment { @Named("provider:segmentation_id") protected final int segmentationId; + @ConstructorProperties({"provider:network_type", "provider:physical_network", "provider:segmentation_id"}) protected NetworkSegment(NetworkType networkType, String physicalNetwork, int segmentationId) { this.networkType = networkType; this.physicalNetwork = physicalNetwork; diff --git a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java index 091bf99a90..9f328d6723 100644 --- a/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java +++ b/apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java @@ -21,6 +21,7 @@ package org.jclouds.openstack.neutron.v2.domain; import com.google.common.base.Objects; import javax.inject.Named; +import java.beans.ConstructorProperties; /** * A Neutron Router Interface @@ -36,6 +37,7 @@ public class RouterInterface { @Named("port_id") protected final String portId; + @ConstructorProperties({"subnet_id", "port_id"}) protected RouterInterface(String subnetId, String portId) { this.subnetId = subnetId; this.portId = portId;