commit 9ec39822db90540bcb628091e4476d329fd26ca3
author Sho SHIMIZU <shimizu.sho@jp.fujitsu.com> Thu Jul 10 17:15:12 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Mon Jul 14 18:59:22 2014 -0700
tree 4c9e3238d4184fa401239b160c45a0d81864b097
parent f7c31a4a8b02813ac7b785333716d05f255b8de4

Refactor caller ID related code

- Replace instantiation of CallerId with constant field
- Rename the field, callerId, to caller

Change-Id: If54177357610c563d3636793319427a25b72c12f

src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java

diff --git a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
index b273965..f4bf28d 100644
--- a/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
+++ b/src/main/java/net/onrc/onos/apps/sdnip/SdnIp.java
@@ -87,6 +87,7 @@
         IOFSwitchListener, IConfigInfoService {
 
     private static final Logger log = LoggerFactory.getLogger(SdnIp.class);
+    private final CallerId callerId = new CallerId("SDNIP");
 
     private IFloodlightProviderService floodlightProvider;
     private ILinkDiscoveryService linkDiscoveryService;
@@ -104,7 +105,7 @@
     private String currentConfigFilename = DEFAULT_CONFIG_FILENAME;
 
     /* ShortestPath Intent Variables */
-    private final String callerId = "SdnIp";
+    private final String caller = "SdnIp";
     private IControllerRegistryService controllerRegistryService;
     private IPathCalcRuntimeService pathRuntime;
     /* Shortest Intent Path Variables */
@@ -535,7 +536,7 @@
                 prefix, nextHopMacAddress);
 
         FlowPath flowPath = new FlowPath();
-        flowPath.setInstallerId(new CallerId("SDNIP"));
+        flowPath.setInstallerId(callerId);
 
         // Set flowPath FlowPathType and FlowPathUserState
         flowPath.setFlowPathType(FlowPathType.FP_TYPE_SHORTEST_PATH);
@@ -771,7 +772,7 @@
 
         FlowPath flowPath = new FlowPath();
 
-        flowPath.setInstallerId(new CallerId("SDNIP"));
+        flowPath.setInstallerId(callerId);
 
         // Set flowPath FlowPathType and FlowPathUserState
         flowPath.setFlowPathType(FlowPathType.FP_TYPE_SHORTEST_PATH);
@@ -867,8 +868,8 @@
             //Inet4Address.
             int srcIP = InetAddresses.coerceToInteger(peerInterface.getIpAddress());
             int dstIP = InetAddresses.coerceToInteger(bgpPeer.getIpAddress());
-            String fwdIntentId = callerId + ":" + controllerRegistryService.getNextUniqueId();
-            String bwdIntentId = callerId + ":" + controllerRegistryService.getNextUniqueId();
+            String fwdIntentId = caller + ":" + controllerRegistryService.getNextUniqueId();
+            String bwdIntentId = caller + ":" + controllerRegistryService.getNextUniqueId();
             SwitchPort srcPort =
                 new SwitchPort(bgpdAttachmentPoint.dpid(),
                                bgpdAttachmentPoint.port());
@@ -897,7 +898,7 @@
         for (BgpPeer bgpPeer : bgpPeers.values()) {
 
             FlowPath flowPath = new FlowPath();
-            flowPath.setInstallerId(new CallerId("SDNIP"));
+            flowPath.setInstallerId(callerId);
 
             // Set flowPath FlowPathType and FlowPathUserState
             flowPath.setFlowPathType(FlowPathType.FP_TYPE_SHORTEST_PATH);