commit ea6a8254ed5ddf6f094d5f7112a737cdcdca18ee
author Yuta HIGUCHI <y-higuchi@ak.jp.nec.com> Wed Jun 29 22:36:00 2016 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jun 30 17:36:18 2016 +0000
tree 44ab2165f2f3ca79521d9e8ea9a028fa1963f706
parent b5a41e594e351832e4900a4734f9307851a08ca3

Lower LINC-OE log level

- lower log to appropriate level
- cosmetic changes

Change-Id: I41eac5ba9cdc370e8dc007156f0c7220e765e92c

drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OfOpticalSwitchImplLinc13.java

diff --git a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OfOpticalSwitchImplLinc13.java b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OfOpticalSwitchImplLinc13.java
index 5e55fb4..c61d6b7 100644
--- a/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OfOpticalSwitchImplLinc13.java
+++ b/drivers/optical/src/main/java/org/onosproject/driver/optical/handshaker/OfOpticalSwitchImplLinc13.java
@@ -15,6 +15,7 @@
  */
 package org.onosproject.driver.optical.handshaker;
 
+import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 import org.onosproject.net.Device;
 import org.onosproject.openflow.controller.OpenFlowOpticalSwitch;
@@ -46,7 +47,6 @@
 
 import java.io.IOException;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
@@ -73,7 +73,7 @@
 
     @Override
     public void startDriverHandshake() {
-        log.warn("Starting driver handshake for sw {}", getStringId());
+        log.debug("Starting driver handshake for sw {}", getStringId());
         if (startDriverHandshakeCalled) {
             throw new SwitchDriverSubHandshakeAlreadyStarted();
         }
@@ -118,7 +118,7 @@
             case PACKET_IN:
                 break;
             case PORT_STATUS:
-                log.warn("****LINC-OE Port Status {} {}", getStringId(), m);
+                log.debug("****LINC-OE Port Status {} {}", getStringId(), m);
                 processOFPortStatus((OFCircuitPortStatus) m);
                 break;
             case QUEUE_GET_CONFIG_REPLY:
@@ -128,7 +128,7 @@
             case STATS_REPLY:
                 OFStatsReply stats = (OFStatsReply) m;
                 if (stats.getStatsType() == OFStatsType.EXPERIMENTER) {
-                    log.warn("LINC-OE : Received stats reply message {}", m);
+                    log.debug("LINC-OE : Received stats reply message {}", m);
                     createOpticalPortList((OFCircuitPortsReply) m);
                     driverHandshakeComplete.set(true);
                 }
@@ -152,21 +152,21 @@
         OFCircuitPortsRequest circuitPortsRequest = factory()
                 .buildCircuitPortsRequest().setXid(getNextTransactionId())
                 .build();
-        log.warn("LINC-OE : Sending experimented circuit port stats " +
+        log.debug("LINC-OE : Sending experimented circuit port stats " +
                          "message " +
                          "{}",
                  circuitPortsRequest.toString());
         this.sendHandshakeMessage(circuitPortsRequest);
     }
 
-    @Override
     /**
      * Returns a list of standard (Ethernet) ports.
      *
      * @return List of ports
      */
+    @Override
     public List<OFPortDesc> getPorts() {
-        return Collections.EMPTY_LIST;
+        return ImmutableList.of();
     }
 
     /**
@@ -337,7 +337,7 @@
     @Override
     public List<? extends OFObject> getPortsOf(PortDescPropertyType type) {
         if (!type.equals(PortDescPropertyType.OPTICAL_TRANSPORT)) {
-            return Collections.EMPTY_LIST;
+            return ImmutableList.of();
         }
 
         return opticalPorts;