Move inventory utilities to separate package.

Change-Id: Ifda35e60e7d03ac97b768e84146b91ddf15cc41f
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java
index 80d8744e7fd427f9cea66b9eabb48600ee600a50..2f91e628a897562278b49298e7ffd1ac9a4548c0 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/DataFlowFilterImpl.java
@@ -16,8 +16,8 @@ import org.opendaylight.vtn.manager.flow.DataFlowFilter;
 
 import org.opendaylight.vtn.manager.internal.cluster.MacVlan;
 import org.opendaylight.vtn.manager.internal.cluster.VTNFlow;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/FlowModTask.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/FlowModTask.java
index 0eb9586a0aaa27aa1170f8448228938507f57105..79dc4597272bef07f77a2117439c3f01a98d6fb9 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/FlowModTask.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/FlowModTask.java
@@ -17,11 +17,11 @@ import org.slf4j.Logger;
 
 import org.opendaylight.vtn.manager.internal.cluster.ClusterEvent;
 import org.opendaylight.vtn.manager.internal.cluster.FlowModResult;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
 import org.opendaylight.vtn.manager.internal.util.concurrent.AbstractVTNFuture;
 import org.opendaylight.vtn.manager.internal.util.concurrent.TimeoutCounter;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 
 import org.opendaylight.controller.forwardingrulesmanager.
     IForwardingRulesManager;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/PacketContext.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/PacketContext.java
index 3e83a5bab92d86aa5038e4262521da1a741a364c..7e80e58d82743abe4d962241e533b592ec91d349 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/PacketContext.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/PacketContext.java
@@ -44,9 +44,9 @@ import org.opendaylight.vtn.manager.internal.packet.cache.Inet4Packet;
 import org.opendaylight.vtn.manager.internal.packet.cache.L4Packet;
 import org.opendaylight.vtn.manager.internal.packet.cache.TcpPacket;
 import org.opendaylight.vtn.manager.internal.packet.cache.UdpPacket;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.flow.match.FlowMatchContext;
 import org.opendaylight.vtn.manager.internal.util.flow.match.FlowMatchType;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.packet.ArpPacketBuilder;
 import org.opendaylight.vtn.manager.internal.util.packet.EtherHeader;
 import org.opendaylight.vtn.manager.internal.util.packet.InetHeader;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/RouteResolver.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/RouteResolver.java
