package org.opendaylight.transportpce.olm.power;
-import java.math.BigDecimal;
-import java.util.Arrays;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.HashMap;
import java.util.Map;
import java.util.Optional;
-import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
import org.mockito.ArgumentMatchers;
import org.mockito.Mockito;
import org.opendaylight.mdsal.binding.api.MountPoint;
import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl;
import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl121;
import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl221;
+import org.opendaylight.transportpce.common.crossconnect.CrossConnectImpl710;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
import org.opendaylight.transportpce.common.device.DeviceTransactionManagerImpl;
import org.opendaylight.transportpce.common.mapping.MappingUtils;
import org.opendaylight.transportpce.common.mapping.PortMappingImpl;
import org.opendaylight.transportpce.common.mapping.PortMappingVersion121;
import org.opendaylight.transportpce.common.mapping.PortMappingVersion221;
+import org.opendaylight.transportpce.common.mapping.PortMappingVersion710;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaceException;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfaces;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl121;
import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl221;
+import org.opendaylight.transportpce.common.openroadminterfaces.OpenRoadmInterfacesImpl710;
import org.opendaylight.transportpce.olm.stub.MountPointServiceStub;
import org.opendaylight.transportpce.olm.stub.MountPointStub;
import org.opendaylight.transportpce.olm.util.OlmPowerServiceRpcImplUtil;
import org.opendaylight.transportpce.olm.util.OlmUtils;
import org.opendaylight.transportpce.test.AbstractTest;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev170418.ServicePowerSetupInput;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.Network;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.Nodes;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.NodesKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.Mapping;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingBuilder;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.MappingKey;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfoBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.olm.rev210618.ServicePowerSetupInput;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.OpenroadmNodeVersion;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.Mapping;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.mapping.MappingKey;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.Nodes;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.NodesBuilder;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev220922.network.nodes.NodeInfoBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.OpticalControlMode;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.RatioDB;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev181019.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.interfaces.grp.InterfaceBuilder;
-import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.device.types.rev191129.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.Interface1Builder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.Ots;
import org.opendaylight.yang.gen.v1.http.org.openroadm.optical.transport.interfaces.rev161014.ots.container.OtsBuilder;
-import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PowerMockIgnore;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
+import org.opendaylight.yangtools.yang.common.Decimal64;
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({OlmUtils.class,PowerMgmtVersion121.class})
-@PowerMockIgnore("org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.*")
+@Disabled
public class PowerMgmtPowerMockTest extends AbstractTest {
private MountPoint mountPoint;
private PowerMgmt powerMgmt;
private CrossConnectImpl121 crossConnectImpl121;
private CrossConnectImpl221 crossConnectImpl22;
+ private CrossConnectImpl710 crossConnectImpl710;
private MappingUtils mappingUtils;
private OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121;
private OpenRoadmInterfacesImpl221 openRoadmInterfacesImpl22;
+ private OpenRoadmInterfacesImpl710 openRoadmInterfacesImpl710;
+ private PortMappingVersion710 portMappingVersion710;
private PortMappingVersion221 portMappingVersion22;
private PortMappingVersion121 portMappingVersion121;
- @Before
- public void setUp() {
- this.mountPoint = new MountPointStub(this.getDataBroker());
+ @BeforeEach
+ void setUp() {
+ this.mountPoint = new MountPointStub(getDataBroker());
this.mountPointService = new MountPointServiceStub(mountPoint);
this.mappingUtils = new MappingUtilsImpl(getDataBroker());
this.mappingUtils = Mockito.spy(new MappingUtilsImpl(getDataBroker()));
this.crossConnectImpl121 = new CrossConnectImpl121(deviceTransactionManager);
this.crossConnectImpl22 = new CrossConnectImpl221(deviceTransactionManager);
this.crossConnect = new CrossConnectImpl(deviceTransactionManager, this.mappingUtils, this.crossConnectImpl121,
- this.crossConnectImpl22);
+ this.crossConnectImpl22, this.crossConnectImpl710);
+ this.portMappingVersion22 = new PortMappingVersion221(getDataBroker(), deviceTransactionManager);
+ this.portMappingVersion121 = new PortMappingVersion121(getDataBroker(), deviceTransactionManager);
+ this.portMappingVersion710 = new PortMappingVersion710(getDataBroker(), deviceTransactionManager);
+ this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion710,
+ this.portMappingVersion22, this.portMappingVersion121);
this.openRoadmInterfacesImpl121 = new OpenRoadmInterfacesImpl121(deviceTransactionManager);
- this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager);
+ this.openRoadmInterfacesImpl22 = new OpenRoadmInterfacesImpl221(deviceTransactionManager, this.portMapping);
+ this.openRoadmInterfacesImpl710 = new OpenRoadmInterfacesImpl710(deviceTransactionManager, this.portMapping);
this.openRoadmInterfaces = new OpenRoadmInterfacesImpl((this.deviceTransactionManager),
- this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22);
+ this.mappingUtils,this.openRoadmInterfacesImpl121,this.openRoadmInterfacesImpl22,
+ this.openRoadmInterfacesImpl710);
this.openRoadmInterfaces = Mockito.spy(this.openRoadmInterfaces);
- this.portMappingVersion22 =
- new PortMappingVersion221(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
- this.portMappingVersion121 =
- new PortMappingVersion121(getDataBroker(), deviceTransactionManager, this.openRoadmInterfaces);
- this.portMapping = new PortMappingImpl(getDataBroker(), this.portMappingVersion22, this.portMappingVersion121);
this.portMapping = Mockito.spy(this.portMapping);
- this.powerMgmt = new PowerMgmtImpl(this.getDataBroker(), this.openRoadmInterfaces, this.crossConnect,
- this.deviceTransactionManager);
+ this.powerMgmt = new PowerMgmtImpl(this.openRoadmInterfaces, this.crossConnect,
+ this.deviceTransactionManager, this.portMapping, 1000, 1000);
}
@Test
- public void testSetPowerMockingUtil() {
- PowerMockito.mockStatic(OlmUtils.class);
- PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg()));
+ void testSetPowerMockingUtil() {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getXpdrNodesFromNodesBuilderDeg());
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2();
boolean output = this.powerMgmt.setPower(input);
- Assert.assertEquals(false, output);
+ assertEquals(false, output);
}
@Test
- public void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException {
- PowerMockito.mockStatic(OlmUtils.class);
- PowerMockito.mockStatic(PowerMgmtVersion121.class);
- PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork()));
+ void testSetPowerMockingUtilNetwokType() throws OpenRoadmInterfaceException {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.mockStatic(PowerMgmtVersion121.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getXpdrNodesFromNodesBuilderNetwork());
Map<String, Double> txPowerRangeMap = new HashMap<>();
- PowerMockito.when(PowerMgmtVersion121.getXponderPowerRange(
+ Mockito.when(PowerMgmtVersion121.getXponderPowerRange(
Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
ArgumentMatchers.eq(deviceTransactionManager)))
.thenReturn(txPowerRangeMap);
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2();
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class);
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
.thenReturn(Optional.empty());
PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect);
boolean output = powerMgmtImpl.setPower(input);
- Assert.assertEquals(true, output);
+ assertEquals(true, output);
}
@Test
- public void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException {
- PowerMockito.mockStatic(OlmUtils.class);
- PowerMockito.mockStatic(PowerMgmtVersion121.class);
- PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderNetwork()));
+ void testSetPowerMockingUtilNetwokTypeMoreThanOneNode() throws OpenRoadmInterfaceException {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.mockStatic(PowerMgmtVersion121.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getXpdrNodesFromNodesBuilderNetwork());
Map<String, Double> txPowerRangeMap = new HashMap<>();
- PowerMockito.when(PowerMgmtVersion121
+ Mockito.when(PowerMgmtVersion121
.getXponderPowerRange(Mockito.anyString(), Mockito.anyString(), Mockito.anyString(),
ArgumentMatchers.eq(deviceTransactionManager)))
.thenReturn(txPowerRangeMap);
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput2();
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class);
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
.thenReturn(Optional.empty());
PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect);
boolean output = powerMgmtImpl.setPower(input);
- Assert.assertEquals(true, output);
+ assertEquals(true, output);
}
@Test
- public void testSetPowerXpdrNodes() {
- PowerMockito.mockStatic(OlmUtils.class);
- PowerMockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getXpdrNodesFromNodesBuilderDeg()));
+ void testSetPowerXpdrNodes() {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getXpdrNodesFromNodesBuilderDeg());
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
boolean output = this.powerMgmt.setPower(input);
- Assert.assertEquals(true, output);
+ assertEquals(true, output);
}
@Test
- public void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException {
- PowerMockito.mockStatic(OlmUtils.class);
- Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+ void testSetPowerRdmNodesReturnInterfaceEmpty() throws OpenRoadmInterfaceException {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getRdmNodesFromNodesBuilder());
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class);
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
.thenReturn(Optional.empty());
PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect);
boolean output = powerMgmtImpl.setPower(input);
- Assert.assertEquals(false, output);
+ assertEquals(false, output);
}
@Test
- public void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException {
- PowerMockito.mockStatic(OlmUtils.class);
- Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+ void testSetPowerRdmNodesThrowsException() throws OpenRoadmInterfaceException {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getRdmNodesFromNodesBuilder());
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class);
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString()))
.thenThrow(new OpenRoadmInterfaceException("error thrown by unit tests "));
PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,this.crossConnect);
boolean output = powerMgmtImpl.setPower(input);
- Assert.assertEquals(false, output);
+ assertEquals(false, output);
}
@Test
- public void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException {
- PowerMockito.mockStatic(OlmUtils.class);
- Mockito.when(OlmUtils.getNode(Mockito.anyString(), ArgumentMatchers.eq(getDataBroker())))
- .thenReturn(Optional.of(getRdmNodesFromNodesBuilder()));
+ void testSetPowerRdmNodesReturnInterface() throws OpenRoadmInterfaceException {
+ Mockito.mockStatic(OlmUtils.class);
+ Mockito.when(this.portMapping.getNode(Mockito.anyString()))
+ .thenReturn(getRdmNodesFromNodesBuilder());
ServicePowerSetupInput input = OlmPowerServiceRpcImplUtil.getServicePowerSetupInput3();
- OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = PowerMockito.mock(OpenRoadmInterfacesImpl121.class);
+ OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy = Mockito.mock(OpenRoadmInterfacesImpl121.class);
- Ots ots = new OtsBuilder().setSpanLossTransmit(new RatioDB(new BigDecimal(23))).build();
+ Ots ots = new OtsBuilder().setSpanLossTransmit(new RatioDB(Decimal64.valueOf("23"))).build();
Interface1Builder intf1Builder = new Interface1Builder();
Mockito.when(openRoadmInterfacesImpl121Spy.getInterface(Mockito.anyString(), Mockito.anyString())).thenReturn(
- Optional.of(new InterfaceBuilder().addAugmentation(Interface1.class, intf1Builder.setOts(ots).build())
+ Optional.of(new InterfaceBuilder().addAugmentation(intf1Builder.setOts(ots).build())
.build()));
CrossConnect crossConnectMock = Mockito.mock(CrossConnectImpl.class);
Mockito.when(crossConnectMock
- .setPowerLevel(Mockito.anyString(), ArgumentMatchers.eq(OpticalControlMode.Power), Mockito.any(),
+ .setPowerLevel(Mockito.anyString(), OpticalControlMode.Power.getName(), Mockito.any(),
Mockito.anyString())).thenReturn(true);
PowerMgmtImpl powerMgmtImpl = getNewPowerMgmt(openRoadmInterfacesImpl121Spy,crossConnectMock);
boolean output = powerMgmtImpl.setPower(input);
- Assert.assertEquals(true, output);
+ assertEquals(true, output);
}
private PowerMgmtImpl getNewPowerMgmt(OpenRoadmInterfacesImpl121 openRoadmInterfacesImpl121Spy,
CrossConnect crossConnectMock) {
OpenRoadmInterfacesImpl openRoadmInterfacesSpy = new OpenRoadmInterfacesImpl((this.deviceTransactionManager),
- this.mappingUtils, openRoadmInterfacesImpl121Spy, this.openRoadmInterfacesImpl22);
- openRoadmInterfacesSpy = PowerMockito.spy(openRoadmInterfacesSpy);
- return new PowerMgmtImpl(this.getDataBroker(), openRoadmInterfacesSpy, crossConnectMock,
- this.deviceTransactionManager);
+ this.mappingUtils, openRoadmInterfacesImpl121Spy, this.openRoadmInterfacesImpl22,
+ this.openRoadmInterfacesImpl710);
+ openRoadmInterfacesSpy = Mockito.spy(openRoadmInterfacesSpy);
+ return new PowerMgmtImpl(openRoadmInterfacesSpy, crossConnectMock,
+ this.deviceTransactionManager, this.portMapping, 0, 0);
}
private Nodes getXpdrNodesFromNodesBuilderDeg() {
MappingBuilder mappingBuilder = getMappingBuilderDeg();
+ Mapping mapping = mappingBuilder.build();
return new NodesBuilder().setNodeId("node 1")
.setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr).build())
- .setMapping(Arrays.asList(mappingBuilder.build()))
+ .setMapping(Map.of(mapping.key(),mapping))
.build();
}
private Nodes getXpdrNodesFromNodesBuilderNetwork() {
MappingBuilder mappingBuilder = getMappingBuilderNetWork();
+ Mapping mapping = mappingBuilder.build();
return new NodesBuilder().setNodeId("node 1")
.setNodeInfo(new NodeInfoBuilder().setNodeType(NodeTypes.Xpdr)
- .setOpenroadmVersion(NodeInfo.OpenroadmVersion._121)
+ .setOpenroadmVersion(OpenroadmNodeVersion._121)
.build())
- .setMapping(Arrays.asList(mappingBuilder.build()))
+ .setMapping(Map.of(mapping.key(),mapping))
.build();
}
private Nodes getRdmNodesFromNodesBuilder() {
MappingBuilder mappingBuilder = getMappingBuilderDeg();
-
+ Mapping mapping = mappingBuilder.build();
return new NodesBuilder().setNodeId("node 1").setNodeInfo(
new NodeInfoBuilder().setNodeType(NodeTypes.Rdm)
- .setOpenroadmVersion(NodeInfo.OpenroadmVersion._121)
+ .setOpenroadmVersion(OpenroadmNodeVersion._121)
.build())
- .setMapping(Arrays.asList(mappingBuilder.build()))
+ .setMapping(Map.of(mapping.key(),mapping))
.build();
}
private MappingBuilder getMappingBuilderDeg() {
- MappingBuilder mappingBuilder = new MappingBuilder();
- mappingBuilder.withKey(new MappingKey("deg"));
- mappingBuilder.setLogicalConnectionPoint("logicalConnPoint");
- mappingBuilder.setSupportingOts("OTS");
- mappingBuilder.setSupportingCircuitPackName("2/0");
- mappingBuilder.setSupportingOms("OMS");
- mappingBuilder.setSupportingPort("8080");
- mappingBuilder.setSupportingCircuitPackName("circuit1");
- InstanceIdentifier<Mapping> portMappingIID =
- InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1"))
- .child(Mapping.class, new MappingKey("deg")).build();
- return mappingBuilder;
+ return new MappingBuilder()
+ .withKey(new MappingKey("deg"))
+ .setLogicalConnectionPoint("logicalConnPoint")
+ .setSupportingOts("OTS")
+ .setSupportingCircuitPackName("2/0")
+ .setSupportingOms("OMS")
+ .setSupportingPort("8080")
+ .setSupportingCircuitPackName("circuit1");
}
private MappingBuilder getMappingBuilderNetWork() {
- MappingBuilder mappingBuilder = new MappingBuilder();
- mappingBuilder.withKey(new MappingKey("network"));
- mappingBuilder.setLogicalConnectionPoint("logicalConnPoint");
- mappingBuilder.setSupportingOts("OTS");
- mappingBuilder.setSupportingCircuitPackName("2/0");
- mappingBuilder.setSupportingOms("OMS");
- mappingBuilder.setSupportingPort("8080");
- mappingBuilder.setSupportingCircuitPackName("circuit1");
- InstanceIdentifier<Mapping> portMappingIID =
- InstanceIdentifier.builder(Network.class).child(Nodes.class, new NodesKey("node 1"))
- .child(Mapping.class, new MappingKey("network")).build();
- return mappingBuilder;
+ return new MappingBuilder()
+ .withKey(new MappingKey("network"))
+ .setLogicalConnectionPoint("logicalConnPoint")
+ .setSupportingOts("OTS")
+ .setSupportingCircuitPackName("2/0")
+ .setSupportingOms("OMS")
+ .setSupportingPort("8080")
+ .setSupportingCircuitPackName("circuit1");
}
-
}