This is just the first step towards pulling the OVSDB Library into its own bundle.
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
import com.fasterxml.jackson.annotation.JsonProperty;\r
\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
import java.util.Map;\r
\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
\r
-import org.opendaylight.ovsdb.internal.Connection;\r
-import org.opendaylight.ovsdb.internal.OvsdbMessage;\r
+import org.opendaylight.ovsdb.plugin.Connection;\r
+import org.opendaylight.ovsdb.plugin.OvsdbMessage;\r
\r
import java.util.*;\r
\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
\r
-import org.opendaylight.ovsdb.internal.Connection;\r
-import org.opendaylight.ovsdb.internal.OvsdbMessage;\r
+import org.opendaylight.ovsdb.plugin.Connection;\r
+import org.opendaylight.ovsdb.plugin.OvsdbMessage;\r
\r
import java.util.ArrayList;\r
import java.util.HashMap;\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
import com.fasterxml.jackson.annotation.JsonProperty;\r
\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
import java.util.Map;\r
\r
-package org.opendaylight.ovsdb.database;\r
+package org.opendaylight.ovsdb.lib.database;\r
\r
import com.fasterxml.jackson.annotation.JsonProperty;\r
\r
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.common.collect.ForwardingMap;
import com.google.common.collect.Maps;
-import org.opendaylight.ovsdb.datatype.json.Converter;
+import org.opendaylight.ovsdb.lib.datatype.json.Converter;
import java.util.HashMap;
import java.util.Map;
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.Sets;
-import org.opendaylight.ovsdb.datatype.json.Converter;
+import org.opendaylight.ovsdb.lib.datatype.json.Converter;
import java.util.Set;
-package org.opendaylight.ovsdb.datatype;
+package org.opendaylight.ovsdb.lib.datatype;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver;
-import org.opendaylight.ovsdb.datatype.json.OVSDBTypesIDResolver;
-import org.opendaylight.ovsdb.datatype.json.UUIDStringConverter;
+import org.opendaylight.ovsdb.lib.datatype.json.OVSDBTypesIDResolver;
+import org.opendaylight.ovsdb.lib.datatype.json.UUIDStringConverter;
@JsonTypeIdResolver(OVSDBTypesIDResolver.class)
@JsonTypeInfo(use = JsonTypeInfo.Id.CUSTOM, include = JsonTypeInfo.As.WRAPPER_ARRAY)
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.util.StdConverter;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
public class Converter {
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import com.fasterxml.jackson.databind.JavaType;
import com.fasterxml.jackson.databind.jsontype.TypeIdResolver;
import com.fasterxml.jackson.databind.type.TypeFactory;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
public class OVSDBTypesIDResolver implements TypeIdResolver {
-package org.opendaylight.ovsdb.datatype.json;
+package org.opendaylight.ovsdb.lib.datatype.json;
import com.fasterxml.jackson.databind.util.StdConverter;
-import org.opendaylight.ovsdb.datatype.UUID;
+
+import org.opendaylight.ovsdb.lib.datatype.UUID;
public class UUIDStringConverter extends StdConverter<String, UUID> {
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import io.netty.channel.ChannelHandlerAdapter;
import io.netty.channel.ChannelHandlerContext;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
public class InvalidEncodingException extends RuntimeException {
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import com.google.common.collect.Lists;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import java.util.List;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import com.fasterxml.jackson.core.JsonEncoding;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import io.netty.channel.ChannelHandlerContext;
import io.netty.handler.codec.MessageToMessageEncoder;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.SettableFuture;
import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.ovsdb.internal.Connection;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.Connection;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-package org.opendaylight.ovsdb.internal.jsonrpc;\r
+package org.opendaylight.ovsdb.lib.jsonrpc;\r
\r
import com.fasterxml.jackson.databind.JsonNode;\r
import com.google.common.base.Strings;\r
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import java.util.List;
--- /dev/null
+package org.opendaylight.ovsdb.lib.message;
+
+
+public class EchoResponse {
+}
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.google.common.collect.Lists;
import java.util.List;
-import org.opendaylight.ovsdb.table.internal.Column;
+import org.opendaylight.ovsdb.lib.table.internal.Column;
@JsonInclude(JsonInclude.Include.NON_NULL)
public class MonitorRequest<E> {
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
-import org.opendaylight.ovsdb.internal.jsonrpc.Params;
-import org.opendaylight.ovsdb.table.Bridge;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.jsonrpc.Params;
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
import java.util.List;
import java.util.Map;
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
public class MonitorSelect {
-package org.opendaylight.ovsdb.internal.ovsdb;
+package org.opendaylight.ovsdb.lib.message;
import java.util.List;
import com.google.common.util.concurrent.ListenableFuture;
-import org.opendaylight.ovsdb.database.DatabaseSchema;
-import org.opendaylight.ovsdb.message.EchoResponse;
-import org.opendaylight.ovsdb.message.MonitorRequestBuilder;
-import org.opendaylight.ovsdb.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.database.DatabaseSchema;
public interface OVSDB {
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
import com.fasterxml.jackson.annotation.JsonAnyGetter;
import com.fasterxml.jackson.annotation.JsonAnySetter;
import java.util.Map;
import java.util.Set;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class TableUpdate<T extends Table> {
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.google.common.collect.Maps;
import java.util.Map;
import java.util.Set;
-import org.opendaylight.ovsdb.table.*;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.*;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class TableUpdates {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Bridge extends Table<Bridge> {
public static final Name<Bridge> NAME = new Name<Bridge>("Bridge"){};
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Bridge>{ controller, fail_mode, name, ports}
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Bridge>{ controller, fail_mode, name, ports}
private String name;
private OvsDBSet<UUID> ports;
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Capability extends Table<Capability> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Controller extends Table<Controller> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Interface extends Table<Interface> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Manager extends Table<Manager> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Mirror extends Table<Mirror> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class NetFlow extends Table<NetFlow> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Open_vSwitch extends Table<Open_vSwitch> {
+ external_ids + ", statistics=" + statistics + "]";
}
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Open_vSwitch>{ controller, fail_mode, name, ports}
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Open_vSwitch>{ controller, fail_mode, name, ports}
}
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
import java.math.BigInteger;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Port extends Table<Port> {
+ external_ids + "]";
}
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Port> {
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Port> {
interfaces,
name,
tag,
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
import java.math.BigInteger;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Qos extends Table<Qos> {
+ other_config + ", external_ids=" + external_ids + "]";
}
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Qos> {
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Qos> {
queues,
type,
other_config,
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
import java.math.BigInteger;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class Queue extends Table<Queue> {
+ ", external_ids=" + external_ids + "]";
}
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<Queue> {
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<Queue> {
dscp,
other_config,
external_ids}
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
public class SFlow extends Table<SFlow> {
-package org.opendaylight.ovsdb.table;
+package org.opendaylight.ovsdb.lib.table;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.table.internal.Table;
-import org.opendaylight.ovsdb.table.internal.Table.Name;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Table.Name;
public class SSL extends Table<SSL> {
+ external_ids + "]";
}
- public enum Column implements org.opendaylight.ovsdb.table.internal.Column<SSL> {
+ public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column<SSL> {
ca_cert,
bootstrap_ca_cert,
certificate,
--- /dev/null
+package org.opendaylight.ovsdb.lib.table.internal;
+
+
+public interface Column<E> {
+}
-package org.opendaylight.ovsdb.table.internal;
+package org.opendaylight.ovsdb.lib.table.internal;
public abstract class Table<E extends Table> {
-package org.opendaylight.ovsdb.table.internal;
+package org.opendaylight.ovsdb.lib.table.internal;
import java.util.ArrayList;
import java.util.List;
-import org.opendaylight.ovsdb.table.*;
+
+import org.opendaylight.ovsdb.lib.table.*;
public class Tables {
public static List<Table> tables = new ArrayList<Table>();
+++ /dev/null
-package org.opendaylight.ovsdb.message;
-
-
-public class EchoResponse {
-}
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import java.util.Dictionary;
import java.util.Hashtable;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import java.net.InetAddress;
import java.net.UnknownHostException;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
-import org.opendaylight.ovsdb.database.OVSBridge;
-import org.opendaylight.ovsdb.database.OVSInstance;
-import org.opendaylight.ovsdb.database.OvsdbType;
+import org.opendaylight.ovsdb.lib.database.OVSBridge;
+import org.opendaylight.ovsdb.lib.database.OVSInstance;
+import org.opendaylight.ovsdb.lib.database.OvsdbType;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import io.netty.channel.Channel;
import org.opendaylight.controller.sal.core.Node;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import io.netty.bootstrap.Bootstrap;
import io.netty.channel.*;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.utils.Status;
import org.opendaylight.controller.sal.utils.StatusCode;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcDecoder;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcEndpoint;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcServiceBinderHandler;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcServiceBinderHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
public enum Encapsulation {
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import java.util.Map;
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import java.util.ArrayList;\r
import java.util.Map;\r
\r
import com.fasterxml.jackson.annotation.JsonProperty;\r
\r
-import org.opendaylight.ovsdb.database.OvsdbType;\r
+import org.opendaylight.ovsdb.lib.database.OvsdbType;\r
\r
public class InsertRequest {\r
public String op;\r
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import java.net.InetAddress;
import java.net.UnknownHostException;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
public interface InventoryServiceInternal {
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import java.lang.String;\r
\r
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import com.fasterxml.jackson.databind.JsonNode;\r
import com.fasterxml.jackson.databind.ObjectMapper;\r
import io.netty.channel.ChannelHandlerContext;\r
import io.netty.channel.ChannelInboundHandlerAdapter;\r
\r
-import org.opendaylight.ovsdb.message.EchoResponse;\r
+import org.opendaylight.ovsdb.lib.message.EchoResponse;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import org.opendaylight.controller.sal.utils.Status;\r
import org.opendaylight.controller.sal.utils.StatusCode;\r
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import java.util.ArrayList;\r
import java.util.List;\r
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import org.opendaylight.controller.sal.core.NodeConnector;
import org.opendaylight.controller.sal.utils.INodeConnectorFactory;
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import org.opendaylight.controller.sal.core.ConstructionException;
import org.opendaylight.controller.sal.utils.INodeFactory;
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import java.util.Random;\r
\r
-package org.opendaylight.ovsdb.internal;
+package org.opendaylight.ovsdb.plugin;
import java.net.InetAddress;
import java.net.UnknownHostException;
-package org.opendaylight.ovsdb.internal;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
\r
import java.util.ArrayList;\r
+++ /dev/null
-package org.opendaylight.ovsdb.table.internal;
-
-
-public interface Column<E> {
-}
+++ /dev/null
-[
- "Open_vSwitch",
- null,
- {
- "Bridge": {
- "columns": [
- "controller",
- "fail_mode",
- "name",
- "ports"
- ]
- },
- "Controller": {
- "columns": [
- "is_connected",
- "target"
- ]
- },
- "Interface": {
- "columns": [
- "name",
- "options",
- "type"
- ]
- },
- "Manager": {
- "columns": [
- "is_connected",
- "target"
- ]
- },
- "Open_vSwitch": {
- "columns": [
- "bridges",
- "cur_cfg",
- "manager_options",
- "ovs_version"
- ]
- },
- "Port": {
- "columns": [
- "interfaces",
- "name",
- "tag",
- "trunks"
- ]
- }
- }
-]
\ No newline at end of file
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import io.netty.bootstrap.ServerBootstrap;
import io.netty.channel.*;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import io.netty.handler.logging.LogLevel;
import io.netty.handler.logging.LoggingHandler;
import junit.framework.TestCase;
+
import org.codehaus.jackson.map.ObjectMapper;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
import java.io.*;
import java.net.Socket;
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.jsonrpc;
import com.google.common.reflect.Invokable;
import com.google.common.reflect.TypeToken;
-package org.opendaylight.ovsdb.message;
+package org.opendaylight.ovsdb.lib.message;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import junit.framework.TestCase;
-import org.opendaylight.ovsdb.datatype.OvsDBMap;
-import org.opendaylight.ovsdb.datatype.OvsDBSet;
-import org.opendaylight.ovsdb.datatype.UUID;
-import org.opendaylight.ovsdb.table.Bridge;
-import org.opendaylight.ovsdb.table.Interface;
-import org.opendaylight.ovsdb.table.Port;
-import org.opendaylight.ovsdb.table.internal.Table;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBMap;
+import org.opendaylight.ovsdb.lib.datatype.OvsDBSet;
+import org.opendaylight.ovsdb.lib.datatype.UUID;
+import org.opendaylight.ovsdb.lib.message.TableUpdate;
+import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.Interface;
+import org.opendaylight.ovsdb.lib.table.Port;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
import org.sonatype.inject.Nullable;
import java.io.IOException;
assertEquals(2, rows.size());
List<TableUpdate.Row<Port>> sorted = Ordering.natural().onResultOf(new Function<TableUpdate.Row<Port>, String>() {
@Override
- public String apply(@Nullable org.opendaylight.ovsdb.message.TableUpdate.Row<Port> input) {
+ public String apply(@Nullable org.opendaylight.ovsdb.lib.message.TableUpdate.Row<Port> input) {
return input.getId();
}
}).sortedCopy(rows);
-package org.opendaylight.ovsdb.internal.jsonrpc;
+package org.opendaylight.ovsdb.lib.message;
import com.fasterxml.jackson.annotation.JsonAutoDetect;
import com.fasterxml.jackson.annotation.PropertyAccessor;
import org.junit.Test;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.ovsdb.database.DatabaseSchema;
-import org.opendaylight.ovsdb.internal.ConnectionService;
-import org.opendaylight.ovsdb.internal.MessageHandler;
-import org.opendaylight.ovsdb.internal.jsonrpc.JsonRpcEndpoint;
-import org.opendaylight.ovsdb.internal.ovsdb.OVSDB;
-import org.opendaylight.ovsdb.message.EchoResponse;
-import org.opendaylight.ovsdb.message.MonitorRequestBuilder;
-import org.opendaylight.ovsdb.message.TableUpdates;
-import org.opendaylight.ovsdb.table.internal.Table;
-import org.opendaylight.ovsdb.table.internal.Tables;
+import org.opendaylight.ovsdb.lib.database.DatabaseSchema;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.ovsdb.lib.jsonrpc.JsonRpcServiceBinderHandler;
+import org.opendaylight.ovsdb.lib.message.EchoResponse;
+import org.opendaylight.ovsdb.lib.message.MonitorRequestBuilder;
+import org.opendaylight.ovsdb.lib.message.OVSDB;
+import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.internal.Tables;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
+import org.opendaylight.ovsdb.plugin.MessageHandler;
import java.util.ArrayList;
import java.util.Arrays;
@Test
public void testSome() throws InterruptedException, ExecutionException {
- //todo(ashwin): this is a big mess without a bean factory like spring or guice
ConnectionService service = new ConnectionService();
ObjectMapper objectMapper = new ObjectMapper();
objectMapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
import org.junit.Test;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-package org.opendaylight.ovsdb;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import org.junit.Test;\r
import org.opendaylight.controller.sal.core.Node;\r
import org.opendaylight.controller.sal.core.NodeConnector;\r
-import org.opendaylight.ovsdb.internal.ConfigurationService;\r
-import org.opendaylight.ovsdb.internal.ConnectionService;\r
+import org.opendaylight.ovsdb.plugin.ConfigurationService;\r
+import org.opendaylight.ovsdb.plugin.ConnectionService;\r
import org.opendaylight.controller.sal.connection.ConnectionConstants;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
+\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
import org.junit.Test;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import java.util.HashMap;
import java.util.Map;
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
import java.util.HashMap;
import java.util.Map;
+
import org.junit.Test;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.*;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.opendaylight.ovsdb.internal.Encapsulation;
+import org.opendaylight.ovsdb.plugin.*;
public class OvsdbTestAddTunnel {
private static final Logger logger = LoggerFactory
-package org.opendaylight.ovsdb;
+package org.opendaylight.ovsdb.plugin;
import org.junit.Test;
import org.opendaylight.controller.sal.core.Node;
import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.ovsdb.internal.ConfigurationService;
-import org.opendaylight.ovsdb.internal.ConnectionService;
+import org.opendaylight.ovsdb.plugin.ConfigurationService;
+import org.opendaylight.ovsdb.plugin.ConnectionService;
import org.opendaylight.controller.sal.connection.ConnectionConstants;
import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import java.util.HashMap;
import java.util.Map;
-package org.opendaylight.ovsdb;\r
+package org.opendaylight.ovsdb.plugin;\r
\r
import org.junit.Test;\r
import org.opendaylight.controller.sal.core.Node;\r
import org.opendaylight.controller.sal.core.NodeConnector;\r
-import org.opendaylight.ovsdb.internal.ConfigurationService;\r
-import org.opendaylight.ovsdb.internal.ConnectionService;\r
+import org.opendaylight.ovsdb.plugin.ConfigurationService;\r
+import org.opendaylight.ovsdb.plugin.ConnectionService;\r
import org.opendaylight.controller.sal.connection.ConnectionConstants;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r