* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.neutronvpn;
-
+import java.math.BigInteger;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.DataChangeListener;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.genius.mdsalutil.AbstractDataChangeListener;
+import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
+import org.opendaylight.netvirt.neutronvpn.api.utils.NeutronConstants;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.Bgpvpns;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.Bgpvpn;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.BgpvpnTypeBase;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.BgpvpnTypeL3;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.CreateIdPoolInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.IdManagerService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.vpnmaps.VpnMap;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.BgpvpnTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.BgpvpnTypeL3;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.Bgpvpns;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.Bgpvpn;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.osgi.framework.BundleContext;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.math.BigInteger;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-
-public class NeutronBgpvpnChangeListener extends AbstractDataChangeListener<Bgpvpn> implements AutoCloseable {
+public class NeutronBgpvpnChangeListener extends AsyncDataTreeChangeListenerBase<Bgpvpn, NeutronBgpvpnChangeListener>
+ implements AutoCloseable {
private static final Logger LOG = LoggerFactory.getLogger(NeutronBgpvpnChangeListener.class);
+ private final DataBroker dataBroker;
+ private final NeutronvpnManager nvpnManager;
+ private final IdManagerService idManager;
+ private final String adminRDValue;
- private ListenerRegistration<DataChangeListener> listenerRegistration;
- private NeutronvpnManager nvpnManager;
- private IdManagerService idManager;
- private String adminRDValue;
- private DataBroker dbroker;
-
-
- public NeutronBgpvpnChangeListener(final DataBroker db, NeutronvpnManager nVpnMgr) {
- super(Bgpvpn.class);
+ public NeutronBgpvpnChangeListener(final DataBroker dataBroker, final NeutronvpnManager nVpnMgr,
+ final IdManagerService idManager) {
+ super(Bgpvpn.class, NeutronBgpvpnChangeListener.class);
+ this.dataBroker = dataBroker;
nvpnManager = nVpnMgr;
- dbroker = db;
- registerListener(db);
+ this.idManager = idManager;
BundleContext bundleContext=FrameworkUtil.getBundle(NeutronBgpvpnChangeListener.class).getBundleContext();
adminRDValue = bundleContext.getProperty(NeutronConstants.RD_PROPERTY_KEY);
}
- @Override
- public void close() throws Exception {
- if (listenerRegistration != null) {
- try {
- listenerRegistration.close();
- } catch (final Exception e) {
- LOG.error("Error when cleaning up DataChangeListener.", e);
- }
- listenerRegistration = null;
- }
- LOG.info("N_Bgpvpn listener Closed");
+ public void start() {
+ LOG.info("{} start", getClass().getSimpleName());
+ createIdPool();
+ registerListener(LogicalDatastoreType.CONFIGURATION, dataBroker);
}
-
- private void registerListener(final DataBroker db) {
- try {
- listenerRegistration = db.registerDataChangeListener(LogicalDatastoreType.CONFIGURATION,
- InstanceIdentifier.create(Neutron.class).child(Bgpvpns.class).child(Bgpvpn.class),
- NeutronBgpvpnChangeListener.this, DataChangeScope.SUBTREE);
- } catch (final Exception e) {
- LOG.error("Neutron Manager Bgpvpn DataChange listener registration fail!", e);
- throw new IllegalStateException("Neutron Manager Bgpvpn DataChange listener registration failed.", e);
- }
+ @Override
+ protected InstanceIdentifier<Bgpvpn> getWildCardPath() {
+ return InstanceIdentifier.create(Neutron.class).child(Bgpvpns.class).child(Bgpvpn.class);
}
- public void setIdManager(IdManagerService idManager) {
- this.idManager = idManager;
- createIdPool();
+ @Override
+ protected NeutronBgpvpnChangeListener getDataTreeChangeListener() {
+ return NeutronBgpvpnChangeListener.this;
}
private boolean isBgpvpnTypeL3(Class<? extends BgpvpnTypeBase> bgpvpnType) {
@Override
protected void add(InstanceIdentifier<Bgpvpn> identifier, Bgpvpn input) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Adding Bgpvpn : key: " + identifier + ", value=" + input);
- }
+ LOG.trace("Adding Bgpvpn : key: {}, value={}", identifier, input);
if (isBgpvpnTypeL3(input.getType())) {
- // Create internal VPN
- // handle route-target
- List<String> importRouteTargets = new ArrayList<>();
- List<String> exportRouteTargets = new ArrayList<>();
+ // handle route-target(s)
+ List<String> importRouteTargets = new ArrayList<String>();
+ List<String> exportRouteTargets = new ArrayList<String>();
List<String> inputRouteList = input.getRouteTargets();
List<String> inputImportRouteList = input.getImportTargets();
List<String> inputExportRouteList = input.getExportTargets();
+ Set<String> inputImportRouteSet = new HashSet<>();
+ Set<String> inputExportRouteSet = new HashSet<>();
+
if (inputRouteList != null && !inputRouteList.isEmpty()) {
- importRouteTargets.addAll(inputRouteList);
- exportRouteTargets.addAll(inputRouteList);
+ inputImportRouteSet.addAll(inputRouteList);
+ inputExportRouteSet.addAll(inputRouteList);
}
if (inputImportRouteList != null && !inputImportRouteList.isEmpty()) {
- importRouteTargets.addAll(inputImportRouteList);
+ inputImportRouteSet.addAll(inputImportRouteList);
}
if (inputExportRouteList != null && !inputExportRouteList.isEmpty()) {
- exportRouteTargets.addAll(inputExportRouteList);
+ inputExportRouteSet.addAll(inputExportRouteList);
}
+
+ importRouteTargets.addAll(inputImportRouteSet);
+ exportRouteTargets.addAll(inputExportRouteSet);
+
List<String> rd = input.getRouteDistinguishers();
if (rd == null || rd.isEmpty()) {
// generate new RD
rd = generateNewRD(input.getUuid());
- }else {
+ } else {
String[] rdParams = rd.get(0).split(":");
if (rdParams[0].trim().equals(adminRDValue)) {
LOG.error("AS specific part of RD should not be same as that defined by DC Admin");
router = input.getRouters().get(0);
}
if (rd != null) {
- nvpnManager.createL3Vpn(input.getUuid(), input.getName(), input.getTenantId(), rd,
- importRouteTargets, exportRouteTargets, router, input.getNetworks());
- }else {
+ try {
+ nvpnManager.createL3Vpn(input.getUuid(), input.getName(), input.getTenantId(), rd, importRouteTargets,
+ exportRouteTargets, router, input.getNetworks());
+ } catch (Exception e) {
+ LOG.error("Creation of BGPVPN {} failed with error message {}. ", input.getUuid(),
+ e.getMessage(), e);
+ }
+ } else {
LOG.error("Create BgpVPN with id " + input.getUuid() + " failed due to missing/invalid RD value.");
}
}
-
}
private List<String> generateNewRD(Uuid vpn) {
- List<String> rd = null;
if (adminRDValue != null) {
Integer rdId = NeutronvpnUtils.getUniqueRDId(idManager, NeutronConstants.RD_IDPOOL_NAME, vpn.toString());
if (rdId != null) {
- rd = new ArrayList<>(Arrays.asList(adminRDValue + ":" + rdId));
+ String rd = adminRDValue + ":" + rdId;
+ LOG.debug("Generated RD {} for L3VPN {}", rd, vpn);
+ return Collections.singletonList(rd);
}
- LOG.debug("Generated RD " + rd.get(0) + " for L3VPN " + vpn);
}
- return rd;
+ return Collections.emptyList();
}
@Override
protected void remove(InstanceIdentifier<Bgpvpn> identifier, Bgpvpn input) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Removing Bgpvpn : key: " + identifier + ", value=" + input);
- }
+ LOG.trace("Removing Bgpvpn : key: {}, value={}", identifier, input);
if (isBgpvpnTypeL3(input.getType())) {
nvpnManager.removeL3Vpn(input.getUuid());
+ // Release RD Id in pool
NeutronvpnUtils.releaseRDId(idManager, NeutronConstants.RD_IDPOOL_NAME, input.getUuid().toString());
}
-
-
}
@Override
protected void update(InstanceIdentifier<Bgpvpn> identifier, Bgpvpn original, Bgpvpn update) {
- if (LOG.isTraceEnabled()) {
- LOG.trace("Update Bgpvpn : key: " + identifier + ", value=" + update);
- }
+ LOG.trace("Update Bgpvpn : key: {}, value={}", identifier, update);
if (isBgpvpnTypeL3(update.getType())) {
List<Uuid> oldNetworks = original.getNetworks();
List<Uuid> newNetworks = update.getNetworks();
Uuid vpnId = update.getUuid();
handleNetworksUpdate(vpnId, oldNetworks, newNetworks);
handleRoutersUpdate(vpnId, oldRouters, newRouters);
-
}
}
if (oldNetworks != newNetworks) {
Iterator<Uuid> iter = newNetworks.iterator();
while (iter.hasNext()) {
- Object net = iter.next();
+ Uuid net = iter.next();
if (oldNetworks.contains(net)) {
oldNetworks.remove(net);
iter.remove();
if (newRouters != null && !newRouters.isEmpty()) {
if (oldRouters != null && !oldRouters.isEmpty()) {
if (oldRouters.size() > 1 || newRouters.size() > 1) {
- VpnMap vpnMap = NeutronvpnUtils.getVpnMap(dbroker, vpnId);
+ VpnMap vpnMap = NeutronvpnUtils.getVpnMap(dataBroker, vpnId);
if (vpnMap.getRouterId() != null) {
LOG.warn("Only Single Router association to a given bgpvpn is allowed .Kindly de-associate " +
"router " + vpnMap.getRouterId().getValue() + " from vpn " + vpnId + " before " +
private boolean validateRouteInfo(Uuid routerID) {
Uuid assocVPNId;
- if ((assocVPNId = NeutronvpnUtils.getVpnForRouter(dbroker, routerID, true)) != null) {
+ if ((assocVPNId = NeutronvpnUtils.getVpnForRouter(dataBroker, routerID, true)) != null) {
LOG.warn("VPN router association failed due to router " + routerID.getValue()
+ " already associated to another VPN " + assocVPNId.getValue());
return false;
return true;
}
-}
+}
\ No newline at end of file
Code Review / netvirt.git / blobdiff