Lowering log level and creating example openconfig device file for ODTN infinera simulators
Change-Id: I8c669a788e31fdbaedf1274bedaaa709b20b13c1
diff --git a/apps/configsync/src/main/java/org/onosproject/d/config/sync/impl/DynamicDeviceConfigSynchronizer.java b/apps/configsync/src/main/java/org/onosproject/d/config/sync/impl/DynamicDeviceConfigSynchronizer.java
index ab094fc..1236364 100644
--- a/apps/configsync/src/main/java/org/onosproject/d/config/sync/impl/DynamicDeviceConfigSynchronizer.java
+++ b/apps/configsync/src/main/java/org/onosproject/d/config/sync/impl/DynamicDeviceConfigSynchronizer.java
@@ -221,7 +221,7 @@
// FIXME hack for unconsolidated event bug
quietUntil = System.currentTimeMillis() + quietPeriod.toMillis();
} else {
- log.info("Ignored event's ResourceId: {}", event.subject());
+ log.debug("Ignored event's ResourceId: {}", event.subject());
}
}
diff --git a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
index 040982f..f742268 100644
--- a/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
+++ b/apps/odtn/api/src/main/java/org/onosproject/odtn/utils/tapi/TapiObjectHandler.java
@@ -255,7 +255,7 @@
// for debug
CharSequence strNode = toCharSequence(toXmlCompositeStream(toCompositeData(rData)));
- log.info("XML:\n{}", XmlString.prettifyXml(strNode));
+ log.debug("XML:\n{}", XmlString.prettifyXml(strNode));
return rData;
}
diff --git a/apps/odtn/api/src/test/resources/openconfig-devices.json b/apps/odtn/api/src/test/resources/openconfig-devices.json
new file mode 100644
index 0000000..95cc10b
--- /dev/null
+++ b/apps/odtn/api/src/test/resources/openconfig-devices.json
@@ -0,0 +1,26 @@
+{
+ "devices" : {
+ "netconf:127.0.0.1:11002" : {
+ "basic" : {
+ "driver":"infinera-xt3300"
+ },
+ "netconf" : {
+ "ip" : "127.0.0.1",
+ "port" : "11002",
+ "username" : "admin",
+ "password" : "admin"
+ }
+ },
+ "netconf:127.0.0.1:11003" : {
+ "basic" : {
+ "driver":"infinera-xt3300"
+ },
+ "netconf" : {
+ "ip" : "127.0.0.1",
+ "port" : "11003",
+ "username" : "admin",
+ "password" : "admin"
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DefaultTapiResolver.java b/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DefaultTapiResolver.java
index abdabf5..16a5597 100644
--- a/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DefaultTapiResolver.java
+++ b/apps/odtn/service/src/main/java/org/onosproject/odtn/internal/DefaultTapiResolver.java
@@ -214,31 +214,31 @@
protected void addNodeRef(TapiNodeRef nodeRef) {
tapiNodeRefList.add(nodeRef);
- log.info("Nodes: {}", tapiNodeRefList);
+ log.debug("Nodes: {}", tapiNodeRefList);
}
protected void addNepRef(TapiNepRef nepRef) {
tapiNepRefList.add(nepRef);
- log.info("Neps: {}", tapiNepRefList);
+ log.debug("Neps: {}", tapiNepRefList);
}
protected void addNodeRefList(List<TapiNodeRef> nodes) {
tapiNodeRefList = nodes;
- log.info("Nodes: {}", tapiNodeRefList);
+ log.debug("Nodes: {}", tapiNodeRefList);
}
protected void addNepRefList(List<TapiNepRef> neps) {
tapiNepRefList = neps;
- log.info("Neps: {}", tapiNepRefList);
+ log.debug("Neps: {}", tapiNepRefList);
}
private void updateCache() {
- log.info("Dirty: {}, Source updated: {}", isDirty, sourceUpdated);
+ log.debug("Dirty: {}, Source updated: {}", isDirty, sourceUpdated);
if (isDirty || sourceUpdated) {
sourceUpdated = false;
clearCache();
dataProvider.updateCacheRequest(this);
- log.info("Update completed: {}", tapiNodeRefList);
+ log.debug("Update completed: {}", tapiNodeRefList);
isDirty = false;
}
}