This patch introduce base class for Neutron object for code consolidation.
This is preparation for bug fixing 4157.
Change-Id: Ibc0fc28255c6fcfd022fd1feb2af079cff416a61
Related-Bug: 4157
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
String getID();
void setID(String id);
+
+ String getTenantID();
+
+ void setTenantID(String tenantID);
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronFirewall implements Serializable, INeutronObject {
+public class NeutronFirewall extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String firewallUUID;
-
- @XmlElement (name = "tenant_id")
- String firewallTenantID;
-
@XmlElement (name = "name")
String firewallName;
@XmlElement (name = "firewall_policy_id")
String neutronFirewallPolicyID;
- public String getID() {
- return firewallUUID;
- }
-
- public void setID(String id) {
- firewallUUID = id;
- }
-
// @deprecated use getID()
public String getFirewallUUID() {
- return firewallUUID;
+ return getID();
}
// @deprecated use setID()
- public void setFirewallUUID(String firewallUUID) {
- this.firewallUUID = firewallUUID;
+ public void setFirewallUUID(String uuid) {
+ setID(uuid);
}
+ @Deprecated
public String getFirewallTenantID() {
- return firewallTenantID;
+ return getTenantID();
}
- public void setFirewallTenantID(String firewallTenantID) {
- this.firewallTenantID = firewallTenantID;
+ @Deprecated
+ public void setFirewallTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getFirewallName() {
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setFirewallTenantID(this.getFirewallTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setFirewallName(this.getFirewallName());
@Override
public String toString() {
return "NeutronFirewall{" +
- "firewallUUID='" + firewallUUID + '\'' +
- ", firewallTenantID='" + firewallTenantID + '\'' +
+ "firewallUUID='" + uuid + '\'' +
+ ", firewallTenantID='" + tenantID + '\'' +
", firewallName='" + firewallName + '\'' +
", firewallDescription='" + firewallDescription + '\'' +
", firewallAdminStateIsUp=" + firewallAdminStateIsUp +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronFirewallPolicy implements Serializable, INeutronObject {
+public class NeutronFirewallPolicy extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String firewallPolicyUUID;
-
- @XmlElement (name = "tenant_id")
- String firewallPolicyTenantID;
-
@XmlElement (name = "name")
String firewallPolicyName;
this.firewallPolicyName = firewallPolicyName;
}
+ @Deprecated
public String getFirewallPolicyTenantID() {
- return firewallPolicyTenantID;
- }
-
- public void setFirewallPolicyTenantID(String firewallPolicyTenantID) {
- this.firewallPolicyTenantID = firewallPolicyTenantID;
- }
-
- public String getID() {
- return firewallPolicyUUID;
+ return getTenantID();
}
- public void setID(String id) {
- firewallPolicyUUID = id;
+ @Deprecated
+ public void setFirewallPolicyTenantID(String tenantID) {
+ setTenantID(tenantID);
}
// @deprecated use getID()
public String getFirewallPolicyUUID() {
- return firewallPolicyUUID;
+ return getID();
}
// @deprecated use setID()
- public void setFirewallPolicyUUID(String firewallPolicyUUID) {
- this.firewallPolicyUUID = firewallPolicyUUID;
+ public void setFirewallPolicyUUID(String uuid) {
+ setID(uuid);
}
public NeutronFirewallPolicy extractFields(List<String> fields) {
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setFirewallPolicyTenantID(this.getFirewallPolicyTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setFirewallPolicyName(this.getFirewallPolicyName());
@Override
public String toString() {
return "NeutronFirewallPolicy{" +
- "firewallPolicyUUID='" + firewallPolicyUUID + '\'' +
- ", firewallPolicyTenantID='" + firewallPolicyTenantID + '\'' +
+ "firewallPolicyUUID='" + uuid + '\'' +
+ ", firewallPolicyTenantID='" + tenantID + '\'' +
", firewallPolicyName='" + firewallPolicyName + '\'' +
", firewallPolicyDescription='" + firewallPolicyDescription + '\'' +
", firewallPolicyIsShared=" + firewallPolicyIsShared +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronFirewallRule implements Serializable, INeutronObject {
+public class NeutronFirewallRule extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String firewallRuleUUID;
-
- @XmlElement(name = "tenant_id")
- String firewallRuleTenantID;
-
@XmlElement(name = "name")
String firewallRuleName;
this.firewallRuleName = firewallRuleName;
}
+ @Deprecated
public String getFirewallRuleTenantID() {
- return firewallRuleTenantID;
- }
-
- public void setFirewallRuleTenantID(String firewallRuleTenantID) {
- this.firewallRuleTenantID = firewallRuleTenantID;
- }
-
- public String getID() {
- return firewallRuleUUID;
+ return getTenantID();
}
- public void setID(String id) {
- firewallRuleUUID = id;
+ @Deprecated
+ public void setFirewallRuleTenantID(String tenantID) {
+ setTenantID(tenantID);
}
// @deprecated use getID()
public String getFirewallRuleUUID() {
- return firewallRuleUUID;
+ return getID();
}
// @deprecated use setID()
- public void setFireWallRuleID(String firewallRuleUUID) {
- this.firewallRuleUUID = firewallRuleUUID;
+ public void setFireWallRuleID(String uuid) {
+ setID(uuid);
}
public NeutronFirewallRule extractFields(List<String> fields) {
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setFirewallRuleTenantID(this.getFirewallRuleTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setFirewallRuleName(this.getFirewallRuleName());
@Override
public String toString() {
return "firewallPolicyRules{" +
- "firewallRuleUUID='" + firewallRuleUUID + '\'' +
- ", firewallRuleTenantID='" + firewallRuleTenantID + '\'' +
+ "firewallRuleUUID='" + uuid + '\'' +
+ ", firewallRuleTenantID='" + tenantID + '\'' +
", firewallRuleName='" + firewallRuleName + '\'' +
", firewallRuleDescription='" + firewallRuleDescription + '\'' +
", firewallRuleStatus='" + firewallRuleStatus + '\'' +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronFloatingIP implements Serializable, INeutronObject {
+public class NeutronFloatingIP extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String floatingIPUUID;
-
@XmlElement (name = "floating_network_id")
String floatingNetworkUUID;
@XmlElement (name = "floating_ip_address")
String floatingIPAddress;
- @XmlElement (name = "tenant_id")
- String tenantUUID;
-
@XmlElement (name="router_id")
String routerUUID;
public NeutronFloatingIP() {
}
- public String getID() {
- return floatingIPUUID;
- }
-
- public void setID(String id) {
- floatingIPUUID = id;
- }
-
// @deprecated use getID()
public String getFloatingIPUUID() {
- return floatingIPUUID;
+ return getID();
}
// @deprecated use setID()
- public void setFloatingIPUUID(String floatingIPUUID) {
- this.floatingIPUUID = floatingIPUUID;
+ public void setFloatingIPUUID(String uuid) {
+ setID(uuid);
}
public String getFloatingNetworkUUID() {
this.floatingIPAddress = floatingIPAddress;
}
+ @Deprecated
public String getTenantUUID() {
- return tenantUUID;
+ return getTenantID();
}
- public void setTenantUUID(String tenantUUID) {
- this.tenantUUID = tenantUUID;
+ @Deprecated
+ public void setTenantUUID(String tenantID) {
+ setTenantID(tenantID);
}
public void setRouterUUID(String routerUUID) {
ans.setFloatingIPAddress(this.getFloatingIPAddress());
}
if (s.equals("tenant_id")) {
- ans.setTenantUUID(this.getTenantUUID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("router_id")) {
ans.setRouterUUID(this.getRouterUUID());
@Override
public String toString() {
return "NeutronFloatingIP{" +
- "fipUUID='" + floatingIPUUID + '\'' +
+ "fipUUID='" + uuid + '\'' +
", fipFloatingNetworkId='" + floatingNetworkUUID + '\'' +
", fipPortUUID='" + portUUID + '\'' +
", fipFixedIPAddress='" + fixedIPAddress + '\'' +
", fipFloatingIPAddress=" + floatingIPAddress +
- ", fipTenantId='" + tenantUUID + '\'' +
+ ", fipTenantId='" + tenantID + '\'' +
", fipRouterId='" + routerUUID + '\'' +
", fipStatus='" + status + '\'' +
'}';
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronLoadBalancer implements Serializable, INeutronObject {
+public class NeutronLoadBalancer extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String loadBalancerID;
-
- @XmlElement (name = "tenant_id")
- String loadBalancerTenantID;
-
@XmlElement (name = "name")
String loadBalancerName;
@XmlElement (name = "vip_subnet_id")
String loadBalancerVipSubnetID;
- public String getID() {
- return loadBalancerID;
- }
-
- public void setID(String id) {
- loadBalancerID = id;
- }
-
// @deprecated use getID()
public String getLoadBalancerID() {
- return loadBalancerID;
+ return getID();
}
// @deprecated use setID()
- public void setLoadBalancerID(String loadBalancerID) {
- this.loadBalancerID = loadBalancerID;
+ public void setLoadBalancerID(String uuid) {
+ setID(uuid);
}
- public String getLoadBalancerTenantID() {
- return loadBalancerTenantID;
+ @Deprecated
+ public String getLoadBlancerTenantID() {
+ return getTenantID();
}
- public void setLoadBalancerTenantID(String loadBalancerTenantID) {
- this.loadBalancerTenantID = loadBalancerTenantID;
+ @Deprecated
+ public void setLoadBalancerTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getLoadBalancerName() {
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setLoadBalancerTenantID(this.getLoadBalancerTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setLoadBalancerName(this.getLoadBalancerName());
@Override public String toString() {
return "NeutronLoadBalancer{" +
- "loadBalancerID='" + loadBalancerID + '\'' +
- ", loadBalancerTenantID='" + loadBalancerTenantID + '\'' +
+ "loadBalancerID='" + uuid + '\'' +
+ ", loadBalancerTenantID='" + tenantID + '\'' +
", loadBalancerName='" + loadBalancerName + '\'' +
", loadBalancerDescription='" + loadBalancerDescription + '\'' +
", loadBalancerStatus='" + loadBalancerStatus + '\'' +
@XmlAccessorType(XmlAccessType.NONE)
public class NeutronLoadBalancerHealthMonitor
+ extends NeutronObject
implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String loadBalancerHealthMonitorID;
-
- @XmlElement (name = "tenant_id")
- String loadBalancerHealthMonitorTenantID;
-
@XmlElement (name = "type")
String loadBalancerHealthMonitorType;
@XmlElement (name = "pools")
List<Neutron_ID> loadBalancerHealthMonitorPools;
- public String getID() {
- return loadBalancerHealthMonitorID;
- }
-
- public void setID(String id) {
- loadBalancerHealthMonitorID = id;
- }
-
// @deprecated use getID()
public String getLoadBalancerHealthMonitorID() {
- return loadBalancerHealthMonitorID;
+ return getID();
}
// @deprecated use setID()
- public void setLoadBalancerHealthMonitorID(String loadBalancerHealthMonitorID) {
- this.loadBalancerHealthMonitorID = loadBalancerHealthMonitorID;
+ public void setLoadBalancerHealthMonitorID(String uuid) {
+ setID(uuid);
}
+ @Deprecated
public String getLoadBalancerHealthMonitorTenantID() {
- return loadBalancerHealthMonitorTenantID;
+ return getTenantID();
}
- public void setLoadBalancerHealthMonitorTenantID(String loadBalancerHealthMonitorTenantID) {
- this.loadBalancerHealthMonitorTenantID = loadBalancerHealthMonitorTenantID;
+ @Deprecated
+ public void setLoadBalancerHealthMonitorTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getLoadBalancerHealthMonitorType() {
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setLoadBalancerHealthMonitorTenantID(this.getLoadBalancerHealthMonitorTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("type")) {
ans.setLoadBalancerHealthMonitorType(this.getLoadBalancerHealthMonitorType());
@Override public String toString() {
return "NeutronLoadBalancerHealthMonitor{" +
- "loadBalancerHealthMonitorID='" + loadBalancerHealthMonitorID + '\'' +
- ", loadBalancerHealthMonitorTenantID='" + loadBalancerHealthMonitorTenantID + '\'' +
+ "loadBalancerHealthMonitorID='" + uuid + '\'' +
+ ", loadBalancerHealthMonitorTenantID='" + tenantID + '\'' +
", loadBalancerHealthMonitorType='" + loadBalancerHealthMonitorType + '\'' +
", loadBalancerHealthMonitorDelay=" + loadBalancerHealthMonitorDelay +
", loadBalancerHealthMonitorTimeout=" + loadBalancerHealthMonitorTimeout +
@XmlAccessorType(XmlAccessType.NONE)
public class NeutronLoadBalancerListener
+ extends NeutronObject
implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String loadBalancerListenerID;
-
@XmlElement (name = "default_pool_id")
String neutronLoadBalancerListenerDefaultPoolID;
@XmlElement (name = "connection_limit")
Integer neutronLoadBalancerListenerConnectionLimit;
- @XmlElement (name = "tenant_id")
- String loadBalancerListenerTenantID;
-
@XmlElement (name = "name")
String loadBalancerListenerName;
@XmlElement (name = "load_balancers")
List<Neutron_ID> neutronLoadBalancerListenerLoadBalancerIDs;
- public String getID() {
- return loadBalancerListenerID;
- }
-
- public void setID(String id) {
- loadBalancerListenerID = id;
- }
-
// @deprecated use getID()
public String getLoadBalancerListenerID() {
- return loadBalancerListenerID;
+ return getID();
}
// @deprecated use setID()
- public void setLoadBalancerListenerID(String loadBalancerListenerID) {
- this.loadBalancerListenerID = loadBalancerListenerID;
+ public void setLoadBalancerListenerID(String uuid) {
+ setID(uuid);
}
+ @Deprecated
public String getLoadBalancerListenerTenantID() {
- return loadBalancerListenerTenantID;
+ return getTenantID();
}
- public void setLoadBalancerListenerTenantID(String loadBalancerListenerTenantID) {
- this.loadBalancerListenerTenantID = loadBalancerListenerTenantID;
+ @Deprecated
+ public void setLoadBalancerListenerTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getLoadBalancerListenerName() {
ans.setNeutronLoadBalancerListenerDefaultPoolID(this.getNeutronLoadBalancerListenerDefaultPoolID());
}
if (s.equals("tenant_id")) {
- ans.setLoadBalancerListenerTenantID(this.getLoadBalancerListenerTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setLoadBalancerListenerName(this.getLoadBalancerListenerName());
@Override public String toString() {
return "NeutronLoadBalancerListener{" +
- "loadBalancerListenerID='" + loadBalancerListenerID + '\'' +
+ "loadBalancerListenerID='" + uuid + '\'' +
", neutronLoadBalancerListenerDefaultPoolID='" + neutronLoadBalancerListenerDefaultPoolID + '\'' +
", neutronLoadBalancerListenerConnectionLimit='" + neutronLoadBalancerListenerConnectionLimit + '\'' +
- ", loadBalancerListenerTenantID='" + loadBalancerListenerTenantID + '\'' +
+ ", loadBalancerListenerTenantID='" + tenantID + '\'' +
", loadBalancerListenerName='" + loadBalancerListenerName + '\'' +
", loadBalancerListenerDescription='" + loadBalancerListenerDescription + '\'' +
", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronLoadBalancerPool implements Serializable, INeutronObject {
+public class NeutronLoadBalancerPool extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String loadBalancerPoolID;
-
- @XmlElement (name = "tenant_id")
- String loadBalancerPoolTenantID;
-
@XmlElement (name = "name")
String loadBalancerPoolName;
loadBalancerPoolMembers = new ArrayList<NeutronLoadBalancerPoolMember>();
}
- public String getID() {
- return loadBalancerPoolID;
- }
-
- public void setID(String id) {
- loadBalancerPoolID = id;
- }
-
// @deprecated use getID()
public String getLoadBalancerPoolID() {
- return loadBalancerPoolID;
+ return getID();
}
// @deprecated use setID()
- public void setLoadBalancerPoolID(String loadBalancerPoolID) {
- this.loadBalancerPoolID = loadBalancerPoolID;
+ public void setLoadBalancerPoolID(String uuid) {
+ setID(uuid);
}
+ @Deprecated
public String getLoadBalancerPoolTenantID() {
- return loadBalancerPoolTenantID;
+ return getTenantID();
}
- public void setLoadBalancerPoolTenantID(String loadBalancerPoolTenantID) {
- this.loadBalancerPoolTenantID = loadBalancerPoolTenantID;
+ @Deprecated
+ public void setLoadBalancerPoolTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getLoadBalancerPoolName() {
public List<NeutronLoadBalancerPoolMember> getLoadBalancerPoolMembers() {
/*
- * Update the pool_id of the member to that this.loadBalancerPoolID
+ * Update the pool_id of the member to that this.id
*/
List<NeutronLoadBalancerPoolMember> answer = new ArrayList<NeutronLoadBalancerPoolMember>();
if (loadBalancerPoolMembers != null) {
for (NeutronLoadBalancerPoolMember member: loadBalancerPoolMembers) {
- member.setPoolID(loadBalancerPoolID);
+ member.setPoolID(uuid);
answer.add(member);
}
}
ans.setID(this.getID());
}
if (s.equals("tenant_id")) {
- ans.setLoadBalancerPoolTenantID(this.getLoadBalancerPoolTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("name")) {
ans.setLoadBalancerPoolName(this.getLoadBalancerPoolName());
@Override
public String toString() {
return "NeutronLoadBalancerPool{" +
- "id='" + loadBalancerPoolID + '\'' +
- ", tenantID='" + loadBalancerPoolTenantID + '\'' +
+ "id='" + uuid + '\'' +
+ ", tenantID='" + tenantID + '\'' +
", name='" + loadBalancerPoolName + '\'' +
", description='" + loadBalancerPoolDescription + '\'' +
", protocol=" + loadBalancerPoolProtocol +'\''+
@XmlAccessorType(XmlAccessType.NONE)
public class NeutronLoadBalancerPoolMember
+ extends NeutronObject
implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
/**
* TODO: Plumb into LBaaS Pool. Members are nested underneath Pool CRUD.
*/
- @XmlElement (name = "id")
- String poolMemberID;
-
- @XmlElement (name = "tenant_id")
- String poolMemberTenantID;
-
@XmlElement (name = "address")
String poolMemberAddress;
this.poolID = poolID;
}
- public String getID() {
- return poolMemberID;
- }
-
- public void setID(String id) {
- poolMemberID = id;
- }
-
// @deprecated use getID()
public String getPoolMemberID() {
- return poolMemberID;
+ return getID();
}
// @deprecated use setID()
- public void setPoolMemberID(String poolMemberID) {
- this.poolMemberID = poolMemberID;
+ public void setPoolMemberID(String uuid) {
+ setID(uuid);
}
+ @Deprecated
public String getPoolMemberTenantID() {
- return poolMemberTenantID;
+ return getTenantID();
}
- public void setPoolMemberTenantID(String poolMemberTenantID) {
- this.poolMemberTenantID = poolMemberTenantID;
+ @Deprecated
+ public void setPoolMemberTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public String getPoolMemberAddress() {
ans.setPoolID(this.getPoolID());
}
if (s.equals("tenant_id")) {
- ans.setPoolMemberTenantID(this.getPoolMemberTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("address")) {
ans.setPoolMemberAddress(this.getPoolMemberAddress());
}
@Override public String toString() {
return "NeutronLoadBalancerPoolMember{" +
- "poolMemberID='" + poolMemberID + '\'' +
+ "poolMemberID='" + uuid + '\'' +
", poolID='" + poolID + '\'' +
- ", poolMemberTenantID='" + poolMemberTenantID + '\'' +
+ ", poolMemberTenantID='" + tenantID + '\'' +
", poolMemberAddress='" + poolMemberAddress + '\'' +
", poolMemberProtoPort=" + poolMemberProtoPort +
", poolMemberAdminStateIsUp=" + poolMemberAdminStateIsUp +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronMeteringLabel implements Serializable, INeutronObject {
+public class NeutronMeteringLabel extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement (name = "id")
- String meteringLabelUUID;
-
@XmlElement (name = "name")
String meteringLabelName;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "description")
String description;
* getters and setters
*/
- public String getID() {
- return meteringLabelUUID;
- }
-
- public void setID(String id) {
- meteringLabelUUID = id;
- }
-
// @deprecated use getID()
public String getMeteringLabelUUID() {
- return meteringLabelUUID;
+ return getID();
}
// @deprecated use setID()
public void setMeteringLabelUUID(String uuid) {
- this.meteringLabelUUID = uuid;
+ setID(uuid);
}
public String getMeteringLabelName() {
this.meteringLabelName = name;
}
+ @Deprecated
public String getMeteringLabelTenantID() {
- return tenantID;
+ return getTenantID();
}
+ @Deprecated
public void setMeteringLabelTenantID(String tenantID) {
- this.tenantID = tenantID;
+ setTenantID(tenantID);
}
public String getMeteringLabelDescription() {
@Override
public String toString() {
- return "NeutronMeteringLabel [id=" + meteringLabelUUID +
+ return "NeutronMeteringLabel [id=" + uuid +
", name=" + meteringLabelName +
", description=" + description +
", tenant_id=" + tenantID + "]";
ans.setMeteringLabelName(this.getMeteringLabelName());
}
if (s.equals("tenant_id")) {
- ans.setMeteringLabelTenantID(this.getMeteringLabelTenantID());
+ ans.setTenantID(this.getTenantID());
}
if (s.equals("description")) {
ans.setMeteringLabelDescription(this.getMeteringLabelDescription());
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronMeteringLabelRule implements Serializable, INeutronObject {
+public class NeutronMeteringLabelRule extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement (name = "id")
- String meteringLabelRuleUUID;
-
@XmlElement (name = "direction")
String meteringLabelRuleDirection;
* getters and setters
*/
- public String getID() {
- return meteringLabelRuleUUID;
- }
-
- public void setID(String id) {
- meteringLabelRuleUUID = id;
- }
-
// @deprecated use getID()
public String getMeteringLabelRuleUUID() {
- return meteringLabelRuleUUID;
+ return getID();
}
// @deprecated use setID()
public void setMeteringLabelRuleUUID(String uuid) {
- this.meteringLabelRuleUUID = uuid;
+ setID(uuid);
}
public String getMeteringLabelRuleDirection() {
@Override
public String toString() {
- return "NeutronMeteringLabelRule [id=" + meteringLabelRuleUUID +
+ return "NeutronMeteringLabelRule [id=" + uuid +
", direction=" + meteringLabelRuleDirection +
", excluded=" + meteringLabelRuleExcluded +
", remote_ip_prefix=" + meteringLabelRuleRemoteIPPrefix +
@XmlRootElement(name = "network")
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronNetwork implements Serializable, INeutronObject {
+public class NeutronNetwork extends NeutronObject implements Serializable, INeutronObject {
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
private static final long serialVersionUID = 1L;
- @XmlElement (name = "id")
- String networkUUID;
-
@XmlElement (name = "name")
String networkName;
@XmlElement (defaultValue = "false", name = "shared")
Boolean shared;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
// @XmlElement (defaultValue = "false", name = "router:external")
@XmlElement (defaultValue="false", namespace="router", name="external")
Boolean routerExternal;
}
}
- public String getID() { return networkUUID; }
-
- public void setID(String id) { this.networkUUID = id; }
-
+ @Deprecated
public String getNetworkUUID() {
- return networkUUID;
+ return getID();
}
- public void setNetworkUUID(String networkUUID) {
- this.networkUUID = networkUUID;
+ @Deprecated
+ public void setNetworkUUID(String uuid) {
+ setID(uuid);
}
public String getNetworkName() {
shared = newValue;
}
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public boolean isRouterExternal() { return routerExternal; }
public Boolean getRouterExternal() { return routerExternal; }
while (i.hasNext()) {
String s = i.next();
if (s.equals("id")) {
- ans.setNetworkUUID(this.getNetworkUUID());
+ ans.setID(this.getID());
}
if (s.equals("name")) {
ans.setNetworkName(this.getNetworkName());
@Override
public String toString() {
- return "NeutronNetwork [networkUUID=" + networkUUID + ", networkName=" + networkName + ", adminStateUp="
+ return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + networkName + ", adminStateUp="
+ adminStateUp + ", shared=" + shared + ", tenantID=" + tenantID + ", routerExternal=" + routerExternal
+ ", providerNetworkType=" + providerNetworkType + ", providerPhysicalNetwork="
+ providerPhysicalNetwork + ", providerSegmentationID=" + providerSegmentationID + ", status=" + status
--- /dev/null
+/*
+ * Copyright (c) 2015 Intel Corporation All rights reserved.
+ * Copyright (c) 2015 Isaku Yamahata 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 java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public class NeutronObject extends Neutron_ID implements Serializable, INeutronObject {
+ private static final long serialVersionUID = 1L;
+
+ @XmlElement (name = "tenant_id")
+ String tenantID;
+
+ public NeutronObject() {
+ super();
+ }
+
+ public String getTenantID() {
+ return tenantID;
+ }
+
+ public void setTenantID(String tenantID) {
+ this.tenantID = tenantID;
+ }
+
+ @Override
+ public String toString() {
+ return "NeutronObject [id=" + uuid + ", tenantID=" + tenantID + "]";
+ }
+}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronPort implements Serializable, INeutronObject {
+public class NeutronPort extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String portUUID;
-
@XmlElement (name = "network_id")
String networkUUID;
@XmlElement (name = "device_owner")
String deviceOwner;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "security_groups")
List<NeutronSecurityGroup> securityGroups;
public NeutronPort() {
}
- public String getID() { return portUUID; }
-
- public void setID(String id) { this.portUUID = id; }
-
+ @Deprecated
public String getPortUUID() {
- return portUUID;
+ return getID();
}
- public void setPortUUID(String portUUID) {
- this.portUUID = portUUID;
+ @Deprecated
+ public void setPortUUID(String uuid) {
+ setID(uuid);
}
public String getNetworkUUID() {
this.deviceOwner = deviceOwner;
}
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public List<NeutronSecurityGroup> getSecurityGroups() {
return securityGroups;
}
NeutronPort ans = new NeutronPort();
for (String field: fields) {
if ("id".equals(field)) {
- ans.setPortUUID(this.getPortUUID());
+ ans.setID(this.getID());
}
if ("network_id".equals(field)) {
ans.setNetworkUUID(this.getNetworkUUID());
@Override
public String toString() {
- return "NeutronPort [portUUID=" + portUUID + ", networkUUID=" + networkUUID + ", name=" + name
+ return "NeutronPort [portUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name
+ ", adminStateUp=" + adminStateUp + ", status=" + status + ", macAddress=" + macAddress
+ ", fixedIPs=" + fixedIPs + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID="
+ tenantID + ", securityGroups=" + securityGroups
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronRouter implements Serializable, INeutronObject {
+public class NeutronRouter extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String routerUUID;
-
@XmlElement (name = "name")
String name;
@XmlElement (name = "status")
String status;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "external_gateway_info", nillable = true)
NeutronRouter_NetworkReference externalGatewayInfo;
interfaces = new HashMap<String, NeutronRouter_Interface>();
}
- public String getID() { return routerUUID; }
-
- public void setID(String id) { this.routerUUID = id; }
-
+ @Deprecated
public String getRouterUUID() {
- return routerUUID;
+ return getID();
}
- public void setRouterUUID(String routerUUID) {
- this.routerUUID = routerUUID;
+ @Deprecated
+ public void setRouterUUID(String uuid) {
+ setID(uuid);
}
public String getName() {
this.status = status;
}
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public NeutronRouter_NetworkReference getExternalGatewayInfo() {
return externalGatewayInfo;
}
while (i.hasNext()) {
String s = i.next();
if (s.equals("id")) {
- ans.setRouterUUID(this.getRouterUUID());
+ ans.setID(this.getID());
}
if (s.equals("name")) {
ans.setName(this.getName());
@Override
public String toString() {
return "NeutronRouter [" +
- "id=" + routerUUID +
+ "id=" + uuid +
", name=" + name +
", adminStateUp=" + adminStateUp +
", status=" + status +
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronSecurityGroup implements Serializable, INeutronObject {
+public class NeutronSecurityGroup extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String securityGroupUUID;
-
@XmlElement(name = "name")
String securityGroupName;
@XmlElement(name = "description")
String securityGroupDescription;
- @XmlElement(name = "tenant_id")
- String securityGroupTenantID;
-
@XmlElement(name = "security_group_rules")
List<NeutronSecurityRule> neutronSecurityRule;
}
- public String getID() {
- return securityGroupUUID;
- }
-
- public void setID(String id) {
- securityGroupUUID = id;
- }
-
// @deprecated use getID()
public String getSecurityGroupUUID() {
- return securityGroupUUID;
+ return getID();
}
// @deprecated use setID()
- public void setSecurityGroupUUID(String securityGroupUUID) {
- this.securityGroupUUID = securityGroupUUID;
+ public void setSecurityGroupUUID(String uuid) {
+ setID(uuid);
}
public String getSecurityGroupName() {
this.securityGroupDescription = securityGroupDescription;
}
+ @Deprecated
public String getSecurityGroupTenantID() {
- return securityGroupTenantID;
+ return getTenantID();
}
- public void setSecurityGroupTenantID(String securityGroupTenantID) {
- this.securityGroupTenantID = securityGroupTenantID;
+ @Deprecated
+ public void setSecurityGroupTenantID(String tenantID) {
+ setTenantID(tenantID);
}
// Rules In Group
ans.setSecurityGroupDescription (this.getSecurityGroupDescription ());
}
if (s.equals ("tenant_id")) {
- ans.setSecurityGroupTenantID (this.getSecurityGroupTenantID ());
+ ans.setTenantID (this.getTenantID ());
}
if (s.equals ("security_group_rules")) {
ans.setSecurityRules (this.getSecurityRules ());
@Override
public String toString() {
return "NeutronSecurityGroup{" +
- "securityGroupUUID='" + securityGroupUUID + '\'' +
+ "securityGroupUUID='" + uuid + '\'' +
", securityGroupName='" + securityGroupName + '\'' +
", securityGroupDescription='" + securityGroupDescription + '\'' +
- ", securityGroupTenantID='" + securityGroupTenantID + '\'' +
+ ", securityGroupTenantID='" + tenantID + '\'' +
", securityRules=" + neutronSecurityRule + "]";
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronSecurityRule implements Serializable, INeutronObject {
+public class NeutronSecurityRule extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
- @XmlElement(name = "id")
- String securityRuleUUID;
-
@XmlElement(name = "direction")
String securityRuleDirection;
@XmlElement(name = "security_group_id")
String securityRuleGroupID;
- @XmlElement(name = "tenant_id")
- String securityRuleTenantID;
-
public NeutronSecurityRule() {
}
- public String getID() {
- return securityRuleUUID;
- }
-
- public void setID(String id) {
- securityRuleUUID = id;
- }
-
// @deprecated use getID()
public String getSecurityRuleUUID() {
- return securityRuleUUID;
+ return getID();
}
// @deprecated use setID()
- public void setSecurityRuleUUID(String securityRuleUUID) {
- this.securityRuleUUID = securityRuleUUID;
+ public void setSecurityRuleUUID(String uuid) {
+ setID(uuid);
}
public String getSecurityRuleDirection() {
this.securityRuleGroupID = securityRuleGroupID;
}
+ @Deprecated
public String getSecurityRuleTenantID() {
- return securityRuleTenantID;
+ return getTenantID();
}
- public void setSecurityRuleTenantID(String securityRuleTenantID) {
- this.securityRuleTenantID = securityRuleTenantID;
+ @Deprecated
+ public void setSecurityRuleTenantID(String tenantID) {
+ setTenantID(tenantID);
}
public NeutronSecurityRule extractFields(List<String> fields) {
ans.setSecurityRuleGroupID(this.getSecurityRuleGroupID());
}
if (s.equals("tenant_id")) {
- ans.setSecurityRuleTenantID(this.getSecurityRuleTenantID());
+ ans.setTenantID(this.getTenantID());
}
}
return ans;
@Override
public String toString() {
return "NeutronSecurityRule{" +
- "securityRuleUUID='" + securityRuleUUID + '\'' +
+ "securityRuleUUID='" + uuid + '\'' +
", securityRuleDirection='" + securityRuleDirection + '\'' +
", securityRuleProtocol='" + securityRuleProtocol + '\'' +
", securityRulePortMin=" + securityRulePortMin +
", securityRuleRemoteIpPrefix='" + securityRuleRemoteIpPrefix + '\'' +
", securityRemoteGroupID=" + securityRemoteGroupID +
", securityRuleGroupID='" + securityRuleGroupID + '\'' +
- ", securityRuleTenantID='" + securityRuleTenantID + '\'' +
+ ", securityRuleTenantID='" + tenantID + '\'' +
'}';
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronSubnet implements Serializable, INeutronObject {
+public class NeutronSubnet extends NeutronObject implements Serializable, INeutronObject {
private static final Logger LOGGER = LoggerFactory
.getLogger(NeutronCRUDInterfaces.class);
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String subnetUUID;
-
@XmlElement (name = "network_id")
String networkUUID;
@XmlElement (defaultValue = "true", name = "enable_dhcp")
Boolean enableDHCP;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "ipv6_address_mode", nillable = true)
String ipV6AddressMode;
myPorts = arg;
}
- public String getID() { return subnetUUID; }
-
- public void setID(String id) { this.subnetUUID = id; }
-
+ @Deprecated
public String getSubnetUUID() {
- return subnetUUID;
+ return getID();
}
- public void setSubnetUUID(String subnetUUID) {
- this.subnetUUID = subnetUUID;
+ @Deprecated
+ public void setSubnetUUID(String uuid) {
+ setID(uuid);
}
public String getNetworkUUID() {
enableDHCP = newValue;
}
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public String getIpV6AddressMode() { return ipV6AddressMode; }
public void setIpV6AddressMode(String ipV6AddressMode) { this.ipV6AddressMode = ipV6AddressMode; }
while (i.hasNext()) {
String s = i.next();
if (s.equals("id")) {
- ans.setSubnetUUID(this.getSubnetUUID());
+ ans.setID(this.getID());
}
if (s.equals("network_id")) {
ans.setNetworkUUID(this.getNetworkUUID());
@Override
public String toString() {
- return "NeutronSubnet [subnetUUID=" + subnetUUID + ", networkUUID=" + networkUUID + ", name=" + name
+ return "NeutronSubnet [subnetUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name
+ ", ipVersion=" + ipVersion + ", cidr=" + cidr + ", gatewayIP=" + gatewayIP + ", dnsNameservers="
+ dnsNameservers + ", allocationPools=" + allocationPools + ", hostRoutes=" + hostRoutes
+ ", enableDHCP=" + enableDHCP + ", tenantID=" + tenantID
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronVPNIKEPolicy implements Serializable, INeutronObject {
+public class NeutronVPNIKEPolicy extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String id;
-
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "name")
String name;
public NeutronVPNIKEPolicy() {
}
- public String getID() {
- return id;
- }
-
- public void setID(String id) {
- this.id = id;
- }
-
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public String getName() {
return name;
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronVPNIPSECPolicy implements Serializable, INeutronObject {
+public class NeutronVPNIPSECPolicy extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String id;
-
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "name")
String name;
public NeutronVPNIPSECPolicy() {
}
- public String getID() {
- return id;
- }
-
- public void setID(String id) {
- this.id = id;
- }
-
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public String getName() {
return name;
}
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronVPNIPSECSiteConnection implements Serializable, INeutronObject {
+public class NeutronVPNIPSECSiteConnection extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
// annotated attributes
- @XmlElement (name = "id")
- String id;
-
- @XmlElement (name = "tenant_id")
- String tenantID;
-
@XmlElement (name = "name")
String name;
public NeutronVPNIPSECSiteConnection() {
}
- public String getID() {
- return id;
- }
-
- public void setID(String id) {
- this.id = id;
- }
-
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
public String getName() {
return name;
}
@Override
public String toString() {
- return "NeutronVPNIPSECSiteConnection{" + "id='" + id + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
+ return "NeutronVPNIPSECSiteConnection{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
+ name + '\'' + ", description=" + description + ", peerAddress=" + peerAddress + ", peerID='" + peerID
+ '\'' + ", routeMode='" + routeMode + '\'' + ", mtu=" + mtu + ", authMode='" + authMode + '\''
+ ", preSharedKey='" + preSharedKey + '\'' + ", initiator='" + initiator + '\'' + ", adminStateUp="
@XmlRootElement
@XmlAccessorType(XmlAccessType.NONE)
-public class NeutronVPNService implements Serializable, INeutronObject {
+public class NeutronVPNService extends NeutronObject implements Serializable, INeutronObject {
private static final long serialVersionUID = 1L;
// See OpenStack Network API v2.0 Reference for description of
@XmlElement (name = "subnet_id")
String subnetUUID;
- @XmlElement (name = "tenant_id")
- String tenantID;
-
- @XmlElement (name = "id")
- String id;
-
@XmlElement (name = "description")
String description;
this.subnetUUID = subnetUUID;
}
- public String getTenantID() {
- return tenantID;
- }
-
- public void setTenantID(String tenantID) {
- this.tenantID = tenantID;
- }
-
- public String getID() {
- return id;
- }
-
- public void setID(String id) {
- this.id = id;
- }
-
public String getDescription() {
return description;
}
"d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed",
- "aa902936679e4ea29bfe1158e3450a13", testObject.getFirewallTenantID());
+ "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed",
"jaxb-test", testObject.getFirewallName());
"d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed",
- "aa902936679e4ea29bfe1158e3450a13", testObject.getFirewallPolicyTenantID());
+ "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed",
"jaxb-test", testObject.getFirewallPolicyName());
"8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID());
Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed",
- "45977fa2dbd7482098dd68d0d8970117", testObject.getFirewallRuleTenantID());
+ "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed",
"ALLOW_HTTP", testObject.getFirewallRuleName());
"2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
Assert.assertEquals("NeutronFloatingIP JAXB Test 2: Testing tenant_id failed",
- "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantUUID());
+ "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
Assert.assertEquals("NeutronFloatingIP JAXB Test 3: Testing router id failed",
"d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID());
"200,201,202", testObject.getLoadBalancerHealthMonitorExpectedCodes());
Assert.assertEquals("NeutronLoadBalancerHealthMonitor JAXB Test 10: Testing tenant_id failed",
- "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getLoadBalancerHealthMonitorTenantID());
+ "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
Neutron_ID neutron_id = new Neutron_ID();
neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7");
NeutronLoadBalancer testObject = (NeutronLoadBalancer) JaxbTestHelper.jaxbUnmarshall(dummyObject,
NeutronLoadBalancer_sourceJson);
Assert.assertEquals("NeutronLoadBalancer JAXB Test 1: Testing id failed",
- "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.loadBalancerID);
+ "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.uuid);
Assert.assertEquals("NeutronLoadBalancer JAXB Test 2: Testing LoadBalancer Name failed",
"NeutronLoadBalancer", testObject.getLoadBalancerName());
"d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.loadBalancerVipSubnetID);
Assert.assertEquals("NeutronLoadBalancer JAXB Test 8: Testing tenant_id failed",
- "4969c491a3c74ee4af974e6d800c62de", testObject.getLoadBalancerTenantID());
+ "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
} catch (Exception e) {
Assert.assertTrue("Tests failed", false);
}
testObject.getNeutronLoadBalancerListenerProtocolPort());
Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 9: Testing tenant_id failed",
- "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getLoadBalancerListenerTenantID());
+ "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
Neutron_ID neutron_id = new Neutron_ID();
neutron_id.setID("2f245a7b-0000-4f26-9cf9-9e82d248fda7");
testObject.getLoadBalancerPoolProtocol());
Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 7: Testing Tenant_id failed",
- "1a3e005cf9ce40308c900bcb08e5320c", testObject.getLoadBalancerPoolTenantID());
+ "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID());
Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed",
"00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getNeutronLoadBalancerPoolHealthMonitorID());
"10045a7b-0000-4f26-9cf9-9e82d248fda7", testObject.getPoolMemberSubnetID());
Assert.assertEquals("NeutronLoadBalancerPoolMember JAXB Test 7: Testing tenant_id failed",
- "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getPoolMemberTenantID());
+ "00045a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
} catch (Exception e) {
Assert.fail("Test failed");
}
"Provides allowed address pairs", testObject.getMeteringLabelDescription());
Assert.assertEquals("NeutronMeteringLabel JAXB Test 4: Testing tenant_id failed",
- "9bacb3c5d39d41a79512987f338cf177", testObject.getMeteringLabelTenantID());
+ "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
} catch (Exception e) {
Assert.fail("Test failed");
}
List<String> routes = testObject.getRoutes();
Assert.assertEquals("NeutronRouter JAXB Test 1: Testing router_uuid failed",
- "e9330b1f-a2ef-4160-a991-169e56ab17f5", testObject.getRouterUUID());
+ "e9330b1f-a2ef-4160-a991-169e56ab17f5", testObject.getID());
Assert.assertEquals("NeutronRouter JAXB Test 2: Testing name failed", "jaxb-test", testObject.getName());
"security group for webservers", testObject.getSecurityGroupDescription());
Assert.assertEquals("NeutronSecurityGroup JAXB Test 4: Testing port range min failed",
- "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getSecurityGroupTenantID());
+ "b4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID());
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.1: Testing security group rules list length failed",
1, securityRules.size());
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.2: Testing security group rules id value failed",
- "2bc0accf-312e-429a-956e-e4407625eb62", securityRules.get(0).securityRuleUUID);
+ "2bc0accf-312e-429a-956e-e4407625eb62", securityRules.get(0).uuid);
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.3: Testing security group rules direction value failed",
"ingress", securityRules.get(0).securityRuleDirection);
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.4: Testing security group rules protocol value failed",
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.10: Testing security group rules security group id value failed",
"a7734e61-b545-452d-a3cd-0189cbd9747a", securityRules.get(0).securityRuleGroupID);
Assert.assertEquals("NeutronSecurityGroup JAXB Test 5.11: Testing security group rules tenant id value failed",
- "e4f50856753b4dc6afee5fa6b9b6c550", securityRules.get(0).securityRuleTenantID);
+ "e4f50856753b4dc6afee5fa6b9b6c550", securityRules.get(0).tenantID);
} catch (Exception e) {
Assert.fail("Tests failed");
}
"a7734e61-b545-452d-a3cd-0189cbd9747a", testObject.getSecurityRuleGroupID());
Assert.assertEquals("NeutronSecurityRule JAXB Test 10: Testing tenant id failed",
- "e4f50856753b4dc6afee5fa6b9b6c550", testObject.getSecurityRuleTenantID());
+ "e4f50856753b4dc6afee5fa6b9b6c550", testObject.getTenantID());
} catch (Exception e) {
Assert.fail("Tests failed");
}
if ((queryFirewallUUID == null ||
queryFirewallUUID.equals(nsg.getID())) &&
(queryFirewallTenantID == null ||
- queryFirewallTenantID.equals(nsg.getFirewallTenantID())) &&
+ queryFirewallTenantID.equals(nsg.getTenantID())) &&
(queryFirewallName == null ||
queryFirewallName.equals(nsg.getFirewallName())) &&
(queryFirewallDescription == null ||
if ((queryFirewallPolicyUUID == null ||
queryFirewallPolicyUUID.equals(nsg.getID())) &&
(queryFirewallPolicyTenantID == null ||
- queryFirewallPolicyTenantID.equals(nsg.getFirewallPolicyTenantID())) &&
+ queryFirewallPolicyTenantID.equals(nsg.getTenantID())) &&
(queryFirewallPolicyName == null ||
queryFirewallPolicyName.equals(nsg.getFirewallPolicyName())) &&
(querySecurityPolicyDescription == null ||
if ((queryFirewallRuleUUID == null ||
queryFirewallRuleUUID.equals(nsr.getID())) &&
(queryFirewallRuleTenantID == null ||
- queryFirewallRuleTenantID.equals(nsr.getFirewallRuleTenantID())) &&
+ queryFirewallRuleTenantID.equals(nsr.getTenantID())) &&
(queryFirewallRuleName == null ||
queryFirewallRuleName.equals(nsr.getFirewallRuleName())) &&
(queryFirewallRuleDescription == null ||
(queryFloatingIPAddress == null || queryFloatingIPAddress.equals(oSS.getFloatingIPAddress())) &&
(queryStatus == null || queryStatus.equals(oSS.getStatus())) &&
(queryRouterID == null || queryRouterID.equals(oSS.getRouterUUID())) &&
- (queryTenantID == null || queryTenantID.equals(oSS.getTenantUUID()))) {
+ (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
if (fields.size() > 0) {
ans.add(extractFields(oSS,fields));
} else {
queryLoadBalancerHealthMonitorID.equals(nsg.getID())) &&
(queryLoadBalancerHealthMonitorTenantID == null ||
queryLoadBalancerHealthMonitorTenantID.equals
- (nsg.getLoadBalancerHealthMonitorTenantID())) &&
+ (nsg.getTenantID())) &&
(queryLoadBalancerHealthMonitorType == null ||
queryLoadBalancerHealthMonitorType.equals
(nsg.getLoadBalancerHealthMonitorType())) &&
(queryLoadBalancerListenerDefaultPoolID == null ||
queryLoadBalancerListenerDefaultPoolID.equals(nsg.getNeutronLoadBalancerListenerDefaultPoolID())) &&
(queryLoadBalancerListenerTenantID == null ||
- queryLoadBalancerListenerTenantID.equals(nsg.getLoadBalancerListenerTenantID())) &&
+ queryLoadBalancerListenerTenantID.equals(nsg.getTenantID())) &&
(queryLoadBalancerListenerName == null ||
queryLoadBalancerListenerName.equals(nsg.getLoadBalancerListenerName())) &&
(queryLoadBalancerListenerDescription == null ||
if ((queryLoadBalancerID == null ||
queryLoadBalancerID.equals(nsg.getID())) &&
(queryLoadBalancerTenantID == null ||
- queryLoadBalancerTenantID.equals(nsg.getLoadBalancerTenantID())) &&
+ queryLoadBalancerTenantID.equals(nsg.getTenantID())) &&
(queryLoadBalancerName == null ||
queryLoadBalancerName.equals(nsg.getLoadBalancerName())) &&
(queryLoadBalancerDescription == null ||
if ((queryLoadBalancerPoolID == null ||
queryLoadBalancerPoolID.equals(nsg.getID())) &&
(queryLoadBalancerPoolTenantID == null ||
- queryLoadBalancerPoolTenantID.equals(nsg.getLoadBalancerPoolTenantID())) &&
+ queryLoadBalancerPoolTenantID.equals(nsg.getTenantID())) &&
(queryLoadBalancerPoolName == null ||
queryLoadBalancerPoolName.equals(nsg.getLoadBalancerPoolName())) &&
(queryLoadBalancerDescription == null ||
queryLoadBalancerPoolMemberID.equals(nsg.getID())) &&
loadBalancerPoolUUID.equals(nsg.getPoolID()) &&
(queryLoadBalancerPoolMemberTenantID == null ||
- queryLoadBalancerPoolMemberTenantID.equals(nsg.getPoolMemberTenantID())) &&
+ queryLoadBalancerPoolMemberTenantID.equals(nsg.getTenantID())) &&
(queryLoadBalancerPoolMemberAddress == null ||
queryLoadBalancerPoolMemberAddress.equals(nsg.getPoolMemberAddress())) &&
(queryLoadBalancerPoolMemberAdminStateUp == null ||
if ((queryID == null || queryID.equals(oSS.getID())) &&
(queryName == null || queryName.equals(oSS.getMeteringLabelName())) &&
(queryDescription == null || queryDescription.equals(oSS.getMeteringLabelDescription())) &&
- (queryTenantID == null || queryTenantID.equals(oSS.getMeteringLabelTenantID()))) {
+ (queryTenantID == null || queryTenantID.equals(oSS.getTenantID()))) {
if (fields.size() > 0) {
ans.add(extractFields(oSS,fields));
} else {
(querySecurityDescription == null ||
querySecurityDescription.equals(nsg.getSecurityGroupDescription())) &&
(querySecurityTenantID == null ||
- querySecurityTenantID.equals(nsg.getSecurityGroupTenantID()))) {
+ querySecurityTenantID.equals(nsg.getTenantID()))) {
if (fields.size() > 0) {
ans.add(extractFields(nsg, fields));
} else {
(querySecurityRemoteGroupID == null ||
querySecurityRemoteGroupID.equals(nsr.getSecurityRemoteGroupID())) &&
(querySecurityRuleTenantID == null ||
- querySecurityRuleTenantID.equals(nsr.getSecurityRuleTenantID()))) {
+ querySecurityRuleTenantID.equals(nsr.getTenantID()))) {
if (fields.size() > 0) {
ans.add(extractFields(nsr, fields));
} else {
import org.opendaylight.neutron.spi.INeutronObject;
import org.opendaylight.neutron.spi.NeutronNetwork;
+import org.opendaylight.neutron.spi.NeutronObject;
import org.opendaylight.neutron.spi.NeutronPort;
import org.opendaylight.neutron.spi.NeutronSubnet;
}
}
- private static final class MarkerObject implements INeutronObject {
+ private static final class MarkerObject extends NeutronObject implements INeutronObject {
private final String id;
MarkerObject(String id) {
+ super();
this.id = id;
}
answer.setFirewallName(firewall.getName());
}
if (firewall.getTenantId() != null) {
- answer.setFirewallTenantID(firewall.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(firewall.getTenantId().getValue().replace("-",""));
}
answer.setFirewallAdminStateIsUp(firewall.isAdminStateUp());
if (firewall.getStatus() != null) {
if (firewall.getFirewallName() != null) {
firewallBuilder.setName(firewall.getFirewallName());
}
- if (firewall.getFirewallTenantID() != null) {
- firewallBuilder.setTenantId(toUuid(firewall.getFirewallTenantID()));
+ if (firewall.getTenantID() != null) {
+ firewallBuilder.setTenantId(toUuid(firewall.getTenantID()));
}
if (firewall.getFirewallAdminStateIsUp() != null) {
firewallBuilder.setAdminStateUp(firewall.getFirewallAdminStateIsUp());
answer.setFirewallPolicyName(policy.getName());
}
if (policy.getTenantId() != null) {
- answer.setFirewallPolicyTenantID(policy.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(policy.getTenantId().getValue().replace("-",""));
}
if (policy.getDescr() != null) {
answer.setFirewallPolicyDescription(policy.getDescr());
if (policy.getFirewallPolicyName() != null) {
policyBuilder.setName(policy.getFirewallPolicyName());
}
- if (policy.getFirewallPolicyTenantID() != null) {
- policyBuilder.setTenantId(toUuid(policy.getFirewallPolicyTenantID()));
+ if (policy.getTenantID() != null) {
+ policyBuilder.setTenantId(toUuid(policy.getTenantID()));
}
if (policy.getFirewallPolicyDescription() != null) {
policyBuilder.setDescr(policy.getFirewallPolicyDescription());
answer.setFirewallRuleName(rule.getName());
}
if (rule.getTenantId() != null) {
- answer.setFirewallRuleTenantID(rule.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(rule.getTenantId().getValue().replace("-",""));
}
if (rule.getDescr() != null) {
answer.setFirewallRuleDescription(rule.getDescr());
if (rule.getFirewallRuleName() != null) {
ruleBuilder.setName(rule.getFirewallRuleName());
}
- if (rule.getFirewallRuleTenantID() != null) {
- ruleBuilder.setTenantId(toUuid(rule.getFirewallRuleTenantID()));
+ if (rule.getTenantID() != null) {
+ ruleBuilder.setTenantId(toUuid(rule.getTenantID()));
}
if (rule.getFirewallRuleDescription() != null) {
ruleBuilder.setDescr(rule.getFirewallRuleDescription());
if (floatingIp.getStatus() != null) {
floatingipBuilder.setStatus(floatingIp.getStatus());
}
- if (floatingIp.getTenantUUID() != null) {
- floatingipBuilder.setTenantId(toUuid(floatingIp.getTenantUUID()));
+ if (floatingIp.getTenantID() != null) {
+ floatingipBuilder.setTenantId(toUuid(floatingIp.getTenantID()));
}
if (floatingIp.getID() != null) {
floatingipBuilder.setUuid(toUuid(floatingIp.getID()));
result.setFloatingIPAddress(String.valueOf(fip.getFloatingIpAddress().getValue()));
}
if (fip.getTenantId() != null) {
- result.setTenantUUID(String.valueOf(fip.getTenantId().getValue()));
+ result.setTenantID(String.valueOf(fip.getTenantId().getValue()));
}
if (fip.getRouterId() != null) {
result.setRouterUUID(String.valueOf(fip.getRouterId().getValue()));
}
healthmonitorBuilder.setPools(listUuid);
}
- if (healthMonitor.getLoadBalancerHealthMonitorTenantID() != null) {
- healthmonitorBuilder.setTenantId(toUuid(healthMonitor.getLoadBalancerHealthMonitorTenantID()));
+ if (healthMonitor.getTenantID() != null) {
+ healthmonitorBuilder.setTenantId(toUuid(healthMonitor.getTenantID()));
}
if (healthMonitor.getLoadBalancerHealthMonitorTimeout() != null) {
healthmonitorBuilder.setTimeout(Long.valueOf(healthMonitor.getLoadBalancerHealthMonitorTimeout()));
answer.setLoadBalancerHealthMonitorPools(list);
}
if (healthMonitor.getTenantId() != null) {
- answer.setLoadBalancerHealthMonitorTenantID(healthMonitor.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(healthMonitor.getTenantId().getValue().replace("-",""));
}
if (healthMonitor.getTimeout() != null) {
answer.setLoadBalancerHealthMonitorTimeout(healthMonitor.getTimeout().intValue());
answer.setLoadBalancerStatus(loadBalancer.getStatus());
}
if (loadBalancer.getTenantId() != null) {
- answer.setLoadBalancerTenantID(loadBalancer.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(loadBalancer.getTenantId().getValue().replace("-",""));
}
if (loadBalancer.getVipAddress() != null) {
answer.setLoadBalancerVipAddress(String.valueOf(loadBalancer.getVipAddress().getValue()));
if (loadBalancer.getLoadBalancerStatus() != null) {
loadBalancerBuilder.setStatus(loadBalancer.getLoadBalancerStatus());
}
- if (loadBalancer.getLoadBalancerTenantID() != null) {
- loadBalancerBuilder.setTenantId(toUuid(loadBalancer.getLoadBalancerTenantID()));
+ if (loadBalancer.getTenantID() != null) {
+ loadBalancerBuilder.setTenantId(toUuid(loadBalancer.getTenantID()));
}
if (loadBalancer.getLoadBalancerVipAddress() != null) {
loadBalancerBuilder.setVipAddress(new IpAddress(loadBalancer.getLoadBalancerVipAddress().toCharArray()));
if (listener.getNeutronLoadBalancerListenerProtocolPort() != null) {
listenerBuilder.setProtocolPort(Integer.valueOf(listener.getNeutronLoadBalancerListenerProtocolPort()));
}
- if (listener.getLoadBalancerListenerTenantID() != null) {
- listenerBuilder.setTenantId(toUuid(listener.getLoadBalancerListenerTenantID()));
+ if (listener.getTenantID() != null) {
+ listenerBuilder.setTenantId(toUuid(listener.getTenantID()));
}
if (listener.getID() != null) {
listenerBuilder.setUuid(toUuid(listener.getID()));
answer.setNeutronLoadBalancerListenerProtocolPort(String.valueOf(listener.getProtocolPort()));
}
if (listener.getTenantId() != null) {
- answer.setLoadBalancerListenerTenantID(listener.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(listener.getTenantId().getValue().replace("-",""));
}
if (listener.getUuid() != null) {
answer.setID(listener.getUuid().getValue());
sessionPersistenceBuilder.setType(sessionPersistence.getType());
poolBuilder.setSessionPersistence(sessionPersistenceBuilder.build());
}
- if (pool.getLoadBalancerPoolTenantID() != null) {
- poolBuilder.setTenantId(toUuid(pool.getLoadBalancerPoolTenantID()));
+ if (pool.getTenantID() != null) {
+ poolBuilder.setTenantId(toUuid(pool.getTenantID()));
}
if (pool.getID() != null) {
poolBuilder.setUuid(toUuid(pool.getID()));
answer.setLoadBalancerSessionPersistence(sessionPersistence);
}
if (pool.getTenantId() != null) {
- answer.setLoadBalancerPoolTenantID(pool.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(pool.getTenantId().getValue().replace("-",""));
}
if (pool.getUuid() != null) {
answer.setID(pool.getUuid().getValue());
answer.setPoolMemberSubnetID(member.getSubnetId().getValue());
}
if (member.getTenantId() != null) {
- answer.setPoolMemberTenantID(member.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(member.getTenantId().getValue().replace("-",""));
}
if (member.getWeight() != null) {
answer.setPoolMemberWeight(member.getWeight());
if (member.getPoolMemberSubnetID() != null) {
memberBuilder.setSubnetId(toUuid(member.getPoolMemberSubnetID()));
}
- if (member.getPoolMemberTenantID() != null) {
- memberBuilder.setTenantId(toUuid(member.getPoolMemberTenantID()));
+ if (member.getTenantID() != null) {
+ memberBuilder.setTenantId(toUuid(member.getTenantID()));
}
if (member.getPoolMemberWeight() != null) {
memberBuilder.setWeight(member.getPoolMemberWeight());
if (meteringLabel.getMeteringLabelDescription()!=null) {
meteringLabelBuilder.setDescription(meteringLabel.getMeteringLabelDescription());
}
- if (meteringLabel.getMeteringLabelTenantID()!=null) {
- meteringLabelBuilder.setTenantId(toUuid(meteringLabel.getMeteringLabelTenantID()));
+ if (meteringLabel.getTenantID()!=null) {
+ meteringLabelBuilder.setTenantId(toUuid(meteringLabel.getTenantID()));
}
if (meteringLabel.getID()!=null) {
meteringLabelBuilder.setUuid(toUuid(meteringLabel.getID()));
}
//todo: remove '-' chars as tenant id doesn't use them
if (label.getTenantId() != null) {
- answer.setMeteringLabelTenantID(label.getTenantId().getValue());
+ answer.setTenantID(label.getTenantId().getValue());
}
if (label.getUuid() != null) {
answer.setID(label.getUuid().getValue());
if (network.getTenantID() != null) {
networkBuilder.setTenantId(toUuid(network.getTenantID()));
}
- if (network.getNetworkUUID() != null) {
- networkBuilder.setUuid(toUuid(network.getNetworkUUID()));
+ if (network.getID() != null) {
+ networkBuilder.setUuid(toUuid(network.getID()));
} else {
LOGGER.warn("Attempting to write neutron network without UUID");
}
if (port.getTenantId() != null) {
result.setTenantID(String.valueOf(port.getTenantId().getValue()).replace("-", ""));
}
- result.setPortUUID(String.valueOf(port.getUuid().getValue()));
+ result.setID(String.valueOf(port.getUuid().getValue()));
addExtensions(port, result);
return result;
}
if (neutronPort.getTenantID() != null && neutronPort.getTenantID() != "") {
portBuilder.setTenantId(toUuid(neutronPort.getTenantID()));
}
- if (neutronPort.getPortUUID() != null) {
- portBuilder.setUuid(toUuid(neutronPort.getPortUUID()));
+ if (neutronPort.getID() != null) {
+ portBuilder.setUuid(toUuid(neutronPort.getID()));
} else {
LOGGER.warn("Attempting to write neutron port without UUID");
}
RouterBuilder routerBuilder = new RouterBuilder();
- if (router.getRouterUUID() != null) {
- routerBuilder.setUuid(toUuid(router.getRouterUUID()));
+ if (router.getID() != null) {
+ routerBuilder.setUuid(toUuid(router.getID()));
}
if (router.getName() != null) {
routerBuilder.setName(router.getName());
answer.setSecurityGroupDescription(group.getDescription());
}
if (group.getTenantId() != null) {
- answer.setSecurityGroupTenantID(group.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(group.getTenantId().getValue().replace("-",""));
}
if (group.getSecurityRules() != null) {
NeutronCRUDInterfaces interfaces = new NeutronCRUDInterfaces()
if (securityGroup.getSecurityGroupDescription() != null) {
securityGroupBuilder.setDescription(securityGroup.getSecurityGroupDescription());
}
- if (securityGroup.getSecurityGroupTenantID() != null) {
- securityGroupBuilder.setTenantId(toUuid(securityGroup.getSecurityGroupTenantID()));
+ if (securityGroup.getTenantID() != null) {
+ securityGroupBuilder.setTenantId(toUuid(securityGroup.getTenantID()));
}
if (securityGroup.getSecurityRules() != null) {
List<Uuid> neutronSecurityRule = new ArrayList<Uuid>();
protected NeutronSecurityRule fromMd(SecurityRule rule) {
NeutronSecurityRule answer = new NeutronSecurityRule();
if (rule.getTenantId() != null) {
- answer.setSecurityRuleTenantID(rule.getTenantId().getValue().replace("-",""));
+ answer.setTenantID(rule.getTenantId().getValue().replace("-",""));
}
if (rule.getDirection() != null) {
answer.setSecurityRuleDirection(DIRECTION_MAP.get(rule.getDirection()));
protected SecurityRule toMd(NeutronSecurityRule securityRule) {
SecurityRuleBuilder securityRuleBuilder = new SecurityRuleBuilder();
- if (securityRule.getSecurityRuleTenantID() != null) {
- securityRuleBuilder.setTenantId(toUuid(securityRule.getSecurityRuleTenantID()));
+ if (securityRule.getTenantID() != null) {
+ securityRuleBuilder.setTenantId(toUuid(securityRule.getTenantID()));
}
if (securityRule.getSecurityRuleDirection() != null) {
ImmutableBiMap<String, Class<? extends DirectionBase>> mapper =
Code Review / neutron.git / commitdiff