From 945aaee9d514a2348dce53418f70aeceda8b3ef1 Mon Sep 17 00:00:00 2001 From: manuedelf Date: Mon, 8 Jun 2020 17:15:46 +0200 Subject: [PATCH] Lighty support in Magnesium - use release version of lighty-app-parent - set groupId to io.lighty.controller - set artifactId to tpce - fix final jar name to tpce - update shell scripts - remove unused dependencies from pom - add missing ietf.restconf.rev131019 yang model to fix serialization problem JIRA: TRNSPRTPCE-237 Change-Id: I45f243091ad1ec723475350d04b373cf8580cb84 --- lighty/build.sh | 11 +-- lighty/pom.xml | 86 ++++--------------- .../resources/clean-start-controller.sh | 2 +- .../assembly/resources/start-controller.sh | 2 +- .../controllers/tpce/utils/TPCEUtils.java | 3 +- tests/transportpce_tests/1.2.1/test_utils.py | 2 +- tests/transportpce_tests/2.2.1/test_utils.py | 2 +- 7 files changed, 24 insertions(+), 84 deletions(-) diff --git a/lighty/build.sh b/lighty/build.sh index 43a4fb776..8326b9332 100755 --- a/lighty/build.sh +++ b/lighty/build.sh @@ -1,15 +1,6 @@ #!/bin/sh cd $(dirname "$0") -cd .. #mvn clean install -s tests/odl_settings.xml -DskipTests -Dmaven.javadoc.skip=true -Dodlparent.spotbugs.skip -Dodlparent.checkstyle.skip -git clone https://github.com/PantheonTechnologies/lighty-core.git -cd lighty-core -git checkout 12.1.x -mvn clean install -DskipTests -Dmaven.javadoc.skip=true -cd ../lighty mvn clean install -Dmaven.javadoc.skip=true -cd target -unzip lighty-transportpce-12.1.0-SNAPSHOT-bin.zip -cd .. -rm -rf ../lighty-core +unzip target/tpce-bin.zip -d target diff --git a/lighty/pom.xml b/lighty/pom.xml index 45f2655a8..518ef8b63 100644 --- a/lighty/pom.xml +++ b/lighty/pom.xml @@ -1,24 +1,23 @@ - - + + 4.0.0 io.lighty.core lighty-app-parent - 12.1.0-SNAPSHOT - + 12.1.0 + - io.lighty.examples.controllers - lighty-transportpce - 12.1.0-SNAPSHOT + io.lighty.controllers + tpce + 2.0.0-SNAPSHOT jar @@ -61,7 +60,7 @@ transportpce-networkmodel ${transportpce.version} - + @@ -79,7 +78,7 @@ transportpce-servicehandler ${transportpce.version} - + io.lighty.modules @@ -88,61 +87,10 @@ io.lighty.modules lighty-restconf-nb-community - - - - javax.ws.rs - javax.ws.rs-api - - - - io.lighty.resources - singlenode-configuration - - - io.lighty.resources - log4j-properties - - - - org.eclipse.jetty - jetty-server - - - javax.servlet - javax.servlet-api - - - org.eclipse.jetty - jetty-webapp - - - org.eclipse.jetty - jetty-servlets - - - org.glassfish.jersey.core - jersey-server - - - org.glassfish.jersey.containers - jersey-container-jetty-http - - - org.glassfish.jersey.inject - jersey-hk2 - - - javax.ws.rs - javax.ws.rs-api - - - - org.eclipse.jetty - jetty-client - test - + + tpce + diff --git a/lighty/src/main/assembly/resources/clean-start-controller.sh b/lighty/src/main/assembly/resources/clean-start-controller.sh index 5a967bce1..e0866d993 100755 --- a/lighty/src/main/assembly/resources/clean-start-controller.sh +++ b/lighty/src/main/assembly/resources/clean-start-controller.sh @@ -8,4 +8,4 @@ rm -rf cache rm -rf target #start controller -java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.1.0-SNAPSHOT.jar +java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar tpce.jar diff --git a/lighty/src/main/assembly/resources/start-controller.sh b/lighty/src/main/assembly/resources/start-controller.sh index d0d8d2a72..d20baf467 100755 --- a/lighty/src/main/assembly/resources/start-controller.sh +++ b/lighty/src/main/assembly/resources/start-controller.sh @@ -5,4 +5,4 @@ BASEDIR=$(dirname "$0") cd ${BASEDIR} #start controller -java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar lighty-transportpce-12.1.0-SNAPSHOT.jar +java -ms128m -mx128m -XX:MaxMetaspaceSize=128m -jar tpce.jar diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java index ce6950f28..a9444a4dc 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/utils/TPCEUtils.java @@ -166,7 +166,8 @@ public final class TPCEUtils { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.netconf.base._1._0.rev110601.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.extension.rev131210.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.monitoring.rev101004.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.$YangModuleInfoImpl.getInstance() + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.netconf.notifications.rev120206.$YangModuleInfoImpl.getInstance(), + org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.restconf.rev131019.$YangModuleInfoImpl.getInstance() ); public static final Set yangModels = Stream.concat( diff --git a/tests/transportpce_tests/1.2.1/test_utils.py b/tests/transportpce_tests/1.2.1/test_utils.py index 2b565a53f..d63109516 100644 --- a/tests/transportpce_tests/1.2.1/test_utils.py +++ b/tests/transportpce_tests/1.2.1/test_utils.py @@ -70,7 +70,7 @@ def start_tpce(): print("starting LIGHTY.IO TransportPCE build...") executable = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "..", "..", "..", "lighty", "target", "lighty-transportpce-12.1.0-SNAPSHOT", + "..", "..", "..", "lighty", "target", "tpce", "clean-start-controller.sh") with open('odl.log', 'w') as outfile: return subprocess.Popen( diff --git a/tests/transportpce_tests/2.2.1/test_utils.py b/tests/transportpce_tests/2.2.1/test_utils.py index 7afbdc181..4d5fe3efb 100644 --- a/tests/transportpce_tests/2.2.1/test_utils.py +++ b/tests/transportpce_tests/2.2.1/test_utils.py @@ -62,7 +62,7 @@ def start_tpce(): print("starting LIGHTY.IO TransportPCE build...") executable = os.path.join( os.path.dirname(os.path.realpath(__file__)), - "..", "..", "..", "lighty", "target", "lighty-transportpce-12.1.0-SNAPSHOT", + "..", "..", "..", "lighty", "target", "tpce", "clean-start-controller.sh") with open('odl.log', 'w') as outfile: return subprocess.Popen( -- 2.36.6