From: Martial COULIBALY Date: Thu, 22 Feb 2018 09:11:35 +0000 (+0100) Subject: Update testtool version in tests folder X-Git-Tag: v0.2.0~60 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=commitdiff_plain;h=74d11927047a7b6ace072a208ee7b1d9a3769d9d Update testtool version in tests folder - testtool 1.3.1-SNAPSHOT is no more available in netconf nexus repo. Switched netconf submodule to branch 'release/nitrogen-sr1' (=1.3.1). - updated portmapping tests and start.sh with testtool new version. - changed portmapping tests restconf address 172.0.0.1 into localhost because of some tox issues. Change-Id: Ie885f71c8103800a7888bd456170ceb98e2424df Signed-off-by: Martial COULIBALY --- diff --git a/tests/build.sh b/tests/build.sh index d765ebfd8..676dc1c20 100755 --- 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) -(cp testtool_pom.xml netconf/netconf/tools/netconf-testtool/pom.xml && cd netconf/netconf/tools/netconf-testtool && mvn clean install -DskipTests) +(cd netconf/netconf/tools/netconf-testtool && mvn clean install -DskipTests) rm -rf schemas && mkdir -p schemas #sample config for ordm 2.x are not yet ready #cp -r ../ordmodels/common/src/main/yang/org-openroadm-* schemas diff --git a/tests/netconf b/tests/netconf index b5505bd7a..fc2c9d59b 160000 --- a/tests/netconf +++ b/tests/netconf @@ -1 +1 @@ -Subproject commit b5505bd7a925c66f59687a17d4e0e855f5cb6939 +Subproject commit fc2c9d59ba8c17b42118ffe2e92237d92264d5c2 diff --git a/tests/start.sh b/tests/start.sh index b395d89ee..ef87b264d 100755 --- a/tests/start.sh +++ b/tests/start.sh @@ -11,7 +11,7 @@ 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 \ + --initial-config-xml-file sample_configs/ord_1.2.1/sample-config-ROADM.xml \ ${opts} exit $? diff --git a/tests/testtool_pom.xml b/tests/testtool_pom.xml deleted file mode 100644 index bcb582119..000000000 --- a/tests/testtool_pom.xml +++ /dev/null @@ -1,401 +0,0 @@ - - - - - 4.0.0 - - - org.opendaylight.odlparent - odlparent - 2.0.5 - - - - org.opendaylight.netconf - netconf-testtool - ${project.artifactId} - 1.3.1 - jar - - - true - - - - - - org.opendaylight.netconf - netconf-artifacts - ${project.version} - pom - import - - - org.opendaylight.yangtools - yangtools-artifacts - 1.2.1 - pom - import - - - org.opendaylight.controller - config-artifacts - 0.7.1 - pom - import - - - org.opendaylight.controller - mdsal-artifacts - 1.6.1 - pom - import - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.11.1 - pom - import - - - - - - - org.codehaus.janino - janino - 2.6.1 - - - net.sourceforge.argparse4j - argparse4j - 0.4.3 - - - ch.qos.logback - logback-classic - compile - - - com.ning - async-http-client - 1.9.24 - - - org.bouncycastle - bcpkix-jdk15on - - - org.bouncycastle - bcprov-jdk15on - - - ${project.groupId} - netconf-netty-util - - - ${project.groupId} - netconf-auth - - - ${project.groupId} - config-netconf-connector - - - ${project.groupId} - sal-netconf-connector - - - org.opendaylight.yangtools - mockito-configuration - - - org.slf4j - slf4j-api - - - com.google.guava - guava - - - ${project.groupId} - netconf-api - - - ${project.groupId} - ietf-netconf-monitoring - - - ${project.groupId} - ietf-netconf-monitoring-extension - - - ${project.groupId} - netconf-client - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - ${project.groupId} - netconf-impl - - - ${project.groupId} - netconf-mapping-api - - - ${project.groupId} - netconf-monitoring - - - ${project.groupId} - netconf-ssh - - - org.opendaylight.controller - netty-config-api - - - org.opendaylight.controller - sal-inmemory-datastore - - - org.opendaylight.netconf - mdsal-netconf-connector - - - org.apache.karaf.features - org.apache.karaf.features.core - ${karaf.version} - - - - - - - org.apache.maven.plugins - maven-dependency-plugin - - - stress-client dependency copy - - copy - - - - - org.bouncycastle - bcpkix-jdk15on - ${project.build.directory}/lib - true - bcpkix-jdk15on.jar - - - org.bouncycastle - bcprov-jdk15on - ${project.build.directory}/lib - true - bcprov-jdk15on.jar - - - - - - - - org.apache.maven.plugins - maven-shade-plugin - - - - - shade - - package - - - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - org.opendaylight.netconf.test.tool.client - - - - - - org.opendaylight.netconf.test.tool.Main - - - true - executable - - - - - stress-client - - shade - - package - - stress-client - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - org.opendaylight.netconf.test.tool.client.http - org.opendaylight.netconf.test.tool.rpc - AcceptingAuthProvider - org.opendaylight.netconf.test.tool.DummyMonitoringService - org.opendaylight.netconf.test.tool.FakeCapability - org.opendaylight.netconf.test.tool.Main - org.opendaylight.netconf.test.tool.NetconfDeviceSimulator - - - - - - org.bouncycastle:* - - - - - - org.opendaylight.netconf.test.tool.client.stress.StressClient - . lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar - - - - true - stress-client - - - - - restconf-perf-client - - shade - - package - - rest-perf-client - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - org.opendaylight.netconf.test.tool.rpc - AcceptingAuthProvider - org.opendaylight.netconf.test.tool.DummyMonitoringService - org.opendaylight.netconf.test.tool.FakeCapability - org.opendaylight.netconf.test.tool.Main - org.opendaylight.netconf.test.tool.NetconfDeviceSimulator - - - - - - org.bouncycastle:* - com.google:* - org.opendaylight.yangtools - org.opendaylight.yang - - - - - org.opendaylight.netconf.test.tool.client.http.perf.RestPerfClient - - - true - rest-perf-client - - - - - scale-util - - shade - - package - - scale-util - - - *:* - - META-INF/*.SF - META-INF/*.DSA - META-INF/*.RSA - - - - - - - org.opendaylight.netconf.test.tool.ScaleUtil - . lib lib/bcprov-jdk15on.jar lib/bcpkix-jdk15on.jar - - - - true - scale-util - - - - - - maven-assembly-plugin - - - src/main/assembly/stress-client.xml - - stress-client-${project.version}-package - - - - make-assembly - package - - single - - - - - - org.apache.maven.plugins - maven-checkstyle-plugin - - checkstyle.violationSeverity=error - - - - - - diff --git a/tests/transportpce_tests/test_portmapping.py b/tests/transportpce_tests/test_portmapping.py index a880ea80d..296b7963c 100644 --- a/tests/transportpce_tests/test_portmapping.py +++ b/tests/transportpce_tests/test_portmapping.py @@ -25,7 +25,7 @@ class TransportPCEPortMappingTesting(unittest.TestCase): testtools_process1 = None testtools_process2 = None odl_process = None - restconf_baseurl = "http://127.0.0.1:8181/restconf" + restconf_baseurl = "http://localhost:8181/restconf" @classmethod def __start_testtools(cls):