Merge "Fixed augment schema path resolving."

diff --git a/opendaylight/distribution/opendaylight/src/assemble/bin.xml b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
index 96ecf13a81cee18c9091d5b51e03e44951c4f1bf..8c00d7f0fcf8b4b9553e3ea0a1e0b93e83158f3a 100644 (file)
--- a/opendaylight/distribution/opendaylight/src/assemble/bin.xml
+++ b/opendaylight/distribution/opendaylight/src/assemble/bin.xml
@@ -13,6 +13,8 @@
         <exclude>org.opendaylight.controller.thirdparty:org.openflow.openflowj</exclude>
         <exclude>org.opendaylight.controller:clustering.stub</exclude>
                <exclude>org.opendaylight.controller:logging.bridge</exclude>
+               <exclude>org.opendaylight.controller:protocol_plugins.stub</exclude>
+               <exclude>org.opendaylight.controller:*.integrationtest</exclude>
       </excludes>
       <binaries>
         <outputDirectory>opendaylight/plugins</outputDirectory>
@@ -82,7 +84,6 @@
                <include>com.sun.jersey:jersey-core</include>
                <include>com.sun.jersey:jersey-json</include>
                <include>com.sun.jersey:jersey-server</include>
-               
       </includes>
       <useTransitiveDependencies>false</useTransitiveDependencies>
       <outputFileNameMapping>

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
index abad0b2ab5d5984cee70063697f9109b297602ac..e2945628868d0b4e1b6477e2f4285353f0d3f941 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/DescStatisticsConverter.java
@@ -19,9 +19,6 @@ import org.slf4j.LoggerFactory;
 /**
  * Utility class for converting openflow description statistics into SAL
  * NodeDescription object
- * 
- * 
- * 
  */
 public class DescStatisticsConverter {
     private static final Logger log = LoggerFactory
@@ -31,7 +28,8 @@ public class DescStatisticsConverter {
 
     public DescStatisticsConverter(List<OFStatistics> statsList) {
         this.hwDesc = null;
-        this.ofDesc = (OFDescriptionStatistics) statsList.get(0);
+        this.ofDesc = (statsList == null || statsList.isEmpty())? 
+                null : (OFDescriptionStatistics) statsList.get(0);
     }
 
     public NodeDescription getHwDescription() {

diff --git a/opendaylight/switchmanager/api/pom.xml b/opendaylight/switchmanager/api/pom.xml
index 44746e565393bd333dcbb723b20dc393ee1854ef..dbf3cf2024d0429702eba2beb202974d5a1140f4 100644 (file)
--- a/opendaylight/switchmanager/api/pom.xml
+++ b/opendaylight/switchmanager/api/pom.xml
@@ -18,7 +18,7 @@
     <!-- Sonar properties using jacoco to retrieve integration test results -->
     <sonar.java.coveragePlugin>jacoco</sonar.java.coveragePlugin>
     <sonar.dynamicAnalysis>reuseReports</sonar.dynamicAnalysis>
-    <sonar.jacoco.Reportpath>target/jacobo.exec</sonar.jacoco.Reportpath>
+    <sonar.jacoco.Reportpath>target/jacoco.exec</sonar.jacoco.Reportpath>
     <sonar.jacoco.itReportPath>target/jacoco-it.exec</sonar.jacoco.itReportPath>
     <sonar.language>java</sonar.language>
   </properties>

diff --git a/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml b/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml
new file mode 100644 (file)
index 0000000..2d63ce5
--- /dev/null
+++ b/opendaylight/switchmanager/integrationtest/src/test/resources/logback.xml
@@ -0,0 +1,13 @@
+<configuration scan="true">
+
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+      </pattern>
+    </encoder>
+  </appender>
+
+  <root level="error">
+    <appender-ref ref="STDOUT" />
+  </root>
+</configuration>

diff --git a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
index 1102a6382e649aa9389528ce5b6d438e5fc2ba8b..ec59ab740b76e14ca69b6e39643b4a20761fc1ae 100644 (file)
--- a/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
+++ b/opendaylight/web/devices/src/main/java/org/opendaylight/controller/devices/web/Devices.java
@@ -207,6 +207,9 @@ public class Devices implements IDaylightWeb {
         IForwardingStaticRouting staticRouting = (IForwardingStaticRouting) ServiceHelper
                 .getInstance(IForwardingStaticRouting.class, containerName,
                         this);
+        if (staticRouting == null) {
+            return null;
+        }
         List<Map<String, String>> staticRoutes = new ArrayList<Map<String, String>>();
         ConcurrentMap<String, StaticRouteConfig> routeConfigs = staticRouting
                 .getStaticRouteConfigs();

diff --git a/opendaylight/web/flows/src/main/resources/js/page.js b/opendaylight/web/flows/src/main/resources/js/page.js
index 2d6b6bb4c5a205e7e50c1e3ca3ba4e64473f876a..f92e596b0aab2ecd23f36a7c25ac873c08c219f8 100644 (file)
--- a/opendaylight/web/flows/src/main/resources/js/page.js
+++ b/opendaylight/web/flows/src/main/resources/js/page.js
@@ -162,7 +162,7 @@ one.f.detail = {
                        var body = [];
                        var tr = {};
                        var entry = [];
-
+                        entry.push(data['flow']['ingressPort']);
                        entry.push(data['flow']['etherType']);
                        entry.push(data['flow']['vlanId']);
                        entry.push(data['flow']['vlanPriority']);
@@ -212,7 +212,7 @@ one.f.detail = {
             return $table;
         },
                description : function(body) {
-                       var header = ['Ethernet Type', 'VLAN ID', 'VLAN Priority', 'Source MAC', 'Dest MAC', 'Source IP', 'Dest IP', 'TOS', 'Source Port', 'Dest Port', 'Protocol', 'Cookie'];
+                       var header = ['Input Port', 'Ethernet Type', 'VLAN ID', 'VLAN Priority', 'Source MAC', 'Dest MAC', 'Source IP', 'Dest IP', 'TOS', 'Source Port', 'Dest Port', 'Protocol', 'Cookie'];
                        var $thead = one.lib.dashlet.table.header(header);
                        var attributes = ['table-striped', 'table-bordered', 'table-condensed'];
                        var $table = one.lib.dashlet.table.table(attributes);