Allow to change the controller ip and port for the integration test from the maven...

To execute the integration tests use mvn -Pintegrationtest -Dovsdbserver.ipaddress=x.x.x.x -Dovsdbserver.port=x verify

Change-Id: Ie2df5528f650301c992c3712715df49b0c24227e
Signed-off-by: Hugo Trippaers <hugo@trippaers.nl>

diff --git a/ovsdb/pom.xml b/ovsdb/pom.xml
index e1efbc922809777c5a41c6b58782c4a92d202371..62566c2e814e96fb5601ec382cc3fb825ba1ff1f 100755 (executable)
--- a/ovsdb/pom.xml
+++ b/ovsdb/pom.xml
@@ -15,9 +15,18 @@
         <java.version.source>1.7</java.version.source>
         <java.version.target>1.7</java.version.target>
         <skip.integrationtest>true</skip.integrationtest>
+        <!-- used for filtering the integration test resource -->
+        <ovsdbserver.ipaddress>192.168.56.10</ovsdbserver.ipaddress>
+        <ovsdbserver.port>6640</ovsdbserver.port>
     </properties>
 
     <build>
+      <testResources>
+        <testResource>
+          <directory>src/test/resources</directory>
+          <filtering>true</filtering>
+        </testResource>
+      </testResources>
         <plugins>
             <plugin>
                 <groupId>org.apache.felix</groupId>

diff --git a/ovsdb/src/test/resources/org/opendaylight/ovsdb/lib/message/integration-test.properties b/ovsdb/src/test/resources/org/opendaylight/ovsdb/lib/message/integration-test.properties
index 5f57dc20d446f5a5bc23ff666853c3c49da92e99..7d6453a59e00c0b3b51f62ab79b4974603dd9e54 100644 (file)
--- a/ovsdb/src/test/resources/org/opendaylight/ovsdb/lib/message/integration-test.properties
+++ b/ovsdb/src/test/resources/org/opendaylight/ovsdb/lib/message/integration-test.properties
@@ -1,2 +1,2 @@
-ovsdbserver.ipaddress=192.168.168.121
-ovsdbserver.port=6640
\ No newline at end of file
+ovsdbserver.ipaddress=${ovsdbserver.ipaddress}
+ovsdbserver.port=${ovsdbserver.port}
\ No newline at end of file