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.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;
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);
+ wrtx.commit().get(1, TimeUnit.SECONDS);
LOG.info("OpenRoadm-Network created successfully.");
} catch (ExecutionException | TimeoutException | InterruptedException e) {
LOG.warn("Failed to create OpenRoadm-Network", e);
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());
// 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();
}