Merge "Self assign controller MAC when cannot retrieve one from host"

diff --git a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
index 0345f188157d8e775be0b208839b76f6ca83f1ca..d1a5dcc416cc190dd3dabd80fdc5e8963a6af9a3 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
+++ b/opendaylight/distribution/opendaylight/src/main/resources/configuration/logback.xml
@@ -86,6 +86,10 @@
     <appender-ref ref="opendaylight.log"/>
   </logger>
 
+  <!-- To debug MD-SAL schema loading issues, uncomment this -->
+  <!--logger name="org.opendaylight.yangtools.yang.parser.impl.util.URLSchemaContextResolver" level="DEBUG"/>
+  <logger name="org.opendaylight.yangtools.sal.binding.generator.impl.RuntimeGeneratedMappingServiceImpl" level="TRACE"/-->
+
   <!-- additivity=false ensures analytics data only goes to the analytics log -->
   <logger name="audit" level="INFO" additivity="false">
        <appender-ref ref="audit-file"/>

diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java
index 3c968f8e2013423d4c405e1e95b8c4c711e5640e..c8af4ccd831bb306b563913a3af86d631a92b031 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java
+++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/ConfigPusher.java
@@ -77,7 +77,10 @@ public class ConfigPusher {
         // start pushing snapshots:
         for (ConfigSnapshotHolder configSnapshotHolder: configs){
             netconfClient = pushSnapshotWithRetries(configSnapshotHolder, Optional.of(netconfClient));
+            logger.debug("Config snapshot pushed successfully: {}", configSnapshotHolder);
         }
+
+        logger.debug("All configuration snapshots have been pushed successfully.");
         return netconfClient;
     }
 

diff --git a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/osgi/ConfigPersisterActivator.java b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/osgi/ConfigPersisterActivator.java
index 857912021b0e21d07f60d740bbc6f6372ef0f6b6..179c9681fc4b21732286442251f5029e19e6958c 100644 (file)
--- a/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/osgi/ConfigPersisterActivator.java
+++ b/opendaylight/netconf/config-persister-impl/src/main/java/org/opendaylight/controller/netconf/persist/impl/osgi/ConfigPersisterActivator.java
@@ -90,6 +90,7 @@ public class ConfigPersisterActivator implements BundleActivator {
                     // uncaught exception handler will deal with this failure
                     throw new RuntimeException("Interrupted while waiting for netconf connection", e);
                 }
+                logger.info("Configuration Persister initialization completed.");
             }
         };
         initializationThread = new Thread(initializationRunnable, "ConfigPersister-registrator");