index 47e4c212535075496f45537e11454126265c6f93..70c01b3ad8da2fd9222c7e659a7d28fb38e73755 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/RouteResolver.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/RouteResolver.java
@@ -11,9 +11,9 @@ package org.opendaylight.vtn.manager.internal;
 
 import java.util.List;
 
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 
 /**
  * {@code RouteResolver} provides interfaces to be implemented by classes

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/TxContext.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/TxContext.java
index 6ec63f2ac1f94481045f1fd4220c3e8d2449e2e9..9a83c95ba3439067ddb17cc746bcf7e3046e48e7 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/TxContext.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/TxContext.java
@@ -9,8 +9,8 @@
 
 package org.opendaylight.vtn.manager.internal;
 
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.FlowCondReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNFlowDatabase.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNFlowDatabase.java
index 5f26597dfc9bf81b43a9913f0c886daf1987df68..5bae97622caea667402d39bbf6d1c4047e9c7d32 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNFlowDatabase.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNFlowDatabase.java
@@ -28,9 +28,9 @@ import org.opendaylight.vtn.manager.flow.DataFlow;
 import org.opendaylight.vtn.manager.internal.cluster.FlowGroupId;
 import org.opendaylight.vtn.manager.internal.cluster.MacVlan;
 import org.opendaylight.vtn.manager.internal.cluster.VTNFlow;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 
 import org.opendaylight.controller.forwardingrulesmanager.FlowEntry;
 import org.opendaylight.controller.sal.core.Node;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerImpl.java
index 8797b4aa73b4d0ce15c35087ca3d18f88b6e1847..47409614b9f2f038c31da3cdb9eeac9a383d0161 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerImpl.java
@@ -86,17 +86,17 @@ import org.opendaylight.vtn.manager.internal.packet.PacketInEvent;
 import org.opendaylight.vtn.manager.internal.packet.VTNPacketListener;
 import org.opendaylight.vtn.manager.internal.routing.RoutingEvent;
 import org.opendaylight.vtn.manager.internal.routing.VTNRoutingListener;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.concurrent.AbstractVTNFuture;
 import org.opendaylight.vtn.manager.internal.util.concurrent.VTNFuture;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.FlowCondUtils;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.VTNFlowCondition;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.VTNFlowMatch;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.packet.ArpPacketBuilder;
 import org.opendaylight.vtn.manager.internal.util.pathpolicy.PathCostConfigBuilder;
 import org.opendaylight.vtn.manager.internal.util.pathpolicy.PathPolicyConfigBuilder;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerProvider.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerProvider.java
index f18ce9e55102527b5b40892af1ad4a228a309b54..babade43d2dd7ae7e52dbc27bd0fcbf865c957b3 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerProvider.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/VTNManagerProvider.java
@@ -18,8 +18,8 @@ import com.google.common.util.concurrent.FutureCallback;
 
 import org.opendaylight.vtn.manager.VTNException;
 
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.concurrent.VTNFuture;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/AbstractBridge.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/AbstractBridge.java
index 67772f7ef9b673668da38c6aab12d0aa0f0d2b2c..31ee01f3f4c19d7635ab8e4849ccd86f15ad440c 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/AbstractBridge.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/AbstractBridge.java
@@ -30,10 +30,11 @@ import org.opendaylight.vtn.manager.VNodePath;
 import org.opendaylight.vtn.manager.VNodeState;
 import org.opendaylight.vtn.manager.VTNException;
 import org.opendaylight.vtn.manager.VTenantPath;
+
 import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/BridgeState.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/BridgeState.java
index b78d488fd8a4b2970744af8a3504001d9f450245..219df99fcf4bfee9cb48e075a9e648344902f7a2 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/BridgeState.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/BridgeState.java
@@ -21,9 +21,9 @@ import org.opendaylight.vtn.manager.VNodeState;
 
 import org.opendaylight.vtn.manager.internal.RouteResolver;
 import org.opendaylight.vtn.manager.internal.TxContext;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 
 import org.opendaylight.controller.sal.core.Node;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java
index 807e2cdc7c47986dcbcea5a442fa9cb4fd4e7846..768005c004acb64a9e9f0d6f6f7135e34cc23094 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/MacMapImpl.java
@@ -48,11 +48,11 @@ import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
 import org.opendaylight.vtn.manager.internal.util.ProtocolUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.packet.Ethernet;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortBridge.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortBridge.java
index 8ab114477fdc2ab855216be3f0b03fb9fc804d67..81f66f91a357a4fc40228bc98ce71e85f4e07ae2 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortBridge.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortBridge.java
@@ -33,10 +33,10 @@ import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
 import org.opendaylight.vtn.manager.internal.routing.RoutingEvent;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortInterface.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortInterface.java
index 2ec5f6ddb411996e969f33aee645ee91c5dc1662..08e88cf09ee48ff287054f8713063467f7c15ac7 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortInterface.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/PortInterface.java
@@ -35,12 +35,12 @@ import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.VTNThreadData;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
 import org.opendaylight.vtn.manager.internal.util.ProtocolUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.node.info.VtnPort;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java
index 7c89754477a9ac19c20f200d95a21e587640ffdf..ae8f22dfa57dae733cee2b0ec14bcff0cc20d593 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VBridgeImpl.java
@@ -57,11 +57,11 @@ import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.VTNThreadData;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
 import org.opendaylight.vtn.manager.internal.util.ProtocolUtils;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.sal.core.Node;
 import org.opendaylight.controller.sal.core.NodeConnector;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VTNFlow.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VTNFlow.java
index df2f5e0d9a96d00b0b1742b7ccf8756a81f1f710..da6064b7e56aec8829e58e36835375f13867fa60 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VTNFlow.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VTNFlow.java
@@ -30,8 +30,8 @@ import org.opendaylight.vtn.manager.internal.L2Host;
 import org.opendaylight.vtn.manager.internal.PortFilter;
 import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.connectionmanager.IConnectionManager;
 import org.opendaylight.controller.forwardingrulesmanager.FlowEntry;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VlanMapImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VlanMapImpl.java
index 9317589f612ffaa5531964c3b1085a32297a04c5..acc4d055e21a5f431b1ff6ea08ee641585112195 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VlanMapImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/cluster/VlanMapImpl.java
@@ -31,10 +31,10 @@ import org.opendaylight.vtn.manager.internal.VTNManagerImpl;
 import org.opendaylight.vtn.manager.internal.VlanMapPortFilter;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.node.info.VtnPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.nodes.VtnNode;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/InventoryMaintainer.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/InventoryMaintainer.java
index adc547facf66edcdeb0ce3882162a1156f29f5f1..d826db01221387a6d4e84962b6d22040ee99593a 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/InventoryMaintainer.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/InventoryMaintainer.java
@@ -23,10 +23,10 @@ import org.opendaylight.vtn.manager.internal.TxQueue;
 import org.opendaylight.vtn.manager.internal.TxTask;
 import org.opendaylight.vtn.manager.internal.util.DataStoreListener;
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeConnectorListener.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeConnectorListener.java
index 3a8c0873096ba62d0d9aba0be01ff3f866c1c51f..ae44a44a5864be7f37c67ae30de223eca1de93a8 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeConnectorListener.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeConnectorListener.java
@@ -22,10 +22,10 @@ import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.TxQueue;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.tx.AbstractTxTask;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeListener.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeListener.java
index 6764b9d8008400bf373658bcefb4567bee616bd5..a14310aab1b6a36bdde757752b42c4c64129993d 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeListener.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/NodeListener.java
@@ -26,9 +26,9 @@ import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.TxQueue;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 import org.opendaylight.vtn.manager.internal.util.tx.AbstractTxTask;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/TopologyListener.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/TopologyListener.java
index c0047c99855dfbac85dc9c49a99b794f7b083f66..6f1d26fe3eb422bdab2cea59875ba491999da23a 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/TopologyListener.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/TopologyListener.java
@@ -25,9 +25,9 @@ import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.TxQueue;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.tx.AbstractTxTask;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VTNInventoryManager.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VTNInventoryManager.java
index 655bd783e3231848c8bda545a6a88a3ff1ac2af8..f86b12feaab70dbdaa815fd971d35f8513d73b21 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VTNInventoryManager.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VTNInventoryManager.java
@@ -25,7 +25,7 @@ import org.slf4j.LoggerFactory;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
 import org.opendaylight.vtn.manager.internal.util.CompositeAutoCloseable;
 import org.opendaylight.vtn.manager.internal.util.IdentifierTargetComparator;
-import org.opendaylight.vtn.manager.internal.util.InventoryUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryUtils;
 import org.opendaylight.vtn.manager.internal.util.tx.TxQueueImpl;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnNodeEvent.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnNodeEvent.java
index bdfe24cdc4a4ad94a7803ee80a4f03869a5f3117..71568397d8899edb3b415dac21d25568944bddd8 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnNodeEvent.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnNodeEvent.java
@@ -11,7 +11,7 @@ package org.opendaylight.vtn.manager.internal.inventory;
 
 import org.opendaylight.vtn.manager.VTNException;
 
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 import org.opendaylight.vtn.manager.internal.util.tx.TxEvent;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.nodes.VtnNode;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnPortEvent.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnPortEvent.java
index a2510313a5d0f82aad4837c24f941a792a40832e..f05af9d5a6ce0f79b4eeb69ad242ae84fff7ef33 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnPortEvent.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/inventory/VtnPortEvent.java
@@ -11,7 +11,7 @@ package org.opendaylight.vtn.manager.internal.inventory;
 
 import org.opendaylight.vtn.manager.VTNException;
 
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.tx.TxEvent;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.node.info.VtnPort;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/PacketInEvent.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/PacketInEvent.java
index 88412c9987eb1516e193449b8f0c14ba0ff3e031..4e55de4c701f31063196a80aff04625c517c7d76 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/PacketInEvent.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/PacketInEvent.java
@@ -11,7 +11,7 @@ package org.opendaylight.vtn.manager.internal.packet;
 
 import org.opendaylight.vtn.manager.VTNException;
 
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.tx.TxEvent;
 
 import org.opendaylight.controller.sal.core.ConstructionException;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/VTNPacketService.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/VTNPacketService.java
index 1839c1b68b80118ce1dc7de9525194f187e65c85..c137a9eeb463b50a8230ab377082b436b898afbd 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/VTNPacketService.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/packet/VTNPacketService.java
@@ -24,10 +24,10 @@ import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
 import org.opendaylight.vtn.manager.internal.inventory.VTNInventoryListener;
 import org.opendaylight.vtn.manager.internal.inventory.VtnNodeEvent;
 import org.opendaylight.vtn.manager.internal.inventory.VtnPortEvent;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
 import org.opendaylight.vtn.manager.internal.util.SalNotificationListener;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.concurrent.FutureErrorCallback;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.sal.binding.api.NotificationService;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/provider/VTNManagerProviderImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/provider/VTNManagerProviderImpl.java
index a605d2c8455a915a72b6a6487b5ae4769f49fba3..933515ee354e1d58582d3d112e25129e06d7b780 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/provider/VTNManagerProviderImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/provider/VTNManagerProviderImpl.java
@@ -38,12 +38,12 @@ import org.opendaylight.vtn.manager.internal.flow.cond.FlowCondManager;
 import org.opendaylight.vtn.manager.internal.inventory.VTNInventoryManager;
 import org.opendaylight.vtn.manager.internal.packet.VTNPacketService;
 import org.opendaylight.vtn.manager.internal.routing.VTNRoutingManager;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.concurrent.CanceledFuture;
 import org.opendaylight.vtn.manager.internal.util.concurrent.FutureCallbackTask;
 import org.opendaylight.vtn.manager.internal.util.concurrent.FutureCanceller;
 import org.opendaylight.vtn.manager.internal.util.concurrent.VTNFuture;
 import org.opendaylight.vtn.manager.internal.util.concurrent.VTNThreadPool;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.tx.ReadTxContext;
 import org.opendaylight.vtn.manager.internal.util.tx.TxQueueImpl;
 import org.opendaylight.vtn.manager.internal.util.tx.TxSyncFuture;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/PathPolicyTransformer.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/PathPolicyTransformer.java
index 907caae52b34e1db0a7218b234b9e11776b2feef..b9e428e20e9f3bfe58361afbfa9620ad277cd036 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/PathPolicyTransformer.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/PathPolicyTransformer.java
@@ -20,10 +20,10 @@ import org.opendaylight.vtn.manager.PathPolicy;
 import org.opendaylight.vtn.manager.VTNException;
 
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.pathpolicy.PathPolicyUtils;
 
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/TopologyGraph.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/TopologyGraph.java
index fa9e80567a4c1d91e858068988d644c70e765ad7..01cb0c6963ff6f473ef7e3e29943caa3146f700e 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/TopologyGraph.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/routing/TopologyGraph.java
@@ -29,11 +29,11 @@ import org.apache.commons.collections15.Transformer;
 
 import org.opendaylight.vtn.manager.internal.RouteResolver;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
-import org.opendaylight.vtn.manager.internal.util.LinkEdge;
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
 import org.opendaylight.vtn.manager.internal.util.concurrent.TimeoutCounter;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.LinkEdge;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.topology.rev150209.vtn.topology.VtnLink;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryReader.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReader.java
similarity index 99%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryReader.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReader.java
index e760a2bfe7cef07764c3522bd67709cf18e7eef4..fb5693b5b33ef6a283b5b0b5d44d9d026ca8aef1 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryReader.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReader.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -24,6 +24,7 @@ import org.opendaylight.vtn.manager.SwitchPort;
 import org.opendaylight.vtn.manager.VTNException;
 
 import org.opendaylight.vtn.manager.internal.PortFilter;
+import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryUtils.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtils.java
similarity index 99%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryUtils.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtils.java
index 47c28d5dfc2fe4f9874a30377ea8babc5cbbcc79..9d65fbee08fab476ce97456c210b74fbcd3c5f4b 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/InventoryUtils.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtils.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/LinkEdge.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdge.java
similarity index 98%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/LinkEdge.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdge.java
index 6a60ac34d51f10caae24d20306ec7649da6264d2..ffa7eaa8e2ffc174593876ce20753be69749d180 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/LinkEdge.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdge.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.topology.rev150209.vtn.topology.VtnLink;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/NodeUtils.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtils.java
similarity index 99%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/NodeUtils.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtils.java
index 381ed454a5bc3ce6e23c9ce57833889131d4883e..b7c9da79fe1eaa9c5174caab99bf48bff87fee39 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/NodeUtils.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtils.java
@@ -7,11 +7,12 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import org.opendaylight.vtn.manager.PortLocation;
 import org.opendaylight.vtn.manager.SwitchPort;
 
+import org.opendaylight.vtn.manager.internal.util.MiscUtils;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 
 import org.opendaylight.controller.sal.core.Node;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalNode.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNode.java
similarity index 99%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalNode.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNode.java
index 78813cb58579ca8d59d2b8de4f6d8589efa442eb..eaa9a2d176d6b5cb93312a1ba977b0ee1c055e2f 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalNode.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNode.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.math.BigInteger;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalPort.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPort.java
similarity index 99%
rename from manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalPort.java
rename to manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPort.java
index 8f4a8b025732a8c6ba79260a8da416c56c4267b3..ae26bce843d6bde0d66009f2bf728c8f538b8760 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/SalPort.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPort.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import org.opendaylight.vtn.manager.util.NumberUtils;
 

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilder.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilder.java
index c2b33f0e17ec78649e2e612b006be88b5977eafe..5d57d9bf3ccfb730fcf00219daa9fc37a568aac7 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilder.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilder.java
@@ -12,7 +12,7 @@ package org.opendaylight.vtn.manager.internal.util.pathpolicy;
 import org.opendaylight.vtn.manager.PathCost;
 
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.pathpolicy.rev150209.VtnPathCostConfig;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtils.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtils.java
index 093c863e2fd61c2d4770c6d7d68b72167f091b8f..b7d236990915cc70f3cc25365c909b65e575c5d0 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtils.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtils.java
@@ -20,7 +20,7 @@ import org.opendaylight.vtn.manager.VTNException;
 
 import org.opendaylight.vtn.manager.internal.util.DataStoreUtils;
 import org.opendaylight.vtn.manager.internal.util.MiscUtils;
-import org.opendaylight.vtn.manager.internal.util.NodeUtils;
+import org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/ReadTxContext.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/ReadTxContext.java
index 26e3f9dbc34217d5c01e3441e1beb4a75cd32481..4997133f958d4be684edab90e017b38be11a8e24 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/ReadTxContext.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/ReadTxContext.java
@@ -11,8 +11,8 @@ package org.opendaylight.vtn.manager.internal.util.tx;
 
 import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.FlowCondReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;

diff --git a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/TxQueueImpl.java b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/TxQueueImpl.java
index 119bfa5c6265488e27571deb241cb2d16b21d4e1..e77c7a3698ecb4c1f821bb83b4d4ea0cead2d502 100644 (file)
--- a/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/TxQueueImpl.java
+++ b/manager/implementation/src/main/java/org/opendaylight/vtn/manager/internal/util/tx/TxQueueImpl.java
@@ -25,10 +25,10 @@ import org.opendaylight.vtn.manager.internal.TxContext;
 import org.opendaylight.vtn.manager.internal.TxQueue;
 import org.opendaylight.vtn.manager.internal.TxTask;
 import org.opendaylight.vtn.manager.internal.VTNManagerProvider;
-import org.opendaylight.vtn.manager.internal.util.InventoryReader;
 import org.opendaylight.vtn.manager.internal.util.concurrent.SettableVTNFuture;
 import org.opendaylight.vtn.manager.internal.util.concurrent.VTNFuture;
 import org.opendaylight.vtn.manager.internal.util.flow.cond.FlowCondReader;
+import org.opendaylight.vtn.manager.internal.util.inventory.InventoryReader;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;
 import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/TestBase.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/TestBase.java
index 50c2c096fce7947e68d616df0d5db2217b3eec17..a7a88b89509b8318237c8c1f48d3880ca05cfe72 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/TestBase.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/TestBase.java
@@ -66,7 +66,7 @@ import org.opendaylight.vtn.manager.internal.cluster.MapType;
 import org.opendaylight.vtn.manager.internal.cluster.VTenantImpl;
 import org.opendaylight.vtn.manager.internal.cluster.VlanMapPath;
 import org.opendaylight.vtn.manager.internal.packet.PacketInEvent;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 
 import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreListenerTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreListenerTest.java
index 46ce6dd2654d7b0475038343971300f9ed2fbb7d..d4ec36575ea695d7a113293a289722a35294fbf5 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreListenerTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreListenerTest.java
@@ -26,6 +26,7 @@ import org.mockito.Mockito;
 
 import org.slf4j.Logger;
 
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.pathpolicy.PathPolicyUtils;
 
 import org.opendaylight.vtn.manager.internal.TestBase;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreUtilsTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreUtilsTest.java
index ee27d98816512db8cb79df3af21bf6075202f507..d737535da5974f598c7ed45da44f95e69bf13762 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreUtilsTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/DataStoreUtilsTest.java
@@ -21,6 +21,8 @@ import com.google.common.util.concurrent.CheckedFuture;
 
 import org.opendaylight.vtn.manager.VTNException;
 
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
+
 import org.opendaylight.vtn.manager.internal.TestBase;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/IdentifierTargetComparatorTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/IdentifierTargetComparatorTest.java
index 5ccaabbb8ab46c02949a4390f3e2877e557ecd4c..db7c72bea4e87989aaea28ae6e23790b327ffc2e 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/IdentifierTargetComparatorTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/IdentifierTargetComparatorTest.java
@@ -21,6 +21,8 @@ import java.util.Set;
 
 import org.junit.Test;
 
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.pathpolicy.PathPolicyUtils;
 
 import org.opendaylight.vtn.manager.internal.TestBase;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/flow/cond/FlowCondUtilsTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/flow/cond/FlowCondUtilsTest.java
index b99771240a27f8add150e5ed4d16a406830c38a6..3d960f43143e4472b86cc9a0d5b2b168379d518f 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/flow/cond/FlowCondUtilsTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/flow/cond/FlowCondUtilsTest.java
@@ -19,11 +19,10 @@ import org.junit.Test;
 
 import org.mockito.Mockito;
 
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcErrorTag;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 
-import org.opendaylight.vtn.manager.internal.util.SalPort;
-
 import org.opendaylight.vtn.manager.internal.TestBase;
 
 import org.opendaylight.controller.md.sal.binding.api.ReadTransaction;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryReaderTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReaderTest.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryReaderTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReaderTest.java
index 4f7219867e5f9883f6db1e67038804c244041bc4..9cbd68fe035b0e856f7e0716765de37bc8f72da9 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryReaderTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryReaderTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.ArrayList;
 import java.util.Collection;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryUtilsTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtilsTest.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryUtilsTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtilsTest.java
index 030ed703ddecf9ca07e2646e59e58471405a61bf..017efa2bb5825a9b2aa33a544339a44acbd4d23d 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/InventoryUtilsTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/InventoryUtilsTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.ArrayList;
 import java.util.Iterator;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/LinkEdgeTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdgeTest.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/LinkEdgeTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdgeTest.java
index 1f6cf0fc86e283f96ddac2254f868069292140b7..b970042099a0927747e01624ab0da917ed6a68f4 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/LinkEdgeTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/LinkEdgeTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/NodeUtilsTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtilsTest.java
similarity index 98%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/NodeUtilsTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtilsTest.java
index 5f87b2809f4a1f3394f1ed057294b1247f01dc80..92ca161a834e8a687b24672293ba6f26d2490b67 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/NodeUtilsTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/NodeUtilsTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -30,10 +30,8 @@ import org.opendaylight.controller.sal.core.NodeConnector;
 import org.opendaylight.controller.sal.utils.Status;
 import org.opendaylight.controller.sal.utils.StatusCode;
 
-import static
-    org.opendaylight.vtn.manager.internal.util.NodeUtils.checkNodeType;
-import static
-    org.opendaylight.vtn.manager.internal.util.NodeUtils.checkNodeConnectorType;
+import static org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils.checkNodeType;
+import static org.opendaylight.vtn.manager.internal.util.inventory.NodeUtils.checkNodeConnectorType;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.node.info.VtnPort;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vtn.impl.inventory.rev150209.vtn.node.info.VtnPortBuilder;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortConfigBuilder.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortConfigBuilder.java
similarity index 98%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortConfigBuilder.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortConfigBuilder.java
index fa689e1f7d4c7b5b488807a2e095cc2710fefce0..9b30aa9de72d1a2429b41528c3daee3fa2f5b0a2 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortConfigBuilder.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortConfigBuilder.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortConfig;
 

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortFeaturesBuilder.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortFeaturesBuilder.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortFeaturesBuilder.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortFeaturesBuilder.java
index ea362c18a4c158f0ff8adfa6b11677794361e1d8..eabaadaae51c7884712f0cc5e2687bfb9d890f9e 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/PortFeaturesBuilder.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/PortFeaturesBuilder.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.port.rev130925.PortFeatures;
 

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalNodeTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNodeTest.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalNodeTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNodeTest.java
index 3c448105e7d31cb061471e4180275d4899337a5b..814bef140a6017f31568c5141a496898ed89e2c1 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalNodeTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalNodeTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.math.BigInteger;
 import java.util.HashSet;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalPortTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPortTest.java
similarity index 99%
rename from manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalPortTest.java
rename to manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPortTest.java
index 35095166752d9113fbe1cce604095ce88bef0191..d77d801fcfb18b4578112b93f665d986d1f4a496 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/SalPortTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/inventory/SalPortTest.java
@@ -7,7 +7,7 @@
  * distribution, and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.vtn.manager.internal.util;
+package org.opendaylight.vtn.manager.internal.util.inventory;
 
 import java.math.BigInteger;
 import java.util.HashSet;

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilderTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilderTest.java
index cb630d56b15af593063aa083f97bcef3d9692ea4..37a8e85c580dbc624c2c669081b863c1b4f44d28 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilderTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathCostConfigBuilderTest.java
@@ -23,7 +23,7 @@ import org.opendaylight.vtn.manager.PathCost;
 import org.opendaylight.vtn.manager.PortLocation;
 import org.opendaylight.vtn.manager.SwitchPort;
 
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcErrorTag;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyConfigBuilderTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyConfigBuilderTest.java
index 850e16f87bccfe0d2e3070e186d2cff9e2705459..c7c2c6d8bd5be34397ed7f57d09cf4eef5e12457 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyConfigBuilderTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyConfigBuilderTest.java
@@ -19,7 +19,7 @@ import org.opendaylight.vtn.manager.PathPolicy;
 import org.opendaylight.vtn.manager.PortLocation;
 import org.opendaylight.vtn.manager.SwitchPort;
 
-import org.opendaylight.vtn.manager.internal.util.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcErrorTag;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;
 

diff --git a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtilsTest.java b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtilsTest.java
index 1b4dcb6b59941857e454daf364a6cd3c6bb7c1b2..1d8210621ca4fd96a2032b94c8d6400291373bb5 100644 (file)
--- a/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtilsTest.java
+++ b/manager/implementation/src/test/java/org/opendaylight/vtn/manager/internal/util/pathpolicy/PathPolicyUtilsTest.java
@@ -22,8 +22,8 @@ import org.opendaylight.vtn.manager.PathPolicy;
 import org.opendaylight.vtn.manager.PortLocation;
 import org.opendaylight.vtn.manager.SwitchPort;
 
-import org.opendaylight.vtn.manager.internal.util.SalNode;
-import org.opendaylight.vtn.manager.internal.util.SalPort;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalNode;
+import org.opendaylight.vtn.manager.internal.util.inventory.SalPort;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcErrorTag;
 import org.opendaylight.vtn.manager.internal.util.rpc.RpcException;