import org.opendaylight.openflowplugin.api.openflow.device.Xid;
import org.opendaylight.openflowplugin.api.openflow.device.exception.DeviceDataException;
import org.opendaylight.openflowplugin.api.openflow.device.listener.OpenflowMessageListenerFacade;
-import org.opendaylight.openflowplugin.api.openflow.flow.registry.DeviceFlowRegistry;
import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher;
import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey;
+import org.opendaylight.openflowplugin.api.openflow.registry.flow.DeviceFlowRegistry;
+import org.opendaylight.openflowplugin.api.openflow.registry.group.DeviceGroupRegistry;
+import org.opendaylight.openflowplugin.api.openflow.registry.meter.DeviceMeterRegistry;
+import org.opendaylight.openflowplugin.api.openflow.statistics.ofpspecific.MessageSpy;
import org.opendaylight.openflowplugin.impl.common.NodeStaticReplyTranslatorUtil;
-import org.opendaylight.openflowplugin.impl.flow.registry.DeviceFlowRegistryImpl;
+import org.opendaylight.openflowplugin.impl.registry.flow.DeviceFlowRegistryImpl;
+import org.opendaylight.openflowplugin.impl.registry.group.DeviceGroupRegistryImpl;
+import org.opendaylight.openflowplugin.impl.registry.meter.DeviceMeterRegistryImpl;
import org.opendaylight.openflowplugin.openflow.md.core.session.SwitchConnectionCookieOFImpl;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNodeConnector;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
private TranslatorLibrary translatorLibrary;
private OpenflowMessageListenerFacade openflowMessageListenerFacade;
private final DeviceFlowRegistry deviceFlowRegistry;
+ private final DeviceGroupRegistry deviceGroupRegistry;
+ private final DeviceMeterRegistry deviceMeterRegistry;
private Timeout barrierTaskTimeout;
private NotificationProviderService notificationService;
+ private final MessageSpy messageSpy;
+
@VisibleForTesting
DeviceContextImpl(@Nonnull final ConnectionContext primaryConnectionContext,
- @Nonnull final DeviceState deviceState, @Nonnull final DataBroker dataBroker,
- @Nonnull final HashedWheelTimer hashedWheelTimer) {
+ @Nonnull final DeviceState deviceState,
+ @Nonnull final DataBroker dataBroker,
+ @Nonnull final HashedWheelTimer hashedWheelTimer,
+ @Nonnull final MessageSpy _messageSpy) {
this.primaryConnectionContext = Preconditions.checkNotNull(primaryConnectionContext);
this.deviceState = Preconditions.checkNotNull(deviceState);
this.dataBroker = Preconditions.checkNotNull(dataBroker);
auxiliaryConnectionContexts = new HashMap<>();
requests = new HashMap<>();
deviceFlowRegistry = new DeviceFlowRegistryImpl();
+ deviceGroupRegistry = new DeviceGroupRegistryImpl();
+ deviceMeterRegistry = new DeviceMeterRegistryImpl();
+ messageSpy = _messageSpy;
}
/**
return deviceFlowRegistry;
}
+ @Override
+ public DeviceGroupRegistry getDeviceGroupRegistry() {
+ return deviceGroupRegistry;
+ }
+
+ @Override
+ public DeviceMeterRegistry getDeviceMeterRegistry() {
+ return deviceMeterRegistry;
+ }
+
@Override
public void processReply(final OfHeader ofHeader) {
final RequestContext requestContext = getRequests().get(ofHeader.getXid());
nConnectorBuilder.addAugmentation(FlowCapableNodeConnectorStatisticsData.class, new FlowCapableNodeConnectorStatisticsDataBuilder().build());
nConnectorBuilder.addAugmentation(FlowCapableNodeConnector.class, flowCapableNodeConnector);
writeToTransaction(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector, nConnectorBuilder.build());
- } else if (portStatus.getReason().equals(PortReason.OFPPRDELETE) ) {
+ } else if (portStatus.getReason().equals(PortReason.OFPPRDELETE)) {
addDeleteToTxChain(LogicalDatastoreType.OPERATIONAL, iiToNodeConnector);
}
}
return hashedWheelTimer;
}
+ @Override
+ public void close() throws Exception {
+ for (Map.Entry<Long, RequestContext> entry : requests.entrySet()){
+ entry.getValue().close();
+ }
+ }
+
private class XidGenerator {