import java.util.Set;
import org.opendaylight.ovsdb.lib.OvsdbClient;
-import org.opendaylight.ovsdb.lib.OvsdbConnectionInfo;
+import org.opendaylight.ovsdb.lib.error.SchemaVersionMismatchException;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeSystem;
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.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.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.ovsdb.bridge.attributes.ControllerEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ControllerEntryBuilder;
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.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.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
public class SouthboundMapper {
private static final Logger LOG = LoggerFactory.getLogger(SouthboundMapper.class);
- public static Node createNode(OvsdbClient client) {
- NodeBuilder nodeBuilder = new NodeBuilder();
- nodeBuilder.setNodeId(createNodeId(client.getConnectionInfo()));
- nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, createOvsdbAugmentation(client));
- return nodeBuilder.build();
- }
- public static Node createNode(ConnectionInfo key) {
- NodeBuilder nodeBuilder = new NodeBuilder();
- nodeBuilder.setNodeId(createNodeId(key.getRemoteIp(),key.getRemotePort()));
- nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, createOvsdbAugmentation(key));
- return nodeBuilder.build();
- }
-
- public static OvsdbNodeAugmentation createOvsdbAugmentation(OvsdbClient client) {
- return createOvsdbAugmentation(createConnectionInfo(client));
- }
+ private static NodeId createNodeId(OvsdbConnectionInstance client) {
+ NodeKey key = client.getInstanceIdentifier().firstKeyOf(Node.class, NodeKey.class);
+ return key.getNodeId();
- public static OvsdbNodeAugmentation createOvsdbAugmentation(ConnectionInfo key) {
- OvsdbNodeAugmentationBuilder ovsdbNodeBuilder = new OvsdbNodeAugmentationBuilder();
- ovsdbNodeBuilder.setConnectionInfo(key);
- return ovsdbNodeBuilder.build();
}
public static IpAddress createIpAddress(InetAddress address) {
return new IpAddress(ipv6);
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(OvsdbClient client) {
- return createInstanceIdentifier(createIpAddress(client.getConnectionInfo().getRemoteAddress()),
- new PortNumber(client.getConnectionInfo().getRemotePort()));
- }
-
public static InstanceIdentifier<Node> createInstanceIdentifier(NodeId nodeId) {
InstanceIdentifier<Node> nodePath = InstanceIdentifier
.create(NetworkTopology.class)
return nodePath;
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key,OvsdbBridgeName bridgeName) {
- return createInstanceIdentifier(createManagedNodeId(key, bridgeName));
+ public static InstanceIdentifier<Node> createInstanceIdentifier(OvsdbConnectionInstance client,Bridge bridge) {
+ InstanceIdentifier<Node> iid;
+ if (bridge.getExternalIdsColumn() != null
+ && bridge.getExternalIdsColumn().getData() != null
+ && bridge.getExternalIdsColumn().getData().containsKey(SouthboundConstants.IID_EXTERNAL_ID_KEY)) {
+ String iidString = bridge.getExternalIdsColumn().getData().get(SouthboundConstants.IID_EXTERNAL_ID_KEY);
+ iid = (InstanceIdentifier<Node>) SouthboundUtil.deserializeInstanceIdentifier(iidString);
+ } else {
+ String nodeString = client.getNodeKey().getNodeId().getValue()
+ + "/bridge/" + bridge.getName();
+ NodeId nodeId = new NodeId(new Uri(nodeString));
+ NodeKey nodeKey = new NodeKey(nodeId);
+ iid = InstanceIdentifier.builder(NetworkTopology.class)
+ .child(Topology.class,new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
+ .child(Node.class,nodeKey)
+ .build();
+ }
+ return iid;
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key,Bridge bridge) {
- String managedNodePathString = bridge
- .getExternalIdsColumn()
- .getData()
- .get(SouthboundConstants.IID_EXTERNAL_ID_KEY);
- InstanceIdentifier<Node> managedNodePath = null;
- if (managedNodePathString != null) {
- managedNodePath = (InstanceIdentifier<Node>) SouthboundUtil
- .deserializeInstanceIdentifier(managedNodePathString);
- }
- if (managedNodePath == null) {
- managedNodePath = SouthboundMapper.createInstanceIdentifier(key,new OvsdbBridgeName(bridge.getName()));
+ public static InstanceIdentifier<Node> createInstanceIdentifier(
+ OvsdbConnectionInstance client, Controller controller, String bridgeName) {
+ InstanceIdentifier<Node> iid;
+ if (controller.getExternalIdsColumn() != null
+ && controller.getExternalIdsColumn().getData() != null
+ && controller.getExternalIdsColumn().getData().containsKey(SouthboundConstants.IID_EXTERNAL_ID_KEY)) {
+ String iidString = controller.getExternalIdsColumn().getData().get(SouthboundConstants.IID_EXTERNAL_ID_KEY);
+ iid = (InstanceIdentifier<Node>) SouthboundUtil.deserializeInstanceIdentifier(iidString);
+ } else {
+ // TODO retrieve bridge name
+ String nodeString = client.getNodeKey().getNodeId().getValue()
+ + "/bridge/" + bridgeName;
+ NodeId nodeId = new NodeId(new Uri(nodeString));
+ NodeKey nodeKey = new NodeKey(nodeId);
+ iid = InstanceIdentifier.builder(NetworkTopology.class)
+ .child(Topology.class,new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
+ .child(Node.class,nodeKey)
+ .build();
}
- return managedNodePath;
+ return iid;
}
public static NodeId createManagedNodeId(InstanceIdentifier<Node> iid) {
return nodeKey.getNodeId();
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key) {
- return createInstanceIdentifier(key.getRemoteIp(), key.getRemotePort());
- }
-
- public static InstanceIdentifier<Node> createInstanceIdentifier(IpAddress ip, PortNumber port) {
- InstanceIdentifier<Node> path = InstanceIdentifier
- .create(NetworkTopology.class)
- .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
- .child(Node.class,createNodeKey(ip,port));
- LOG.debug("Created ovsdb path: {}",path);
- return path;
- }
-
- public static NodeKey createNodeKey(IpAddress ip, PortNumber port) {
- return new NodeKey(createNodeId(ip,port));
- }
-
- public static NodeId createNodeId(OvsdbConnectionInfo connectionInfo) {
- return createNodeId(createIpAddress(connectionInfo.getRemoteAddress()),
- new PortNumber(connectionInfo.getRemotePort()));
- }
-
- public static NodeId createManagedNodeId(OvsdbConnectionInfo connectionInfo, OvsdbBridgeName bridgeName) {
- return createManagedNodeId(createIpAddress(connectionInfo.getRemoteAddress()),
- new PortNumber(connectionInfo.getRemotePort()),
- bridgeName);
- }
-
- public static NodeId createManagedNodeId(ConnectionInfo key, OvsdbBridgeName bridgeName) {
- return createManagedNodeId(key.getRemoteIp(),key.getRemotePort(),bridgeName);
- }
-
- public static NodeId createManagedNodeId(IpAddress ip, PortNumber port, OvsdbBridgeName bridgeName) {
- return new NodeId(createNodeId(ip,port).getValue()
- + "/" + SouthboundConstants.BRIDGE_URI_PREFIX + "/" + bridgeName.getValue());
- }
-
- public static NodeId createNodeId(IpAddress ip, PortNumber port) {
- String uriString = SouthboundConstants.OVSDB_URI_PREFIX + "://"
- + new String(ip.getValue()) + ":" + port.getValue();
- Uri uri = new Uri(uriString);
- NodeId nodeId = new NodeId(uri);
- return nodeId;
- }
-
public static InetAddress createInetAddress(IpAddress ip) throws UnknownHostException {
if (ip.getIpv4Address() != null) {
return InetAddress.getByName(ip.getIpv4Address().getValue());
}
public static List<ProtocolEntry> createMdsalProtocols(Bridge bridge) {
- Set<String> protocols = bridge.getProtocolsColumn().getData();
+ Set<String> protocols = null;
+ try {
+ protocols = bridge.getProtocolsColumn().getData();
+ } catch (SchemaVersionMismatchException e) {
+ LOG.warn("protocols not supported by this version of ovsdb", e);
+ }
List<ProtocolEntry> protocolList = new ArrayList<ProtocolEntry>();
if (protocols != null && protocols.size() > 0) {
ImmutableBiMap<String, Class<? extends OvsdbBridgeProtocolBase>> mapper =
return protocolList;
}
- public static List<ControllerEntry> createControllerEntries(Bridge bridge,Map<UUID,
- Controller> updatedControllerRows) {
- LOG.debug("Bridge: {}, updatedControllerRows: {}",bridge,updatedControllerRows);
- Set<UUID> controllerUUIDs = bridge.getControllerColumn().getData();
- List<ControllerEntry> controllerEntries = new ArrayList<ControllerEntry>();
+ /**
+ * Create the {@link ControllerEntry} list given an OVSDB {@link Bridge}
+ * and {@link Controller} rows.
+ *
+ * @param bridge the {@link Bridge} to update
+ * @param updatedControllerRows the list of {@link Controller} controllers with updates
+ * @return list of {@link ControllerEntry} entries
+ */
+ public static List<ControllerEntry> createControllerEntries(Bridge bridge,
+ Map<UUID, Controller> updatedControllerRows) {
+
+ LOG.debug("createControllerEntries Bridge: {}\n, updatedControllerRows: {}",
+ bridge, updatedControllerRows);
+ final Set<UUID> controllerUUIDs = bridge.getControllerColumn().getData();
+ final List<ControllerEntry> controllerEntries = new ArrayList<ControllerEntry>();
for (UUID controllerUUID : controllerUUIDs ) {
- Controller controller = updatedControllerRows.get(controllerUUID);
- if (controller != null && controller.getTargetColumn() != null
- && controller.getTargetColumn() != null) {
- String targetString = controller.getTargetColumn().getData();
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid uuid =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
+ final Controller controller = updatedControllerRows.get(controllerUUID);
+ addControllerEntries(controllerEntries, controller);
+ }
+ LOG.debug("controllerEntries: {}", controllerEntries);
+ return controllerEntries;
+ }
+
+ /**
+ * Create the {@link ControllerEntry} list given an MDSAL {@link Node} bridge
+ * and {@link Controller} rows.
+ *
+ * @param bridgeNode the {@link Node} to update
+ * @param updatedControllerRows the list of {@link Controller} controllers with updates
+ * @return list of {@link ControllerEntry} entries
+ */
+ public static List<ControllerEntry> createControllerEntries(Node bridgeNode,
+ Map<UUID, Controller> updatedControllerRows) {
+
+ LOG.debug("createControllerEntries Bridge 2: {}\n, updatedControllerRows: {}",
+ bridgeNode, updatedControllerRows);
+ final List<ControllerEntry> controllerEntriesCreated = new ArrayList<ControllerEntry>();
+ final OvsdbBridgeAugmentation ovsdbBridgeAugmentation =
+ bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class);
+ if (ovsdbBridgeAugmentation == null) {
+ return controllerEntriesCreated;
+ }
+
+ final List<ControllerEntry> controllerEntries = ovsdbBridgeAugmentation.getControllerEntry();
+ for (ControllerEntry controllerEntry : controllerEntries) {
+ final Controller controller = updatedControllerRows.get(
+ new UUID(controllerEntry.getControllerUuid().getValue()));
+ addControllerEntries(controllerEntriesCreated, controller);
+ }
+ LOG.debug("controllerEntries: {}", controllerEntriesCreated);
+ return controllerEntriesCreated;
+ }
+
+ /**
+ * Add the OVSDB {@link Controller} updates to the MDSAL {@link ControllerEntry} list.
+ *
+ * @param controllerEntries the list of {@link ControllerEntry} to update
+ * @param controller the updated OVSDB {@link Controller}
+ */
+ public static void addControllerEntries(List<ControllerEntry> controllerEntries,
+ final Controller controller) {
+
+ if (controller != null && controller.getTargetColumn() != null) {
+ final String targetString = controller.getTargetColumn().getData();
+ final org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid uuid =
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang
.ietf.yang.types.rev130715.Uuid(controller.getUuid().toString());
- controllerEntries.add(new ControllerEntryBuilder()
+
+ controllerEntries.add(new ControllerEntryBuilder()
.setTarget(new Uri(targetString))
+ .setIsConnected(controller.getIsConnectedColumn().getData())
.setControllerUuid(uuid).build());
- }
}
- return controllerEntries;
}
public static Map<UUID, Controller> createOvsdbController(OvsdbBridgeAugmentation omn,DatabaseSchema dbSchema) {
List<ControllerEntry> controllerEntries = omn.getControllerEntry();
Map<UUID,Controller> controllerMap = new HashMap<UUID,Controller>();
if (controllerEntries != null && !controllerEntries.isEmpty()) {
- int index = 0;
for (ControllerEntry controllerEntry : controllerEntries) {
String controllerNamedUUID = "Controller_" + getRandomUUID();
Controller controller = TyperUtils.getTypedRowWrapper(dbSchema, Controller.class);
public static ConnectionInfo createConnectionInfo(OvsdbClient client) {
ConnectionInfoBuilder connectionInfoBuilder = new ConnectionInfoBuilder();
connectionInfoBuilder.setRemoteIp(createIpAddress(client.getConnectionInfo().getRemoteAddress()));
- //connectionInfoBuilder.setLocalIp(createIpAddress(client.getConnectionInfo().getLocalAddress()));
connectionInfoBuilder.setRemotePort(new PortNumber(client.getConnectionInfo().getRemotePort()));
- //connectionInfoBuilder.setLocalPort(new PortNumber(client.getConnectionInfo().getLocalPort()));
+ connectionInfoBuilder.setLocalIp(createIpAddress(client.getConnectionInfo().getLocalAddress()));
+ connectionInfoBuilder.setLocalPort(new PortNumber(client.getConnectionInfo().getLocalPort()));
+ return connectionInfoBuilder.build();
+ }
+
+ public static ConnectionInfo suppressLocalIpPort(ConnectionInfo connectionInfo) {
+ ConnectionInfoBuilder connectionInfoBuilder = new ConnectionInfoBuilder();
+ connectionInfoBuilder.setRemoteIp(connectionInfo.getRemoteIp());
+ connectionInfoBuilder.setRemotePort(connectionInfo.getRemotePort());
return connectionInfoBuilder.build();
}
}
Code Review / ovsdb.git / blobdiff