From: Christophe BETOULE Date: Wed, 16 Feb 2022 08:11:02 +0000 (+0000) Subject: Merge "Remove maintenance loopback container" into stable/phosphorus X-Git-Tag: 4.2.0~12 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0624ac3da6f28ba0077d7bd88ac5c18cbb3e1716;hp=fe8a24380dc8c4fa3b28e7297f6024de0db795c7;p=transportpce.git Merge "Remove maintenance loopback container" into stable/phosphorus --- diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java index 8e9a39d64..bdbfeb770 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface710.java @@ -53,7 +53,6 @@ import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnO import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtnOtu; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.Otsi; import org.opendaylight.yang.gen.v1.http.org.openroadm.interfaces.rev191129.OtsiGroup; -import org.opendaylight.yang.gen.v1.http.org.openroadm.maintenance.loopback.rev191129.maint.loopback.MaintLoopbackBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.interfaces.rev200529.och.container.OchBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.tributary.signal.interfaces.rev200529.otsi.attributes.FlexoBuilder; import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.channel.tributary.signal.interfaces.rev200529.otsi.container.OtsiBuilder; @@ -433,15 +432,13 @@ public class OpenRoadmInterface710 { nodeId, logicalConnPoint)); } // Create an OTUCn object - MaintLoopbackBuilder maintLoopbackBuilder = new MaintLoopbackBuilder(); - maintLoopbackBuilder.setEnabled(false); OtuBuilder otuBuilder = new OtuBuilder() .setRate(OTUCn.class) .setTimActEnabled(false) .setTimDetectMode(TimDetectMode.Disabled) .setDegmIntervals(Uint8.valueOf(2)) - .setDegthrPercentage(Uint16.valueOf(100)) - .setMaintLoopback(maintLoopbackBuilder.build()); + .setDegthrPercentage(Uint16.valueOf(100)); + if (apiInfoA != null) { otuBuilder.setTxSapi(apiInfoA.getSapi()) .setTxDapi(apiInfoA.getDapi())