Move common DataStoreContext and co to test-common

Before Al migration, DataStoreContext was used only by GNPy at run-time.
As GNPy does not use it anymore, move it to test scope by putting it in
the test-common module.

JIRA: TRNSPRTPCE-305
Signed-off-by: guillaume.lambert <guillaume.lambert@orange.com>
Change-Id: I8ea8afbdab56de08c594c9edb55543cb8d1901b7

diff --git a/common/pom.xml b/common/pom.xml
index f3e9d0158bb8fc58f47eeb90c654cbae6562920c..c40b83ea8da019c079ebf7b64ce295a69436f4ad 100644 (file)
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -73,6 +73,12 @@
             <version>3.0.2</version>
             <optional>true</optional>
         </dependency>
+        <dependency>
+            <groupId>org.opendaylight.transportpce</groupId>
+            <artifactId>test-common</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java
index 5a3e077029ad9f0929366b26fbe1d70b2211e3d8..878b5c93e1275a83ecb340da7ec3e708c7a7773f 100644 (file)
--- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/MappingUtilsImplTest.java
@@ -18,9 +18,9 @@ import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
 import org.opendaylight.transportpce.common.StringConstants;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.DataStoreContextImpl;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder;

diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java
index 54de308e7f6049f97e9f22fe337df27946964905..0853b6b935d07ea199f1bd2b2617c8ee5539ff98 100644 (file)
--- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingImplTest.java
@@ -25,8 +25,8 @@ import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.DataStoreContextImpl;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.NodesBuilder;

diff --git a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java
index 35437394eac01e6ab2a3ee7abce04da26955fbb3..cba2e6ef2a3f85381a128e85a1e24b81d6f9022d 100644 (file)
--- a/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java
+++ b/common/src/test/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121Test.java
@@ -32,12 +32,12 @@ import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.ReadTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
 import org.opendaylight.transportpce.common.Timeouts;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
 import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.DataStoreContextImpl;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.NetworkBuilder;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.network.Nodes;

diff --git a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
index 35bd2b0b0b942f4a59e0644f1269278a17a0a9f2..74b86ba86282d077c35bc5473af4136ab9987513 100644 (file)
--- a/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
+++ b/networkmodel/src/test/java/org/opendaylight/transportpce/networkmodel/NetConfTopologyListenerTest.java
@@ -27,7 +27,6 @@ import org.opendaylight.mdsal.binding.api.DataObjectModification;
 import org.opendaylight.mdsal.binding.api.DataTreeModification;
 import org.opendaylight.mdsal.binding.api.MountPoint;
 import org.opendaylight.mdsal.binding.api.MountPointService;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
 import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
 import org.opendaylight.transportpce.common.mapping.MappingUtils;
@@ -45,6 +44,7 @@ import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfa
 import org.opendaylight.transportpce.networkmodel.service.NetworkModelService;
 import org.opendaylight.transportpce.networkmodel.stub.MountPointServiceStub;
 import org.opendaylight.transportpce.networkmodel.stub.MountPointStub;
+import org.opendaylight.transportpce.test.DataStoreContextImpl;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Host;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
index 788e82c23a84e409b4674151ad9913eb91e1d63b..82afbdb13988d882f4df8554a1dd61d5c8ae94a6 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/PceSendingPceRPCsTest.java
@@ -13,7 +13,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
 import org.opendaylight.transportpce.pce.gnpy.ConnectToGnpyServer;
