*/
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.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitch;
+import org.opendaylight.openflowplugin.api.openflow.md.ModelDrivenSwitchRegistration;
import org.opendaylight.openflowplugin.api.openflow.md.core.NotificationQueueWrapper;
-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.SessionListener;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionManager;
import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv6Address;
+import org.opendaylight.openflowplugin.openflow.md.core.role.OfEntityManager;
+import org.opendaylight.openflowplugin.openflow.md.core.sal.convertor.ConvertorExecutor;
+import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil;
+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.Ipv6Address;
+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.flow.inventory.rev130819.FlowCapableNodeUpdated;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeUpdatedBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
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.InstanceIdentifier.InstanceIdentifierBuilder;
*/
public class SalRegistrationManager implements SessionListener, AutoCloseable {
- private final static Logger LOG = LoggerFactory.getLogger(SalRegistrationManager.class);
-
- private ProviderContext providerContext;
+ private static final Logger LOG = LoggerFactory.getLogger(SalRegistrationManager.class);
+ private final ConvertorExecutor convertorExecutor;
private NotificationProviderService publishService;
private DataBroker dataService;
- private SwitchFeaturesUtil swFeaturesUtil;
+ private RpcProviderRegistry rpcProviderRegistry;
+
+ private final SwitchFeaturesUtil swFeaturesUtil;
private ListenerRegistration<SessionListener> sessionListenerRegistration;
- public SalRegistrationManager() {
+ private OfEntityManager entManager;
+
+ public SalRegistrationManager(ConvertorExecutor convertorExecutor) {
+ this.convertorExecutor = convertorExecutor;
swFeaturesUtil = SwitchFeaturesUtil.getInstance();
}
return publishService;
}
- public void setPublishService(NotificationProviderService publishService) {
+ public void setPublishService(final NotificationProviderService publishService) {
this.publishService = publishService;
}
- public ProviderContext getProviderContext() {
- return providerContext;
+ public void setDataService(final DataBroker dataService) {
+ this.dataService = dataService;
+ }
+
+ public void setRpcProviderRegistry(final RpcProviderRegistry rpcProviderRegistry) {
+ this.rpcProviderRegistry = rpcProviderRegistry;
+ }
+
+ public void setOfEntityManager(OfEntityManager entManager) {
+ this.entManager = entManager;
}
- public void onSessionInitiated(ProviderContext session) {
- LOG.debug("onSessionInitiated");
- this.providerContext = session;
- this.publishService = session.getSALService(NotificationProviderService.class);
- this.dataService = session.getSALService(DataBroker.class);
- // We register as listener for Session Manager
+ public void init() {
+ LOG.debug("init..");
sessionListenerRegistration = getSessionManager().registerSessionListener(this);
getSessionManager().setNotificationProviderService(publishService);
getSessionManager().setDataBroker(dataService);
}
@Override
- public void onSessionAdded(SwitchSessionKeyOF sessionKey, SessionContext context) {
+ public void onSessionAdded(final SwitchSessionKeyOF sessionKey, final SessionContext context) {
GetFeaturesOutput features = context.getFeatures();
BigInteger datapathId = features.getDatapathId();
InstanceIdentifier<Node> identifier = identifierFromDatapathId(datapathId);
NodeRef nodeRef = new NodeRef(identifier);
NodeId nodeId = nodeIdFromDatapathId(datapathId);
- ModelDrivenSwitchImpl ofSwitch = new ModelDrivenSwitchImpl(nodeId, identifier, context);
- CompositeObjectRegistration<ModelDrivenSwitch> registration = ofSwitch.register(providerContext);
- context.setProviderRegistration(registration);
-
- LOG.debug("ModelDrivenSwitch for {} registered to MD-SAL.", datapathId.toString());
+ ModelDrivenSwitch ofSwitch = new ModelDrivenSwitchImpl(nodeId, identifier, context, convertorExecutor);
NotificationQueueWrapper wrappedNotification = new NotificationQueueWrapper(
- nodeAdded(ofSwitch, features, nodeRef),
+ nodeAdded(ofSwitch, features, nodeRef),
context.getFeatures().getVersion());
- context.getNotificationEnqueuer().enqueueNotification(wrappedNotification);
+
+ reqOpenflowEntityOwnership(ofSwitch, context, wrappedNotification, rpcProviderRegistry);
}
@Override
- public void onSessionRemoved(SessionContext context) {
+ public void setRole (SessionContext context) {
+ entManager.setSlaveRole(context);
+ }
+
+ @Override
+ public void onSessionRemoved(final SessionContext context) {
GetFeaturesOutput features = context.getFeatures();
BigInteger datapathId = features.getDatapathId();
InstanceIdentifier<Node> identifier = identifierFromDatapathId(datapathId);
NodeRef nodeRef = new NodeRef(identifier);
+ NodeId nodeId = nodeIdFromDatapathId(datapathId);
+ unregOpenflowEntityOwnership(nodeId);
NodeRemoved nodeRemoved = nodeRemoved(nodeRef);
- if (context.isValid()) {
- CompositeObjectRegistration<ModelDrivenSwitch> registration = context.getProviderRegistration();
+
+ ModelDrivenSwitchRegistration registration = context.getProviderRegistration();
+ if (null != registration) {
registration.close();
+ context.setProviderRegistration(null);
}
+ LOG.debug("ModelDrivenSwitch for {} unregistered from MD-SAL.", datapathId);
- LOG.debug("ModelDrivenSwitch for {} unregistered from MD-SAL.", datapathId.toString());
-
NotificationQueueWrapper wrappedNotification = new NotificationQueueWrapper(
nodeRemoved, context.getFeatures().getVersion());
context.getNotificationEnqueuer().enqueueNotification(wrappedNotification);
}
- private NodeUpdated nodeAdded(ModelDrivenSwitch sw, GetFeaturesOutput features, NodeRef nodeRef) {
+ private NodeUpdated nodeAdded(final ModelDrivenSwitch sw, final GetFeaturesOutput features, final NodeRef nodeRef) {
NodeUpdatedBuilder builder = new NodeUpdatedBuilder();
builder.setId(sw.getNodeId());
builder.setNodeRef(nodeRef);
FlowCapableNodeUpdatedBuilder builder2 = new FlowCapableNodeUpdatedBuilder();
- builder2.setIpAddress(getIpAddressOf(sw));
+ try {
+ builder2.setIpAddress(getIpAddressOf(sw));
+ builder2.setPortNumber(getPortNumberOf(sw));
+ } catch (Exception e) {
+ LOG.warn("IP address/Port Number of the node {} cannot be obtained.", sw.getNodeId(), e);
+ }
builder2.setSwitchFeatures(swFeaturesUtil.buildSwitchFeatures(features));
builder.addAugmentation(FlowCapableNodeUpdated.class, builder2.build());
return builder.build();
}
- private IpAddress getIpAddressOf(ModelDrivenSwitch sw) {
+ private static IpAddress getIpAddressOf(final ModelDrivenSwitch sw) {
SessionContext sessionContext = sw.getSessionContext();
- if (!sessionContext.isValid()) {
- 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().getConnectionAdapter(),
+ "connection adapter of primary conductor must not be NULL -> " + sw.getNodeId());
InetSocketAddress remoteAddress = sessionContext.getPrimaryConductor().getConnectionAdapter()
.getRemoteAddress();
if (remoteAddress == null) {
return resolveIpAddress(remoteAddress.getAddress());
}
- private static IpAddress resolveIpAddress(InetAddress address) {
+ private static IpAddress resolveIpAddress(final InetAddress address) {
String hostAddress = address.getHostAddress();
if (address instanceof Inet4Address) {
return new IpAddress(new Ipv4Address(hostAddress));
throw new IllegalArgumentException("Unsupported IP address type!");
}
- private NodeRemoved nodeRemoved(NodeRef nodeRef) {
+ private static PortNumber getPortNumberOf(ModelDrivenSwitch sw) {
+ SessionContext sessionContext = sw.getSessionContext();
+
+ 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());
+ InetSocketAddress remoteAddress = sessionContext.getPrimaryConductor().getConnectionAdapter()
+ .getRemoteAddress();
+ if (remoteAddress == null) {
+ LOG.warn("Port Number of the node {} cannot be obtained. No connection with switch.", sw.getNodeId());
+ return null;
+ }
+ return resolvePortNumber(remoteAddress.getPort());
+ }
+
+ private static PortNumber resolvePortNumber(int port) {
+ PortNumber portNo = new PortNumber(port);
+ return portNo;
+ }
+
+ private static NodeRemoved nodeRemoved(final NodeRef nodeRef) {
NodeRemovedBuilder builder = new NodeRemovedBuilder();
builder.setNodeRef(nodeRef);
return builder.build();
}
- public static InstanceIdentifier<Node> identifierFromDatapathId(BigInteger datapathId) {
+ public static InstanceIdentifier<Node> identifierFromDatapathId(final BigInteger datapathId) {
NodeKey nodeKey = nodeKeyFromDatapathId(datapathId);
InstanceIdentifierBuilder<Node> builder = InstanceIdentifier.builder(Nodes.class).child(Node.class, nodeKey);
- return builder.toInstance();
+ return builder.build();
}
- public static NodeKey nodeKeyFromDatapathId(BigInteger datapathId) {
+ public static NodeKey nodeKeyFromDatapathId(final BigInteger datapathId) {
return new NodeKey(nodeIdFromDatapathId(datapathId));
}
- public static NodeId nodeIdFromDatapathId(BigInteger datapathId) {
+ public static NodeId nodeIdFromDatapathId(final BigInteger datapathId) {
// FIXME: Convert to textual representation of datapathID
- String current = datapathId.toString();
+ String current = String.valueOf(datapathId);
return new NodeId("openflow:" + current);
}
@Override
public void close() {
- LOG.debug("close");
dataService = null;
- providerContext = null;
+ rpcProviderRegistry = null;
publishService = null;
if (sessionListenerRegistration != null) {
sessionListenerRegistration.close();
}
}
+
+ private void reqOpenflowEntityOwnership(ModelDrivenSwitch ofSwitch,
+ SessionContext context,
+ NotificationQueueWrapper wrappedNotification,
+ RpcProviderRegistry rpcProviderRegistry) {
+ context.setValid(true);
+ entManager.requestOpenflowEntityOwnership(ofSwitch, context, wrappedNotification, rpcProviderRegistry);
+ }
+
+ private void unregOpenflowEntityOwnership(NodeId nodeId) {
+ entManager.unregisterEntityOwnershipRequest(nodeId);
+ }
+
}
Code Review / openflowplugin.git / blobdiff