Bug 8568 - Remove deprecated CSS module tests 35/58535/5
authormatthieu <mcauffiez@inocybe.com>
Thu, 8 Jun 2017 16:40:06 +0000 (12:40 -0400)
committermatcauf <mcauffiez@inocybe.ca>
Fri, 9 Jun 2017 14:21:36 +0000 (10:21 -0400)
Remove Test class that are using deprecated DataProviderService
for Classes
BGPApplicationPeerModule
BGPPeerModule
RIBImplModule
Ipv4ReachabilityTopologyBuilderModule
Ipv6ReachabilityTopologyBuilderModule are deprecated and
will be not tested

Classes AddPathImplModule and BGPTableTypeImplModule are not
deprecated and will be not tested.
Do they need to be deprecated ?

Change-Id: I9b9d3125b6f80ee70c86451f8a46cbd480bde6c2
Signed-off-by: matthieu <mcauffiez@inocybe.com>
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java [deleted file]
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModuleTest.java [deleted file]
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java [deleted file]
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java [deleted file]
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java [deleted file]
bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java [deleted file]
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/AbstractTopologyBuilderModuleTest.java [deleted file]
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java [deleted file]
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java [deleted file]
bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java [deleted file]

diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AbstractRIBImplModuleTest.java
deleted file mode 100755 (executable)
index e706708..0000000
+++ /dev/null
@@ -1,537 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.contains;
-import static org.mockito.Mockito.doAnswer;
-import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.mock;
-
-import com.google.common.base.Optional;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.CheckedFuture;
-import io.netty.channel.EventLoopGroup;
-import io.netty.util.concurrent.EventExecutor;
-import io.netty.util.concurrent.ImmediateEventExecutor;
-import io.netty.util.concurrent.SucceededFuture;
-import java.io.InputStream;
-import java.net.InetSocketAddress;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.concurrent.atomic.LongAdder;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import org.junit.After;
-import org.junit.Assert;
-import org.junit.Before;
-import org.mockito.Matchers;
-import org.mockito.Mock;
-import org.mockito.Mockito;
-import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
-import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.controller.config.yang.bgp.rib.spi.RIBExtensionsImplModuleFactory;
-import org.opendaylight.controller.config.yang.bgp.rib.spi.RIBExtensionsImplModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingAsyncDataBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingAsyncDataBrokerImplModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.BindingBrokerImplModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.ForwardedCompatibleDataBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.ForwardedCompatibleDataBrokerImplModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.NotificationBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.binding.impl.RuntimeMappingModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomBrokerImplModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomBrokerImplModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleFactory;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.DomInmemoryDataBrokerModuleMXBean;
-import org.opendaylight.controller.config.yang.md.sal.dom.impl.SchemaServiceImplSingletonModuleFactory;
-import org.opendaylight.controller.config.yang.netty.eventexecutor.AutoCloseableEventExecutor;
-import org.opendaylight.controller.config.yang.netty.eventexecutor.GlobalEventExecutorModuleFactory;
-import org.opendaylight.controller.config.yang.netty.threadgroup.NettyThreadgroupModuleFactory;
-import org.opendaylight.controller.config.yang.netty.threadgroup.NioEventLoopGroupCloseable;
-import org.opendaylight.controller.config.yang.netty.timer.HashedWheelTimerModuleFactory;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec;
-import org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodecFactory;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataTreeChangeService;
-import org.opendaylight.controller.md.sal.dom.api.DOMDataWriteTransaction;
-import org.opendaylight.controller.md.sal.dom.api.DOMMountPointService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationPublishService;
-import org.opendaylight.controller.md.sal.dom.api.DOMNotificationService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcProviderService;
-import org.opendaylight.controller.md.sal.dom.api.DOMRpcService;
-import org.opendaylight.controller.md.sal.dom.api.DOMTransactionChain;
-import org.opendaylight.controller.sal.core.api.model.SchemaService;
-import org.opendaylight.controller.sal.core.api.model.YangTextSourceProvider;
-import org.opendaylight.mdsal.binding.generator.api.ClassLoadingStrategy;
-import org.opendaylight.mdsal.binding.generator.impl.GeneratedClassLoadingStrategy;
-import org.opendaylight.protocol.bgp.openconfig.spi.BGPTableTypeRegistryConsumer;
-import org.opendaylight.protocol.bgp.parser.spi.BGPExtensionProviderContext;
-import org.opendaylight.protocol.bgp.parser.spi.MessageRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.StrictBGPPeerRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPDispatcher;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BGPPeerRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.spi.BgpDeployer;
-import org.opendaylight.protocol.bgp.rib.impl.spi.ImportPolicyPeerTracker;
-import org.opendaylight.protocol.bgp.rib.impl.spi.RIB;
-import org.opendaylight.protocol.bgp.rib.impl.spi.RIBSupportContextRegistry;
-import org.opendaylight.protocol.bgp.rib.impl.stats.rib.impl.BGPRenderStats;
-import org.opendaylight.protocol.bgp.rib.spi.RIBExtensionProviderContext;
-import org.opendaylight.protocol.bgp.rib.spi.SimpleRIBExtensionProviderContext;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.Bgp;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.rev151009.bgp.top.bgp.Global;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.bgp.types.rev151009.IPV4UNICAST;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.NetworkInstances;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstance;
-import org.opendaylight.yang.gen.v1.http.openconfig.net.yang.network.instance.rev151018.network.instance.top.network.instances.NetworkInstanceKey;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.BgpTableType;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.BgpRib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.RibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.Rib;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.bgp.rib.RibKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.rib.TablesKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.ClusterIdentifier;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
-import org.opendaylight.yangtools.yang.model.api.SchemaContext;
-import org.opendaylight.yangtools.yang.model.api.SchemaContextListener;
-import org.opendaylight.yangtools.yang.parser.spi.meta.ReactorException;
-import org.opendaylight.yangtools.yang.test.util.YangParserTestUtils;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleListener;
-import org.osgi.framework.Filter;
-import org.osgi.framework.ServiceListener;
-import org.osgi.framework.ServiceReference;
-
-public abstract class AbstractRIBImplModuleTest extends AbstractConfigTest {
-
-    private static final String INSTANCE_NAME = "rib-impl";
-    private static final String FACTORY_NAME = RIBImplModuleFactory.NAME;
-    private static final String TRANSACTION_NAME = "testTransaction";
-
-    protected static final RibId RIB_ID = new RibId("test");
-    protected static final BgpId BGP_ID = new BgpId("192.168.1.1");
-    protected static final ClusterIdentifier CLUSTER_ID = new ClusterIdentifier("192.168.1.2");
-
-    private static final AsNumber AS_NUMBER = new AsNumber(5000L);
-    private static final String RIB_EXTENSIONS_INSTANCE_NAME = "rib-extensions-impl";
-    private static final String DOM_BROKER_INSTANCE_NAME = "dom-broker-impl";
-    private static final String BINDING_ASYNC_BROKER_INSTANCE_NAME = "binding-async-broker-instance";
-    private static final String BINDING_BROKER_INSTANCE_NAME = "binding-broker-impl";
-    private static final String COMPATIBLE_DATA_BROKER_INSTANCE_NAME = "binding-data-compatible-broker-instance";
-    private static final String NOTIFICATION_BROKER_INSTANCE_NAME = "notification-broker-impl";
-
-    private static final InstanceIdentifier<NetworkInstance> OPENCONFIG_IID = InstanceIdentifier.create(NetworkInstances.class).child(NetworkInstance.class,
-            new NetworkInstanceKey("global-bgp"));
-
-    @Mock
-    private ReadWriteTransaction mockedTransaction;
-
-    @Mock
-    private DataBroker mockedDataProvider;
-
-    @Mock
-    private CheckedFuture<Void, TransactionCommitFailedException> mockedFuture;
-
-    @Mock
-    private RpcResult<TransactionStatus> mockedResult;
-
-    @Mock
-    protected BGPDispatcher mockedBGPDispatcher;
-
-    @Mock
-    private RIB mockedRIB;
-
-    @Mock
-    private BgpDeployer bgpDeployer;
-
-    @Mock
-    private BGPTableTypeRegistryConsumer tableTypeRegistry;
-
-    @Mock
-    private BGPPeerRuntimeMXBean mockedPeer;
-
-    @SuppressWarnings("unchecked")
-    @Before
-    public void setUp() throws Exception {
-        MockitoAnnotations.initMocks(this);
-
-        final List<ModuleFactory> moduleFactories = getModuleFactories();
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.mockedContext, moduleFactories.toArray(new ModuleFactory[moduleFactories.size()])));
-
-        doAnswer(invocation -> {
-            final String str = invocation.getArgumentAt(0, String.class);
-            final Filter mockFilter = mock(Filter.class);
-            doReturn(str).when(mockFilter).toString();
-            return mockFilter;
-        }).when(this.mockedContext).createFilter(anyString());
-
-        final ServiceReference<?> emptyServiceReference = mock(ServiceReference.class, "Empty");
-        final ServiceReference<?> classLoadingStrategySR = mock(ServiceReference.class, "ClassLoadingStrategy");
-        final ServiceReference<?> dataProviderServiceReference = mock(ServiceReference.class, "Data Provider");
-
-        Mockito.doNothing().when(this.mockedContext).addServiceListener(any(ServiceListener.class), Mockito.anyString());
-        Mockito.doNothing().when(this.mockedContext).removeServiceListener(any(ServiceListener.class));
-
-        Mockito.doNothing().when(this.mockedContext).addBundleListener(any(BundleListener.class));
-        Mockito.doNothing().when(this.mockedContext).removeBundleListener(any(BundleListener.class));
-
-        Mockito.doReturn(new Bundle[] {}).when(this.mockedContext).getBundles();
-
-        Mockito.doReturn(new ServiceReference[] {}).when(this.mockedContext).getServiceReferences(Matchers.anyString(), Matchers.anyString());
-
-        Mockito.doReturn("Empty reference").when(emptyServiceReference).toString();
-        Mockito.doReturn("Data Provider Service Reference").when(dataProviderServiceReference).toString();
-        Mockito.doReturn("Class loading stategy reference").when(classLoadingStrategySR).toString();
-
-        Mockito.doReturn(emptyServiceReference).when(this.mockedContext).getServiceReference(Mockito.anyString());
-        Mockito.doReturn(dataProviderServiceReference).when(this.mockedContext).getServiceReference(DataBroker.class);
-        Mockito.doReturn(classLoadingStrategySR).when(this.mockedContext).getServiceReference(GeneratedClassLoadingStrategy.class);
-        Mockito.doReturn(classLoadingStrategySR).when(this.mockedContext).getServiceReference(ClassLoadingStrategy.class);
-
-        Mockito.doReturn(this.mockedDataProvider).when(this.mockedContext).getService(dataProviderServiceReference);
-        Mockito.doReturn(GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy()).when(this.mockedContext).getService(classLoadingStrategySR);
-        Mockito.doReturn(null).when(this.mockedContext).getService(emptyServiceReference);
-
-        Mockito.doReturn(this.mockedTransaction).when(this.mockedDataProvider).newReadWriteTransaction();
-
-        Mockito.doReturn(null).when(this.mockedTransaction).read(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any());
-        Mockito.doNothing().when(this.mockedTransaction).put(Mockito.eq(LogicalDatastoreType.OPERATIONAL), Mockito.any(), Mockito.any());
-        Mockito.doNothing().when(this.mockedTransaction).delete(Mockito.eq(LogicalDatastoreType.OPERATIONAL), any(InstanceIdentifier.class));
-
-        Mockito.doReturn(this.mockedFuture).when(this.mockedTransaction).submit();
-        Mockito.doReturn(TRANSACTION_NAME).when(this.mockedTransaction).getIdentifier();
-
-        Mockito.doReturn(null).when(this.mockedFuture).get();
-        Mockito.doReturn(null).when(this.mockedFuture).checkedGet();
-
-        final SchemaContext context = parseYangStreams(getFilesAsStreams(getYangModelsPaths()));
-        final SchemaService mockedSchemaService = mock(SchemaService.class);
-        doReturn(context).when(mockedSchemaService).getGlobalContext();
-        doAnswer(invocation -> {
-            invocation.getArgumentAt(0, SchemaContextListener.class).onGlobalContextUpdated(context);
-            final ListenerRegistration<SchemaContextListener> reg = mock(ListenerRegistration.class);
-            doNothing().when(reg).close();
-            return reg;
-        }).when(mockedSchemaService).registerSchemaContextListener(any(SchemaContextListener.class));
-
-        setupMockService(SchemaService.class, mockedSchemaService);
-        setupMockService(YangTextSourceProvider.class, mock(YangTextSourceProvider.class));
-
-        final BindingToNormalizedNodeCodec bindingCodec = BindingToNormalizedNodeCodecFactory.newInstance(
-                GeneratedClassLoadingStrategy.getTCCLClassLoadingStrategy());
-        BindingToNormalizedNodeCodecFactory.registerInstance(bindingCodec, mockedSchemaService);
-        setupMockService(BindingToNormalizedNodeCodec.class, bindingCodec);
-
-        final BGPExtensionProviderContext mockContext = mock(BGPExtensionProviderContext.class);
-        doReturn(mock(MessageRegistry.class)).when(mockContext).getMessageRegistry();
-        setupMockService(BGPExtensionProviderContext.class, mockContext);
-
-        setupMockService(EventLoopGroup.class, NioEventLoopGroupCloseable.newInstance(0));
-        setupMockService(EventExecutor.class, AutoCloseableEventExecutor.CloseableEventExecutorMixin.globalEventExecutor());
-
-        setupMockService(DOMNotificationService.class, mock(DOMNotificationService.class));
-        setupMockService(DOMNotificationPublishService.class, mock(DOMNotificationPublishService.class));
-        setupMockService(DOMRpcService.class, mock(DOMRpcService.class));
-        setupMockService(DOMRpcProviderService.class, mock(DOMRpcProviderService.class));
-        setupMockService(DOMMountPointService.class, mock(DOMMountPointService.class));
-
-        setupMockService(BGPDispatcher.class, this.mockedBGPDispatcher);
-        doReturn(new SucceededFuture<>(ImmediateEventExecutor.INSTANCE, null)).when(this.mockedBGPDispatcher)
-            .createReconnectingClient(any(InetSocketAddress.class), anyInt(), any(Optional.class));
-
-        setupMockService(BgpDeployer.class, this.bgpDeployer);
-        final Global global = mock(Global.class);
-        final Bgp globalBgp = mock(Bgp.class);
-        doReturn(global).when(globalBgp).getGlobal();
-        doReturn("global").when(global).toString();
-        doNothing().when(this.bgpDeployer).onGlobalModified(any(),any(),any());
-        doNothing().when(this.bgpDeployer).onNeighborModified(any(),any(),any());
-        doReturn(this.mockedFuture).when(this.bgpDeployer).writeConfiguration(any(), any());
-        doReturn(this.mockedFuture).when(this.bgpDeployer).removeConfiguration(any());
-        doReturn(java.util.Optional.of(IPV4UNICAST.class)).when(this.tableTypeRegistry)
-            .getAfiSafiType(any(TablesKey.class));
-        doReturn(java.util.Optional.of(IPV4UNICAST.class)).when(this.tableTypeRegistry)
-            .getAfiSafiType(any(BgpTableType.class));
-        doReturn(this.tableTypeRegistry).when(this.bgpDeployer).getTableTypeRegistry();
-        doReturn(OPENCONFIG_IID).when(this.bgpDeployer).getInstanceIdentifier();
-        final DOMTransactionChain mockedChain = mock(DOMTransactionChain.class);
-        final DOMDataWriteTransaction mockedWTx = mock(DOMDataWriteTransaction.class);
-        doNothing().when(mockedWTx).put(any(), any(), any());
-        doNothing().when(mockedWTx).delete(any(), any());
-        doReturn(this.mockedFuture).when(mockedWTx).submit();
-        doReturn(mockedWTx).when(mockedChain).newWriteOnlyTransaction();
-        doReturn(mockedChain).when(this.mockedRIB).createPeerChain(any());
-        doNothing().when(mockedChain).close();
-        doReturn(YangInstanceIdentifier.of(BgpRib.QNAME)).when(this.mockedRIB).getYangRibId();
-        doReturn(new AsNumber(123456L)).when(this.mockedRIB).getLocalAs();
-        doReturn(BGP_ID).when(this.mockedRIB).getBgpIdentifier();
-        final BGPRenderStats mockedRenderStats = mock(BGPRenderStats.class);
-        doReturn(new LongAdder()).when(mockedRenderStats).getConfiguredPeerCounter();
-        doReturn(mockedRenderStats).when(this.mockedRIB).getRenderStats();
-        final DOMDataTreeChangeService mockedTreeChangeService = mock(DOMDataTreeChangeService.class);
-        final ListenerRegistration<?> mockedListenerReg = mock(ListenerRegistration.class);
-        doNothing().when(mockedListenerReg).close();
-        doReturn(mockedListenerReg).when(mockedTreeChangeService).registerDataTreeChangeListener(any(), any());
-        doReturn(mockedTreeChangeService).when(this.mockedRIB).getService();
-        final ImportPolicyPeerTracker mockedImportPolicy = mock(ImportPolicyPeerTracker.class);
-        doNothing().when(mockedImportPolicy).peerRoleChanged(any(), any());
-        doReturn(null).when(mockedImportPolicy).policyFor(any());
-        doReturn(mockedImportPolicy).when(this.mockedRIB).getImportPolicyPeerTracker();
-        doReturn(mock(RIBSupportContextRegistry.class)).when(this.mockedRIB).getRibSupportContext();
-        doReturn(Collections.emptySet()).when(this.mockedRIB).getLocalTablesKeys();
-        doReturn(Collections.emptySet()).when(this.mockedRIB).getLocalTables();
-        doReturn(this.mockedBGPDispatcher).when(this.mockedRIB).getDispatcher();
-        doReturn(InstanceIdentifier.create(BgpRib.class).child(Rib.class, new RibKey(RIB_ID))).when(this.mockedRIB).getInstanceIdentifier();
-
-        setupMockService(RIB.class, this.mockedRIB);
-
-        setupMockService(RIBExtensionProviderContext.class, new SimpleRIBExtensionProviderContext());
-
-        setupMockService(BGPPeerRegistry.class, StrictBGPPeerRegistry.GLOBAL);
-
-        setupMockService(BGPPeerRuntimeMXBean.class, this.mockedPeer);
-    }
-
-    protected void setupMockService(final Class<?> serviceInterface, final Object instance) throws Exception {
-        final ServiceReference<?> mockServiceRef = mock(ServiceReference.class);
-        doReturn(new ServiceReference[]{mockServiceRef}).when(this.mockedContext).
-        getServiceReferences(anyString(), contains(serviceInterface.getName()));
-        doReturn(new ServiceReference[]{mockServiceRef}).when(this.mockedContext).
-        getServiceReferences(serviceInterface.getName(), null);
-        doReturn(instance).when(this.mockedContext).getService(mockServiceRef);
-        doReturn("test").when(mockServiceRef).toString();
-    }
-
-    private static SchemaContext parseYangStreams(final List<InputStream> streams) {
-        try {
-            return YangParserTestUtils.parseYangStreams(streams);
-        } catch (final ReactorException e) {
-            throw new RuntimeException("Unable to build schema context from " + streams, e);
-        }
-    }
-
-    protected List<ModuleFactory> getModuleFactories() {
-        return Lists.newArrayList(new RIBImplModuleFactory(), new GlobalEventExecutorModuleFactory(),
-                new BGPDispatcherImplModuleFactory(), new NettyThreadgroupModuleFactory(),
-                new RIBExtensionsImplModuleFactory(), new DomBrokerImplModuleFactory(), new RuntimeMappingModuleFactory(),
-                new HashedWheelTimerModuleFactory(), new BindingAsyncDataBrokerImplModuleFactory(),
-                new DomInmemoryDataBrokerModuleFactory(), new SchemaServiceImplSingletonModuleFactory(),
-                new NotificationBrokerImplModuleFactory(), new ForwardedCompatibleDataBrokerImplModuleFactory(),
-                new BindingBrokerImplModuleFactory());
-    }
-
-    @Override
-    protected BundleContextServiceRegistrationHandler getBundleContextServiceRegistrationHandler(final Class<?> serviceType) {
-        if (serviceType.equals(SchemaContextListener.class)) {
-            return (clazz, serviceInstance, props) -> {
-                final SchemaContextListener listener = (SchemaContextListener) serviceInstance;
-                final SchemaContext context = parseYangStreams(getFilesAsStreams(getYangModelsPaths()));
-                listener.onGlobalContextUpdated(context);
-            };
-        }
-
-        return super.getBundleContextServiceRegistrationHandler(serviceType);
-    }
-
-    @After
-    public void closeAllModules() throws Exception {
-        super.destroyAllConfigBeans();
-
-    }
-
-    protected CommitStatus createInstance() throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createRIBImplModuleInstance(transaction);
-        return transaction.commit();
-    }
-
-    protected CommitStatus createRIBImplModuleInstance(final RibId ribId, final AsNumber localAs, final BgpId bgpId, final ClusterIdentifier clusterId) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createRIBImplModuleInstance(transaction, ribId, localAs, bgpId, clusterId, createAsyncDataBrokerInstance(transaction));
-        return transaction.commit();
-    }
-
-    private ObjectName createRIBImplModuleInstance(final ConfigTransactionJMXClient transaction, final RibId ribId, final AsNumber localAs,
-            final BgpId bgpId, final ClusterIdentifier clusterId, final ObjectName dataBroker) throws Exception {
-        final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final RIBImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, RIBImplModuleMXBean.class);
-        mxBean.setDataProvider(dataBroker);
-        mxBean.setDomDataProvider(lookupDomAsyncDataBroker(transaction));
-        mxBean.setCodecTreeFactory(lookupMappingServiceInstance(transaction));
-        mxBean.setBgpDispatcher(createBGPDispatcherImplInstance(transaction));
-        mxBean.setExtensions(createRibExtensionsInstance(transaction));
-        mxBean.setRibId(ribId);
-        mxBean.setLocalAs(localAs);
-        mxBean.setBgpRibId(bgpId);
-        mxBean.setClusterId(clusterId);
-        return nameCreated;
-    }
-
-    public static ObjectName createBGPDispatcherImplInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        final ObjectName nameCreated = transaction.createModule(BGPDispatcherImplModuleFactory.NAME, "bgp-message-fct");
-        final BGPDispatcherImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BGPDispatcherImplModuleMXBean.class);
-        return nameCreated;
-    }
-
-    protected ObjectName createRIBImplModuleInstance(final ConfigTransactionJMXClient transaction) throws Exception {
-        return createRIBImplModuleInstance(transaction, RIB_ID, AS_NUMBER, BGP_ID, CLUSTER_ID,
-                createAsyncDataBrokerInstance(transaction));
-    }
-
-    public ObjectName createRIBImplModuleInstance(final ConfigTransactionJMXClient transaction, final ObjectName dataBroker)
-            throws Exception {
-        return createRIBImplModuleInstance(transaction, RIB_ID, AS_NUMBER, BGP_ID, CLUSTER_ID, dataBroker);
-    }
-
-    public ObjectName createAsyncDataBrokerInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException, InstanceNotFoundException {
-        final ObjectName nameCreated = transaction.createModule(BindingAsyncDataBrokerImplModuleFactory.NAME, BINDING_ASYNC_BROKER_INSTANCE_NAME);
-        final BindingAsyncDataBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BindingAsyncDataBrokerImplModuleMXBean.class);
-        mxBean.setBindingMappingService(lookupMappingServiceInstance(transaction));
-        mxBean.setDomAsyncBroker(lookupDomAsyncDataBroker(transaction));
-        mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
-        return nameCreated;
-    }
-
-    public static ObjectName lookupDomAsyncDataBroker(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        try {
-            return transaction.lookupConfigBean(DomInmemoryDataBrokerModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
-        } catch (final InstanceNotFoundException e) {
-            try {
-                final ObjectName nameCreated = transaction.createModule(DomInmemoryDataBrokerModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
-                final DomInmemoryDataBrokerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomInmemoryDataBrokerModuleMXBean.class);
-                mxBean.setSchemaService(lookupSchemaServiceInstance(transaction));
-                return nameCreated;
-            } catch (final InstanceAlreadyExistsException e1) {
-                throw new IllegalStateException(e1);
-            }
-        }
-    }
-
-    private static ObjectName lookupMappingServiceInstance(final ConfigTransactionJMXClient transaction) {
-        try {
-            return transaction.lookupConfigBean(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
-        } catch (final InstanceNotFoundException e) {
-            try {
-                return transaction.createModule(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
-            } catch (final InstanceAlreadyExistsException e1) {
-                throw new IllegalStateException(e1);
-            }
-        }
-    }
-
-    private static ObjectName lookupSchemaServiceInstance(final ConfigTransactionJMXClient transaction) {
-        try {
-            return transaction.lookupConfigBean(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
-        } catch (final InstanceNotFoundException e) {
-            try {
-                return transaction.createModule(SchemaServiceImplSingletonModuleFactory.NAME, SchemaServiceImplSingletonModuleFactory.SINGLETON_NAME);
-            } catch (final InstanceAlreadyExistsException e1) {
-                throw new IllegalStateException(e1);
-            }
-        }
-    }
-
-    private static ObjectName createRibExtensionsInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        final ObjectName nameCreated = transaction.createModule(RIBExtensionsImplModuleFactory.NAME, RIB_EXTENSIONS_INSTANCE_NAME);
-        transaction.newMXBeanProxy(nameCreated, RIBExtensionsImplModuleMXBean.class);
-        return nameCreated;
-    }
-
-    public List<String> getYangModelsPaths() {
-        final List<String> paths = Lists.newArrayList("/META-INF/yang/bgp-rib.yang", "/META-INF/yang/ietf-inet-types@2013-07-15.yang",
-                "/META-INF/yang/bgp-message.yang", "/META-INF/yang/bgp-multiprotocol.yang", "/META-INF/yang/bgp-types.yang",
-                "/META-INF/yang/network-concepts.yang", "/META-INF/yang/ieee754.yang", "/META-INF/yang/yang-ext.yang");
-        return paths;
-    }
-
-    // TODO move back to AbstractConfigTest
-    private static List<InputStream> getFilesAsStreams(final List<String> paths) {
-        final List<InputStream> resources = new ArrayList<>();
-        final List<String> failedToFind = new ArrayList<>();
-        for (final String path : paths) {
-            final InputStream is = AbstractRIBImplModuleTest.class.getResourceAsStream(path);
-            if (is == null) {
-                failedToFind.add(path);
-            } else {
-                resources.add(is);
-            }
-        }
-        Assert.assertEquals("Some files were not found", Collections.<String> emptyList(), failedToFind);
-
-        return resources;
-    }
-
-    public ObjectName createBindingBrokerImpl(final ConfigTransactionJMXClient transaction, final ObjectName dataBrokerON,
-            final ObjectName notificationBrokerON) throws Exception {
-        final ObjectName objectName = transaction.createModule(BindingBrokerImplModuleFactory.NAME, BINDING_BROKER_INSTANCE_NAME);
-        final BindingBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(objectName, BindingBrokerImplModuleMXBean.class);
-        mxBean.setDataBroker(dataBrokerON);
-        mxBean.setNotificationService(notificationBrokerON);
-        mxBean.setBindingMappingService(lookupMappingServiceInstance(transaction));
-        mxBean.setDomAsyncBroker(lookupDomBrokerInstance(transaction));
-        return objectName;
-    }
-
-    public static ObjectName lookupDomBrokerInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        try {
-            return transaction.lookupConfigBean(DomBrokerImplModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
-        } catch (final InstanceNotFoundException e) {
-            try {
-                final ObjectName nameCreated = transaction.createModule(DomBrokerImplModuleFactory.NAME, DOM_BROKER_INSTANCE_NAME);
-                final DomBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, DomBrokerImplModuleMXBean.class);
-                mxBean.setAsyncDataBroker(lookupDomAsyncDataBroker(transaction));
-                return nameCreated;
-            } catch (final InstanceAlreadyExistsException e1) {
-                throw new IllegalStateException(e1);
-            }
-        }
-    }
-
-    public ObjectName createCompatibleDataBrokerInstance(final ConfigTransactionJMXClient transaction)
-            throws InstanceAlreadyExistsException, InstanceNotFoundException {
-        final ObjectName nameCreated = transaction.createModule(ForwardedCompatibleDataBrokerImplModuleFactory.NAME, COMPATIBLE_DATA_BROKER_INSTANCE_NAME);
-        final ForwardedCompatibleDataBrokerImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, ForwardedCompatibleDataBrokerImplModuleMXBean.class);
-        mxBean.setDataBroker(lookupDataBrokerInstance(transaction));
-        return nameCreated;
-    }
-
-    private static ObjectName lookupDataBrokerInstance(final ConfigTransactionJMXClient transaction) {
-        try {
-            return transaction.lookupConfigBean(BindingAsyncDataBrokerImplModuleFactory.NAME, BINDING_ASYNC_BROKER_INSTANCE_NAME);
-        } catch (final InstanceNotFoundException e) {
-            try {
-                return transaction.createModule(RuntimeMappingModuleFactory.NAME, RuntimeMappingModuleFactory.SINGLETON_NAME);
-            } catch (final InstanceAlreadyExistsException e1) {
-                throw new IllegalStateException(e1);
-            }
-        }
-    }
-
-    public ObjectName createNotificationBrokerInstance(final ConfigTransactionJMXClient transaction) throws Exception {
-        final ObjectName objectName = transaction.createModule(NotificationBrokerImplModuleFactory.NAME, NOTIFICATION_BROKER_INSTANCE_NAME);
-        return objectName;
-    }
-}
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/AddPathImplModuleTest.java
deleted file mode 100644 (file)
index 3db3de6..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.mockito.Mockito.doReturn;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.ObjectName;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.IdentityAttributeRef;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
-import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.SendReceive;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.MplsLabeledVpnSubsequentAddressFamily;
-
-public class AddPathImplModuleTest extends AbstractConfigTest {
-
-    private static final String FACTORY_NAME = AddPathImplModuleFactory.NAME;
-    private static final String INSTANCE_NAME = "add-path-instance";
-
-    private static final String AFI_NAME = BGPTableTypeImplModuleFactory.NAME;
-    private static final String AFI_INSTANCE_NAME = "bgp-table-type-instance";
-
-    @Before
-    public void setUp() throws Exception {
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.mockedContext,
-            new AddPathImplModuleFactory(),
-            new BGPTableTypeImplModuleFactory()));
-    }
-
-    @Override
-    protected BindingRuntimeContext getBindingRuntimeContext() {
-        final BindingRuntimeContext ret = super.getBindingRuntimeContext();
-        doReturn(Ipv4AddressFamily.class).when(ret).getIdentityClass(Ipv4AddressFamily.QNAME);
-        doReturn(MplsLabeledVpnSubsequentAddressFamily.class).when(ret).getIdentityClass(MplsLabeledVpnSubsequentAddressFamily.QNAME);
-        return ret;
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 2, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, 2);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final AddPathImplModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME), AddPathImplModuleMXBean.class);
-        mxBean.setSendReceive(SendReceive.Receive);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, 1);
-    }
-
-    private CommitStatus createInstance() throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createAddpathInstance(transaction);
-        return transaction.commit();
-    }
-
-    private static ObjectName createAddpathInstance(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final AddPathImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, AddPathImplModuleMXBean.class);
-
-        mxBean.setAddressFamily(createAddressFamily(transaction, AFI_INSTANCE_NAME));
-        mxBean.setSendReceive(SendReceive.Both);
-        return nameCreated;
-    }
-
-    protected static ObjectName createAddressFamily(final ConfigTransactionJMXClient transaction, final String instanceName) throws InstanceAlreadyExistsException {
-        final ObjectName nameCreated = transaction.createModule(AFI_NAME, instanceName);
-        final BGPTableTypeImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BGPTableTypeImplModuleMXBean.class);
-
-        final IdentityAttributeRef afiRef = new IdentityAttributeRef(Ipv4AddressFamily.QNAME.toString());
-        final IdentityAttributeRef safiRef = new IdentityAttributeRef(MplsLabeledVpnSubsequentAddressFamily.QNAME.toString());
-
-        mxBean.setAfi(afiRef);
-        mxBean.setSafi(safiRef);
-        return nameCreated;
-    }
-
-}
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPApplicationPeerModuleTest.java
deleted file mode 100755 (executable)
index 4b282a3..0000000
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.junit.Assert.assertEquals;
-
-import java.util.List;
-import javax.management.InstanceNotFoundException;
-import javax.management.ObjectName;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.ApplicationRibId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.BgpId;
-
-public class BGPApplicationPeerModuleTest extends AbstractRIBImplModuleTest {
-
-    private static final int EXP_INSTANCES = 8;
-    private static final String INSTANCE_NAME = "application-peer-instance";
-    private static final String FACTORY_NAME = BGPApplicationPeerModuleFactory.NAME;
-    private static final ApplicationRibId APP_RIB_ID = new ApplicationRibId("application-peer-test");
-    private static final ApplicationRibId NEW_APP_RIB_ID = new ApplicationRibId("new-application-peer-name");
-
-    private ObjectName dataBroker = null;
-    private ObjectName ribModule = null;
-
-    @Override
-    protected List<ModuleFactory> getModuleFactories() {
-        final List<ModuleFactory> moduleFactories = super.getModuleFactories();
-        moduleFactories.add(new BGPApplicationPeerModuleFactory());
-        return moduleFactories;
-    }
-
-    @Test
-    public void testCreateInstance() throws Exception {
-        final CommitStatus status = createApplicationPeerInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, EXP_INSTANCES, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createApplicationPeerInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, EXP_INSTANCES);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createApplicationPeerInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final BGPApplicationPeerModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
-                BGPApplicationPeerModuleMXBean.class);
-        mxBean.setApplicationRibId(new ApplicationRibId(NEW_APP_RIB_ID));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, EXP_INSTANCES - 1);
-        assertEquals(NEW_APP_RIB_ID, getApplicationRibId());
-    }
-
-    private CommitStatus createApplicationPeerInstance() throws Exception {
-        return createApplicationPeerInstance(INSTANCE_NAME);
-    }
-
-    private CommitStatus createApplicationPeerInstance(final String instanceName) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        final ObjectName objName = transaction.createModule(BGPApplicationPeerModuleFactory.NAME, instanceName);
-        final BGPApplicationPeerModuleMXBean mxBean = transaction.newMXBeanProxy(objName, BGPApplicationPeerModuleMXBean.class);
-        final ObjectName dataBrokerON = lookupDomAsyncDataBroker(transaction);
-        mxBean.setDataBroker(dataBrokerON);
-        mxBean.setBgpPeerId(new BgpId(BGP_ID));
-        mxBean.setApplicationRibId(APP_RIB_ID);
-        if (this.dataBroker == null) {
-            this.dataBroker = createAsyncDataBrokerInstance(transaction);
-        }
-        if (this.ribModule == null) {
-            this.ribModule = createRIBImplModuleInstance(transaction, this.dataBroker);
-        }
-        mxBean.setTargetRib(this.ribModule);
-        return transaction.commit();
-    }
-
-    private ApplicationRibId getApplicationRibId() throws InstanceNotFoundException {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        final BGPApplicationPeerModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
-                BGPApplicationPeerModuleMXBean.class);
-        return mxBean.getApplicationRibId();
-    }
-
-}
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPPeerModuleTest.java
deleted file mode 100755 (executable)
index ae1d197..0000000
+++ /dev/null
@@ -1,197 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doReturn;
-
-import com.google.common.collect.Lists;
-import io.netty.channel.epoll.Epoll;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.ObjectName;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.IdentityAttributeRef;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.multiprotocol.rev130919.SendReceive;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.rib.rev130925.PeerRole;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.MplsLabeledVpnSubsequentAddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.controller.rfc2385.cfg.rev160324.Rfc2385Key;
-
-public class BGPPeerModuleTest extends AbstractRIBImplModuleTest {
-
-    private static final int EXP_INSTANCES = 18;
-    private static final String INSTANCE_NAME = "bgp-peer-module-impl";
-    private static final String FACTORY_NAME = BGPPeerModuleFactory.NAME;
-
-    private static final IpAddress HOST = new IpAddress(new Ipv4Address("127.0.0.1"));
-    private static final PortNumber PORT_NUMBER = new PortNumber(1);
-
-    @Override
-    protected BindingRuntimeContext getBindingRuntimeContext() {
-        final BindingRuntimeContext ret = super.getBindingRuntimeContext();
-        doReturn(Ipv4AddressFamily.class).when(ret).getIdentityClass(Ipv4AddressFamily.QNAME);
-        doReturn(MplsLabeledVpnSubsequentAddressFamily.class).when(ret).getIdentityClass(MplsLabeledVpnSubsequentAddressFamily.QNAME);
-        return ret;
-    }
-
-    @Override
-    protected List<ModuleFactory> getModuleFactories() {
-        final List<ModuleFactory> moduleFactories = super.getModuleFactories();
-        moduleFactories.add(new BGPPeerModuleFactory());
-        moduleFactories.add(new BGPTableTypeImplModuleFactory());
-        moduleFactories.add(new StrictBgpPeerRegistryModuleFactory());
-        moduleFactories.add(new AddPathImplModuleFactory());
-        return moduleFactories;
-    }
-
-    @Test
-    public void testValidationExceptionPortNotSet() throws Exception {
-        try {
-            createBgpPeerInstance(HOST, null, false);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("Port value is not set."));
-        }
-    }
-
-    @Test
-    public void testValidationExceptionInternalPeerRole() throws Exception {
-        try {
-            createInternalBgpPeerInstance();
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("Internal Peer Role is reserved for Application Peer use."));
-        }
-    }
-
-    @Test
-    public void testValidationExceptionHostNotSet() throws Exception {
-        try {
-            createBgpPeerInstance(null, PORT_NUMBER, false);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("Host value is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createBgpPeerInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, EXP_INSTANCES, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        CommitStatus status = createBgpPeerInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, EXP_INSTANCES);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        CommitStatus status = createBgpPeerInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final BGPPeerModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
-            BGPPeerModuleMXBean.class);
-        mxBean.setPort(new PortNumber(10));
-        status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, EXP_INSTANCES - 1);
-    }
-
-    private ObjectName createBgpPeerInstance(final ConfigTransactionJMXClient transaction, final IpAddress host,
-            final PortNumber port, final boolean md5, final boolean internalPeerRole) throws Exception {
-        final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final BGPPeerModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BGPPeerModuleMXBean.class);
-
-        mxBean.setPeerRegistry(createPeerRegistry(transaction));
-        mxBean.setHost(host);
-        mxBean.setPort(port);
-        mxBean.setAdvertizedTable(Collections.emptyList());
-        mxBean.setRouteRefresh(false);
-        {
-            final ObjectName ribON = createRIBImplModuleInstance(transaction);
-            mxBean.setRib(ribON);
-        }
-        mxBean.setAddPath(createAddPathCollection(transaction));
-        if (Epoll.isAvailable()) {
-            mxBean.setPassword(Rfc2385Key.getDefaultInstance("foo"));
-        }
-        if (internalPeerRole) {
-            mxBean.setPeerRole(PeerRole.Internal);
-        }
-
-        mxBean.setAdvertizedTable(Lists.newArrayList(BGPTableTypeImplModuleTest.createTableInstance(transaction,
-            new IdentityAttributeRef(Ipv4AddressFamily.QNAME.toString()),
-            new IdentityAttributeRef(MplsLabeledVpnSubsequentAddressFamily.QNAME.toString()))));
-
-        final ObjectName notificationBrokerON = createNotificationBrokerInstance(transaction);
-        final ObjectName bindingBrokerON = createBindingBrokerImpl(transaction, createCompatibleDataBrokerInstance(transaction), notificationBrokerON);
-        mxBean.setRpcRegistry(bindingBrokerON);
-        return nameCreated;
-    }
-
-    private static List<ObjectName> createAddPathCollection(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        final ObjectName name1 = transaction.createModule(AddPathImplModuleFactory.NAME, "add-path-inst-1");
-        final AddPathImplModuleMXBean mxBean = transaction.newMXBeanProxy(name1, AddPathImplModuleMXBean.class);
-        mxBean.setAddressFamily(AddPathImplModuleTest.createAddressFamily(transaction, "add-path-inst-1"));
-        mxBean.setSendReceive(SendReceive.Both);
-
-        final ObjectName name2 = transaction.createModule(AddPathImplModuleFactory.NAME, "add-path-inst-2");
-        final AddPathImplModuleMXBean mxBean2 = transaction.newMXBeanProxy(name2, AddPathImplModuleMXBean.class);
-        mxBean2.setAddressFamily(AddPathImplModuleTest.createAddressFamily(transaction, "add-path-inst-2"));
-        mxBean2.setSendReceive(SendReceive.Receive);
-
-        final List<ObjectName> ret = new ArrayList<>();
-        ret.add(name1);
-        ret.add(name2);
-        return ret;
-    }
-
-    private static ObjectName createPeerRegistry(final ConfigTransactionJMXClient transaction) throws InstanceAlreadyExistsException {
-        return transaction.createModule(StrictBgpPeerRegistryModuleFactory.NAME, "peer-registry");
-    }
-
-    private CommitStatus createBgpPeerInstance() throws Exception {
-        return createBgpPeerInstance(false);
-    }
-
-    private CommitStatus createBgpPeerInstance(final boolean md5) throws Exception {
-        return createBgpPeerInstance(HOST, PORT_NUMBER, md5);
-    }
-
-    private CommitStatus createBgpPeerInstance(final IpAddress host, final PortNumber port, final boolean md5) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createBgpPeerInstance(transaction, host, port, md5, false);
-        return transaction.commit();
-    }
-
-    private CommitStatus createInternalBgpPeerInstance()
-        throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createBgpPeerInstance(transaction, HOST, PORT_NUMBER, false, true);
-        return transaction.commit();
-    }
-}
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/BGPTableTypeImplModuleTest.java
deleted file mode 100644 (file)
index 3e147cb..0000000
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.mockito.Mockito.doReturn;
-
-import javax.management.InstanceAlreadyExistsException;
-import javax.management.ObjectName;
-import org.junit.Before;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.ConflictingVersionException;
-import org.opendaylight.controller.config.api.IdentityAttributeRef;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.manager.impl.AbstractConfigTest;
-import org.opendaylight.controller.config.manager.impl.factoriesresolver.HardcodedModuleFactoriesResolver;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.mdsal.binding.generator.util.BindingRuntimeContext;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv4AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.Ipv6AddressFamily;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev130919.MplsLabeledVpnSubsequentAddressFamily;
-
-public class BGPTableTypeImplModuleTest extends AbstractConfigTest {
-
-    private static final String INSTANCE_NAME = "bgp-table-type-impl";
-    private static final String FACTORY_NAME = BGPTableTypeImplModuleFactory.NAME;
-
-    private final IdentityAttributeRef afiRef = new IdentityAttributeRef(Ipv4AddressFamily.QNAME.toString());
-    private final IdentityAttributeRef safiRef = new IdentityAttributeRef(MplsLabeledVpnSubsequentAddressFamily.QNAME.toString());
-
-    @Before
-    public void setUp() throws Exception {
-        super.initConfigTransactionManagerImpl(new HardcodedModuleFactoriesResolver(this.mockedContext, new BGPTableTypeImplModuleFactory()));
-    }
-
-    @Override
-    protected BindingRuntimeContext getBindingRuntimeContext() {
-        final BindingRuntimeContext ret = super.getBindingRuntimeContext();
-        doReturn(Ipv4AddressFamily.class).when(ret).getIdentityClass(Ipv4AddressFamily.QNAME);
-        doReturn(MplsLabeledVpnSubsequentAddressFamily.class).when(ret).getIdentityClass(MplsLabeledVpnSubsequentAddressFamily.QNAME);
-        doReturn(Ipv6AddressFamily.class).when(ret).getIdentityClass(Ipv6AddressFamily.QNAME);
-        return ret;
-    }
-
-    @Test
-    public void testValidationExceptionAfiNotSet() throws InstanceAlreadyExistsException, ConflictingVersionException {
-        try {
-            createInstance(null, this.safiRef);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("Afi value is not set."));
-        }
-    }
-
-    @Test
-    public void testValidationExceptionSafiNotSet() throws InstanceAlreadyExistsException, ConflictingVersionException {
-        try {
-            createInstance(this.afiRef, null);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("Safi value is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 1, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, 1);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final BGPTableTypeImplModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
-                BGPTableTypeImplModuleMXBean.class);
-        mxBean.setAfi(new IdentityAttributeRef(Ipv6AddressFamily.QNAME.toString()));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, 0);
-    }
-
-    private CommitStatus createInstance() throws Exception {
-        return createInstance(this.afiRef, this.safiRef);
-    }
-
-    private CommitStatus createInstance(final IdentityAttributeRef afiRef, final IdentityAttributeRef safiRef)
-            throws ConflictingVersionException, ValidationException, InstanceAlreadyExistsException {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        createTableInstance(transaction, afiRef, safiRef);
-        return transaction.commit();
-    }
-
-    public static ObjectName createTableInstance(final ConfigTransactionJMXClient transaction, final IdentityAttributeRef afiRef,
-            final IdentityAttributeRef safiRef) throws InstanceAlreadyExistsException {
-        final ObjectName nameCreated = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final BGPTableTypeImplModuleMXBean mxBean = transaction.newMXBeanProxy(nameCreated, BGPTableTypeImplModuleMXBean.class);
-
-        mxBean.setAfi(afiRef);
-        mxBean.setSafi(safiRef);
-        return nameCreated;
-    }
-
-}
diff --git a/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java b/bgp/rib-impl/src/test/java/org/opendaylight/controller/config/yang/bgp/rib/impl/RIBImplModuleTest.java
deleted file mode 100755 (executable)
index e1b5f83..0000000
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * Copyright (c) 2013 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.rib.impl;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber;
-
-public class RIBImplModuleTest extends AbstractRIBImplModuleTest {
-    private static final int EXP_INSTANCES = 7;
-    private static final AsNumber AS_NUMBER = new AsNumber(500L);
-    private static final String INSTANCE_NAME = "rib-impl";
-    private static final String FACTORY_NAME = RIBImplModuleFactory.NAME;
-
-    @Test
-    public void testValidationExceptionRibIdNotSet() throws Exception {
-        try {
-            createRIBImplModuleInstance(null, AS_NUMBER, BGP_ID, CLUSTER_ID);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("RibId is not set."));
-        }
-    }
-
-    @Test
-    public void testValidationExceptionLocalAsNotSet() throws Exception {
-        try {
-            createRIBImplModuleInstance(RIB_ID, null, BGP_ID, CLUSTER_ID);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("LocalAs is not set."));
-        }
-    }
-
-    @Test
-    public void testValidationExceptionBgpIdNotSet() throws Exception {
-        try {
-            createRIBImplModuleInstance(RIB_ID, AS_NUMBER, null, CLUSTER_ID);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("BgpRibId is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, EXP_INSTANCES, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, EXP_INSTANCES);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final RIBImplModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME, INSTANCE_NAME),
-                RIBImplModuleMXBean.class);
-        mxBean.setLocalAs(new AsNumber(100L));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, EXP_INSTANCES - 1);
-    }
-}
diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/AbstractTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/AbstractTopologyBuilderModuleTest.java
deleted file mode 100644 (file)
index d4a7889..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2016 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.topology.provider;
-
-import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyDeployer;
-import org.opendaylight.bgpcep.bgp.topology.provider.spi.BgpTopologyProvider;
-import org.opendaylight.bgpcep.bgp.topology.provider.spi.TopologyReferenceSingletonService;
-import org.opendaylight.bgpcep.topology.TopologyReference;
-import org.opendaylight.controller.config.yang.bgp.rib.impl.AbstractRIBImplModuleTest;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
-import org.opendaylight.yangtools.concepts.AbstractRegistration;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-
-public abstract class AbstractTopologyBuilderModuleTest extends AbstractRIBImplModuleTest {
-    @Override
-    public final void setUp() throws Exception {
-        super.setUp();
-        setupMockService(TopologyReference.class, (TopologyReference) () -> null);
-        setupMockService(BgpTopologyDeployer.class, new BgpTopologyDeployer() {
-            @Override
-            public AbstractRegistration registerTopologyProvider(final BgpTopologyProvider topologyBuilder) {
-                return null;
-            }
-            @Override
-            public DataBroker getDataBroker() {
-                return null;
-            }
-            @Override
-            public AbstractRegistration registerService(final TopologyReferenceSingletonService topologyProviderService) {
-                return null;
-            }
-
-            @Override
-            public void createInstance(final Topology topology) {
-
-            }
-
-            @Override
-            public void removeInstance(final Topology topology) {
-                return;
-            }
-
-            @Override
-            public InstanceIdentifier<Topology> getInstanceIdentifier() {
-                return null;
-            }
-        });
-    }
-}
diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv4ReachabilityTopologyBuilderModuleTest.java
deleted file mode 100644 (file)
index e46faa4..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.topology.provider;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-import javax.management.ObjectName;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.controller.config.yang.bgp.reachability.ipv4.Ipv4ReachabilityTopologyBuilderModuleFactory;
-import org.opendaylight.controller.config.yang.bgp.reachability.ipv4.Ipv4ReachabilityTopologyBuilderModuleMXBean;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
-
-public class Ipv4ReachabilityTopologyBuilderModuleTest extends AbstractTopologyBuilderModuleTest {
-
-    private static final String FACTORY_NAME = Ipv4ReachabilityTopologyBuilderModuleFactory.NAME;
-    private static final String INSTANCE_NAME = "bgp-reachability-ipv4-instance";
-
-    @Override
-    protected List<ModuleFactory> getModuleFactories() {
-        final List<ModuleFactory> moduleFactories = super.getModuleFactories();
-        moduleFactories.add(new Ipv4ReachabilityTopologyBuilderModuleFactory());
-        return moduleFactories;
-    }
-
-    @Override
-    public List<String> getYangModelsPaths() {
-        final List<String> paths = super.getYangModelsPaths();
-        paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/l3-unicast-igp-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/bgp-inet.yang");
-        paths.add("/META-INF/yang/bmp-monitor.yang");
-        paths.add("/META-INF/yang/bmp-message.yang");
-        paths.add("/META-INF/yang/ietf-yang-types@2013-07-15.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-types.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-config.yang");
-        return paths;
-    }
-
-    @Test
-    public void testValidationExceptionTopologyIdNotSet() throws Exception {
-        try {
-            createIpv4ReachabilityTopoBuilderModuleInstance(null);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("TopologyId is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createIpv4ReachabilityTopoBuilderModuleInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 8, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createIpv4ReachabilityTopoBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, 8);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createIpv4ReachabilityTopoBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final Ipv4ReachabilityTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME,
-                INSTANCE_NAME), Ipv4ReachabilityTopologyBuilderModuleMXBean.class);
-        mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, 7);
-    }
-
-    private CommitStatus createIpv4ReachabilityTopoBuilderModuleInstance() throws Exception {
-        return createIpv4ReachabilityTopoBuilderModuleInstance(new TopologyId("bgp-topology"));
-    }
-
-    private CommitStatus createIpv4ReachabilityTopoBuilderModuleInstance(final TopologyId topologyId) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        final ObjectName ipv4ReachabilityBuilderON = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final Ipv4ReachabilityTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(ipv4ReachabilityBuilderON,
-                Ipv4ReachabilityTopologyBuilderModuleMXBean.class);
-        final ObjectName dataBrokerON = createAsyncDataBrokerInstance(transaction);
-        mxBean.setDataProvider(dataBrokerON);
-        mxBean.setLocalRib(createRIBImplModuleInstance(transaction, dataBrokerON));
-        mxBean.setTopologyId(topologyId);
-        return transaction.commit();
-    }
-}
diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/Ipv6ReachabilityTopologyBuilderModuleTest.java
deleted file mode 100644 (file)
index c32ac7a..0000000
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.topology.provider;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-import javax.management.ObjectName;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.controller.config.yang.bgp.reachability.ipv6.Ipv6ReachabilityTopologyBuilderModuleFactory;
-import org.opendaylight.controller.config.yang.bgp.reachability.ipv6.Ipv6ReachabilityTopologyBuilderModuleMXBean;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
-
-public class Ipv6ReachabilityTopologyBuilderModuleTest extends AbstractTopologyBuilderModuleTest {
-
-    private static final String FACTORY_NAME = Ipv6ReachabilityTopologyBuilderModuleFactory.NAME;
-    private static final String INSTANCE_NAME = "bgp-reachability-ipv6-instance";
-
-    @Override
-    protected List<ModuleFactory> getModuleFactories() {
-        final List<ModuleFactory> moduleFactories = super.getModuleFactories();
-        moduleFactories.add(new Ipv6ReachabilityTopologyBuilderModuleFactory());
-        return moduleFactories;
-    }
-
-    @Override
-    public List<String> getYangModelsPaths() {
-        final List<String> paths = super.getYangModelsPaths();
-        paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/l3-unicast-igp-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/bgp-inet.yang");
-        paths.add("/META-INF/yang/bmp-monitor.yang");
-        paths.add("/META-INF/yang/bmp-message.yang");
-        paths.add("/META-INF/yang/ietf-yang-types@2013-07-15.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-types.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-config.yang");
-        return paths;
-    }
-
-    @Test
-    public void testValidationExceptionTopology() throws Exception {
-        try {
-            createIpv6ReachabilityTopoBuilderModuleInstance(null);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("TopologyId is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createIpv6ReachabilityTopoBuilderModuleInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 8, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createIpv6ReachabilityTopoBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, 8);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createIpv6ReachabilityTopoBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final Ipv6ReachabilityTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME,
-                INSTANCE_NAME), Ipv6ReachabilityTopologyBuilderModuleMXBean.class);
-        mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, 7);
-    }
-
-    private CommitStatus createIpv6ReachabilityTopoBuilderModuleInstance() throws Exception {
-        return createIpv6ReachabilityTopoBuilderModuleInstance(new TopologyId("bgp-topology"));
-    }
-
-    private CommitStatus createIpv6ReachabilityTopoBuilderModuleInstance(final TopologyId topologyId) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        final ObjectName ipv6ReachabilityBuilderON = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final Ipv6ReachabilityTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(ipv6ReachabilityBuilderON,
-                Ipv6ReachabilityTopologyBuilderModuleMXBean.class);
-        final ObjectName dataBrokerON = createAsyncDataBrokerInstance(transaction);
-        mxBean.setDataProvider(dataBrokerON);
-        mxBean.setLocalRib(createRIBImplModuleInstance(transaction, dataBrokerON));
-        mxBean.setTopologyId(topologyId);
-        return transaction.commit();
-    }
-}
diff --git a/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java b/bgp/topology-provider/src/test/java/org/opendaylight/controller/config/yang/bgp/topology/provider/LinkstateTopologyBuilderModuleTest.java
deleted file mode 100644 (file)
index 47e0a17..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2014 Cisco Systems, Inc. and others.  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.controller.config.yang.bgp.topology.provider;
-
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-
-import java.util.List;
-import javax.management.ObjectName;
-import org.junit.Test;
-import org.opendaylight.controller.config.api.ValidationException;
-import org.opendaylight.controller.config.api.jmx.CommitStatus;
-import org.opendaylight.controller.config.spi.ModuleFactory;
-import org.opendaylight.controller.config.util.ConfigTransactionJMXClient;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TopologyId;
-
-public class LinkstateTopologyBuilderModuleTest extends AbstractTopologyBuilderModuleTest {
-
-    private static final String FACTORY_NAME = LinkstateTopologyBuilderModuleFactory.NAME;
-    private static final String INSTANCE_NAME = "bgp-linkstate-topology-instance";
-
-    @Override
-    protected List<ModuleFactory> getModuleFactories() {
-        final List<ModuleFactory> moduleFactories = super.getModuleFactories();
-        moduleFactories.add(new LinkstateTopologyBuilderModuleFactory());
-        return moduleFactories;
-    }
-
-    @Override
-    public List<String> getYangModelsPaths() {
-        final List<String> paths = super.getYangModelsPaths();
-        paths.add("/META-INF/yang/network-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/l3-unicast-igp-topology@2013-10-21.yang");
-        paths.add("/META-INF/yang/bgp-linkstate.yang");
-        paths.add("/META-INF/yang/bgp-segment-routing.yang");
-        paths.add("/META-INF/yang/rsvp.yang");
-        paths.add("/META-INF/yang/iana.yang");
-        paths.add("/META-INF/yang/bgp-epe.yang");
-        paths.add("/META-INF/yang/bmp-monitor.yang");
-        paths.add("/META-INF/yang/bmp-message.yang");
-        paths.add("/META-INF/yang/ietf-yang-types@2013-07-15.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-types.yang");
-        paths.add("/META-INF/yang/odl-bgp-topology-config.yang");
-        return paths;
-    }
-
-    @Test
-    public void testValidationExceptionTopologyIdNotSet() throws Exception {
-        try {
-            createLinkstateTopologyBuilderModuleInstance(null);
-            fail();
-        } catch (final ValidationException e) {
-            assertTrue(e.getMessage().contains("TopologyId is not set."));
-        }
-    }
-
-    @Test
-    public void testCreateBean() throws Exception {
-        final CommitStatus status = createLinkstateTopologyBuilderModuleInstance();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 8, 0, 0);
-    }
-
-    @Test
-    public void testReusingOldInstance() throws Exception {
-        createLinkstateTopologyBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 0, 8);
-    }
-
-    @Test
-    public void testReconfigure() throws Exception {
-        createLinkstateTopologyBuilderModuleInstance();
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        assertBeanCount(1, FACTORY_NAME);
-        final LinkstateTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(transaction.lookupConfigBean(FACTORY_NAME,
-                INSTANCE_NAME), LinkstateTopologyBuilderModuleMXBean.class);
-        mxBean.setTopologyId(new TopologyId("new-bgp-topology"));
-        final CommitStatus status = transaction.commit();
-        assertBeanCount(1, FACTORY_NAME);
-        assertStatus(status, 0, 1, 7);
-    }
-
-    private CommitStatus createLinkstateTopologyBuilderModuleInstance() throws Exception {
-        return createLinkstateTopologyBuilderModuleInstance(new TopologyId("bgp-topology"));
-    }
-
-    private CommitStatus createLinkstateTopologyBuilderModuleInstance(final TopologyId topologyId) throws Exception {
-        final ConfigTransactionJMXClient transaction = this.configRegistryClient.createTransaction();
-        final ObjectName linkstateTopoBuilderON = transaction.createModule(FACTORY_NAME, INSTANCE_NAME);
-        final LinkstateTopologyBuilderModuleMXBean mxBean = transaction.newMXBeanProxy(linkstateTopoBuilderON,
-                LinkstateTopologyBuilderModuleMXBean.class);
-        final ObjectName dataBrokerON = createAsyncDataBrokerInstance(transaction);
-        mxBean.setDataProvider(dataBrokerON);
-        mxBean.setLocalRib(createRIBImplModuleInstance(transaction, dataBrokerON));
-        mxBean.setTopologyId(topologyId);
-        return transaction.commit();
-    }
-}