@@ -21,6 +20,7 @@ import org.opendaylight.transportpce.pce.gnpy.JerseyServer;
 import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.pce.utils.PceTestUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.transportpce.test.DataStoreContext;
 
 @Ignore
 //@RunWith(MockitoJUnitRunner.class)

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
index 84e97e050d2bee7cfec998ef149481565140d39f..44b2716047ca733cb41d362ad539525e97a02674 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/constraints/PceConstraintsCalcTest.java
@@ -12,7 +12,6 @@ import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
@@ -20,6 +19,7 @@ import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.pce.utils.PceTestUtils;
 import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.transportpce.test.DataStoreContext;
 
 @Ignore
 public class PceConstraintsCalcTest extends AbstractTest {

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
index 9553a741a24a9572ecc00d74fba2017125a6e4ea..6bdc71a1f2cf048cade20b3e3bdecb58d704101f 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/service/PathComputationServiceImplTest.java
@@ -16,7 +16,6 @@ import org.junit.Ignore;
 import org.junit.Test;
 import org.mockito.Mockito;
 import org.opendaylight.mdsal.binding.api.DataBroker;
-import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.network.NetworkTransactionImpl;
 import org.opendaylight.transportpce.common.network.NetworkTransactionService;
 import org.opendaylight.transportpce.common.network.RequestProcessor;
@@ -26,6 +25,7 @@ import org.opendaylight.transportpce.pce.utils.PceTestData;
 import org.opendaylight.transportpce.pce.utils.PceTestUtils;
 import org.opendaylight.transportpce.pce.utils.TransactionUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.transportpce.test.DataStoreContext;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.PathBandwidth;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.generic.path.properties.PathPropertiesBuilder;
 import org.opendaylight.yang.gen.v1.gnpy.path.rev200909.generic.path.properties.path.properties.PathMetric;

diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
index 24b6c110b4a8275f033b2ebcab49334ef6fd829b..2df1601f7638f325ffb3100020f56e1ebb0b6929 100644 (file)
--- a/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
+++ b/pce/src/test/java/org/opendaylight/transportpce/pce/utils/PceTestUtils.java
@@ -24,10 +24,10 @@ import org.junit.Assert;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
 import org.opendaylight.transportpce.common.NetworkUtils;
-import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
-import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.converter.DataObjectConverter;
+import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev200128.PathComputationRequestOutput;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZ;
 import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev200629.path.description.atoz.direction.AToZKey;

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java
index d030999506d3ccaa8508bab9fbc153aa2f0805d3..3fdad4da75b1fc47f53232f387216a0a7610c50f 100644 (file)
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/topology/TapiTopologyImplTest.java
@@ -29,12 +29,12 @@ import org.eclipse.jdt.annotation.Nullable;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
 import org.opendaylight.transportpce.common.InstanceIdentifiers;
 import org.opendaylight.transportpce.common.NetworkUtils;
 import org.opendaylight.transportpce.tapi.utils.TopologyDataUtils;
 import org.opendaylight.transportpce.test.AbstractTest;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.DataStoreContextImpl;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.AdministrativeState;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.CapacityUnit;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.common.rev181210.ForwardingDirection;

diff --git a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
index 371c2a92bf72106f55e1e68ed3b7b22d5b74832f..dbc82005c03b57d5dc951d0681852c1bdb7bb386 100644 (file)
--- a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
+++ b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
@@ -16,8 +16,8 @@ import java.util.Optional;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.WriteTransaction;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
+import org.opendaylight.transportpce.test.DataStoreContext;
+import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
 import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200827.Network;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
 import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput;

diff --git a/test-common/pom.xml b/test-common/pom.xml
index 039ef6d0ecf0e28f69eadd482c862f019b4c272e..4142879db916d91986248fcf11cf0c4e1526a12e 100644 (file)
--- a/test-common/pom.xml
+++ b/test-common/pom.xml
@@ -4,7 +4,8 @@
     are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution,
     and is available at http://www.eclipse.org/legal/epl-v10.html Author: Martial Coulibaly <martial.coulibaly@gfi.com>
     on behalf of Orange -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
@@ -12,21 +13,68 @@
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>bundle-parent</artifactId>
         <version>7.0.5</version>
-        <relativePath/>
+        <relativePath />
     </parent>
 
     <groupId>org.opendaylight.transportpce</groupId>
     <artifactId>test-common</artifactId>
     <version>3.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
-
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>1.9.0-SNAPSHOT</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>6.0.4</version>
+                <scope>import</scope>
+                <type>pom</type>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
     <dependencies>
+        <dependency>
+            <groupId>${project.groupId}.ordmodels</groupId>
+            <artifactId>transportpce-ordmodels-device</artifactId>
+            <version>${project.version}</version>
+        </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>transportpce-common</artifactId>
+            <artifactId>transportpce-api</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>transportpce-tapimodels</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-dom-adapter</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-binding-generator-impl</artifactId>
+        </dependency>
+        <!-- Aluminium bump: undocumented new dependencies -->
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-broker</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>mdsal-dom-inmemory-datastore</artifactId>
+        </dependency>
         <!-- Sodium bump: javax.annotation.Nullable and friends -->
         <dependency>
             <groupId>com.google.code.findbugs</groupId>

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java b/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
index 625dcf45d257a499e5917fc95b4506e2e6781169..864533b99cecd8a6adfcc81b3ac107f7775048c6 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/AbstractTest.java
@@ -11,8 +11,6 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;
 import org.opendaylight.mdsal.binding.api.NotificationService;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
 
 public abstract class AbstractTest {
 

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContext.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
similarity index 96%
rename from common/src/main/java/org/opendaylight/transportpce/common/DataStoreContext.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
index 1f2a5fd14b613855d5108e384113dc809a055309..b5b396ab28bc3a05ea1174b1f9b0ef52f34f7aa4 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContext.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContext.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common;
+package org.opendaylight.transportpce.test;
 
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.binding.api.NotificationPublishService;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
similarity index 99%
rename from common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
index 983d52729eaa78706b3ff4debcbd05e66fb843f5..0ae99c5ebd1361c1235a110a00d8be768c9f30e0 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/DataStoreContextImpl.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DataStoreContextImpl.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common;
+package org.opendaylight.transportpce.test;
 
 import com.google.common.collect.ClassToInstanceMap;
 import com.google.common.collect.ImmutableClassToInstanceMap;

diff --git a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
index fa1fd7c326fca022dd2643eeb3525b93b26d90b1..b7c8081bd62b554dd4f939e7f0d739176c4c4c5c 100644 (file)
--- a/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/DeviceWrapper.java
@@ -23,10 +23,8 @@ import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.mdsal.dom.api.DOMDataBroker;
 import org.opendaylight.mdsal.dom.api.DOMDataTreeWriteTransaction;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.DataStoreContextImpl;
-import org.opendaylight.transportpce.common.converter.XMLDataObjectConverter;
-import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
+import org.opendaylight.transportpce.test.converter.DataObjectConverter;
+import org.opendaylight.transportpce.test.converter.XMLDataObjectConverter;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.PathArgument;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java
similarity index 97%
rename from common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java
index e07ef9e913a57f87e0ae159e9a1d1788db2d029b..2d61d31cb60a6d8b6c2c134b62ff1daf917c7daa 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/AbstractDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/AbstractDataObjectConverter.java
@@ -5,15 +5,13 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common.converter;
+package org.opendaylight.transportpce.test.converter;
 
-//import com.google.common.base.Preconditions;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
 import org.opendaylight.yangtools.yang.binding.DataContainer;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/api/DataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
similarity index 98%
rename from common/src/main/java/org/opendaylight/transportpce/common/converter/api/DataObjectConverter.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
index 302b904bbcc1ec264da38fb3a94668a2ed6ccc6a..f724e5d47dbdf255da439bdb76bdf08f17cbf3f4 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/api/DataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/DataObjectConverter.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common.converter.api;
+package org.opendaylight.transportpce.test.converter;
 
 import java.io.InputStream;
 import java.io.Reader;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
similarity index 97%
rename from common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
index 2177d1e437a0f3d5e4a3389dffe4985230f96f00..62b442284f52a9b2fedb8f3eba1291fe3d068641 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/JSONDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/JSONDataObjectConverter.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common.converter;
+package org.opendaylight.transportpce.test.converter;
 
 import com.google.gson.stream.JsonReader;
 import com.google.gson.stream.JsonWriter;
@@ -19,8 +19,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Optional;
 import javax.annotation.Nonnull;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.transportpce.common.DataStoreContext;
-import org.opendaylight.transportpce.common.converter.api.DataObjectConverter;
+import org.opendaylight.transportpce.test.DataStoreContext;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;

diff --git a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
similarity index 98%
rename from common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java
rename to test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
index 1e18cd8aebee1d4c413fb62a86c022af8dfc831c..10e402a86b64d1649d72c0e032275f340edfab0f 100644 (file)
--- a/common/src/main/java/org/opendaylight/transportpce/common/converter/XMLDataObjectConverter.java
+++ b/test-common/src/main/java/org/opendaylight/transportpce/test/converter/XMLDataObjectConverter.java
@@ -5,7 +5,7 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
-package org.opendaylight.transportpce.common.converter;
+package org.opendaylight.transportpce.test.converter;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,7 +23,7 @@ import javax.xml.stream.XMLStreamException;
 import javax.xml.stream.XMLStreamReader;
 import javax.xml.stream.XMLStreamWriter;
 import org.opendaylight.mdsal.binding.dom.codec.api.BindingNormalizedNodeSerializer;
-import org.opendaylight.transportpce.common.DataStoreContext;
+import org.opendaylight.transportpce.test.DataStoreContext;
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;