Fixing log messages
Fixing onos-config glitch
Change-Id: I15a1d7bc0a4fc50773f041328958bf02e8e4cb0f
diff --git a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
index ccb66ad..6aa040b 100644
--- a/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onosproject/fwd/ReactiveForwarding.java
@@ -192,7 +192,7 @@
readComponentConfiguration(context);
requestIntercepts();
- log.info("Started with Application ID {}", appId.id());
+ log.info("Started", appId.id());
}
@Deactivate
@@ -213,7 +213,7 @@
}
/**
- * Request packet in via PacketService.
+ * Request packet in via packet service.
*/
private void requestIntercepts() {
TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
@@ -231,7 +231,7 @@
}
/**
- * Cancel request for packet in via PacketService.
+ * Cancel request for packet in via packet service.
*/
private void withdrawIntercepts() {
TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
@@ -353,7 +353,7 @@
if (ignoreIpv4McastPackets != ignoreIpv4McastPacketsEnabled) {
ignoreIpv4McastPackets = ignoreIpv4McastPacketsEnabled;
log.info("Configured. Ignore IPv4 multicast packets is {}",
- ignoreIpv4McastPackets ? "enabled" : "disabled");
+ ignoreIpv4McastPackets ? "enabled" : "disabled");
}
}
@@ -691,12 +691,12 @@
}
private void fixBlackhole(ConnectPoint egress) {
- Set<FlowEntry> rules = getFlowRulesFrom(egress);
+ Set<FlowEntry> rules = getFlowRulesFrom(egress);
Set<SrcDstPair> pairs = findSrcDstPairs(rules);
Map<DeviceId, Set<Path>> srcPaths = new HashMap<>();
- for (SrcDstPair sd: pairs) {
+ for (SrcDstPair sd : pairs) {
// get the edge deviceID for the src host
DeviceId srcId = hostService.getHost(HostId.hostId(sd.src)).location().deviceId();
DeviceId dstId = hostService.getHost(HostId.hostId(sd.dst)).location().deviceId();
@@ -715,20 +715,20 @@
// Backtracks from link down event to remove flows that lead to blackhole
private void backTrackBadNodes(Set<Path> shortestPaths, DeviceId dstId, SrcDstPair sd) {
- for (Path p: shortestPaths) {
+ for (Path p : shortestPaths) {
List<Link> pathLinks = p.links();
for (int i = 0; i < pathLinks.size(); i = i + 1) {
Link curLink = pathLinks.get(i);
DeviceId curDevice = curLink.src().deviceId();
- log.trace("Currently inspecting device: " + curDevice);
// skipping the first link because this link's src has already been pruned beforehand
if (i != 0) {
cleanFlowRules(sd, curDevice);
}
- Set<Path> pathsFromCurDevice = topologyService.getPaths(topologyService.currentTopology(),
- curDevice, dstId);
+ Set<Path> pathsFromCurDevice =
+ topologyService.getPaths(topologyService.currentTopology(),
+ curDevice, dstId);
if (pickForwardPath(pathsFromCurDevice, curLink.src().port()) != null) {
break;
} else {
@@ -748,7 +748,7 @@
boolean matchesSrc = false, matchesDst = false;
for (Instruction i : r.treatment().allInstructions()) {
if (i.type() == Instruction.Type.OUTPUT) {
- //if the flow has matching src and dst
+ // if the flow has matching src and dst
for (Criterion cr : r.selector().criteria()) {
if (cr.type() == Criterion.Type.ETH_DST) {
if (((EthCriterion) cr).mac().equals(pair.dst)) {
@@ -773,9 +773,9 @@
// Returns a set of src/dst MAC pairs extracted from the specified set of flow entries
private Set<SrcDstPair> findSrcDstPairs(Set<FlowEntry> rules) {
ImmutableSet.Builder<SrcDstPair> builder = ImmutableSet.builder();
- for (FlowEntry r: rules) {
+ for (FlowEntry r : rules) {
MacAddress src = null, dst = null;
- for (Criterion cr: r.selector().criteria()) {
+ for (Criterion cr : r.selector().criteria()) {
if (cr.type() == Criterion.Type.ETH_DST) {
dst = ((EthCriterion) cr).mac();
} else if (cr.type() == Criterion.Type.ETH_SRC) {
diff --git a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
index 2c9d9aa..2ea308b 100644
--- a/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
+++ b/core/net/src/main/java/org/onosproject/event/impl/CoreEventDispatcher.java
@@ -156,7 +156,7 @@
long delta = System.currentTimeMillis() - lastStart;
if (lastStart > 0 && delta > maxProcessMillis) {
lastStart = 0;
- log.error("Event sink {} exceeded execution time limit: {} ms",
+ log.warn("Event sink {} exceeded execution time limit: {} ms; spawning new dispatch loop",
lastSink.getClass().getName(), delta);
// Notify the sink that it has exceeded its time limit.
diff --git a/tools/test/bin/onos-config b/tools/test/bin/onos-config
index 4fe122a..5c3ab02 100755
--- a/tools/test/bin/onos-config
+++ b/tools/test/bin/onos-config
@@ -53,5 +53,5 @@
scp -qr ${ONOS_ROOT}/tools/package/config/ $remote:$ONOS_INSTALL_DIR/
# Copy the desired initial network configuration to remote if needed
-[ -n $ONOS_CFG -a -f $ONOS_CFG -a "${1:-$OCI}" = "$OC1" ] && \
+[ -n "$ONOS_CFG" -a -f "$ONOS_CFG" -a "${1:-$OCI}" = "$OC1" ] && \
scp $ONOS_CFG $remote:$ONOS_INSTALL_DIR/config/network-cfg.json