From 597b20b3cb38ad28de578ce4f90c04ce6d13babb Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Fri, 16 Dec 2016 22:49:06 -0800 Subject: [PATCH] checkstyle: TypeName eliminate TypeName violation and enable it. Change-Id: I97af3891eafc965176fa34f17176b62d897122a9 Signed-off-by: Isaku Yamahata --- .../neutron/e2etest/ITNeutronE2E.java | 6 +- ...12_Tests.java => NeutronBug3812Tests.java} | 6 +- ...27_Tests.java => NeutronBug4027Tests.java} | 6 +- ...SON.java => TempestPortsIpV6TestJSON.java} | 6 +- .../spi/{Neutron_ID.java => NeutronID.java} | 8 +- .../spi/{Neutron_IPs.java => NeutronIPs.java} | 8 +- .../neutron/spi/NeutronL2gatewayDevice.java | 2 +- .../spi/NeutronLoadBalancerHealthMonitor.java | 6 +- .../spi/NeutronLoadBalancerListener.java | 6 +- .../neutron/spi/NeutronLoadBalancerPool.java | 12 +-- ...eutronLoadBalancerSessionPersistence.java} | 6 +- .../neutron/spi/NeutronNetwork.java | 6 +- ...egment.java => NeutronNetworkSegment.java} | 6 +- .../neutron/spi/NeutronObject.java | 2 +- .../opendaylight/neutron/spi/NeutronPort.java | 26 +++---- ...va => NeutronPortAllowedAddressPairs.java} | 6 +- ...n.java => NeutronPortExtraDHCPOption.java} | 6 +- .../neutron/spi/NeutronRouter.java | 6 +- ...rface.java => NeutronRouterInterface.java} | 12 +-- ...ava => NeutronRouterNetworkReference.java} | 10 +-- ...IDJAXBTest.java => NeutronIDJAXBTest.java} | 10 +-- ...sJAXBTest.java => NeutronIPsJAXBTest.java} | 12 +-- ...tronLoadBalancerHealthMonitorJAXBTest.java | 4 +- .../spi/NeutronLoadBalancerPoolJAXBTest.java | 2 +- ...adBalancerSessionPersistenceJAXBTest.java} | 12 +-- .../neutron/spi/NeutronNetworkJAXBTest.java | 2 +- ...ava => NeutronNetworkSegmentJAXBTest.java} | 14 ++-- ...utronPortAllowedAddressPairsJAXBTest.java} | 8 +- .../NeutronPortExtraDHCPOptionJAXBTest.java | 75 +++++++++++++++++++ .../neutron/spi/NeutronPortJAXBTest.java | 6 +- .../neutron/spi/NeutronPortQosJAXBTest.java | 6 +- .../spi/NeutronPortSecurityJAXBTest.java | 6 +- .../NeutronPort_ExtraDHCPOptionJAXBTest.java | 75 ------------------- ...va => NeutronRouterInterfaceJAXBTest.java} | 14 ++-- .../neutron/spi/NeutronRouterJAXBTest.java | 2 +- ...eutronRouterNetworkReferenceJAXBTest.java} | 20 ++--- .../api/NeutronRoutersNorthbound.java | 6 +- parent/checkstyle-suppressions.xml | 3 - ...ronLoadBalancerHealthMonitorInterface.java | 8 +- .../NeutronLoadBalancerListenerInterface.java | 8 +- .../NeutronLoadBalancerPoolInterface.java | 16 ++-- .../transcriber/NeutronNetworkInterface.java | 8 +- .../transcriber/NeutronPortInterface.java | 24 +++--- .../transcriber/NeutronRouterInterface.java | 20 ++--- 44 files changed, 255 insertions(+), 258 deletions(-) rename integration/test/src/test/java/org/opendaylight/neutron/e2etest/{Neutron_Bug3812_Tests.java => NeutronBug3812Tests.java} (97%) rename integration/test/src/test/java/org/opendaylight/neutron/e2etest/{Neutron_Bug4027_Tests.java => NeutronBug4027Tests.java} (93%) rename integration/test/src/test/java/org/opendaylight/neutron/e2etest/{Tempest_PortsIpV6TestJSON.java => TempestPortsIpV6TestJSON.java} (97%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{Neutron_ID.java => NeutronID.java} (90%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{Neutron_IPs.java => NeutronIPs.java} (84%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronLoadBalancer_SessionPersistence.java => NeutronLoadBalancerSessionPersistence.java} (84%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronNetwork_Segment.java => NeutronNetworkSegment.java} (91%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronPort_AllowedAddressPairs.java => NeutronPortAllowedAddressPairs.java} (85%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronPort_ExtraDHCPOption.java => NeutronPortExtraDHCPOption.java} (87%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronRouter_Interface.java => NeutronRouterInterface.java} (81%) rename neutron-spi/src/main/java/org/opendaylight/neutron/spi/{NeutronRouter_NetworkReference.java => NeutronRouterNetworkReference.java} (84%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{Neutron_IDJAXBTest.java => NeutronIDJAXBTest.java} (62%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{Neutron_IPsJAXBTest.java => NeutronIPsJAXBTest.java} (62%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{NeutronLoadBalancer_SessionPersistenceJAXBTest.java => NeutronLoadBalancerSessionPersistenceJAXBTest.java} (59%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{NeutronNetwork_SegmentJAXBTest.java => NeutronNetworkSegmentJAXBTest.java} (58%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{NeutronPort_AllowedAddressPairsJAXBTest.java => NeutronPortAllowedAddressPairsJAXBTest.java} (76%) create mode 100644 neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java delete mode 100644 neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{NeutronRouter_InterfaceJAXBTest.java => NeutronRouterInterfaceJAXBTest.java} (63%) rename neutron-spi/src/test/java/org/opendaylight/neutron/spi/{NeutronRouter_NetworkReferenceJAXBTest.java => NeutronRouterNetworkReferenceJAXBTest.java} (57%) diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java index b4b54205a..a380499d2 100644 --- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java +++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/ITNeutronE2E.java @@ -117,9 +117,9 @@ public class ITNeutronE2E { NeutronSFCFlowClassifierTests.runTests(base); // tests related to bugs - Neutron_Bug3812_Tests.runTests(base); - Tempest_PortsIpV6TestJSON.runTests(base); - Neutron_Bug4027_Tests.runTests(base); + NeutronBug3812Tests.runTests(base); + TempestPortsIpV6TestJSON.runTests(base); + NeutronBug4027Tests.runTests(base); } static HttpURLConnection httpURLConnectionFactoryGet(URL url) throws IOException { diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug3812_Tests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java similarity index 97% rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug3812_Tests.java rename to integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java index fe0607df6..a24b81111 100644 --- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug3812_Tests.java +++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java @@ -8,10 +8,10 @@ package org.opendaylight.neutron.e2etest; -public class Neutron_Bug3812_Tests { +public class NeutronBug3812Tests { String base; - public Neutron_Bug3812_Tests(String base) { + public NeutronBug3812Tests(String base) { this.base = base; } @@ -98,7 +98,7 @@ public class Neutron_Bug3812_Tests { } public static void runTests(String base) { - Neutron_Bug3812_Tests bugTest = new Neutron_Bug3812_Tests(base); + NeutronBug3812Tests bugTest = new NeutronBug3812Tests(base); bugTest.check_bug3812(); } } diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug4027_Tests.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java similarity index 93% rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug4027_Tests.java rename to integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java index db52ee626..7908c5caa 100644 --- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Neutron_Bug4027_Tests.java +++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java @@ -8,10 +8,10 @@ package org.opendaylight.neutron.e2etest; -public class Neutron_Bug4027_Tests { +public class NeutronBug4027Tests { String base; - public Neutron_Bug4027_Tests(String base) { + public NeutronBug4027Tests(String base) { this.base = base; } @@ -40,7 +40,7 @@ public class Neutron_Bug4027_Tests { } public static void runTests(String base) { - Neutron_Bug4027_Tests bugTest = new Neutron_Bug4027_Tests(base); + NeutronBug4027Tests bugTest = new NeutronBug4027Tests(base); bugTest.check_bug4027(); } } diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Tempest_PortsIpV6TestJSON.java b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java similarity index 97% rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/Tempest_PortsIpV6TestJSON.java rename to integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java index 7dca34283..51d67bd37 100644 --- a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/Tempest_PortsIpV6TestJSON.java +++ b/integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java @@ -8,10 +8,10 @@ package org.opendaylight.neutron.e2etest; -public class Tempest_PortsIpV6TestJSON { +public class TempestPortsIpV6TestJSON { String base; - public Tempest_PortsIpV6TestJSON(String base) { + public TempestPortsIpV6TestJSON(String base) { this.base = base; } @@ -85,7 +85,7 @@ public class Tempest_PortsIpV6TestJSON { } public static void runTests(String base) { - Tempest_PortsIpV6TestJSON tpv6runner = new Tempest_PortsIpV6TestJSON(base); + TempestPortsIpV6TestJSON tpv6runner = new TempestPortsIpV6TestJSON(base); tpv6runner.test_create_port_in_allowed_allocation_pools(); } } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java similarity index 90% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java index 8638f4b98..de968c2a0 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_ID.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronID.java @@ -18,7 +18,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public class Neutron_ID implements Serializable { +public class NeutronID implements Serializable { private static final long serialVersionUID = 1L; private static final String UUID_PATTERN_REGEX = "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"; @@ -36,10 +36,10 @@ public class Neutron_ID implements Serializable { "Supplied value \"%s\" does not match uuid pattern \"%s\"", uuid, UUID_PATTERN_REGEX); } - public Neutron_ID() { + public NeutronID() { } - public Neutron_ID(String uuid) { + public NeutronID(String uuid) { checkUuidPattern(uuid); this.uuid = uuid; } @@ -55,6 +55,6 @@ public class Neutron_ID implements Serializable { @Override public String toString() { - return "Neutron_ID{" + "id='" + uuid + '\'' + "}"; + return "NeutronID{" + "id='" + uuid + '\'' + "}"; } } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronIPs.java similarity index 84% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronIPs.java index 29626fb6f..54aa33b4d 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/Neutron_IPs.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronIPs.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class Neutron_IPs implements Serializable { +public final class NeutronIPs implements Serializable { private static final long serialVersionUID = 1L; // See OpenStack Network API v2.0 Reference for description of @@ -28,10 +28,10 @@ public final class Neutron_IPs implements Serializable { @XmlElement(name = "subnet_id") String subnetUUID; - public Neutron_IPs() { + public NeutronIPs() { } - public Neutron_IPs(String uuid) { + public NeutronIPs(String uuid) { subnetUUID = uuid; } @@ -53,6 +53,6 @@ public final class Neutron_IPs implements Serializable { @Override public String toString() { - return "Neutron_IPs{" + "ipAddress='" + ipAddress + '\'' + ", subnetUUID='" + subnetUUID + '\'' + "}"; + return "NeutronIPs{" + "ipAddress='" + ipAddress + '\'' + ", subnetUUID='" + subnetUUID + '\'' + "}"; } } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java index 7c60c5787..397a442f8 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayDevice.java @@ -12,7 +12,7 @@ import java.io.Serializable; import java.util.List; import javax.xml.bind.annotation.XmlElement; -public final class NeutronL2gatewayDevice extends Neutron_ID implements Serializable { +public final class NeutronL2gatewayDevice extends NeutronID implements Serializable { private static final long serialVersionUID = 1L; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java index afd7d4140..f1bc7caa7 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java @@ -67,7 +67,7 @@ public final class NeutronLoadBalancerHealthMonitor extends NeutronObject loadBalancerHealthMonitorPools; + List loadBalancerHealthMonitorPools; public String getLoadBalancerHealthMonitorType() { return loadBalancerHealthMonitorType; @@ -133,11 +133,11 @@ public final class NeutronLoadBalancerHealthMonitor extends NeutronObject getLoadBalancerHealthMonitorPools() { + public List getLoadBalancerHealthMonitorPools() { return loadBalancerHealthMonitorPools; } - public void setLoadBalancerHealthMonitorPools(List loadBalancerHealthMonitorPools) { + public void setLoadBalancerHealthMonitorPools(List loadBalancerHealthMonitorPools) { this.loadBalancerHealthMonitorPools = loadBalancerHealthMonitorPools; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java index 5324593aa..5f2bc3bd3 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java @@ -59,7 +59,7 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes neutronLoadBalancerListenerLoadBalancerIDs; + List neutronLoadBalancerListenerLoadBalancerIDs; public Boolean getLoadBalancerListenerAdminStateIsUp() { return loadBalancerListenerAdminStateIsUp; @@ -101,12 +101,12 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes getNeutronLoadBalancerListenerLoadBalancerIDs() { + public List getNeutronLoadBalancerListenerLoadBalancerIDs() { return neutronLoadBalancerListenerLoadBalancerIDs; } public void setNeutronLoadBalancerListenerLoadBalancerIDs( - List neutronLoadBalancerListenerLoadBalancerIDs) { + List neutronLoadBalancerListenerLoadBalancerIDs) { this.neutronLoadBalancerListenerLoadBalancerIDs = neutronLoadBalancerListenerLoadBalancerIDs; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java index 6bfebd5ce..6b0bb3ae6 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java @@ -54,10 +54,10 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes loadBalancerPoolListeners; + List loadBalancerPoolListeners; @XmlElement(name = "session_persistence") - NeutronLoadBalancer_SessionPersistence loadBalancerPoolSessionPersistence; + NeutronLoadBalancerSessionPersistence loadBalancerPoolSessionPersistence; @XmlElement(name = "members") List loadBalancerPoolMembers; @@ -98,20 +98,20 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes getLoadBalancerPoolListeners() { + public List getLoadBalancerPoolListeners() { return loadBalancerPoolListeners; } - public void setLoadBalancerPoolListeners(List loadBalancerPoolListeners) { + public void setLoadBalancerPoolListeners(List loadBalancerPoolListeners) { this.loadBalancerPoolListeners = loadBalancerPoolListeners; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistence.java similarity index 84% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistence.java index 9e96ff919..a2f9f817d 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistence.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistence.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronLoadBalancer_SessionPersistence implements Serializable { +public final class NeutronLoadBalancerSessionPersistence implements Serializable { private static final long serialVersionUID = 1L; // See OpenStack Network API v2.0 Reference for description of @@ -28,10 +28,10 @@ public final class NeutronLoadBalancer_SessionPersistence implements Serializabl @XmlElement(name = "type") String type; - public NeutronLoadBalancer_SessionPersistence() { + public NeutronLoadBalancerSessionPersistence() { } - public NeutronLoadBalancer_SessionPersistence(String cookieName, String type) { + public NeutronLoadBalancerSessionPersistence(String cookieName, String type) { this.cookieName = cookieName; this.type = type; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java index b19f2e8be..95bc7cfa0 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java @@ -43,7 +43,7 @@ public final class NeutronNetwork extends NeutronAdminAttributes String providerSegmentationID; @XmlElement(name = "segments") - List segments; + List segments; @XmlElement(name = "vlan_transparent") Boolean vlanTransparent; @@ -132,11 +132,11 @@ public final class NeutronNetwork extends NeutronAdminAttributes this.providerSegmentationID = providerSegmentationID; } - public void setSegments(List segments) { + public void setSegments(List segments) { this.segments = segments; } - public List getSegments() { + public List getSegments() { return segments; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetworkSegment.java similarity index 91% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetworkSegment.java index b63921c3c..1f231275b 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork_Segment.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetworkSegment.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "network") @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronNetwork_Segment implements Serializable { +public final class NeutronNetworkSegment implements Serializable { // See OpenStack Network API v2.0 Reference for description of // annotated attributes @@ -34,7 +34,7 @@ public final class NeutronNetwork_Segment implements Serializable { @XmlElement(namespace = "provider", name = "segmentation_id") String providerSegmentationID; - public NeutronNetwork_Segment() { + public NeutronNetworkSegment() { } public String getProviderNetworkType() { @@ -63,7 +63,7 @@ public final class NeutronNetwork_Segment implements Serializable { @Override public String toString() { - return "NeutronNetwork_Segment [ " + ", providerNetworkType=" + providerNetworkType + return "NeutronNetworkSegment [ " + ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork=" + providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + "]"; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java index 9f8192aab..f6858669e 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java @@ -20,7 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types. @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public abstract class NeutronObject extends Neutron_ID +public abstract class NeutronObject extends NeutronID implements Serializable, INeutronObject { private static final long serialVersionUID = 1L; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java index 29d137152..077ec8d5f 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java @@ -34,7 +34,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple String macAddress; @XmlElement(name = "fixed_ips") - List fixedIPs; + List fixedIPs; @XmlElement(name = "device_id") String deviceID; @@ -46,7 +46,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple List securityGroups; @XmlElement(name = "allowed_address_pairs") - List allowedAddressPairs; + List allowedAddressPairs; //@XmlElement (name = "binding:host_id") @XmlElement(namespace = "binding", name = "host_id") @@ -66,7 +66,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple Map vifDetails; @XmlElement(name = "extra_dhcp_opts") - List extraDHCPOptions; + List extraDHCPOptions; //Port security is enabled by default for backward compatibility. @XmlElement(defaultValue = "true", name = "port_security_enabled") @@ -101,11 +101,11 @@ public final class NeutronPort extends NeutronAdminAttributes imple this.macAddress = macAddress; } - public List getFixedIPs() { + public List getFixedIPs() { return fixedIPs; } - public void setFixedIPs(List fixedIPs) { + public void setFixedIPs(List fixedIPs) { this.fixedIPs = fixedIPs; } @@ -133,19 +133,19 @@ public final class NeutronPort extends NeutronAdminAttributes imple this.securityGroups = securityGroups; } - public List getAllowedAddressPairs() { + public List getAllowedAddressPairs() { return allowedAddressPairs; } - public void setAllowedAddressPairs(List allowedAddressPairs) { + public void setAllowedAddressPairs(List allowedAddressPairs) { this.allowedAddressPairs = allowedAddressPairs; } - public List getExtraDHCPOptions() { + public List getExtraDHCPOptions() { return extraDHCPOptions; } - public void setExtraDHCPOptions(List extraDHCPOptions) { + public void setExtraDHCPOptions(List extraDHCPOptions) { this.extraDHCPOptions = extraDHCPOptions; } @@ -221,7 +221,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple ans.setMacAddress(this.getMacAddress()); } if ("fixed_ips".equals(field)) { - ans.setFixedIPs(new ArrayList(this.getFixedIPs())); + ans.setFixedIPs(new ArrayList(this.getFixedIPs())); } if ("device_id".equals(field)) { ans.setDeviceID(this.getDeviceID()); @@ -234,7 +234,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple } if ("allowed_address_pairs".equals(field)) { ans.setAllowedAddressPairs( - new ArrayList(this.getAllowedAddressPairs())); + new ArrayList(this.getAllowedAddressPairs())); } if ("binding:host_id".equals(field)) { ans.setBindinghostID(this.getBindinghostID()); @@ -249,7 +249,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple ans.setVIFDetails(new HashMap(this.getVIFDetails())); } if ("extra_dhcp_opts".equals(field)) { - ans.setExtraDHCPOptions(new ArrayList(this.getExtraDHCPOptions())); + ans.setExtraDHCPOptions(new ArrayList(this.getExtraDHCPOptions())); } if ("port_security_enabled".equals(field)) { ans.setPortSecurityEnabled(this.getPortSecurityEnabled()); @@ -269,7 +269,7 @@ public final class NeutronPort extends NeutronAdminAttributes imple status = "ACTIVE"; } if (fixedIPs == null) { - fixedIPs = new ArrayList(); + fixedIPs = new ArrayList(); } } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairs.java similarity index 85% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairs.java index c6269db42..3a60f10cf 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairs.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairs.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronPort_AllowedAddressPairs implements Serializable { +public final class NeutronPortAllowedAddressPairs implements Serializable { private static final long serialVersionUID = 1L; @XmlElement(name = "mac_address") @@ -25,10 +25,10 @@ public final class NeutronPort_AllowedAddressPairs implements Serializable { @XmlElement(name = "ip_address") String ipAddress; - public NeutronPort_AllowedAddressPairs() { + public NeutronPortAllowedAddressPairs() { } - public NeutronPort_AllowedAddressPairs(String macAddress, String ipAddress) { + public NeutronPortAllowedAddressPairs(String macAddress, String ipAddress) { this.macAddress = macAddress; this.ipAddress = ipAddress; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOption.java similarity index 87% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOption.java index d2214a6ee..1506d20bd 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOption.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOption.java @@ -16,7 +16,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronPort_ExtraDHCPOption implements Serializable { +public final class NeutronPortExtraDHCPOption implements Serializable { private static final long serialVersionUID = 1L; @XmlElement(name = "opt_value") @@ -28,10 +28,10 @@ public final class NeutronPort_ExtraDHCPOption implements Serializable { @XmlElement(name = "ip_version", defaultValue = "4", required = false, nillable = true) Integer ipVersion = 4; - public NeutronPort_ExtraDHCPOption() { + public NeutronPortExtraDHCPOption() { } - public NeutronPort_ExtraDHCPOption(String value, String name, Integer ipVersion) { + public NeutronPortExtraDHCPOption(String value, String name, Integer ipVersion) { this.value = value; this.name = name; this.ipVersion = ipVersion; diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java index 051d24f3a..fe44919ca 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java @@ -24,7 +24,7 @@ public final class NeutronRouter extends NeutronAdminAttributes // See OpenStack Network API v2.0 Reference for description of // annotated attributes @XmlElement(name = "external_gateway_info", nillable = true) - NeutronRouter_NetworkReference externalGatewayInfo; + NeutronRouterNetworkReference externalGatewayInfo; @XmlElement(name = "distributed") Boolean distributed; @@ -45,11 +45,11 @@ public final class NeutronRouter extends NeutronAdminAttributes return adminStateUp; } - public NeutronRouter_NetworkReference getExternalGatewayInfo() { + public NeutronRouterNetworkReference getExternalGatewayInfo() { return externalGatewayInfo; } - public void setExternalGatewayInfo(NeutronRouter_NetworkReference externalGatewayInfo) { + public void setExternalGatewayInfo(NeutronRouterNetworkReference externalGatewayInfo) { this.externalGatewayInfo = externalGatewayInfo; } diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java similarity index 81% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java index c7706467a..3a9d58416 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_Interface.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java @@ -17,8 +17,8 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronRouter_Interface extends NeutronObject - implements Serializable, INeutronObject { +public final class NeutronRouterInterface extends NeutronObject + implements Serializable, INeutronObject { private static final long serialVersionUID = 1L; // See OpenStack Network API v2.0 Reference for description of @@ -30,10 +30,10 @@ public final class NeutronRouter_Interface extends NeutronObject fields) { - NeutronRouter_Interface ans = new NeutronRouter_Interface(); + public NeutronRouterInterface extractFields(List fields) { + NeutronRouterInterface ans = new NeutronRouterInterface(); for (String s : fields) { extractField(s, ans); if (s.equals("subnet_id")) { diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReference.java similarity index 84% rename from neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java rename to neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReference.java index ba48778ed..230727859 100644 --- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReference.java +++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReference.java @@ -17,7 +17,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.NONE) -public final class NeutronRouter_NetworkReference implements Serializable { +public final class NeutronRouterNetworkReference implements Serializable { private static final long serialVersionUID = 1L; // See OpenStack Network API v2.0 Reference for description of @@ -30,9 +30,9 @@ public final class NeutronRouter_NetworkReference implements Serializable { Boolean enableSNAT; @XmlElement(name = "external_fixed_ips") - List externalFixedIPs; + List externalFixedIPs; - public NeutronRouter_NetworkReference() { + public NeutronRouterNetworkReference() { } public String getNetworkID() { @@ -51,11 +51,11 @@ public final class NeutronRouter_NetworkReference implements Serializable { this.enableSNAT = enableSNAT; } - public List getExternalFixedIPs() { + public List getExternalFixedIPs() { return externalFixedIPs; } - public void setExternalFixedIPs(List externalFixedIPs) { + public void setExternalFixedIPs(List externalFixedIPs) { this.externalFixedIPs = externalFixedIPs; } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIDJAXBTest.java similarity index 62% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIDJAXBTest.java index 21f9fe8ec..cdabf18ce 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IDJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIDJAXBTest.java @@ -12,17 +12,17 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class Neutron_IDJAXBTest { +public class NeutronIDJAXBTest { private static final String NEUTRON_ID_SOURCE_JSON = "{ \"id\": \"4e8e5957-649f-477b-9e5b-f1f75b21c03c\" }"; @Test - public void test_Neutron_ID_JAXB() throws JAXBException { - Neutron_ID neutronObject = new Neutron_ID(); - Neutron_ID testObject = (Neutron_ID) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_ID_SOURCE_JSON); + public void test_NeutronID_JAXB() throws JAXBException { + NeutronID neutronObject = new NeutronID(); + NeutronID testObject = (NeutronID) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_ID_SOURCE_JSON); - Assert.assertEquals("Neutron_ID JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", + Assert.assertEquals("NeutronID JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c", testObject.getID()); } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIPsJAXBTest.java similarity index 62% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIPsJAXBTest.java index 04c00d99c..a05910eaf 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/Neutron_IPsJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronIPsJAXBTest.java @@ -12,20 +12,20 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class Neutron_IPsJAXBTest { +public class NeutronIPsJAXBTest { private static final String NEUTRON_IPS_SOURCE_JSON = "{ \"ip_address\": \"192.168.111.3\", " + "\"subnet_id\": \"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27\" }"; @Test - public void test_Neutron_IPs_JAXB() throws JAXBException { - Neutron_IPs neutronObject = new Neutron_IPs(); - Neutron_IPs testObject = (Neutron_IPs) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_IPS_SOURCE_JSON); + public void test_NeutronIPs_JAXB() throws JAXBException { + NeutronIPs neutronObject = new NeutronIPs(); + NeutronIPs testObject = (NeutronIPs) JaxbTestHelper.jaxbUnmarshall(neutronObject, NEUTRON_IPS_SOURCE_JSON); - Assert.assertEquals("Neutron_IPs JAXB Test 1: Testing ip_address failed", "192.168.111.3", + Assert.assertEquals("NeutronIPs JAXB Test 1: Testing ip_address failed", "192.168.111.3", testObject.getIpAddress()); - Assert.assertEquals("Neutron_IPs JAXB Test 2: Testing subnet_id failed", + Assert.assertEquals("NeutronIPs JAXB Test 2: Testing subnet_id failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", testObject.getSubnetUUID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java index e451643a8..2db22cc26 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitorJAXBTest.java @@ -58,9 +58,9 @@ public class NeutronLoadBalancerHealthMonitorJAXBTest { Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 10: Testing tenant_id failed", "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID()); - Neutron_ID neutronId = new Neutron_ID(); + NeutronID neutronId = new NeutronID(); neutronId.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7"); - List loadBalancerHealthMonitorPool = new ArrayList(); + List loadBalancerHealthMonitorPool = new ArrayList(); loadBalancerHealthMonitorPool.add(neutronId); testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool); Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed", diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java index 4a2e68b68..055577cac 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java @@ -50,7 +50,7 @@ public class NeutronLoadBalancerPoolJAXBTest { Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed", "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID()); - List testListeners = testObject.getLoadBalancerPoolListeners(); + List testListeners = testObject.getLoadBalancerPoolListeners(); Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1, testListeners.size()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java similarity index 59% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java index 9cac0fc03..c8ca63c4b 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancer_SessionPersistenceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerSessionPersistenceJAXBTest.java @@ -12,19 +12,19 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class NeutronLoadBalancer_SessionPersistenceJAXBTest { +public class NeutronLoadBalancerSessionPersistenceJAXBTest { private static final String NEUTRON_LOAD_BALANCER_SESSION_PERSISTENCE_SOURCE_JSON = "{ " - + "\"cookie_name\": \"NeutronLoadBalancer_SessionPersistence_Cookie\", " + "\"type\": \"HTTP_COOKIE\" }"; + + "\"cookie_name\": \"NeutronLoadBalancerSessionPersistence_Cookie\", " + "\"type\": \"HTTP_COOKIE\" }"; @Test - public void test_NeutronLoadBalancer_SessionPersistence_JAXB() throws JAXBException { - NeutronLoadBalancer_SessionPersistence dummyObject = new NeutronLoadBalancer_SessionPersistence(); + public void test_NeutronLoadBalancerSessionPersistence_JAXB() throws JAXBException { + NeutronLoadBalancerSessionPersistence dummyObject = new NeutronLoadBalancerSessionPersistence(); - NeutronLoadBalancer_SessionPersistence testObject = (NeutronLoadBalancer_SessionPersistence) JaxbTestHelper + NeutronLoadBalancerSessionPersistence testObject = (NeutronLoadBalancerSessionPersistence) JaxbTestHelper .jaxbUnmarshall(dummyObject, NEUTRON_LOAD_BALANCER_SESSION_PERSISTENCE_SOURCE_JSON); Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed", - "NeutronLoadBalancer_SessionPersistence_Cookie", testObject.getCookieName()); + "NeutronLoadBalancerSessionPersistence_Cookie", testObject.getCookieName()); Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed", "HTTP_COOKIE", testObject.getType()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java index 37bcf072b..c596911bf 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java @@ -91,7 +91,7 @@ public class NeutronNetworkJAXBTest { Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed", false, testObject.getShared()); - List segments = testObject.getSegments(); + List segments = testObject.getSegments(); Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed", 2, segments.size()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java similarity index 58% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java index b45e52816..5daed66aa 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetwork_SegmentJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkSegmentJAXBTest.java @@ -12,25 +12,25 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class NeutronNetwork_SegmentJAXBTest { +public class NeutronNetworkSegmentJAXBTest { private static final String NEUTRON_NETWORK_SEGMENT_SOURCE_JSON = "{ " + "\"provider:network_type\": \"vlan\", " + "\"provider:physical_network\": \"physnet1\", " + "\"provider:segmentation_id\": \"1001\" }"; @Test - public void test_NeutronNetwork_Segment_JAXB() throws JAXBException { - NeutronNetwork_Segment segmentObject = new NeutronNetwork_Segment(); + public void test_NeutronNetworkSegment_JAXB() throws JAXBException { + NeutronNetworkSegment segmentObject = new NeutronNetworkSegment(); - NeutronNetwork_Segment testObject = (NeutronNetwork_Segment) JaxbTestHelper.jaxbUnmarshall(segmentObject, + NeutronNetworkSegment testObject = (NeutronNetworkSegment) JaxbTestHelper.jaxbUnmarshall(segmentObject, NEUTRON_NETWORK_SEGMENT_SOURCE_JSON); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 1: Testing provider:network_type failed", "vlan", + Assert.assertEquals("NeutronNetworkSegment JAXB Test 1: Testing provider:network_type failed", "vlan", testObject.getProviderNetworkType()); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 2: Testing provider:physical_network failed", + Assert.assertEquals("NeutronNetworkSegment JAXB Test 2: Testing provider:physical_network failed", "physnet1", testObject.getProviderPhysicalNetwork()); - Assert.assertEquals("NeutronNetwork_Segment JAXB Test 3: Testing provider:segmentation_id failed", "1001", + Assert.assertEquals("NeutronNetworkSegment JAXB Test 3: Testing provider:segmentation_id failed", "1001", testObject.getProviderSegmentationID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java similarity index 76% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java index c41625421..9656acc3e 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_AllowedAddressPairsJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortAllowedAddressPairsJAXBTest.java @@ -12,16 +12,16 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class NeutronPort_AllowedAddressPairsJAXBTest { +public class NeutronPortAllowedAddressPairsJAXBTest { private static final String NEUTRON_PORT_ALLOWED_ADDRESS_PAIRS_SOURCE_JSON = "{ " + "\"ip_address\": \"192.168.199.1\", " + "\"mac_address\": \"fa:16:3e:c9:cb:f0\" }"; @Test - public void test_NeutronPort_AllowedAddressPairs_JAXB() throws JAXBException { - NeutronPort_AllowedAddressPairs portObject = new NeutronPort_AllowedAddressPairs(); + public void test_NeutronPortAllowedAddressPairs_JAXB() throws JAXBException { + NeutronPortAllowedAddressPairs portObject = new NeutronPortAllowedAddressPairs(); - NeutronPort_AllowedAddressPairs testObject = (NeutronPort_AllowedAddressPairs) JaxbTestHelper + NeutronPortAllowedAddressPairs testObject = (NeutronPortAllowedAddressPairs) JaxbTestHelper .jaxbUnmarshall(portObject, NEUTRON_PORT_ALLOWED_ADDRESS_PAIRS_SOURCE_JSON); Assert.assertEquals("NeutronPort Allowed Address Pairs JAXB Test 1: Testing ip_address failed", "192.168.199.1", testObject.getIpAddress()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java new file mode 100644 index 000000000..0f7412f9c --- /dev/null +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortExtraDHCPOptionJAXBTest.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2015 Tata Consultancy Services. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.neutron.spi; + +import javax.xml.bind.JAXBException; +import org.junit.Assert; +import org.junit.Test; + +public class NeutronPortExtraDHCPOptionJAXBTest { + + private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_SOURCE_JSON = "{" + + "\"opt_value\": \"123.123.123.456\", " + + "\"opt_name\": \"server-ip-address\" " + "}"; + private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV4_SOURCE_JSON = "{" + + "\"opt_value\": \"123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", " + + "\"ip_version\": 4" + "}"; + private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON = "{" + + "\"opt_value\": \"::ffff:123.123.123.456\", " + + "\"opt_name\": \"server-ip-address\", " + + "\"ip_version\": 6" + "}"; + + @Test + public void test_NeutronPortExtraDHCPOption_JAXB() throws JAXBException { + NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption(); + NeutronPortExtraDHCPOption testObject; + + testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NEUTRON_PORT_EXTRA_DHCP_OPTION_SOURCE_JSON); + + Assert.assertEquals("NeutronPortExtraDHCPOption JAXB Test 1: Testing opt_value failed", "123.123.123.456", + testObject.getValue()); + Assert.assertEquals("NeutronPortExtraDHCPOption JAXB Test 10: Testing opt_name failed", "server-ip-address", + testObject.getName()); + Assert.assertEquals("NeutronPortExtraDHCPOption JAXB Test 20: Testing opt_name failed", 4, + testObject.getIpVersion().intValue()); + } + + @Test + public void test_NeutronPortExtraDHCPOption_IPv4_JAXB() throws JAXBException { + NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption(); + NeutronPortExtraDHCPOption testObject; + + testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV4_SOURCE_JSON); + + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed", "123.123.123.456", + testObject.getValue()); + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv4 JAXB Test 10: Testing opt_name failed", + "server-ip-address", testObject.getName()); + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed", 4, + testObject.getIpVersion().intValue()); + } + + @Test + public void test_NeutronPortExtraDHCPOption_IPv6_JAXB() throws JAXBException { + NeutronPortExtraDHCPOption portObject = new NeutronPortExtraDHCPOption(); + NeutronPortExtraDHCPOption testObject; + + testObject = (NeutronPortExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, + NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON); + + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv6 JAXB Test 1: Testing opt_value failed", + "::ffff:123.123.123.456", testObject.getValue()); + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv6 JAXB Test 10: Testing opt_name failed", + "server-ip-address", testObject.getName()); + Assert.assertEquals("NeutronPortExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed", 6, + testObject.getIpVersion().intValue()); + } +} diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java index fd1b25153..083b339d0 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java @@ -44,7 +44,7 @@ public class NeutronPortJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); - List fixedIPs = neutronObject.getFixedIPs(); + List fixedIPs = neutronObject.getFixedIPs(); Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", @@ -53,7 +53,7 @@ public class NeutronPortJAXBTest { Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); - List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); + List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, extraDHCPOptions.size()); @@ -62,7 +62,7 @@ public class NeutronPortJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, securityGroups.size()); - List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); + List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, allowedAddressPairs.size()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java index ca73c98b1..d91d728e6 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortQosJAXBTest.java @@ -47,7 +47,7 @@ public class NeutronPortQosJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); - List fixedIPs = neutronObject.getFixedIPs(); + List fixedIPs = neutronObject.getFixedIPs(); Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", @@ -56,7 +56,7 @@ public class NeutronPortQosJAXBTest { Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); - List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); + List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, extraDHCPOptions.size()); @@ -65,7 +65,7 @@ public class NeutronPortQosJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, securityGroups.size()); - List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); + List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, allowedAddressPairs.size()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java index ff8a110cc..76971d00b 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortSecurityJAXBTest.java @@ -92,7 +92,7 @@ public class NeutronPortSecurityJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus()); - List fixedIPs = neutronObject.getFixedIPs(); + List fixedIPs = neutronObject.getFixedIPs(); Assert.assertEquals(" NeutronPort JAXB Test 5.1: Testing fixed_ips list length failed", 1, fixedIPs.size()); Assert.assertEquals(" NeutronPort JAXB Test 5.2: Testing ip_address value failed", "192.168.111.3", @@ -101,7 +101,7 @@ public class NeutronPortSecurityJAXBTest { Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID); - List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); + List extraDHCPOptions = neutronObject.getExtraDHCPOptions(); Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1, extraDHCPOptions.size()); @@ -110,7 +110,7 @@ public class NeutronPortSecurityJAXBTest { Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1, securityGroups.size()); - List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); + List allowedAddressPairs = neutronObject.getAllowedAddressPairs(); Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1, allowedAddressPairs.size()); diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java deleted file mode 100644 index 26073b139..000000000 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPort_ExtraDHCPOptionJAXBTest.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (c) 2015 Tata Consultancy Services. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.neutron.spi; - -import javax.xml.bind.JAXBException; -import org.junit.Assert; -import org.junit.Test; - -public class NeutronPort_ExtraDHCPOptionJAXBTest { - - private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_SOURCE_JSON = "{" - + "\"opt_value\": \"123.123.123.456\", " - + "\"opt_name\": \"server-ip-address\" " + "}"; - private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV4_SOURCE_JSON = "{" - + "\"opt_value\": \"123.123.123.456\", " + "\"opt_name\": \"server-ip-address\", " - + "\"ip_version\": 4" + "}"; - private static final String NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON = "{" - + "\"opt_value\": \"::ffff:123.123.123.456\", " - + "\"opt_name\": \"server-ip-address\", " - + "\"ip_version\": 6" + "}"; - - @Test - public void test_NeutronPort_ExtraDHCPOption_JAXB() throws JAXBException { - NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); - NeutronPort_ExtraDHCPOption testObject; - - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NEUTRON_PORT_EXTRA_DHCP_OPTION_SOURCE_JSON); - - Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 1: Testing opt_value failed", "123.123.123.456", - testObject.getValue()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 10: Testing opt_name failed", "server-ip-address", - testObject.getName()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption JAXB Test 20: Testing opt_name failed", 4, - testObject.getIpVersion().intValue()); - } - - @Test - public void test_NeutronPort_ExtraDHCPOption_IPv4_JAXB() throws JAXBException { - NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); - NeutronPort_ExtraDHCPOption testObject; - - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV4_SOURCE_JSON); - - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 1: Testing opt_value failed", "123.123.123.456", - testObject.getValue()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 10: Testing opt_name failed", - "server-ip-address", testObject.getName()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv4 JAXB Test 20: Testing opt_name failed", 4, - testObject.getIpVersion().intValue()); - } - - @Test - public void test_NeutronPort_ExtraDHCPOption_IPv6_JAXB() throws JAXBException { - NeutronPort_ExtraDHCPOption portObject = new NeutronPort_ExtraDHCPOption(); - NeutronPort_ExtraDHCPOption testObject; - - testObject = (NeutronPort_ExtraDHCPOption) JaxbTestHelper.jaxbUnmarshall(portObject, - NEUTRON_PORT_EXTRA_DHCP_OPTION_IPV6_SOURCE_JSON); - - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 1: Testing opt_value failed", - "::ffff:123.123.123.456", testObject.getValue()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 10: Testing opt_name failed", - "server-ip-address", testObject.getName()); - Assert.assertEquals("NeutronPort_ExtraDHCPOption_IPv6 JAXB Test 20: Testing opt_name failed", 6, - testObject.getIpVersion().intValue()); - } -} diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java similarity index 63% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java index ccc07d549..7367da0b2 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_InterfaceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterInterfaceJAXBTest.java @@ -12,26 +12,26 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class NeutronRouter_InterfaceJAXBTest { +public class NeutronRouterInterfaceJAXBTest { private static final String NEUTRON_ROUTER_INTERFACE_SOURCE_JSON = "{" + "\"subnet_id\": \"3b80198d-4f7b-4f77-9ef5-774d54e17126\", " + "\"port_id\": \"65c0ee9f-d634-4522-8954-51021b570b0d\", " + "\"id\": \"7370da7f-234e-3f7a-ed12-e384131d886d\" }"; @Test - public void test_NeutronRouter_Interface_JAXB() throws JAXBException { - NeutronRouter_Interface dummyObject = new NeutronRouter_Interface(); + public void test_NeutronRouterInterface_JAXB() throws JAXBException { + NeutronRouterInterface dummyObject = new NeutronRouterInterface(); - NeutronRouter_Interface testObject = (NeutronRouter_Interface) JaxbTestHelper.jaxbUnmarshall(dummyObject, + NeutronRouterInterface testObject = (NeutronRouterInterface) JaxbTestHelper.jaxbUnmarshall(dummyObject, NEUTRON_ROUTER_INTERFACE_SOURCE_JSON); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 1: Testing subnet_id failed", + Assert.assertEquals("NeutronRouterInterface JAXB Test 1: Testing subnet_id failed", "3b80198d-4f7b-4f77-9ef5-774d54e17126", testObject.getSubnetUUID()); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 2: Testing port_id failed", + Assert.assertEquals("NeutronRouterInterface JAXB Test 2: Testing port_id failed", "65c0ee9f-d634-4522-8954-51021b570b0d", testObject.portUUID); - Assert.assertEquals("NeutronRouter_Interface JAXB Test 3: Testing id failed", + Assert.assertEquals("NeutronRouterInterface JAXB Test 3: Testing id failed", "7370da7f-234e-3f7a-ed12-e384131d886d", testObject.getID()); } } diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java index 101f999c8..e4f7c67f1 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java @@ -29,7 +29,7 @@ public class NeutronRouterJAXBTest { NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject, NEUTRON_ROUTER_SOURCE_JSON); - NeutronRouter_NetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo(); + NeutronRouterNetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo(); List routes = testObject.getRoutes(); Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed", diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java similarity index 57% rename from neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java rename to neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java index 51db9cb00..597d144b1 100644 --- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouter_NetworkReferenceJAXBTest.java +++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterNetworkReferenceJAXBTest.java @@ -13,7 +13,7 @@ import javax.xml.bind.JAXBException; import org.junit.Assert; import org.junit.Test; -public class NeutronRouter_NetworkReferenceJAXBTest { +public class NeutronRouterNetworkReferenceJAXBTest { private static final String NEUTRON_ROUTER_NETWORK_REFERENCE_SOURCE_JSON = "{" + "\"network_id\": \"e9330b1f-a2ef-4160-a991-169e56ab17f6\" ," + "\"enable_snat\": false , " @@ -22,28 +22,28 @@ public class NeutronRouter_NetworkReferenceJAXBTest { + "}"; @Test - public void test_NeutronRouter_NetworkReference_JAXB() throws JAXBException { - NeutronRouter_NetworkReference dummyObject = new NeutronRouter_NetworkReference(); + public void test_NeutronRouterNetworkReference_JAXB() throws JAXBException { + NeutronRouterNetworkReference dummyObject = new NeutronRouterNetworkReference(); - NeutronRouter_NetworkReference testObject = (NeutronRouter_NetworkReference) JaxbTestHelper + NeutronRouterNetworkReference testObject = (NeutronRouterNetworkReference) JaxbTestHelper .jaxbUnmarshall(dummyObject, NEUTRON_ROUTER_NETWORK_REFERENCE_SOURCE_JSON); - List externalFixedIPs = testObject.getExternalFixedIPs(); + List externalFixedIPs = testObject.getExternalFixedIPs(); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 1: Testing network_id failed", + Assert.assertEquals("NeutronRouterNetworkReference JAXB Test 1: Testing network_id failed", "e9330b1f-a2ef-4160-a991-169e56ab17f6", testObject.getNetworkID()); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 2: Testing enable_snat failed", false, + Assert.assertEquals("NeutronRouterNetworkReference JAXB Test 2: Testing enable_snat failed", false, testObject.getEnableSNAT()); Assert.assertEquals( - "NeutronRouter_NetworkReference JAXB Test 3.1: Testing externalFixedIPs list length failed", 1, + "NeutronRouterNetworkReference JAXB Test 3.1: Testing externalFixedIPs list length failed", 1, externalFixedIPs.size()); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.2: Testing ip_address value failed", + Assert.assertEquals("NeutronRouterNetworkReference JAXB Test 3.2: Testing ip_address value failed", "192.168.111.3", externalFixedIPs.get(0).ipAddress); - Assert.assertEquals("NeutronRouter_NetworkReference JAXB Test 3.3: Testing subnet_id value failed", + Assert.assertEquals("NeutronRouterNetworkReference JAXB Test 3.3: Testing subnet_id value failed", "22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", externalFixedIPs.get(0).subnetUUID); } } diff --git a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java index cd2a36939..96cee57e0 100644 --- a/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java +++ b/northbound-api/src/main/java/org/opendaylight/neutron/northbound/api/NeutronRoutersNorthbound.java @@ -26,7 +26,7 @@ import org.codehaus.enunciate.jaxrs.ResponseCode; import org.codehaus.enunciate.jaxrs.StatusCodes; import org.opendaylight.neutron.spi.INeutronRouterCRUD; import org.opendaylight.neutron.spi.NeutronRouter; -import org.opendaylight.neutron.spi.NeutronRouter_Interface; +import org.opendaylight.neutron.spi.NeutronRouterInterface; /** * Neutron Northbound REST APIs.
@@ -187,7 +187,7 @@ public final class NeutronRoutersNorthbound @Consumes({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackRouterInterfaces.class) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful") }) - public Response addRouterInterface(@PathParam("routerUUID") String routerUUID, NeutronRouter_Interface input) { + public Response addRouterInterface(@PathParam("routerUUID") String routerUUID, NeutronRouterInterface input) { // Do nothing. Keep this interface for compatibility return Response.status(HttpURLConnection.HTTP_OK).entity(input).build(); } @@ -198,7 +198,7 @@ public final class NeutronRoutersNorthbound @Consumes({ MediaType.APPLICATION_JSON }) //@TypeHint(OpenStackRouterInterfaces.class) @StatusCodes({ @ResponseCode(code = HttpURLConnection.HTTP_OK, condition = "Operation successful") }) - public Response removeRouterInterface(@PathParam("routerUUID") String routerUUID, NeutronRouter_Interface input) { + public Response removeRouterInterface(@PathParam("routerUUID") String routerUUID, NeutronRouterInterface input) { // Do nothing. Keep this interface for compatibility return Response.status(HttpURLConnection.HTTP_OK).entity(input).build(); } diff --git a/parent/checkstyle-suppressions.xml b/parent/checkstyle-suppressions.xml index 8937cd333..9fbc05ae8 100644 --- a/parent/checkstyle-suppressions.xml +++ b/parent/checkstyle-suppressions.xml @@ -9,8 +9,5 @@ - diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java index 0c9104255..0d7cced84 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java @@ -13,8 +13,8 @@ import java.util.ArrayList; import java.util.List; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.neutron.spi.INeutronLoadBalancerHealthMonitorCRUD; +import org.opendaylight.neutron.spi.NeutronID; import org.opendaylight.neutron.spi.NeutronLoadBalancerHealthMonitor; -import org.opendaylight.neutron.spi.Neutron_ID; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProbeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProbeHttp; @@ -66,7 +66,7 @@ public final class NeutronLoadBalancerHealthMonitorInterface } if (healthMonitor.getLoadBalancerHealthMonitorPools() != null) { final List listUuid = new ArrayList(); - for (final Neutron_ID neutronId : healthMonitor.getLoadBalancerHealthMonitorPools()) { + for (final NeutronID neutronId : healthMonitor.getLoadBalancerHealthMonitorPools()) { listUuid.add(toUuid(neutronId.getID())); } healthmonitorBuilder.setPools(listUuid); @@ -111,9 +111,9 @@ public final class NeutronLoadBalancerHealthMonitorInterface answer.setLoadBalancerHealthMonitorMaxRetries(Integer.valueOf(healthMonitor.getMaxRetries())); } if (healthMonitor.getPools() != null) { - final List list = new ArrayList(); + final List list = new ArrayList(); for (final Uuid id : healthMonitor.getPools()) { - list.add(new Neutron_ID(id.getValue())); + list.add(new NeutronID(id.getValue())); } answer.setLoadBalancerHealthMonitorPools(list); } diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java index 68fe6f4f1..db2a3efd7 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerListenerInterface.java @@ -14,8 +14,8 @@ import java.util.List; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.neutron.northbound.api.BadRequestException; import org.opendaylight.neutron.spi.INeutronLoadBalancerListenerCRUD; +import org.opendaylight.neutron.spi.NeutronID; import org.opendaylight.neutron.spi.NeutronLoadBalancerListener; -import org.opendaylight.neutron.spi.Neutron_ID; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolHttp; @@ -61,7 +61,7 @@ public final class NeutronLoadBalancerListenerInterface } if (listener.getNeutronLoadBalancerListenerLoadBalancerIDs() != null) { final List listLoadBalancers = new ArrayList(); - for (final Neutron_ID neutronId : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) { + for (final NeutronID neutronId : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) { listLoadBalancers.add(toUuid(neutronId.getID())); } listenerBuilder.setLoadbalancers(listLoadBalancers); @@ -96,9 +96,9 @@ public final class NeutronLoadBalancerListenerInterface answer.setNeutronLoadBalancerListenerDefaultPoolID(listener.getDefaultPoolId().getValue()); } if (listener.getLoadbalancers() != null) { - final List list = new ArrayList(); + final List list = new ArrayList(); for (final Uuid id : listener.getLoadbalancers()) { - list.add(new Neutron_ID(id.getValue())); + list.add(new NeutronID(id.getValue())); } answer.setNeutronLoadBalancerListenerLoadBalancerIDs(list); } diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java index 339d9a6b4..c0261f1cd 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java @@ -23,10 +23,10 @@ import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException; import org.opendaylight.neutron.spi.INeutronLoadBalancerPoolCRUD; +import org.opendaylight.neutron.spi.NeutronID; import org.opendaylight.neutron.spi.NeutronLoadBalancerPool; import org.opendaylight.neutron.spi.NeutronLoadBalancerPoolMember; -import org.opendaylight.neutron.spi.NeutronLoadBalancer_SessionPersistence; -import org.opendaylight.neutron.spi.Neutron_ID; +import org.opendaylight.neutron.spi.NeutronLoadBalancerSessionPersistence; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolBase; @@ -78,7 +78,7 @@ public final class NeutronLoadBalancerPoolInterface } if (pool.getLoadBalancerPoolListeners() != null) { final List listListener = new ArrayList(); - for (final Neutron_ID neutronId : pool.getLoadBalancerPoolListeners()) { + for (final NeutronID neutronId : pool.getLoadBalancerPoolListeners()) { listListener.add(toUuid(neutronId.getID())); } poolBuilder.setListeners(listListener); @@ -93,7 +93,7 @@ public final class NeutronLoadBalancerPoolInterface poolBuilder.setProtocol((Class) mapper.get(pool.getLoadBalancerPoolProtocol())); } if (pool.getLoadBalancerPoolSessionPersistence() != null) { - final NeutronLoadBalancer_SessionPersistence sessionPersistence = pool + final NeutronLoadBalancerSessionPersistence sessionPersistence = pool .getLoadBalancerPoolSessionPersistence(); final SessionPersistenceBuilder sessionPersistenceBuilder = new SessionPersistenceBuilder(); sessionPersistenceBuilder.setCookieName(sessionPersistence.getCookieName()); @@ -123,9 +123,9 @@ public final class NeutronLoadBalancerPoolInterface answer.setLoadBalancerPoolLbAlgorithm(pool.getLbAlgorithm()); } if (pool.getListeners() != null) { - final List ids = new ArrayList(); + final List ids = new ArrayList(); for (final Uuid id : pool.getListeners()) { - ids.add(new Neutron_ID(id.getValue())); + ids.add(new NeutronID(id.getValue())); } answer.setLoadBalancerPoolListeners(ids); } @@ -143,8 +143,8 @@ public final class NeutronLoadBalancerPoolInterface answer.setLoadBalancerPoolProtocol(PROTOCOL_MAP.get(pool.getProtocol())); } if (pool.getSessionPersistence() != null) { - final NeutronLoadBalancer_SessionPersistence sessionPersistence = - new NeutronLoadBalancer_SessionPersistence(); + final NeutronLoadBalancerSessionPersistence sessionPersistence = + new NeutronLoadBalancerSessionPersistence(); sessionPersistence.setCookieName(pool.getSessionPersistence().getCookieName()); sessionPersistence.setType(pool.getSessionPersistence().getType()); diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java index c0e6d976d..991f30f57 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java @@ -14,7 +14,7 @@ import java.util.List; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.neutron.spi.INeutronNetworkCRUD; import org.opendaylight.neutron.spi.NeutronNetwork; -import org.opendaylight.neutron.spi.NeutronNetwork_Segment; +import org.opendaylight.neutron.spi.NeutronNetworkSegment; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3Extension; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.ext.rev150712.NetworkL3ExtensionBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.NetworkTypeBase; @@ -68,10 +68,10 @@ public final class NeutronNetworkInterface result.setProviderPhysicalNetwork(providerExtension.getPhysicalNetwork()); result.setProviderSegmentationID(providerExtension.getSegmentationId()); result.setProviderNetworkType(NETWORK_MAP.get(providerExtension.getNetworkType())); - final List segments = new ArrayList(); + final List segments = new ArrayList(); if (providerExtension.getSegments() != null) { for (final Segments segment : providerExtension.getSegments()) { - final NeutronNetwork_Segment neutronSegment = new NeutronNetwork_Segment(); + final NeutronNetworkSegment neutronSegment = new NeutronNetworkSegment(); neutronSegment.setProviderPhysicalNetwork(segment.getPhysicalNetwork()); neutronSegment.setProviderSegmentationID(segment.getSegmentationId()); neutronSegment.setProviderNetworkType(NETWORK_MAP.get(segment.getNetworkType())); @@ -107,7 +107,7 @@ public final class NeutronNetworkInterface if (network.getSegments() != null) { final List segments = new ArrayList(); long count = 0; - for (final NeutronNetwork_Segment segment : network.getSegments()) { + for (final NeutronNetworkSegment segment : network.getSegments()) { count++; final SegmentsBuilder segmentsBuilder = new SegmentsBuilder(); if (segment.getProviderPhysicalNetwork() != null) { diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java index 02da7d3e1..2c1def710 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java @@ -17,11 +17,11 @@ import java.util.Map; import java.util.Set; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.neutron.spi.INeutronPortCRUD; +import org.opendaylight.neutron.spi.NeutronIPs; import org.opendaylight.neutron.spi.NeutronPort; -import org.opendaylight.neutron.spi.NeutronPort_AllowedAddressPairs; -import org.opendaylight.neutron.spi.NeutronPort_ExtraDHCPOption; +import org.opendaylight.neutron.spi.NeutronPortAllowedAddressPairs; +import org.opendaylight.neutron.spi.NeutronPortExtraDHCPOption; import org.opendaylight.neutron.spi.NeutronSecurityGroup; -import org.opendaylight.neutron.spi.Neutron_IPs; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; @@ -101,9 +101,9 @@ public final class NeutronPortInterface extends AbstractNeutronInterface pairs = new ArrayList(); + final List pairs = new ArrayList(); for (final AllowedAddressPairs mdPair : port.getAllowedAddressPairs()) { - final NeutronPort_AllowedAddressPairs pair = new NeutronPort_AllowedAddressPairs(); + final NeutronPortAllowedAddressPairs pair = new NeutronPortAllowedAddressPairs(); pair.setIpAddress(String.valueOf(mdPair.getIpAddress().getValue())); pair.setMacAddress(mdPair.getMacAddress().getValue()); pairs.add(pair); @@ -113,9 +113,9 @@ public final class NeutronPortInterface extends AbstractNeutronInterface options = new ArrayList(); + final List options = new ArrayList(); for (final ExtraDhcpOpts opt : port.getExtraDhcpOpts()) { - final NeutronPort_ExtraDHCPOption arg = new NeutronPort_ExtraDHCPOption(); + final NeutronPortExtraDHCPOption arg = new NeutronPortExtraDHCPOption(); arg.setName(opt.getOptName()); arg.setValue(opt.getOptValue()); arg.setIpVersion(IPV_MAP.get(opt.getIpVersion())); @@ -124,9 +124,9 @@ public final class NeutronPortInterface extends AbstractNeutronInterface ips = new ArrayList(); + final List ips = new ArrayList(); for (final FixedIps mdIP : port.getFixedIps()) { - final Neutron_IPs ip = new Neutron_IPs(); + final NeutronIPs ip = new NeutronIPs(); ip.setIpAddress(String.valueOf(mdIP.getIpAddress().getValue())); ip.setSubnetUUID(mdIP.getSubnetId().getValue()); ips.add(ip); @@ -191,7 +191,7 @@ public final class NeutronPortInterface extends AbstractNeutronInterface listAllowedAddressPairs = new ArrayList(); - for (final NeutronPort_AllowedAddressPairs allowedAddressPairs : neutronPort.getAllowedAddressPairs()) { + for (final NeutronPortAllowedAddressPairs allowedAddressPairs : neutronPort.getAllowedAddressPairs()) { final AllowedAddressPairsBuilder allowedAddressPairsBuilder = new AllowedAddressPairsBuilder(); allowedAddressPairsBuilder .setIpAddress(new IpPrefixOrAddress(allowedAddressPairs.getIpAddress().toCharArray())); @@ -209,7 +209,7 @@ public final class NeutronPortInterface extends AbstractNeutronInterface listExtraDHCPOptions = new ArrayList(); final ImmutableBiMap> mapper = IPV_MAP.inverse(); - for (final NeutronPort_ExtraDHCPOption extraDHCPOption : neutronPort.getExtraDHCPOptions()) { + for (final NeutronPortExtraDHCPOption extraDHCPOption : neutronPort.getExtraDHCPOptions()) { final ExtraDhcpOptsBuilder extraDHCPOptsBuilder = new ExtraDhcpOptsBuilder(); extraDHCPOptsBuilder.setOptName(extraDHCPOption.getName()); extraDHCPOptsBuilder.setOptValue(extraDHCPOption.getValue()); @@ -225,7 +225,7 @@ public final class NeutronPortInterface extends AbstractNeutronInterface listNeutronIPs = new ArrayList(); - for (final Neutron_IPs neutronIPs : neutronPort.getFixedIPs()) { + for (final NeutronIPs neutronIPs : neutronPort.getFixedIPs()) { final FixedIpsBuilder fixedIpsBuilder = new FixedIpsBuilder(); fixedIpsBuilder.setIpAddress(new IpAddress(neutronIPs.getIpAddress().toCharArray())); fixedIpsBuilder.setSubnetId(toUuid(neutronIPs.getSubnetUUID())); diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java index 20808f29e..40de549fc 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java @@ -12,10 +12,10 @@ import java.util.ArrayList; import java.util.List; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.neutron.spi.INeutronRouterCRUD; +import org.opendaylight.neutron.spi.NeutronIPs; import org.opendaylight.neutron.spi.NeutronRoute; import org.opendaylight.neutron.spi.NeutronRouter; -import org.opendaylight.neutron.spi.NeutronRouter_NetworkReference; -import org.opendaylight.neutron.spi.Neutron_IPs; +import org.opendaylight.neutron.spi.NeutronRouterNetworkReference; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.l3.attributes.Routes; @@ -67,16 +67,16 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface neutronRouter_NetworkReferences = new ArrayList< - NeutronRouter_NetworkReference>(); - neutronRouter_NetworkReferences.add(router.getExternalGatewayInfo()); - for (final NeutronRouter_NetworkReference externalGatewayInfos : neutronRouter_NetworkReferences) { + final List neutronRouterNetworkReferences = new ArrayList< + NeutronRouterNetworkReference>(); + neutronRouterNetworkReferences.add(router.getExternalGatewayInfo()); + for (final NeutronRouterNetworkReference externalGatewayInfos : neutronRouterNetworkReferences) { final ExternalGatewayInfoBuilder builder = new ExternalGatewayInfoBuilder(); builder.setEnableSnat(externalGatewayInfos.getEnableSNAT()); builder.setExternalNetworkId(toUuid(externalGatewayInfos.getNetworkID())); if (externalGatewayInfos.getExternalFixedIPs() != null) { final List externalFixedIps = new ArrayList(); - for (final Neutron_IPs externalIp : externalGatewayInfos.getExternalFixedIPs()) { + for (final NeutronIPs externalIp : externalGatewayInfos.getExternalFixedIPs()) { final ExternalFixedIpsBuilder eFixedIpBuilder = new ExternalFixedIpsBuilder(); eFixedIpBuilder.setIpAddress(new IpAddress(externalIp.getIpAddress().toCharArray())); eFixedIpBuilder.setSubnetId(toUuid(externalIp.getSubnetUUID())); @@ -110,13 +110,13 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface fixedIPs = new ArrayList(); + final List fixedIPs = new ArrayList(); for (final ExternalFixedIps mdFixedIP : router.getExternalGatewayInfo().getExternalFixedIps()) { - final Neutron_IPs fixedIP = new Neutron_IPs(); + final NeutronIPs fixedIP = new NeutronIPs(); fixedIP.setSubnetUUID(String.valueOf(mdFixedIP.getSubnetId().getValue())); fixedIP.setIpAddress(String.valueOf(mdFixedIP.getIpAddress().getValue())); fixedIPs.add(fixedIP); -- 2.36.6