import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
+import org.opendaylight.ovsdb.lib.error.ColumnSchemaNotFoundException;
import org.opendaylight.ovsdb.lib.message.TableUpdates;
import org.opendaylight.ovsdb.lib.notation.Column;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.schema.openvswitch.Interface;
import org.opendaylight.ovsdb.schema.openvswitch.Port;
-import org.opendaylight.ovsdb.southbound.OvsdbClientKey;
+import org.opendaylight.ovsdb.southbound.OvsdbConnectionInstance;
import org.opendaylight.ovsdb.southbound.SouthboundConstants;
import org.opendaylight.ovsdb.southbound.SouthboundMapper;
+import org.opendaylight.ovsdb.southbound.SouthboundUtil;
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.l2.types.rev130827.VlanId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeName;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbPortInterfaceAttributes;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentationBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ManagedNodeEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceExternalIds;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceExternalIdsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceOtherConfigs;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortOtherConfigsBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Trunks;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.TrunksBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
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.TpId;
+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.TopologyKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder;
+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.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class OvsdbPortUpdateCommand extends AbstractTransactionCommand {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbPortUpdateCommand.class);
-
- public OvsdbPortUpdateCommand(OvsdbClientKey key, TableUpdates updates,
+ private Map<UUID, Port> portUpdatedRows;
+ private Map<UUID, Port> portOldRows;
+ private Map<UUID, Interface> interfaceUpdatedRows;
+ private Map<UUID, Interface> interfaceOldRows;
+ private Map<UUID, Bridge> bridgeUpdatedRows;
+ public OvsdbPortUpdateCommand(OvsdbConnectionInstance key, TableUpdates updates,
DatabaseSchema dbSchema) {
super(key, updates, dbSchema);
+ portUpdatedRows = TyperUtils.extractRowsUpdated(Port.class, updates, dbSchema);
+ portOldRows = TyperUtils.extractRowsOld(Port.class, updates, dbSchema);
+ interfaceUpdatedRows = TyperUtils.extractRowsUpdated(Interface.class, updates, dbSchema);
+ interfaceOldRows = TyperUtils.extractRowsOld(Interface.class, updates, dbSchema);
+ bridgeUpdatedRows = TyperUtils.extractRowsUpdated(Bridge.class, updates, dbSchema);
}
@Override
public void execute(ReadWriteTransaction transaction) {
- String bridgeName = null;
- Collection<Port> portUpdatedRows = TyperUtils.extractRowsUpdated(
- Port.class, getUpdates(), getDbSchema()).values();
- Collection<Bridge> bridgeUpdatedRows = TyperUtils.extractRowsUpdated(
- Bridge.class, getUpdates(), getDbSchema()).values();
- for (Bridge bridge : bridgeUpdatedRows) {
- Iterator<UUID> bridgePorts = bridge.getPortsColumn().getData()
- .iterator();
- while (bridgePorts.hasNext()) {
- UUID portUUID = bridgePorts.next();
- for (Port port : portUpdatedRows) {
- if (portUUID.equals(port.getUuid())) {
- bridgeName = bridge.getName();
- NodeId bridgeId = SouthboundMapper.createManagedNodeId(
- getKey(), new OvsdbBridgeName(bridgeName));
- final InstanceIdentifier<Node> nodePath = SouthboundMapper
- .createInstanceIdentifier(bridgeId);
- Optional<Node> node = readNode(transaction, nodePath);
- if (node.isPresent()) {
- NodeBuilder nodeBuilder = buildNode(node, bridgeId, bridge, port);
- transaction.merge(LogicalDatastoreType.OPERATIONAL,
- nodePath, nodeBuilder.build());
- }
- }
+ final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
+ if ( (portUpdatedRows == null && interfaceOldRows == null )
+ || ( interfaceOldRows.isEmpty() && portUpdatedRows.isEmpty())) {
+ return;
+ }
+ Optional<Node> node = readNode(transaction, connectionIId);
+ if (node.isPresent()) {
+ updateTerminationPoints(transaction, node.get());
+ }
+ }
+ private void updateTerminationPoints(ReadWriteTransaction transaction, Node node) {
+ for (Entry<UUID, Port> portUpdate : portUpdatedRows.entrySet()) {
+ String portName = null;
+ portName = portUpdate.getValue().getNameColumn().getData();
+ Optional<InstanceIdentifier<Node>> bridgeIid = getTerminationPointBridge(portUpdate.getKey());
+ if (!bridgeIid.isPresent()) {
+ bridgeIid = getTerminationPointBridge( transaction, node, portName);
+ }
+ if (bridgeIid.isPresent()) {
+ NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid.get());
+ TerminationPointKey tpKey = new TerminationPointKey(new TpId(portName));
+ TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
+ tpBuilder.setKey(tpKey);
+ tpBuilder.setTpId(tpKey.getTpId());
+ InstanceIdentifier<TerminationPoint> tpPath =
+ getInstanceIdentifier(bridgeIid.get(), portUpdate.getValue());
+ OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder =
+ new OvsdbTerminationPointAugmentationBuilder();
+ buildTerminationPoint(tpAugmentationBuilder,portUpdate.getValue());
+ UUID interfaceUUID = (UUID)portUpdate.getValue().getInterfacesColumn().getData().toArray()[0];
+ if (interfaceUpdatedRows.containsKey(interfaceUUID)) {
+ buildTerminationPoint(tpAugmentationBuilder,
+ interfaceUpdatedRows.get(interfaceUUID));
+ interfaceUpdatedRows.remove(interfaceUUID);
+ interfaceOldRows.remove(interfaceUUID);
}
+ tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+ if (portOldRows.containsKey(portUpdate.getKey()) && !portQosCleared(portUpdate)) {
+ transaction.merge(LogicalDatastoreType.OPERATIONAL,
+ tpPath, tpBuilder.build());
+ } else {
+ transaction.put(LogicalDatastoreType.OPERATIONAL,
+ tpPath, tpBuilder.build());
+ }
+ }
+ }
+ for (Entry<UUID, Interface> interfaceUpdate : interfaceUpdatedRows.entrySet()) {
+ String interfaceName = null;
+ interfaceName = interfaceUpdatedRows.get(interfaceUpdate.getKey()).getNameColumn().getData();
+ Optional<InstanceIdentifier<Node>> bridgeIid = getTerminationPointBridge( transaction, node, interfaceName);
+ if (bridgeIid.isPresent()) {
+ NodeId bridgeId = SouthboundMapper.createManagedNodeId(bridgeIid.get());
+ TerminationPointKey tpKey = new TerminationPointKey(new TpId(interfaceName));
+ InstanceIdentifier<TerminationPoint> tpPath = InstanceIdentifier
+ .create(NetworkTopology.class)
+ .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
+ .child(Node.class,new NodeKey(bridgeId))
+ .child(TerminationPoint.class,tpKey);
+ TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
+ tpBuilder.setKey(tpKey);
+ tpBuilder.setTpId(tpKey.getTpId());
+ OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder =
+ new OvsdbTerminationPointAugmentationBuilder();
+ buildTerminationPoint(tpAugmentationBuilder, interfaceUpdate.getValue());
+ tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build());
+ transaction.merge(LogicalDatastoreType.OPERATIONAL,
+ tpPath, tpBuilder.build());
}
}
+
+ }
+ private void buildTerminationPoint(OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder,
+ Port portUpdate) {
+
+ tpAugmentationBuilder
+ .setName(portUpdate.getName());
+ tpAugmentationBuilder.setPortUuid(new Uuid(
+ portUpdate.getUuid().toString()));
+ updatePort(portUpdate, tpAugmentationBuilder);
+ }
+
+ private void buildTerminationPoint(OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder,
+ Interface interfaceUpdate) {
+
+ tpAugmentationBuilder
+ .setName(interfaceUpdate.getName());
+ tpAugmentationBuilder.setInterfaceUuid(new Uuid(
+ interfaceUpdate.getUuid().toString()));
+ updateInterfaces(interfaceUpdate, tpAugmentationBuilder);
}
private Optional<Node> readNode(final ReadWriteTransaction transaction, final InstanceIdentifier<Node> nodePath) {
return node;
}
- private NodeBuilder buildNode(final Optional<Node> node, final NodeId bridgeId, final Bridge bridge,
- final Port port) {
- NodeBuilder nodeBuilder = new NodeBuilder();
- nodeBuilder.setNodeId(bridgeId);
- List<TerminationPoint> tpList = buildTpList(bridge, port);
- nodeBuilder.setTerminationPoint(tpList);
- nodeBuilder.addAugmentation(
- OvsdbBridgeAugmentation.class,
- node.get().getAugmentation(
- OvsdbBridgeAugmentation.class));
- return nodeBuilder;
+ private Optional<InstanceIdentifier<Node>> getTerminationPointBridge( UUID portUUID) {
+ for (UUID bridgeUUID : this.bridgeUpdatedRows.keySet()) {
+ if (this.bridgeUpdatedRows.get(bridgeUUID).getPortsColumn().getData().contains(portUUID)) {
+ return Optional.of(SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
+ this.bridgeUpdatedRows.get(bridgeUUID)));
+ }
+ }
+ return Optional.absent();
}
-
- private List<TerminationPoint> buildTpList(final Bridge bridge, final Port port) {
- List<TerminationPoint> tpList = new ArrayList<TerminationPoint>();
- TerminationPointBuilder entry = new TerminationPointBuilder();
- entry.setTpId(new TpId(port.getName()));
- OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder =
- new OvsdbTerminationPointAugmentationBuilder();
- ovsdbTerminationPointBuilder
- .setName(port.getName());
- ovsdbTerminationPointBuilder.setPortUuid(new Uuid(
- port.getUuid().toString()));
- updatePort(port, ovsdbTerminationPointBuilder);
- updateInterfaces(port, bridge, ovsdbTerminationPointBuilder);
- entry.addAugmentation(
- OvsdbTerminationPointAugmentation.class,
- ovsdbTerminationPointBuilder.build());
- tpList.add(entry.build());
- return tpList;
+ private Optional<InstanceIdentifier<Node>> getTerminationPointBridge(
+ final ReadWriteTransaction transaction, Node node, String tpName) {
+ OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class);
+ List<ManagedNodeEntry> managedNodes = ovsdbNode.getManagedNodeEntry();
+ for ( ManagedNodeEntry managedNodeEntry : managedNodes ) {
+ @SuppressWarnings("unchecked")
+ Node managedNode = readNode(transaction
+ ,(InstanceIdentifier<Node>)managedNodeEntry.getBridgeRef().getValue()).get();
+ TerminationPointBuilder tpBuilder = new TerminationPointBuilder();
+ TerminationPointKey tpKey = new TerminationPointKey(new TpId(tpName));
+ tpBuilder.setKey(tpKey);
+ if (managedNode.getTerminationPoint().contains(tpBuilder.build())) {
+ OvsdbBridgeAugmentation ovsdbNodeAugment
+ = managedNode.getAugmentation(OvsdbBridgeAugmentation.class);
+ return Optional.of((InstanceIdentifier<Node>)managedNodeEntry.getBridgeRef().getValue());
+ }
+ }
+ return Optional.absent();
}
- private void updateInterfaces(final Port port, final Bridge bridge,
+ private void updateInterfaces(Interface interfaceUpdate,
final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
- Column<GenericTableSchema, Set<UUID>> iface = port.getInterfacesColumn();
- Set<UUID> ifUuid = iface.getData();
- Collection<Interface> ifUpdateRows = TyperUtils.extractRowsUpdated(
- Interface.class, getUpdates(), getDbSchema()).values();
- updateInterfaces(ifUuid, ifUpdateRows, bridge, ovsdbTerminationPointBuilder);
- }
-
- private void updateInterfaces(final Set<UUID> ifUuid, final Collection<Interface> ifUpdateRows,
- final Bridge bridge, final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
-
- for (UUID ifIter : ifUuid) {
- for (Interface interfIter : ifUpdateRows) {
- Column<GenericTableSchema, String> typeColumn = interfIter.getTypeColumn();
- String type = typeColumn.getData();
- if ((interfIter.getUuid()).equals(ifIter)) {
- updateInterface(interfIter, bridge, type, ovsdbTerminationPointBuilder);
- break;
- }
- }
- }
+ Column<GenericTableSchema, String> typeColumn = interfaceUpdate.getTypeColumn();
+ String type = typeColumn.getData();
+ updateInterface(interfaceUpdate, type,ovsdbTerminationPointBuilder);
}
private void updatePort(final Port port,
updateVlan(port, ovsdbTerminationPointBuilder);
updateVlanTrunks(port, ovsdbTerminationPointBuilder);
updateVlanMode(port, ovsdbTerminationPointBuilder);
+ updateQos(port, ovsdbTerminationPointBuilder);
updatePortExternalIds(port, ovsdbTerminationPointBuilder);
updatePortOtherConfig(port, ovsdbTerminationPointBuilder);
}
private void updateInterface(final Interface interf,
- final Bridge bridge, final String type,
+ final String type,
final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
ovsdbTerminationPointBuilder.setInterfaceUuid(
new Uuid(interf.getUuid().toString()));
ovsdbTerminationPointBuilder.setInterfaceType(
SouthboundMapper.createInterfaceType(type));
- updateOfPort(interf, bridge, ovsdbTerminationPointBuilder);
- updateOfPortRequest(interf, bridge, ovsdbTerminationPointBuilder);
+ updateOfPort(interf, ovsdbTerminationPointBuilder);
+ updateOfPortRequest(interf, ovsdbTerminationPointBuilder);
updateInterfaceExternalIds(interf, ovsdbTerminationPointBuilder);
updateOptions(interf, ovsdbTerminationPointBuilder);
updateInterfaceOtherConfig(interf, ovsdbTerminationPointBuilder);
final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
Set<Long> portTrunks = port.getTrunksColumn().getData();
- List<Trunks> modelTrunks = new ArrayList<Trunks>();
+ List<Trunks> modelTrunks = new ArrayList<>();
if (!portTrunks.isEmpty()) {
for (Long trunk: portTrunks) {
if (trunk != null) {
}
}
+ private void updateQos(final Port port,
+ final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
+ if (port.getQosColumn() == null) {
+ return;
+ }
+ Collection<UUID> qosUuidCol = port.getQosColumn().getData();
+ if (!qosUuidCol.isEmpty()) {
+ Iterator<UUID> itr = qosUuidCol.iterator();
+ UUID qosUuid = itr.next();
+ ovsdbTerminationPointBuilder.setQos(new Uuid(qosUuid.toString()));
+ }
+ }
+
private void updateOfPort(final Interface interf,
- final Bridge bridge,
final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
Set<Long> ofPorts = interf.getOpenFlowPortColumn().getData();
.setOfport(ofPort);
} else {
LOG.debug("Received negative value for ofPort from ovsdb for {} {} {}",
- bridge.getName(), interf.getName(),ofPort);
+ interf.getName(),ofPort);
}
}
}
private void updateOfPortRequest(final Interface interf,
- final Bridge bridge,
final OvsdbTerminationPointAugmentationBuilder ovsdbTerminationPointBuilder) {
- Set<Long> ofPortRequests = interf
- .getOpenFlowPortRequestColumn().getData();
+ Set<Long> ofPortRequests = null;
+ try {
+ ofPortRequests = interf.getOpenFlowPortRequestColumn().getData();
+ } catch (ColumnSchemaNotFoundException e) {
+ LOG.warn("Cannot find openflow column", e);
+ }
if (ofPortRequests != null && !ofPortRequests.isEmpty()) {
Iterator<Long> ofPortRequestsIter = ofPortRequests.iterator();
int ofPort = ofPortRequestsIter.next().intValue();
.setOfportRequest(ofPort);
} else {
LOG.debug("Received negative value for ofPort from ovsdb for {} {} {}",
- bridge.getName(), interf.getName(),ofPort);
+ interf.getName(),ofPort);
}
}
}
if (interfaceExternalIds != null && !interfaceExternalIds.isEmpty()) {
Set<String> externalIdKeys = interfaceExternalIds.keySet();
List<InterfaceExternalIds> externalIdsList =
- new ArrayList<InterfaceExternalIds>();
+ new ArrayList<>();
String externalIdValue;
for (String externalIdKey : externalIdKeys) {
externalIdValue = interfaceExternalIds.get(externalIdKey);
Map<String, String> portExternalIds = port.getExternalIdsColumn().getData();
if (portExternalIds != null && !portExternalIds.isEmpty()) {
Set<String> externalIdKeys = portExternalIds.keySet();
- List<PortExternalIds> externalIdsList = new ArrayList<PortExternalIds>();
+ List<PortExternalIds> externalIdsList = new ArrayList<>();
String externalIdValue;
for (String externalIdKey : externalIdKeys) {
externalIdValue = portExternalIds.get(externalIdKey);
Map<String, String> optionsMap = interf.getOptionsColumn().getData();
if (optionsMap != null && !optionsMap.isEmpty()) {
- List<Options> options = new ArrayList<Options>();
+ List<Options> options = new ArrayList<>();
String optionsValueString;
OptionsKey optionsKey;
for (String optionsKeyString : optionsMap.keySet()) {
Map<String, String> portOtherConfigMap = port.getOtherConfigColumn().getData();
if (portOtherConfigMap != null && !portOtherConfigMap.isEmpty()) {
- List<PortOtherConfigs> portOtherConfigs = new ArrayList<PortOtherConfigs>();
+ List<PortOtherConfigs> portOtherConfigs = new ArrayList<>();
String portOtherConfigValueString;
for (String portOtherConfigKeyString : portOtherConfigMap.keySet()) {
portOtherConfigValueString = portOtherConfigMap.get(portOtherConfigKeyString);
Map<String, String> interfaceOtherConfigMap = interf.getOtherConfigColumn().getData();
if (interfaceOtherConfigMap != null && !interfaceOtherConfigMap.isEmpty()) {
- List<InterfaceOtherConfigs> interfaceOtherConfigs = new ArrayList<InterfaceOtherConfigs>();
+ List<InterfaceOtherConfigs> interfaceOtherConfigs = new ArrayList<>();
String interfaceOtherConfigValueString;
for (String interfaceOtherConfigKeyString : interfaceOtherConfigMap.keySet()) {
interfaceOtherConfigValueString = interfaceOtherConfigMap.get(interfaceOtherConfigKeyString);
ovsdbTerminationPointBuilder.setInterfaceOtherConfigs(interfaceOtherConfigs);
}
}
+
+ private boolean portQosCleared(Entry<UUID, Port> portUpdate) {
+ if (portUpdate.getValue().getQosColumn() == null) {
+ return false;
+ }
+ Collection<UUID> newQos = portUpdate.getValue().getQosColumn().getData();
+ if (portOldRows.get(portUpdate.getKey()).getQosColumn() == null) {
+ return false;
+ }
+ Collection<UUID> oldQos = portOldRows.get(portUpdate.getKey()).getQosColumn().getData();
+
+ if (newQos.isEmpty() && !oldQos.isEmpty()) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ private InstanceIdentifier<TerminationPoint> getInstanceIdentifier(InstanceIdentifier<Node> bridgeIid,Port port) {
+ if (port.getExternalIdsColumn() != null
+ && port.getExternalIdsColumn().getData() != null
+ && port.getExternalIdsColumn().getData().containsKey(SouthboundConstants.IID_EXTERNAL_ID_KEY)) {
+ String iidString = port.getExternalIdsColumn().getData().get(SouthboundConstants.IID_EXTERNAL_ID_KEY);
+ return (InstanceIdentifier<TerminationPoint>) SouthboundUtil.deserializeInstanceIdentifier(iidString);
+ } else {
+ return bridgeIid.child(TerminationPoint.class, new TerminationPointKey(new TpId(port.getName())));
+ }
+ }
}
Code Review / ovsdb.git / blobdiff