Bump test dependencies to stable/nitrogen

Change-Id: I6c071cc8abd5658740dadd3dd74b5045230795b0
Co-authored-by: Guillaume Lambert <guillaume.lambert@orange.com>
Signed-off-by: Guillaume Lambert <guillaume.lambert@orange.com>

diff --git a/.gitmodules b/.gitmodules
index fc25778f2b9062020f87470be29d1b4a7a7c5771..b1690202f88dbbfaa8b12b8ab3fa1a3c633ae4a2 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,8 @@
 [submodule "tests/netconf"]
        path = tests/netconf
        url = https://git.opendaylight.org/gerrit/p/netconf.git
+       branch = stable/nitrogen
 [submodule "tests/mdsal"]
        path = tests/mdsal
        url = https://git.opendaylight.org/gerrit/p/mdsal.git
+       branch = stable/nitrogen

diff --git a/tests/build.sh b/tests/build.sh
index 6916def1a5cca54244ff4a2cca9fcd4fb005fd54..85c67fe7b8a561893ec973e619c5ffb4acb704e3 100755 (executable)
--- a/tests/build.sh
+++ b/tests/build.sh
@@ -15,7 +15,7 @@ netconf/netconf/models/ietf-netconf-notifications/src/main/yang/notifications@20
 rm -rf netconf mdsal && git submodule update --init
 (cd netconf && patch -p1 < ../netconf.patch && patch -p1 < ../get_connection_port_trail.patch)
 
-(cd netconf/netconf/tools/netconf-testtool && mvn clean install -DskipTests)
+(cp testtool_pom.xml netconf/netconf/tools/netconf-testtool/pom.xml  && cd netconf/netconf/tools/netconf-testtool &&  mvn clean install -DskipTests)
 rm -rf schemas; mkdir -p schemas && cp -r ../ordmodels/src/main/yang/org-openroadm-* schemas
 cp ${yang} schemas
 

diff --git a/tests/mdsal b/tests/mdsal
index 3e67910220d30d8ecdb29b6081b674c069dc4bfe..a6433bbfd68b44bd5d1c661f90b96584597f44ae 160000 (submodule)
--- a/tests/mdsal
+++ b/tests/mdsal
@@ -1 +1 @@
-Subproject commit 3e67910220d30d8ecdb29b6081b674c069dc4bfe
+Subproject commit a6433bbfd68b44bd5d1c661f90b96584597f44ae

diff --git a/tests/start.sh b/tests/start.sh
index 827273d403903677258d0e7f00f9c70200e7afbe..b395d89ee67c346fcb6fdd61365582e53314eee1 100755 (executable)
--- a/tests/start.sh
+++ b/tests/start.sh
@@ -9,7 +9,7 @@
 # opts="${opts} --ssh tcp"
 # opts="${opts} --notification-file notif.xml"
 
-java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.3.1-SNAPSHOT-executable.jar \
+java -jar ./netconf/netconf/tools/netconf-testtool/target/netconf-testtool-1.3.1-executable.jar \
      --schemas-dir schemas \
      --initial-config-xml-file sample-config-ROADM.xml \
      ${opts}

