From: Giovanni Meo <gmeo@cisco.com>
Date: Wed, 8 May 2013 10:28:52 +0000 (+0000)
Subject: Merge "Fixed augment schema path resolving."
X-Git-Tag: releasepom-0.1.0~473
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=commitdiff_plain;h=3de02c0d3a9fad575f326f022a562042e3034fbe;hp=e52af57ca012beb92aecfda2f8acc2d7ba006468

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 96ecf13a81..8c00d7f0fc 100644
--- 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 abad0b2ab5..e294562886 100644
--- 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 44746e5653..dbf3cf2024 100644
--- 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
index 0000000000..2d63ce5744
--- /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 1102a6382e..ec59ab740b 100644
--- 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 2d6b6bb4c5..f92e596b0a 100644
--- 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);