Getters and setters for boolean 07/20407/1
authorKeith Burns (alagalah) <alagalah@gmail.com>
Thu, 14 May 2015 15:43:47 +0000 (08:43 -0700)
committerKeith Burns (alagalah) <alagalah@gmail.com>
Thu, 14 May 2015 15:43:47 +0000 (08:43 -0700)
Change-Id: Id5833518ca860f49de0243bc58c866cc1f6fcee5
Signed-off-by: Keith Burns (alagalah) <alagalah@gmail.com>
renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/EndpointManager.java
renderers/ofoverlay/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/node/SwitchManager.java

index c149921b882e17ef5cff9ca050c1416121e46d87..489a6e35c2573662fa973cbbbf6063bbc005751c 100644 (file)
@@ -552,7 +552,7 @@ public class EndpointManager implements AutoCloseable, DataChangeListener {
                 Set<EpKey> epsNode = new HashSet<EpKey>();
                 epsNode.add(newEpKey);
                 endpointsByNode.put(newLoc, epsNode);
-                SwitchManager.activateEndpoint(newLoc);
+                SwitchManager.activatingSwitch(newLoc);
 
             } else {
                 Set<EpKey> epsNode = endpointsByNode.get(newLoc);
@@ -589,7 +589,7 @@ public class EndpointManager implements AutoCloseable, DataChangeListener {
                 epsNode.remove(oldEpKey);
                 if (epsNode.isEmpty()) {
                     endpointsByNode.remove(oldLoc);
-                    SwitchManager.deactivateEndpoint(oldLoc);
+                    SwitchManager.deactivatingSwitch(oldLoc);
                 }
             }
             // Update endpointsByGroupByNode
@@ -640,7 +640,7 @@ public class EndpointManager implements AutoCloseable, DataChangeListener {
                     epsNode.remove(oldEpKey);
                     if (epsNode.isEmpty()) {
                         endpointsByNode.remove(oldLoc);
-                        SwitchManager.deactivateEndpoint(oldLoc);
+                        SwitchManager.deactivatingSwitch(oldLoc);
                     }
                 }
                 // Update endpointsByGroupByNode
@@ -681,7 +681,7 @@ public class EndpointManager implements AutoCloseable, DataChangeListener {
                 Set<EpKey> newEpsNode = new HashSet<EpKey>();
                 newEpsNode.add(newEpKey);
                 endpointsByNode.put(newLoc, newEpsNode);
-                SwitchManager.activateEndpoint(newLoc);
+                SwitchManager.activatingSwitch(newLoc);
             } else {
                 Set<EpKey> newEpsNode = endpointsByNode.get(newLoc);
                 newEpsNode.add(newEpKey);
index f3b39c3e19609fc87dc765a7798ca6efeb7d8068..3b9126526b67569d856c4b62007990068181ace5 100644 (file)
@@ -82,14 +82,14 @@ public class SwitchManager implements AutoCloseable {
     }
 
     // When first endpoint is attached to switch, it can be ready
-    public static void activateEndpoint(NodeId nodeId) {
-        switches.get(nodeId).hasEndpoints=true;
+    public static void activatingSwitch(NodeId nodeId) {
+        switches.get(nodeId).setHasEndpoints(true);
         switches.get(nodeId).updateStatus();
     }
 
     // When last endpoint is removed from switch, it is no longer ready
-    public static void deactivateEndpoint(NodeId nodeId) {
-        switches.get(nodeId).hasEndpoints=false;
+    public static void deactivatingSwitch(NodeId nodeId) {
+        switches.get(nodeId).setHasEndpoints(false);;
         switches.get(nodeId).updateStatus();
     }
 
@@ -256,6 +256,16 @@ public class SwitchManager implements AutoCloseable {
         private Map<InstanceIdentifier<NodeConnector>, FlowCapableNodeConnector> fcncByNcIid = Maps.newHashMap();
         private boolean hasEndpoints=false;
 
+
+        public boolean isHasEndpoints() {
+            return hasEndpoints;
+        }
+
+
+        public void setHasEndpoints(boolean hasEndpoints) {
+            this.hasEndpoints = hasEndpoints;
+        }
+
         Map<Class<? extends TunnelTypeBase>, TunnelBuilder> tunnelBuilderByType = new HashMap<>();
         Set<NodeConnectorId> externalPorts = new HashSet<>();
 
@@ -327,7 +337,7 @@ public class SwitchManager implements AutoCloseable {
         private void updateStatus() {
             boolean tunnelWithIpAndNcExists = tunnelWithIpAndNcExists();
             if (fcNode != null) {
-                if (tunnelWithIpAndNcExists && hasEndpoints) {
+                if (tunnelWithIpAndNcExists && isHasEndpoints()) {
                     setStatus(SwitchStatus.READY);
                 } else {
                     setStatus(SwitchStatus.PREPARING);