Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add OTN links support in TAPI topology
[transportpce.git]
/
tapi
/
src
/
test
/
java
/
org
/
opendaylight
/
transportpce
/
tapi
/
utils
/
TopologyDataUtils.java
diff --git
a/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
b/tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
index 1227c3eebc9ac285b5a1689d02ba2a1628ae4ebe..2d669c1c3cf4476864cdeff8ba32cff859492a9e 100644
(file)
--- a/
tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
+++ b/
tapi/src/test/java/org/opendaylight/transportpce/tapi/utils/TopologyDataUtils.java
@@
-7,18
+7,20
@@
*/
package org.opendaylight.transportpce.tapi.utils;
*/
package org.opendaylight.transportpce.tapi.utils;
-import
edu.umd.cs.findbugs.annotations.NonNull
;
+import
com.google.common.util.concurrent.FluentFuture
;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Optional;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.util.Optional;
+import java.util.concurrent.ExecutionException;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.WriteTransaction;
import org.opendaylight.mdsal.binding.api.DataBroker;
import org.opendaylight.mdsal.binding.api.WriteTransaction;
+import org.opendaylight.mdsal.common.api.CommitInfo;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
-import org.opendaylight.transportpce.
common
.DataStoreContext;
-import org.opendaylight.transportpce.
common
.converter.XMLDataObjectConverter;
-import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200
429
.Network;
+import org.opendaylight.transportpce.
test
.DataStoreContext;
+import org.opendaylight.transportpce.
test
.converter.XMLDataObjectConverter;
+import org.opendaylight.yang.gen.v1.http.org.opendaylight.transportpce.portmapping.rev200
827
.Network;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInputBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.network.rev180226.Networks;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInput;
import org.opendaylight.yang.gen.v1.urn.onf.otcc.yang.tapi.topology.rev181210.GetTopologyDetailsInputBuilder;
@@
-33,6
+35,7
@@
public final class TopologyDataUtils {
private static final Logger LOG = LoggerFactory.getLogger(TopologyDataUtils.class);
public static final String OPENROADM_TOPOLOGY_FILE = "src/test/resources/openroadm-topology2.xml";
public static final String OTN_TOPOLOGY_FILE = "src/test/resources/otn-topology.xml";
private static final Logger LOG = LoggerFactory.getLogger(TopologyDataUtils.class);
public static final String OPENROADM_TOPOLOGY_FILE = "src/test/resources/openroadm-topology2.xml";
public static final String OTN_TOPOLOGY_FILE = "src/test/resources/otn-topology.xml";
+ public static final String OTN_TOPOLOGY_WITH_OTN_LINKS_FILE = "src/test/resources/otn-topology-with-otn-links.xml";
public static final String PORTMAPPING_FILE = "src/test/resources/portmapping-example.xml";
public static GetTopologyDetailsInput buildGetTopologyDetailsInput(String topoName) {
public static final String PORTMAPPING_FILE = "src/test/resources/portmapping-example.xml";
public static GetTopologyDetailsInput buildGetTopologyDetailsInput(String topoName) {
@@
-42,7
+45,7
@@
public final class TopologyDataUtils {
}
public static <T> void writeTopologyFromFileToDatastore(DataStoreContext dataStoreContextUtil, String file,
}
public static <T> void writeTopologyFromFileToDatastore(DataStoreContext dataStoreContextUtil, String file,
- InstanceIdentifier ii) {
+ InstanceIdentifier ii)
throws InterruptedException, ExecutionException
{
Networks networks = null;
File topoFile = new File(file);
if (topoFile.exists()) {
Networks networks = null;
File topoFile = new File(file);
if (topoFile.exists()) {
@@
-70,21
+73,22
@@
public final class TopologyDataUtils {
} else {
LOG.error("xml file {} not found at {}", topoFile.getName(), topoFile.getAbsolutePath());
}
} else {
LOG.error("xml file {} not found at {}", topoFile.getName(), topoFile.getAbsolutePath());
}
- writeTransaction(dataStoreContextUtil.getDataBroker(), ii, networks.getNetwork().get(0));
+ FluentFuture<? extends CommitInfo> commitFuture = writeTransaction(dataStoreContextUtil.getDataBroker(), ii,
+ networks.nonnullNetwork().values().stream().findFirst().get());
+ commitFuture.get();
LOG.info("extraction from {} stored with success in datastore", topoFile.getName());
}
@SuppressWarnings("unchecked")
LOG.info("extraction from {} stored with success in datastore", topoFile.getName());
}
@SuppressWarnings("unchecked")
- private static boolean writeTransaction(DataBroker dataBroker, InstanceIdentifier instanceIdentifier,
- DataObject object) {
- @NonNull
+ private static FluentFuture<? extends CommitInfo> writeTransaction(DataBroker dataBroker,
+ InstanceIdentifier instanceIdentifier, DataObject object) {
WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object);
WriteTransaction transaction = dataBroker.newWriteOnlyTransaction();
transaction.put(LogicalDatastoreType.CONFIGURATION, instanceIdentifier, object);
- transaction.commit();
- return true;
+ return transaction.commit();
}
}
- public static void writePortmappingFromFileToDatastore(DataStoreContext dataStoreContextUtil) {
+ public static void writePortmappingFromFileToDatastore(DataStoreContext dataStoreContextUtil)
+ throws InterruptedException, ExecutionException {
Network result = null;
File portmappingFile = new File(PORTMAPPING_FILE);
if (portmappingFile.exists()) {
Network result = null;
File portmappingFile = new File(PORTMAPPING_FILE);
if (portmappingFile.exists()) {
@@
-113,7
+117,9
@@
public final class TopologyDataUtils {
LOG.error("xml file {} not found at {}", portmappingFile.getName(), portmappingFile.getAbsolutePath());
}
InstanceIdentifier<Network> portmappingIID = InstanceIdentifier.builder(Network.class).build();
LOG.error("xml file {} not found at {}", portmappingFile.getName(), portmappingFile.getAbsolutePath());
}
InstanceIdentifier<Network> portmappingIID = InstanceIdentifier.builder(Network.class).build();
- writeTransaction(dataStoreContextUtil.getDataBroker(), portmappingIID, result);
+ FluentFuture<? extends CommitInfo> writeTransaction = writeTransaction(dataStoreContextUtil.getDataBroker(),
+ portmappingIID, result);
+ writeTransaction.get();
LOG.info("portmapping-example stored with success in datastore");
}
LOG.info("portmapping-example stored with success in datastore");
}