commit fbca55eeffd5c056228b2dc435f8f6d90cf3df2e
author Charles Chan <rascov@gmail.com> Tue Jul 24 16:40:35 2018 -0700
committer Charles Chan <charles@opennetworking.org> Wed Jul 25 21:52:22 2018 +0000
tree ecd5a32d0327b3b8bfa3d4e91d711a2fd1809dee
parent 4eb73bb6e65edbadc121600b6b72889f27a5d7fd

Clarify log messages

Change-Id: I82e10496d1ff48143ed7391ea2ca6d92f501a4f4

app/src/main/java/org/onosproject/segmentrouting/HostHandler.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java b/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
index e4d85de..ffc0e4d 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/HostHandler.java
@@ -529,8 +529,8 @@
                                                 MacAddress mac, VlanId innerVlan,
                                                 VlanId outerVlan, EthType outerTpid,
                                                 IpAddress ip, boolean revoke) {
-        if (!srManager.handleDoubleTaggedHosts) {
-            log.debug("Ignore double tagged host {}/{}/{}", mac, outerVlan, innerVlan);
+        if (!srManager.routeDoubleTaggedHosts) {
+            log.debug("Routing for double tagged host is disabled. Ignore {}/{}/{}", mac, outerVlan, innerVlan);
             return;
         }
 
@@ -551,7 +551,7 @@
     }
 
     void populateAllDoubleTaggedHost() {
-        log.info("Populating all double tagged hosts");
+        log.info("Enabling routing for all double tagged hosts");
         Sets.newHashSet(srManager.hostService.getHosts()).stream().filter(this::isDoubleTaggedHost)
                 .forEach(h -> h.locations().forEach(l ->
                     h.ipAddresses().forEach(i ->
@@ -563,7 +563,7 @@
     }
 
     void revokeAllDoubleTaggedHost() {
-        log.info("Revoking all double tagged hosts");
+        log.info("Disabling routing for all double tagged hosts");
         Sets.newHashSet(srManager.hostService.getHosts()).stream().filter(this::isDoubleTaggedHost)
                 .forEach(h -> h.locations().forEach(l ->
                     h.ipAddresses().forEach(i ->

app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java

diff --git a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java b/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
index 5dc76bc..5905275 100644
--- a/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
+++ b/app/src/main/java/org/onosproject/segmentrouting/SegmentRoutingManager.java
@@ -247,9 +247,9 @@
             label = "Enable this to respond to ARP/NDP requests from unknown hosts.")
     boolean respondToUnknownHosts = true;
 
-    @Property(name = "handleDoubleTaggedHosts", boolValue = false,
-            label = "Program flows and groups for double tagged hosts")
-    boolean handleDoubleTaggedHosts = false;
+    @Property(name = "routeDoubleTaggedHosts", boolValue = false,
+            label = "Program flows and groups to pop and route double tagged hosts")
+    boolean routeDoubleTaggedHosts = false;
 
     ArpHandler arpHandler = null;
     IcmpHandler icmpHandler = null;
@@ -634,13 +634,13 @@
             log.info("{} responding to ARPs/NDPs from unknown hosts", respondToUnknownHosts ? "Enabling" : "Disabling");
         }
 
-        String strHandleDoubleTaggedHosts = Tools.get(properties, "handleDoubleTaggedHosts");
-        boolean expectHandleDoubleTaggedHosts = Boolean.parseBoolean(strHandleDoubleTaggedHosts);
-        if (expectHandleDoubleTaggedHosts != handleDoubleTaggedHosts) {
-            handleDoubleTaggedHosts = expectHandleDoubleTaggedHosts;
-            log.info("{} programming for double tagged hosts ", handleDoubleTaggedHosts ? "Enabling" : "Disabling");
+        String strRouteDoubleTaggedHosts = Tools.get(properties, "routeDoubleTaggedHosts");
+        boolean expectRouteDoubleTaggedHosts = Boolean.parseBoolean(strRouteDoubleTaggedHosts);
+        if (expectRouteDoubleTaggedHosts != routeDoubleTaggedHosts) {
+            routeDoubleTaggedHosts = expectRouteDoubleTaggedHosts;
+            log.info("{} routing for double tagged hosts", routeDoubleTaggedHosts ? "Enabling" : "Disabling");
 
-            if (handleDoubleTaggedHosts) {
+            if (routeDoubleTaggedHosts) {
                 hostHandler.populateAllDoubleTaggedHost();
             } else {
                 hostHandler.revokeAllDoubleTaggedHost();