*/
package org.opendaylight.netvirt.qosservice;
-import com.google.common.base.Optional;
-import java.math.BigInteger;
+import static java.util.Collections.emptyList;
+import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArraySet;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
import javax.inject.Inject;
import javax.inject.Singleton;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.jdt.annotation.Nullable;
+import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
+import org.opendaylight.genius.infra.Datastore;
import org.opendaylight.genius.infra.ManagedNewTransactionRunner;
import org.opendaylight.genius.infra.ManagedNewTransactionRunnerImpl;
+import org.opendaylight.genius.infra.TypedWriteTransaction;
import org.opendaylight.genius.mdsalutil.ActionInfo;
import org.opendaylight.genius.mdsalutil.FlowEntity;
import org.opendaylight.genius.mdsalutil.InstructionInfo;
import org.opendaylight.genius.mdsalutil.matches.MatchMetadata;
import org.opendaylight.genius.utils.ServiceIndex;
import org.opendaylight.infrautils.jobcoordinator.JobCoordinator;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
import org.opendaylight.ovsdb.utils.southbound.utils.SouthboundUtils;
-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.interfaces.rev140508.InterfacesState;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface;
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.netvirt.neutronvpn.rev150602.subnetmaps.Subnetmap;
import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev150602.subnetmaps.SubnetmapKey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes.FixedIps;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosNetworkExtension;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosPortExtension;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.Uint64;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public Collection<Port> getQosPorts(Uuid qosUuid) {
final ConcurrentMap<Uuid, Port> portMap = qosPortsMap.get(qosUuid);
- return portMap != null ? portMap.values() : Collections.emptyList();
+ return portMap != null ? portMap.values() : emptyList();
}
public void addToQosPortsCache(Uuid qosUuid, Port port) {
}
}
- @Nonnull
+ @NonNull
public Collection<Network> getQosNetworks(Uuid qosUuid) {
final ConcurrentMap<Uuid, Network> networkMap = qosNetworksMap.get(qosUuid);
- return networkMap != null ? networkMap.values() : Collections.emptyList();
+ return networkMap != null ? networkMap.values() : emptyList();
}
- @Nonnull
+ @NonNull
public List<Uuid> getSubnetIdsFromNetworkId(Uuid networkId) {
InstanceIdentifier<NetworkMap> networkMapId = InstanceIdentifier.builder(NetworkMaps.class)
.child(NetworkMap.class, new NetworkMapKey(networkId)).build();
Optional<NetworkMap> optionalNetworkMap = MDSALUtil.read(LogicalDatastoreType.CONFIGURATION,
networkMapId, dataBroker);
- return optionalNetworkMap.isPresent() ? optionalNetworkMap.get().getSubnetIdList() : Collections.emptyList();
+ return (optionalNetworkMap.isPresent() && optionalNetworkMap.get().getSubnetIdList() != null)
+ ? optionalNetworkMap.get().getSubnetIdList() : emptyList();
}
- @Nonnull
+ @NonNull
protected List<Uuid> getPortIdsFromSubnetId(Uuid subnetId) {
InstanceIdentifier<Subnetmap> subnetMapId = InstanceIdentifier
.builder(Subnetmaps.class)
.child(Subnetmap.class, new SubnetmapKey(subnetId)).build();
Optional<Subnetmap> optionalSubnetmap = MDSALUtil.read(LogicalDatastoreType.CONFIGURATION,
subnetMapId,dataBroker);
- return optionalSubnetmap.isPresent() ? optionalSubnetmap.get().getPortList() : Collections.emptyList();
+ return (optionalSubnetmap.isPresent() && optionalSubnetmap.get().getPortList() != null)
+ ? optionalSubnetmap.get().getPortList() : emptyList();
}
public void handleNeutronPortQosAdd(Port port, Uuid qosUuid) {
- LOG.trace("Handling Port add and QoS associated: port: {} qos: {}", port.getUuid(), qosUuid);
+ LOG.debug("Handling Port add and QoS associated: port: {} qos: {}", port.getUuid().getValue(),
+ qosUuid.getValue());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(),
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
// handle Bandwidth Limit Rules update
if (qosPolicy != null && qosPolicy.getBandwidthLimitRules() != null
&& !qosPolicy.getBandwidthLimitRules().isEmpty()) {
}
public void handleQosInterfaceAdd(Port port, Uuid qosUuid) {
- LOG.trace("Handling Port add and QoS associated: port: {} qos: {}", port.getUuid(), qosUuid);
+ LOG.debug("Handling Port add and QoS associated: port: {} qos: {}", port.getUuid().getValue(),
+ qosUuid.getValue());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
- jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(), () ->
- Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
- // handle DSCP Mark Rules update
- if (qosPolicy != null && qosPolicy.getDscpmarkingRules() != null
- && !qosPolicy.getDscpmarkingRules().isEmpty()) {
- setPortDscpMarking(port, qosPolicy.getDscpmarkingRules().get(0));
- }
- })));
+ jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(), () -> {
+ // handle DSCP Mark Rules update
+ if (qosPolicy != null && qosPolicy.getDscpmarkingRules() != null
+ && !qosPolicy.getDscpmarkingRules().isEmpty()) {
+ setPortDscpMarking(port, qosPolicy.getDscpmarkingRules().get(0));
+ }
+ return emptyList();
+ });
}
public void handleNeutronPortQosUpdate(Port port, Uuid qosUuidNew, Uuid qosUuidOld) {
- LOG.trace("Handling Port QoS update: port: {} qosservice: {}", port.getUuid(), qosUuidNew);
+ LOG.debug("Handling Port QoS update: port: {} qosservice: {}", port.getUuid().getValue(),
+ qosUuidNew.getValue());
QosPolicy qosPolicyNew = qosPolicyMap.get(qosUuidNew);
QosPolicy qosPolicyOld = qosPolicyMap.get(qosUuidOld);
jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(),
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
// handle Bandwidth Limit Rules update
if (qosPolicyNew != null && qosPolicyNew.getBandwidthLimitRules() != null
&& !qosPolicyNew.getBandwidthLimitRules().isEmpty()) {
&& !qosPolicyOld.getBandwidthLimitRules().isEmpty()) {
BandwidthLimitRulesBuilder bwLimitBuilder = new BandwidthLimitRulesBuilder();
setPortBandwidthLimits(port, bwLimitBuilder
- .setMaxBurstKbps(BigInteger.ZERO)
- .setMaxKbps(BigInteger.ZERO).build(), tx);
+ .setMaxBurstKbps(Uint64.ZERO)
+ .setMaxKbps(Uint64.ZERO).build(), tx);
}
}
//handle DSCP Mark Rules update
}
public void handleNeutronPortQosRemove(Port port, Uuid qosUuid) {
- LOG.trace("Handling Port QoS removal: port: {} qosservice: {}", port.getUuid(), qosUuid);
+ LOG.debug("Handling Port QoS removal: port: {} qosservice: {}", port.getUuid().getValue(), qosUuid.getValue());
// check for network qosservice to apply
Network network = neutronVpnManager.getNeutronNetwork(port.getNetworkId());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(),
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION, tx -> {
// handle Bandwidth Limit Rules removal
if (qosPolicy != null && qosPolicy.getBandwidthLimitRules() != null
&& !qosPolicy.getBandwidthLimitRules().isEmpty()) {
BandwidthLimitRulesBuilder bwLimitBuilder = new BandwidthLimitRulesBuilder();
setPortBandwidthLimits(port, bwLimitBuilder
- .setMaxBurstKbps(BigInteger.ZERO)
- .setMaxKbps(BigInteger.ZERO).build(), tx);
+ .setMaxBurstKbps(Uint64.ZERO)
+ .setMaxKbps(Uint64.ZERO).build(), tx);
}
// handle DSCP MArk Rules removal
if (qosPolicy != null && qosPolicy.getDscpmarkingRules() != null
}
public void handleNeutronPortRemove(Port port, Uuid qosUuid) {
- LOG.trace("Handling Port removal and Qos associated: port: {} qos: {}", port.getUuid(), qosUuid);
+ LOG.debug("Handling Port removal and Qos associated: port: {} qos: {}", port.getUuid().getValue(),
+ qosUuid.getValue());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(), () -> {
&& !qosPolicy.getDscpmarkingRules().isEmpty()) {
unsetPortDscpMark(port);
}
- return Collections.emptyList();
+ return emptyList();
});
}
public void handleNeutronPortRemove(Port port, Uuid qosUuid, Interface intrf) {
- LOG.trace("Handling Port removal and Qos associated: port: {} qos: {}", port.getUuid(), qosUuid);
+ LOG.debug("Handling Port removal and Qos associated: port: {} qos: {}", port.getUuid().getValue(),
+ qosUuid.getValue());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
jobCoordinator.enqueueJob("QosPort-" + port.getUuid().getValue(), () -> {
&& !qosPolicy.getDscpmarkingRules().isEmpty()) {
unsetPortDscpMark(port, intrf);
}
- return Collections.emptyList();
+ return emptyList();
});
}
public void handleNeutronNetworkQosUpdate(Network network, Uuid qosUuid) {
- LOG.trace("Handling Network QoS update: net: {} qosservice: {}", network.getUuid(), qosUuid);
+ LOG.debug("Handling Network QoS update: net: {} qosservice: {}", network.getUuid().getValue(), qosUuid);
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
if (qosPolicy == null || (qosPolicy.getBandwidthLimitRules() == null
|| qosPolicy.getBandwidthLimitRules().isEmpty())
if (port != null && (port.augmentation(QosPortExtension.class) == null
|| port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) {
jobCoordinator.enqueueJob("QosPort-" + portId.getValue(),
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
- if (qosPolicy.getBandwidthLimitRules() != null
- && !qosPolicy.getBandwidthLimitRules().isEmpty()) {
- setPortBandwidthLimits(port, qosPolicy.getBandwidthLimitRules().get(0), tx);
- }
- if (qosPolicy.getDscpmarkingRules() != null
- && !qosPolicy.getDscpmarkingRules().isEmpty()) {
- setPortDscpMarking(port, qosPolicy.getDscpmarkingRules().get(0));
- }
- })));
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ CONFIGURATION, tx -> {
+ if (qosPolicy.getBandwidthLimitRules() != null
+ && !qosPolicy.getBandwidthLimitRules().isEmpty()) {
+ setPortBandwidthLimits(port, qosPolicy.getBandwidthLimitRules().get(0), tx);
+ }
+ if (qosPolicy.getDscpmarkingRules() != null
+ && !qosPolicy.getDscpmarkingRules().isEmpty()) {
+ setPortDscpMarking(port, qosPolicy.getDscpmarkingRules().get(0));
+ }
+ })));
}
}
}
}
public void handleNeutronNetworkQosRemove(Network network, Uuid qosUuid) {
- LOG.trace("Handling Network QoS removal: net: {} qosservice: {}", network.getUuid(), qosUuid);
+ LOG.debug("Handling Network QoS removal: net: {} qosservice: {}", network.getUuid().getValue(),
+ qosUuid.getValue());
QosPolicy qosPolicy = qosPolicyMap.get(qosUuid);
List<Uuid> subnetIds = getSubnetIdsFromNetworkId(network.getUuid());
if (port != null && (port.augmentation(QosPortExtension.class) == null
|| port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) {
jobCoordinator.enqueueJob("QosPort-" + portId.getValue(),
- () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> {
- if (qosPolicy != null && qosPolicy.getBandwidthLimitRules() != null
- && !qosPolicy.getBandwidthLimitRules().isEmpty()) {
- BandwidthLimitRulesBuilder bwLimitBuilder = new BandwidthLimitRulesBuilder();
- setPortBandwidthLimits(port, bwLimitBuilder
- .setMaxBurstKbps(BigInteger.ZERO)
- .setMaxKbps(BigInteger.ZERO).build(), tx);
- }
- if (qosPolicy != null && qosPolicy.getDscpmarkingRules() != null
- && !qosPolicy.getDscpmarkingRules().isEmpty()) {
- unsetPortDscpMark(port);
- }
- })));
+ () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ CONFIGURATION, tx -> {
+ if (qosPolicy != null && qosPolicy.getBandwidthLimitRules() != null
+ && !qosPolicy.getBandwidthLimitRules().isEmpty()) {
+ BandwidthLimitRulesBuilder bwLimitBuilder = new BandwidthLimitRulesBuilder();
+ setPortBandwidthLimits(port, bwLimitBuilder
+ .setMaxBurstKbps(Uint64.ZERO)
+ .setMaxKbps(Uint64.ZERO).build(), tx);
+ }
+ if (qosPolicy != null && qosPolicy.getDscpmarkingRules() != null
+ && !qosPolicy.getDscpmarkingRules().isEmpty()) {
+ unsetPortDscpMark(port);
+ }
+ })));
}
}
}
}
public void handleNeutronNetworkQosBwRuleRemove(Network network, BandwidthLimitRules zeroBwLimitRule) {
- LOG.trace("Handling Qos Bandwidth Rule Remove, net: {}", network.getUuid());
+ LOG.debug("Handling Qos Bandwidth Rule Remove, net: {}", network.getUuid().getValue());
List<Uuid> subnetIds = getSubnetIdsFromNetworkId(network.getUuid());
if (port != null && (port.augmentation(QosPortExtension.class) == null
|| port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) {
jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> Collections.singletonList(
- txRunner.callWithNewWriteOnlyTransactionAndSubmit(
+ txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
tx -> setPortBandwidthLimits(port, zeroBwLimitRule, tx))));
}
}
}
public void handleNeutronNetworkQosDscpRuleRemove(Network network) {
- LOG.trace("Handling Qos Dscp Rule Remove, net: {}", network.getUuid());
+ LOG.debug("Handling Qos Dscp Rule Remove, net: {}", network.getUuid().getValue());
List<Uuid> subnetIds = getSubnetIdsFromNetworkId(network.getUuid());
|| port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) {
jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> {
unsetPortDscpMark(port);
- return Collections.emptyList();
+ return emptyList();
});
}
}
// TODO Clean up the exception handling
@SuppressWarnings("checkstyle:IllegalCatch")
- public void setPortBandwidthLimits(Port port, BandwidthLimitRules bwLimit, WriteTransaction writeConfigTxn) {
+ public void setPortBandwidthLimits(Port port, BandwidthLimitRules bwLimit,
+ TypedWriteTransaction<Datastore.Configuration> writeConfigTxn) {
if (!qosEosHandler.isQosClusterOwner()) {
- LOG.trace("Not Qos Cluster Owner. Ignoring setting bandwidth limits");
+ LOG.debug("Not Qos Cluster Owner. Ignoring setting bandwidth limits");
return;
}
- LOG.trace("Setting bandwidth limits {} on Port {}", port, bwLimit);
-
- BigInteger dpId = getDpnForInterface(port.getUuid().getValue());
- if (dpId.equals(BigInteger.ZERO)) {
+ Uint64 dpId = getDpnForInterface(port.getUuid().getValue());
+ if (dpId.equals(Uint64.ZERO)) {
LOG.info("DPN ID for interface {} not found", port.getUuid().getValue());
return;
}
+ LOG.trace("Setting bandwidth limits {} on Port {}", port.getUuid().getValue(), bwLimit);
OvsdbBridgeRef bridgeRefEntry = getBridgeRefEntryFromOperDS(dpId);
Optional<Node> bridgeNode = MDSALUtil.read(LogicalDatastoreType.OPERATIONAL,
bridgeRefEntry.getValue().firstIdentifierOf(Node.class), dataBroker);
-
+ if (!bridgeNode.isPresent()) {
+ LOG.error("bridge not found for dpn {} port {} in operational datastore", dpId, port.getUuid().getValue());
+ return;
+ }
+ LOG.debug("bridgeNode {}", bridgeNode.get().getNodeId().getValue());
TerminationPoint tp = SouthboundUtils.getTerminationPointByExternalId(bridgeNode.get(),
port.getUuid().getValue());
+ if (tp == null) {
+ LOG.debug("Skipping setting of bandwidth limit rules for subport {}",
+ port.getUuid().getValue());
+ return;
+ }
+ LOG.debug("tp: {}", tp.getTpId().getValue());
OvsdbTerminationPointAugmentation ovsdbTp = tp.augmentation(OvsdbTerminationPointAugmentation.class);
OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder();
tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
try {
if (writeConfigTxn != null) {
- writeConfigTxn.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier
+ writeConfigTxn.merge(InstanceIdentifier
.create(NetworkTopology.class)
.child(Topology.class, new TopologyKey(SouthboundUtils.OVSDB_TOPOLOGY_ID))
.child(Node.class, bridgeNode.get().key())
.child(TerminationPoint.class, new TerminationPointKey(tp.key())), tpBuilder.build());
}
} catch (Exception e) {
- LOG.error("Failure while setting BwLimitRule {} to port {}", bwLimit, port, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Failure while setting BwLimitRule {} to port {} exception ", bwLimit,
+ port.getUuid().getValue(), e);
+ } else {
+ LOG.error("Failure while setting BwLimitRule {} to port {}", bwLimit, port.getUuid().getValue());
+ }
}
}
public void setPortDscpMarking(Port port, DscpmarkingRules dscpMark) {
- if (!qosEosHandler.isQosClusterOwner()) {
- LOG.trace("Not Qos Cluster Owner. Ignoring setting DSCP marking");
- return;
- }
- LOG.trace("Setting DSCP value {} on Port {}", port, dscpMark);
- BigInteger dpnId = getDpnForInterface(port.getUuid().getValue());
+ Uint64 dpnId = getDpnForInterface(port.getUuid().getValue());
String ifName = port.getUuid().getValue();
- IpAddress ipAddress = port.getFixedIps().get(0).getIpAddress();
- Short dscpValue = dscpMark.getDscpMark();
- if (dpnId.equals(BigInteger.ZERO)) {
- LOG.info("DPN ID for interface {} not found", port.getUuid().getValue());
+ if (dpnId.equals(Uint64.ZERO)) {
+ LOG.info("DPN ID for interface {} not found. Cannot set dscp value {} on port {}",
+ port.getUuid().getValue(), dscpMark, port.getUuid().getValue());
return;
}
- //1. OF rules
- addFlow(dpnId, dscpValue, ifName, ipAddress, getInterfaceStateFromOperDS(ifName));
- if (qosServiceConfiguredPorts.add(port.getUuid())) {
- // bind qos service to interface
- bindservice(ifName);
+ if (!qosEosHandler.isQosClusterOwner()) {
+ qosServiceConfiguredPorts.add(port.getUuid());
+ LOG.trace("Not Qos Cluster Owner. Ignoring setting DSCP marking");
+ return;
+ } else {
+ Interface ifState = getInterfaceStateFromOperDS(ifName);
+ Short dscpValue = dscpMark.getDscpMark().toJava();
+ int ipVersions = getIpVersions(port);
+ //1. OF rules
+ if (hasIpv4Addr(ipVersions)) {
+ LOG.trace("setting ipv4 flow for port: {}, dscp: {}", ifName, dscpValue);
+ addFlow(dpnId, dscpValue, ifName, NwConstants.ETHTYPE_IPV4, ifState);
+ }
+ if (hasIpv6Addr(ipVersions)) {
+ LOG.trace("setting ipv6 flow for port: {}, dscp: {}", ifName, dscpValue);
+ addFlow(dpnId, dscpValue, ifName, NwConstants.ETHTYPE_IPV6, ifState);
+ }
+
+ if (qosServiceConfiguredPorts.add(port.getUuid())) {
+ // bind qos service to interface
+ bindservice(ifName);
+ }
+
}
}
public void unsetPortDscpMark(Port port) {
- if (!qosEosHandler.isQosClusterOwner()) {
- LOG.trace("Not Qos Cluster Owner. Ignoring unsetting DSCP marking");
- return;
- }
- LOG.trace("Removing dscp marking rule from Port {}", port);
- BigInteger dpnId = getDpnForInterface(port.getUuid().getValue());
+ Uint64 dpnId = getDpnForInterface(port.getUuid().getValue());
String ifName = port.getUuid().getValue();
- if (dpnId.equals(BigInteger.ZERO)) {
- LOG.info("DPN ID for port {} not found", port);
+ if (dpnId.equals(Uint64.ZERO)) {
+ LOG.debug("DPN ID for port {} not found. Cannot unset dscp value", port.getUuid().getValue());
return;
}
- //unbind service from interface
- unbindservice(ifName);
- // 1. OF
- removeFlow(dpnId, ifName, getInterfaceStateFromOperDS(ifName));
- qosServiceConfiguredPorts.remove(port.getUuid());
+ if (!qosEosHandler.isQosClusterOwner()) {
+ qosServiceConfiguredPorts.remove(port.getUuid());
+ LOG.debug("Not Qos Cluster Owner. Ignoring unsetting DSCP marking");
+ return;
+ } else {
+ LOG.trace("Removing dscp marking rule from Port {}", port.getUuid().getValue());
+ Interface intf = getInterfaceStateFromOperDS(ifName);
+ //unbind service from interface
+ unbindservice(ifName);
+ // 1. OF
+ int ipVersions = getIpVersions(port);
+ if (hasIpv4Addr(ipVersions)) {
+ removeFlow(dpnId, ifName, NwConstants.ETHTYPE_IPV4, intf);
+ }
+ if (hasIpv6Addr(ipVersions)) {
+ removeFlow(dpnId, ifName, NwConstants.ETHTYPE_IPV6, intf);
+ }
+ qosServiceConfiguredPorts.remove(port.getUuid());
+ }
}
public void unsetPortDscpMark(Port port, Interface intrf) {
- LOG.trace("Removing dscp marking rule from Port {}", port);
- BigInteger dpnId = getDpIdFromInterface(intrf);
+ Uint64 dpnId = getDpIdFromInterface(intrf);
String ifName = port.getUuid().getValue();
- if (dpnId.equals(BigInteger.ZERO)) {
- LOG.error("Unable to retrieve DPN Id for interface {}", ifName);
+ if (dpnId.equals(Uint64.ZERO)) {
+ LOG.error("Unable to retrieve DPN Id for interface {}. Cannot unset dscp value on port", ifName);
return;
}
- unbindservice(ifName);
- removeFlow(dpnId, ifName, intrf);
+ if (!qosEosHandler.isQosClusterOwner()) {
+ qosServiceConfiguredPorts.remove(port.getUuid());
+ return;
+ } else {
+ LOG.trace("Removing dscp marking rule from Port {}", port.getUuid().getValue());
+ unbindservice(ifName);
+ int ipVersions = getIpVersions(port);
+ if (hasIpv4Addr(ipVersions)) {
+ removeFlow(dpnId, ifName, NwConstants.ETHTYPE_IPV4, intrf);
+ }
+ if (hasIpv6Addr(ipVersions)) {
+ removeFlow(dpnId, ifName, NwConstants.ETHTYPE_IPV6, intrf);
+ }
+ qosServiceConfiguredPorts.remove(port.getUuid());
+ }
}
- private static BigInteger getDpIdFromInterface(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+ private static Uint64 getDpIdFromInterface(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
.interfaces.rev140508.interfaces.state.Interface ifState) {
String lowerLayerIf = ifState.getLowerLayerIf().get(0);
NodeConnectorId nodeConnectorId = new NodeConnectorId(lowerLayerIf);
- return BigInteger.valueOf(MDSALUtil.getDpnIdFromPortName(nodeConnectorId));
+ Long dpIdLong = MDSALUtil.getDpnIdFromPortName(nodeConnectorId);
+ Uint64 dpnId = dpIdLong < 0 ? Uint64.ZERO : Uint64.valueOf(dpIdLong);
+ return dpnId;
}
- public BigInteger getDpnForInterface(String ifName) {
- BigInteger nodeId = BigInteger.ZERO;
+ public Uint64 getDpnForInterface(String ifName) {
+ Uint64 nodeId = Uint64.ZERO;
try {
GetDpidFromInterfaceInput
dpIdInput = new GetDpidFromInterfaceInputBuilder().setIntfName(ifName).build();
LOG.error("Could not retrieve DPN Id for interface {}", ifName);
}
} catch (NullPointerException | InterruptedException | ExecutionException e) {
- LOG.error("Exception when getting dpn for interface {}", ifName, e);
+ if (LOG.isDebugEnabled()) {
+ LOG.debug("Exception when getting DPN for interface {} exception ", ifName, e);
+ } else {
+ LOG.error("Could not retrieve DPN for interface {}", ifName);
+ }
}
return nodeId;
}
@Nullable
- private BridgeEntry getBridgeEntryFromConfigDS(BigInteger dpnId) {
+ private BridgeEntry getBridgeEntryFromConfigDS(Uint64 dpnId) {
BridgeEntryKey bridgeEntryKey = new BridgeEntryKey(dpnId);
InstanceIdentifier<BridgeEntry> bridgeEntryInstanceIdentifier = getBridgeEntryIdentifier(bridgeEntryKey);
LOG.debug("Trying to retrieve bridge entry from config for Id: {}", bridgeEntryInstanceIdentifier);
@Nullable
private BridgeEntry getBridgeEntryFromConfigDS(InstanceIdentifier<BridgeEntry> bridgeEntryInstanceIdentifier) {
- return MDSALUtil.read(LogicalDatastoreType.CONFIGURATION, bridgeEntryInstanceIdentifier, dataBroker).orNull();
+ return MDSALUtil.read(LogicalDatastoreType.CONFIGURATION, bridgeEntryInstanceIdentifier, dataBroker)
+ .orElse(null);
}
@Nullable
private BridgeRefEntry getBridgeRefEntryFromOperDS(InstanceIdentifier<BridgeRefEntry> dpnBridgeEntryIid) {
- return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, dpnBridgeEntryIid, dataBroker).orNull();
+ return MDSALUtil.read(LogicalDatastoreType.OPERATIONAL, dpnBridgeEntryIid, dataBroker).orElse(null);
}
@Nullable
- private OvsdbBridgeRef getBridgeRefEntryFromOperDS(BigInteger dpId) {
+ private OvsdbBridgeRef getBridgeRefEntryFromOperDS(Uint64 dpId) {
BridgeRefEntryKey bridgeRefEntryKey = new BridgeRefEntryKey(dpId);
InstanceIdentifier<BridgeRefEntry> bridgeRefEntryIid = getBridgeRefEntryIdentifier(bridgeRefEntryKey);
BridgeRefEntry bridgeRefEntry = getBridgeRefEntryFromOperDS(bridgeRefEntryIid);
return bridgeRefEntry.getBridgeReference();
}
- @Nonnull
+ @NonNull
private static InstanceIdentifier<BridgeRefEntry> getBridgeRefEntryIdentifier(BridgeRefEntryKey bridgeRefEntryKey) {
return InstanceIdentifier.builder(BridgeRefInfo.class).child(BridgeRefEntry.class, bridgeRefEntryKey).build();
}
- @Nonnull
+ @NonNull
private static InstanceIdentifier<BridgeEntry> getBridgeEntryIdentifier(BridgeEntryKey bridgeEntryKey) {
return InstanceIdentifier.builder(BridgeInterfaceInfo.class).child(BridgeEntry.class, bridgeEntryKey).build();
}
- public void removeStaleFlowEntry(Interface intrf) {
+ public void removeStaleFlowEntry(Interface intrf, int ethType) {
List<MatchInfo> matches = new ArrayList<>();
- BigInteger dpnId = getDpIdFromInterface(intrf);
+ Uint64 dpnId = getDpIdFromInterface(intrf);
Integer ifIndex = intrf.getIfIndex();
matches.add(new MatchMetadata(MetaDataUtil.getLportTagMetaData(ifIndex), MetaDataUtil.METADATA_MASK_LPORT_TAG));
FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpnId, NwConstants.QOS_DSCP_TABLE,
- getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex),
+ getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex, ethType),
QosConstants.QOS_DEFAULT_FLOW_PRIORITY, "QoSRemoveFlow", 0, 0, NwConstants.COOKIE_QOS_TABLE,
matches, null);
mdsalUtils.removeFlow(flowEntity);
}
- private void addFlow(BigInteger dpnId, Short dscpValue, String ifName, IpAddress ipAddress, Interface ifState) {
+ public void addFlow(Uint64 dpnId, Short dscpValue, String ifName, int ethType, Interface ifState) {
if (ifState == null) {
- LOG.trace("Could not find the ifState for interface {}", ifName);
+ LOG.debug("Could not find the ifState for interface {}", ifName);
return;
}
Integer ifIndex = ifState.getIfIndex();
List<MatchInfo> matches = new ArrayList<>();
- if (ipAddress.getIpv4Address() != null) {
- matches.add(new MatchEthernetType(NwConstants.ETHTYPE_IPV4));
- } else {
- matches.add(new MatchEthernetType(NwConstants.ETHTYPE_IPV6));
- }
+ matches.add(new MatchEthernetType(ethType));
matches.add(new MatchMetadata(MetaDataUtil.getLportTagMetaData(ifIndex), MetaDataUtil.METADATA_MASK_LPORT_TAG));
List<ActionInfo> actionsInfos = new ArrayList<>();
List<InstructionInfo> instructions = Collections.singletonList(new InstructionApplyActions(actionsInfos));
FlowEntity flowEntity = MDSALUtil.buildFlowEntity(dpnId, NwConstants.QOS_DSCP_TABLE,
- getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex),
+ getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex, ethType),
QosConstants.QOS_DEFAULT_FLOW_PRIORITY, "QoSConfigFlow", 0, 0, NwConstants.COOKIE_QOS_TABLE,
matches, instructions);
mdsalUtils.installFlow(flowEntity);
}
- private void removeFlow(BigInteger dpnId, String ifName, Interface ifState) {
+ public void removeFlow(Uint64 dpnId, String ifName, int ethType, Interface ifState) {
if (ifState == null) {
- LOG.trace("Could not find the ifState for interface {}", ifName);
+ LOG.debug("Could not find the ifState for interface {}", ifName);
return;
}
Integer ifIndex = ifState.getIfIndex();
mdsalUtils.removeFlow(dpnId, NwConstants.QOS_DSCP_TABLE,
- new FlowId(getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex)));
+ new FlowId(getQosFlowId(NwConstants.QOS_DSCP_TABLE, dpnId, ifIndex, ethType)));
}
- @Nullable
- public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
- .ietf.interfaces.rev140508.interfaces.state.Interface getInterfaceStateFromOperDS(
- String interfaceName) {
- return MDSALUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL,
- createInterfaceStateInstanceIdentifier(interfaceName)).orNull();
+ public org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state
+ .@Nullable Interface getInterfaceStateFromOperDS(String interfaceName) {
+ try {
+ return SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.OPERATIONAL,
+ createInterfaceStateInstanceIdentifier(interfaceName)).orElse(null);
+ } catch (ExecutionException | InterruptedException e) {
+ LOG.error("getInterfaceStateFromOperDS: Exception while reading interface DS for the interface {}",
+ interfaceName, e);
+ }
+ return null;
}
- @Nonnull
+ @NonNull
public static InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.interfaces.rev140508.interfaces.state.Interface> createInterfaceStateInstanceIdentifier(
String interfaceName) {
}
private static BoundServices getBoundServices(String serviceName, short qosServiceIndex, int priority,
- BigInteger cookieQosTable, List<Instruction> instructions) {
+ Uint64 cookieQosTable, List<Instruction> instructions) {
StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookieQosTable)
.setFlowPriority(priority).setInstruction(instructions);
return new BoundServicesBuilder().withKey(new BoundServicesKey(qosServiceIndex)).setServiceName(serviceName)
.addAugmentation(StypeOpenflow.class, augBuilder.build()).build();
}
- @Nonnull
- public static String getQosFlowId(short tableId, BigInteger dpId, int lportTag) {
- return String.valueOf(tableId) + dpId + lportTag;
+ @NonNull
+ public static String getQosFlowId(short tableId, Uint64 dpId, int lportTag, int ethType) {
+ return new StringBuilder().append(tableId).append(NwConstants.FLOWID_SEPARATOR).append(dpId)
+ .append(NwConstants.FLOWID_SEPARATOR).append(lportTag)
+ .append(NwConstants.FLOWID_SEPARATOR).append(ethType).toString();
}
public boolean portHasQosPolicy(Port port) {
- LOG.trace("checking qos policy for port: {}", port.getUuid());
+ LOG.trace("checking qos policy for port: {}", port.getUuid().getValue());
boolean isQosPolicy = port.augmentation(QosPortExtension.class) != null
&& port.augmentation(QosPortExtension.class).getQosPolicyId() != null;
- LOG.trace("portHasQosPolicy for port: {} return value {}", port.getUuid(), isQosPolicy);
+ LOG.trace("portHasQosPolicy for port: {} return value {}", port.getUuid().getValue(), isQosPolicy);
return isQosPolicy;
}
} else {
Network network = neutronVpnManager.getNeutronNetwork(port.getNetworkId());
- if (network.augmentation(QosNetworkExtension.class) != null) {
+ if (network != null && network.augmentation(QosNetworkExtension.class) != null) {
qosUuid = network.augmentation(QosNetworkExtension.class).getQosPolicyId();
}
}
return qosPolicy;
}
+ public boolean hasDscpMarkingRule(QosPolicy qosPolicy) {
+ if (qosPolicy != null) {
+ return qosPolicy.getDscpmarkingRules() != null && !qosPolicy.getDscpmarkingRules().isEmpty();
+ }
+ return false;
+ }
+
public void addToPortCache(Port port) {
neutronPortMap.put(port.getUuid(), port);
}
return neutronNetworkMap.get(networkUuid);
}
- public static BigInteger getDpnIdFromLowerLayerIf(String lowerLayerIf) {
+ @Nullable
+ public static Uint64 getDpnIdFromLowerLayerIf(String lowerLayerIf) {
try {
- return new BigInteger(lowerLayerIf.substring(lowerLayerIf.indexOf(":") + 1, lowerLayerIf.lastIndexOf(":")));
+ return Uint64.valueOf(lowerLayerIf.substring(lowerLayerIf.indexOf(":") + 1, lowerLayerIf.lastIndexOf(":")));
} catch (NullPointerException e) {
return null;
}
}
+ @Nullable
public static String getPortNumberFromLowerLayerIf(String lowerLayerIf) {
try {
return (lowerLayerIf.substring(lowerLayerIf.lastIndexOf(":") + 1));
}
}
+ public int getIpVersions(Port port) {
+ int versions = 0;
+ for (FixedIps fixedIp: port.getFixedIps()) {
+ if (fixedIp.getIpAddress().getIpv4Address() != null) {
+ versions |= (1 << QosConstants.IPV4_ADDR_MASK_BIT);
+ } else if (fixedIp.getIpAddress().getIpv6Address() != null) {
+ versions |= (1 << QosConstants.IPV6_ADDR_MASK_BIT);
+ }
+ }
+ return versions;
+ }
+
+ public boolean hasIpv4Addr(int versions) {
+ return (versions & (1 << QosConstants.IPV4_ADDR_MASK_BIT)) != 0;
+ }
+
+ public boolean hasIpv6Addr(int versions) {
+ return (versions & (1 << QosConstants.IPV6_ADDR_MASK_BIT)) != 0;
+ }
+
+ public boolean isBindServiceDone(Optional<Uuid> uuid) {
+ if (uuid != null) {
+ return qosServiceConfiguredPorts.contains(uuid.get());
+ }
+ return false;
+ }
+
+ public void removeInterfaceInQosConfiguredPorts(Optional<Uuid> uuid) {
+ if (uuid != null) {
+ qosServiceConfiguredPorts.remove(uuid.get());
+ }
+ }
}
Code Review / netvirt.git / blobdiff