*/
package org.opendaylight.openflowplugin.openflow.md.core.sal;
+import com.google.common.base.Preconditions;
import java.math.BigInteger;
import java.net.Inet4Address;
import java.net.Inet6Address;
import java.net.InetAddress;
import java.net.InetSocketAddress;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
/**
* session and inventory listener implementation
*/
LOG.debug("ModelDrivenSwitch for {} registered to MD-SAL.", datapathId.toString());
NotificationQueueWrapper wrappedNotification = new NotificationQueueWrapper(
- nodeAdded(ofSwitch, features, nodeRef),
+ nodeAdded(ofSwitch, features, nodeRef),
context.getFeatures().getVersion());
context.getNotificationEnqueuer().enqueueNotification(wrappedNotification);
}
InstanceIdentifier<Node> identifier = identifierFromDatapathId(datapathId);
NodeRef nodeRef = new NodeRef(identifier);
NodeRemoved nodeRemoved = nodeRemoved(nodeRef);
- if (context.isValid()) {
- CompositeObjectRegistration<ModelDrivenSwitch> registration = context.getProviderRegistration();
+
+ CompositeObjectRegistration<ModelDrivenSwitch> registration = context.getProviderRegistration();
+ if (null != registration) {
registration.close();
+ context.setProviderRegistration(null);
}
-
LOG.debug("ModelDrivenSwitch for {} unregistered from MD-SAL.", datapathId.toString());
-
+
NotificationQueueWrapper wrappedNotification = new NotificationQueueWrapper(
nodeRemoved, context.getFeatures().getVersion());
context.getNotificationEnqueuer().enqueueNotification(wrappedNotification);
// LOG.warn("IP address of the node {} cannot be obtained. Session is not valid.", sw.getNodeId());
// return null;
// }
- Preconditions.checkNotNull(sessionContext.getPrimaryConductor(),
- "primary conductor must not be NULL -> "+sw.getNodeId());
+ Preconditions.checkNotNull(sessionContext.getPrimaryConductor(),
+ "primary conductor must not be NULL -> " + sw.getNodeId());
Preconditions.checkNotNull(sessionContext.getPrimaryConductor().getConnectionAdapter(),
- "connection adapter of primary conductor must not be NULL -> "+sw.getNodeId());
+ "connection adapter of primary conductor must not be NULL -> " + sw.getNodeId());
InetSocketAddress remoteAddress = sessionContext.getPrimaryConductor().getConnectionAdapter()
.getRemoteAddress();
if (remoteAddress == null) {
sessionListenerRegistration.close();
}
}
-
+
/**
* @param providerContext the providerContext to set
*/
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListeningExecutorService;
-
import java.math.BigInteger;
import java.util.Collections;
import java.util.Set;
-import java.util.concurrent.ExecutorService;
-
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.runners.MockitoJUnitRunner;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.NotificationListener;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.controller.sal.common.util.Rpcs;
-import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitch;
import org.opendaylight.openflowplugin.api.OFConstants;
+import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitch;
import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor;
import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationEnqueuer;
import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService;
-import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
-import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF;
+import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
+import org.opendaylight.openflowplugin.openflow.md.core.session.SessionContextOFImpl;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.UpdateFlowOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.FlowModInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.GetFeaturesOutput;
import org.opendaylight.yangtools.concepts.CompositeObjectRegistration;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier;
-import org.opendaylight.yangtools.yang.binding.Notification;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
private static final BigInteger dataPathId = BigInteger.ONE;
private SalRegistrationManager salRegistrationManager;
- @Mock
- private SessionContext context;
+
+ private SessionContextOFImpl context;
@Mock
private ConnectionConductor conductor;
@Mock
@Before
public void setUp() {
OFSessionUtil.getSessionManager().setRpcPool(rpcPool);
-
- Mockito.when(context.getPrimaryConductor()).thenReturn(conductor);
- Mockito.when(context.getMessageDispatchService()).thenReturn(messageDispatchService);
Mockito.when(conductor.getVersion()).thenReturn(OFConstants.OFP_VERSION_1_0)
.thenReturn(OFConstants.OFP_VERSION_1_3);
- Mockito.when(context.getFeatures()).thenReturn(features);
+ context = new SessionContextOFImpl();
+ context.setPrimaryConductor(conductor);
+ Mockito.when(features.getDatapathId()).thenReturn(BigInteger.valueOf(1));
+ Mockito.when(features.getVersion()).thenReturn((short) 1);
+ context.setFeatures(features);
+ context.setNotificationEnqueuer(notificationEnqueuer);
mdSwitchOF13 = new ModelDrivenSwitchImpl(null, null, context);
registration = new CompositeObjectRegistration<>(mdSwitchOF13, Collections.EMPTY_LIST);
+ context.setProviderRegistration(registration);
- Mockito.when(context.getProviderRegistration()).thenReturn(registration);
- Mockito.when(context.getNotificationEnqueuer()).thenReturn(notificationEnqueuer);
- Mockito.when(features.getDatapathId()).thenReturn(BigInteger.valueOf(1));
- Mockito.when(features.getVersion()).thenReturn((short) 1);
Set<RpcError> errorSet = Collections.emptySet();
UpdateFlowOutputBuilder updateFlowOutput = new UpdateFlowOutputBuilder();
salRegistrationManager = new SalRegistrationManager();
salRegistrationManager.onSessionInitiated(providerContext);
salRegistrationManager.setPublishService(notificationProviderService);
+
}
-
+
/**
* free sesion manager
*/
*/
@Test
public void testOnSessionRemoved() {
+ assertNotNull(context.getProviderRegistration());
salRegistrationManager.onSessionRemoved(context);
+ assertNull(context.getProviderRegistration());
}
/**