From 4692e0088d2cb68650279cb1b0cfebf2e5fa64e5 Mon Sep 17 00:00:00 2001 From: "guillaume.lambert" Date: Thu, 27 Feb 2020 15:08:15 +0100 Subject: [PATCH] clean OTN renderer code JIRA: TRNSPRTPCE-174 TRNSPRTPCE-142 Signed-off-by: guillaume.lambert Change-Id: I2babfd00dd554fc23aa8287146d87a7cc445db1d --- .../OpenRoadmInterface121.java | 89 +++++++++--------- .../OpenRoadmInterface221.java | 94 +++++++++---------- .../DeviceRendererServiceImpl.java | 2 +- .../OtnDeviceRendererServiceImpl.java | 57 ++++++----- ...ndererServiceOperationsImplDeleteTest.java | 6 +- 5 files changed, 130 insertions(+), 118 deletions(-) diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java index fb11fe9a2..3f6bf10ca 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface121.java @@ -72,17 +72,18 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } // Ethernet interface specific data - EthernetBuilder ethIfBuilder = new EthernetBuilder(); - ethIfBuilder.setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled); - ethIfBuilder.setDuplex(EthAttributes.Duplex.Full); - ethIfBuilder.setFec(EthAttributes.Fec.Off); - ethIfBuilder.setSpeed(100000L); - ethIfBuilder.setMtu(9000L); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setAutoNegotiation(EthAttributes.AutoNegotiation.Enabled) + .setDuplex(EthAttributes.Duplex.Full) + .setFec(EthAttributes.Fec.Off) + .setSpeed(100000L) + .setMtu(9000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); @@ -102,15 +103,15 @@ public class OpenRoadmInterface121 { private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); - interfaceBuilder.setDescription(" TBD "); - interfaceBuilder.setCircuitId(" TBD "); - interfaceBuilder.setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()); - interfaceBuilder.setSupportingPort(portMap.getSupportingPort()); - interfaceBuilder.setAdministrativeState(AdminStates.InService); - interfaceBuilder.setType(type); - interfaceBuilder.setName(key); - interfaceBuilder.withKey(new InterfaceKey(key)); + InterfaceBuilder interfaceBuilder = new InterfaceBuilder() + .setDescription(" TBD ") + .setCircuitId(" TBD ") + .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) + .setSupportingPort(portMap.getSupportingPort()) + .setAdministrativeState(AdminStates.InService) + .setType(type) + .setName(key) + .withKey(new InterfaceKey(key)); return interfaceBuilder; } /** @@ -128,8 +129,9 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder otuInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOtu.class, logicalConnPoint @@ -137,9 +139,9 @@ public class OpenRoadmInterface121 { otuInterfaceBldr.setSupportingInterface(supportOchInterface); // OTU interface specific data - OtuBuilder otuIfBuilder = new OtuBuilder(); - otuIfBuilder.setFec(OtuAttributes.Fec.Scfec); - otuIfBuilder.setRate(OTU4.class); + OtuBuilder otuIfBuilder = new OtuBuilder() + .setFec(OtuAttributes.Fec.Scfec) + .setRate(OTU4.class); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -169,23 +171,23 @@ public class OpenRoadmInterface121 { throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node % and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node % and logical connection port %s", + nodeId, logicalConnPoint)); } InterfaceBuilder oduInterfaceBldr = createGenericInterfaceBuilder(portMap, OtnOdu.class, logicalConnPoint + "-ODU"); oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data - OduBuilder oduIfBuilder = new OduBuilder(); - oduIfBuilder.setRate(ODU4.class); - oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder(); - opuBldr.setPayloadType("07"); - opuBldr.setExpPayloadType("07"); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType("07") + .setExpPayloadType("07"); + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setOpu(opuBldr.build()); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -217,16 +219,16 @@ public class OpenRoadmInterface121 { Mapping portMap = portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node %s and logical connection port %s", + nodeId, logicalConnPoint)); } // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, createOpenRoadmOchInterfaceName(logicalConnPoint, waveNumber)); // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); + OchBuilder ocIfBuilder = new OchBuilder().setWavelengthNumber(waveNumber); // Add supporting OMS interface if (portMap.getSupportingOms() != null) { @@ -252,16 +254,17 @@ public class OpenRoadmInterface121 { OchAttributes.ModulationFormat format) throws OpenRoadmInterfaceException { Mapping portMap = this.portMapping.getMapping(nodeId, logicalConnPoint); if (portMap == null) { - throw new OpenRoadmInterfaceException(String.format("Unable to get mapping from PortMapping for node %s and" - + " logical connection port %s", nodeId, logicalConnPoint)); + throw new OpenRoadmInterfaceException(String.format( + "Unable to get mapping from PortMapping for node %s and logical connection port %s", + nodeId, logicalConnPoint)); } // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - ocIfBuilder.setWavelengthNumber(waveNumber); - ocIfBuilder.setModulationFormat(format); - ocIfBuilder.setRate(R100G.class); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); + OchBuilder ocIfBuilder = new OchBuilder() + .setWavelengthNumber(waveNumber) + .setModulationFormat(format) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java index bc77eee11..6d798f2fb 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/openroadminterface/OpenRoadmInterface221.java @@ -87,9 +87,9 @@ public class OpenRoadmInterface221 { } // Ethernet interface specific data - EthernetBuilder ethIfBuilder = new EthernetBuilder(); - ethIfBuilder.setFec(EthAttributes.Fec.Off); - ethIfBuilder.setSpeed(100000L); + EthernetBuilder ethIfBuilder = new EthernetBuilder() + .setFec(EthAttributes.Fec.Off) + .setSpeed(100000L); InterfaceBuilder ethInterfaceBldr = createGenericInterfaceBuilder(portMap, EthernetCsmacd.class, logicalConnPoint + "-ETHERNET"); @@ -152,18 +152,19 @@ public class OpenRoadmInterface221 { // TODO : Check this method InterfaceBuilder mcInterfaceBldr = createGenericInterfaceBuilder(portMap, - MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber); - mcInterfaceBldr.setSupportingInterface(portMap.getSupportingOms()); + MediaChannelTrailTerminationPoint.class, logicalConnPoint + "-mc" + "-" + waveNumber) + .setSupportingInterface(portMap.getSupportingOms()); - McTtpBuilder mcTtpBuilder = new McTtpBuilder(); - mcTtpBuilder.setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStart()))); - mcTtpBuilder.setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStop()))); + McTtpBuilder mcTtpBuilder = new McTtpBuilder() + .setMinFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStart()))) + .setMaxFreq(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getStop()))); // Create Interface1 type object required for adding as augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder interface1Builder = - new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder(); - interface1Builder.setMcTtp(mcTtpBuilder.build()); + new org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1Builder() + .setMcTtp(mcTtpBuilder.build()); + mcInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.media.channel.interfaces.rev181019.Interface1.class, interface1Builder.build()); @@ -197,17 +198,15 @@ public class OpenRoadmInterface221 { nmcInterfaceBldr.setSupportingInterface(logicalConnPoint + "-mc" + "-" + waveNumber); } - NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder(); - - nmcCtpIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - nmcCtpIfBuilder.setWidth(FrequencyGHz.getDefaultInstance("40")); + NmcCtpBuilder nmcCtpIfBuilder = new NmcCtpBuilder() + .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) + .setWidth(FrequencyGHz.getDefaultInstance("40")); // Create Interface1 type object required for adding as augmentation org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1Builder - nmcCtpI1fBuilder = new - org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 - .Interface1Builder(); - nmcCtpI1fBuilder.setNmcCtp(nmcCtpIfBuilder.build()); + nmcCtpI1fBuilder = + new org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019 + .Interface1Builder().setNmcCtp(nmcCtpIfBuilder.build()); nmcInterfaceBldr.addAugmentation( org.opendaylight.yang.gen.v1.http.org.openroadm.network.media.channel.interfaces.rev181019.Interface1.class, nmcCtpI1fBuilder.build()); @@ -231,11 +230,10 @@ public class OpenRoadmInterface221 { } // OCH interface specific data - OchBuilder ocIfBuilder = new OchBuilder(); - - ocIfBuilder.setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))); - ocIfBuilder.setRate(R100G.class); - ocIfBuilder.setTransmitPower(new PowerDBm(new BigDecimal("-5"))); + OchBuilder ocIfBuilder = new OchBuilder() + .setFrequency(FrequencyTHz.getDefaultInstance(String.valueOf(fixedFlex.getCenterFrequency()))) + .setRate(R100G.class) + .setTransmitPower(new PowerDBm(new BigDecimal("-5"))); // Create generic interface InterfaceBuilder ochInterfaceBldr = createGenericInterfaceBuilder(portMap, OpticalChannel.class, @@ -273,15 +271,14 @@ public class OpenRoadmInterface221 { oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data - OduBuilder oduIfBuilder = new OduBuilder(); - oduIfBuilder.setRate(ODU4.class); - oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated); - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder(); - opuBldr.setPayloadType(PayloadTypeDef.getDefaultInstance("07")); - opuBldr.setExpPayloadType(PayloadTypeDef.getDefaultInstance("07")); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("07")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("07")); + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated) + .setOpu(opuBldr.build()); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class @@ -333,15 +330,15 @@ public class OpenRoadmInterface221 { private InterfaceBuilder createGenericInterfaceBuilder(Mapping portMap, Class type, String key) { - InterfaceBuilder interfaceBuilder = new InterfaceBuilder(); - interfaceBuilder.setDescription(" TBD "); - interfaceBuilder.setCircuitId(" TBD "); - interfaceBuilder.setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()); - interfaceBuilder.setSupportingPort(portMap.getSupportingPort()); - interfaceBuilder.setAdministrativeState(AdminStates.InService); - interfaceBuilder.setType(type); - interfaceBuilder.setName(key); - interfaceBuilder.withKey(new InterfaceKey(key)); + InterfaceBuilder interfaceBuilder = new InterfaceBuilder() + .setDescription(" TBD ") + .setCircuitId(" TBD ") + .setSupportingCircuitPackName(portMap.getSupportingCircuitPackName()) + .setSupportingPort(portMap.getSupportingPort()) + .setAdministrativeState(AdminStates.InService) + .setType(type) + .setName(key) + .withKey(new InterfaceKey(key)); return interfaceBuilder; } @@ -449,20 +446,19 @@ public class OpenRoadmInterface221 { oduInterfaceBldr.setSupportingInterface(supportingOtuInterface); // ODU interface specific data - OduBuilder oduIfBuilder = new OduBuilder(); - oduIfBuilder.setRate(ODU4.class); - oduIfBuilder.setMonitoringMode(OduAttributes.MonitoringMode.Terminated); + OduBuilder oduIfBuilder = new OduBuilder() + .setRate(ODU4.class) + .setMonitoringMode(OduAttributes.MonitoringMode.Terminated); if (!nodeId.toLowerCase().contains("eci")) { oduIfBuilder.setTxDapi(""); oduIfBuilder.setTxSapi(""); } - oduIfBuilder.setOduFunction(ODUTTP.class); - // Set Opu attributes - OpuBuilder opuBldr = new OpuBuilder(); - opuBldr.setPayloadType(PayloadTypeDef.getDefaultInstance("21")); - opuBldr.setExpPayloadType(PayloadTypeDef.getDefaultInstance("21")); - oduIfBuilder.setOpu(opuBldr.build()); + OpuBuilder opuBldr = new OpuBuilder() + .setPayloadType(PayloadTypeDef.getDefaultInstance("21")) + .setExpPayloadType(PayloadTypeDef.getDefaultInstance("21")); + oduIfBuilder.setOduFunction(ODUTTP.class) + .setOpu(opuBldr.build()); // Create Interface1 type object required for adding as augmentation // TODO look at imports of different versions of class diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java index f695c36ad..23d08b672 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/DeviceRendererServiceImpl.java @@ -143,7 +143,6 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { } if ((srcTp != null) && srcTp.contains(StringConstants.NETWORK_TOKEN)) { crossConnectFlag++; - Mapping mapping = this.portMapping.getMapping(nodeId,srcTp); // create OpenRoadm Xponder Line Interfaces String supportingOchInterface = this.openRoadmInterfaceFactory.createOpenRoadmOchInterface( nodeId, srcTp, waveNumber, ModulationFormat.DpQpsk); @@ -153,6 +152,7 @@ public class DeviceRendererServiceImpl implements DeviceRendererService { createdOtuInterfaces.add(supportingOtuInterface); createdOduInterfaces.add(this.openRoadmInterfaceFactory.createOpenRoadmOdu4Interface(nodeId, srcTp, supportingOtuInterface)); + Mapping mapping = this.portMapping.getMapping(nodeId,srcTp); if (mapping != null && mapping.getXponderType() != null && (mapping.getXponderType().getIntValue() == 3 || mapping.getXponderType().getIntValue() == 2)) { diff --git a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java index a14ac0349..8bb68e95c 100644 --- a/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java +++ b/renderer/src/main/java/org/opendaylight/transportpce/renderer/provisiondevice/OtnDeviceRendererServiceImpl.java @@ -116,6 +116,10 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { break; default: LOG.error("service rate {} not managed yet", input.getServiceRate()); + String result = input.getServiceRate() + " is not supported"; + results.add(result); + success.set(false); + return; } List intToDelete = this.crossConnect.deleteCrossConnect(nodeId, connectionNumber, true); if (intToDelete != null) { @@ -203,30 +207,37 @@ public class OtnDeviceRendererServiceImpl implements OtnDeviceRendererService { //check if the node is mounted or not? List createdEthInterfaces = new ArrayList<>(); List createdOduInterfaces = new ArrayList<>(); - if ("1G".equals(input.getServiceRate())) { - LOG.info("Input service is 1G"); - createdEthInterfaces.add( - openRoadmInterfaceFactory.createOpenRoadmEth1GInterface(node.getNodeId(), node.getClientTp())); - createdOduInterfaces.add( - //suppporting interface?, payload ? - openRoadmInterfaceFactory.createOpenRoadmOdu0Interface(node.getNodeId(), node.getClientTp(), - input.getServiceName(), "07", false, input.getTribPortNumber(), input.getTribSlot())); - createdOduInterfaces.add( - openRoadmInterfaceFactory.createOpenRoadmOdu0Interface(node.getNodeId(), node.getNetworkTp(), - input.getServiceName(), "07", true, input.getTribPortNumber(), input.getTribSlot())); - } else if ("10G".equals(input.getServiceRate())) { - LOG.info("Input service is 10G"); - createdEthInterfaces.add( - openRoadmInterfaceFactory.createOpenRoadmEth10GInterface(node.getNodeId(), node.getClientTp())); - createdOduInterfaces.add( - //suppporting interface?, payload ? - openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getClientTp(), - input.getServiceName(),"03", false ,input.getTribPortNumber(),input.getTribSlot())); - createdOduInterfaces.add( - // supporting interface? payload ? - openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getNetworkTp(), - input.getServiceName(),"03" , true ,input.getTribPortNumber(),input.getTribSlot())); + switch (input.getServiceRate()) { + case("1G"): + LOG.info("Input service is 1G"); + createdEthInterfaces.add( + openRoadmInterfaceFactory.createOpenRoadmEth1GInterface(node.getNodeId(), node.getClientTp())); + createdOduInterfaces.add( + //suppporting interface?, payload ? + openRoadmInterfaceFactory.createOpenRoadmOdu0Interface(node.getNodeId(), node.getClientTp(), + input.getServiceName(), "07", false, input.getTribPortNumber(), input.getTribSlot())); + createdOduInterfaces.add( + openRoadmInterfaceFactory.createOpenRoadmOdu0Interface(node.getNodeId(), node.getNetworkTp(), + input.getServiceName(), "07", true, input.getTribPortNumber(), input.getTribSlot())); + break; + case("10G"): + LOG.info("Input service is 10G"); + createdEthInterfaces.add( + openRoadmInterfaceFactory.createOpenRoadmEth10GInterface(node.getNodeId(), node.getClientTp())); + createdOduInterfaces.add( + //suppporting interface?, payload ? + openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getClientTp(), + input.getServiceName(),"03", false ,input.getTribPortNumber(),input.getTribSlot())); + createdOduInterfaces.add( + // supporting interface? payload ? + openRoadmInterfaceFactory.createOpenRoadmOdu2eInterface(node.getNodeId(), node.getNetworkTp(), + input.getServiceName(),"03" , true ,input.getTribPortNumber(),input.getTribSlot())); + break; + default: + LOG.error("service rate {} not managed yet", input.getServiceRate()); + return; } + //implement cross connect List createdConnections = new ArrayList<>(); if (!createdOduInterfaces.isEmpty()) { diff --git a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java index 4ce85b0a6..e788fc9be 100644 --- a/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java +++ b/renderer/src/test/java/org/opendaylight/transportpce/renderer/provisiondevice/RendererServiceOperationsImplDeleteTest.java @@ -148,7 +148,8 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest { = this.rendererServiceOperations.serviceDelete(serviceDeleteInputBuilder.build()).get(); Assert.assertEquals(ResponseCodes.RESPONSE_OK, serviceDeleteOutput.getConfigurationResponseCommon().getResponseCode()); - Mockito.verify(this.crossConnect, Mockito.times(2)).deleteCrossConnect(Mockito.any(), Mockito.any(), Mockito.eq(false)); + Mockito.verify(this.crossConnect, Mockito.times(2)) + .deleteCrossConnect(Mockito.any(), Mockito.any(), Mockito.eq(false)); } @Test @@ -159,7 +160,8 @@ public class RendererServiceOperationsImplDeleteTest extends AbstractTest { = this.rendererServiceOperations.serviceDelete(serviceDeleteInputBuilder.build()).get(); Assert.assertEquals(ResponseCodes.RESPONSE_FAILED, serviceDeleteOutput.getConfigurationResponseCommon().getResponseCode()); - Mockito.verify(this.crossConnect, Mockito.times(0)).deleteCrossConnect(Mockito.any(), Mockito.any(), Mockito.eq(false)); + Mockito.verify(this.crossConnect, Mockito.times(0)) + .deleteCrossConnect(Mockito.any(), Mockito.any(), Mockito.eq(false)); } @Test -- 2.36.6