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=917926e5129d12f03c73baeba1b44361c120c315;hb=66ccddbe00692f230350a19e1a222f09d6abd9a7;hp=259cda54364a56b1155a0e1f45bad9079a564d26;hpb=738d0daf16440e92fc7b111d3db83b42573c705a;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 259cda543..917926e51 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 @@ -17,7 +17,7 @@ import org.opendaylight.mdsal.binding.api.DataBroker; import org.opendaylight.mdsal.binding.api.WriteTransaction; import org.opendaylight.mdsal.common.api.LogicalDatastoreType; import org.opendaylight.transportpce.common.NetworkUtils; -import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev190702.network.nodes.NodeInfo; +import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev191115.network.nodes.NodeInfo; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.NetworkTypes1Builder; import org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.networks.network.network.types.OpenroadmCommonNetworkBuilder; @@ -85,16 +85,18 @@ public final class OpenRoadmNetwork { nodeBldr.setNodeId(nwNodeId); nodeBldr.withKey(new NodeKey(nwNodeId)); Node1Builder node1bldr = new Node1Builder(); + org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder node2bldr = + new org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1Builder(); /* * Recognize the node type: 1:ROADM, 2:XPONDER */ 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: {}", nodeInfo.getNodeType().getName()); @@ -123,6 +125,8 @@ public final class OpenRoadmNetwork { // Augment to the main node builder nodeBldr.addAugmentation(Node1.class, node1bldr.build()); + nodeBldr.addAugmentation(org.opendaylight.yang.gen.v1.http.org.openroadm.common.network.rev181130.Node1.class, + node2bldr.build()); return nodeBldr.build(); }