+/*
+ * Copyright (c) 2015 Cisco 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
+
package org.opendaylight.ovsdb.southbound.transactions.md;
+import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog;
+
+import com.google.common.base.Optional;
+import com.google.common.base.Preconditions;
+import com.google.common.net.InetAddresses;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.ArrayList;
import java.util.Map;
import java.util.Map.Entry;
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.controller.md.sal.common.api.data.ReadFailedException;
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.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.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ControllerEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ProtocolEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ProtocolEntryKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
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.node.attributes.ManagedNodeEntryBuilder;
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.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.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.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(ConnectionInfo key, TableUpdates updates,
+ public OvsdbBridgeUpdateCommand(OvsdbConnectionInstance key, TableUpdates updates,
DatabaseSchema dbSchema) {
super(key,updates,dbSchema);
updatedBridgeRows = TyperUtils.extractRowsUpdated(Bridge.class, getUpdates(), getDbSchema());
private void updateBridge(ReadWriteTransaction transaction,
Bridge bridge) {
- final InstanceIdentifier<Node> connectionIId = SouthboundMapper.createInstanceIdentifier(getConnectionInfo());
- Optional<Node> connection = readNode(transaction, connectionIId);
+ final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
+ Optional<Node> connection = SouthboundUtil.readNode(transaction, connectionIId);
if (connection.isPresent()) {
LOG.debug("Connection {} is present",connection);
transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
// Update the bridge node with whatever data we are getting
- InstanceIdentifier<Node> bridgeIid = SouthboundMapper.createInstanceIdentifier(getConnectionInfo(),bridge);
+ InstanceIdentifier<Node> bridgeIid = getInstanceIdentifier(bridge);
Node bridgeNode = buildBridgeNode(bridge);
transaction.merge(LogicalDatastoreType.OPERATIONAL, bridgeIid, bridgeNode);
deleteEntries(transaction, protocolEntriesToRemove(bridgeIid,bridge));
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
Preconditions.checkNotNull(bridgeIid);
Preconditions.checkNotNull(bridge);
- List<InstanceIdentifier<BridgeOtherConfigs>> result =
- new ArrayList<InstanceIdentifier<BridgeOtherConfigs>>();
+ List<InstanceIdentifier<BridgeOtherConfigs>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
Preconditions.checkNotNull(bridgeIid);
Preconditions.checkNotNull(bridge);
- List<InstanceIdentifier<BridgeExternalIds>> result =
- new ArrayList<InstanceIdentifier<BridgeExternalIds>>();
+ List<InstanceIdentifier<BridgeExternalIds>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
InstanceIdentifier<Node> bridgeIid, Bridge bridge) {
Preconditions.checkNotNull(bridgeIid);
Preconditions.checkNotNull(bridge);
- List<InstanceIdentifier<ProtocolEntry>> result =
- new ArrayList<InstanceIdentifier<ProtocolEntry>>();
+ List<InstanceIdentifier<ProtocolEntry>> result = new ArrayList<>();
Bridge oldBridge = oldBridgeRows.get(bridge.getUuid());
try {
}
}
} catch (SchemaVersionMismatchException e) {
- LOG.warn("protocol not supported by this version of ovsdb", e);
+ schemaMismatchLog("protocols", "Bridge", e);
}
return result;
}
- private Optional<Node> readNode(ReadWriteTransaction transaction,
- final InstanceIdentifier<Node> connectionIid) {
- Optional<Node> node = Optional.absent();
- try {
- node = transaction.read(LogicalDatastoreType.OPERATIONAL, connectionIid).checkedGet();
- } catch (final ReadFailedException e) {
- LOG.warn("Read Operational/DS for Node fail! {}", connectionIid, e);
- }
- return node;
- }
-
private Node buildConnectionNode(
Bridge bridge) {
//Update node with managed node reference
NodeBuilder connectionNode = new NodeBuilder();
- connectionNode.setNodeId(SouthboundMapper.createNodeId(getConnectionInfo().getRemoteIp(),
- getConnectionInfo().getRemotePort()));
+ connectionNode.setNodeId(getOvsdbConnectionInstance().getNodeId());
OvsdbNodeAugmentationBuilder ovsdbConnectionAugmentationBuilder = new OvsdbNodeAugmentationBuilder();
- List<ManagedNodeEntry> managedBridges = new ArrayList<ManagedNodeEntry>();
- InstanceIdentifier<Node> bridgeIid = SouthboundMapper.createInstanceIdentifier(getConnectionInfo(),bridge);
+ List<ManagedNodeEntry> managedBridges = new ArrayList<>();
+ InstanceIdentifier<Node> bridgeIid = SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
+ bridge);
ManagedNodeEntry managedBridge = new ManagedNodeEntryBuilder().setBridgeRef(
new OvsdbBridgeRef(bridgeIid)).build();
managedBridges.add(managedBridge);
connectionNode.addAugmentation(OvsdbNodeAugmentation.class, ovsdbConnectionAugmentationBuilder.build());
- LOG.debug("Update node with bridge node ref {}",ovsdbConnectionAugmentationBuilder.toString());
+ LOG.debug("Update node with bridge node ref {}",
+ ovsdbConnectionAugmentationBuilder.getManagedNodeEntry().iterator().next());
return connectionNode.build();
}
private Node buildBridgeNode(Bridge bridge) {
NodeBuilder bridgeNodeBuilder = new NodeBuilder();
- InstanceIdentifier<Node> bridgeIid = SouthboundMapper.createInstanceIdentifier(getConnectionInfo(),bridge);
- NodeId bridgeNodeId = SouthboundMapper.createManagedNodeId(bridgeIid);
+ NodeId bridgeNodeId = getNodeId(bridge);
bridgeNodeBuilder.setNodeId(bridgeNodeId);
OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder();
ovsdbBridgeAugmentationBuilder.setBridgeName(new OvsdbBridgeName(bridge.getName()));
setFailMode(ovsdbBridgeAugmentationBuilder, bridge);
setOpenFlowNodeRef(ovsdbBridgeAugmentationBuilder, bridge);
setManagedBy(ovsdbBridgeAugmentationBuilder);
+ setAutoAttach(ovsdbBridgeAugmentationBuilder, bridge);
bridgeNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridgeAugmentationBuilder.build());
LOG.debug("Built with the intent to store bridge data {}",
- ovsdbBridgeAugmentationBuilder.toString());
+ ovsdbBridgeAugmentationBuilder.build());
return bridgeNodeBuilder.build();
}
+ private 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 = SouthboundMapper.createInstanceIdentifier(getConnectionInfo());
+ InstanceIdentifier<Node> connectionNodePath = getOvsdbConnectionInstance().getInstanceIdentifier();
ovsdbBridgeAugmentationBuilder.setManagedBy(new OvsdbNodeRef(connectionNodePath));
}
.getOtherConfigColumn().getData();
if (otherConfigs != null && !otherConfigs.isEmpty()) {
Set<String> otherConfigKeys = otherConfigs.keySet();
- List<BridgeOtherConfigs> otherConfigList = new ArrayList<BridgeOtherConfigs>();
+ List<BridgeOtherConfigs> otherConfigList = new ArrayList<>();
String otherConfigValue;
for (String otherConfigKey : otherConfigKeys) {
otherConfigValue = otherConfigs.get(otherConfigKey);
.getData();
if (externalIds != null && !externalIds.isEmpty()) {
Set<String> externalIdKeys = externalIds.keySet();
- List<BridgeExternalIds> externalIdsList = new ArrayList<BridgeExternalIds>();
+ List<BridgeExternalIds> externalIdsList = new ArrayList<>();
String externalIdValue;
for (String externalIdKey : externalIdKeys) {
externalIdValue = externalIds.get(externalIdKey);
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()) {
if (bridgeControllerIpAddress.getIpv4Address().getValue()
.equals(networkInterfaceAddress.getHostAddress())) {
ovsdbBridgeAugmentationBuilder.setBridgeOpenflowNodeRef(
- SouthboundMapper.createInstanceIdentifier(bridgeControllerIpAddress,
- bridgeControllerPortNumber));
+ getOvsdbConnectionInstance().getInstanceIdentifier());
break networkInterfacesLoop;
}
}
}
} catch (Exception e) {
- LOG.warn("Error getting local ip address {}", e);
+ LOG.warn("Error getting local ip address", e);
}
}
}
}
+
+ private InstanceIdentifier<Node> getInstanceIdentifier(Bridge bridge) {
+ return SouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(),
+ bridge);
+ }
+
+ private NodeId getNodeId(Bridge bridge) {
+ NodeKey nodeKey = getInstanceIdentifier(bridge).firstKeyOf(Node.class, NodeKey.class);
+ return nodeKey.getNodeId();
+ }
}
Code Review / ovsdb.git / blobdiff