X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=transportpce.git;a=blobdiff_plain;f=renderer%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Frenderer%2Fprovisiondevice%2FRendererServiceOperationsImpl.java;h=ccb610049439d18965b8b2a3cd3076025f5dae02;hp=a9fd162b0d9c244417ea59362abfaab771403894;hb=20f7e2f0391dd4cb85fc8a69b9c0fa12d12648fa;hpb=db73cab6ecda984a81ad4a4da999b763421d27fa diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java index a9fd162b0..ccb610049 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImpl.java @@ -656,20 +656,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations renderingResults.forEach(rr -> otnLinkTerminationPoints.addAll(rr.getOtnLinkTps())); Link notifLink = createLinkForNotif(otnLinkTerminationPoints); List allSupportLinks = ModelMappingUtils.getLinksFromServicePathDescription(input.getPathDescription()); - List supportedLinks = null; - switch (serviceType) { - case StringConstants.SERVICE_TYPE_ODU4: - case StringConstants.SERVICE_TYPE_100GE_S: - supportedLinks = allSupportLinks.stream() - .filter(lk -> lk.startsWith(OtnLinkType.OTU4.getName())).collect(Collectors.toList()); - break; - case StringConstants.SERVICE_TYPE_ODUC4: - supportedLinks = allSupportLinks.stream() - .filter(lk -> lk.startsWith(OtnLinkType.OTUC4.getName())).collect(Collectors.toList()); - break; - default: - break; - } + List supportedLinks = getSupportedLinks(allSupportLinks, serviceType); sendNotificationsWithPathDescription(ServicePathNotificationTypes.ServiceImplementationRequest, input.getServiceName(), RpcStatusEx.Successful, OPERATION_SUCCESSFUL, input.getPathDescription(), @@ -706,20 +693,7 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations renderingResults.forEach(rr -> otnLinkTerminationPoints.addAll(rr.getOtnLinkTps())); Link notifLink = createLinkForNotif(otnLinkTerminationPoints); List allSupportLinks = ModelMappingUtils.getLinksFromServicePathDescription(pathDescription); - List supportedLinks = null; - switch (serviceType) { - case StringConstants.SERVICE_TYPE_ODU4: - case StringConstants.SERVICE_TYPE_100GE_S: - supportedLinks = allSupportLinks.stream() - .filter(lk -> lk.startsWith(OtnLinkType.OTU4.getName())).collect(Collectors.toList()); - break; - case StringConstants.SERVICE_TYPE_ODUC4: - supportedLinks = allSupportLinks.stream() - .filter(lk -> lk.startsWith(OtnLinkType.OTUC4.getName())).collect(Collectors.toList()); - break; - default: - break; - } + List supportedLinks = getSupportedLinks(allSupportLinks, serviceType); sendNotificationsWithPathDescription(ServicePathNotificationTypes.ServiceDelete, serviceName, RpcStatusEx.Successful, OPERATION_SUCCESSFUL, pathDescription, notifLink, supportedLinks, @@ -815,4 +789,25 @@ public class RendererServiceOperationsImpl implements RendererServiceOperations .build()) .build(); } + + private List getSupportedLinks(List allSupportLinks, String serviceType) { + switch (serviceType) { + case StringConstants.SERVICE_TYPE_10GE: + case StringConstants.SERVICE_TYPE_1GE: + return allSupportLinks.stream() + .filter(lk -> lk.startsWith(OtnLinkType.ODTU4.getName())).collect(Collectors.toList()); + case StringConstants.SERVICE_TYPE_100GE_M: + return allSupportLinks.stream() + .filter(lk -> lk.startsWith(OtnLinkType.ODUC4.getName())).collect(Collectors.toList()); + case StringConstants.SERVICE_TYPE_ODU4: + case StringConstants.SERVICE_TYPE_100GE_S: + return allSupportLinks.stream() + .filter(lk -> lk.startsWith(OtnLinkType.OTU4.getName())).collect(Collectors.toList()); + case StringConstants.SERVICE_TYPE_ODUC4: + return allSupportLinks.stream() + .filter(lk -> lk.startsWith(OtnLinkType.OTUC4.getName())).collect(Collectors.toList()); + default: + return null; + } + } }