Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
HoneyNode Java 11 support for 121 devices
[transportpce.git]
/
tests
/
honeynode
/
1.2.1
/
honeynode-plugin-impl
/
src
/
main
/
java
/
io
/
fd
/
honeycomb
/
transportpce
/
device
/
configuration
/
PmConfiguration.java
diff --git
a/tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
b/tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
similarity index 96%
rename from
tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
rename to
tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
index 4fd3ffecabb521a7d7d8dbee91fc1ca426a1ab55..9891597224d5bd2fa6a749b7c621e29bcc23a4bb 100644
(file)
--- a/
tests/honeynode/2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
+++ b/
tests/honeynode/1.2.1/honeynode-plugin-impl/src/main/java/io/fd/honeycomb/transportpce/device/configuration/PmConfiguration.java
@@
-16,16
+16,15
@@
package io.fd.honeycomb.transportpce.device.configuration;
package io.fd.honeycomb.transportpce.device.configuration;
-import io.fd.honeycomb.transportpce.device.tools.DefaultPmListFactory;
-import io.fd.honeycomb.transportpce.test.common.DataStoreContext;
-import io.fd.honeycomb.transportpce.test.common.DataStoreContextImpl;
-
import java.io.File;
import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.CurrentPmlist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.File;
import org.opendaylight.yang.gen.v1.http.org.openroadm.pm.rev161014.CurrentPmlist;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import io.fd.honeycomb.transportpce.device.tools.DefaultPmListFactory;
+import io.fd.honeycomb.transportpce.test.common.DataStoreContext;
+import io.fd.honeycomb.transportpce.test.common.DataStoreContextImpl;
import net.jmob.guice.conf.core.BindConfig;
import net.jmob.guice.conf.core.InjectConfig;
import net.jmob.guice.conf.core.Syntax;
import net.jmob.guice.conf.core.BindConfig;
import net.jmob.guice.conf.core.InjectConfig;
import net.jmob.guice.conf.core.Syntax;
@@
-60,9
+59,11
@@
public final class PmConfiguration {
public CurrentPmlist getDataPm() {
CurrentPmlist result = null;
File pm_list_data = new File(classLoader.getResource(PM_DATA_SAMPLE_OPER_XML).getFile());
public CurrentPmlist getDataPm() {
CurrentPmlist result = null;
File pm_list_data = new File(classLoader.getResource(PM_DATA_SAMPLE_OPER_XML).getFile());
- result = defaultPmListFactory.createDefaultPmList(dataStoreContextUtil,pm_list_data);
+ result = defaultPmListFactory.createDefaultPmList(dataStoreContextUtil,
pm_list_data);
if (result != null) {
LOG.info("result pm list size : {}", result.getCurrentPm().size());
if (result != null) {
LOG.info("result pm list size : {}", result.getCurrentPm().size());
+ } else {
+ LOG.warn("Failed to get PM info !");
}
return result;
}
}
return result;
}