*/
package org.opendaylight.netvirt.dhcpservice;
+import com.google.common.base.Optional;
import java.math.BigInteger;
-
+import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.apache.commons.lang3.tuple.Pair;
import org.opendaylight.controller.md.sal.binding.api.ClusteredDataChangeListener;
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.datastoreutils.AsyncClusteredDataChangeListenerBase;
+import org.opendaylight.genius.mdsalutil.MDSALUtil;
+import org.opendaylight.netvirt.dhcpservice.api.DHCPMConstants;
import org.opendaylight.netvirt.elanmanager.utils.ElanL2GwCacheUtils;
import org.opendaylight.netvirt.neutronvpn.api.l2gw.L2GatewayDevice;
-import org.opendaylight.vpnservice.datastoreutils.AsyncClusteredDataChangeListenerBase;
-import org.opendaylight.vpnservice.mdsalutil.MDSALUtil;
-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.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalUcastMacs;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.concepts.ListenerRegistration;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-
public class DhcpUCastMacListener extends AsyncClusteredDataChangeListenerBase<LocalUcastMacs, DhcpUCastMacListener> implements AutoCloseable {
private static final Logger logger = LoggerFactory.getLogger(DhcpUCastMacListener.class);
- private DataBroker broker;
- private ListenerRegistration<DataChangeListener> listenerRegistration;
- private DhcpExternalTunnelManager dhcpExternalTunnelManager;
- public DhcpUCastMacListener(DhcpExternalTunnelManager dhcpManager, DataBroker dataBroker) {
+ private final DhcpExternalTunnelManager dhcpExternalTunnelManager;
+ private DhcpManager dhcpManager;
+ private final DataBroker broker;
+
+ public DhcpUCastMacListener(DhcpManager dhcpManager,DhcpExternalTunnelManager dhcpExtTunnelMgr, DataBroker dataBroker) {
super(LocalUcastMacs.class, DhcpUCastMacListener.class);
this.broker = dataBroker;
- this.dhcpExternalTunnelManager = dhcpManager;
+ this.dhcpExternalTunnelManager = dhcpExtTunnelMgr;
+ this.dhcpManager = dhcpManager;
+ }
+
+ public void init() {
+ registerListener(LogicalDatastoreType.OPERATIONAL, broker);
}
@Override
@Override
public void close() throws Exception {
- if (listenerRegistration != null) {
- try {
- listenerRegistration.close();
- } catch (final Exception e) {
- logger.error("Error when cleaning up DataChangeListener.", e);
- }
- listenerRegistration = null;
- }
+ super.close();
logger.info("DhcpUCastMacListener Closed");
}
protected void remove(InstanceIdentifier<LocalUcastMacs> identifier,
LocalUcastMacs del) {
// Flow removal for table 18 is handled in Neutron Port delete.
+ //remove the new CR-DHCP
+ NodeId torNodeId = identifier.firstKeyOf(Node.class).getNodeId();
+ LogicalSwitches logicalSwitch = getLogicalSwitches(del);
+ if (null == logicalSwitch) {
+ logger.error("DhcpUCastMacListener remove :Logical Switch ref doesn't have data {}", logicalSwitch);
+ return;
+ }
+ String elanInstanceName = logicalSwitch.getHwvtepNodeName().getValue();
+ L2GatewayDevice device = ElanL2GwCacheUtils.getL2GatewayDeviceFromCache(elanInstanceName, torNodeId.getValue());
+ if (device == null) {
+ logger.error("Logical Switch Device with name {} is not present in L2GWCONN cache", elanInstanceName);
+ return;
+ }
+ IpAddress tunnelIp = device.getTunnelIp();
+ Pair<IpAddress, String> tunnelIpElanName = new ImmutablePair<IpAddress, String>(tunnelIp, elanInstanceName);
+ dhcpExternalTunnelManager.removeFromAvailableCache(tunnelIpElanName);
}
@Override
return;
}
IpAddress tunnelIp = device.getTunnelIp();
+ Subnet subnet = dhcpManager.getNeutronSubnet(port);
+ if (null != subnet && !subnet.isEnableDhcp()) {
+ dhcpExternalTunnelManager.updateExistingVMTunnelIPCache(tunnelIp, elanInstanceName, macAddress);
+ logger.warn("DhcpUCastMacListener add: flag for the subnetId "+subnet.getUuid()+ " is False so Table 18 " +
+ "entries are not added" );
+ return;
+ }
BigInteger designatedDpnId = dhcpExternalTunnelManager.readDesignatedSwitchesForExternalTunnel(tunnelIp, elanInstanceName);
+ if (designatedDpnId == null || designatedDpnId.equals(DHCPMConstants.INVALID_DPID)) {
+ logger.trace("Unable to install flows for macAddress {}. TunnelIp {}, elanInstanceName {}, designatedDpn {} ", macAddress, tunnelIp, elanInstanceName, designatedDpnId);
+ dhcpExternalTunnelManager.updateLocalCache(tunnelIp, elanInstanceName, macAddress);
+ return;
+ }
dhcpExternalTunnelManager.installDhcpFlowsForVms(tunnelIp, elanInstanceName, DhcpServiceUtils.getListOfDpns(broker), designatedDpnId, macAddress);
}
protected DataChangeScope getDataChangeScope() {
return DataChangeScope.SUBTREE;
}
-}
\ No newline at end of file
+
+ private LogicalSwitches getLogicalSwitches(LocalUcastMacs ucastMacs) {
+ LogicalSwitches logicalSwitch = null;
+ InstanceIdentifier<LogicalSwitches> logicalSwitchRef = (InstanceIdentifier<LogicalSwitches>)
+ ucastMacs.getLogicalSwitchRef().getValue();
+ Optional<LogicalSwitches> logicalSwitchOptional = MDSALUtil.read(broker, LogicalDatastoreType.OPERATIONAL,
+ logicalSwitchRef);
+ if (logicalSwitchOptional.isPresent()) {
+ logicalSwitch = logicalSwitchOptional.get();
+ }
+ return logicalSwitch;
+ }
+}