Fix RIBImplModuleTest to work after default modules in sal are removed.

Commit http://git.opendaylight.org/gerrit/5496 will break this test, this commit fixes it.

Change-Id: Id198e77c2e5374c83e4a6e27df68c73b24bf9bb4
Signed-off-by: Tomas Olvecky <tolvecky@cisco.com>

diff --git a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
index 81c0830a8659c32166098db14303c7e8bf42e979..9d6af0eb883974edb5913d5ea9d627265ec70c0b 100644 (file)
--- a/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
+++ b/bgp/rib-impl-config/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
@@ -275,10 +275,17 @@ public class RIBImplModuleTest extends AbstractConfigTest {
                return nameCreated;
        }
 
-       public static ObjectName lookupMappingServiceInstance(final ConfigTransactionJMXClient transaction)
-                       throws InstanceAlreadyExistsException, InstanceNotFoundException {
-               ObjectName nameCreated = transaction.lookupConfigBean("runtime-generated-mapping", "runtime-mapping-singleton");
-               return nameCreated;
+       public static ObjectName lookupMappingServiceInstance(final ConfigTransactionJMXClient transaction) {
+
+        try {
+            return transaction.lookupConfigBean(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
+        } catch (InstanceNotFoundException e) {
+            try {
+                return transaction.createModule(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
+            } catch (InstanceAlreadyExistsException e1) {
+                throw new IllegalStateException(e1);
+            }
+        }
        }
 
        public static ObjectName createRibExtensionsInstance(final ConfigTransactionJMXClient transaction, final String moduleName,