From: Tom Pantelis <tpanteli@brocade.com>
Date: Sat, 30 May 2015 05:54:44 +0000 (-0400)
Subject: Fix intermittent ToasterTest failures
X-Git-Tag: release/lithium~79
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=1a0dbeb592cae5367b0c56ef1e38dd91e01f0790

Fix intermittent ToasterTest failures

The ToasterTest has been intermittently failing on jenkins for a while.
I repro'ed it locally after 5 tries. An error occurs indicating it
can't find the pingpong-databroker namespace. Not sure why this occurs
intermittently.

The test doesn't need/use the pingpong databroker so I commented it out
in the controller.xml. After this change the test ran successfully 80
times.

Change-Id: Id0cfdd2464218173e91392ac9bb66e60a8f51595
Signed-off-by: Tom Pantelis <tpanteli@brocade.com>
(cherry picked from commit 817fba4cbd618da7f587b3a5c33ac1dd2450e983)
---

diff --git a/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml b/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
index bdbdb7bc40..c1f2ff2490 100644
--- a/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
+++ b/opendaylight/md-sal/samples/toaster-it/src/test/resources/controller.xml
@@ -105,6 +105,7 @@
                 </module>
 
                 <!-- PingPong broker -->
+                <!--
                 <module>
                     <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:pingpong">prefix:pingpong-data-broker</type>
                     <name>pingpong-data-broker</name>
@@ -131,7 +132,7 @@
                         </binding-mapping-service>
                     </binding-forwarded-data-broker>
                         </module>
-
+                  -->
                         <!--
                              Tree-based in-memory data store. This is the data store which is currently
                              recommended for single-node deployments.
@@ -325,10 +326,12 @@
                                 <name>binding-data-broker</name>
                                 <provider>/modules/module[type='binding-forwarded-data-broker'][name='binding-async-data-broker']</provider>
                             </instance>
+                        <!--
                         <instance>
                             <name>pingpong-binding-data-broker</name>
                             <provider>/modules/module[type='binding-forwarded-data-broker'][name='pingpong-binding-data-broker']</provider>
                         </instance>
+                        -->
                         </service>
 
                         <service>
@@ -337,10 +340,12 @@
                                 <name>inmemory-data-broker</name>
                                 <provider>/modules/module[type='dom-inmemory-data-broker'][name='inmemory-data-broker']</provider>
                             </instance>
+                            <!--
                             <instance>
                                 <name>pingpong-broker</name>
                                 <provider>/modules/module[type='pingpong-data-broker'][name='pingpong-data-broker']</provider>
                             </instance>
+                            -->
                         </service>
 
                         <!-- Toaster samples -->