From 0067b0054ebdb285e14dc94fe3264e46856ee9ce Mon Sep 17 00:00:00 2001 From: Gilles Thouenon Date: Mon, 26 Sep 2022 18:00:46 +0200 Subject: [PATCH] Remove openroadm and tapi models building Remove openroadm and tapi models building from TransportPCE project to use them as an upstream dependency. - adapt maven pom files - remove from api transportpce yang model bad revision in imports that avoid having the latest ones - fix few imports errors for SupportedIfCapability, OpucnTribSlotDef JIRA: TRNSPRTPCE-694 Signed-off-by: Gilles Thouenon Change-Id: I9d376663d9c35d2c5a7400943384ae48f4b62d71 --- api/pom.xml | 49 +++++++++++------ ...-common-service-path-types@2022-01-18.yang | 1 - ...ansportpce-pathDescription@2021-07-05.yang | 1 - common/pom.xml | 53 +++++++++++++----- .../common/mapping/PortMappingVersion121.java | 2 +- dmaap-client/pom.xml | 13 ++--- features/odl-transportpce-tapi/pom.xml | 10 ++-- features/odl-transportpce/pom.xml | 24 +++------ inventory/pom.xml | 18 ++++--- nbinotifications/pom.xml | 21 ++++---- networkmodel/pom.xml | 53 +++++++++++++----- olm/pom.xml | 52 ++++++++++++++---- pce/pom.xml | 44 ++++++++++----- .../transportpce/pce/PcePathDescription.java | 2 +- .../pce/graph/PostAlgoPathValidator.java | 2 +- .../pce/networkanalyzer/PceResult.java | 2 +- .../pce/networkanalyzer/PceOtnNodeTest.java | 2 +- .../pce/networkanalyzer/PceResultTest.java | 2 +- pom.xml | 3 -- renderer/pom.xml | 52 ++++++++++++++---- servicehandler/pom.xml | 21 +++++--- tapi/pom.xml | 54 +++++++++++++------ test-common/pom.xml | 46 ++++++++++++++++ 23 files changed, 381 insertions(+), 146 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 0a023ab05..9ef77b05b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -21,31 +21,50 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + 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} - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-device-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + openroadm-network-10.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} - ${project.groupId} - transportpce-tapimodels - ${project.version} + org.opendaylight.transportpce.models + tapi-2.1.1 + 17.0.0-SNAPSHOT org.opendaylight.yangtools diff --git a/api/src/main/yang/service_path/transportpce-common-service-path-types@2022-01-18.yang b/api/src/main/yang/service_path/transportpce-common-service-path-types@2022-01-18.yang index 6b6683c02..213e9c22e 100644 --- a/api/src/main/yang/service_path/transportpce-common-service-path-types@2022-01-18.yang +++ b/api/src/main/yang/service_path/transportpce-common-service-path-types@2022-01-18.yang @@ -13,7 +13,6 @@ module transportpce-common-service-path-types { } import org-openroadm-resource-types { prefix org-openroadm-resource-types; - revision-date 2018-11-30; } import org-openroadm-common-service-types { prefix org-openroadm-common-service-types; diff --git a/api/src/main/yang/service_path/transportpce-pathDescription@2021-07-05.yang b/api/src/main/yang/service_path/transportpce-pathDescription@2021-07-05.yang index 670586bf1..6ef1b5106 100644 --- a/api/src/main/yang/service_path/transportpce-pathDescription@2021-07-05.yang +++ b/api/src/main/yang/service_path/transportpce-pathDescription@2021-07-05.yang @@ -12,7 +12,6 @@ module transportpce-pathDescription { } import org-openroadm-otn-common-types { prefix org-openroadm-otn-common-types; - revision-date 2018-11-30; } organization diff --git a/common/pom.xml b/common/pom.xml index 8f8e708a2..c9191cf4c 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -19,6 +19,10 @@ 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + @@ -33,24 +37,49 @@ - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.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} ${project.groupId} diff --git a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java index ae65f9951..bc4f2e48f 100644 --- a/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java +++ b/common/src/main/java/org/opendaylight/transportpce/common/mapping/PortMappingVersion121.java @@ -76,7 +76,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev161014.OtnO import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.Protocols1; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.Lldp; import org.opendaylight.yang.gen.v1.http.org.openroadm.lldp.rev161014.lldp.container.lldp.PortConfig; -import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev170929.SupportedIfCapability; +import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev161014.SupportedIfCapability; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.opendaylight.yangtools.yang.common.Uint16; import org.opendaylight.yangtools.yang.common.Uint32; diff --git a/dmaap-client/pom.xml b/dmaap-client/pom.xml index 29dc03f3b..8b8ac8020 100644 --- a/dmaap-client/pom.xml +++ b/dmaap-client/pom.xml @@ -20,19 +20,20 @@ client to send message to Dmaap message router + 17.0.0-SNAPSHOT UTF-8 - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} ${project.groupId} diff --git a/features/odl-transportpce-tapi/pom.xml b/features/odl-transportpce-tapi/pom.xml index a011f8d4e..1c9e803f3 100644 --- a/features/odl-transportpce-tapi/pom.xml +++ b/features/odl-transportpce-tapi/pom.xml @@ -22,11 +22,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL feature OpenDaylight :: transportpce :: tapi + + 17.0.0-SNAPSHOT + + - ${project.groupId} - transportpce-tapimodels - ${project.version} + org.opendaylight.transportpce.models + tapi-2.1.1 + ${transportpce.models.version} ${project.groupId} diff --git a/features/odl-transportpce/pom.xml b/features/odl-transportpce/pom.xml index 3ee7cdce7..f7e57a15e 100644 --- a/features/odl-transportpce/pom.xml +++ b/features/odl-transportpce/pom.xml @@ -24,6 +24,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.2 + 17.0.0-SNAPSHOT etc/opendaylight/karaf @@ -41,24 +42,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} - - - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + odl-openroadm-models + ${transportpce.models.version} + features + xml org.opendaylight.transportpce diff --git a/inventory/pom.xml b/inventory/pom.xml index e65fc2b9d..91fd630c9 100644 --- a/inventory/pom.xml +++ b/inventory/pom.xml @@ -19,12 +19,16 @@ 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + org.opendaylight.netconf netconf-artifacts - 2.0.13 + 4.0.1 import pom @@ -33,14 +37,14 @@ - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-device-1.2.1 + ${transportpce.models.version} ${project.groupId} diff --git a/nbinotifications/pom.xml b/nbinotifications/pom.xml index 20eafb2e8..d9748d9e6 100644 --- a/nbinotifications/pom.xml +++ b/nbinotifications/pom.xml @@ -22,28 +22,29 @@ UTF-8 + 17.0.0-SNAPSHOT 3.0.0 - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} - ${project.groupId} - transportpce-api - ${project.version} + org.opendaylight.transportpce.models + tapi-2.1.1 + ${transportpce.models.version} ${project.groupId} - transportpce-tapimodels + transportpce-api ${project.version} diff --git a/networkmodel/pom.xml b/networkmodel/pom.xml index a226bf861..83e7c2375 100644 --- a/networkmodel/pom.xml +++ b/networkmodel/pom.xml @@ -22,6 +22,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + @@ -50,24 +54,49 @@ and is available at http://www.eclipse.org/legal/epl-v10.html - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.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} ${project.groupId} diff --git a/olm/pom.xml b/olm/pom.xml index 09439f77b..316c721e6 100644 --- a/olm/pom.xml +++ b/olm/pom.xml @@ -22,21 +22,55 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.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} ${project.groupId} diff --git a/pce/pom.xml b/pce/pom.xml index 2e6cff3c7..15268db51 100644 --- a/pce/pom.xml +++ b/pce/pom.xml @@ -23,26 +23,45 @@ 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.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} ${project.groupId} @@ -164,7 +183,6 @@ jakarta.ws.rs-api - org.opendaylight.transportpce diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java index 27fd931e6..3d9dfdbee 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/PcePathDescription.java @@ -19,7 +19,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.optical.channel.types.rev211210.FrequencyTHz; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.state.types.rev191129.State; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.ModulationFormat; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirectionBuilder; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.atoz.direction.AToZ; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java index c05eaa091..7e4acd6e2 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/graph/PostAlgoPathValidator.java @@ -30,7 +30,7 @@ import org.opendaylight.transportpce.pce.networkanalyzer.PceResult; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.SpectrumAssignment; import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.pce.rev220808.SpectrumAssignmentBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev211210.OpenroadmLinkType; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; diff --git a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java index f4d8b3bbf..05a6e8c77 100644 --- a/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java +++ b/pce/src/main/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResult.java @@ -12,7 +12,7 @@ import java.math.BigDecimal; import java.util.List; import org.opendaylight.transportpce.common.ResponseCodes; import org.opendaylight.transportpce.common.fixedflex.GridConstant; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef; import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.AToZDirection; import org.opendaylight.yang.gen.v1.http.org.transportpce.b.c._interface.pathdescription.rev210705.path.description.ZToADirection; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java index 132522515..636328dbc 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceOtnNodeTest.java @@ -45,7 +45,7 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10 import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If10GEODU2e; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.If1GEODU0; import org.opendaylight.yang.gen.v1.http.org.openroadm.port.types.rev201211.IfOCHOTU4ODU4; -import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129 .ServiceFormat; +import org.opendaylight.yang.gen.v1.http.org.openroadm.service.format.rev191129.ServiceFormat; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; diff --git a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResultTest.java b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResultTest.java index a058340df..46ed8e5f1 100644 --- a/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResultTest.java +++ b/pce/src/test/java/org/opendaylight/transportpce/pce/networkanalyzer/PceResultTest.java @@ -13,7 +13,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; import org.opendaylight.transportpce.test.AbstractTest; -import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev181130.OpucnTribSlotDef; +import org.opendaylight.yang.gen.v1.http.org.openroadm.otn.common.types.rev210924.OpucnTribSlotDef; public class PceResultTest extends AbstractTest { diff --git a/pom.xml b/pom.xml index af955d6d1..d579b004d 100644 --- a/pom.xml +++ b/pom.xml @@ -30,8 +30,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - ordmodels - tapimodels api common test-common @@ -74,7 +72,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - diff --git a/renderer/pom.xml b/renderer/pom.xml index a88940f05..e590f65b6 100644 --- a/renderer/pom.xml +++ b/renderer/pom.xml @@ -22,21 +22,55 @@ and is available at http://www.eclipse.org/legal/epl-v10.html 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.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} ${project.groupId} diff --git a/servicehandler/pom.xml b/servicehandler/pom.xml index ca897bda9..972c70bbd 100644 --- a/servicehandler/pom.xml +++ b/servicehandler/pom.xml @@ -24,16 +24,25 @@ Author: Martial Coulibaly on behalf of Orange 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} + + + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} ${project.groupId} diff --git a/tapi/pom.xml b/tapi/pom.xml index e8924b365..7da42de13 100644 --- a/tapi/pom.xml +++ b/tapi/pom.xml @@ -24,6 +24,10 @@ Author: Martial Coulibaly on behalf of Orange 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + @@ -38,29 +42,49 @@ Author: Martial Coulibaly on behalf of Orange - ${project.groupId} - transportpce-tapimodels - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-common - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-device - ${project.version} + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-network - ${project.version} + org.opendaylight.transportpce.models + openroadm-device-1.2.1 + ${transportpce.models.version} - ${project.groupId}.ordmodels - transportpce-ordmodels-service - ${project.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 + ${transportpce.models.version} ${project.groupId} diff --git a/test-common/pom.xml b/test-common/pom.xml index 1e7991ea9..f2f027ce3 100644 --- a/test-common/pom.xml +++ b/test-common/pom.xml @@ -21,6 +21,10 @@ 6.0.0-SNAPSHOT bundle + + 17.0.0-SNAPSHOT + + @@ -34,6 +38,48 @@ + + org.opendaylight.transportpce.models + openroadm-common-1.2.1 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-common-2.2.1 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-common-7.1.0 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-common-10.1.0 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-device-7.1.0 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-network-10.1.0 + ${transportpce.models.version} + test + + + org.opendaylight.transportpce.models + openroadm-service-10.1.0 + ${transportpce.models.version} + test + ${project.groupId} transportpce-api -- 2.36.6