From 3f9a0c3183480d150089c0d5a6e507c877f7d121 Mon Sep 17 00:00:00 2001 From: "Smokowski, Steve (ss835w)" Date: Thu, 2 May 2019 09:42:55 -0400 Subject: Enhance Openstack Client Update Openstack Client to support additional fields Updat all formatting issues Issue-ID: SO-1844 Change-Id: I1369e0c18cc25274db8df7e12855a020b8da38da Signed-off-by: Smokowski, Steve (ss835w) --- .../openstack/quantum/model/GatewayInfo.java | 4 +- .../woorea/openstack/quantum/model/HostRoute.java | 5 +- .../com/woorea/openstack/quantum/model/Link.java | 48 +++++++ .../woorea/openstack/quantum/model/Network.java | 150 +++++++++++++-------- .../woorea/openstack/quantum/model/Networks.java | 18 ++- .../openstack/quantum/model/NeutronError.java | 14 +- .../com/woorea/openstack/quantum/model/Pool.java | 13 +- .../com/woorea/openstack/quantum/model/Port.java | 63 +++------ .../com/woorea/openstack/quantum/model/Ports.java | 4 +- .../com/woorea/openstack/quantum/model/Router.java | 17 ++- .../quantum/model/RouterForAddInterface.java | 31 +++-- .../openstack/quantum/model/RouterForCreate.java | 16 ++- .../openstack/quantum/model/RouterInterface.java | 1 - .../woorea/openstack/quantum/model/Routers.java | 7 +- .../woorea/openstack/quantum/model/Segment.java | 8 +- .../com/woorea/openstack/quantum/model/Subnet.java | 71 +++++----- .../openstack/quantum/model/SubnetForCreate.java | 4 +- .../woorea/openstack/quantum/model/Subnets.java | 7 +- 18 files changed, 288 insertions(+), 193 deletions(-) create mode 100644 quantum-model/src/main/java/com/woorea/openstack/quantum/model/Link.java (limited to 'quantum-model/src/main/java/com/woorea/openstack/quantum') diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java index 88fb6a4..84e1a0c 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/GatewayInfo.java @@ -17,7 +17,6 @@ package com.woorea.openstack.quantum.model; import com.fasterxml.jackson.annotation.JsonProperty; - import java.io.Serializable; public class GatewayInfo implements Serializable { @@ -33,7 +32,8 @@ public class GatewayInfo implements Serializable { this.networkId = id; } - @Override public String toString() { + @Override + public String toString() { return "[networkId=" + networkId + "]"; } } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/HostRoute.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/HostRoute.java index 958a21d..ace3849 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/HostRoute.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/HostRoute.java @@ -26,6 +26,7 @@ public class HostRoute implements Serializable { public String getDestination() { return destination; } + public void setDestination(String destination) { this.destination = destination; } @@ -33,11 +34,13 @@ public class HostRoute implements Serializable { public String getNexthop() { return nexthop; } + public void setNexthop(String nexthop) { this.nexthop = nexthop; } - @Override public String toString() { + @Override + public String toString() { return "[destination=" + destination + ", nexthop=" + nexthop + "]"; } } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Link.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Link.java new file mode 100644 index 0000000..05fa9e9 --- /dev/null +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Link.java @@ -0,0 +1,48 @@ +/*- + * ============LICENSE_START======================================================= + * Licensed 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. + * ============LICENSE_END========================================================= + */ + +package com.woorea.openstack.quantum.model; + +import com.fasterxml.jackson.annotation.JsonProperty; + +public class Link { + @JsonProperty("href") + private String href; + + @JsonProperty("rel") + private String rel; + + public String getHref() { + return href; + } + + public void setHref(String href) { + this.href = href; + } + + public String getRel() { + return rel; + } + + public void setRel(String rel) { + this.rel = rel; + } + + @Override + public String toString() { + return "Link{" + "href='" + href + '\'' + ", rel='" + rel + '\'' + '}'; + } +} diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java index bec7dbf..fbc00fb 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Network.java @@ -21,19 +21,18 @@ package com.woorea.openstack.quantum.model; */ import java.io.Serializable; +import java.util.Date; import java.util.List; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; /** - * Network Extension supporting both Provider networks and Multi-Provider networks. - * The attributes for both of these network extensions are included. - * It is the responsibility of users to populate only one or the other. It is - * also critical that the Mapper is set for serialization inclusion.NON_NULL, or - * both would be sent to Openstack which would cause an error. + * Network Extension supporting both Provider networks and Multi-Provider networks. The attributes for both of these + * network extensions are included. It is the responsibility of users to populate only one or the other. It is also + * critical that the Mapper is set for serialization inclusion.NON_NULL, or both would be sent to Openstack which would + * cause an error. * */ @SuppressWarnings("serial") @@ -41,15 +40,27 @@ import com.fasterxml.jackson.annotation.JsonRootName; @JsonIgnoreProperties(ignoreUnknown = true) public class Network implements Serializable { + @JsonProperty("status") private String status; + @JsonProperty("subnets") private List subnets; + @JsonProperty("availability_zones") + private List availabilityZones; + + @JsonProperty("availability_zone_hints") + private List availabilityZoneHints; + + @JsonProperty("name") private String name; @JsonProperty("admin_state_up") private Boolean adminStateUp; + @JsonProperty("project_id") + private String projectId; + @JsonProperty("tenant_id") private String tenantId; @@ -63,25 +74,57 @@ public class Network implements Serializable { private Integer providerSegmentationId; @JsonProperty("router:external") - private String routerExternal; + private Boolean routerExternal; + + @JsonProperty("ipv6_address_scope") + private String ipv6AddressScope; + + @JsonProperty("ipv4_address_scope") + private String ipv4AddressScope; + + @JsonProperty("revision_number") + private Integer revisionNumber; + + @JsonProperty("port_security_enabled") + private Boolean portSecurityEnabled; + + @JsonProperty("mtu") + private Integer mtu; private String id; - private String shared; - + @JsonProperty("shared") + private Boolean shared; + + @JsonProperty("updated_at") + private Date updatedAt; + + @JsonProperty("created_at") + private Date createdAt; + + @JsonProperty("description") + private String description; + + + + @JsonProperty("is_default") + private Boolean isDefault; + private List segments; + @JsonProperty("tags") + private List tags; + /** * @return the status */ - + public String getStatus() { return status; } /** - * @param status - * the status to set + * @param status the status to set */ @JsonProperty public void setStatus(String status) { @@ -91,14 +134,13 @@ public class Network implements Serializable { /** * @return the subnets */ - + public List getSubnets() { return subnets; } /** - * @param subnets - * the subnets to set + * @param subnets the subnets to set */ @JsonProperty public void setSubnets(List subnets) { @@ -113,8 +155,7 @@ public class Network implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -125,18 +166,17 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - + public String getProviderPhyNet() { return getProviderPhysicalNetwork(); } /** - * @param providerPhyNet - * the providerPhyNet to set + * @param providerPhyNet the providerPhyNet to set * @deprecated */ @Deprecated - + public void setProviderPhyNet(String providerPhyNet) { setProviderPhysicalNetwork(providerPhyNet); } @@ -144,7 +184,7 @@ public class Network implements Serializable { /** * @return the adminStateUp */ - + public boolean isAdminStateUp() { return adminStateUp; } @@ -154,8 +194,7 @@ public class Network implements Serializable { } /** - * @param adminStateUp - * the adminStateUp to set + * @param adminStateUp the adminStateUp to set */ public void setAdminStateUp(Boolean adminStateUp) { this.adminStateUp = adminStateUp; @@ -169,8 +208,7 @@ public class Network implements Serializable { } /** - * @param tenantId - * the tenantId to set + * @param tenantId the tenantId to set */ public void setTenantId(String tenantId) { this.tenantId = tenantId; @@ -181,18 +219,17 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - + public String getNetType() { return getProviderNetworkType(); } /** - * @param netType - * the netType to set + * @param netType the netType to set * @deprecated */ @Deprecated - + public void setNetType(String netType) { setProviderNetworkType(netType); } @@ -200,29 +237,27 @@ public class Network implements Serializable { /** * @return the routerExternal */ - public String getRouterExternal() { + public Boolean getRouterExternal() { return routerExternal; } /** - * @param routerExternal - * the routerExternal to set + * @param routerExternal the routerExternal to set */ - public void setRouterExternal(String routerExternal) { + public void setRouterExternal(Boolean routerExternal) { this.routerExternal = routerExternal; } /** * @return the id */ - + public String getId() { return id; } /** - * @param id - * the id to set + * @param id the id to set */ @JsonProperty public void setId(String id) { @@ -232,15 +267,14 @@ public class Network implements Serializable { /** * @return the shared */ - public String getShared() { + public Boolean getShared() { return shared; } /** - * @param shared - * the shared to set + * @param shared the shared to set */ - public void setShared(String shared) { + public void setShared(Boolean shared) { this.shared = shared; } @@ -249,18 +283,17 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - + public String getProviderSegID() { return getProviderSegmentationId() == null ? null : Integer.toString(getProviderSegmentationId()); } /** - * @param providerSegID - * the providerSegID to set + * @param providerSegID the providerSegID to set * @deprecated */ @Deprecated - + public void setProviderSegID(String providerSegID) { setProviderSegmentationId(providerSegID == null ? null : Integer.parseInt(providerSegID)); } @@ -300,10 +333,12 @@ public class Network implements Serializable { /** * Function to detect and return the network type */ - public enum NetworkType { BASIC, PROVIDER, MULTI_PROVIDER }; - - - public NetworkType getNetworkType () { + public enum NetworkType { + BASIC, PROVIDER, MULTI_PROVIDER + }; + + + public NetworkType getNetworkType() { if (segments != null) return NetworkType.MULTI_PROVIDER; else if (providerNetworkType != null) @@ -319,19 +354,18 @@ public class Network implements Serializable { */ @Override public String toString() { - StringBuilder buf = new StringBuilder("Network [id=" + id + ", name=" + name + ", subnets=" - + subnets + ", status=" + status + ", admin_state_up=" + adminStateUp + ", tenant_id=" + - tenantId + ", shared=" + shared + ", router:external=" + routerExternal); + StringBuilder buf = new StringBuilder("Network [id=" + id + ", name=" + name + ", subnets=" + subnets + + ", status=" + status + ", admin_state_up=" + adminStateUp + ", tenant_id=" + tenantId + ", shared=" + + shared + ", router:external=" + routerExternal); if (getNetworkType() == NetworkType.PROVIDER) - buf.append (", provider:physical_network=" + providerPhysicalNetwork + - ", provider:network_type=" + providerNetworkType + - ", provider:segmentation_id=" + providerSegmentationId); + buf.append(", provider:physical_network=" + providerPhysicalNetwork + ", provider:network_type=" + + providerNetworkType + ", provider:segmentation_id=" + providerSegmentationId); if (getNetworkType() == NetworkType.MULTI_PROVIDER) { - buf.append (", segments: "); + buf.append(", segments: "); for (Segment s : segments) - buf.append (s.toString()).append(" "); + buf.append(s.toString()).append(" "); } - buf.append ("]"); + buf.append("]"); return buf.toString(); } } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java index 3bf24c3..f0473a7 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Networks.java @@ -19,14 +19,24 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Networks implements Iterable, Serializable{ - +public class Networks implements Iterable, Serializable { + @JsonProperty("networks") private List list; + @JsonProperty("networks_links") + private List links; + + public List getLinks() { + return links; + } + + public void setLinks(List links) { + this.links = links; + } + /** * @return the list */ @@ -51,5 +61,5 @@ public class Networks implements Iterable, Serializable{ public Iterator iterator() { return list.iterator(); } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java index fda8da1..ad5f109 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/NeutronError.java @@ -17,18 +17,17 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonRootName; @JsonRootName("NeutronError") public class NeutronError implements Serializable { private String type; - + private String message; private String detail; - + /** * @return the code */ @@ -50,13 +49,14 @@ public class NeutronError implements Serializable { return detail; } - /* (non-Javadoc) + /* + * (non-Javadoc) + * * @see java.lang.Object#toString() */ @Override public String toString() { - return "NeutronError [type=" + type + ", title=" + detail + ", message=" - + message + "]"; + return "NeutronError [type=" + type + ", title=" + detail + ", message=" + message + "]"; } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Pool.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Pool.java index a7ce888..2d1b019 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Pool.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Pool.java @@ -18,39 +18,42 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; -public class Pool implements Serializable{ - +public class Pool implements Serializable { + private String start; private String end; - + /** * @return the start */ public String getStart() { return start; } + /** * @param start the start to set */ public void setStart(String start) { this.start = start; } + /** * @return the end */ public String getEnd() { return end; } + /** * @param end the end to set */ public void setEnd(String end) { this.end = end; } - + @Override public String toString() { return "Allocation_pool [start=" + start + ", end=" + end + "]"; } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java index 1951a60..2fc6b21 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Port.java @@ -19,7 +19,6 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; import java.util.List; import java.util.Map; - import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -47,8 +46,7 @@ public class Port implements Serializable { } /** - * @param address - * the address to set + * @param address the address to set */ public void setAddress(String address) { this.address = address; @@ -62,8 +60,7 @@ public class Port implements Serializable { } /** - * @param subnetId - * the subnetId to set + * @param subnetId the subnetId to set */ public void setSubnetId(String subnetId) { this.subnetId = subnetId; @@ -151,11 +148,8 @@ public class Port implements Serializable { @Override public String toString() { - return "Binding [hostId=" + hostId - + ", vifType=" + vifType + - ", vnicType=" + vnicType + - ", vifDetails=" + vifDetails + - ", profile=" + profile + "]"; + return "Binding [hostId=" + hostId + ", vifType=" + vifType + ", vnicType=" + vnicType + ", vifDetails=" + + vifDetails + ", profile=" + profile + "]"; } } @@ -190,7 +184,7 @@ public class Port implements Serializable { private List securityGroups; @JsonUnwrapped - private Binding binding; + private Binding binding; /** * @return the adminStateUp @@ -200,8 +194,7 @@ public class Port implements Serializable { } /** - * @param adminStateUp - * the adminStateUp to set + * @param adminStateUp the adminStateUp to set */ public void setAdminStateUp(Boolean adminStateUp) { this.adminStateUp = adminStateUp; @@ -215,8 +208,7 @@ public class Port implements Serializable { } /** - * @param deviceId - * the deviceId to set + * @param deviceId the deviceId to set */ public void setDeviceId(String deviceId) { this.deviceId = deviceId; @@ -230,8 +222,7 @@ public class Port implements Serializable { } /** - * @param deviceOwner - * the deviceOwner to set + * @param deviceOwner the deviceOwner to set */ public void setDeviceOwner(String deviceOwner) { this.deviceOwner = deviceOwner; @@ -245,8 +236,7 @@ public class Port implements Serializable { } /** - * @param list - * the list to set + * @param list the list to set */ public void setList(List list) { this.list = list; @@ -261,8 +251,7 @@ public class Port implements Serializable { } /** - * @param id - * the id to set + * @param id the id to set */ @JsonProperty public void setId(String id) { @@ -277,8 +266,7 @@ public class Port implements Serializable { } /** - * @param macAddress - * the macAddress to set + * @param macAddress the macAddress to set */ public void setMacAddress(String macAddress) { this.macAddress = macAddress; @@ -292,8 +280,7 @@ public class Port implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -307,8 +294,7 @@ public class Port implements Serializable { } /** - * @param networkId - * the networkId to set + * @param networkId the networkId to set */ public void setNetworkId(String networkId) { this.networkId = networkId; @@ -323,8 +309,7 @@ public class Port implements Serializable { } /** - * @param status - * the status to set + * @param status the status to set */ @JsonProperty public void setStatus(String status) { @@ -339,8 +324,7 @@ public class Port implements Serializable { } /** - * @param tenantId - * the tenantId to set + * @param tenantId the tenantId to set */ public void setTenantId(String tenantId) { this.tenantId = tenantId; @@ -354,8 +338,7 @@ public class Port implements Serializable { } /** - * @param securityGroups - * IDs of security groups to associate to the port + * @param securityGroups IDs of security groups to associate to the port */ public void setSecurityGroups(List securityGroups) { this.securityGroups = securityGroups; @@ -369,8 +352,7 @@ public class Port implements Serializable { } /** - * @param binding - * The port bindings by which the port is bind to network on host + * @param binding The port bindings by which the port is bind to network on host */ public void setBinding(Binding binding) { this.binding = binding; @@ -378,12 +360,9 @@ public class Port implements Serializable { @Override public String toString() { - return "Port [id=" + id + ", name=" + name + ", mac_address=" - + macAddress + ", admin_state_up=" + adminStateUp + ", device_id=" + deviceId - + ", device_owner=" + deviceOwner + ", fixed_ips=" + list - + ", network_id=" + networkId + ", status=" + status - + ", tenant_id=" + tenantId - + ", securityGroups=" + securityGroups + return "Port [id=" + id + ", name=" + name + ", mac_address=" + macAddress + ", admin_state_up=" + adminStateUp + + ", device_id=" + deviceId + ", device_owner=" + deviceOwner + ", fixed_ips=" + list + ", network_id=" + + networkId + ", status=" + status + ", tenant_id=" + tenantId + ", securityGroups=" + securityGroups + ", binding=" + binding + "]"; } -} \ No newline at end of file +} diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java index eeb4c64..a32e993 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Ports.java @@ -19,7 +19,6 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; @SuppressWarnings("serial") @@ -36,8 +35,7 @@ public class Ports implements Iterable, Serializable { } /** - * @param list - * the list to set + * @param list the list to set */ public void setList(List list) { this.list = list; diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java index d180a12..05c622a 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java @@ -17,10 +17,8 @@ package com.woorea.openstack.quantum.model; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; - import java.io.Serializable; @JsonRootName("router") @@ -50,45 +48,58 @@ public class Router implements Serializable { public String getName() { return name; } + public void setName(String name) { this.name = name; } + public List getRoutes() { return routes; } + public void setRoutes(List routes) { this.routes = routes; } + public String getAdminStateUp() { return adminStateUp; } + public void setAdminStateUp(String adminStateUp) { this.adminStateUp = adminStateUp; } + public String getStatus() { return status; } + public void setStatus(String status) { this.status = status; } + public GatewayInfo getExternalGatewayInfo() { return externalGatewayInfo; } + public void setExternalGatewayInfo(GatewayInfo externalGatewayInfo) { this.externalGatewayInfo = externalGatewayInfo; } + public String getTenantId() { return tenantId; } + public void setTenantId(String tenantId) { this.tenantId = tenantId; } + public String getId() { return id; } + public void setId(String id) { this.id = id; } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java index 04d99cb..9b6f918 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForAddInterface.java @@ -17,28 +17,27 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; public class RouterForAddInterface implements Serializable { - @JsonProperty("subnet_id") - String subnetId; - String routerId; + @JsonProperty("subnet_id") + String subnetId; + String routerId; - public String getSubnetId() { - return subnetId; - } + public String getSubnetId() { + return subnetId; + } - public void setSubnetId(String subnetId) { - this.subnetId = subnetId; - } + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } - public String getRouterId() { - return routerId; - } + public String getRouterId() { + return routerId; + } - public void setRouterId(String routerId) { - this.routerId = routerId; - } + public void setRouterId(String routerId) { + this.routerId = routerId; } +} diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java index 6f5ddae..ec3bdd4 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterForCreate.java @@ -17,10 +17,8 @@ package com.woorea.openstack.quantum.model; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.annotation.JsonRootName; - import java.io.Serializable; @JsonRootName("router") @@ -49,15 +47,19 @@ public class RouterForCreate implements Serializable { public String getName() { return name; } + public void setName(String name) { this.name = name; } + public List getRoutes() { return routes; } + public void setRoutes(List routes) { this.routes = routes; } + public String getAdminStateUp() { return adminStateUp; } @@ -65,29 +67,37 @@ public class RouterForCreate implements Serializable { public void setAdminStateUp(String adminStateUp) { this.adminStateUp = adminStateUp; } + public String getStatus() { return status; } + public void setStatus(String status) { this.status = status; } + public GatewayInfo getExternalGatewayInfo() { return externalGatewayInfo; } + public void setExternalGatewayInfo(GatewayInfo externalGatewayInfo) { this.externalGatewayInfo = externalGatewayInfo; } + public String getTenantId() { return tenantId; } + public void setTenantId(String tenantId) { this.tenantId = tenantId; } + public String getId() { return id; } + public void setId(String id) { this.id = id; } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java index 42cca03..bfa9902 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/RouterInterface.java @@ -17,7 +17,6 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonProperty; public class RouterInterface implements Serializable { diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java index 370b77d..13ca024 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Routers.java @@ -19,11 +19,10 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; -public class Routers implements Iterable, Serializable{ - +public class Routers implements Iterable, Serializable { + @JsonProperty("routers") private List list; @@ -51,5 +50,5 @@ public class Routers implements Iterable, Serializable{ public Iterator iterator() { return list.iterator(); } - + } diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java index 25e27c3..a15a651 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Segment.java @@ -17,7 +17,6 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; - import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -65,8 +64,7 @@ public class Segment implements Serializable { */ @Override public String toString() { - return "Segment [ provider:physical_network=" + providerPhysicalNetwork + - ", provider:network_type=" + providerNetworkType + - ", provider:segmentation_id=" + providerSegmentationId + "]"; + return "Segment [ provider:physical_network=" + providerPhysicalNetwork + ", provider:network_type=" + + providerNetworkType + ", provider:segmentation_id=" + providerSegmentationId + "]"; } -} \ No newline at end of file +} diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java index a2319d4..f47f25d 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnet.java @@ -17,8 +17,8 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; +import java.util.Date; import java.util.List; - import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @@ -31,6 +31,7 @@ import com.fasterxml.jackson.annotation.JsonValue; @JsonIgnoreProperties(ignoreUnknown = true) public class Subnet implements Serializable { + @JsonProperty("name") private String name; @JsonProperty("enable_dhcp") @@ -42,6 +43,9 @@ public class Subnet implements Serializable { @JsonProperty("tenant_id") private String tenantId; + @JsonProperty("project_id") + private String projectId; + @JsonProperty("dns_nameservers") private List dnsNames; @@ -51,19 +55,35 @@ public class Subnet implements Serializable { @JsonProperty("host_routes") private List hostRoutes; + @JsonProperty("service_types") + private List serviceTypes; + @JsonProperty("ip_version") private IpVersion ipversion; + @JsonProperty("ipv6_address_mode") + private String ipv6AddressMode; + + @JsonProperty("ipv6_ra_mode") + private String ipv6RAMode; + @JsonProperty("gateway_ip") private String gw; + @JsonProperty("cidr") private String cidr; + @JsonProperty("created_at") + private Date createdAt; + + @JsonProperty("updated_at") + private Date updatedAt; + + @JsonProperty("id") private String id; public enum IpVersion implements Serializable { - IPV4(4), - IPV6(6); + IPV4(4), IPV6(6); private int code; IpVersion(int code) { @@ -99,8 +119,7 @@ public class Subnet implements Serializable { } /** - * @param name - * the name to set + * @param name the name to set */ public void setName(String name) { this.name = name; @@ -109,7 +128,6 @@ public class Subnet implements Serializable { /** * @return the enableDHCP */ - @JsonIgnore public boolean isEnableDHCP() { return enableDHCP; } @@ -119,8 +137,7 @@ public class Subnet implements Serializable { } /** - * @param enableDHCP - * the enableDHCP to set + * @param enableDHCP the enableDHCP to set */ public void setEnableDHCP(Boolean enableDHCP) { this.enableDHCP = enableDHCP; @@ -134,8 +151,7 @@ public class Subnet implements Serializable { } /** - * @param networkId - * the networkId to set + * @param networkId the networkId to set */ public void setNetworkId(String networkId) { this.networkId = networkId; @@ -149,8 +165,7 @@ public class Subnet implements Serializable { } /** - * @param tenantId - * the tenantId to set + * @param tenantId the tenantId to set */ public void setTenantId(String tenantId) { this.tenantId = tenantId; @@ -164,8 +179,7 @@ public class Subnet implements Serializable { } /** - * @param dnsNames - * the dnsNames to set + * @param dnsNames the dnsNames to set */ public void setDnsNames(List dnsNames) { this.dnsNames = dnsNames; @@ -179,8 +193,7 @@ public class Subnet implements Serializable { } /** - * @param list - * the list to set + * @param list the list to set */ public void setList(List list) { this.list = list; @@ -194,8 +207,7 @@ public class Subnet implements Serializable { } /** - * @param hostRoutes - * the hostRoutes to set + * @param hostRoutes the hostRoutes to set */ public void setHostRoutes(List hostRoutes) { this.hostRoutes = hostRoutes; @@ -209,8 +221,7 @@ public class Subnet implements Serializable { } /** - * @param ipversion - * the ipversion to set + * @param ipversion the ipversion to set */ public void setIpversion(IpVersion ipversion) { this.ipversion = ipversion; @@ -224,8 +235,7 @@ public class Subnet implements Serializable { } /** - * @param gw - * the gw to set + * @param gw the gw to set */ public void setGw(String gw) { this.gw = gw; @@ -239,8 +249,7 @@ public class Subnet implements Serializable { } /** - * @param cidr - * the cidr to set + * @param cidr the cidr to set */ public void setCidr(String cidr) { this.cidr = cidr; @@ -249,14 +258,12 @@ public class Subnet implements Serializable { /** * @return the id */ - @JsonIgnore public String getId() { return id; } /** - * @param id - * the id to set + * @param id the id to set */ @JsonProperty public void setId(String id) { @@ -270,11 +277,9 @@ public class Subnet implements Serializable { */ @Override public String toString() { - return "Subnet [id=" + id + ", name=" + name + ", network_id=" - + networkId + ", tenant_id=" + tenantId + ", allocation_pools=" + list - + ", gateway_ip=" + gw + ", ip_version=" + ipversion - + ", cidr=" + cidr + ", enable_dhcp=" + enableDHCP + ", dns_nameservers=" - + dnsNames + ", host_routes=" + hostRoutes + "]"; + return "Subnet [id=" + id + ", name=" + name + ", network_id=" + networkId + ", tenant_id=" + tenantId + + ", allocation_pools=" + list + ", gateway_ip=" + gw + ", ip_version=" + ipversion + ", cidr=" + cidr + + ", enable_dhcp=" + enableDHCP + ", dns_nameservers=" + dnsNames + ", host_routes=" + hostRoutes + "]"; } -} \ No newline at end of file +} diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java index 34820aa..f5987a6 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/SubnetForCreate.java @@ -21,6 +21,7 @@ import com.fasterxml.jackson.annotation.JsonRootName; /** * Please use {@link Subnet} directly. + * * @Deprecated */ @SuppressWarnings("serial") @@ -39,8 +40,7 @@ public class SubnetForCreate extends Subnet { } /** - * @param ipVersion - * the ipVersion to set + * @param ipVersion the ipVersion to set * @deprecated */ @Deprecated diff --git a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java index 0faef86..e02c224 100644 --- a/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java +++ b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Subnets.java @@ -19,14 +19,13 @@ package com.woorea.openstack.quantum.model; import java.io.Serializable; import java.util.Iterator; import java.util.List; - import com.fasterxml.jackson.annotation.JsonProperty; public class Subnets implements Serializable, Iterable { - + @JsonProperty("subnets") private List list; - + /** * @return the list */ @@ -45,7 +44,7 @@ public class Subnets implements Serializable, Iterable { public String toString() { return "Subnets [list=" + list + "]"; } - + @Override public Iterator iterator() { return list.iterator(); -- cgit 1.2.3-korg