Committed by
Gerrit Code Review
Lower LINC-OE log level
- lower log to appropriate level - cosmetic changes Change-Id: I41eac5ba9cdc370e8dc007156f0c7220e765e92c
Showing
1 changed file
with
8 additions
and
8 deletions
| ... | @@ -15,6 +15,7 @@ | ... | @@ -15,6 +15,7 @@ |
| 15 | */ | 15 | */ |
| 16 | package org.onosproject.driver.optical.handshaker; | 16 | package org.onosproject.driver.optical.handshaker; |
| 17 | 17 | ||
| 18 | +import com.google.common.collect.ImmutableList; | ||
| 18 | import com.google.common.collect.ImmutableSet; | 19 | import com.google.common.collect.ImmutableSet; |
| 19 | import org.onosproject.net.Device; | 20 | import org.onosproject.net.Device; |
| 20 | import org.onosproject.openflow.controller.OpenFlowOpticalSwitch; | 21 | import org.onosproject.openflow.controller.OpenFlowOpticalSwitch; |
| ... | @@ -46,7 +47,6 @@ import org.projectfloodlight.openflow.types.U8; | ... | @@ -46,7 +47,6 @@ import org.projectfloodlight.openflow.types.U8; |
| 46 | 47 | ||
| 47 | import java.io.IOException; | 48 | import java.io.IOException; |
| 48 | import java.util.ArrayList; | 49 | import java.util.ArrayList; |
| 49 | -import java.util.Collections; | ||
| 50 | import java.util.LinkedList; | 50 | import java.util.LinkedList; |
| 51 | import java.util.List; | 51 | import java.util.List; |
| 52 | import java.util.Set; | 52 | import java.util.Set; |
| ... | @@ -73,7 +73,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements | ... | @@ -73,7 +73,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements |
| 73 | 73 | ||
| 74 | @Override | 74 | @Override |
| 75 | public void startDriverHandshake() { | 75 | public void startDriverHandshake() { |
| 76 | - log.warn("Starting driver handshake for sw {}", getStringId()); | 76 | + log.debug("Starting driver handshake for sw {}", getStringId()); |
| 77 | if (startDriverHandshakeCalled) { | 77 | if (startDriverHandshakeCalled) { |
| 78 | throw new SwitchDriverSubHandshakeAlreadyStarted(); | 78 | throw new SwitchDriverSubHandshakeAlreadyStarted(); |
| 79 | } | 79 | } |
| ... | @@ -118,7 +118,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements | ... | @@ -118,7 +118,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements |
| 118 | case PACKET_IN: | 118 | case PACKET_IN: |
| 119 | break; | 119 | break; |
| 120 | case PORT_STATUS: | 120 | case PORT_STATUS: |
| 121 | - log.warn("****LINC-OE Port Status {} {}", getStringId(), m); | 121 | + log.debug("****LINC-OE Port Status {} {}", getStringId(), m); |
| 122 | processOFPortStatus((OFCircuitPortStatus) m); | 122 | processOFPortStatus((OFCircuitPortStatus) m); |
| 123 | break; | 123 | break; |
| 124 | case QUEUE_GET_CONFIG_REPLY: | 124 | case QUEUE_GET_CONFIG_REPLY: |
| ... | @@ -128,7 +128,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements | ... | @@ -128,7 +128,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements |
| 128 | case STATS_REPLY: | 128 | case STATS_REPLY: |
| 129 | OFStatsReply stats = (OFStatsReply) m; | 129 | OFStatsReply stats = (OFStatsReply) m; |
| 130 | if (stats.getStatsType() == OFStatsType.EXPERIMENTER) { | 130 | if (stats.getStatsType() == OFStatsType.EXPERIMENTER) { |
| 131 | - log.warn("LINC-OE : Received stats reply message {}", m); | 131 | + log.debug("LINC-OE : Received stats reply message {}", m); |
| 132 | createOpticalPortList((OFCircuitPortsReply) m); | 132 | createOpticalPortList((OFCircuitPortsReply) m); |
| 133 | driverHandshakeComplete.set(true); | 133 | driverHandshakeComplete.set(true); |
| 134 | } | 134 | } |
| ... | @@ -152,21 +152,21 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements | ... | @@ -152,21 +152,21 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements |
| 152 | OFCircuitPortsRequest circuitPortsRequest = factory() | 152 | OFCircuitPortsRequest circuitPortsRequest = factory() |
| 153 | .buildCircuitPortsRequest().setXid(getNextTransactionId()) | 153 | .buildCircuitPortsRequest().setXid(getNextTransactionId()) |
| 154 | .build(); | 154 | .build(); |
| 155 | - log.warn("LINC-OE : Sending experimented circuit port stats " + | 155 | + log.debug("LINC-OE : Sending experimented circuit port stats " + |
| 156 | "message " + | 156 | "message " + |
| 157 | "{}", | 157 | "{}", |
| 158 | circuitPortsRequest.toString()); | 158 | circuitPortsRequest.toString()); |
| 159 | this.sendHandshakeMessage(circuitPortsRequest); | 159 | this.sendHandshakeMessage(circuitPortsRequest); |
| 160 | } | 160 | } |
| 161 | 161 | ||
| 162 | - @Override | ||
| 163 | /** | 162 | /** |
| 164 | * Returns a list of standard (Ethernet) ports. | 163 | * Returns a list of standard (Ethernet) ports. |
| 165 | * | 164 | * |
| 166 | * @return List of ports | 165 | * @return List of ports |
| 167 | */ | 166 | */ |
| 167 | + @Override | ||
| 168 | public List<OFPortDesc> getPorts() { | 168 | public List<OFPortDesc> getPorts() { |
| 169 | - return Collections.EMPTY_LIST; | 169 | + return ImmutableList.of(); |
| 170 | } | 170 | } |
| 171 | 171 | ||
| 172 | /** | 172 | /** |
| ... | @@ -337,7 +337,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements | ... | @@ -337,7 +337,7 @@ public class OfOpticalSwitchImplLinc13 extends AbstractOpenFlowSwitch implements |
| 337 | @Override | 337 | @Override |
| 338 | public List<? extends OFObject> getPortsOf(PortDescPropertyType type) { | 338 | public List<? extends OFObject> getPortsOf(PortDescPropertyType type) { |
| 339 | if (!type.equals(PortDescPropertyType.OPTICAL_TRANSPORT)) { | 339 | if (!type.equals(PortDescPropertyType.OPTICAL_TRANSPORT)) { |
| 340 | - return Collections.EMPTY_LIST; | 340 | + return ImmutableList.of(); |
| 341 | } | 341 | } |
| 342 | 342 | ||
| 343 | return opticalPorts; | 343 | return opticalPorts; | ... | ... |
-
Please register or login to post a comment