move all asserts on tenant_id to last in JAXB tests

This is to confirm the hypothesis that the weird occasional test
failures we see are ALL and ONLY due to some suspected possible
concurrency issue in getTenantID().

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

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
index 768966b50cee7f4b5fc56fd8dcedfb7f415f41c1..e6844ae71a6e4efb57454a4049289aa8e4210268 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFirewallJAXBTest.java
@@ -28,9 +28,6 @@ public class NeutronFirewallJAXBTest {
         Assert.assertEquals("NeutronFirewall JAXB Test 1: Testing id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
 
-        Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed",
-                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
-
         Assert.assertEquals("NeutronFirewall JAXB Test 3: Testing name failed", "jaxb-test",
                 testObject.getName());
 
@@ -41,6 +38,9 @@ public class NeutronFirewallJAXBTest {
 
         Assert.assertEquals("NeutronFirewall JAXB Test 8: Testing firewall_policy_id failed",
                 "83ca694a-eeff-48e5-b2d8-fe5198cf2e86", testObject.getFirewallPolicyID());
+
+        Assert.assertEquals("NeutronFirewall JAXB Test 2: Testing tenant_id failed",
+                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
     }
 
     private static final String NEUTRON_FIREWALL_POLICY_SOURCE_JSON =
@@ -58,9 +58,6 @@ public class NeutronFirewallJAXBTest {
         Assert.assertEquals("NeutronFirewallPolicy JAXB Test 1: Testing id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getID());
 
-        Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed",
-                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
-
         Assert.assertEquals("NeutronFirewallPolicy JAXB Test 3: Testing name failed", "jaxb-test",
                 testObject.getName());
 
@@ -69,6 +66,9 @@ public class NeutronFirewallJAXBTest {
 
         Assert.assertTrue("NeutronFirewallPolicy JAXB Test 6: Testing audited failed",
                 testObject.getFirewallPolicyIsAudited());
+
+        Assert.assertEquals("NeutronFirewallPolicy JAXB Test 2: Testing tenant_id failed",
+                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
     }
 
     private static final String NEUTRON_FIREWALL_RULE_SOURCE_JSON = "{ \"action\": \"allow\", "
@@ -88,9 +88,6 @@ public class NeutronFirewallJAXBTest {
         Assert.assertEquals("NeutronFirewallRule JAXB Test 1: Testing id failed",
                 "8722e0e0-9cc9-4490-9660-8c9a5732fbb0", testObject.getID());
 
-        Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed",
-                "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
-
         Assert.assertEquals("NeutronFirewallRule JAXB Test 3: Testing name failed", "ALLOW_HTTP",
                 testObject.getName());
 
@@ -132,5 +129,8 @@ public class NeutronFirewallJAXBTest {
 
         Assert.assertTrue("NeutronFirewallRule JAXB Test 15: Testing enabled failed",
                 testObject.getFirewallRuleIsEnabled());
+
+        Assert.assertEquals("NeutronFirewallRule JAXB Test 2: Testing tenant_id failed",
+                "45977fa2dbd7482098dd68d0d8970117", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
index 25f055b2695ace93bb037d5dcd56d23d0a1f1f61..f5593c7c627526a2c3e4b4eae452409678c60457 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronFloatingIpJAXBTest.java
@@ -31,9 +31,6 @@ public class NeutronFloatingIpJAXBTest {
         Assert.assertEquals("NeutronFloatingIp JAXB Test 1: Testing id failed",
                 "2f245a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getID());
 
-        Assert.assertEquals("NeutronFloatingIp JAXB Test 2: Testing tenant_id failed",
-                "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
-
         Assert.assertEquals("NeutronFloatingIp JAXB Test 3: Testing router id failed",
                 "d23abc8d-2991-4a55-ba98-2aaea84cc72f", testObject.getRouterUUID());
 
@@ -51,5 +48,8 @@ public class NeutronFloatingIpJAXBTest {
 
         Assert.assertEquals("NeutronFloatingIp JAXB Test 8: Testing status failed", "ACTIVE",
                 testObject.getStatus());
+
+        Assert.assertEquals("NeutronFloatingIp JAXB Test 2: Testing tenant_id failed",
+                "4969c491a3c74ee4af974e6d800c62de", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
index ec6b0071481a0aa115a24d168357d82a8ab06eaf..1cc25a7b7b743a61e86957e9b340441339e5a9ff 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerListenerJAXBTest.java
@@ -59,12 +59,11 @@ public class NeutronLoadBalancerListenerJAXBTest {
         Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 8: Testing status failed", "80",
                 testObject.getNeutronLoadBalancerListenerProtocolPort());
 
-        Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 9: Testing tenant_id failed",
-                "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
-
         Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 10: Testing loadbalancers failed",
                     "a36c20d0-18e9-42ce-88fd-82a35977ee8c",
                     testObject.getNeutronLoadBalancerListenerLoadBalancerIDs().get(0).getID());
 
+        Assert.assertEquals("NeutronLoadBalancerListener JAXB Test 9: Testing tenant_id failed",
+                "11145a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
index 52c3bd85a956070c0a47f0b1842ea5b1115808d9..4f987630e3c83730c90ec5435b695a96ebadf141 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronLoadBalancerPoolJAXBTest.java
@@ -44,9 +44,6 @@ public class NeutronLoadBalancerPoolJAXBTest {
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 6: Testing Protocol failed", "HTTP",
                 testObject.getLoadBalancerPoolProtocol());
 
-        Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 7: Testing Tenant_id failed",
-                "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID());
-
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 8: Testing HealthMonitorID failed",
                 "00066a7b-796b-4f26-9cf9-9e82d248fda7", testObject.getLoadBalancerPoolHealthMonitorID());
 
@@ -66,5 +63,8 @@ public class NeutronLoadBalancerPoolJAXBTest {
 
         Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 12: Testing session_persistence type failed",
                 "APP_COOKIE", testObject.getLoadBalancerPoolSessionPersistence().getType());
+
+        Assert.assertEquals("NeutronLoadBalancerPool JAXB Test 7: Testing Tenant_id failed",
+                "1a3e005cf9ce40308c900bcb08e5320c", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
index c596911bf341055b38a27d3c17e3fa396863cd20..9dae347c853113e51dfac51ab2ba9a658bfa3521 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkJAXBTest.java
@@ -32,9 +32,6 @@ public class NeutronNetworkJAXBTest {
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
-
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed",
                 "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork());
 
@@ -55,6 +52,9 @@ public class NeutronNetworkJAXBTest {
                 testObject.getProviderNetworkType());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 11: Testing shared failed", false, testObject.getShared());
+
+        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
+                "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
     }
 
     private static final String NEUTRON_NETWORK_MULTIPLE_PROVIDER_SOURCE_JSON = "{" + "\"status\": \"ACTIVE\", "
@@ -76,9 +76,6 @@ public class NeutronNetworkJAXBTest {
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
-                "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
-
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing status failed", "ACTIVE", testObject.getStatus());
 
         Assert.assertEquals("NeutronNetwork JAXB Test 5: Testing name failed", "net1", testObject.getName());
@@ -112,6 +109,9 @@ public class NeutronNetworkJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 9.4: Testing segment index 1 network type failed", "stt",
                 segments.get(1).getProviderNetworkType());
+
+        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed",
+                "9bacb3c5d39d41a79512987f338cf177", testObject.getTenantID());
     }
 
     private static final String NEUTRON_NETWORK_L3_HA_SOURCE_JSON = "{"
@@ -130,9 +130,6 @@ public class NeutronNetworkJAXBTest {
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "d3a2beea-c6ca-4e76-ba7d-e947c5df0c0e",
                 testObject.getID());
 
-        // Bug 4775: tenantId is null when json provides it as empty string
-        Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID());
-
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing name failed",
                 "HA network tenant c15340eb65804b20af2dd0fd3beddc8c", testObject.getName());
 
@@ -146,5 +143,8 @@ public class NeutronNetworkJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 7: Testing provider segmentation id failed", "1018",
                 testObject.getProviderSegmentationID());
+
+        // Bug 4775: tenantId is null when json provides it as empty string
+        Assert.assertNull("NeutronNetwork JAXB Test 2: Testing tenant_id failed", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
index a69b1b73991cdb4a50fbbdee465f8a3a8afcec57..a8af020e6d94325a2364216d89e37a6fd99fdbd0 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronNetworkQosJAXBTest.java
@@ -12,6 +12,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronNetworkQosJAXBTest {
+
     private static final String NEUTRON_NETWORK_QOS_ENABLED_SOURCE_JSON = "{ " + "\"status\": \"ACTIVE\", "
             + "\"subnets\": [ \"3b80198d-4f7b-4f77-9ef5-774d54e17126\" ], " + "\"name\": \"net1\", "
             + "\"admin_state_up\": true, " + "\"tenant_id\": \"9bacb3c5d39d41a79512987f338cf177\", "
@@ -30,9 +31,6 @@ public class NeutronNetworkQosJAXBTest {
         Assert.assertEquals("NeutronNetwork JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 testObject.getID());
 
-        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
-                testObject.getTenantID());
-
         Assert.assertEquals("NeutronNetwork JAXB Test 3: Testing physical network id failed",
                 "8bab8453-1bc9-45af-8c70-f83aa9b50453", testObject.getProviderPhysicalNetwork());
 
@@ -56,5 +54,8 @@ public class NeutronNetworkQosJAXBTest {
 
         Assert.assertEquals("NeutronNetwork JAXB Test 12: Testing qos_policy_id failed",
                 "d6220bbb-35f3-48ab-8eae-69c60aef3546", testObject.getQosPolicyId());
+
+        Assert.assertEquals("NeutronNetwork JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
index e054b4de75e1171e1c6c2ed43fa5b4ff7292eb84..4ada90bd2d6367ab7ac0b61eaaa08e08ec0140cc 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronPortJAXBTest.java
@@ -36,9 +36,6 @@ public class NeutronPortJAXBTest {
         Assert.assertEquals("NeutronPort JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());
 
-        Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
-                neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronPort JAXB Test 3: Testing network_id failed",
                 "e9330b1f-a2ef-4160-a991-169e56ab17f5", neutronObject.getNetworkUUID());
 
@@ -99,5 +96,8 @@ public class NeutronPortJAXBTest {
 
         Assert.assertEquals("NeutronPort JAXB Test 17: Testing binding:profile failed",
                 "{\'capabilities\': [\'switchdev\']}", neutronObject.getProfile());
+
+        Assert.assertEquals("NeutronPort JAXB Test 2: Testing tenant_id failed", "9bacb3c5d39d41a79512987f338cf177",
+                neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
index e9fdff7cd00bf4d2d7671814b7bbcf142cab060e..8de480576282fc20546940116503bbe022111f2a 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronRouterJAXBTest.java
@@ -42,9 +42,6 @@ public class NeutronRouterJAXBTest {
 
         Assert.assertEquals("NeutronRouter JAXB Test 4: Testing status failed", "ACTIVE", testObject.getStatus());
 
-        Assert.assertEquals("NeutronFloatingIp JAXB Test 5: Testing tenant_id failed",
-                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
-
         Assert.assertEquals("NeutronRouter JAXB Test 6: Testing externalGatewayInfo failed",
                 "e9330b1f-a2ef-4160-a991-169e56ab17f6", externalGatewayInfo.getNetworkID());
 
@@ -58,5 +55,8 @@ public class NeutronRouterJAXBTest {
 
         Assert.assertEquals("NeutronRouter JAXB Test 9.2: Testing routes failed", "10.0.0.0/24",
                 routes.get(0).getDestination());
+
+        Assert.assertEquals("NeutronFloatingIp JAXB Test 5: Testing tenant_id failed",
+                "aa902936679e4ea29bfe1158e3450a13", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
index 54a40d10b37974a8526d81dee1d69b90f30ebb7e..24fed591b6fb6ccbf325c029680cf0bc7c217832 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCFlowClassifierJAXBTest.java
@@ -36,9 +36,6 @@ public class NeutronSFCFlowClassifierJAXBTest {
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 1: Testing id failed",
                 "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
-        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 2: Testing tenant_id failed",
-                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 3: Testing ethertype failed", "IPv4",
                 neutronObject.getEthertype());
 
@@ -72,5 +69,8 @@ public class NeutronSFCFlowClassifierJAXBTest {
         Map<String, String> l7Param = neutronObject.getL7Parameters();
         Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 13: Testing L7_parameters list length failed", 1,
                 l7Param.size());
+
+        Assert.assertEquals("NeutronSFCFlowClassifier JAXB Test 2: Testing tenant_id failed",
+                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
index 0c6d49a2642f29e59489bc1817a2b977462268dc..ce65183d0dfacab7e48d3c953a9236691aa4f013 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortChainJAXBTest.java
@@ -27,7 +27,6 @@ public class NeutronSFCPortChainJAXBTest {
 
     @Test
     public void test_NeutronSFCPortChain_JAXB() throws JAXBException {
-
         NeutronSFCPortChain testObject = new NeutronSFCPortChain();
         NeutronSFCPortChain neutronObject = (NeutronSFCPortChain) JaxbTestHelper.jaxbUnmarshall(testObject,
                 NEUTRON_SFC_PORT_CHAIN_SOURCE_JSON);
@@ -35,9 +34,6 @@ public class NeutronSFCPortChainJAXBTest {
         Assert.assertEquals("NeutronSFCPortChain JAXB Test 1: Testing id failed",
                 "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
-        Assert.assertEquals("NeutronSFCPortChain JAXB Test 2: Testing tenant_id failed",
-                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronSFCPortChain JAXB Test 3: Testing flow_classifiers failed", 2,
                 neutronObject.getFlowClassifiersUUID().size());
 
@@ -48,5 +44,7 @@ public class NeutronSFCPortChainJAXBTest {
         Assert.assertEquals("NeutronSFCPortChain JAXB Test 5: Testing chain_parameters list length " + "failed", 1,
                 param.size());
 
+        Assert.assertEquals("NeutronSFCPortChain JAXB Test 2: Testing tenant_id failed",
+                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
index df280d6915bf710ab081a9d9b6536477e059798e..897ca306bec5192b74f0c672bd539f85bfb10da9 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairGroupJAXBTest.java
@@ -15,6 +15,7 @@ import org.junit.Test;
  * Created by Anil Vishnoi (avishnoi@Brocade.com).
  */
 public class NeutronSFCPortPairGroupJAXBTest {
+
     private static final String NEUTRON_SFC_PORT_PAIR_GROUP_SOURCE_JSON = "{ " + "\"name\": \"portpair1\", "
             + "\"port_pairs\": [ " + "\"d11e9190-73d4-11e5-b392-2c27d72acb4c\"" + "], "
             + "\"tenant_id\": \"4969c491a3c74ee4af974e6d800c62de\", "
@@ -29,10 +30,10 @@ public class NeutronSFCPortPairGroupJAXBTest {
         Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 1: Testing id failed",
                 "4e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getID());
 
-        Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 2: Testing tenant_id failed",
-                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 3: Testing port_pairs failed",
                 "d11e9190-73d4-11e5-b392-2c27d72acb4c", neutronObject.getPortPairs().get(0));
+
+        Assert.assertEquals("NeutronSFCPortPairGroup JAXB Test 2: Testing tenant_id failed",
+                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
index cc7466ea5979739d9560246ed2a2bf4c8c24b65a..6071958db0617b2e0de9389041272bde29b48608 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSFCPortPairJAXBTest.java
@@ -32,9 +32,6 @@ public class NeutronSFCPortPairJAXBTest {
         Assert.assertEquals("NeutronSFCPortPair JAXB Test 1: Testing id failed", "4e8e5957-649f-477b-9e5b-f1f75b21c03c",
                 neutronObject.getID());
 
-        Assert.assertEquals("NeutronSFCPortPair JAXB Test 2: Testing tenant_id failed",
-                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronSFCPortPair JAXB Test 3: Testing ingress failed",
                 "5e8e5957-649f-477b-9e5b-f1f75b21c03c", neutronObject.getIngressPortUUID());
 
@@ -45,5 +42,8 @@ public class NeutronSFCPortPairJAXBTest {
         Assert.assertEquals(
                 "NeutronSFCPortPair JAXB Test 5: Testing service_function_parameters list length " + "failed", 1,
                 param.size());
+
+        Assert.assertEquals("NeutronSFCPortPair JAXB Test 2: Testing tenant_id failed",
+                "4969c491a3c74ee4af974e6d800c62de", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
index e11c67847c8e1a05fc672e973e0755605fd5b3cf..b0da2d13d7163a489b4c536741c7c7b2792a532b 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronSubnetJAXBTest.java
@@ -14,6 +14,7 @@ import org.junit.Assert;
 import org.junit.Test;
 
 public class NeutronSubnetJAXBTest {
+
     private static final String NEUTRON_SUBNET_ENABLED_SOURCE_JSON = "{"
         + "\"service_types\": [], "
         + "\"description\": \"\", "
@@ -44,8 +45,6 @@ public class NeutronSubnetJAXBTest {
                 NEUTRON_SUBNET_ENABLED_SOURCE_JSON);
         Assert.assertEquals("NeutronSubnet JAXB Test 1: Testing id failed",
                             "dd4320eb-a56b-412b-ae83-fc5ac2a5e6f6", testObject.getID());
-        Assert.assertEquals("NeutronSubnet JAXB Test 2: Testing tenant_id failed",
-                            "379ffe2b9cda498d9e17b319733ec889", testObject.getTenantID());
         Assert.assertEquals("NeutronSubnet JAXB Test 3: Testing name failed", "", testObject.getName());
         Assert.assertEquals("NeutronSubnet JAXB Test 4: Testing enabled_dhcp failed", true, testObject.isEnableDHCP());
         Assert.assertEquals("NeutronSubnet JAXB Test 5: Testing network_id failed",
@@ -65,5 +64,8 @@ public class NeutronSubnetJAXBTest {
                             null, testObject.getIpV6AddressMode());
         Assert.assertEquals("NeutronSubnet JAXB Test 10: Testing cidr failed",
                             "2003::/64", testObject.getCidr());
+
+        Assert.assertEquals("NeutronSubnet JAXB Test 2: Testing tenant_id failed",
+                "379ffe2b9cda498d9e17b319733ec889", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
index c5e5a6742d52de869fb69e8b60658a2301a4a0e9..6002ebf9bd1ce8ed5c34f9500ff8a17c9c37253d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapFlowJAXBTest.java
@@ -30,9 +30,6 @@ public class NeutronTapFlowJAXBTest {
         Assert.assertEquals("NeutronTapFlow JAXB Test 1: Testing id failed", "f6220bbb-35f3-48ab-8eae-69c60aef3546",
                 neutronObject.getID());
 
-        Assert.assertEquals("NeutronTapFlow JAXB Test 2: Testing tenant_id failed",
-                "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronTapFlow JAXB Test 3 : Testing name failed", "tap-flow-test",
                 neutronObject.getName());
 
@@ -45,5 +42,7 @@ public class NeutronTapFlowJAXBTest {
         Assert.assertEquals("NeutronTapFlow JAXB Test 6: Testing direction failed",
                 "BOTH", neutronObject.getTapFlowDirection());
 
+        Assert.assertEquals("NeutronTapFlow JAXB Test 2: Testing tenant_id failed",
+                "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
index 77bdb5a70de5a5a89f45129996df04e30694e0ea..c0709e9dee999ddceb7391f7dfaab11ff0c53c37 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTapServiceJAXBTest.java
@@ -28,14 +28,13 @@ public class NeutronTapServiceJAXBTest {
         Assert.assertEquals("NeutronTapService JAXB Test 1: Testing id failed", "b6440bbb-35f3-48ab-8eae-69c60aef3546",
                 neutronObject.getID());
 
-        Assert.assertEquals("NeutronTapService JAXB Test 2: Testing tenant_id failed",
-                "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronTapService JAXB Test 3 : Testing name failed", "tap-service-test",
                 neutronObject.getName());
 
         Assert.assertEquals("NeutronTapService JAXB Test 4 : Testing port_id failed",
                 "311d75c3-4da8-4267-8aed-6dbb19a3dcfe", neutronObject.getTapServicePortID());
 
+        Assert.assertEquals("NeutronTapService JAXB Test 2: Testing tenant_id failed",
+                "aa902936679e4ea29bfe1158e3450a13", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
index 403d83c674e275dbdcf30e195ed0aa791a50bf1d..8715b854186e9cff386c0656b22aa68c1ffa8480 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronTrunkJAXBTest.java
@@ -40,9 +40,6 @@ public class NeutronTrunkJAXBTest {
         Assert.assertTrue("NeutronTrunk JAXB Test 4 : Testing AdminStateUp failed",
                 neutronObject.getAdminStateUp());
 
-        Assert.assertEquals("NeutronTrunk JAXB Test 5: Testing tenant_id failed",
-                "cc3641789c8a4304abaa841c64f638d9", neutronObject.getTenantID());
-
         Assert.assertEquals("NeutronTrunk JAXB Test 6 : Testing PotId failed", "60aac28d-1d3a-48d9-99bc-dd4bd62e50f2",
                 neutronObject.getPortId());
 
@@ -59,5 +56,8 @@ public class NeutronTrunkJAXBTest {
 
         Assert.assertEquals("NeutronTrunk JAXB Test 10 : Testing SubPort Port Id failed",
                 "dca33436-2a7c-415b-aa35-14769e7834e3",  subPort.getPortId());
+
+        Assert.assertEquals("NeutronTrunk JAXB Test 5: Testing tenant_id failed",
+                "cc3641789c8a4304abaa841c64f638d9", neutronObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
index 8da001ce41d82c64b7ffc0d485ae95097bff1149..ca8805544c7a429ced8922567caba4aa04a9380d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIkePolicyJAXBTest.java
@@ -30,9 +30,6 @@ public class NeutronVpnIkePolicyJAXBTest {
         Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 1: Testing id failed",
                 "5522aff7-1b3c-48dd-9c3c-b50f016b73db", testObject.getID());
 
-        Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 2: Testing tenant id failed",
-                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
-
         Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 3: Testing name failed", "ikepolicy1",
                 testObject.getName());
 
@@ -56,5 +53,8 @@ public class NeutronVpnIkePolicyJAXBTest {
 
         Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 10.2: Testing lifetime values failed", new Integer(3600),
                 testObject.getLifetime().getValue());
+
+        Assert.assertEquals("NeutronVpnIkePolicy JAXB Test 2: Testing tenant id failed",
+                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
index 669c66703ca2e48c2930bc7f9a2b833070a61d29..e72ae9e3913597054fe4f5a5728aced660d9279d 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecPolicyJAXBTest.java
@@ -31,9 +31,6 @@ public class NeutronVpnIpSecPolicyJAXBTest {
         Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 1: Testing id failed",
                 "5291b189-fd84-46e5-84bd-78f40c05d69c", testObject.getID());
 
-        Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 2: Testing tenant id failed",
-                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
-
         Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 3: Testing name failed", "ipsecpolicy1",
                 testObject.getName());
 
@@ -57,5 +54,8 @@ public class NeutronVpnIpSecPolicyJAXBTest {
 
         Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 11: Testing Lifetime value failed", new Integer(3600),
                 testObject.getLifetime().getValue());
+
+        Assert.assertEquals("NeutronVpnIpSecPolicy JAXB Test 2: Testing tenant id failed",
+                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
     }
 }

diff --git a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
index cc693fc35c301e9cc55a9db6ae9e1af0a890c71a..318b211332296b1378b157ff8e991f541f047f83 100644 (file)
--- a/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
+++ b/neutron-spi/src/test/java/org/opendaylight/neutron/spi/NeutronVpnIpSecSiteConnectionJAXBTest.java
@@ -36,9 +36,6 @@ public class NeutronVpnIpSecSiteConnectionJAXBTest {
         Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 1: Testing id failed",
                 "cbc152a0-7e93-4f98-9f04-b085a4bf2511", testObject.getID());
 
-        Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 2: Testing tenant id failed",
-                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
-
         Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 3: Testing name failed", "myvpn",
                 testObject.getName());
 
@@ -94,5 +91,8 @@ public class NeutronVpnIpSecSiteConnectionJAXBTest {
 
         Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 18.3: Testing DeadPeerDetection failed",
                 new Integer(120), testObject.getDeadPeerDetection().getTimeout());
+
+        Assert.assertEquals("NeutronVpnIpSecSiteConnection JAXB Test 2: Testing tenant id failed",
+                "ccb81365fe36411a9011e90491fe1330", testObject.getTenantID());
     }
 }