move non Karaf IT related code from integration/test to test-standalone

This allows to call the new class NeutronAllTests in another test env.

The ITNeutronE2E of course still runs just like before.

Change-Id: Ie72012416b4333660cf4b083a97d1e66156a6efa
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/features/test/odl-neutron-logger-test/pom.xml b/features/test/odl-neutron-logger-test/pom.xml
index 34d918da1f831186ff44adece6393c4fa5feda6d..93ddaf05fbd3db934b4be9a84231c1a75f3cc96b 100644 (file)
--- a/features/test/odl-neutron-logger-test/pom.xml
+++ b/features/test/odl-neutron-logger-test/pom.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <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">
@@ -35,6 +34,11 @@
             <artifactId>neutron-logger</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>integration-test-standalone</artifactId>
+            <version>${project.version}</version>
+         </dependency>
     </dependencies>
 
 </project>

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
new file mode 100644 (file)
index 0000000..eec61fc
--- /dev/null
+++ b/integration/test-standalone/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+
+  <parent>
+    <groupId>org.opendaylight.odlparent</groupId>
+    <artifactId>bundle-parent</artifactId>
+    <version>3.0.2</version>
+    <relativePath />
+  </parent>
+
+  <groupId>org.opendaylight.neutron</groupId>
+  <artifactId>integration-test-standalone</artifactId>
+  <version>0.11.0-SNAPSHOT</version>
+
+  <!-- <name> formatting is used by autorelease to parse and notify projects on
+       build failure. Please do not modify this unless you have a good reason. -->
+  <name>ODL :: neutron :: ${project.artifactId}</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/HttpUtils.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/HttpUtils.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/HttpUtils.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronAllTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBgpvpnTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBgpvpnTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBgpvpnTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBgpvpnTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBug3812Tests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronBug4027Tests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallPolicyTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallPolicyTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallPolicyTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallPolicyTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallRuleTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallRuleTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallRuleTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallRuleTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFirewallTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFirewallTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIpTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFloatingIpTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronFloatingIpTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronFloatingIpTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIKEPoliciesTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIKEPoliciesTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIKEPoliciesTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIKEPoliciesTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecPoliciesTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIpSecPoliciesTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecPoliciesTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIpSecPoliciesTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecSiteConnectionTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIpSecSiteConnectionTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronIpSecSiteConnectionTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronIpSecSiteConnectionTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayConnectionTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayConnectionTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayConnectionTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayConnectionTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronL2GatewayTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBHealthMonitorTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBListenerTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBPoolMembersTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLBPoolTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronLoadBalancerTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringLabelTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronMeteringLabelTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringLabelTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronMeteringLabelTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringRuleTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronMeteringRuleTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronMeteringRuleTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronMeteringRuleTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronNetworkTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronPortTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronProjectIdTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronProjectIdTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronProjectIdTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronProjectIdTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronQosPolicyTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronQosPolicyTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronQosPolicyTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronQosPolicyTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRevisionNumberTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronRevisionNumberTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRevisionNumberTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronRevisionNumberTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronRouterTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCFlowClassifierTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCFlowClassifierTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCFlowClassifierTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCFlowClassifierTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortChainTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortChainTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortChainTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortChainTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairGroupTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairGroupTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairGroupTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairGroupTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSFCPortPairTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityGroupTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSecurityGroupTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityGroupTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSecurityGroupTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityRuleTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSecurityRuleTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSecurityRuleTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSecurityRuleTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronSubnetTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapFlowTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTapFlowTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapFlowTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTapFlowTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapServiceTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTapServiceTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTapServiceTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTapServiceTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTrunkTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTrunkTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronTrunkTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronTrunkTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronVpnServicesTests.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronVpnServicesTests.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/NeutronVpnServicesTests.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/NeutronVpnServicesTests.java

diff --git a/integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java b/integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java
similarity index 100%
rename from integration/test/src/test/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java
rename to integration/test-standalone/src/main/java/org/opendaylight/neutron/e2etest/TempestPortsIpV6TestJSON.java

diff --git a/integration/test/pom.xml b/integration/test/pom.xml
index d4fa63f0b213e6f68f72493af860273e32cc85ff..606f2d2e0d53dde70cb115b3550471e090015df5 100644 (file)
--- a/integration/test/pom.xml
+++ b/integration/test/pom.xml
@@ -28,8 +28,13 @@
     <sonar.sources>pom.xml,target/generated-sources/dependency</sonar.sources>
   </properties>
   <dependencies>
+     <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>integration-test-standalone</artifactId>
+      <version>${project.version}</version>
+    </dependency>
     <dependency>
-      <groupId>org.opendaylight.neutron</groupId>
+      <groupId>${project.groupId}</groupId>
       <artifactId>neutron-karaf</artifactId>
       <version>${project.version}</version>
       <type>zip</type>

diff --git a/pom.xml b/pom.xml
index feda1e1afaf3e17512fa6b1d51da60f0a19e669b..ec02edff774637d3e0fdf6ef3d9f420590d31f0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -98,6 +98,7 @@
     <module>features/production</module>
     <module>features/test</module>
     <module>karaf</module>
+    <module>integration/test-standalone</module>
     <module>integration/test</module>
     <module>model</module>
     <module>neutron-hostconfig</module>