eliminate TypeName violation and enable it.
Change-Id: I97af3891eafc965176fa34f17176b62d897122a9
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
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 {
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;
}
}
public static void runTests(String base) {
- Neutron_Bug3812_Tests bugTest = new Neutron_Bug3812_Tests(base);
+ NeutronBug3812Tests bugTest = new NeutronBug3812Tests(base);
bugTest.check_bug3812();
}
}
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;
}
}
public static void runTests(String base) {
- Neutron_Bug4027_Tests bugTest = new Neutron_Bug4027_Tests(base);
+ NeutronBug4027Tests bugTest = new NeutronBug4027Tests(base);
bugTest.check_bug4027();
}
}
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;
}
}
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();
}
}
@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}$";
"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;
}
@Override
public String toString() {
- return "Neutron_ID{" + "id='" + uuid + '\'' + "}";
+ return "NeutronID{" + "id='" + uuid + '\'' + "}";
}
}
@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
@XmlElement(name = "subnet_id")
String subnetUUID;
- public Neutron_IPs() {
+ public NeutronIPs() {
}
- public Neutron_IPs(String uuid) {
+ public NeutronIPs(String uuid) {
subnetUUID = uuid;
}
@Override
public String toString() {
- return "Neutron_IPs{" + "ipAddress='" + ipAddress + '\'' + ", subnetUUID='" + subnetUUID + '\'' + "}";
+ return "NeutronIPs{" + "ipAddress='" + ipAddress + '\'' + ", subnetUUID='" + subnetUUID + '\'' + "}";
}
}
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;
Boolean loadBalancerHealthMonitorAdminStateIsUp;
@XmlElement(name = "pools")
- List<Neutron_ID> loadBalancerHealthMonitorPools;
+ List<NeutronID> loadBalancerHealthMonitorPools;
public String getLoadBalancerHealthMonitorType() {
return loadBalancerHealthMonitorType;
this.loadBalancerHealthMonitorAdminStateIsUp = loadBalancerHealthMonitorAdminStateIsUp;
}
- public List<Neutron_ID> getLoadBalancerHealthMonitorPools() {
+ public List<NeutronID> getLoadBalancerHealthMonitorPools() {
return loadBalancerHealthMonitorPools;
}
- public void setLoadBalancerHealthMonitorPools(List<Neutron_ID> loadBalancerHealthMonitorPools) {
+ public void setLoadBalancerHealthMonitorPools(List<NeutronID> loadBalancerHealthMonitorPools) {
this.loadBalancerHealthMonitorPools = loadBalancerHealthMonitorPools;
}
String neutronLoadBalancerListenerProtocolPort;
@XmlElement(name = "loadbalancers")
- List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
+ List<NeutronID> neutronLoadBalancerListenerLoadBalancerIDs;
public Boolean getLoadBalancerListenerAdminStateIsUp() {
return loadBalancerListenerAdminStateIsUp;
this.neutronLoadBalancerListenerConnectionLimit = neutronLoadBalancerListenerConnectionLimit;
}
- public List<Neutron_ID> getNeutronLoadBalancerListenerLoadBalancerIDs() {
+ public List<NeutronID> getNeutronLoadBalancerListenerLoadBalancerIDs() {
return neutronLoadBalancerListenerLoadBalancerIDs;
}
public void setNeutronLoadBalancerListenerLoadBalancerIDs(
- List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs) {
+ List<NeutronID> neutronLoadBalancerListenerLoadBalancerIDs) {
this.neutronLoadBalancerListenerLoadBalancerIDs = neutronLoadBalancerListenerLoadBalancerIDs;
}
Boolean loadBalancerPoolAdminStateIsUp;
@XmlElement(name = "listeners")
- List<Neutron_ID> loadBalancerPoolListeners;
+ List<NeutronID> loadBalancerPoolListeners;
@XmlElement(name = "session_persistence")
- NeutronLoadBalancer_SessionPersistence loadBalancerPoolSessionPersistence;
+ NeutronLoadBalancerSessionPersistence loadBalancerPoolSessionPersistence;
@XmlElement(name = "members")
List<NeutronLoadBalancerPoolMember> loadBalancerPoolMembers;
this.loadBalancerPoolAdminStateIsUp = loadBalancerPoolAdminStateIsUp;
}
- public NeutronLoadBalancer_SessionPersistence getLoadBalancerPoolSessionPersistence() {
+ public NeutronLoadBalancerSessionPersistence getLoadBalancerPoolSessionPersistence() {
return loadBalancerPoolSessionPersistence;
}
public void setLoadBalancerSessionPersistence(
- NeutronLoadBalancer_SessionPersistence loadBalancerPoolSessionPersistence) {
+ NeutronLoadBalancerSessionPersistence loadBalancerPoolSessionPersistence) {
this.loadBalancerPoolSessionPersistence = loadBalancerPoolSessionPersistence;
}
- public List<Neutron_ID> getLoadBalancerPoolListeners() {
+ public List<NeutronID> getLoadBalancerPoolListeners() {
return loadBalancerPoolListeners;
}
- public void setLoadBalancerPoolListeners(List<Neutron_ID> loadBalancerPoolListeners) {
+ public void setLoadBalancerPoolListeners(List<NeutronID> loadBalancerPoolListeners) {
this.loadBalancerPoolListeners = loadBalancerPoolListeners;
}
@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
@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;
}
String providerSegmentationID;
@XmlElement(name = "segments")
- List<NeutronNetwork_Segment> segments;
+ List<NeutronNetworkSegment> segments;
@XmlElement(name = "vlan_transparent")
Boolean vlanTransparent;
this.providerSegmentationID = providerSegmentationID;
}
- public void setSegments(List<NeutronNetwork_Segment> segments) {
+ public void setSegments(List<NeutronNetworkSegment> segments) {
this.segments = segments;
}
- public List<NeutronNetwork_Segment> getSegments() {
+ public List<NeutronNetworkSegment> getSegments() {
return segments;
}
@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
@XmlElement(namespace = "provider", name = "segmentation_id")
String providerSegmentationID;
- public NeutronNetwork_Segment() {
+ public NeutronNetworkSegment() {
}
public String getProviderNetworkType() {
@Override
public String toString() {
- return "NeutronNetwork_Segment [ " + ", providerNetworkType=" + providerNetworkType
+ return "NeutronNetworkSegment [ " + ", providerNetworkType=" + providerNetworkType
+ ", providerPhysicalNetwork=" + providerPhysicalNetwork + ", providerSegmentationID="
+ providerSegmentationID + "]";
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public abstract class NeutronObject<T extends NeutronObject> extends Neutron_ID
+public abstract class NeutronObject<T extends NeutronObject> extends NeutronID
implements Serializable, INeutronObject<T> {
private static final long serialVersionUID = 1L;
String macAddress;
@XmlElement(name = "fixed_ips")
- List<Neutron_IPs> fixedIPs;
+ List<NeutronIPs> fixedIPs;
@XmlElement(name = "device_id")
String deviceID;
List<NeutronSecurityGroup> securityGroups;
@XmlElement(name = "allowed_address_pairs")
- List<NeutronPort_AllowedAddressPairs> allowedAddressPairs;
+ List<NeutronPortAllowedAddressPairs> allowedAddressPairs;
//@XmlElement (name = "binding:host_id")
@XmlElement(namespace = "binding", name = "host_id")
Map<String, String> vifDetails;
@XmlElement(name = "extra_dhcp_opts")
- List<NeutronPort_ExtraDHCPOption> extraDHCPOptions;
+ List<NeutronPortExtraDHCPOption> extraDHCPOptions;
//Port security is enabled by default for backward compatibility.
@XmlElement(defaultValue = "true", name = "port_security_enabled")
this.macAddress = macAddress;
}
- public List<Neutron_IPs> getFixedIPs() {
+ public List<NeutronIPs> getFixedIPs() {
return fixedIPs;
}
- public void setFixedIPs(List<Neutron_IPs> fixedIPs) {
+ public void setFixedIPs(List<NeutronIPs> fixedIPs) {
this.fixedIPs = fixedIPs;
}
this.securityGroups = securityGroups;
}
- public List<NeutronPort_AllowedAddressPairs> getAllowedAddressPairs() {
+ public List<NeutronPortAllowedAddressPairs> getAllowedAddressPairs() {
return allowedAddressPairs;
}
- public void setAllowedAddressPairs(List<NeutronPort_AllowedAddressPairs> allowedAddressPairs) {
+ public void setAllowedAddressPairs(List<NeutronPortAllowedAddressPairs> allowedAddressPairs) {
this.allowedAddressPairs = allowedAddressPairs;
}
- public List<NeutronPort_ExtraDHCPOption> getExtraDHCPOptions() {
+ public List<NeutronPortExtraDHCPOption> getExtraDHCPOptions() {
return extraDHCPOptions;
}
- public void setExtraDHCPOptions(List<NeutronPort_ExtraDHCPOption> extraDHCPOptions) {
+ public void setExtraDHCPOptions(List<NeutronPortExtraDHCPOption> extraDHCPOptions) {
this.extraDHCPOptions = extraDHCPOptions;
}
ans.setMacAddress(this.getMacAddress());
}
if ("fixed_ips".equals(field)) {
- ans.setFixedIPs(new ArrayList<Neutron_IPs>(this.getFixedIPs()));
+ ans.setFixedIPs(new ArrayList<NeutronIPs>(this.getFixedIPs()));
}
if ("device_id".equals(field)) {
ans.setDeviceID(this.getDeviceID());
}
if ("allowed_address_pairs".equals(field)) {
ans.setAllowedAddressPairs(
- new ArrayList<NeutronPort_AllowedAddressPairs>(this.getAllowedAddressPairs()));
+ new ArrayList<NeutronPortAllowedAddressPairs>(this.getAllowedAddressPairs()));
}
if ("binding:host_id".equals(field)) {
ans.setBindinghostID(this.getBindinghostID());
ans.setVIFDetails(new HashMap<String, String>(this.getVIFDetails()));
}
if ("extra_dhcp_opts".equals(field)) {
- ans.setExtraDHCPOptions(new ArrayList<NeutronPort_ExtraDHCPOption>(this.getExtraDHCPOptions()));
+ ans.setExtraDHCPOptions(new ArrayList<NeutronPortExtraDHCPOption>(this.getExtraDHCPOptions()));
}
if ("port_security_enabled".equals(field)) {
ans.setPortSecurityEnabled(this.getPortSecurityEnabled());
status = "ACTIVE";
}
if (fixedIPs == null) {
- fixedIPs = new ArrayList<Neutron_IPs>();
+ fixedIPs = new ArrayList<NeutronIPs>();
}
}
@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")
@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;
}
@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")
@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;
// 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;
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;
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public final class NeutronRouter_Interface extends NeutronObject<NeutronRouter_Interface>
- implements Serializable, INeutronObject<NeutronRouter_Interface> {
+public final class NeutronRouterInterface extends NeutronObject<NeutronRouterInterface>
+ implements Serializable, INeutronObject<NeutronRouterInterface> {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
@XmlElement(name = "port_id")
String portUUID;
- public NeutronRouter_Interface() {
+ public NeutronRouterInterface() {
}
- public NeutronRouter_Interface(String subnetUUID, String portUUID) {
+ public NeutronRouterInterface(String subnetUUID, String portUUID) {
this.subnetUUID = subnetUUID;
this.portUUID = portUUID;
}
}
@Override
- public NeutronRouter_Interface extractFields(List<String> fields) {
- NeutronRouter_Interface ans = new NeutronRouter_Interface();
+ public NeutronRouterInterface extractFields(List<String> fields) {
+ NeutronRouterInterface ans = new NeutronRouterInterface();
for (String s : fields) {
extractField(s, ans);
if (s.equals("subnet_id")) {
@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
Boolean enableSNAT;
@XmlElement(name = "external_fixed_ips")
- List<Neutron_IPs> externalFixedIPs;
+ List<NeutronIPs> externalFixedIPs;
- public NeutronRouter_NetworkReference() {
+ public NeutronRouterNetworkReference() {
}
public String getNetworkID() {
this.enableSNAT = enableSNAT;
}
- public List<Neutron_IPs> getExternalFixedIPs() {
+ public List<NeutronIPs> getExternalFixedIPs() {
return externalFixedIPs;
}
- public void setExternalFixedIPs(List<Neutron_IPs> externalFixedIPs) {
+ public void setExternalFixedIPs(List<NeutronIPs> externalFixedIPs) {
this.externalFixedIPs = externalFixedIPs;
}
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());
}
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());
}
}
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<Neutron_ID> loadBalancerHealthMonitorPool = new ArrayList<Neutron_ID>();
+ List<NeutronID> loadBalancerHealthMonitorPool = new ArrayList<NeutronID>();
loadBalancerHealthMonitorPool.add(neutronId);
testObject.setLoadBalancerHealthMonitorPools(loadBalancerHealthMonitorPool);
Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 11: Testing Pools failed",
Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed",
"00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID());
- List<Neutron_ID> testListeners = testObject.getLoadBalancerPoolListeners();
+ List<NeutronID> testListeners = testObject.getLoadBalancerPoolListeners();
Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 9.1: Testing Listeners failed", 1,
testListeners.size());
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());
Assert.assertEquals("NeutronNetwork JAXB Test 8: Testing shared failed", false, testObject.getShared());
- List<NeutronNetwork_Segment> segments = testObject.getSegments();
+ List<NeutronNetworkSegment> segments = testObject.getSegments();
Assert.assertEquals("NeutronNetwork JAXB Test 9.1: Testing segments list length failed", 2,
segments.size());
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());
}
}
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());
--- /dev/null
+/*
+ * 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());
+ }
+}
Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus());
- List<Neutron_IPs> fixedIPs = neutronObject.getFixedIPs();
+ List<NeutronIPs> 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",
Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed",
"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID);
- List<NeutronPort_ExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
+ List<NeutronPortExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1,
extraDHCPOptions.size());
Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1,
securityGroups.size());
- List<NeutronPort_AllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
+ List<NeutronPortAllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1,
allowedAddressPairs.size());
Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus());
- List<Neutron_IPs> fixedIPs = neutronObject.getFixedIPs();
+ List<NeutronIPs> 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",
Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed",
"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID);
- List<NeutronPort_ExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
+ List<NeutronPortExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1,
extraDHCPOptions.size());
Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1,
securityGroups.size());
- List<NeutronPort_AllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
+ List<NeutronPortAllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1,
allowedAddressPairs.size());
Assert.assertEquals("NeutronPort JAXB Test 4: Testing status failed", "ACTIVE", neutronObject.getStatus());
- List<Neutron_IPs> fixedIPs = neutronObject.getFixedIPs();
+ List<NeutronIPs> 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",
Assert.assertEquals(" NeutronPort JAXB Test 5.3: Testing subnet_id value failed",
"22b44fc2-4ffb-4de4-b0f9-69d58b37ae27", fixedIPs.get(0).subnetUUID);
- List<NeutronPort_ExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
+ List<NeutronPortExtraDHCPOption> extraDHCPOptions = neutronObject.getExtraDHCPOptions();
Assert.assertEquals("NeutronPort JAXB Test 6: Testing extra_dhcp_opts list length failed", 1,
extraDHCPOptions.size());
Assert.assertEquals("NeutronPort JAXB Test 7: Testing security_groups list length failed", 1,
securityGroups.size());
- List<NeutronPort_AllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
+ List<NeutronPortAllowedAddressPairs> allowedAddressPairs = neutronObject.getAllowedAddressPairs();
Assert.assertEquals("NeutronPort JAXB Test 8: Testing allowed_address_pairs list length failed", 1,
allowedAddressPairs.size());
+++ /dev/null
-/*
- * 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());
- }
-}
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());
}
}
NeutronRouter testObject = (NeutronRouter) JaxbTestHelper.jaxbUnmarshall(dummyObject,
NEUTRON_ROUTER_SOURCE_JSON);
- NeutronRouter_NetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo();
+ NeutronRouterNetworkReference externalGatewayInfo = testObject.getExternalGatewayInfo();
List<NeutronRoute> routes = testObject.getRoutes();
Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed",
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 , "
+ "}";
@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<Neutron_IPs> externalFixedIPs = testObject.getExternalFixedIPs();
+ List<NeutronIPs> 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);
}
}
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.<br>
@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();
}
@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();
}
<suppress checks="AbbreviationAsWordInName"
files="."
/>
- <suppress checks="TypeName"
- files="."
- />
</suppressions>
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;
}
if (healthMonitor.getLoadBalancerHealthMonitorPools() != null) {
final List<Uuid> listUuid = new ArrayList<Uuid>();
- for (final Neutron_ID neutronId : healthMonitor.getLoadBalancerHealthMonitorPools()) {
+ for (final NeutronID neutronId : healthMonitor.getLoadBalancerHealthMonitorPools()) {
listUuid.add(toUuid(neutronId.getID()));
}
healthmonitorBuilder.setPools(listUuid);
answer.setLoadBalancerHealthMonitorMaxRetries(Integer.valueOf(healthMonitor.getMaxRetries()));
}
if (healthMonitor.getPools() != null) {
- final List<Neutron_ID> list = new ArrayList<Neutron_ID>();
+ final List<NeutronID> list = new ArrayList<NeutronID>();
for (final Uuid id : healthMonitor.getPools()) {
- list.add(new Neutron_ID(id.getValue()));
+ list.add(new NeutronID(id.getValue()));
}
answer.setLoadBalancerHealthMonitorPools(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;
}
if (listener.getNeutronLoadBalancerListenerLoadBalancerIDs() != null) {
final List<Uuid> listLoadBalancers = new ArrayList<Uuid>();
- for (final Neutron_ID neutronId : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) {
+ for (final NeutronID neutronId : listener.getNeutronLoadBalancerListenerLoadBalancerIDs()) {
listLoadBalancers.add(toUuid(neutronId.getID()));
}
listenerBuilder.setLoadbalancers(listLoadBalancers);
answer.setNeutronLoadBalancerListenerDefaultPoolID(listener.getDefaultPoolId().getValue());
}
if (listener.getLoadbalancers() != null) {
- final List<Neutron_ID> list = new ArrayList<Neutron_ID>();
+ final List<NeutronID> list = new ArrayList<NeutronID>();
for (final Uuid id : listener.getLoadbalancers()) {
- list.add(new Neutron_ID(id.getValue()));
+ list.add(new NeutronID(id.getValue()));
}
answer.setNeutronLoadBalancerListenerLoadBalancerIDs(list);
}
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;
}
if (pool.getLoadBalancerPoolListeners() != null) {
final List<Uuid> listListener = new ArrayList<Uuid>();
- for (final Neutron_ID neutronId : pool.getLoadBalancerPoolListeners()) {
+ for (final NeutronID neutronId : pool.getLoadBalancerPoolListeners()) {
listListener.add(toUuid(neutronId.getID()));
}
poolBuilder.setListeners(listListener);
poolBuilder.setProtocol((Class<? extends ProtocolBase>) 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());
answer.setLoadBalancerPoolLbAlgorithm(pool.getLbAlgorithm());
}
if (pool.getListeners() != null) {
- final List<Neutron_ID> ids = new ArrayList<Neutron_ID>();
+ final List<NeutronID> ids = new ArrayList<NeutronID>();
for (final Uuid id : pool.getListeners()) {
- ids.add(new Neutron_ID(id.getValue()));
+ ids.add(new NeutronID(id.getValue()));
}
answer.setLoadBalancerPoolListeners(ids);
}
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());
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;
result.setProviderPhysicalNetwork(providerExtension.getPhysicalNetwork());
result.setProviderSegmentationID(providerExtension.getSegmentationId());
result.setProviderNetworkType(NETWORK_MAP.get(providerExtension.getNetworkType()));
- final List<NeutronNetwork_Segment> segments = new ArrayList<NeutronNetwork_Segment>();
+ final List<NeutronNetworkSegment> segments = new ArrayList<NeutronNetworkSegment>();
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()));
if (network.getSegments() != null) {
final List<Segments> segments = new ArrayList<Segments>();
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) {
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;
final NeutronPort result = new NeutronPort();
fromMdAdminAttributes(port, result);
if (port.getAllowedAddressPairs() != null) {
- final List<NeutronPort_AllowedAddressPairs> pairs = new ArrayList<NeutronPort_AllowedAddressPairs>();
+ final List<NeutronPortAllowedAddressPairs> pairs = new ArrayList<NeutronPortAllowedAddressPairs>();
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);
result.setDeviceID(port.getDeviceId());
result.setDeviceOwner(port.getDeviceOwner());
if (port.getExtraDhcpOpts() != null) {
- final List<NeutronPort_ExtraDHCPOption> options = new ArrayList<NeutronPort_ExtraDHCPOption>();
+ final List<NeutronPortExtraDHCPOption> options = new ArrayList<NeutronPortExtraDHCPOption>();
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()));
result.setExtraDHCPOptions(options);
}
if (port.getFixedIps() != null) {
- final List<Neutron_IPs> ips = new ArrayList<Neutron_IPs>();
+ final List<NeutronIPs> ips = new ArrayList<NeutronIPs>();
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);
portBuilder.addAugmentation(PortSecurityExtension.class, portSecurityBuilder.build());
if (neutronPort.getAllowedAddressPairs() != null) {
final List<AllowedAddressPairs> listAllowedAddressPairs = new ArrayList<AllowedAddressPairs>();
- 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()));
if (neutronPort.getExtraDHCPOptions() != null) {
final List<ExtraDhcpOpts> listExtraDHCPOptions = new ArrayList<ExtraDhcpOpts>();
final ImmutableBiMap<Integer, Class<? extends IpVersionBase>> 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());
}
if (neutronPort.getFixedIPs() != null) {
final List<FixedIps> listNeutronIPs = new ArrayList<FixedIps>();
- 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()));
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;
}
if (router.getExternalGatewayInfo() != null) {
ExternalGatewayInfo externalGatewayInfo = null;
- final List<NeutronRouter_NetworkReference> neutronRouter_NetworkReferences = new ArrayList<
- NeutronRouter_NetworkReference>();
- neutronRouter_NetworkReferences.add(router.getExternalGatewayInfo());
- for (final NeutronRouter_NetworkReference externalGatewayInfos : neutronRouter_NetworkReferences) {
+ final List<NeutronRouterNetworkReference> 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> externalFixedIps = new ArrayList<ExternalFixedIps>();
- 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()));
}
if (router.getExternalGatewayInfo() != null) {
- final NeutronRouter_NetworkReference extGwInfo = new NeutronRouter_NetworkReference();
+ final NeutronRouterNetworkReference extGwInfo = new NeutronRouterNetworkReference();
extGwInfo.setNetworkID(String.valueOf(router.getExternalGatewayInfo().getExternalNetworkId().getValue()));
extGwInfo.setEnableSNAT(router.getExternalGatewayInfo().isEnableSnat());
if (router.getExternalGatewayInfo().getExternalFixedIps() != null) {
- final List<Neutron_IPs> fixedIPs = new ArrayList<Neutron_IPs>();
+ final List<NeutronIPs> fixedIPs = new ArrayList<NeutronIPs>();
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);
Code Review / neutron.git / commitdiff