import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.transportpce.common.NetworkUtils;
import org.opendaylight.transportpce.common.Timeouts;
import org.opendaylight.transportpce.common.device.DeviceTransactionManager;
+import org.opendaylight.transportpce.common.network.NetworkTransactionService;
import org.opendaylight.transportpce.networkmodel.dto.NodeData;
import org.opendaylight.transportpce.networkmodel.dto.TopologyShard;
import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Node1Builder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.TerminationPoint1Builder;
+import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.link.OMSAttributesBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.network.types.OpenroadmTopologyBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.DegreeAttributesBuilder;
import org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.network.node.SrgAttributesBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class OpenRoadmTopology {
+public class OpenRoadmTopology121 {
- private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmTopology.class);
+ private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmTopology121.class);
private static final int DEFAULT_PORT_DIRECTION = -1;
private static final int MAX_DEGREE = 20;
private static final int MAX_SRG = 20;
- private final DataBroker dataBroker;
+ private NetworkTransactionService networkTransactionService;
private final DeviceTransactionManager deviceTransactionManager;
- public OpenRoadmTopology(DataBroker dataBroker, DeviceTransactionManager deviceTransactionManager) {
- this.dataBroker = dataBroker;
+ public OpenRoadmTopology121(NetworkTransactionService networkTransactionService,
+ DeviceTransactionManager deviceTransactionManager) {
+ this.networkTransactionService = networkTransactionService;
this.deviceTransactionManager = deviceTransactionManager;
}
/**
* This public method creates the OpenROADM Topology Layer and posts it to
* the controller.
- *
- * @param controllerdb controller databroker
*/
- public void createTopoLayer(DataBroker controllerdb) {
+ public void createTopoLayer() {
try {
Network openRoadmTopology = createOpenRoadmTopology();
InstanceIdentifierBuilder<Network> nwIID = InstanceIdentifier.builder(Network.class,
- new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)));
- WriteTransaction wrtx = controllerdb.newWriteOnlyTransaction();
- wrtx.put(LogicalDatastoreType.CONFIGURATION, nwIID.build(), openRoadmTopology);
- wrtx.submit().get(1, TimeUnit.SECONDS);
+ new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)));
+ this.networkTransactionService.put(LogicalDatastoreType.CONFIGURATION, nwIID.build(), openRoadmTopology);
+ this.networkTransactionService.submit().get(1, TimeUnit.SECONDS);
LOG.info("OpenRoadm-Topology created successfully.");
} catch (ExecutionException | TimeoutException | InterruptedException e) {
LOG.warn("Failed to create OpenRoadm-Topology", e);
int portDirectionEnum = DEFAULT_PORT_DIRECTION;
InstanceIdentifier<Info> infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class);
- java.util.Optional<Info> deviceInfoOpt = this.deviceTransactionManager.getDataFromDevice(nodeId,
- LogicalDatastoreType.OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ java.util.Optional<Info> deviceInfoOpt =
+ deviceTransactionManager.getDataFromDevice(nodeId, LogicalDatastoreType.OPERATIONAL, infoIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
Info deviceInfo;
if (deviceInfoOpt.isPresent()) {
deviceInfo = deviceInfoOpt.get();
if (NodeTypes.Rdm.equals(deviceInfo.getNodeType())) {
/*
- * Adding Degree Node Get Degree Number -> x
- * then get connection ports
- * then find the port directions to decide whether TX/RX/TXRX
- * Get value for max degree from info subtree, required for iteration
+ * Adding Degree Node Get Degree Number -> x then get connection ports then find the port directions
+ * to decide whether TX/RX/TXRX Get value for max degree from info subtree, required for iteration
* if not present assume to be 20 (temporary)
*/
portDirectionEnum = nodeData.getPortDirectionEnum();
nodes.add(tempNode.build());
degreeCounter++;
- } else {
- // null returned if Degree number= degreeCounter not present in the device
+ }
+ // null returned if Degree number= degreeCounter not present in the device
+ else {
break;
}
}
}
numOfSrgs = srgCounter - 1;
+
LOG.info("adding links numOfDegrees={} numOfSrgs={}", numOfDegrees, numOfSrgs);
List<Link> links = new ArrayList<>();
links.addAll(createExpressLinks(nodeId, numOfDegrees, portDirectionEnum));
return new TopologyShard(nodes, links);
} else if (NodeTypes.Xpdr.equals(deviceInfo.getNodeType())) {
// Check if node is XPONDER
- XponderPortNumber portNums = getNoOfPorts(nodeId);
+ Integer clientport = getNoOfClientPorts(nodeId);
List<Link> links = new ArrayList<>();
- NodeBuilder tempNode = createXpdr(portNums.getNumOfClientPorts(), portNums.getNumOfLinePorts(), nodeId);
- nodes.add(tempNode.build());
+ Integer clientCounter = 1;
+ Integer lineCounter = 1;
+ while (clientCounter <= clientport) {
+ NodeBuilder tempNode = createXpdr(clientCounter, lineCounter, nodeId);
+ if (tempNode == null) {
+ break;
+ }
+ nodes.add(tempNode.build());
+ clientCounter++;
+ lineCounter++;
+ LOG.info("Entered this loop");
+ }
return new TopologyShard(nodes, links);
}
}
/**
- * This private method gets the list of circuit packs on a xponder.
- * For each circuit pack on a Xponder, it does a get on circuit-pack subtree with
- * circuit-pack-name as key in order to get the list of ports.
- * It then iterates over the list of ports to get ports with port-qual as
+ * This private method gets the list of circuit packs on a xponder. For each circuit pack on a
+ * Xponder, it does a get on circuit-pack subtree with circuit-pack-name as key in order to get the
+ * list of ports. It then iterates over the list of ports to get ports with port-qual as
* xpdr-network/xpdr-client. The line and client ports are saved as:
*
* <p>
* <p>
* 2. CLNTn
*/
- private XponderPortNumber getNoOfPorts(String deviceId) {
-
- XponderPortNumber xponderPortNumber = new XponderPortNumber();
+ private int getNoOfClientPorts(String deviceId) {
// Creating for Xponder Line and Client Ports
InstanceIdentifier<OrgOpenroadmDevice> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class);
- Optional<OrgOpenroadmDevice> deviceObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
- LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ Optional<OrgOpenroadmDevice> deviceObject =
+ deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
// Variable to keep track of number of client ports
- int client = 0;
- int line = 0;
+ int client = 1;
if (deviceObject.isPresent()) {
for (CircuitPacks cp : deviceObject.get().getCircuitPacks()) {
if (cp.getPorts() != null) {
if (port.getPortQual() != null) {
if (port.getPortQual().getIntValue() == 4) {
client++;
- } else if (port.getPortQual().getIntValue() == 3) {
- line++;
}
}
}
}
}
} else {
- return xponderPortNumber;
+ return 0;
}
- xponderPortNumber.setNumOfClientPorts(client);
- xponderPortNumber.setNumOfLinePorts(line);
- return xponderPortNumber;
+ return client;
}
private NodeBuilder createXpdr(Integer clientCounter, Integer lineCounter, String nodeId) {
node1bldr.setNodeType(OpenroadmNodeType.XPONDER);
List<TerminationPoint> tpList = new ArrayList<>();
String nodeIdtopo = new StringBuilder().append(nodeId).append("-XPDR1").toString();
- // Ad degree node specific augmentation
+
+
nodebldr.setNodeId(new NodeId(nodeIdtopo));
nodebldr.withKey(new NodeKey(new NodeId(nodeIdtopo)));
nodebldr.addAugmentation(Node1.class, node1bldr.build());
while (clientCounter != 0) {
- // Create CLNT-TX terminationCannot get available Capabilitiesc
+ // Create CLNT-TX termination
tempTpBldr = createTpBldr("XPDR1-CLIENT" + clientCounter);
tp1Bldr.setTpType(OpenroadmTpType.XPONDERCLIENT);
XpdrClientAttributesBuilder xpdrClntBldr = new XpdrClientAttributesBuilder();
tpList.add(tempTpBldr.build());
lineCounter--;
}
- LOG.info("printing tpList {}", tpList);
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder tpNode1 =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder();
+ LOG.info("printing tpList {}",tpList);
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608
+ .Node1Builder tpNode1 = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf
+ .network.topology.rev150608.Node1Builder();
tpNode1.setTerminationPoint(tpList);
nodebldr.addAugmentation(
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1.class,
- tpNode1.build());
- LOG.info("The nodebldr {}", nodebldr);
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1.class,
+ tpNode1.build());
+ LOG.info("The nodebldr {}",nodebldr);
return nodebldr;
}
+
private NodeData createDegreeNode(String nodeId, int degreeCounter) {
// Create augmentation node to inorder to add degree
Node1Builder node1bldr = new Node1Builder();
// Get connection ports on degree number = degreeCounter in order to get port
// direction
List<ConnectionPorts> degreeConPorts = getDegreePorts(nodeId, degreeCounter);
- if ((degreeConPorts == null) || degreeConPorts.isEmpty()) {
+ if (degreeConPorts == null || degreeConPorts.isEmpty()) {
return null;
}
nodebldr.addAugmentation(Node1.class, node1bldr.build());
// Get Port direction
int portDirectionEnum = getPortDirection(nodeId, degreeConPorts.get(0).getCircuitPackName(),
- degreeConPorts.get(0).getPortName().toString());
+ degreeConPorts.get(0).getPortName().toString());
/*
* if bi-directional then create 2 tp's :
*
* if uni-directional :
*
- * --> TTP-TX --> TTP-RX --> CTP-TX --> CTP-RX
+ * --> TTP-TX
+ * --> TTP-RX
+ * --> CTP-TX
+ * --> CTP-RX
*/
TerminationPoint1Builder tp1Bldr = new TerminationPoint1Builder();
TerminationPointBuilder tempTpBldr;
List<TerminationPoint> tpList = new ArrayList<>();
- if ((portDirectionEnum == 1) || (portDirectionEnum == 2)) {
+ if (portDirectionEnum == 1 || portDirectionEnum == 2) {
// ports are uni Directional on a degree, therefore 4 termination points
// Create TTP-TX termination
tempTpBldr = createTpBldr("DEG" + degreeCounter + "-TTP-RX");
tp1Bldr.setTpType(OpenroadmTpType.DEGREERXTTP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+ tempTpBldr.addAugmentation(TerminationPoint1.class,tp1Bldr.build());
tpList.add(tempTpBldr.build());
// Create CTP-TX termination
tp1Bldr = new TerminationPoint1Builder();
tempTpBldr = createTpBldr("DEG" + degreeCounter + "-CTP-TX");
tp1Bldr.setTpType(OpenroadmTpType.DEGREETXCTP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+ tempTpBldr.addAugmentation(TerminationPoint1.class,tp1Bldr.build());
tpList.add(tempTpBldr.build());
// Create CTP-RX termination
tp1Bldr = new TerminationPoint1Builder();
tempTpBldr = createTpBldr("DEG" + degreeCounter + "-CTP-RX");
tp1Bldr.setTpType(OpenroadmTpType.DEGREERXCTP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+ tempTpBldr.addAugmentation(TerminationPoint1.class,tp1Bldr.build());
tpList.add(tempTpBldr.build());
} else if (portDirectionEnum == 3) {
tp1Bldr = new TerminationPoint1Builder();
tempTpBldr = createTpBldr("DEG" + degreeCounter + "-TTP-TXRX");
tp1Bldr.setTpType(OpenroadmTpType.DEGREETXRXTTP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+ tempTpBldr.addAugmentation(TerminationPoint1.class,tp1Bldr.build());
tpList.add(tempTpBldr.build());
// Create CTP-TXRX termination
tp1Bldr = new TerminationPoint1Builder();
tempTpBldr = createTpBldr("DEG" + degreeCounter + "-CTP-TXRX");
tp1Bldr.setTpType(OpenroadmTpType.DEGREETXRXCTP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
+ tempTpBldr.addAugmentation(TerminationPoint1.class,tp1Bldr.build());
tpList.add(tempTpBldr.build());
}
- org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder tpNode1 =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder();
+ org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608
+ .Node1Builder tpNode1
+ = new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network
+ .topology.rev150608.Node1Builder();
tpNode1.setTerminationPoint(tpList);
return new NodeData(nodebldr, portDirectionEnum);
}
+
private NodeBuilder createSrgNode(String nodeId, int srgCounter, int portDirectionEnum) {
// Create augmentation node to inorder to add degree
Node1Builder node1bldr = new Node1Builder();
NodeBuilder nodebldr = createTopoLayerNode(nodeId);
nodebldr.addAugmentation(Node1.class, node1bldr.build());
+
// Get connection ports on degree number = degreeCounter in order to get port
// direction
int maxPpPorts = getMaxPp(nodeId, srgCounter);
return null;
}
+
String nodeIdtopo = new StringBuilder().append(nodeId).append("-SRG").append(srgCounter).toString();
nodebldr.setNodeId(new NodeId(nodeIdtopo));
List<TerminationPoint> tpList = new ArrayList<>();
TerminationPointBuilder tempTpBldr;
for (int i = 1; i <= maxPpPorts; i++) {
- if ((portDirectionEnum == 1) || (portDirectionEnum == 2)) {
- if (i >= (maxPpPorts / 2)) {
+ if (portDirectionEnum == 1 || portDirectionEnum == 2) {
+ if (i >= maxPpPorts / 2) {
break;
}
// ports are uni Directional on a degree, therefore 4 termination points
- // Create PP-TX termination
+ // Create TTP-TX termination
tempTpBldr = createTpBldr("SRG" + srgCounter + "-PP" + i + "-TX");
tp1Bldr = new TerminationPoint1Builder();
tp1Bldr.setTpType(OpenroadmTpType.SRGTXPP);
tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
tpList.add(tempTpBldr.build());
- // Create PP-RX termination
+ // Create TTP-RX termination
tempTpBldr = createTpBldr("SRG" + srgCounter + "-PP" + i + "-RX");
tp1Bldr = new TerminationPoint1Builder();
tp1Bldr.setTpType(OpenroadmTpType.SRGRXPP);
} else if (portDirectionEnum == 3) {
// Ports are bi directional therefore 2 termination points
- // Create PP-TXRX termination
+ // Create TTP-TXRX termination
tempTpBldr = createTpBldr("SRG" + srgCounter + "-PP" + i + "-TXRX");
tp1Bldr = new TerminationPoint1Builder();
tp1Bldr.setTpType(OpenroadmTpType.SRGTXRXPP);
}
}
- switch (portDirectionEnum) {
- case 1: // ports are uni Directional on a degree
- // Create CP-TX termination
- tempTpBldr = createTpBldr("SRG" + srgCounter + "-CP" + "-TX");
- tp1Bldr = new TerminationPoint1Builder();
- tp1Bldr.setTpType(OpenroadmTpType.SRGTXCP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
- tpList.add(tempTpBldr.build());
- break;
- case 2:
- // Create CP-RX termination
- tempTpBldr = createTpBldr("SRG" + srgCounter + "-CP" + "-RX");
- tp1Bldr = new TerminationPoint1Builder();
- tp1Bldr.setTpType(OpenroadmTpType.SRGRXCP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
- tpList.add(tempTpBldr.build());
- break;
- case 3:
- // Ports are bi directional therefore 2 termination points
- // Create CP-TXRX termination
- tempTpBldr = createTpBldr("SRG" + srgCounter + "-CP" + "-TXRX");
- tp1Bldr = new TerminationPoint1Builder();
- tp1Bldr.setTpType(OpenroadmTpType.SRGTXRXCP);
- tempTpBldr.addAugmentation(TerminationPoint1.class, tp1Bldr.build());
- tpList.add(tempTpBldr.build());
- break;
- default:
- LOG.error("No correponsding direction to the value: {}", portDirectionEnum);
- break;
- }
-
org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder tpNode1 =
- new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology.rev150608.Node1Builder();
+ new org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.topology
+ .rev150608.Node1Builder();
tpNode1.setTerminationPoint(tpList);
}
/*
- * This method will return the TTP ports in the device for a given degree number to
- * be used by the node to create TTP and CTP termination point on the device.
+ * This method will return the TTP ports in the device for a given degree number to be used by the
+ * node to create TTP and CTP termination point on the device
*/
private List<ConnectionPorts> getDegreePorts(String deviceId, Integer degreeCounter) {
List<ConnectionPorts> degreeConPorts = new ArrayList<>();
LOG.info("Getting Connection ports for Degree Number {}", degreeCounter);
- InstanceIdentifier<Degree> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Degree.class,
- new DegreeKey(degreeCounter));
+ InstanceIdentifier<Degree> deviceIID =
+ InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Degree.class, new DegreeKey(degreeCounter));
- Optional<Degree> ordmDegreeObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
- LogicalDatastoreType.CONFIGURATION, deviceIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ Optional<Degree> ordmDegreeObject =
+ deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.CONFIGURATION, deviceIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmDegreeObject.isPresent()) {
degreeConPorts.addAll(new ArrayList<>(ordmDegreeObject.get().getConnectionPorts()));
LOG.info("Getting max pp ports for Srg Number {}", srgCounter);
InstanceIdentifier<SharedRiskGroup> deviceIID = InstanceIdentifier.create(OrgOpenroadmDevice.class)
.child(SharedRiskGroup.class, new SharedRiskGroupKey(srgCounter));
- Optional<SharedRiskGroup> ordmSrgObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
- LogicalDatastoreType.OPERATIONAL, deviceIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ Optional<SharedRiskGroup> ordmSrgObject =
+ deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, deviceIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (ordmSrgObject.isPresent()) {
if (ordmSrgObject.get().getMaxAddDropPorts() != null) {
maxPpPorts = ordmSrgObject.get().getMaxAddDropPorts();
.child(CircuitPacks.class, new CircuitPacksKey(circuitPackName))
.child(Ports.class, new PortsKey(portName));
LOG.info("Fetching Port Direction for port {} at circuit pack {}", portName, circuitPackName);
- Optional<Ports> portObject = this.deviceTransactionManager.getDataFromDevice(deviceId,
- LogicalDatastoreType.OPERATIONAL, portIID, Timeouts.DEVICE_READ_TIMEOUT,
- Timeouts.DEVICE_READ_TIMEOUT_UNIT);
+ Optional<Ports> portObject =
+ deviceTransactionManager.getDataFromDevice(deviceId, LogicalDatastoreType.OPERATIONAL, portIID,
+ Timeouts.DEVICE_READ_TIMEOUT, Timeouts.DEVICE_READ_TIMEOUT_UNIT);
if (portObject.isPresent()) {
Ports port = portObject.get();
if (port.getPortDirection() != null) {
return tpBldr;
}
- // This method returns the linkBuilder object for given source and destination.
+ // This method returns the linkBuilder object for given source and destination
public LinkBuilder createLink(String srcNode, String dstNode, String srcTp, String destTp) {
LOG.info("creating link for {}-{}", srcNode, dstNode);
// Create Destination for link
SourceBuilder srcNodeBldr = new SourceBuilder();
srcNodeBldr.setSourceNode(new NodeId(srcNode));
srcNodeBldr.setSourceTp(srcTp);
- LinkBuilder lnkBldr = new LinkBuilder();
// set link builder attribute
+ LinkBuilder lnkBldr = new LinkBuilder();
lnkBldr.setDestination(dstNodeBldr.build());
lnkBldr.setSource(srcNodeBldr.build());
lnkBldr.setLinkId(LinkIdUtil.buildLinkId(srcNode, srcTp, dstNode, destTp));
lnkBldr.withKey(new LinkKey(lnkBldr.getLinkId()));
- org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder lnk1Bldr =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+ org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder lnk1Bldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.network.topology.rev170929.Link1Builder();
+ OMSAttributesBuilder omsAttributesBuilder = new OMSAttributesBuilder();
LinkId oppositeLinkId = LinkIdUtil.getOppositeLinkId(srcNode, srcTp, dstNode, destTp);
- lnk1Bldr.setOppositeLink(oppositeLinkId);
- lnkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1.class,
- lnk1Bldr.build());
+ omsAttributesBuilder.setOppositeLink(oppositeLinkId);
+ lnk1Bldr.setOMSAttributes(omsAttributesBuilder.build());
+ lnkBldr.addAugmentation(Link1.class,lnk1Bldr.build());
return lnkBldr;
}
+
+
private List<Link> createExpressLinks(String nodeId, int numOfDegrees, int portDirectionEnum) {
LOG.info("creating express links {} {} {}", nodeId, numOfDegrees, portDirectionEnum);
List<Link> links = new ArrayList<>();
String destTp;
// ports are uni-directional
- if ((portDirectionEnum == 1) || (portDirectionEnum == 2)) {
+ if (portDirectionEnum == 1 || portDirectionEnum == 2) {
LOG.info("creating uni-directional express links");
for (int i = 1; i <= numOfDegrees; i++) {
for (int j = i + 1; j <= numOfDegrees; j++) {
Link1Builder lnk1Bldr = new Link1Builder();
lnk1Bldr.setLinkType(OpenroadmLinkType.EXPRESSLINK);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder lnk2Bldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+ lnk2Bldr.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
expLinkBldr.addAugmentation(Link1.class, lnk1Bldr.build());
-
+ expLinkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929
+ .Link1.class, lnk2Bldr.build());
links.add(expLinkBldr.build());
// ZtoA direction
Link1Builder lnk1Bldr = new Link1Builder();
lnk1Bldr.setLinkType(OpenroadmLinkType.EXPRESSLINK);
-
LinkBuilder expLinkBldr = createLink(srcNode, destNode, srcTp, destTp);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder lnk2Bldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+ lnk2Bldr.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
expLinkBldr.addAugmentation(Link1.class, lnk1Bldr.build());
+ expLinkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929
+ .Link1.class, lnk2Bldr.build());
links.add(expLinkBldr.build());
// ZtoA direction
return links;
}
- private List<Link> createAddDropLinks(String nodeId, int numOfDegrees, int numOfSrgs, int portDirectionEnum) {
+ private List<Link> createAddDropLinks(String nodeId, int numOfDegrees, int numOfSrgs,
+ int portDirectionEnum) {
LOG.info("creating add-drop links {} {} {} {}", nodeId, numOfDegrees, numOfSrgs, portDirectionEnum);
List<Link> links = new ArrayList<>();
String destTp;
// ports are uni-directional
- if ((portDirectionEnum == 1) || (portDirectionEnum == 2)) {
+ if (portDirectionEnum == 1 || portDirectionEnum == 2) {
LOG.info("creating uni-directional add-drop links");
for (int i = 1; i <= numOfDegrees; i++) {
for (int j = 1; j <= numOfSrgs; j++) {
LinkBuilder addDropLinkBldr = createLink(srcNode, destNode, srcTp, destTp);
Link1Builder lnk1Bldr = new Link1Builder();
lnk1Bldr.setLinkType(OpenroadmLinkType.DROPLINK);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder lnk2Bldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+ lnk2Bldr.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
addDropLinkBldr.addAugmentation(Link1.class, lnk1Bldr.build());
+ addDropLinkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links
+ .rev170929.Link1.class, lnk2Bldr.build());
links.add(addDropLinkBldr.build());
// add links direction
LinkBuilder addDropLinkBldr = createLink(srcNode, destNode, srcTp, destTp);
Link1Builder lnk1Bldr = new Link1Builder();
lnk1Bldr.setLinkType(OpenroadmLinkType.DROPLINK);
+ org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder lnk2Bldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links.rev170929.Link1Builder();
+ lnk2Bldr.setOppositeLink(LinkIdUtil.getOppositeLinkId(srcNode, srcTp, destNode, destTp));
addDropLinkBldr.addAugmentation(Link1.class, lnk1Bldr.build());
+ addDropLinkBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.opposite.links
+ .rev170929.Link1.class, lnk2Bldr.build());
+
links.add(addDropLinkBldr.build());
// add link
return links;
}
- // This method returns the linkBuilder object for given source and destination.
- public boolean deleteLink(String srcNode, String dstNode, Integer srcDegId,
- Integer destDegId ,String srcTp, String destTp) {
- LOG.info("deleting link for {}-{}", srcNode, dstNode);
- try {
- LinkId linkId = LinkIdUtil.buildLinkId(srcNode + "-DEG" + srcDegId,
- srcTp, dstNode + "-DEG" + destDegId, destTp);
- LOG.info("Link is for the link is {}", linkId.getValue());
- InstanceIdentifierBuilder<Link> linkIID = InstanceIdentifier
- .builder(Network.class, new NetworkKey(new NetworkId(NetworkUtils.OVERLAY_NETWORK_ID)))
- .augmentation(Network1.class).child(Link.class, new LinkKey(linkId));
- WriteTransaction wrtx = this.dataBroker.newWriteOnlyTransaction();
- wrtx.delete(LogicalDatastoreType.CONFIGURATION, linkIID.build());
- LOG.info("Deleted");
- wrtx.submit().get(1, TimeUnit.SECONDS);
- LOG.info("Submitted");
- } catch (InterruptedException | ExecutionException | TimeoutException e) {
- LOG.error(e.getMessage(), e);
- return false;
- }
- return true;
- }
private List<AvailableWavelengths> create96AvalWaveDegree() {
List<AvailableWavelengths> waveList = new ArrayList<>();
return waveList;
}
- private List<org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes.AvailableWavelengths>
- create96AvalWaveSrg() {
+ private List<org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
+ .AvailableWavelengths> create96AvalWaveSrg() {
- List<org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes.AvailableWavelengths>
- waveList = new ArrayList<>();
+ List<org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
+ .AvailableWavelengths> waveList = new ArrayList<>();
for (int i = 1; i < 97; i++) {
org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
- .AvailableWavelengthsBuilder avalBldr =
- new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
- .AvailableWavelengthsBuilder();
+ .AvailableWavelengthsBuilder avalBldr =
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
+ .AvailableWavelengthsBuilder();
avalBldr.setIndex((long) i);
avalBldr.withKey(
- new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
- .AvailableWavelengthsKey((long) i));
+ new org.opendaylight.yang.gen.v1.http.org.openroadm.srg.rev170929.srg.node.attributes
+ .AvailableWavelengthsKey((long) i));
waveList.add(avalBldr.build());
}
return waveList;
}
-
- private class XponderPortNumber {
- private int numOfLinePorts;
- private int numOfClientPorts;
-
- XponderPortNumber() {
- numOfClientPorts = 0;
- numOfLinePorts = 0;
- }
-
- public void setNumOfLinePorts(int numOfLinePorts) {
- this.numOfLinePorts = numOfLinePorts;
- }
-
- public void setNumOfClientPorts(int numOfClientPorts) {
- this.numOfClientPorts = numOfClientPorts;
- }
-
- public int getNumOfClientPorts() {
- return numOfClientPorts;
- }
-
- public int getNumOfLinePorts() {
- return numOfLinePorts;
- }
- }
}
Code Review / transportpce.git / blobdiff