X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fopenroadminterface%2FOpenRoadmInterface710.java;h=7fa28d5f540f2b0af70899e21b9943051c473005;hb=6f2ada72bbf4febe8e176ec2537dfc7e6e561a52;hp=1d72b2552f3f0647cf4c502e946db38046a3bea3;hpb=268165cb2822b6ce4c55f00cac63eed2bb222ec7;p=transportpce.git 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 1d72b2552..7fa28d5f5 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 @@ -365,9 +365,11 @@ public class OpenRoadmInterface710 { // create OCH interface interfaceOchOtsiOtsigroup = createOpenRoadmOchInterface(nodeId, logicalConnPoint, spectrumInformation); } else if (portMap.getSupportedInterfaceCapability().contains(IfOtsiOtsigroup.class)) { - // Create OTSi and OTSi-group + // Create OTSi and OTSi-group and concat the names of the interface String interfaceOtsiName = createOpenRoadmOtsiInterface(nodeId, logicalConnPoint, spectrumInformation); - interfaceOchOtsiOtsigroup = createOpenRoadmOtsiGroupInterface(nodeId, logicalConnPoint, interfaceOtsiName, + // Concat the two names for this interface + interfaceOchOtsiOtsigroup = interfaceOtsiName + + "#" + createOpenRoadmOtsiGroupInterface(nodeId, logicalConnPoint, interfaceOtsiName, spectrumInformation); } @@ -877,17 +879,19 @@ public class OpenRoadmInterface710 { } // Depending on OTU4 or OTUCn, supporting interface should // reflect that - String interfaceOdu4Oducn = null; + String interfaceOdu4OducnOduflex = null; if (portMap.getSupportedInterfaceCapability().contains(IfOCHOTU4ODU4.class)) { // create OTU4 interface - interfaceOdu4Oducn = createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, apiInfoA, apiInfoZ); + interfaceOdu4OducnOduflex = createOpenRoadmOdu4Interface(nodeId, logicalConnPoint, apiInfoA, apiInfoZ); } else if (portMap.getSupportedInterfaceCapability().contains(IfOtsiOtsigroup.class)) { // Create ODUCn and ODUFlex interface. String interfaceOducn = createOpenRoadmOducnInterface(nodeId, logicalConnPoint); - interfaceOdu4Oducn = createOpenRoadmOduflexInterface(nodeId, logicalConnPoint, interfaceOducn); + // Here we concat the two interfaces + interfaceOdu4OducnOduflex = interfaceOducn + "#" + + createOpenRoadmOduflexInterface(nodeId, logicalConnPoint, interfaceOducn); } - return interfaceOdu4Oducn; + return interfaceOdu4OducnOduflex; } public String createOpenRoadmOtnOducnInterface(String nodeId, String logicalConnPoint,