From e153f0adfbed711ce1e215748594a4d04fd1edaf 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 Cinder, and drop null query params Issue-ID: SO-1844 Change-Id: If58717656e0468ec0ce5d53055c381fe7d1c03f5 Signed-off-by: Smokowski, Steve (ss835w) --- .../woorea/openstack/quantum/model/Network.java | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'quantum-model/src') 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 95fb6a4..bec7dbf 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 @@ -74,7 +74,7 @@ public class Network implements Serializable { /** * @return the status */ - @JsonIgnore + public String getStatus() { return status; } @@ -91,7 +91,7 @@ public class Network implements Serializable { /** * @return the subnets */ - @JsonIgnore + public List getSubnets() { return subnets; } @@ -125,7 +125,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public String getProviderPhyNet() { return getProviderPhysicalNetwork(); } @@ -136,7 +136,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public void setProviderPhyNet(String providerPhyNet) { setProviderPhysicalNetwork(providerPhyNet); } @@ -144,7 +144,7 @@ public class Network implements Serializable { /** * @return the adminStateUp */ - @JsonIgnore + public boolean isAdminStateUp() { return adminStateUp; } @@ -181,7 +181,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public String getNetType() { return getProviderNetworkType(); } @@ -192,7 +192,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public void setNetType(String netType) { setProviderNetworkType(netType); } @@ -215,7 +215,7 @@ public class Network implements Serializable { /** * @return the id */ - @JsonIgnore + public String getId() { return id; } @@ -249,7 +249,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public String getProviderSegID() { return getProviderSegmentationId() == null ? null : Integer.toString(getProviderSegmentationId()); } @@ -260,7 +260,7 @@ public class Network implements Serializable { * @deprecated */ @Deprecated - @JsonIgnore + public void setProviderSegID(String providerSegID) { setProviderSegmentationId(providerSegID == null ? null : Integer.parseInt(providerSegID)); } @@ -302,7 +302,7 @@ public class Network implements Serializable { */ public enum NetworkType { BASIC, PROVIDER, MULTI_PROVIDER }; - @JsonIgnore + public NetworkType getNetworkType () { if (segments != null) return NetworkType.MULTI_PROVIDER; -- cgit 1.2.3-korg