X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=networkmodel%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Ftransportpce%2Fnetworkmodel%2Futil%2FOpenRoadmNetwork.java;h=2d745b1087857dcf72b7e550f5e8567cd9d82fb7;hb=67763b4d82e44c68fdbc765cdeec5496ff65b01e;hp=39924b27edee2f12d19dd26cc9e0fadf28e66c3e;hpb=2c9f39e2e1dba040cfb99a8720f0098328ed03ee;p=transportpce.git diff --git a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java index 39924b27e..2d745b108 100644 --- a/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java +++ b/networkmodel/src/main/java/org/opendaylight/transportpce/networkmodel/util/OpenRoadmNetwork.java @@ -8,45 +8,23 @@ package org.opendaylight.transportpce.networkmodel.util; -import com.google.common.collect.ImmutableList; - -import java.util.Optional; -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 com.google.common.collect.ImmutableMap; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.transportpce.common.Timeouts; -import org.opendaylight.transportpce.common.device.DeviceTransactionManager; -import org.opendaylight.yang.gen.v1.http.org.openroadm.common.types.rev161014.NodeTypes; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.OrgOpenroadmDevice; -import org.opendaylight.yang.gen.v1.http.org.openroadm.device.rev170206.org.openroadm.device.container.org.openroadm.device.Info; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev170929.NetworkTypes1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev170929.NetworkTypes1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev170929.Node1; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev170929.Node1Builder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev170929.network.network.types.OpenroadmNetworkBuilder; -import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev170929.OpenroadmNodeType; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.Network; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NetworkKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.NodeId; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NetworkTypesBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.Node; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NodeBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.NodeKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.node.SupportingNodeBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev150608.network.node.SupportingNodeKey; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev210315.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.rev200529.Node1Builder; +import org.opendaylight.yang.gen.v1.http.org.openroadm.network.types.rev200529.OpenroadmNodeType; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NetworkId; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.NodeId; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.Node; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.NodeKey; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNode; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.networks.network.node.SupportingNodeKey; import org.slf4j.Logger; import org.slf4j.LoggerFactory; + public final class OpenRoadmNetwork { private static final Logger LOG = LoggerFactory.getLogger(OpenRoadmNetwork.class); @@ -55,101 +33,61 @@ public final class OpenRoadmNetwork { // utility class } - /** - * This public method creates the OpenRoadmNetwork Layer and posts it to the - * controller. - */ - public static void createOpenRoadmNetworkLayer(DataBroker controllerdb) { - try { - Network openRoadmNetwork = createOpenRoadmNetwork(); - InstanceIdentifierBuilder nwIID = InstanceIdentifier.builder(Network.class, - new NetworkKey(new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID))); - WriteTransaction wrtx = controllerdb.newWriteOnlyTransaction(); - wrtx.put(LogicalDatastoreType.CONFIGURATION, nwIID.build(), openRoadmNetwork); - wrtx.submit().get(1, TimeUnit.SECONDS); - LOG.info("OpenRoadm-Network created successfully."); - } catch (ExecutionException | TimeoutException | InterruptedException e) { - LOG.warn("Failed to create OpenRoadm-Network", e); - } - } - /** * Create single node entry for OpenRoadmNetwork. * + * @param nodeId node ID + * @param nodeInfo some important and general data from device + * + * @return node */ - public static Node createNode(String nodeId, DeviceTransactionManager deviceTransactionManager) { - // Fetches the info from the deviceInfo - InstanceIdentifier infoIID = InstanceIdentifier.create(OrgOpenroadmDevice.class).child(Info.class); - Optional deviceInfoOpt = deviceTransactionManager.getDataFromDevice(nodeId, - LogicalDatastoreType.OPERATIONAL, infoIID, Timeouts.DEVICE_READ_TIMEOUT, - Timeouts.DEVICE_READ_TIMEOUT_UNIT); - Info deviceInfo; - if (deviceInfoOpt.isPresent()) { - deviceInfo = deviceInfoOpt.get(); - } else { - LOG.error("Unable to get device info from device {}!", nodeId); - return null; - } - NodeTypes nodeType = deviceInfo.getNodeType(); + public static Node createNode(String nodeId, NodeInfo nodeInfo) { - // Uses the Node Builder to set the nodeId and Key - NodeBuilder nodeBldr = new NodeBuilder(); - NodeId nwNodeId = new NodeId(nodeId); - nodeBldr.setNodeId(nwNodeId); - nodeBldr.setKey(new NodeKey(nwNodeId)); - Node1Builder node1bldr = new Node1Builder(); + Node1Builder node1Bldr = new Node1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder node2Bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev200529.Node1Builder(); /* * Recognize the node type: 1:ROADM, 2:XPONDER */ - switch (nodeType.getIntValue()) { + switch (nodeInfo.getNodeType().getIntValue()) { case 1: - node1bldr.setNodeType(OpenroadmNodeType.ROADM); + node2Bldr.setNodeType(OpenroadmNodeType.ROADM); break; case 2: - node1bldr.setNodeType(OpenroadmNodeType.XPONDER); + node2Bldr.setNodeType(OpenroadmNodeType.XPONDER); break; default: - LOG.error("No correponsding type for the value: {}", nodeType.getIntValue()); + LOG.error("No correponsding type for the value: {}", nodeInfo.getNodeType().getName()); break; } - String vendor = deviceInfo.getVendor(); - String model = deviceInfo.getModel(); - IpAddress ipAddress = deviceInfo.getIpAddress(); // Sets IP, Model and Vendor information fetched from the deviceInfo - node1bldr.setIp(ipAddress); - node1bldr.setModel(model); - node1bldr.setVendor(vendor); + if (nodeInfo.getNodeIpAddress() != null) { + node1Bldr.setIp(nodeInfo.getNodeIpAddress()); + } + if (nodeInfo.getNodeModel() != null) { + node1Bldr.setModel(nodeInfo.getNodeModel()); + } + if (nodeInfo.getNodeVendor() != null) { + node1Bldr.setVendor(nodeInfo.getNodeVendor()); + } // Sets the value of Network-ref and Node-ref as a part of the supporting node // attribute - String clli = deviceInfo.getClli(); - SupportingNodeBuilder supportbldr = new SupportingNodeBuilder(); - supportbldr.setKey(new SupportingNodeKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID), new NodeId(clli))); - supportbldr.setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID)); - supportbldr.setNodeRef(new NodeId(clli)); - nodeBldr.setSupportingNode(ImmutableList.of(supportbldr.build())); + SupportingNode supportingNode = new SupportingNodeBuilder() + .setNetworkRef(new NetworkId(NetworkUtils.CLLI_NETWORK_ID)) + .setNodeRef(new NodeId(nodeInfo.getNodeClli())) + .withKey(new SupportingNodeKey(new NetworkId(NetworkUtils.CLLI_NETWORK_ID), + new NodeId(nodeInfo.getNodeClli()))) + .build(); - // Augment to the main node builder - nodeBldr.addAugmentation(Node1.class, node1bldr.build()); - return nodeBldr.build(); - } - - /** - * Create empty OpenROADM network. - */ - private static Network createOpenRoadmNetwork() { - NetworkBuilder openrdmnwBuilder = new NetworkBuilder(); - NetworkId nwId = new NetworkId(NetworkUtils.UNDERLAY_NETWORK_ID); - openrdmnwBuilder.setNetworkId(nwId); - openrdmnwBuilder.setKey(new NetworkKey(nwId)); - // sets network type to OpenRoadmNetwork - NetworkTypes1Builder openRoadmNetworkTypesBldr = new NetworkTypes1Builder(); - openRoadmNetworkTypesBldr.setOpenroadmNetwork(new OpenroadmNetworkBuilder().build()); - NetworkTypesBuilder openrdmnwTypeBuilder = new NetworkTypesBuilder(); - openrdmnwTypeBuilder.addAugmentation(NetworkTypes1.class, openRoadmNetworkTypesBldr.build()); - openrdmnwBuilder.setNetworkTypes(openrdmnwTypeBuilder.build()); - return openrdmnwBuilder.build(); + return new NodeBuilder() + .setNodeId(new NodeId(nodeId)) + .withKey(new NodeKey(new NodeId(nodeId))) + .setSupportingNode(ImmutableMap.of(supportingNode.key(),supportingNode)) + .addAugmentation(node1Bldr.build()) + .addAugmentation(node2Bldr.build()) + .build(); } }