From bb99f9c5dab5d391e19bd8bac68b278b13efaab2 Mon Sep 17 00:00:00 2001 From: seshukm Date: Wed, 25 Jul 2018 19:52:31 +0800 Subject: basic refactoring of quantum module take 2 Issue-ID: SO-729 Change-Id: I3c910850a23eb778987c5096a10082d5af82af2f Signed-off-by: seshukm --- .../openstack/quantum/model/GatewayInfo.java | 22 ++-- .../woorea/openstack/quantum/model/HostRoute.java | 34 +++--- .../woorea/openstack/quantum/model/Network.java | 32 +++--- .../woorea/openstack/quantum/model/Networks.java | 58 +++++------ .../openstack/quantum/model/NeutronError.java | 64 ++++++------ .../com/woorea/openstack/quantum/model/Pool.java | 68 ++++++------ .../com/woorea/openstack/quantum/model/Router.java | 114 ++++++++++----------- .../quantum/model/RouterForAddInterface.java | 40 ++++---- 8 files changed, 216 insertions(+), 216 deletions(-) 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 6287a7c..852e1c3 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 @@ -23,18 +23,18 @@ import org.codehaus.jackson.annotate.JsonProperty; public class GatewayInfo implements Serializable { - @JsonProperty("network_id") - private String networkId; + @JsonProperty("network_id") + private String networkId; - public String getNetworkId() { - return networkId; - } + public String getNetworkId() { + return networkId; + } - public void setNetworkId(String id) { - this.networkId = id; - } + public void setNetworkId(String id) { + this.networkId = id; + } - @Override public String toString() { - return "[networkId=" + networkId + "]"; - } + @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 5482666..958a21d 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 @@ -20,24 +20,24 @@ import java.io.Serializable; public class HostRoute implements Serializable { - private String destination; - private String nexthop; + private String destination; + private String nexthop; - public String getDestination() { - return destination; - } - public void setDestination(String destination) { - this.destination = destination; - } + public String getDestination() { + return destination; + } + public void setDestination(String destination) { + this.destination = destination; + } - public String getNexthop() { - return nexthop; - } - public void setNexthop(String nexthop) { - this.nexthop = nexthop; - } + public String getNexthop() { + return nexthop; + } + public void setNexthop(String nexthop) { + this.nexthop = nexthop; + } - @Override public String toString() { - return "[destination=" + destination + ", nexthop=" + nexthop + "]"; - } + @Override public String toString() { + return "[destination=" + destination + ", nexthop=" + nexthop + "]"; + } } 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 6c21b00..f9e9c07 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 @@ -304,12 +304,12 @@ public class Network implements Serializable { @JsonIgnore public NetworkType getNetworkType () { - if (segments != null) - return NetworkType.MULTI_PROVIDER; - else if (providerNetworkType != null) - return NetworkType.PROVIDER; - else - return NetworkType.BASIC; + if (segments != null) + return NetworkType.MULTI_PROVIDER; + else if (providerNetworkType != null) + return NetworkType.PROVIDER; + else + return NetworkType.BASIC; } /* @@ -319,19 +319,19 @@ public class Network implements Serializable { */ @Override public String toString() { - StringBuilder buf = new StringBuilder("Network [id=" + id + ", name=" + name + ", subnets=" + 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 + + if (getNetworkType() == NetworkType.PROVIDER) + buf.append (", provider:physical_network=" + providerPhysicalNetwork + ", provider:network_type=" + providerNetworkType + ", provider:segmentation_id=" + providerSegmentationId); - if (getNetworkType() == NetworkType.MULTI_PROVIDER) { - buf.append (", segments: "); - for (Segment s : segments) - buf.append (s.toString()).append(" "); - } - buf.append ("]"); - return buf.toString(); + if (getNetworkType() == NetworkType.MULTI_PROVIDER) { + buf.append (", segments: "); + for (Segment s : segments) + buf.append (s.toString()).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 84e45ca..9bf53f2 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 @@ -22,33 +22,33 @@ import java.util.List; import org.codehaus.jackson.annotate.JsonProperty; public class Networks implements Iterable, Serializable{ - - @JsonProperty("networks") - private List list; - - /** - * @return the list - */ - public List getList() { - return list; - } - - - /** - * @param list the list to set - */ - public void setList(List list) { - this.list = list; - } - - @Override - public String toString() { - return "Networks [list=" + list + "]"; - } - - @Override - public Iterator iterator() { - return list.iterator(); - } - + + @JsonProperty("networks") + private List list; + + /** + * @return the list + */ + public List getList() { + return list; + } + + + /** + * @param list the list to set + */ + public void setList(List list) { + this.list = list; + } + + @Override + public String toString() { + return "Networks [list=" + list + "]"; + } + + @Override + 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 4dac0ea..91e998e 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 @@ -46,40 +46,40 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("NeutronError") public class NeutronError implements Serializable { - private String type; - - private String message; + private String type; + + private String message; - private String detail; - - /** - * @return the code - */ - public String getType() { - return type; - } + private String detail; + + /** + * @return the code + */ + public String getType() { + return type; + } - /** - * @return the message - */ - public String getMessage() { - return message; - } + /** + * @return the message + */ + public String getMessage() { + return message; + } - /** - * @return the title - */ - public String getDetail() { - return detail; - } + /** + * @return the title + */ + public String getDetail() { + return detail; + } - /* (non-Javadoc) - * @see java.lang.Object#toString() - */ - @Override - public String toString() { - return "NeutronError [type=" + type + ", title=" + detail + ", message=" - + message + "]"; - } - + /* (non-Javadoc) + * @see java.lang.Object#toString() + */ + @Override + public String toString() { + 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 70f80ad..a7ce888 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 @@ -19,38 +19,38 @@ package com.woorea.openstack.quantum.model; import java.io.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 + "]"; - } - + + 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/Router.java b/quantum-model/src/main/java/com/woorea/openstack/quantum/model/Router.java index 3bbecaa..cea0891 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 @@ -25,69 +25,69 @@ import org.codehaus.jackson.map.annotate.JsonRootName; @JsonRootName("router") public class Router implements Serializable { - @JsonProperty("status") - private String status; + @JsonProperty("status") + private String status; - @JsonProperty("external_gateway_info") - private GatewayInfo externalGatewayInfo; + @JsonProperty("external_gateway_info") + private GatewayInfo externalGatewayInfo; - @JsonProperty("name") - private String name; + @JsonProperty("name") + private String name; - @JsonProperty("admin_state_up") - private String admin_state_up; + @JsonProperty("admin_state_up") + private String admin_state_up; - @JsonProperty("tenant_id") - private String tenantId; + @JsonProperty("tenant_id") + private String tenantId; - @JsonProperty("id") - private String id; + @JsonProperty("id") + private String id; - @JsonProperty("routes") - private List routes; + @JsonProperty("routes") + private List routes; - 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 getAdmin_state_up() { - return admin_state_up; - } - public void setAdmin_state_up(String admin_state_up) { - this.admin_state_up = admin_state_up; - } - 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; - } - + 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 getAdmin_state_up() { + return admin_state_up; + } + public void setAdmin_state_up(String admin_state_up) { + this.admin_state_up = admin_state_up; + } + 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 4cca4c0..a8b65b5 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 @@ -22,23 +22,23 @@ import org.codehaus.jackson.annotate.JsonProperty; public class RouterForAddInterface implements Serializable { - @JsonProperty("subnet_id") - String subnetId; - String routerId; - - public String getSubnetId() { - return subnetId; - } - - public void setSubnetId(String subnetId) { - this.subnetId = subnetId; - } - - public String getRouterId() { - return routerId; - } - - public void setRouterId(String routerId) { - this.routerId = routerId; - } - } + @JsonProperty("subnet_id") + String subnetId; + String routerId; + + public String getSubnetId() { + return subnetId; + } + + public void setSubnetId(String subnetId) { + this.subnetId = subnetId; + } + + public String getRouterId() { + return routerId; + } + + public void setRouterId(String routerId) { + this.routerId = routerId; + } + } -- cgit 1.2.3-korg