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.rev100924.Uri;
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.InterfaceTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeBase;
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.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.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ProtocolEntryBuilder;
+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.ConnectionInfoBuilder;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
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.TpId;
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;
nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, createOvsdbAugmentation(client));
return nodeBuilder.build();
}
- public static Node createNode(OvsdbClientKey key) {
+ public static Node createNode(ConnectionInfo key) {
NodeBuilder nodeBuilder = new NodeBuilder();
- nodeBuilder.setNodeId(createNodeId(key.getIp(),key.getPort()));
+ nodeBuilder.setNodeId(createNodeId(key.getRemoteIp(),key.getRemotePort()));
nodeBuilder.addAugmentation(OvsdbNodeAugmentation.class, createOvsdbAugmentation(key));
return nodeBuilder.build();
}
public static OvsdbNodeAugmentation createOvsdbAugmentation(OvsdbClient client) {
- return createOvsdbAugmentation(new OvsdbClientKey(client));
+ return createOvsdbAugmentation(createConnectionInfo(client));
}
- public static OvsdbNodeAugmentation createOvsdbAugmentation(OvsdbClientKey key) {
+ public static OvsdbNodeAugmentation createOvsdbAugmentation(ConnectionInfo key) {
OvsdbNodeAugmentationBuilder ovsdbNodeBuilder = new OvsdbNodeAugmentationBuilder();
- ovsdbNodeBuilder.setIp(key.getIp());
- ovsdbNodeBuilder.setPort(key.getPort());
+ ovsdbNodeBuilder.setConnectionInfo(key);
return ovsdbNodeBuilder.build();
}
public static IpAddress createIpAddress(InetAddress address) {
IpAddress ip = null;
- if(address instanceof Inet4Address) {
+ if (address instanceof Inet4Address) {
ip = createIpAddress((Inet4Address)address);
} else if (address instanceof Inet6Address) {
ip = createIpAddress((Inet6Address)address);
return nodePath;
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(OvsdbClientKey key,OvsdbBridgeName bridgeName) {
+ public static InstanceIdentifier<Node> createInstanceIdentifier(ConnectionInfo key,OvsdbBridgeName bridgeName) {
return createInstanceIdentifier(createManagedNodeId(key, bridgeName));
}
- public static InstanceIdentifier<Node> createInstanceIdentifier(OvsdbClientKey key) {
- return createInstanceIdentifier(key.getIp(), key.getPort());
+ 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()));
+ }
+ return managedNodePath;
+ }
+
+ public static NodeId createManagedNodeId(InstanceIdentifier<Node> iid) {
+ NodeKey nodeKey = iid.firstKeyOf(Node.class, NodeKey.class);
+ 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) {
.create(NetworkTopology.class)
.child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID))
.child(Node.class,createNodeKey(ip,port));
- LOG.info("Created ovsdb path: {}",path);
+ LOG.debug("Created ovsdb path: {}",path);
return path;
}
bridgeName);
}
- public static NodeId createManagedNodeId(OvsdbClientKey key, OvsdbBridgeName bridgeName) {
- return createManagedNodeId(key.getIp(),key.getPort(),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());
+ + "/" + 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();
+ 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 TpId createTerminationPointId(OvsdbConnectionInfo connectionInfo, OvsdbBridgeName bridgeName, String tpName) {
- return createTerminationPointId(createIpAddress(connectionInfo.getRemoteAddress()),
- new PortNumber(connectionInfo.getRemotePort()),
- bridgeName, tpName);
- }
-
- public static TpId createTerminationPointId(OvsdbClientKey key, OvsdbBridgeName bridgeName, String tpName) {
- return createTerminationPointId(key.getIp(),key.getPort(),bridgeName, tpName);
- }
-
- public static TpId createTerminationPointId(IpAddress ip, PortNumber port, OvsdbBridgeName bridgeName, String tpName) {
- return new TpId(createNodeId(ip,port).getValue()
- + "/"+SouthboundConstants.BRIDGE_URI_PREFIX+"/"+ bridgeName.getValue()
- + "/"+SouthboundConstants.TP_URI_PREFIX+"/"+ tpName);
- }
-
public static InetAddress createInetAddress(IpAddress ip) throws UnknownHostException {
- if(ip.getIpv4Address() != null) {
+ if (ip.getIpv4Address() != null) {
return InetAddress.getByName(ip.getIpv4Address().getValue());
- } else if(ip.getIpv6Address() != null) {
+ } else if (ip.getIpv6Address() != null) {
return InetAddress.getByName(ip.getIpv6Address().getValue());
} else {
throw new UnknownHostException("IP Address has no value");
public static DatapathId createDatapathId(Bridge bridge) {
Preconditions.checkNotNull(bridge);
- if(bridge.getDatapathIdColumn() == null) {
+ if (bridge.getDatapathIdColumn() == null) {
return null;
} else {
return createDatapathId(bridge.getDatapathIdColumn().getData());
public static DatapathId createDatapathId(Set<String> dpids) {
Preconditions.checkNotNull(dpids);
- if(dpids.isEmpty()) {
+ if (dpids.isEmpty()) {
return null;
} else {
String[] dpidArray = new String[dpids.size()];
if (SouthboundConstants.DATAPATH_TYPE_MAP.get(mdsalbridge.getDatapathType()) != null) {
datapathtype = SouthboundConstants.DATAPATH_TYPE_MAP.get(mdsalbridge.getDatapathType());
} else {
- throw new IllegalArgumentException("Unknown datapath type " + SouthboundConstants.DATAPATH_TYPE_MAP.get(mdsalbridge.getDatapathType()));
+ throw new IllegalArgumentException("Unknown datapath type "
+ + SouthboundConstants.DATAPATH_TYPE_MAP.get(mdsalbridge.getDatapathType()));
}
}
return datapathtype;
}
+ public static Class<? extends DatapathTypeBase> createDatapathType(String type) {
+ Preconditions.checkNotNull(type);
+ if (type.isEmpty()) {
+ return DatapathTypeSystem.class;
+ } else {
+ ImmutableBiMap<String, Class<? extends DatapathTypeBase>> mapper =
+ SouthboundConstants.DATAPATH_TYPE_MAP.inverse();
+ return mapper.get(type);
+ }
+ }
+
public static DatapathId createDatapathId(String dpid) {
Preconditions.checkNotNull(dpid);
DatapathId datapath;
- if(dpid.matches("^[0-9a-fA-F]{16}")) {
+ if (dpid.matches("^[0-9a-fA-F]{16}")) {
Splitter splitter = Splitter.fixedLength(2);
Joiner joiner = Joiner.on(":");
datapath = new DatapathId(joiner.join(splitter.split(dpid)));
public static Set<String> createOvsdbBridgeProtocols(OvsdbBridgeAugmentation ovsdbBridgeNode) {
Set<String> protocols = new HashSet<String>();
- if(ovsdbBridgeNode.getProtocolEntry() != null && ovsdbBridgeNode.getProtocolEntry().size() > 0) {
- for(ProtocolEntry protocol : ovsdbBridgeNode.getProtocolEntry()) {
- if(SouthboundConstants.OVSDB_PROTOCOL_MAP.get(protocol.getProtocol()) != null) {
+ if (ovsdbBridgeNode.getProtocolEntry() != null && ovsdbBridgeNode.getProtocolEntry().size() > 0) {
+ for (ProtocolEntry protocol : ovsdbBridgeNode.getProtocolEntry()) {
+ if (SouthboundConstants.OVSDB_PROTOCOL_MAP.get(protocol.getProtocol()) != null) {
protocols.add(SouthboundConstants.OVSDB_PROTOCOL_MAP.get(protocol.getProtocol()));
} else {
throw new IllegalArgumentException("Unknown protocol " + protocol.getProtocol());
public static String createOvsdbInterfaceType(Class<? extends InterfaceTypeBase> mdsaltype) {
Preconditions.checkNotNull(mdsaltype);
- ImmutableBiMap<Class<? extends InterfaceTypeBase>, String> mapper = SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.inverse();
+ ImmutableBiMap<Class<? extends InterfaceTypeBase>, String> mapper =
+ SouthboundConstants.OVSDB_INTERFACE_TYPE_MAP.inverse();
return mapper.get(mdsaltype);
}
public static List<ProtocolEntry> createMdsalProtocols(Bridge bridge) {
Set<String> protocols = bridge.getProtocolsColumn().getData();
List<ProtocolEntry> protocolList = new ArrayList<ProtocolEntry>();
- if(protocols != null && protocols.size() >0) {
- ImmutableBiMap<String, Class<? extends OvsdbBridgeProtocolBase>> mapper = SouthboundConstants.OVSDB_PROTOCOL_MAP.inverse();
- for(String protocol : protocols) {
- if(protocol != null && mapper.get(protocol) != null) {
- protocolList.add(new ProtocolEntryBuilder().setProtocol((Class<? extends OvsdbBridgeProtocolBase>) mapper.get(protocol)).build());
+ if (protocols != null && protocols.size() > 0) {
+ ImmutableBiMap<String, Class<? extends OvsdbBridgeProtocolBase>> mapper =
+ SouthboundConstants.OVSDB_PROTOCOL_MAP.inverse();
+ for (String protocol : protocols) {
+ if (protocol != null && mapper.get(protocol) != null) {
+ protocolList.add(new ProtocolEntryBuilder().
+ setProtocol((Class<? extends OvsdbBridgeProtocolBase>) mapper.get(protocol)).build());
}
}
}
return protocolList;
}
- public static List<ControllerEntry> createControllerEntries(Bridge bridge,Map<UUID,Controller> updatedControllerRows) {
+ 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>();
- for(UUID controllerUUID : controllerUUIDs ) {
+ for (UUID controllerUUID : controllerUUIDs ) {
Controller controller = updatedControllerRows.get(controllerUUID);
- if(controller != null && controller.getTargetColumn() != null
+ if (controller != null && controller.getTargetColumn() != null
&& controller.getTargetColumn() != null) {
String targetString = controller.getTargetColumn().getData();
- controllerEntries.add(new ControllerEntryBuilder().setTarget(new Uri(targetString)).build());
+ 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()
+ .setTarget(new Uri(targetString))
+ .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()) {
+ if (controllerEntries != null && !controllerEntries.isEmpty()) {
int index = 0;
- for(ControllerEntry controllerEntry : controllerEntries) {
- String controllerNamedUUID = "Controller_" + omn.getBridgeName().getValue() + index++;
+ for (ControllerEntry controllerEntry : controllerEntries) {
+ String controllerNamedUUID = "Controller_" + getRandomUUID();
Controller controller = TyperUtils.getTypedRowWrapper(dbSchema, Controller.class);
controller.setTarget(controllerEntry.getTarget().getValue());
controllerMap.put(new UUID(controllerNamedUUID), controller);
}
return controllerMap;
}
+
+ public static String getRandomUUID() {
+ return "Random_" + java.util.UUID.randomUUID().toString().replace("-", "");
+ }
+ 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()));
+ return connectionInfoBuilder.build();
+ }
}
Code Review / ovsdb.git / blobdiff