X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=southbound%2Fsouthbound-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fsouthbound%2Fovsdb%2Ftransact%2FTerminationPointUpdateCommand.java;h=7e5f3a96f12d81f8e24d99cebb7ff09e2130e187;hb=50e7f939993fa9da3c80a1c8d166629a4868af9c;hp=abdbacf5b9a20b854d7b4c52d422e712e245e923;hpb=faf5434c57199811a1f30e30b7e610324e0e0dce;p=ovsdb.git diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java index abdbacf5b..7e5f3a96f 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. + * Copyright (c) 2015, 2016 Brocade Communications Systems, Inc. and others. All rights reserved. * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, @@ -8,15 +8,24 @@ package org.opendaylight.ovsdb.southbound.ovsdb.transact; import static org.opendaylight.ovsdb.lib.operations.Operations.op; +import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog; +import com.google.common.base.Optional; +import com.google.common.collect.Sets; +import com.google.common.util.concurrent.CheckedFuture; +import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Set; - +import java.util.concurrent.ExecutionException; +import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; +import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +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.SchemaVersionMismatchException; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.operations.TransactionBuilder; @@ -24,9 +33,17 @@ import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.openvswitch.Interface; import org.opendaylight.ovsdb.schema.openvswitch.Port; import org.opendaylight.ovsdb.southbound.SouthboundConstants; +import org.opendaylight.ovsdb.southbound.SouthboundProvider; +import org.opendaylight.ovsdb.utils.yang.YangUtils; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; 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.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation; +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.VlanMode; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbQosRef; 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.ovsdb.node.attributes.QosEntries; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceBfd; 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.InterfaceLldp; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceOtherConfigs; @@ -34,46 +51,45 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortExternalIds; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortOtherConfigs; 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.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; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; - -public class TerminationPointUpdateCommand extends AbstractTransactCommand { +public class TerminationPointUpdateCommand implements TransactCommand { private static final Logger LOG = LoggerFactory.getLogger(TerminationPointUpdateCommand.class); - public TerminationPointUpdateCommand(BridgeOperationalState state, - AsyncDataChangeEvent, DataObject> changes) { - super(state, changes); + @Override + public void execute(TransactionBuilder transaction, BridgeOperationalState state, + AsyncDataChangeEvent, DataObject> events) { + execute(transaction, state, + TransactUtils.extractCreatedOrUpdated(events, OvsdbTerminationPointAugmentation.class)); } @Override - public void execute(TransactionBuilder transaction) { + public void execute(TransactionBuilder transaction, BridgeOperationalState state, + Collection> modifications) { + execute(transaction, state, + TransactUtils.extractCreatedOrUpdated(modifications, OvsdbTerminationPointAugmentation.class)); + } + + private void execute(TransactionBuilder transaction, BridgeOperationalState state, + Map, + OvsdbTerminationPointAugmentation> createdOrUpdated) { LOG.trace("TerminationPointUpdateCommand called"); - Map, OvsdbTerminationPointAugmentation> created = - TransactUtils.extractCreated(getChanges(),OvsdbTerminationPointAugmentation.class); - for (Entry, - OvsdbTerminationPointAugmentation> terminationPointEntry : created.entrySet()) { - updateTerminationPoint(transaction, terminationPointEntry.getKey(), terminationPointEntry.getValue()); - } - Map, OvsdbTerminationPointAugmentation> updated = - TransactUtils.extractUpdated(getChanges(), OvsdbTerminationPointAugmentation.class); for (Entry, - OvsdbTerminationPointAugmentation> terminationPointEntry : updated.entrySet()) { - updateTerminationPoint(transaction, terminationPointEntry.getKey(), + OvsdbTerminationPointAugmentation> terminationPointEntry : createdOrUpdated.entrySet()) { + updateTerminationPoint(transaction, state, terminationPointEntry.getKey(), terminationPointEntry.getValue()); } } - public void updateTerminationPoint(TransactionBuilder transaction, - InstanceIdentifier iid, - OvsdbTerminationPointAugmentation terminationPoint) { - if (terminationPoint instanceof OvsdbTerminationPointAugmentation) { + public void updateTerminationPoint(TransactionBuilder transaction, BridgeOperationalState state, + InstanceIdentifier iid, + OvsdbTerminationPointAugmentation terminationPoint) { + if (terminationPoint != null) { LOG.debug("Received request to update termination point {}", terminationPoint.getName()); @@ -89,12 +105,14 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { .build()); TerminationPointCreateCommand.stampInstanceIdentifier(transaction, - iid.firstIdentifierOf(TerminationPoint.class), terminationPoint.getName()); + iid.firstIdentifierOf(OvsdbTerminationPointAugmentation.class), terminationPoint.getName()); // Update port + OvsdbBridgeAugmentation operBridge = + state.getBridgeNode(iid).get().getAugmentation(OvsdbBridgeAugmentation.class); Port port = TyperUtils.getTypedRowWrapper( transaction.getDatabaseSchema(), Port.class); - updatePort(terminationPoint,port); + updatePort(terminationPoint, port, operBridge); Port extraPort = TyperUtils.getTypedRowWrapper( transaction.getDatabaseSchema(), Port.class); extraPort.setName(""); @@ -113,32 +131,75 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { updateInterfaceOtherConfig(terminationPoint, ovsInterface); updateInterfaceExternalIds(terminationPoint, ovsInterface); updateInterfaceLldp(terminationPoint, ovsInterface); + updateInterfaceBfd(terminationPoint, ovsInterface); + updateInterfacePolicing(terminationPoint, ovsInterface); } private void updatePort( final OvsdbTerminationPointAugmentation terminationPoint, - final Port port) { + final Port port, + final OvsdbBridgeAugmentation operBridge) { updatePortOtherConfig(terminationPoint, port); updatePortVlanTag(terminationPoint, port); updatePortVlanTrunk(terminationPoint, port); updatePortVlanMode(terminationPoint, port); updatePortExternalIds(terminationPoint, port); - updatePortQos(terminationPoint, port); + updatePortQos(terminationPoint, port, operBridge); } private void updatePortQos( final OvsdbTerminationPointAugmentation terminationPoint, - final Port port) { + final Port port, + final OvsdbBridgeAugmentation operBridge) { Set uuidSet = Sets.newHashSet(); - Uuid qosUuid = terminationPoint.getQos(); - if (qosUuid != null) { - uuidSet.add(new UUID(qosUuid.getValue())); + + // First check if QosEntry is present and use that + if (terminationPoint.getQosEntry() != null && !terminationPoint.getQosEntry().isEmpty()) { + OvsdbQosRef qosRef = terminationPoint.getQosEntry().iterator().next().getQosRef(); + Uri qosId = qosRef.getValue().firstKeyOf(QosEntries.class).getQosId(); + OvsdbNodeAugmentation operNode = getOperNode(operBridge); + if (operNode != null && operNode.getQosEntries() != null + && !operNode.getQosEntries().isEmpty()) { + for (QosEntries qosEntry : operNode.getQosEntries()) { + if (qosEntry.getQosId().equals(qosId)) { + uuidSet.add(new UUID(qosEntry.getQosUuid().getValue())); + } + } + } + if (uuidSet.size() == 0) { + uuidSet.add(new UUID(SouthboundConstants.QOS_NAMED_UUID_PREFIX + + TransactUtils.bytesToHexString(qosId.getValue().getBytes()))); + } + } else { + // Second check if Qos is present and use that (deprecated) + // Do not bother to check if QosEntry and Qos are consistent if both are present + Uuid qosUuid = terminationPoint.getQos(); + if (qosUuid != null) { + uuidSet.add(new UUID(qosUuid.getValue())); + } } port.setQos(uuidSet); } + private OvsdbNodeAugmentation getOperNode(final OvsdbBridgeAugmentation operBridge) { + @SuppressWarnings("unchecked") + InstanceIdentifier iidNode = (InstanceIdentifier)operBridge.getManagedBy().getValue(); + OvsdbNodeAugmentation operNode = null; + ReadOnlyTransaction transaction = SouthboundProvider.getDb().newReadOnlyTransaction(); + CheckedFuture, ReadFailedException> future = + transaction.read(LogicalDatastoreType.OPERATIONAL, iidNode); + try { + Optional nodeOptional = future.get(); + if (nodeOptional.isPresent()) { + operNode = nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class); + } + } catch (InterruptedException | ExecutionException e) { + LOG.warn("Error reading from datastore", e); + } + return operNode; + } private void updateOfPort( final OvsdbTerminationPointAugmentation terminationPoint, @@ -166,14 +227,11 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { //Configure optional input if (terminationPoint.getOptions() != null) { - Map optionsMap = new HashMap<>(); - for (Options option : terminationPoint.getOptions()) { - optionsMap.put(option.getOption(), option.getValue()); - } try { - ovsInterface.setOptions(ImmutableMap.copyOf(optionsMap)); + ovsInterface.setOptions(YangUtils.convertYangKeyValueListToMap(terminationPoint.getOptions(), + Options::getOption, Options::getValue)); } catch (NullPointerException e) { - LOG.warn("Incomplete OVSDB interface options"); + LOG.warn("Incomplete OVSDB interface options", e); } } } @@ -185,14 +243,11 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { List interfaceExternalIds = terminationPoint.getInterfaceExternalIds(); if (interfaceExternalIds != null && !interfaceExternalIds.isEmpty()) { - Map externalIdsMap = new HashMap<>(); - for (InterfaceExternalIds externalId: interfaceExternalIds) { - externalIdsMap.put(externalId.getExternalIdKey(), externalId.getExternalIdValue()); - } try { - ovsInterface.setExternalIds(ImmutableMap.copyOf(externalIdsMap)); + ovsInterface.setExternalIds(YangUtils.convertYangKeyValueListToMap(interfaceExternalIds, + InterfaceExternalIds::getExternalIdKey, InterfaceExternalIds::getExternalIdValue)); } catch (NullPointerException e) { - LOG.warn("Incomplete OVSDB interface external_ids"); + LOG.warn("Incomplete OVSDB interface external_ids", e); } } } @@ -205,18 +260,15 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { List interfaceLldpList = terminationPoint.getInterfaceLldp(); if (interfaceLldpList != null && !interfaceLldpList.isEmpty()) { - Map interfaceLldpMap = new HashMap<>(); - for (InterfaceLldp interfaceLldp : interfaceLldpList) { - interfaceLldpMap.put(interfaceLldp.getLldpKey(), interfaceLldp.getLldpValue()); - } try { - ovsInterface.setLldp(ImmutableMap.copyOf(interfaceLldpMap)); + ovsInterface.setLldp(YangUtils.convertYangKeyValueListToMap(interfaceLldpList, + InterfaceLldp::getLldpKey, InterfaceLldp::getLldpValue)); } catch (NullPointerException e) { - LOG.warn("Incomplete OVSDB interface lldp"); + LOG.warn("Incomplete OVSDB interface lldp", e); } } } catch (SchemaVersionMismatchException e) { - LOG.debug("lldp column for Interface Table unsupported for this version of ovsdb schema. {}", e.getMessage()); + schemaMismatchLog("lldp", "Interface", e); } } @@ -240,20 +292,51 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { } } + private void updateInterfaceBfd( + final OvsdbTerminationPointAugmentation terminationPoint, + final Interface ovsInterface) { + + try { + List interfaceBfdList = + terminationPoint.getInterfaceBfd(); + if (interfaceBfdList != null && !interfaceBfdList.isEmpty()) { + try { + ovsInterface.setBfd(YangUtils.convertYangKeyValueListToMap(interfaceBfdList, + InterfaceBfd::getBfdKey, InterfaceBfd::getBfdValue)); + } catch (NullPointerException e) { + LOG.warn("Incomplete OVSDB interface bfd", e); + } + } + } catch (SchemaVersionMismatchException e) { + schemaMismatchLog("bfd", "Interface", e); + } + } + + private void updateInterfacePolicing( + final OvsdbTerminationPointAugmentation terminationPoint, + final Interface ovsInterface) { + + Long ingressPolicingRate = terminationPoint.getIngressPolicingRate(); + if (ingressPolicingRate != null) { + ovsInterface.setIngressPolicingRate(ingressPolicingRate); + } + Long ingressPolicingBurst = terminationPoint.getIngressPolicingBurst(); + if (ingressPolicingBurst != null) { + ovsInterface.setIngressPolicingBurst(ingressPolicingBurst); + } + } + private void updatePortExternalIds( final OvsdbTerminationPointAugmentation terminationPoint, final Port port) { List portExternalIds = terminationPoint.getPortExternalIds(); if (portExternalIds != null && !portExternalIds.isEmpty()) { - Map externalIdsMap = new HashMap<>(); - for (PortExternalIds externalId: portExternalIds) { - externalIdsMap.put(externalId.getExternalIdKey(), externalId.getExternalIdValue()); - } try { - port.setExternalIds(ImmutableMap.copyOf(externalIdsMap)); + port.setExternalIds(YangUtils.convertYangKeyValueListToMap(portExternalIds, + PortExternalIds::getExternalIdKey, PortExternalIds::getExternalIdValue)); } catch (NullPointerException e) { - LOG.warn("Incomplete OVSDB port external_ids"); + LOG.warn("Incomplete OVSDB port external_ids", e); } } } @@ -276,7 +359,7 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { if (terminationPoint.getTrunks() != null && terminationPoint.getTrunks().size() > 0) { Set portTrunks = new HashSet<>(); List modelTrunks = terminationPoint.getTrunks(); - for (Trunks trunk: modelTrunks) { + for (Trunks trunk : modelTrunks) { if (trunk.getTrunk() != null) { portTrunks.add(trunk.getTrunk().getValue().longValue()); } @@ -291,7 +374,7 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { if (terminationPoint.getVlanMode() != null) { Set portVlanMode = new HashSet<>(); VlanMode modelVlanMode = terminationPoint.getVlanMode(); - portVlanMode.add(SouthboundConstants.VLANMODES.values()[modelVlanMode.getIntValue() - 1].getMode()); + portVlanMode.add(SouthboundConstants.VlanModes.values()[modelVlanMode.getIntValue() - 1].getMode()); port.setVlanMode(portVlanMode); } } @@ -302,13 +385,9 @@ public class TerminationPointUpdateCommand extends AbstractTransactCommand { List portOtherConfigs = terminationPoint.getPortOtherConfigs(); if (portOtherConfigs != null && !portOtherConfigs.isEmpty()) { - Map otherConfigsMap = new HashMap<>(); - for (PortOtherConfigs portOtherConfig : portOtherConfigs) { - otherConfigsMap.put(portOtherConfig.getOtherConfigKey(), - portOtherConfig.getOtherConfigValue()); - } try { - ovsPort.setOtherConfig(ImmutableMap.copyOf(otherConfigsMap)); + ovsPort.setOtherConfig(YangUtils.convertYangKeyValueListToMap(portOtherConfigs, + PortOtherConfigs::getOtherConfigKey, PortOtherConfigs::getOtherConfigValue)); } catch (NullPointerException e) { LOG.warn("Incomplete OVSDB port other_config", e); }