X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=southbound%2Fsouthbound-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fovsdb%2Fsouthbound%2Fovsdb%2Ftransact%2FTerminationPointCreateCommand.java;h=de0758134941d5c12794189b70278f24cf75fabf;hb=8268b2a995fad8fc9b64671f3e46c046d0c4ba99;hp=d4ee1ac0bff06b6fabbcdf99323e4b0b212c02e4;hpb=3f0e261a301fa48259a22835509bf4b4db131302;p=ovsdb.git diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java index d4ee1ac0b..de0758134 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Brocade Communications Systems, Inc. and others. All rights reserved. + * Copyright © 2015, 2017 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,29 +8,44 @@ 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.util.concurrent.CheckedFuture; +import java.util.Collection; +import java.util.Collections; 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 org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; +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.LogicalDatastoreType; +import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.ovsdb.lib.error.SchemaVersionMismatchException; import org.opendaylight.ovsdb.lib.notation.Mutator; import org.opendaylight.ovsdb.lib.notation.UUID; +import org.opendaylight.ovsdb.lib.operations.Mutate; import org.opendaylight.ovsdb.lib.operations.TransactionBuilder; import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; 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.InstanceIdentifierCodec; import org.opendaylight.ovsdb.southbound.SouthboundConstants; import org.opendaylight.ovsdb.southbound.SouthboundMapper; +import org.opendaylight.ovsdb.southbound.SouthboundProvider; +import org.opendaylight.ovsdb.utils.yang.YangUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeBase; 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.OvsdbPortInterfaceAttributes.VlanMode; 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.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; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Options; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortExternalIds; @@ -38,57 +53,67 @@ 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.Trunks; 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.node.TerminationPoint; -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.base.Optional; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Sets; - -public class TerminationPointCreateCommand extends AbstractTransactCommand { +public class TerminationPointCreateCommand implements TransactCommand { private static final Logger LOG = LoggerFactory.getLogger(TerminationPointCreateCommand.class); - public TerminationPointCreateCommand(BridgeOperationalState state, - AsyncDataChangeEvent, DataObject> changes) { - super(state, changes); + @Override + public void execute(TransactionBuilder transaction, BridgeOperationalState state, + DataChangeEvent events, InstanceIdentifierCodec instanceIdentifierCodec) { + execute(transaction, state, TransactUtils.extractCreated(events, OvsdbTerminationPointAugmentation.class), + TransactUtils.extractCreatedOrUpdated(events, Node.class), instanceIdentifierCodec); } @Override - public void execute(TransactionBuilder transaction) { - for (Entry, DataObject> entry: getChanges().getCreatedData().entrySet()) { - DataObject dataObject = entry.getValue(); - if (dataObject instanceof OvsdbTerminationPointAugmentation) { - OvsdbTerminationPointAugmentation terminationPoint = (OvsdbTerminationPointAugmentation) dataObject; - LOG.debug("Received request to create termination point {}", - terminationPoint.getName()); - InstanceIdentifier terminationPointIid = entry.getKey(); - Optional terminationPointOptional = - getOperationalState().getBridgeTerminationPoint(terminationPointIid); - if (!terminationPointOptional.isPresent()) { - // Configure interface - String interfaceUuid = "Interface_" + SouthboundMapper.getRandomUUID();; - Interface ovsInterface = - TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class); - createInterface(terminationPoint, ovsInterface); - transaction.add(op.insert(ovsInterface).withId(interfaceUuid)); - - // Configure port with the above interface details - String portUuid = "Port_" + SouthboundMapper.getRandomUUID(); - Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class); - createPort(terminationPoint, port, interfaceUuid); - transaction.add(op.insert(port).withId(portUuid)); - - //Configure bridge with the above port details - Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class); - bridge.setName(getBridge(entry.getKey()).getBridgeName().getValue()); - bridge.setPorts(Sets.newHashSet(new UUID(portUuid))); + public void execute(TransactionBuilder transaction, BridgeOperationalState state, + Collection> modifications, InstanceIdentifierCodec instanceIdentifierCodec) { + execute(transaction, state, + TransactUtils.extractCreated(modifications, OvsdbTerminationPointAugmentation.class), + TransactUtils.extractCreatedOrUpdated(modifications, Node.class), instanceIdentifierCodec); + } + + private void execute(TransactionBuilder transaction, BridgeOperationalState state, + Map, OvsdbTerminationPointAugmentation> + createdTerminationPoints, + Map, Node> nodes, InstanceIdentifierCodec instanceIdentifierCodec) { + for (Entry, OvsdbTerminationPointAugmentation> entry : + createdTerminationPoints.entrySet()) { + OvsdbTerminationPointAugmentation terminationPoint = entry.getValue(); + LOG.debug("Received request to create termination point {}", + terminationPoint.getName()); + InstanceIdentifier terminationPointIid = entry.getKey(); + Optional terminationPointOptional = + state.getBridgeTerminationPoint(terminationPointIid); + if (!terminationPointOptional.isPresent()) { + // Configure interface + String interfaceUuid = "Interface_" + SouthboundMapper.getRandomUuid(); + Interface ovsInterface = + TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class); + createInterface(terminationPoint, ovsInterface); + transaction.add(op.insert(ovsInterface).withId(interfaceUuid)); + + stampInstanceIdentifier(transaction, entry.getKey(), ovsInterface.getName(), instanceIdentifierCodec); + + // Configure port with the above interface details + String portUuid = "Port_" + SouthboundMapper.getRandomUuid(); + Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class); + createPort(terminationPoint, port, interfaceUuid); + transaction.add(op.insert(port).withId(portUuid)); + LOG.info("Created Termination Point : {} with Uuid : {}", + terminationPoint.getName(),portUuid); + //Configure bridge with the above port details + Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class); + if (getBridge(entry.getKey(), nodes) != null) { + bridge.setName(getBridge(entry.getKey(), nodes).getBridgeName().getValue()); + bridge.setPorts(Collections.singleton(new UUID(portUuid))); transaction.add(op.mutate(bridge) .addMutation(bridge.getPortsColumn().getSchema(), - Mutator.INSERT,bridge.getPortsColumn().getData()) + Mutator.INSERT, bridge.getPortsColumn().getData()) .where(bridge.getNameColumn().getSchema() .opEqual(bridge.getNameColumn().getData())).build()); } @@ -108,6 +133,8 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { createInterfaceOptions(terminationPoint, ovsInterface); createInterfaceOtherConfig(terminationPoint, ovsInterface); createInterfaceExternalIds(terminationPoint, ovsInterface); + createInterfaceLldp(terminationPoint, ovsInterface); + createInterfaceBfd(terminationPoint, ovsInterface); } private void createInterfaceType(final OvsdbTerminationPointAugmentation terminationPoint, @@ -118,13 +145,13 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { ovsInterface.setType(SouthboundMapper.createOvsdbInterfaceType(mdsaltype)); } } - + private void createPort( final OvsdbTerminationPointAugmentation terminationPoint, final Port port, final String interfaceUuid) { port.setName(terminationPoint.getName()); - port.setInterfaces(Sets.newHashSet(new UUID(interfaceUuid))); + port.setInterfaces(Collections.singleton(new UUID(interfaceUuid))); createPortOtherConfig(terminationPoint, port); createPortVlanTag(terminationPoint, port); createPortVlanTrunk(terminationPoint, port); @@ -138,7 +165,7 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { Long ofPort = terminationPoint.getOfport(); if (ofPort != null) { - ovsInterface.setOpenFlowPort(Sets.newHashSet(ofPort)); + ovsInterface.setOpenFlowPort(Collections.singleton(ofPort)); } } @@ -148,7 +175,7 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { Integer ofPortRequest = terminationPoint.getOfportRequest(); if (ofPortRequest != null) { - ovsInterface.setOpenFlowPortRequest(Sets.newHashSet(ofPortRequest.longValue())); + ovsInterface.setOpenFlowPortRequest(Collections.singleton(ofPortRequest.longValue())); } } @@ -158,14 +185,11 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { //Configure optional input if (terminationPoint.getOptions() != null) { - HashMap 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); } } } @@ -177,14 +201,11 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { List interfaceExternalIds = terminationPoint.getInterfaceExternalIds(); if (interfaceExternalIds != null && !interfaceExternalIds.isEmpty()) { - HashMap 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); } } } @@ -196,7 +217,7 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { List interfaceOtherConfigs = terminationPoint.getInterfaceOtherConfigs(); if (interfaceOtherConfigs != null && !interfaceOtherConfigs.isEmpty()) { - HashMap otherConfigsMap = new HashMap(); + Map otherConfigsMap = new HashMap<>(); for (InterfaceOtherConfigs interfaceOtherConfig : interfaceOtherConfigs) { otherConfigsMap.put(interfaceOtherConfig.getOtherConfigKey(), interfaceOtherConfig.getOtherConfigValue()); @@ -209,20 +230,55 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { } } + private void createInterfaceLldp( + final OvsdbTerminationPointAugmentation terminationPoint, + final Interface ovsInterface) { + + try { + List interfaceLldpList = + terminationPoint.getInterfaceLldp(); + if (interfaceLldpList != null && !interfaceLldpList.isEmpty()) { + try { + ovsInterface.setLldp(YangUtils.convertYangKeyValueListToMap(interfaceLldpList, + InterfaceLldp::getLldpKey, InterfaceLldp::getLldpValue)); + } catch (NullPointerException e) { + LOG.warn("Incomplete OVSDB interface lldp", e); + } + } + } catch (SchemaVersionMismatchException e) { + schemaMismatchLog("lldp", "Interface", e); + } + } + + private void createInterfaceBfd(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 createPortExternalIds( final OvsdbTerminationPointAugmentation terminationPoint, final Port port) { List portExternalIds = terminationPoint.getPortExternalIds(); if (portExternalIds != null && !portExternalIds.isEmpty()) { - HashMap 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); } } } @@ -232,7 +288,7 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { final Port port) { if (terminationPoint.getVlanTag() != null) { - Set vlanTag = new HashSet(); + Set vlanTag = new HashSet<>(); vlanTag.add(terminationPoint.getVlanTag().getValue().longValue()); port.setTag(vlanTag); } @@ -243,7 +299,7 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { final Port port) { if (terminationPoint.getTrunks() != null && terminationPoint.getTrunks().size() > 0) { - Set portTrunks = new HashSet(); + Set portTrunks = new HashSet<>(); List modelTrunks = terminationPoint.getTrunks(); for (Trunks trunk: modelTrunks) { if (trunk.getTrunk() != null) { @@ -258,9 +314,9 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { final OvsdbTerminationPointAugmentation terminationPoint, final Port port) { if (terminationPoint.getVlanMode() != null) { - Set portVlanMode = new HashSet(); + 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); } } @@ -271,31 +327,50 @@ public class TerminationPointCreateCommand extends AbstractTransactCommand { List portOtherConfigs = terminationPoint.getPortOtherConfigs(); if (portOtherConfigs != null && !portOtherConfigs.isEmpty()) { - HashMap 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); } } } - private OvsdbBridgeAugmentation getBridge(InstanceIdentifier key) { + private OvsdbBridgeAugmentation getBridge(InstanceIdentifier key, Map, Node> nodes) { + OvsdbBridgeAugmentation bridge = null; InstanceIdentifier nodeIid = key.firstIdentifierOf(Node.class); - Map, Node> nodes = - TransactUtils.extractCreatedOrUpdated(getChanges(),Node.class); if (nodes != null && nodes.get(nodeIid) != null) { Node node = nodes.get(nodeIid); - OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); - if (bridge != null) { - return bridge; + bridge = node.augmentation(OvsdbBridgeAugmentation.class); + if (bridge == null) { + ReadOnlyTransaction transaction = SouthboundProvider.getDb().newReadOnlyTransaction(); + CheckedFuture, ReadFailedException> future = + transaction.read(LogicalDatastoreType.OPERATIONAL, nodeIid); + try { + Optional nodeOptional = future.get(); + if (nodeOptional.isPresent()) { + bridge = nodeOptional.get().augmentation(OvsdbBridgeAugmentation.class); + } + } catch (InterruptedException | ExecutionException e) { + LOG.warn("Error reading from datastore",e); + } + transaction.close(); } } - return null; + return bridge; + } + + public static void stampInstanceIdentifier(TransactionBuilder transaction, + InstanceIdentifier iid, String interfaceName, + InstanceIdentifierCodec instanceIdentifierCodec) { + Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class); + port.setName(interfaceName); + port.setExternalIds(Collections.emptyMap()); + Mutate mutate = TransactUtils.stampInstanceIdentifierMutation(transaction, iid, port.getSchema(), + port.getExternalIdsColumn().getSchema(), instanceIdentifierCodec); + transaction.add(mutate + .where(port.getNameColumn().getSchema().opEqual(interfaceName)) + .build()); } }