Refactor bindMacAddr function from VPLS app.

Change-Id: I4f484bbc02dae756e60c9fb5e1d2ef8a0f722b85

Refactor bindMacAddr function from VPLS app.
Change-Id: I4f484bbc02dae756e60c9fb5e1d2ef8a0f722b85
Yi Tseng · Gerrit Code Review
Commit bf8b67ea9bc5d52d3e14adeae6ccc4b3d9c748ba bf8b67ea 1 parent 3bbca2a6
Showing 1 changed file with 8 additions and 9 deletions
apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java
--- a/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java
View file @bf8b67e
+++ b/apps/vpls/src/main/java/org/onosproject/vpls/Vpls.java
View file @bf8b67e
@@ -177,15 +177,14 @@ public class Vpls {
         VlanId vlanId = e.getKey();
         ConnectPoint cp = e.getValue();
         Set<Host> connectedHosts = hostService.getConnectedHosts(cp);
-        if (!connectedHosts.isEmpty()) {
+        connectedHosts.forEach(host -> {
-            connectedHosts.forEach(host -> {
+            if (host.vlan().equals(vlanId)) {
-                if (host.vlan().equals(vlanId)) {
+                confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac()));
-                    confHostPresentCPoint.put(vlanId, Pair.of(cp, host.mac()));
+            } else {
-                } else {
+                confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
-                    confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
+            }
-                }
+        });
-            });
+        if (connectedHosts.isEmpty()) {
-        } else {
             confHostPresentCPoint.put(vlanId, Pair.of(cp, null));
         }
     }