-/**
+/*
* Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
*
* This program and the accompanying materials are made available under the
*/
package org.opendaylight.openflowplugin.applications.topology.manager;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
import org.junit.Before;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
-import org.opendaylight.controller.md.sal.binding.api.BindingTransactionChain;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
-import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.ModificationType;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
-import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.TransactionChainListener;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.DataObjectModification;
+import org.opendaylight.mdsal.binding.api.DataObjectModification.ModificationType;
+import org.opendaylight.mdsal.binding.api.DataTreeIdentifier;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.mdsal.binding.api.TransactionChain;
+import org.opendaylight.mdsal.binding.api.TransactionChainListener;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnectorBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortConfig;
@Mock
private DataBroker mockDataBroker;
@Mock
- protected BindingTransactionChain mockTxChain;
+ protected TransactionChain mockTxChain;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
- doReturn(mockTxChain).when(mockDataBroker)
- .createTransactionChain(any(TransactionChainListener.class));
+ doReturn(mockTxChain).when(mockDataBroker).createTransactionChain(any(TransactionChainListener.class));
processor = new OperationProcessor(mockDataBroker);
executor.shutdownNow();
}
- protected FlowCapableNodeConnector provideFlowCapableNodeConnector(final boolean isLinkDown, final boolean isPortDown) {
+ protected FlowCapableNodeConnector provideFlowCapableNodeConnector(final boolean isLinkDown,
+ final boolean isPortDown) {
FlowCapableNodeConnectorBuilder builder = new FlowCapableNodeConnectorBuilder();
builder.setState(new StateBuilder().setLinkDown(isLinkDown).build());
builder.setConfiguration(new PortConfig(true, true, true, isPortDown));
return builder.build();
}
- protected <T extends DataObject> DataTreeModification setupDataTreeChange(final ModificationType type,
+ protected <T extends DataObject> DataTreeModification<T> setupDataTreeChange(final ModificationType type,
final InstanceIdentifier<T> ii) {
final DataTreeModification dataTreeModification = mock(DataTreeModification.class);
- final DataTreeIdentifier identifier = new DataTreeIdentifier(LogicalDatastoreType.OPERATIONAL, ii);
+ final DataTreeIdentifier<T> identifier = DataTreeIdentifier.create(LogicalDatastoreType.OPERATIONAL, ii);
when(dataTreeModification.getRootNode()).thenReturn(mock(DataObjectModification.class));
when(dataTreeModification.getRootNode().getModificationType()).thenReturn(type);
when(dataTreeModification.getRootPath()).thenReturn(identifier);
when(dataTreeModification.getRootNode().getDataAfter()).thenReturn(mock(FlowCapableNodeConnector.class));
return dataTreeModification;
}
-
}