diff --git a/tests/testtool_pom.xml b/tests/testtool_pom.xml
new file mode 100644 (file)
index 0000000..bcb5821
--- /dev/null
+++ b/tests/testtool_pom.xml
@@ -0,0 +1,401 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2014 Cisco Systems, Inc. and others.  All rights reserved.
+  ~
+  ~ This program and the accompanying materials 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
+  -->
+
+<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>odlparent</artifactId>
+        <version>2.0.5</version>
+        <relativePath/>
+    </parent>
+
+    <groupId>org.opendaylight.netconf</groupId>
+    <artifactId>netconf-testtool</artifactId>
+    <name>${project.artifactId}</name>
+    <version>1.3.1</version>
+    <packaging>jar</packaging>
+
+    <properties>
+        <sonar.skip>true</sonar.skip>
+    </properties>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>org.opendaylight.netconf</groupId>
+                <artifactId>netconf-artifacts</artifactId>
+                <version>${project.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.yangtools</groupId>
+                <artifactId>yangtools-artifacts</artifactId>
+                <version>1.2.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>config-artifacts</artifactId>
+                <version>0.7.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.controller</groupId>
+                <artifactId>mdsal-artifacts</artifactId>
+                <version>1.6.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+            <dependency>
+                <groupId>org.opendaylight.mdsal.model</groupId>
+                <artifactId>mdsal-model-artifacts</artifactId>
+                <version>0.11.1</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.codehaus.janino</groupId>
+            <artifactId>janino</artifactId>
+            <version>2.6.1</version>
+        </dependency>
+        <dependency>
+            <groupId>net.sourceforge.argparse4j</groupId>
+            <artifactId>argparse4j</artifactId>
+            <version>0.4.3</version>
+        </dependency>
+        <dependency>
+            <groupId>ch.qos.logback</groupId>
+            <artifactId>logback-classic</artifactId>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.ning</groupId>
+            <artifactId>async-http-client</artifactId>
+            <version>1.9.24</version>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-netty-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-auth</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>config-netconf-connector</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>sal-netconf-connector</artifactId>
+        </dependency>
+       <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>mockito-configuration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ietf-netconf-monitoring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>ietf-netconf-monitoring-extension</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-client</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-yang-types-20130715</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-inet-types-2013-07-15</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-impl</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-mapping-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-monitoring</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>netconf-ssh</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>netty-config-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-inmemory-datastore</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>mdsal-netconf-connector</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.karaf.features</groupId>
+            <artifactId>org.apache.karaf.features.core</artifactId>
+            <version>${karaf.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <id>stress-client dependency copy</id>
+                        <goals>
+                            <goal>copy</goal>
+                        </goals>
+                        <configuration>
+                            <artifactItems>
+                                <artifactItem>
+                                    <groupId>org.bouncycastle</groupId>
+                                    <artifactId>bcpkix-jdk15on</artifactId>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <overWrite>true</overWrite>
+                                    <destFileName>bcpkix-jdk15on.jar</destFileName>
+                                </artifactItem>
+                                <artifactItem>
+                                    <groupId>org.bouncycastle</groupId>
+                                    <artifactId>bcprov-jdk15on</artifactId>
+                                    <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                                    <overWrite>true</overWrite>
+                                    <destFileName>bcprov-jdk15on.jar</destFileName>
+                                </artifactItem>
+                            </artifactItems>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <configuration></configuration>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <!-- TODO investigate why jar fails without this filter-->
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                        <exclude>org.opendaylight.netconf.test.tool.client</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                              <transformers>
+                                  <transformer
+                                          implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                      <mainClass>org.opendaylight.netconf.test.tool.Main</mainClass>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>executable</shadedClassifierName>
+                          </configuration>
+                      </execution>
+
+                      <execution>
+                          <id>stress-client</id>
+                          <goals>
+                              <goal>shade</goal>
+                          </goals>
+                          <phase>package</phase>
+                          <configuration>
+                              <shadedArtifactId>stress-client</shadedArtifactId>
+                              <filters>
+                                  <filter>
+                                      <artifact>*:*</artifact>
+                                      <excludes>
+                                          <exclude>META-INF/*.SF</exclude>
+                                          <exclude>META-INF/*.DSA</exclude>
+                                          <exclude>META-INF/*.RSA</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.client.http</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
+                                          <exclude>AcceptingAuthProvider</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
+                                      </excludes>
+                                  </filter>
+                              </filters>
+                              <artifactSet>
+                                  <excludes>
+                                     <exclude>org.bouncycastle:*</exclude>
+                                  </excludes>
+                              </artifactSet>
+                              <transformers>
+                                  <transformer
+                                          implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                      <manifestEntries>
+                                          <Main-Class>org.opendaylight.netconf.test.tool.client.stress.StressClient</Main-Class>
+                                          <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                      </manifestEntries>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>stress-client</shadedClassifierName>
+                          </configuration>
+                      </execution>
+
+                      <execution>
+                          <id>restconf-perf-client</id>
+                          <goals>
+                              <goal>shade</goal>
+                          </goals>
+                          <phase>package</phase>
+                          <configuration>
+                              <shadedArtifactId>rest-perf-client</shadedArtifactId>
+                              <filters>
+                                  <filter>
+                                      <artifact>*:*</artifact>
+                                      <excludes>
+                                          <exclude>META-INF/*.SF</exclude>
+                                          <exclude>META-INF/*.DSA</exclude>
+                                          <exclude>META-INF/*.RSA</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.rpc</exclude>
+                                          <exclude>AcceptingAuthProvider</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.DummyMonitoringService</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.FakeCapability</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.Main</exclude>
+                                          <exclude>org.opendaylight.netconf.test.tool.NetconfDeviceSimulator</exclude>
+                                      </excludes>
+                                  </filter>
+                              </filters>
+                              <artifactSet>
+                                  <excludes>
+                                      <exclude>org.bouncycastle:*</exclude>
+                                      <exclude>com.google:*</exclude>
+                                      <exclude>org.opendaylight.yangtools</exclude>
+                                      <exclude>org.opendaylight.yang</exclude>
+                                  </excludes>
+                              </artifactSet>
+                              <transformers>
+                                  <transformer
+                                          implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                      <mainClass>org.opendaylight.netconf.test.tool.client.http.perf.RestPerfClient</mainClass>
+                                  </transformer>
+                              </transformers>
+                              <shadedArtifactAttached>true</shadedArtifactAttached>
+                              <shadedClassifierName>rest-perf-client</shadedClassifierName>
+                          </configuration>
+                      </execution>
+
+                    <execution>
+                        <id>scale-util</id>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                        <phase>package</phase>
+                        <configuration>
+                            <shadedArtifactId>scale-util</shadedArtifactId>
+                            <filters>
+                                <filter>
+                                    <artifact>*:*</artifact>
+                                    <excludes>
+                                        <exclude>META-INF/*.SF</exclude>
+                                        <exclude>META-INF/*.DSA</exclude>
+                                        <exclude>META-INF/*.RSA</exclude>
+                                    </excludes>
+                                </filter>
+                            </filters>
+                            <transformers>
+                                <transformer
+                                        implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
+                                    <manifestEntries>
+                                        <Main-Class>org.opendaylight.netconf.test.tool.ScaleUtil</Main-Class>
+                                        <Class-Path>. lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar</Class-Path>
+                                    </manifestEntries>
+                                </transformer>
+                            </transformers>
+                            <shadedArtifactAttached>true</shadedArtifactAttached>
+                            <shadedClassifierName>scale-util</shadedClassifierName>
+                        </configuration>
+                    </execution>
+                  </executions>
+              </plugin>
+              <plugin>
+                  <artifactId>maven-assembly-plugin</artifactId>
+                  <configuration>
+                      <descriptors>
+                          <descriptor>src/main/assembly/stress-client.xml</descriptor>
+                      </descriptors>
+                      <finalName>stress-client-${project.version}-package</finalName>
+                  </configuration>
+                  <executions>
+                      <execution>
+                          <id>make-assembly</id>
+                          <phase>package</phase>
+                          <goals>
+                              <goal>single</goal>
+                          </goals>
+                      </execution>
+                  </executions>
+              </plugin>
+              <plugin>
+                  <groupId>org.apache.maven.plugins</groupId>
+                  <artifactId>maven-checkstyle-plugin</artifactId>
+                  <configuration>
+                      <propertyExpansion>checkstyle.violationSeverity=error</propertyExpansion>
+                  </configuration>
+              </plugin>
+          </plugins>
+      </build>
+
+  </project>

diff --git a/tests/transportpce_tests/test_portmapping.py b/tests/transportpce_tests/test_portmapping.py
index f386abf0db94239d7292f671075c2c02b4dcd457..5b03a5f1b5f483371e8c9efaac43068f1232ae41 100644 (file)
--- a/tests/transportpce_tests/test_portmapping.py
+++ b/tests/transportpce_tests/test_portmapping.py
@@ -29,7 +29,7 @@ class TransportPCEtesting(unittest.TestCase):
     @classmethod
     def __start_testtools(cls):
         executable = ("./netconf/netconf/tools/netconf-testtool/target/"
-                      "netconf-testtool-1.3.1-SNAPSHOT-executable.jar")
+                      "netconf-testtool-1.3.1-executable.jar")
         if os.path.isfile(executable):
             with open('testtools.log', 'w') as outfile:
                 cls.testtools_process = subprocess.Popen(