* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.ovsdb.southbound.transactions.md;
+import static java.util.Objects.requireNonNull;
+import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog;
+
+import com.google.common.annotations.VisibleForTesting;
+import com.google.common.net.InetAddresses;
+import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
import java.net.InetAddress;
import java.net.NetworkInterface;
+import java.net.SocketException;
import java.util.ArrayList;
import java.util.Enumeration;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.Optional;
import java.util.Set;
-
import org.apache.commons.lang3.math.NumberUtils;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.ovsdb.lib.error.SchemaVersionMismatchException;
import org.opendaylight.ovsdb.lib.message.TableUpdates;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.schema.openvswitch.Controller;
+import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
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.inet.types.rev100924.IpAddress;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
+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.inet.types.rev130715.Ipv4Address;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
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.DatapathId;
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.OvsdbBridgeProtocolBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeRef;
-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.OvsdbNodeAugmentationBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.BridgeExternalIds;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-import com.google.common.base.Preconditions;
-import com.google.common.net.InetAddresses;
-
public class OvsdbBridgeUpdateCommand extends AbstractTransactionCommand {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbBridgeUpdateCommand.class);
- private Map<UUID,Bridge> updatedBridgeRows;
- private Map<UUID, Bridge> oldBridgeRows;
-
- public OvsdbBridgeUpdateCommand(OvsdbConnectionInstance key, TableUpdates updates,
- DatabaseSchema dbSchema) {
+ private final InstanceIdentifierCodec instanceIdentifierCodec;
+ private final Map<UUID,Bridge> updatedBridgeRows;
+ private final Map<UUID, Bridge> oldBridgeRows;
+ private final List<InstanceIdentifier<Node>> updatedBridges = new ArrayList<>();
+ private final Map<NodeId, Node> updatedBridgeNodes;
+
+ @SuppressFBWarnings(value = "MC_OVERRIDABLE_METHOD_CALL_IN_CONSTRUCTOR", justification = "Non-final for mocking")
+ public OvsdbBridgeUpdateCommand(InstanceIdentifierCodec instanceIdentifierCodec, OvsdbConnectionInstance key,
+ TableUpdates updates, DatabaseSchema dbSchema,
+ Map<NodeId, Node> updatedBridgeNodes) {
super(key,updates,dbSchema);
+ this.instanceIdentifierCodec = instanceIdentifierCodec;
updatedBridgeRows = TyperUtils.extractRowsUpdated(Bridge.class, getUpdates(), getDbSchema());
oldBridgeRows = TyperUtils.extractRowsOld(Bridge.class, getUpdates(), getDbSchema());
+ this.updatedBridgeNodes = updatedBridgeNodes;
}
@Override
public void execute(ReadWriteTransaction transaction) {
- for (Entry<UUID, Bridge> entry : updatedBridgeRows.entrySet()) {
- updateBridge(transaction, entry.getValue());
+ if (updatedBridgeRows == null || updatedBridgeRows.isEmpty()) {
+ return;
}
- }
- private void updateBridge(ReadWriteTransaction transaction,
- Bridge bridge) {
final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
Optional<Node> connection = SouthboundUtil.readNode(transaction, connectionIId);
- if (connection.isPresent()) {
- LOG.debug("Connection {} is present",connection);
-
- // Update the connection node to let it know it manages this bridge
- Node connectionNode = buildConnectionNode(bridge);
- transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
-
- // Update the bridge node with whatever data we are getting
- InstanceIdentifier<Node> bridgeIid = getInstanceIdentifier(bridge);
- Node bridgeNode = buildBridgeNode(bridge);
- transaction.merge(LogicalDatastoreType.OPERATIONAL, bridgeIid, bridgeNode);
- deleteEntries(transaction, protocolEntriesToRemove(bridgeIid,bridge));
- deleteEntries(transaction, externalIdsToRemove(bridgeIid,bridge));
- deleteEntries(transaction, bridgeOtherConfigsToRemove(bridgeIid,bridge));
+ if (!connection.isPresent()) {
+ return;
+ }
+
+ for (Entry<UUID, Bridge> entry : updatedBridgeRows.entrySet()) {
+ updateBridge(transaction, entry.getValue(), connectionIId);
}
}
- private <T extends DataObject> void deleteEntries(ReadWriteTransaction transaction,
+ @VisibleForTesting
+ void updateBridge(ReadWriteTransaction transaction,
+ Bridge bridge, InstanceIdentifier<Node> connectionIId) {
+ // Update the connection node to let it know it manages this bridge
+ Node connectionNode = buildConnectionNode(bridge);
+ transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
+
+ // Update the bridge node with whatever data we are getting
+ InstanceIdentifier<Node> bridgeIid = getInstanceIdentifier(bridge);
+ Node bridgeNode = buildBridgeNode(bridge);
+ transaction.merge(LogicalDatastoreType.OPERATIONAL, bridgeIid, bridgeNode);
+ updatedBridges.add(bridgeIid);
+ updatedBridgeNodes.put(getNodeId(bridge), bridgeNode);
+ deleteEntries(transaction, protocolEntriesToRemove(bridgeIid, bridge));
+ deleteEntries(transaction, externalIdsToRemove(bridgeIid,bridge));
+ deleteEntries(transaction, bridgeOtherConfigsToRemove(bridgeIid,bridge));
+ }
+
+ @VisibleForTesting
+ <T extends DataObject> void deleteEntries(ReadWriteTransaction transaction,
List<InstanceIdentifier<T>> entryIids) {
- for (InstanceIdentifier<T> entryIid: entryIids) {
+ for (InstanceIdentifier<T> entryIid : entryIids) {
transaction.delete(LogicalDatastoreType.OPERATIONAL, entryIid);
}
}
private List<InstanceIdentifier<BridgeOtherConfigs>> bridgeOtherConfigsToRemove(
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
- Preconditions.checkNotNull(bridgeIid);
- Preconditions.checkNotNull(bridge);
+ requireNonNull(bridgeIid);
+ requireNonNull(bridge);
List<InstanceIdentifier<BridgeOtherConfigs>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
private List<InstanceIdentifier<BridgeExternalIds>> externalIdsToRemove(
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
- Preconditions.checkNotNull(bridgeIid);
- Preconditions.checkNotNull(bridge);
+ requireNonNull(bridgeIid);
+ requireNonNull(bridge);
List<InstanceIdentifier<BridgeExternalIds>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
private List<InstanceIdentifier<ProtocolEntry>> protocolEntriesToRemove(
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
- Preconditions.checkNotNull(bridgeIid);
- Preconditions.checkNotNull(bridge);
+ requireNonNull(bridgeIid);
+ requireNonNull(bridge);
List<InstanceIdentifier<ProtocolEntry>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
for (String protocol : oldBridge.getProtocolsColumn().getData()) {
if (bridge.getProtocolsColumn() == null || !bridge.getProtocolsColumn().getData()
.contains(protocol)) {
- Class<? extends OvsdbBridgeProtocolBase> proto = SouthboundConstants.OVSDB_PROTOCOL_MAP
- .inverse().get(protocol);
+ OvsdbBridgeProtocolBase proto = SouthboundConstants.OVSDB_PROTOCOL_MAP.inverse().get(protocol);
InstanceIdentifier<ProtocolEntry> iid = bridgeIid
.augmentation(OvsdbBridgeAugmentation.class)
- .child(ProtocolEntry.class,
- new ProtocolEntryKey(proto));
+ .child(ProtocolEntry.class, new ProtocolEntryKey(proto));
result.add(iid);
}
}
}
} catch (SchemaVersionMismatchException e) {
- // We don't care about the exception stack trace here
- LOG.warn("protocol not supported by this version of ovsdb: {}", e.getMessage());
+ schemaMismatchLog("protocols", "Bridge", e);
}
return result;
}
connectionNode.setNodeId(getOvsdbConnectionInstance().getNodeId());
OvsdbNodeAugmentationBuilder ovsdbConnectionAugmentationBuilder = new OvsdbNodeAugmentationBuilder();
- List<ManagedNodeEntry> managedBridges = new ArrayList<>();
- InstanceIdentifier<Node> bridgeIid = SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
- bridge);
+ InstanceIdentifier<Node> bridgeIid =
+ SouthboundMapper.createInstanceIdentifier(instanceIdentifierCodec, getOvsdbConnectionInstance(),
+ bridge);
ManagedNodeEntry managedBridge = new ManagedNodeEntryBuilder().setBridgeRef(
new OvsdbBridgeRef(bridgeIid)).build();
- managedBridges.add(managedBridge);
- ovsdbConnectionAugmentationBuilder.setManagedNodeEntry(managedBridges);
+ ovsdbConnectionAugmentationBuilder.setManagedNodeEntry(BindingMap.of(managedBridge));
- connectionNode.addAugmentation(OvsdbNodeAugmentation.class, ovsdbConnectionAugmentationBuilder.build());
+ connectionNode.addAugmentation(ovsdbConnectionAugmentationBuilder.build());
LOG.debug("Update node with bridge node ref {}",
- ovsdbConnectionAugmentationBuilder.getManagedNodeEntry().iterator().next());
+ ovsdbConnectionAugmentationBuilder.getManagedNodeEntry().values().iterator().next());
return connectionNode.build();
}
setFailMode(ovsdbBridgeAugmentationBuilder, bridge);
setOpenFlowNodeRef(ovsdbBridgeAugmentationBuilder, bridge);
setManagedBy(ovsdbBridgeAugmentationBuilder);
- bridgeNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridgeAugmentationBuilder.build());
+ setAutoAttach(ovsdbBridgeAugmentationBuilder, bridge);
+ setStpEnalbe(ovsdbBridgeAugmentationBuilder,bridge);
+ bridgeNodeBuilder.addAugmentation(ovsdbBridgeAugmentationBuilder.build());
LOG.debug("Built with the intent to store bridge data {}",
ovsdbBridgeAugmentationBuilder.build());
return bridgeNodeBuilder.build();
}
+ private static void setAutoAttach(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
+ try {
+ if (bridge.getAutoAttachColumn() != null
+ && bridge.getAutoAttachColumn().getData() != null
+ && !bridge.getAutoAttachColumn().getData().isEmpty()) {
+ Set<UUID> uuids = bridge.getAutoAttachColumn().getData();
+ for (UUID uuid : uuids) {
+ ovsdbBridgeAugmentationBuilder.setAutoAttach(new Uuid(uuid.toString()));
+ }
+ }
+ } catch (SchemaVersionMismatchException e) {
+ schemaMismatchLog("auto_attach", "Bridge", e);
+ }
+ }
+
private void setManagedBy(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder) {
InstanceIdentifier<Node> connectionNodePath = getOvsdbConnectionInstance().getInstanceIdentifier();
ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(connectionNodePath));
}
- private void setDataPathType(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
+ private static void setDataPathType(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
ovsdbBridgeAugmentationBuilder.setDatapathType(
SouthboundMapper.createDatapathType(bridge.getDatapathTypeColumn().getData()));
}
- private void setFailMode(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
+ private static void setFailMode(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
if (bridge.getFailModeColumn() != null
&& bridge.getFailModeColumn().getData() != null
&& !bridge.getFailModeColumn().getData().isEmpty()) {
}
}
- private void setOtherConfig(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
+ @VisibleForTesting
+ static void setOtherConfig(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
Map<String, String> otherConfigs = bridge
.getOtherConfigColumn().getData();
if (otherConfigs != null && !otherConfigs.isEmpty()) {
- Set<String> otherConfigKeys = otherConfigs.keySet();
- List<BridgeOtherConfigs> otherConfigList = new ArrayList<>();
- String otherConfigValue;
- for (String otherConfigKey : otherConfigKeys) {
- otherConfigValue = otherConfigs.get(otherConfigKey);
+ var otherConfigList = BindingMap.<BridgeOtherConfigsKey, BridgeOtherConfigs>orderedBuilder();
+ for (Entry<String, String> entry : otherConfigs.entrySet()) {
+ String otherConfigKey = entry.getKey();
+ String otherConfigValue = entry.getValue();
if (otherConfigKey != null && otherConfigValue != null) {
otherConfigList.add(new BridgeOtherConfigsBuilder()
.setBridgeOtherConfigKey(otherConfigKey)
.build());
}
}
- ovsdbBridgeAugmentationBuilder.setBridgeOtherConfigs(otherConfigList);
+ ovsdbBridgeAugmentationBuilder.setBridgeOtherConfigs(otherConfigList.build());
}
}
- private void setExternalIds(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
- Map<String, String> externalIds = bridge.getExternalIdsColumn()
- .getData();
+ @VisibleForTesting
+ static void setExternalIds(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
+ Map<String, String> externalIds = bridge.getExternalIdsColumn().getData();
if (externalIds != null && !externalIds.isEmpty()) {
- Set<String> externalIdKeys = externalIds.keySet();
- List<BridgeExternalIds> externalIdsList = new ArrayList<>();
- String externalIdValue;
- for (String externalIdKey : externalIdKeys) {
- externalIdValue = externalIds.get(externalIdKey);
+ var externalIdsList = BindingMap.<BridgeExternalIdsKey, BridgeExternalIds>orderedBuilder();
+ for (Entry<String, String> entry : externalIds.entrySet()) {
+ String externalIdKey = entry.getKey();
+ String externalIdValue = entry.getValue();
if (externalIdKey != null && externalIdValue != null) {
externalIdsList.add(new BridgeExternalIdsBuilder()
.setBridgeExternalIdKey(externalIdKey)
.build());
}
}
- ovsdbBridgeAugmentationBuilder.setBridgeExternalIds(externalIdsList);
+ ovsdbBridgeAugmentationBuilder.setBridgeExternalIds(externalIdsList.build());
}
}
- private void setProtocol(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
- if (SouthboundMapper.createMdsalProtocols(bridge) != null
- && SouthboundMapper.createMdsalProtocols(bridge).size() > 0) {
- ovsdbBridgeAugmentationBuilder.setProtocolEntry(SouthboundMapper.createMdsalProtocols(bridge));
+ @VisibleForTesting
+ static void setProtocol(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
+ List<ProtocolEntry> protocols = SouthboundMapper.createMdsalProtocols(bridge);
+ if (!protocols.isEmpty()) {
+ ovsdbBridgeAugmentationBuilder.setProtocolEntry(BindingMap.of(protocols));
}
}
- private void setDataPath(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
+ @VisibleForTesting
+ static void setDataPath(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
DatapathId dpid = SouthboundMapper.createDatapathId(bridge);
if (dpid != null) {
ovsdbBridgeAugmentationBuilder.setDatapathId(dpid);
}
}
- private void setOpenFlowNodeRef(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
- Bridge bridge) {
+ private static void setStpEnalbe(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder,
+ Bridge bridge) {
+ if (bridge.getStpEnableColumn() != null) {
+ Boolean stpEnable = bridge.getStpEnableColumn().getData();
+ if (stpEnable != null) {
+ ovsdbBridgeAugmentationBuilder.setStpEnable(stpEnable);
+ }
+ }
+ }
+
+ private void setOpenFlowNodeRef(OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder, Bridge bridge) {
Map<UUID, Controller> updatedControllerRows =
TyperUtils.extractRowsUpdated(Controller.class, getUpdates(), getDbSchema());
LOG.debug("setOpenFlowNodeRef: updatedControllerRows: {}", updatedControllerRows);
for (ControllerEntry controllerEntry: SouthboundMapper.createControllerEntries(bridge, updatedControllerRows)) {
if (controllerEntry != null
- && controllerEntry.isIsConnected() != null && controllerEntry.isIsConnected()) {
+ && controllerEntry.getIsConnected() != null && controllerEntry.getIsConnected()) {
String [] controllerTarget = controllerEntry.getTarget().getValue().split(":");
IpAddress bridgeControllerIpAddress = null;
- PortNumber bridgeControllerPortNumber = null;
for (String targetElement : controllerTarget) {
if (InetAddresses.isInetAddress(targetElement)) {
- bridgeControllerIpAddress = new IpAddress(targetElement.toCharArray());
+ bridgeControllerIpAddress = parseIpAddress(targetElement);
continue;
}
- if (NumberUtils.isNumber(targetElement)) {
- bridgeControllerPortNumber = new PortNumber(
- Integer.valueOf(String.valueOf(targetElement)));
+ if (NumberUtils.isCreatable(targetElement)) {
continue;
}
}
}
}
}
- } catch (Exception e) {
+ } catch (SocketException e) {
LOG.warn("Error getting local ip address", e);
}
}
}
}
+
+ private static IpAddress parseIpAddress(final String ipAddress) {
+ try {
+ return new IpAddress(new Ipv4Address(ipAddress));
+ } catch (IllegalArgumentException e) {
+ LOG.debug("Failed to interpret {} as an Ipv4Address", ipAddress, e);
+ }
+ return new IpAddress(new Ipv6Address(ipAddress));
+ }
+
private InstanceIdentifier<Node> getInstanceIdentifier(Bridge bridge) {
- return SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
+ return SouthboundMapper.createInstanceIdentifier(instanceIdentifierCodec, getOvsdbConnectionInstance(),
bridge);
}
private NodeId getNodeId(Bridge bridge) {
- NodeKey nodeKey = getInstanceIdentifier(bridge).firstKeyOf(Node.class, NodeKey.class);
+ NodeKey nodeKey = getInstanceIdentifier(bridge).firstKeyOf(Node.class);
return nodeKey.getNodeId();
}
+
+ @Override
+ public void onSuccess() {
+ for (InstanceIdentifier<Node> updatedBridge : updatedBridges) {
+ LOG.debug("Updated bridge {} in operational datastore", updatedBridge);
+ }
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+ for (InstanceIdentifier<Node> updatedBridge : updatedBridges) {
+ LOG.error("Failed to update bridge {} in operational datastore", updatedBridge);
+ }
+ }
}
Code Review / ovsdb.git / blobdiff