홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Yuta HIGUCHI
Committed by Gerrit Code Review
ea6a8254 1 parent b5a41e59

Lower LINC-OE log level 

- lower log to appropriate level
- cosmetic changes

Change-Id: I41eac5ba9cdc370e8dc007156f0c7220e765e92c
Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
......@@ -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 org.projectfloodlight.openflow.types.U8;
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 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements
@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 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements
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 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements
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 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements
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 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements
@Override
public List<? extends OFObject> getPortsOf(PortDescPropertyType type) {
if (!type.equals(PortDescPropertyType.OPTICAL_TRANSPORT)) {
return Collections.EMPTY_LIST;
return ImmutableList.of();
}
return opticalPorts;
......