From 9614fec6a0910c23fbb77ae29f202f58a079a386 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 24 Oct 2013 03:54:13 -0700 Subject: [PATCH] Package name changes to reflect functionality differences between Library and Plugin. This is just the first step towards pulling the OVSDB Library into its own bundle. Signed-off-by: Madhu Venugopal --- .../{ => lib}/database/ColumnSchema.java | 2 +- .../{ => lib}/database/DatabaseSchema.java | 2 +- .../ovsdb/{ => lib}/database/OVSBridge.java | 6 +-- .../ovsdb/{ => lib}/database/OVSInstance.java | 6 +-- .../ovsdb/{ => lib}/database/OvsdbType.java | 2 +- .../ovsdb/{ => lib}/database/TableSchema.java | 2 +- .../ovsdb/{ => lib}/database/Uuid.java | 2 +- .../ovsdb/{ => lib}/datatype/OvsDBMap.java | 4 +- .../ovsdb/{ => lib}/datatype/OvsDBSet.java | 4 +- .../ovsdb/{ => lib}/datatype/UUID.java | 6 +-- .../{ => lib}/datatype/json/Converter.java | 9 ++-- .../datatype/json/OVSDBTypesIDResolver.java | 7 +-- .../datatype/json/UUIDStringConverter.java | 5 +- .../jsonrpc/ExceptionHandler.java | 2 +- .../jsonrpc/InvalidEncodingException.java | 2 +- .../jsonrpc/JsonRpc10Request.java | 2 +- .../jsonrpc/JsonRpc10Response.java | 2 +- .../jsonrpc/JsonRpcDecoder.java | 2 +- .../jsonrpc/JsonRpcEncoder.java | 2 +- .../jsonrpc/JsonRpcEndpoint.java | 6 +-- .../jsonrpc/JsonRpcServiceBinderHandler.java | 2 +- .../{internal => lib}/jsonrpc/Params.java | 2 +- .../ovsdb/lib/message/EchoResponse.java | 5 ++ .../{ => lib}/message/MonitorRequest.java | 4 +- .../message/MonitorRequestBuilder.java | 8 +-- .../{ => lib}/message/MonitorSelect.java | 2 +- .../ovsdb => lib/message}/OVSDB.java | 7 +-- .../ovsdb/{ => lib}/message/TableUpdate.java | 4 +- .../ovsdb/{ => lib}/message/TableUpdates.java | 6 +-- .../ovsdb/{ => lib}/table/Bridge.java | 12 ++--- .../ovsdb/{ => lib}/table/Capability.java | 6 +-- .../ovsdb/{ => lib}/table/Controller.java | 4 +- .../ovsdb/{ => lib}/table/Interface.java | 8 +-- .../ovsdb/{ => lib}/table/Manager.java | 4 +- .../ovsdb/{ => lib}/table/Mirror.java | 10 ++-- .../ovsdb/{ => lib}/table/NetFlow.java | 6 +-- .../ovsdb/{ => lib}/table/Open_vSwitch.java | 12 ++--- .../ovsdb/{ => lib}/table/Port.java | 12 ++--- .../ovsdb/{ => lib}/table/Qos.java | 12 ++--- .../ovsdb/{ => lib}/table/Queue.java | 12 ++--- .../ovsdb/{ => lib}/table/SFlow.java | 8 +-- .../ovsdb/{ => lib}/table/SSL.java | 12 ++--- .../ovsdb/lib/table/internal/Column.java | 5 ++ .../ovsdb/{ => lib}/table/internal/Table.java | 2 +- .../{ => lib}/table/internal/Tables.java | 5 +- .../ovsdb/message/EchoResponse.java | 5 -- .../ovsdb/{internal => plugin}/Activator.java | 2 +- .../ConfigurationService.java | 8 +-- .../{internal => plugin}/Connection.java | 2 +- .../ConnectionService.java | 8 +-- .../{internal => plugin}/Encapsulation.java | 2 +- .../IConnectionServiceInternal.java | 2 +- .../{internal => plugin}/InsertRequest.java | 4 +- .../InventoryService.java | 2 +- .../InventoryServiceInternal.java | 2 +- .../ovsdb/{internal => plugin}/JSONMsg.java | 2 +- .../{internal => plugin}/MessageHandler.java | 4 +- .../MessageHandlerFuture.java | 2 +- .../{internal => plugin}/MessageMapper.java | 2 +- .../{internal => plugin}/MutateRequest.java | 2 +- .../NodeConnectorFactory.java | 2 +- .../{internal => plugin}/NodeFactory.java | 2 +- .../{internal => plugin}/OvsdbMessage.java | 2 +- .../{internal => plugin}/ReadService.java | 2 +- .../{internal => plugin}/UpdateRequest.java | 2 +- .../ovsdb/table/internal/Column.java | 5 -- .../ovsdb/internal/json/test.json | 49 ------------------- .../jsonrpc/NettyBootStrapper.java | 2 +- .../{internal => lib}/jsonrpc/TestClient.java | 4 +- .../{internal => lib}/jsonrpc/TestTokens.java | 2 +- .../message/MonitorResponseTest.java | 20 ++++---- .../message}/OVSDBNettyFactoryTest.java | 25 +++++----- .../OVSDBTestGetBridgeDomains.java | 6 +-- .../{ => plugin}/OvsdbTestAddBridge.java | 7 +-- .../ovsdb/{ => plugin}/OvsdbTestAddPort.java | 7 +-- .../{ => plugin}/OvsdbTestAddTunnel.java | 6 +-- .../ovsdb/{ => plugin}/OvsdbTestAddVlan.java | 7 +-- .../{ => plugin}/OvsdbTestSetManager.java | 6 +-- 78 files changed, 205 insertions(+), 245 deletions(-) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/ColumnSchema.java (81%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/DatabaseSchema.java (84%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/OVSBridge.java (89%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/OVSInstance.java (87%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/OvsdbType.java (94%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/TableSchema.java (87%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/database/Uuid.java (71%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/OvsDBMap.java (84%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/OvsDBSet.java (86%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/UUID.java (74%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/json/Converter.java (94%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/json/OVSDBTypesIDResolver.java (89%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/datatype/json/UUIDStringConverter.java (69%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/ExceptionHandler.java (91%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/InvalidEncodingException.java (85%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpc10Request.java (95%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpc10Response.java (93%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpcDecoder.java (99%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpcEncoder.java (90%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpcEndpoint.java (96%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/JsonRpcServiceBinderHandler.java (93%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/Params.java (61%) create mode 100644 ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/message/MonitorRequest.java (89%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/message/MonitorRequestBuilder.java (76%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/message/MonitorSelect.java (93%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal/ovsdb => lib/message}/OVSDB.java (69%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/message/TableUpdate.java (94%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/message/TableUpdates.java (96%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Bridge.java (88%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Capability.java (79%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Controller.java (83%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Interface.java (92%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Manager.java (83%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Mirror.java (90%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/NetFlow.java (77%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Open_vSwitch.java (91%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Port.java (87%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Qos.java (80%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/Queue.java (77%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/SFlow.java (89%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/SSL.java (82%) create mode 100644 ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/internal/Table.java (90%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{ => lib}/table/internal/Tables.java (87%) delete mode 100644 ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/Activator.java (99%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/ConfigurationService.java (99%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/Connection.java (98%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/ConnectionService.java (96%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/Encapsulation.java (89%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/IConnectionServiceInternal.java (88%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/InsertRequest.java (80%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/InventoryService.java (98%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/InventoryServiceInternal.java (53%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/JSONMsg.java (74%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/MessageHandler.java (92%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/MessageHandlerFuture.java (95%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/MessageMapper.java (92%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/MutateRequest.java (87%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/NodeConnectorFactory.java (97%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/NodeFactory.java (96%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/OvsdbMessage.java (85%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/ReadService.java (99%) rename ovsdb/src/main/java/org/opendaylight/ovsdb/{internal => plugin}/UpdateRequest.java (87%) delete mode 100644 ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java delete mode 100644 ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json rename ovsdb/src/test/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/NettyBootStrapper.java (97%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/TestClient.java (96%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{internal => lib}/jsonrpc/TestTokens.java (95%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => lib}/message/MonitorResponseTest.java (89%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{internal/jsonrpc => lib/message}/OVSDBNettyFactoryTest.java (82%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OVSDBTestGetBridgeDomains.java (91%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OvsdbTestAddBridge.java (89%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OvsdbTestAddPort.java (91%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OvsdbTestAddTunnel.java (95%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OvsdbTestAddVlan.java (93%) rename ovsdb/src/test/java/org/opendaylight/ovsdb/{ => plugin}/OvsdbTestSetManager.java (88%) diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java similarity index 81% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java index 8ec68f998..55cdf43a3 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/ColumnSchema.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/ColumnSchema.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java similarity index 84% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java index 7df70f2ab..8d7daa6cf 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/DatabaseSchema.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/DatabaseSchema.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; import java.util.Map; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java similarity index 89% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java index 35c671960..f44fc1343 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSBridge.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSBridge.java @@ -1,8 +1,8 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; -import org.opendaylight.ovsdb.internal.Connection; -import org.opendaylight.ovsdb.internal.OvsdbMessage; +import org.opendaylight.ovsdb.plugin.Connection; +import org.opendaylight.ovsdb.plugin.OvsdbMessage; import java.util.*; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java index 610993a0f..fdecbb73c 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OVSInstance.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OVSInstance.java @@ -1,8 +1,8 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; -import org.opendaylight.ovsdb.internal.Connection; -import org.opendaylight.ovsdb.internal.OvsdbMessage; +import org.opendaylight.ovsdb.plugin.Connection; +import org.opendaylight.ovsdb.plugin.OvsdbMessage; import java.util.ArrayList; import java.util.HashMap; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java similarity index 94% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java index bc4d05927..94b920077 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/OvsdbType.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/OvsdbType.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java index 0172bb890..98c9326b3 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/TableSchema.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/TableSchema.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; import java.util.Map; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java similarity index 71% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java index c5b016ed9..c871111a2 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/database/Uuid.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/database/Uuid.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.database; +package org.opendaylight.ovsdb.lib.database; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java similarity index 84% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java index f3455b670..3a991ce4d 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBMap.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBMap.java @@ -1,10 +1,10 @@ -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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java similarity index 86% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java index e13b45461..639ff1e37 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/OvsDBSet.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/OvsDBSet.java @@ -1,10 +1,10 @@ -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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java similarity index 74% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java index 45a706470..9ba077871 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/UUID.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/UUID.java @@ -1,11 +1,11 @@ -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) diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java similarity index 94% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java index 0c8a44444..5bc27630c 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/Converter.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/Converter.java @@ -1,10 +1,11 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java similarity index 89% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java index b81a26f49..9c4030abd 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/OVSDBTypesIDResolver.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/OVSDBTypesIDResolver.java @@ -1,11 +1,12 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java similarity index 69% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java index 7790a7d67..70d7873fd 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/datatype/json/UUIDStringConverter.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/datatype/json/UUIDStringConverter.java @@ -1,7 +1,8 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java similarity index 91% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java index 4599fa5a4..8d7830256 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/ExceptionHandler.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/ExceptionHandler.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import io.netty.channel.ChannelHandlerAdapter; import io.netty.channel.ChannelHandlerContext; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java similarity index 85% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java index 35a3571d6..8580f3429 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/InvalidEncodingException.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/InvalidEncodingException.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; public class InvalidEncodingException extends RuntimeException { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java similarity index 95% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java index 93df4e02e..4c98a7c6b 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Request.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Request.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import com.google.common.collect.Lists; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java similarity index 93% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java index e897197d0..b13366daf 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpc10Response.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpc10Response.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import java.util.List; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java similarity index 99% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java index 2430f02f0..d76cd8430 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcDecoder.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcDecoder.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import com.fasterxml.jackson.core.JsonEncoding; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java similarity index 90% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java index 9cfe09a20..1b503cd88 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEncoder.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEncoder.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import io.netty.channel.ChannelHandlerContext; import io.netty.handler.codec.MessageToMessageEncoder; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java similarity index 96% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java index e2a1ee6f5..c3281b30e 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcEndpoint.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcEndpoint.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonNode; @@ -11,8 +11,8 @@ import com.google.common.util.concurrent.ListenableFuture; 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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java similarity index 93% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java index 30b71ef12..de1454cd2 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/JsonRpcServiceBinderHandler.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/JsonRpcServiceBinderHandler.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Strings; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java similarity index 61% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java index ba93c7a09..89859bce3 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/jsonrpc/Params.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/jsonrpc/Params.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import java.util.List; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java new file mode 100644 index 000000000..90cc98f6f --- /dev/null +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/EchoResponse.java @@ -0,0 +1,5 @@ +package org.opendaylight.ovsdb.lib.message; + + +public class EchoResponse { +} diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java similarity index 89% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java index b25e06e3d..e1596a987 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequest.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequest.java @@ -1,11 +1,11 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java similarity index 76% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java index c0ebe05f5..e30e731b2 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorRequestBuilder.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorRequestBuilder.java @@ -1,11 +1,11 @@ -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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java similarity index 93% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java index 2601e306b..b1c0c9810 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/MonitorSelect.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/MonitorSelect.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.message; +package org.opendaylight.ovsdb.lib.message; public class MonitorSelect { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java similarity index 69% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java index 9a836080c..2659ccebf 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ovsdb/OVSDB.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/OVSDB.java @@ -1,13 +1,10 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java similarity index 94% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java index 8d8432b4a..1b89ba40a 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdate.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdate.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.message; +package org.opendaylight.ovsdb.lib.message; import com.fasterxml.jackson.annotation.JsonAnyGetter; import com.fasterxml.jackson.annotation.JsonAnySetter; @@ -10,7 +10,7 @@ import java.util.Collection; 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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java similarity index 96% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java index fc6a1233d..f79826fda 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/TableUpdates.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/message/TableUpdates.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.message; +package org.opendaylight.ovsdb.lib.message; import com.fasterxml.jackson.annotation.JsonProperty; import com.google.common.collect.Maps; @@ -6,8 +6,8 @@ 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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java similarity index 88% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java index f8c4f09ac..f6da9eec5 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Bridge.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Bridge.java @@ -1,13 +1,13 @@ -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 { public static final Name NAME = new Name("Bridge"){}; - public enum Column implements org.opendaylight.ovsdb.table.internal.Column{ controller, fail_mode, name, ports} + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column{ controller, fail_mode, name, ports} private String name; private OvsDBSet ports; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java similarity index 79% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java index 88c6d22f4..e7803e120 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Capability.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Capability.java @@ -1,7 +1,7 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java similarity index 83% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java index 94de6caa1..278ffd306 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Controller.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Controller.java @@ -1,6 +1,6 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java similarity index 92% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java index 3a0ad2884..8dbeeec20 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Interface.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Interface.java @@ -1,8 +1,8 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java similarity index 83% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java index edbf64844..478cfa36b 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Manager.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Manager.java @@ -1,6 +1,6 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java similarity index 90% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java index 2b80d607a..7f17cad00 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Mirror.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Mirror.java @@ -1,9 +1,9 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java similarity index 77% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java index 165ad395a..359ec7cff 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/NetFlow.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/NetFlow.java @@ -1,7 +1,7 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java similarity index 91% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java index d6dd6533d..ecfa80fca 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Open_vSwitch.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Open_vSwitch.java @@ -1,9 +1,9 @@ -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 { @@ -156,5 +156,5 @@ public class Open_vSwitch extends Table { + external_ids + ", statistics=" + statistics + "]"; } - public enum Column implements org.opendaylight.ovsdb.table.internal.Column{ controller, fail_mode, name, ports} + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column{ controller, fail_mode, name, ports} } diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java index 53f605c5a..b109755bf 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Port.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Port.java @@ -1,11 +1,11 @@ -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 { @@ -100,7 +100,7 @@ public class Port extends Table { + external_ids + "]"; } - public enum Column implements org.opendaylight.ovsdb.table.internal.Column { + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column { interfaces, name, tag, diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java similarity index 80% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java index c17389bba..7973879eb 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Qos.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Qos.java @@ -1,11 +1,11 @@ -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 { @@ -62,7 +62,7 @@ public class Qos extends Table { + other_config + ", external_ids=" + external_ids + "]"; } - public enum Column implements org.opendaylight.ovsdb.table.internal.Column { + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column { queues, type, other_config, diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java similarity index 77% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java index 1cba94d1f..657e11282 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/Queue.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/Queue.java @@ -1,11 +1,11 @@ -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 { @@ -53,7 +53,7 @@ public class Queue extends Table { + ", external_ids=" + external_ids + "]"; } - public enum Column implements org.opendaylight.ovsdb.table.internal.Column { + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column { dscp, other_config, external_ids} diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java similarity index 89% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java index 9d96bfeed..0242b08e7 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SFlow.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SFlow.java @@ -1,8 +1,8 @@ -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 { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java similarity index 82% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java index 584374142..e764a0771 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/SSL.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/SSL.java @@ -1,9 +1,9 @@ -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 { @@ -58,7 +58,7 @@ public class SSL extends Table { + external_ids + "]"; } - public enum Column implements org.opendaylight.ovsdb.table.internal.Column { + public enum Column implements org.opendaylight.ovsdb.lib.table.internal.Column { ca_cert, bootstrap_ca_cert, certificate, diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java new file mode 100644 index 000000000..21927c6e9 --- /dev/null +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Column.java @@ -0,0 +1,5 @@ +package org.opendaylight.ovsdb.lib.table.internal; + + +public interface Column { +} diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java similarity index 90% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java index ee8deb618..456aa24fe 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Table.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Table.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.table.internal; +package org.opendaylight.ovsdb.lib.table.internal; public abstract class Table { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java index 63a5ed2aa..4244d36c3 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Tables.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/lib/table/internal/Tables.java @@ -1,8 +1,9 @@ -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 tables = new ArrayList
(); diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java deleted file mode 100644 index 2af74c423..000000000 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/message/EchoResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opendaylight.ovsdb.message; - - -public class EchoResponse { -} diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java similarity index 99% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java index b5a1af4cc..0826a0037 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Activator.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Activator.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.Dictionary; import java.util.Hashtable; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java similarity index 99% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java index 27c570f80..7f081769a 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConfigurationService.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConfigurationService.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.net.InetAddress; import java.net.UnknownHostException; @@ -6,9 +6,9 @@ import java.util.*; 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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java similarity index 98% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java index d901598c2..2f94cce66 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Connection.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Connection.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import io.netty.channel.Channel; import org.opendaylight.controller.sal.core.Node; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java similarity index 96% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java index 479ba5c2b..14189d20f 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ConnectionService.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ConnectionService.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import io.netty.bootstrap.Bootstrap; import io.netty.channel.*; @@ -15,9 +15,9 @@ import org.opendaylight.controller.sal.connection.IPluginInConnectionService; 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; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java similarity index 89% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java index 72b7a711a..34e21c503 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/Encapsulation.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/Encapsulation.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; public enum Encapsulation { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java similarity index 88% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java index 612df8829..9d84100f3 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/IConnectionServiceInternal.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/IConnectionServiceInternal.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.Map; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java similarity index 80% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java index 97a4edd5e..dfc0a6676 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InsertRequest.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InsertRequest.java @@ -1,11 +1,11 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.ArrayList; import java.util.Map; import com.fasterxml.jackson.annotation.JsonProperty; -import org.opendaylight.ovsdb.database.OvsdbType; +import org.opendaylight.ovsdb.lib.database.OvsdbType; public class InsertRequest { public String op; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java similarity index 98% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java index ffd615d3c..4302bf29f 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryService.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java similarity index 53% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java index a74df7212..703583fa7 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/InventoryServiceInternal.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryServiceInternal.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; public interface InventoryServiceInternal { diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java similarity index 74% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java index e7e01da58..d641726ce 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/JSONMsg.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/JSONMsg.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.lang.String; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java similarity index 92% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java index 417d9ae47..a17b7b9b3 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandler.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandler.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.ObjectMapper; @@ -6,7 +6,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import io.netty.channel.ChannelHandlerContext; import io.netty.channel.ChannelInboundHandlerAdapter; -import org.opendaylight.ovsdb.message.EchoResponse; +import org.opendaylight.ovsdb.lib.message.EchoResponse; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java similarity index 95% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java index bae2054ea..2e5c6c754 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageHandlerFuture.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageHandlerFuture.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import org.opendaylight.controller.sal.utils.Status; import org.opendaylight.controller.sal.utils.StatusCode; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java similarity index 92% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java index 175874fec..0f4d5a8de 100644 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MessageMapper.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MessageMapper.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java index 342d25b8d..793a10231 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/MutateRequest.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/MutateRequest.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.ArrayList; import java.util.List; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java similarity index 97% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java index 3d1dc84d0..5081f8a3f 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeConnectorFactory.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeConnectorFactory.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import org.opendaylight.controller.sal.core.NodeConnector; import org.opendaylight.controller.sal.utils.INodeConnectorFactory; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java similarity index 96% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java index f6312e64a..b34dc17df 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/NodeFactory.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/NodeFactory.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import org.opendaylight.controller.sal.core.ConstructionException; import org.opendaylight.controller.sal.utils.INodeFactory; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java similarity index 85% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java index 88b2b0c36..84d5be286 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/OvsdbMessage.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/OvsdbMessage.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.Random; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java similarity index 99% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java index f91738bc2..6df5bdc65 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/ReadService.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/ReadService.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.net.InetAddress; import java.net.UnknownHostException; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java similarity index 87% rename from ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java rename to ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java index 876382540..a2bef9bca 100755 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/internal/UpdateRequest.java +++ b/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/UpdateRequest.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal; +package org.opendaylight.ovsdb.plugin; import java.util.ArrayList; diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java b/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java deleted file mode 100644 index 532143205..000000000 --- a/ovsdb/src/main/java/org/opendaylight/ovsdb/table/internal/Column.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.opendaylight.ovsdb.table.internal; - - -public interface Column { -} diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json b/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json deleted file mode 100644 index 876386876..000000000 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/json/test.json +++ /dev/null @@ -1,49 +0,0 @@ -[ - "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 diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java similarity index 97% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java index 6f3027616..c6ecb72f8 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/NettyBootStrapper.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/NettyBootStrapper.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.*; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java similarity index 96% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java index c08699c4f..003985962 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestClient.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestClient.java @@ -1,12 +1,14 @@ -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; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java similarity index 95% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java index 679befdf7..44d48fd0f 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/TestTokens.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/jsonrpc/TestTokens.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.jsonrpc; import com.google.common.reflect.Invokable; import com.google.common.reflect.TypeToken; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java similarity index 89% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java index 8632809ab..900a84da9 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/message/MonitorResponseTest.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/MonitorResponseTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.message; +package org.opendaylight.ovsdb.lib.message; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; @@ -10,13 +10,15 @@ import com.google.common.io.Resources; 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; @@ -88,7 +90,7 @@ public class MonitorResponseTest extends TestCase { assertEquals(2, rows.size()); List> sorted = Ordering.natural().onResultOf(new Function, String>() { @Override - public String apply(@Nullable org.opendaylight.ovsdb.message.TableUpdate.Row input) { + public String apply(@Nullable org.opendaylight.ovsdb.lib.message.TableUpdate.Row input) { return input.getId(); } }).sortedCopy(rows); diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java similarity index 82% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java index f49df9cbc..31a8610d6 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/internal/jsonrpc/OVSDBNettyFactoryTest.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/lib/message/OVSDBNettyFactoryTest.java @@ -1,4 +1,4 @@ -package org.opendaylight.ovsdb.internal.jsonrpc; +package org.opendaylight.ovsdb.lib.message; import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.PropertyAccessor; @@ -17,16 +17,18 @@ import junit.framework.TestCase; 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; @@ -43,7 +45,6 @@ public class OVSDBNettyFactoryTest { @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); diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java similarity index 91% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java index 65bb20c2b..3eba9d7d2 100644 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OVSDBTestGetBridgeDomains.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OVSDBTestGetBridgeDomains.java @@ -1,11 +1,11 @@ -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; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java similarity index 89% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java index b603779a3..21f099141 100755 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddBridge.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddBridge.java @@ -1,13 +1,14 @@ -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; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java similarity index 91% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java index b221c0465..f092535f0 100755 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddPort.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddPort.java @@ -1,13 +1,14 @@ -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; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java similarity index 95% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java index 16ac26ba6..ed3bdc67f 100755 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddTunnel.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddTunnel.java @@ -1,17 +1,17 @@ -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 diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java similarity index 93% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java index b8f0b4f61..cdd3ca4a2 100755 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestAddVlan.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestAddVlan.java @@ -1,14 +1,15 @@ -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; diff --git a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java similarity index 88% rename from ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java rename to ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java index 6486827b1..f3421666b 100755 --- a/ovsdb/src/test/java/org/opendaylight/ovsdb/OvsdbTestSetManager.java +++ b/ovsdb/src/test/java/org/opendaylight/ovsdb/plugin/OvsdbTestSetManager.java @@ -1,10 +1,10 @@ -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; -- 2.36.6