From d2dec393655be843f063f11fba63a8c6d002bbc0 Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Thu, 24 Nov 2022 16:57:40 +0100 Subject: [PATCH] Upgrade lighty to Chlorine - adopt lighty-app-parent-17.0.0 - add transportpce/models as upstream dependency in pom.xml - adapt lighty code and unitary tests JIRA: TRNSPRTPCE-705 Signed-off-by: Gilles Thouenon Co-authored-by: Christophe Betoule Change-Id: Ia4ba687f80e99d9b4f73645efe79525f167abadb --- lighty/pom.xml | 53 ++++++++++++++++++- .../assembly/resources/config_template.json | 3 +- .../java/io/lighty/controllers/tpce/Main.java | 2 - .../controllers/tpce/utils/TPCEUtils.java | 27 ---------- .../io/lighty/controllers/tpce/MaintTest.java | 4 +- lighty/src/test/resources/config.json | 4 +- 6 files changed, 56 insertions(+), 37 deletions(-) diff --git a/lighty/pom.xml b/lighty/pom.xml index c0fde1e19..71be1a294 100644 --- a/lighty/pom.xml +++ b/lighty/pom.xml @@ -11,7 +11,7 @@ io.lighty.core lighty-app-parent - 16.1.0 + 17.0.0 @@ -25,6 +25,7 @@ true true 7.0.0-SNAPSHOT + 17.1.0-SNAPSHOT @@ -35,6 +36,56 @@ 1.4 + + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-device-1.2.1 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-device-2.2.1 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-device-7.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-network-10.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + tapi-2.1.1 + 17.1.0-SNAPSHOT + org.opendaylight.transportpce transportpce-api diff --git a/lighty/src/main/assembly/resources/config_template.json b/lighty/src/main/assembly/resources/config_template.json index a16c4a981..1fadbabe3 100644 --- a/lighty/src/main/assembly/resources/config_template.json +++ b/lighty/src/main/assembly/resources/config_template.json @@ -1,7 +1,6 @@ { "restconf":{ "inetAddress": "127.0.0.1", - "httpPort": ODL_RESTCONF_PORT, - "webSocketPort": ODL_WEBSOCKET_PORT + "httpPort": ODL_RESTCONF_PORT } } diff --git a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java index 043f37f96..9c068143a 100644 --- a/lighty/src/main/java/io/lighty/controllers/tpce/Main.java +++ b/lighty/src/main/java/io/lighty/controllers/tpce/Main.java @@ -20,7 +20,6 @@ import io.lighty.core.controller.impl.config.ControllerConfiguration; import io.lighty.core.controller.impl.util.ControllerConfigUtils; import io.lighty.modules.northbound.restconf.community.impl.CommunityRestConf; import io.lighty.modules.northbound.restconf.community.impl.CommunityRestConfBuilder; -import io.lighty.modules.northbound.restconf.community.impl.config.JsonRestConfServiceType; import io.lighty.modules.northbound.restconf.community.impl.config.RestConfConfiguration; import io.lighty.modules.northbound.restconf.community.impl.util.RestConfConfigUtils; import io.lighty.modules.southbound.netconf.impl.NetconfSBPlugin; @@ -82,7 +81,6 @@ public class Main { restConfConfig.setHttpPort(8181); } - restConfConfig.setJsonRestconfServiceType(JsonRestConfServiceType.DRAFT_02); // 3. NETCONF SBP configuration NetconfConfiguration netconfSBPConfig = NetconfConfigUtils.createDefaultNetconfConfiguration(); startLighty(singleNodeConfiguration, restConfConfig, netconfSBPConfig, registerShutdownHook, 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 2b6d813c4..733f168e2 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 @@ -23,42 +23,21 @@ public final class TPCEUtils { // common models 1.2.1 and 2.2.1 org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.alarm.rev181019.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.amplifier.types.rev181130.$YangModuleInfoImpl - .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.equipment.types.rev181130.$YangModuleInfoImpl - .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.link.types.rev181130.$YangModuleInfoImpl - .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.node.types.rev181130.$YangModuleInfoImpl - .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev181130.$YangModuleInfoImpl - .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev181130.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev170929.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181130.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev161014.$YangModuleInfoImpl .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev171215.$YangModuleInfoImpl .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.equipment.states.types.rev181130.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.layerrate.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.maintenance.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.maintenance.rev181019.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev170929.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev171215.$YangModuleInfoImpl .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev181019.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.pm.types.rev171215.$YangModuleInfoImpl.getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev170929.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev181019.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.probablecause.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.probablecause.rev181019.$YangModuleInfoImpl.getInstance(), @@ -68,8 +47,6 @@ public final class TPCEUtils { org.opendaylight.yang.gen.v1.http.org.openroadm.resource.types.rev181019.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev171215.$YangModuleInfoImpl .getInstance(), - org.opendaylight.yang.gen.v1.http.org.openroadm.switching.pool.types.rev181130.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev161014.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.tca.rev181019.$YangModuleInfoImpl.getInstance(), org.opendaylight.yang.gen.v1.http.org.openroadm.user.mgmt.rev161014.$YangModuleInfoImpl.getInstance(), @@ -354,14 +331,10 @@ public final class TPCEUtils { .getInstance(), 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.restconf.rev131019.$YangModuleInfoImpl - .getInstance(), org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.tapi.rev180928.$YangModuleInfoImpl .getInstance(), org.opendaylight.yang.gen.v1.nbi.notifications.rev211013.$YangModuleInfoImpl diff --git a/lighty/src/test/java/io/lighty/controllers/tpce/MaintTest.java b/lighty/src/test/java/io/lighty/controllers/tpce/MaintTest.java index 98abb12db..f3260e387 100644 --- a/lighty/src/test/java/io/lighty/controllers/tpce/MaintTest.java +++ b/lighty/src/test/java/io/lighty/controllers/tpce/MaintTest.java @@ -49,7 +49,7 @@ public class MaintTest { @Test public void startNoConfigFileTest() throws Exception { main.start(null, false, false, "3000", "2000", true); - ContentResponse response = client.GET("http://localhost:8181/restconf/config/ietf-network:networks/network/openroadm-topology"); + ContentResponse response = client.GET("http://localhost:8181/restconf/data/ietf-network:networks/network=openroadm-topology"); assertEquals("Response code should be 200", 200, response.getStatus()); } @@ -57,7 +57,7 @@ public class MaintTest { public void startConfigFileTest() throws Exception { File configFile = new File("src/test/resources/config.json"); main.start(configFile.getAbsolutePath(), false, false, "3000", "2000", true); - ContentResponse response = client.GET("http://localhost:8888/restconfCustom/config/ietf-network:networks/network/openroadm-topology"); + ContentResponse response = client.GET("http://localhost:8888/restconfCustom/data/ietf-network:networks/network=openroadm-topology"); assertEquals("Response code should be 200", 200, response.getStatus()); } } diff --git a/lighty/src/test/resources/config.json b/lighty/src/test/resources/config.json index 761c4ee26..d770f00d2 100644 --- a/lighty/src/test/resources/config.json +++ b/lighty/src/test/resources/config.json @@ -2,8 +2,6 @@ "restconf":{ "inetAddress": "127.0.0.1", "httpPort":8888, - "webSocketPort": 8185, - "restconfServletContextPath":"/restconfCustom", - "jsonRestconfServiceType": "DRAFT_18" + "restconfServletContextPath":"/restconfCustom" } } -- 2.36.6