Merge "Bug in interface delete 400G-Ethernet" into stable/phosphorus
authorChristophe BETOULE <christophe.betoule@orange.com>
Wed, 16 Feb 2022 08:11:30 +0000 (08:11 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Wed, 16 Feb 2022 08:11:30 +0000 (08:11 +0000)
renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java

index e99750cb07e355ea14cd456ffc5a6ac76f743a6a..6a6480e79e8d28dfc3cb625060f93242c6b4f74f 100644 (file)
@@ -394,7 +394,8 @@ public class DeviceRendererServiceImpl implements DeviceRendererService {
             nodeOpenRoadmVersion.equals(OpenroadmNodeVersion._71)
                 ? Map.of(
                     // We don't need ODUC2, ODUC3 here, since they are handled in OTN service-path
-                    "ODU",  List.of("ODU4", "ODUC4", "ODUFLEX"),
+                    // This has to be in an order of deletion
+                    "ODU",  List.of("ODU4", "ODUFLEX", "ODUC4"),
                     // Add intermediate OTUCn rates (OTUC2, OTUC3)
                     // OTU4 is used in 100G service on 7.1 model
                     "other", List.of("OTU4", "OTUC2", "OTUC3", "OTUC4",