Merge remote-tracking branch 'origin/master' into merge-branch

[netvirt.git] / plugin / src / main / java / org / opendaylight / ovsdb / plugin / InventoryService.java

diff --git a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
similarity index 98%
rename from ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
rename to plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
index a1bac127bc6ef6cf3ff19530f56d85584dbe0348..28ae17b68b4f4b4c3659f471e1dc45ed3cad5a4a 100644 (file)
--- a/ovsdb/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
+++ b/plugin/src/main/java/org/opendaylight/ovsdb/plugin/InventoryService.java
@@ -33,12 +33,12 @@ import org.opendaylight.controller.sal.inventory.IPluginOutInventoryService;
 import org.opendaylight.controller.sal.utils.HexEncode;
 import org.opendaylight.controller.sal.utils.ServiceHelper;
 import org.opendaylight.ovsdb.lib.database.DatabaseSchema;
-import org.opendaylight.ovsdb.lib.message.TableUpdate;
-import org.opendaylight.ovsdb.lib.message.TableUpdate.Row;
-import org.opendaylight.ovsdb.lib.message.TableUpdates;
+import org.opendaylight.ovsdb.lib.message.temp.TableUpdate;
+import org.opendaylight.ovsdb.lib.message.temp.TableUpdate.Row;
+import org.opendaylight.ovsdb.lib.message.temp.TableUpdates;
 import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
 import org.opendaylight.ovsdb.lib.table.Bridge;
-import org.opendaylight.ovsdb.lib.table.internal.Table;
+import org.opendaylight.ovsdb.lib.table.Table;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;