make tenantID in NeutronObject a private field and use through getter()

just... to be sure - re. the NEUTRON-159 mess.

JIRA: NEUTRON-159
Change-Id: I763016a1d535e9778d4497389f190be7227e690c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
index 1684d5b0603e499ba03cc89e33620f14c15a0522..7828d9724b8973775e9f234ef5eb075337d20004 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronBgpvpn.java
@@ -244,7 +244,7 @@ public final class NeutronBgpvpn extends NeutronAdminAttributes<NeutronBgpvpn> {
     @Override
     public String toString() {
         return "NeutronBgpvpn [bgpvpnUUID=" + uuid + ", bgpvpnName=" + name + ", adminStateUp=" + adminStateUp
-                + ", status=" + status + ", tenantID=" + tenantID + ", type=" + type + ", technique=" + technique
+                + ", status=" + status + ", tenantID=" + getTenantID() + ", type=" + type + ", technique=" + technique
                 + ", routeTargets=" + routeTargets + ", importTargets=" + importTargets + ", exportTargets="
                 + exportTargets + ", routeDistinguishers=" + routeDistinguishers + ", vnid = " + vnid
                 + ", autoAggregate = " + autoAggregate + ", networks = " + networks + ", routers = " + routers + "]";

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
index 659293d5d623820fa3fafa7423a1452766327fde..b00e67b28c13b5fc46f264deb375a32520b28ea5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewall.java
@@ -88,7 +88,7 @@ public final class NeutronFirewall extends NeutronBaseAttributes<NeutronFirewall
 
     @Override
     public String toString() {
-        return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + tenantID + '\''
+        return "NeutronFirewall{" + "firewallUUID='" + uuid + '\'' + ", firewallTenantID='" + getTenantID() + '\''
                 + ", firewallName='" + name + '\'' + ", firewallAdminStateIsUp=" + firewallAdminStateIsUp
                 + ", firewallIsShared=" + firewallIsShared + ", firewallRulePolicyID=" + firewallPolicyID + '}';
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
index ff44a5a8329cdb23ea1bea56ae89b361fc633a63..c9d7d2bcffd32eee20ce2da1176ff140d951811c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallPolicy.java
@@ -5,7 +5,6 @@
  * 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.annotation.XmlAccessType;
@@ -28,7 +27,6 @@ import javax.xml.bind.annotation.XmlRootElement;
  * http://docs.openstack.org/api/openstack-network/2.0/openstack-network.pdf
  *
  */
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public final class NeutronFirewallPolicy extends NeutronBaseAttributes<NeutronFirewallPolicy> {
@@ -73,8 +71,8 @@ public final class NeutronFirewallPolicy extends NeutronBaseAttributes<NeutronFi
 
     @Override
     public String toString() {
-        return "NeutronFirewallPolicy{" + "firewallPolicyUUID='" + uuid + '\'' + ", firewallPolicyTenantID='" + tenantID
-                + '\'' + ", firewallPolicyName='" + name + '\'' + ", firewallPolicyIsShared="
+        return "NeutronFirewallPolicy{" + "firewallPolicyUUID='" + uuid + '\'' + ", firewallPolicyTenantID='"
+                + getTenantID() + '\'' + ", firewallPolicyName='" + name + '\'' + ", firewallPolicyIsShared="
                 + firewallPolicyIsShared + ", firewallPolicyIsAudited='" + firewallPolicyIsAudited + '\'' + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
index 6bcd09faa126de7b94c793c3726403c78abec761..6bc7e5f6a5d0aa97fbde0730b0a2f57bfcf599db 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFirewallRule.java
@@ -236,7 +236,7 @@ public final class NeutronFirewallRule extends NeutronBaseAttributes<NeutronFire
 
     @Override
     public String toString() {
-        return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + tenantID
+        return "firewallPolicyRules{" + "firewallRuleUUID='" + uuid + '\'' + ", firewallRuleTenantID='" + getTenantID()
                 + '\'' + ", firewallRuleName='" + name + '\'' + ", firewallRuleIsShared="
                 + firewallRuleIsShared + ", firewallRulePolicyID=" + firewallRulePolicyID + ", firewallRuleProtocol='"
                 + firewallRuleProtocol + '\'' + ", firewallRuleIpVer=" + firewallRuleIpVer + ", firewallRuleSrcIpAddr='"

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIp.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIp.java
index 73bf637a9015f4a8efc878430da82f3ec18a2025..8dd36a344ae7a02d79e6cf680cc57115a228067f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIp.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronFloatingIp.java
@@ -121,7 +121,7 @@ public final class NeutronFloatingIp extends NeutronObject<NeutronFloatingIp> {
     public String toString() {
         return "NeutronFloatingIp{" + "fipUUID='" + uuid + '\'' + ", fipFloatingNetworkId='" + floatingNetworkUUID
                 + '\'' + ", fipPortUUID='" + portUUID + '\'' + ", fipFixedIpAddress='" + fixedIpAddress + '\''
-                + ", fipFloatingIpAddress=" + floatingIpAddress + ", fipTenantId='" + tenantID + '\''
+                + ", fipFloatingIpAddress=" + floatingIpAddress + ", fipTenantId='" + getTenantID() + '\''
                 + ", fipRouterId='" + routerUUID + '\'' + ", fipStatus='" + status + '\'' + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
index 28c68d3e0f309b16aaa4f4735c0e3a4663f10f01..9223cf762341492ed8bf94b1ca2f8cf9120ea8ed 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gateway.java
@@ -44,7 +44,7 @@ public final class NeutronL2gateway extends NeutronBaseAttributes<NeutronL2gatew
 
     @Override
     public String toString() {
-        return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + name + ", tenant_id = " + tenantID
+        return "NeutronL2Gateway [" + "id = " + uuid + ", name = " + name + ", tenant_id = " + getTenantID()
                 + ", devices = " + l2gatewayDevices + "]";
     }
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
index e7befef39c37f14e267119a84120bef9eff8e90d..c7eebbccaad2698ff526c2bed06d2f1670c10d6e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronL2gatewayConnection.java
@@ -93,7 +93,7 @@ public final class NeutronL2gatewayConnection extends NeutronBaseAttributes<Neut
 
     @Override
     public String toString() {
-        return "NeutronL2GatewayConnection [" + "tenant_id = " + tenantID + ", connection_id = " + uuid
+        return "NeutronL2GatewayConnection [" + "tenant_id = " + getTenantID() + ", connection_id = " + uuid
                 + ", gateway_id = " + l2gatewayID + ", network_id = " + networkID + ", segmentation_id = " + segmentID
                 + ", port_id = " + portID + "]";
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
index 2436956ae3c4ad4a856d9a662f1d71ef119c9789..2ee9b44df808d2cb49115d6a437bf846cc01a423 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancer.java
@@ -5,7 +5,6 @@
  * 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.annotation.XmlAccessType;
@@ -28,7 +27,6 @@ import javax.xml.bind.annotation.XmlRootElement;
  * vip_subnet         uuid-str
  * http://docs.openstack.org/api/openstack-network/2.0/openstack-network.pdf
  */
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public final class NeutronLoadBalancer extends NeutronAdminAttributes<NeutronLoadBalancer> {
@@ -73,9 +71,9 @@ public final class NeutronLoadBalancer extends NeutronAdminAttributes<NeutronLoa
 
     @Override
     public String toString() {
-        return "NeutronLoadBalancer{" + "loadBalancerID='" + uuid + '\'' + ", loadBalancerTenantID='" + tenantID + '\''
-                + ", loadBalancerName='" + name + '\'' + ", loadBalancerStatus='" + status
-                + '\'' + ", loadBalancerAdminStateUp='" + adminStateUp + '\'' + ", loadBalancerVipAddress='"
+        return "NeutronLoadBalancer{" + "loadBalancerID='" + uuid + '\'' + ", loadBalancerTenantID='" + getTenantID()
+                + '\'' + ", loadBalancerName='" + name + '\'' + ", loadBalancerStatus='" + status + '\''
+                + ", loadBalancerAdminStateUp='" + adminStateUp + '\'' + ", loadBalancerVipAddress='"
                 + loadBalancerVipAddress + '\'' + ", loadBalancerVipSubnetID='" + loadBalancerVipSubnetID + '\'' + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
index 325f0c6b843ba377962ae7d0413f029100788be7..434d7fbd37cf5900c76b6d0a7ca1b3ab0520e27b 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerHealthMonitor.java
@@ -175,7 +175,7 @@ public final class NeutronLoadBalancerHealthMonitor extends NeutronObject<Neutro
     @Override
     public String toString() {
         return "NeutronLoadBalancerHealthMonitor{" + "loadBalancerHealthMonitorID='" + uuid + '\''
-                + ", loadBalancerHealthMonitorTenantID='" + tenantID + '\'' + ", loadBalancerHealthMonitorType='"
+                + ", loadBalancerHealthMonitorTenantID='" + getTenantID() + '\'' + ", loadBalancerHealthMonitorType='"
                 + loadBalancerHealthMonitorType + '\'' + ", loadBalancerHealthMonitorDelay="
                 + loadBalancerHealthMonitorDelay + ", loadBalancerHealthMonitorTimeout="
                 + loadBalancerHealthMonitorTimeout + ", loadBalancerHealthMonitorMaxRetries="

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
index bd1bf5d47f67dbe238a96b72e981b48dc733afa1..12946d43304252f2589997d579810bb07a5e4303 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListener.java
@@ -133,7 +133,7 @@ public final class NeutronLoadBalancerListener extends NeutronBaseAttributes<Neu
         return "NeutronLoadBalancerListener{" + "loadBalancerListenerID='" + uuid + '\''
                 + ", loadBalancerListenerDefaultPoolID='" + loadBalancerListenerDefaultPoolID + '\''
                 + ", loadBalancerListenerConnectionLimit='" + loadBalancerListenerConnectionLimit + '\''
-                + ", loadBalancerListenerTenantID='" + tenantID + '\''
+                + ", loadBalancerListenerTenantID='" + getTenantID() + '\''
                 + ", loadBalancerListenerName='" + name + '\''
                 + ", loadBalancerListenerAdminStateIsUp=" + loadBalancerListenerAdminStateIsUp + '\''
                 + ", loadBalancerListenerProtocol='" + loadBalancerListenerProtocol + '\''

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
index bcfdeda2975a3b03aff3cbfc7edf3462cb8aa595..1d4f0b89329f2c3988156a77a6d5c6db7d6ae8a6 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPool.java
@@ -173,7 +173,7 @@ public final class NeutronLoadBalancerPool extends NeutronBaseAttributes<Neutron
 
     @Override
     public String toString() {
-        return "NeutronLoadBalancerPool{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
+        return "NeutronLoadBalancerPool{" + "id='" + uuid + '\'' + ", tenantID='" + getTenantID() + '\'' + ", name='"
                 + name + '\'' + ", protocol=" + loadBalancerPoolProtocol + '\'' + ", lbAlgorithm='"
                 + loadBalancerPoolLbAlgorithm + '\'' + ", healthmonitorID=" + loadBalancerPoolHealthMonitorID
                 + ", adminStateUp=" + loadBalancerPoolAdminStateIsUp + '}';

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
index 38915c0c6bba599a10fc00a8acb5f6a7b59927b8..8a9b7927c50d03a37a2116fc6196dfb65b06df69 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolMember.java
@@ -121,7 +121,7 @@ public final class NeutronLoadBalancerPoolMember extends NeutronObject<NeutronLo
     @Override
     public String toString() {
         return "NeutronLoadBalancerPoolMember{" + "poolMemberID='" + uuid + '\'' + ", poolID='" + poolID + '\''
-                + ", poolMemberTenantID='" + tenantID + '\'' + ", poolMemberAddress='" + poolMemberAddress + '\''
+                + ", poolMemberTenantID='" + getTenantID() + '\'' + ", poolMemberAddress='" + poolMemberAddress + '\''
                 + ", poolMemberProtoPort=" + poolMemberProtoPort + ", poolMemberAdminStateIsUp="
                 + poolMemberAdminStateIsUp + ", poolMemberWeight=" + poolMemberWeight + ", poolMemberSubnetID='"
                 + poolMemberSubnetID + '\'' + '}';

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
index 36c7ce4814fabafb6c1aa85dfea4857c98f3975e..f9b270e32b225a3ed9f7b68d0fcd8f67b495d6c9 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabel.java
@@ -41,7 +41,7 @@ public final class NeutronMeteringLabel extends NeutronBaseAttributes<NeutronMet
 
     @Override
     public String toString() {
-        return "NeutronMeteringLabel [id=" + uuid + ", name=" + name + ", tenant_id=" + tenantID
+        return "NeutronMeteringLabel [id=" + uuid + ", name=" + name + ", tenant_id=" + getTenantID()
                 + ", shared=" + shared + "]";
     }
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
index 2acbf768ca8c2236b6542587bbc1e0b585fc1c7d..6751f097f8c81a7970ed60482d740caf24801b22 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronMeteringLabelRule.java
@@ -74,7 +74,7 @@ public final class NeutronMeteringLabelRule extends NeutronObject<NeutronMeterin
 
     @Override
     public String toString() {
-        return "NeutronMeteringLabelRule [id=" + uuid + ", tenantID=" + tenantID + ", direction="
+        return "NeutronMeteringLabelRule [id=" + uuid + ", tenantID=" + getTenantID() + ", direction="
                 + meteringLabelRuleDirection + ", excluded=" + meteringLabelRuleExcluded + ", remote_ip_prefix="
                 + meteringLabelRuleRemoteIpPrefix + ", metering_label_id=" + meteringLabelRuleLabelID + "]";
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
index 40acdb669f8461ed8a4b2299528f0ba198bd281d..9ef372542986902b2dd384fd68124373c5becf45 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronNetwork.java
@@ -199,7 +199,7 @@ public final class NeutronNetwork extends NeutronAdminAttributes<NeutronNetwork>
     @Override
     public String toString() {
         return "NeutronNetwork [networkUUID=" + uuid + ", networkName=" + name + ", adminStateUp=" + adminStateUp
-                + ", shared=" + shared + ", vlanTransparent=" + vlanTransparent + ", tenantID=" + tenantID
+                + ", shared=" + shared + ", vlanTransparent=" + vlanTransparent + ", tenantID=" + getTenantID()
                 + ", routerExternal=" + routerExternal + ", providerNetworkType=" + providerNetworkType
                 + ", providerPhysicalNetwork=" + providerPhysicalNetwork + ", providerSegmentationID="
                 + providerSegmentationID + ", status=" + status + ", qosPolicyId =" + qosPolicyId

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
index b0caf4ae78574d53e6d2ad7bdf5ab42fac54c4c1..c547954659af52ea660faff975821d5727b3d560 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronObject.java
@@ -32,7 +32,7 @@ public abstract class NeutronObject<T extends NeutronObject<T>> extends NeutronI
 
     private static final long serialVersionUID = 1L;
 
-    String tenantID;
+    private String tenantID;
 
     @XmlElement(name = "project_id")
     String projectID;
@@ -65,7 +65,7 @@ public abstract class NeutronObject<T extends NeutronObject<T>> extends NeutronI
 
     @Override
     public String toString() {
-        return "NeutronObject [id=" + uuid + ", tenantID=" + tenantID + "]";
+        return "NeutronObject [id=" + uuid + ", tenantID=" + getTenantID() + "]";
     }
 
     @Override
@@ -90,11 +90,11 @@ public abstract class NeutronObject<T extends NeutronObject<T>> extends NeutronI
 
     @Override
     public void initDefaults() {
-        if (projectID != null && tenantID == null) {
-            tenantID = projectID;
+        if (projectID != null && getTenantID() == null) {
+            setTenantID(projectID);
         }
-        if (projectID == null && tenantID != null) {
-            projectID = tenantID;
+        if (projectID == null && getTenantID() != null) {
+            projectID = getTenantID();
         }
     }
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
index 4de5dffd0f7dde90a805b41550861264d23f905b..8c0bbd809243fe011ebead01e2b700ee625a7735 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronPort.java
@@ -274,7 +274,7 @@ public final class NeutronPort extends NeutronAdminAttributes<NeutronPort> {
     public String toString() {
         return "NeutronPort [portUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name + ", adminStateUp="
                 + adminStateUp + ", status=" + status + ", macAddress=" + macAddress + ", fixedIps=" + fixedIps
-                + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID=" + tenantID
+                + ", deviceID=" + deviceID + ", deviceOwner=" + deviceOwner + ", tenantID=" + getTenantID()
                 + ", securityGroups=" + securityGroups + ", allowedAddressPairs" + allowedAddressPairs
                 + ", bindinghostID=" + bindinghostID + ", bindingvnicType=" + bindingvnicType + ", bindingvifType="
                 + bindingvifType + ", vifDetails=" + vifDetails + ", bindingProfile=" + bindingProfile

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
index 86ee5b6df0f4439418bc444e65a9f96495437a54..8cd423cced7c56ef81a5a0ab9f9c6e34db28ab23 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosBandwidthLimitRule.java
@@ -73,7 +73,7 @@ public final class NeutronQosBandwidthLimitRule extends NeutronObject<NeutronQos
     @Override
     public String toString() {
         return "qosBandwidthLimitRules{" + "qosBandwidthLimitRuleUUID='" + uuid + '\''
-            + ", qosBandwidthLimitRuleTenantID='" + tenantID + '\'' + ", qosBandwidthLimitRuleMaxValue='" + maxKbps
+            + ", qosBandwidthLimitRuleTenantID='" + getTenantID() + '\'' + ", qosBandwidthLimitRuleMaxValue='" + maxKbps
             + '\'' + ", qosBandwidthLimitRuleMaxBurst='" + maxBurstKbps
             + '\'' + ", qosBandwidthLimitRuleDirection='" + direction
             + '\''

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
index 6e69e579abf4f4ce8a72a5445f6ace2b25c6bf04..97d6fe33e3ed3b4ea9177f33844acbc363584730 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosDscpMarkingRule.java
@@ -44,7 +44,7 @@ public final class NeutronQosDscpMarkingRule extends NeutronObject<NeutronQosDsc
     @Override
     public String toString() {
         return "qosDscpMarkingRules{" + "qosDscpMarkingRuleUUID='" + uuid + '\'' + ", qosDscpMarkingRuleTenantID='"
-            + tenantID + '\'' + ", qosDscpMarkingRuleDscpMark='" + dscpMark
+            + getTenantID() + '\'' + ", qosDscpMarkingRuleDscpMark='" + dscpMark
             + '\''
             + '}';
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosMinimumBandwidthRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosMinimumBandwidthRule.java
index 6c056c0df933fd65078dac20c772a04dd0fb976a..7ba84b9d90af897b48a70615008153e1fbb6a44c 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosMinimumBandwidthRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosMinimumBandwidthRule.java
@@ -59,7 +59,7 @@ public final class NeutronQosMinimumBandwidthRule extends NeutronObject<NeutronQ
     @Override
     public String toString() {
         return "qosMinimumBandwidthRules{" + "qosMinimumBandwidthRuleUUID='" + uuid + '\'' + ","
-                + " qosMinimumBandwidthRuleTenantID='" + tenantID
+                + " qosMinimumBandwidthRuleTenantID='" + getTenantID()
                 + '\'' + ", qosMinimumBandwidthMinValue='" + minKbps
                 + '\'' + ", qosMinimumBandwidthDirection='" + direction + '\''
                 + '}';

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
index b17181ae2b5bda7d1f4d281d1a0f9f74147d73f2..f728a707200864f756dc61b33769af48b620cf53 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronQosPolicy.java
@@ -93,7 +93,7 @@ public final class NeutronQosPolicy extends NeutronBaseAttributes<NeutronQosPoli
 
     @Override
     public String toString() {
-        return "NeutronQosPolicy{" + "qosPolicyUUID='" + uuid + '\'' + ", qosPolicyTenantID='" + tenantID + '\''
+        return "NeutronQosPolicy{" + "qosPolicyUUID='" + uuid + '\'' + ", qosPolicyTenantID='" + getTenantID() + '\''
                 + ", qosPolicyName='" + name + '\'' + ", qosPolicyIsShared='" + shared + '\''
                 + ", qosbandwidthLimitRules='" + bandwidthLimitRules + '\'' + ", qosDscpMarkingRules='"
                 + dscpMarkingRules + '\'' + ", qosMinimumBandwidthRules='" + minimumBandwidthRules + '\''

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
index cf49da79e51beef93b165f93bd207918114d9188..1fa408c49eae0b360feb9339e8191d54e634c57f 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouter.java
@@ -92,7 +92,7 @@ public final class NeutronRouter extends NeutronAdminAttributes<NeutronRouter> {
     @Override
     public String toString() {
         return "NeutronRouter [" + "id=" + uuid + ", name=" + name + ", adminStateUp=" + adminStateUp + ", status="
-                + status + ", tenantID=" + tenantID + ", external_gateway_info=" + externalGatewayInfo
+                + status + ", tenantID=" + getTenantID() + ", external_gateway_info=" + externalGatewayInfo
                 + ", distributed=" + distributed + ", gw_port_id=" + gatewayPortId + ", routes=" + routes + "]";
     }
 

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java
index 2961bc996f614114906fd0c1947353e00ee8d01f..723d70ae693bb54bd6899e2e3073e1d14e2f5f44 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronRouterInterface.java
@@ -69,6 +69,6 @@ public final class NeutronRouterInterface extends NeutronObject<NeutronRouterInt
     @Override
     public String toString() {
         return "NeutronRouterInterface [" + "subnetUUID=" + subnetUUID + ", portUUID=" + portUUID + ", id=" + uuid
-                + ", tenantID=" + tenantID + "]";
+                + ", tenantID=" + getTenantID() + "]";
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
index 9caa8e16c618011b62df023c24a780ff37907922..3f1f2ccc25b415e249b50b9e7d1df6302b9186d9 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortChain.java
@@ -80,7 +80,7 @@ public final class NeutronSFCPortChain extends NeutronBaseAttributes<NeutronSFCP
 
     @Override
     public String toString() {
-        return "NeutronSFCPortChain[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\''
+        return "NeutronSFCPortChain[" + "tenantID='" + getTenantID() + '\'' + ", name='" + name + '\''
                 + ", portPairGroupsUUID=" + portPairGroupsUUID + ", flowClassifiersUUID='" + flowClassifiersUUID + '\''
                 + ", chainParameters=" + chainParameters + ']';
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
index faeb9c5c8566a2923789f40a28fbc5b8eefb0488..54bf589821db088b6d1001199db8c83e3c8c81ca 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPair.java
@@ -79,8 +79,8 @@ public final class NeutronSFCPortPair extends NeutronBaseAttributes<NeutronSFCPo
 
     @Override
     public String toString() {
-        return "NeutronSFCPortPair[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\'' + ", ingressPortUUID='"
-                + ingressPortUUID + '\'' + ", egressPortUUID='" + egressPortUUID + '\'' + ", serviceFunctionParameters="
-                + serviceFunctionParameters + ']';
+        return "NeutronSFCPortPair[" + "tenantID='" + getTenantID() + '\'' + ", name='" + name + '\''
+                + ", ingressPortUUID='" + ingressPortUUID + '\'' + ", egressPortUUID='" + egressPortUUID + '\''
+                + ", serviceFunctionParameters=" + serviceFunctionParameters + ']';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
index 319b82f25b8f00626a0c14293bfc1750de296cc9..2d70305a7c0c18ea21c0190a58d80e268d372c07 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroup.java
@@ -49,7 +49,7 @@ public final class NeutronSFCPortPairGroup extends NeutronBaseAttributes<Neutron
 
     @Override
     public String toString() {
-        return "NeutronSFCPortPairGroup[" + "tenantID='" + tenantID + '\'' + ", name='" + name + '\'' + ", portPairs="
-                + portPairs + ']';
+        return "NeutronSFCPortPairGroup[" + "tenantID='" + getTenantID() + '\'' + ", name='" + name + '\''
+                + ", portPairs=" + portPairs + ']';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
index 591e8927409c1369ab37e114c4efed53e2f554fc..89a395502bfd4c5a893389f78fc42e258e7df7bf 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityGroup.java
@@ -34,6 +34,6 @@ public final class NeutronSecurityGroup extends NeutronBaseAttributes<NeutronSec
     @Override
     public String toString() {
         return "NeutronSecurityGroup{" + "securityGroupUUID='" + uuid + '\'' + ", securityGroupName='"
-                + name + '\'' + ", securityGroupTenantID='" + tenantID + '\'' + "]";
+                + name + '\'' + ", securityGroupTenantID='" + getTenantID() + '\'' + "]";
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
index 20de13342e4e51e37de9b9a78f648c0640d0dd81..fa3cb71d3532515d4af56cbd58084a53878b77d5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSecurityRule.java
@@ -5,7 +5,6 @@
  * 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.annotation.XmlAccessType;
@@ -29,7 +28,6 @@ import javax.xml.bind.annotation.XmlRootElement;
  * remote_group_id   uuid-str Source security group to apply to rule.
  * tenant_id         uuid-str Owner of security rule. Admin only outside tenant.
  */
-
 @XmlRootElement
 @XmlAccessorType(XmlAccessType.NONE)
 public final class NeutronSecurityRule extends NeutronObject<NeutronSecurityRule> {
@@ -166,7 +164,7 @@ public final class NeutronSecurityRule extends NeutronObject<NeutronSecurityRule
                 + ", securityRulePortMin=" + securityRulePortMin + ", securityRulePortMax=" + securityRulePortMax
                 + ", securityRuleEthertype='" + securityRuleEthertype + '\'' + ", securityRuleRemoteIpPrefix='"
                 + securityRuleRemoteIpPrefix + '\'' + ", securityRemoteGroupID=" + securityRemoteGroupID
-                + ", securityRuleGroupID='" + securityRuleGroupID + '\'' + ", securityRuleTenantID='" + tenantID + '\''
-                + '}';
+                + ", securityRuleGroupID='" + securityRuleGroupID + '\'' + ", securityRuleTenantID='" + getTenantID()
+                + '\'' + '}';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
index 54ddf3e879e441aff74dbb4cee2227fb7d694e8c..804caa9441ba2ae606296484977945e89aa6d51e 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronSubnet.java
@@ -377,7 +377,7 @@ public final class NeutronSubnet extends NeutronBaseAttributes<NeutronSubnet> {
         return "NeutronSubnet [subnetUUID=" + uuid + ", networkUUID=" + networkUUID + ", name=" + name + ", ipVersion="
                 + ipVersion + ", cidr=" + cidr + ", gatewayIp=" + gatewayIp + ", dnsNameservers=" + dnsNameservers
                 + ", allocationPools=" + allocationPools + ", hostRoutes=" + hostRoutes + ", enableDHCP=" + enableDHCP
-                + ", tenantID=" + tenantID + ", ipv6AddressMode=" + ipV6AddressMode + ", ipv6RaMode=" + ipV6RaMode
+                + ", tenantID=" + getTenantID() + ", ipv6AddressMode=" + ipV6AddressMode + ", ipv6RaMode=" + ipV6RaMode
                 + "]";
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapFlow.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapFlow.java
index 8cf9796b3a67739dfb707365b408a3c95f1f2a2b..55df1e4aca7181a9f1cfd4a79f942d8cc30867b1 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapFlow.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapFlow.java
@@ -71,7 +71,7 @@ public final class NeutronTapFlow extends NeutronBaseAttributes<NeutronTapFlow>
 
     @Override
     public String toString() {
-        return "NeutronTapFlow[" + "tapFlowUUID='" + uuid + '\'' + ", tapFlowTenantID='" + tenantID + '\''
+        return "NeutronTapFlow[" + "tapFlowUUID='" + uuid + '\'' + ", tapFlowTenantID='" + getTenantID() + '\''
                 + ", tapFlowName='" + name + '\'' + ", tapFlowServiceID='" + tapServiceID + '\''
                 + ", tapFlowSourcePort='" + tapFlowSourcePort + '\''
                 + ", tapFlowDirection='" + tapFlowDirection + '\'' + ']';

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapService.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapService.java
index f4b45e4d59db6da232926fa98f002e7122808e86..aa9ce6b4698fe6fa13e5c592bb6538c8a2ba2380 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapService.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTapService.java
@@ -44,7 +44,7 @@ public final class NeutronTapService extends NeutronBaseAttributes<NeutronTapSer
     @Override
     public String toString() {
         return "NeutronTapService[" + "tapServiceUUID='" + uuid + '\'' + ", tapServiceTenantID='"
-                + tenantID + '\'' + ", tapServiceName='" + name + '\'' + ", tapServicePortID='"
+                + getTenantID() + '\'' + ", tapServiceName='" + name + '\'' + ", tapServicePortID='"
                 + tapServicePortID + '\'' + ']';
     }
 }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTrunk.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTrunk.java
index 832470485e10691623cdaabc661a6cf57efb0339..b9d5ad43ea1b6f32451e188bfdf5b8f047356677 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTrunk.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronTrunk.java
@@ -78,7 +78,7 @@ public final class NeutronTrunk extends NeutronAdminAttributes<NeutronTrunk> {
     @Override
     public String toString() {
         return "NeutronTrunk{" + "trunkUUID='" + uuid + '\'' + ", trunkName='" + name + '\''
-                + ", tenantID='" + tenantID + '\'' + ", adminStateUp='" + adminStateUp + '\''
+                + ", tenantID='" + getTenantID() + '\'' + ", adminStateUp='" + adminStateUp + '\''
                 + ", status='" + status + '\'' + ", portId='" + portId + '\''
                 + ", subPorts='" + subPorts + '\'' + '}';
     }

diff --git a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnection.java b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnection.java
index ff685769cd21be6377fc13d05d004af95cff5d1d..fef0955ae3949c07c95cee0732a82742333481d5 100644 (file)
--- a/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnection.java
+++ b/neutron-spi/src/main/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnection.java
@@ -5,7 +5,6 @@
  * 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.util.List;
@@ -198,11 +197,11 @@ public final class NeutronVpnIpSecSiteConnection extends NeutronAdminAttributes<
 
     @Override
     public String toString() {
-        return "NeutronVpnIpSecSiteConnection{" + "id='" + uuid + '\'' + ", tenantID='" + tenantID + '\'' + ", name='"
-                + name + '\'' + ", peerAddress=" + peerAddress + ", peerID='" + peerID + '\'' + ", routeMode='"
-                + routeMode + '\'' + ", mtu=" + mtu + ", authMode='" + authMode + '\'' + ", preSharedKey='"
-                + preSharedKey + '\'' + ", initiator='" + initiator + '\'' + ", adminStateUp=" + adminStateUp
-                + ", status='" + status + '\'' + ", ikePolicyID='" + ikePolicyID + '\'' + ", ipsecPolicyID='"
-                + ipsecPolicyID + '\'' + ", vpnServiceID='" + vpnServiceID + '\'' + '}';
+        return "NeutronVpnIpSecSiteConnection{" + "id='" + uuid + '\'' + ", tenantID='" + getTenantID() + '\''
+                + ", name='" + name + '\'' + ", peerAddress=" + peerAddress + ", peerID='" + peerID + '\''
+                + ", routeMode='" + routeMode + '\'' + ", mtu=" + mtu + ", authMode='" + authMode + '\''
+                + ", preSharedKey='" + preSharedKey + '\'' + ", initiator='" + initiator + '\'' + ", adminStateUp="
+                + adminStateUp + ", status='" + status + '\'' + ", ikePolicyID='" + ikePolicyID + '\''
+                + ", ipsecPolicyID='" + ipsecPolicyID + '\'' + ", vpnServiceID='" + vpnServiceID + '\'' + '}';
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
index b6eb2644b98fca197445beb1174ba8eead9aba73..429b1c489132fb08634e51f65490b4f524dced17 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronQosJAXBTest.java
@@ -53,7 +53,7 @@ public class NeutronQosJAXBTest {
                 "d6220bbb-35f3-48ab-8eae-69c60aef3547", bandwidthLimitPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.2 : Testing Tenant ID failed",
-                "aa902936679e4ea29bfe1158e3450a14", bandwidthLimitPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", bandwidthLimitPolicyRules.get(0).getTenantID());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 5.3 : Testing Max ingress/Egress value failed",
                 new BigInteger("25"), bandwidthLimitPolicyRules.get(0).maxKbps);
@@ -70,7 +70,7 @@ public class NeutronQosJAXBTest {
                 "d6220bbb-35f3-48ab-8eae-69c60aef3547", dscpMarkingPolicyRules.get(0).uuid);
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.2 : Testing Tenant ID failed",
-                "aa902936679e4ea29bfe1158e3450a14", dscpMarkingPolicyRules.get(0).tenantID);
+                "aa902936679e4ea29bfe1158e3450a14", dscpMarkingPolicyRules.get(0).getTenantID());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 6.3 : Testing Max ingress/Egress value failed",
             new Short("8"), dscpMarkingPolicyRules.get(0).dscpMark);
@@ -81,7 +81,7 @@ public class NeutronQosJAXBTest {
             minBandwidthLimitRules.size());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 7.2 : Testing Tenant ID failed",
-            "aa902936679e4ea29bfe1158e3450a14", minBandwidthLimitRules.get(0).tenantID);
+            "aa902936679e4ea29bfe1158e3450a14", minBandwidthLimitRules.get(0).getTenantID());
 
         Assert.assertEquals("NeutronQosPolicy JaxB Test 7.3 : Testing Minimum Bandwidth failed",
             new BigInteger("20"), minBandwidthLimitRules.get(0).minKbps);