*/
package org.opendaylight.netvirt.neutronvpn;
-import com.google.common.base.Optional;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ExecutionException;
import java.util.stream.Collectors;
-import javax.annotation.Nonnull;
-import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
+import org.opendaylight.infrautils.utils.concurrent.Executors;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.elanmanager.api.IElanService;
import org.opendaylight.netvirt.neutronvpn.api.utils.NeutronUtils;
+import org.opendaylight.serviceutils.tools.listener.AbstractAsyncDataTreeChangeListener;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.ElanInstances;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.elan.rev150602.SegmentTypeFlat;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.neutron.networks.network.Segments;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint32;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Singleton
-public class NeutronNetworkChangeListener
- extends AsyncDataTreeChangeListenerBase<Network, NeutronNetworkChangeListener> {
+public class NeutronNetworkChangeListener extends AbstractAsyncDataTreeChangeListener<Network> {
private static final Logger LOG = LoggerFactory.getLogger(NeutronNetworkChangeListener.class);
private final DataBroker dataBroker;
private final NeutronvpnManager nvpnManager;
public NeutronNetworkChangeListener(final DataBroker dataBroker, final NeutronvpnManager neutronvpnManager,
final NeutronvpnNatManager neutronvpnNatManager,
final IElanService elanService, final NeutronvpnUtils neutronvpnUtils) {
- super(Network.class, NeutronNetworkChangeListener.class);
+ super(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Neutron.class)
+ .child(Networks.class).child(Network.class), Executors.newSingleThreadExecutor(
+ "NeutronNetworkChangeListener", LOG));
this.dataBroker = dataBroker;
nvpnManager = neutronvpnManager;
nvpnNatManager = neutronvpnNatManager;
this.neutronvpnUtils = neutronvpnUtils;
}
- @Override
- @PostConstruct
public void init() {
LOG.info("{} init", getClass().getSimpleName());
- registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
}
@Override
- protected InstanceIdentifier<Network> getWildCardPath() {
- return InstanceIdentifier.create(Neutron.class).child(Networks.class).child(Network.class);
+ @PreDestroy
+ public void close() {
+ super.close();
+ Executors.shutdownAndAwaitTermination(getExecutorService());
}
@Override
- protected NeutronNetworkChangeListener getDataTreeChangeListener() {
- return NeutronNetworkChangeListener.this;
- }
-
-
- @Override
- protected void add(InstanceIdentifier<Network> identifier, Network input) {
+ public void add(InstanceIdentifier<Network> identifier, Network input) {
LOG.trace("Adding Network : key: {}, value={}", identifier, input);
String networkId = input.getUuid().getValue();
if (!NeutronvpnUtils.isNetworkTypeSupported(input)) {
LOG.error("Neutronvpn doesn't support the provider type for given network {}", networkId);
return;
}
- Class<? extends NetworkTypeBase> networkType = input.getAugmentation(NetworkProviderExtension.class)
+ Class<? extends NetworkTypeBase> networkType = input.augmentation(NetworkProviderExtension.class)
.getNetworkType();
if (NeutronvpnUtils.isVlanOrVxlanNetwork(networkType)
&& NeutronUtils.getSegmentationIdFromNeutronNetwork(input, networkType) == null) {
}
@Override
- protected void remove(InstanceIdentifier<Network> identifier, Network input) {
+ public void remove(InstanceIdentifier<Network> identifier, Network input) {
LOG.trace("Removing Network : key: {}, value={}", identifier, input);
if (NeutronvpnUtils.getIsExternal(input)) {
if (NeutronvpnUtils.isFlatOrVlanNetwork(input)) {
}
@Override
- protected void update(InstanceIdentifier<Network> identifier, Network original, Network update) {
+ public void update(InstanceIdentifier<Network> identifier, Network original, Network update) {
LOG.trace("Updating Network : key: {}, original value={}, update value={}", identifier, original, update);
neutronvpnUtils.addToNetworkCache(update);
String elanInstanceName = original.getUuid().getValue();
}
}
- @Nonnull
+ @NonNull
private List<ElanSegments> buildSegments(Network input) {
- NetworkProviderExtension providerExtension = input.getAugmentation(NetworkProviderExtension.class);
+ NetworkProviderExtension providerExtension = input.augmentation(NetworkProviderExtension.class);
if (providerExtension == null || providerExtension.getSegments() == null) {
return Collections.emptyList();
}
return 0L;
}
+ @Nullable
private Class<? extends SegmentTypeBase> elanSegmentTypeFromNetworkType(
- Class<? extends NetworkTypeBase> networkType) {
+ @Nullable Class<? extends NetworkTypeBase> networkType) {
if (networkType == null) {
return null;
}
private ElanInstance createElanInstance(Network input) {
String elanInstanceName = input.getUuid().getValue();
InstanceIdentifier<ElanInstance> id = createElanInstanceIdentifier(elanInstanceName);
- Optional<ElanInstance> existingElanInstance = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION,
- id);
- if (existingElanInstance.isPresent()) {
- return existingElanInstance.get();
+ Optional<ElanInstance> existingElanInstance = null;
+ try {
+ existingElanInstance = MDSALUtil.read(dataBroker, LogicalDatastoreType.CONFIGURATION,
+ id);
+ if (existingElanInstance.isPresent()) {
+ return existingElanInstance.get();
+ }
+ } catch (ExecutionException | InterruptedException e) {
+ LOG.error("createElanInstance: failed to read elanInstance {} due to exception ", elanInstanceName, e);
}
Class<? extends SegmentTypeBase> segmentType = NeutronvpnUtils.getSegmentTypeFromNeutronNetwork(input);
String segmentationId = NeutronvpnUtils.getSegmentationIdFromNeutronNetwork(input);
String physicalNetworkName = NeutronvpnUtils.getPhysicalNetworkName(input);
- long elanTag = elanService.retrieveNewElanTag(elanInstanceName);
+ Uint32 elanTag = elanService.retrieveNewElanTag(elanInstanceName);
ElanInstance elanInstance = createElanInstanceBuilder(elanInstanceName, segmentType, segmentationId,
physicalNetworkName, input).setElanTag(elanTag).build();
MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, id, elanInstance);
elanInstanceBuilder.setElanSegments(segments);
elanInstanceBuilder.setExternal(isExternal);
- elanInstanceBuilder.setKey(new ElanInstanceKey(elanInstanceName));
+ elanInstanceBuilder.withKey(new ElanInstanceKey(elanInstanceName));
return elanInstanceBuilder;
}
Code Review / netvirt.git / blobdiff