commit 093e83ea6849e6db8a8df89f167c9a0b35889808
author Yuta HIGUCHI <y-higuchi@onlab.us> Fri Oct 10 22:26:11 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Sat Oct 11 20:15:39 2014 -0700
tree b839e42e609e08be574fa648426631c637437cc4
parent db450ab3008329f7d6639bbfd7a346b1232548b9

Refactoring

- Renamed Clock{Service, Provider} -> DeviceClock*
- move from store -> net/device package

Change-Id: Ib4ba5119146bb2df97d3148f48890fb1f47d6a9d

core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java

diff --git a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
index 36caafb..d1d9db9 100644
--- a/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
@@ -28,6 +28,7 @@
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DefaultDeviceDescription;
 import org.onlab.onos.net.device.DeviceAdminService;
+import org.onlab.onos.net.device.DeviceClockProviderService;
 import org.onlab.onos.net.device.DeviceDescription;
 import org.onlab.onos.net.device.DeviceEvent;
 import org.onlab.onos.net.device.DeviceListener;
@@ -40,7 +41,6 @@
 import org.onlab.onos.net.device.PortDescription;
 import org.onlab.onos.net.provider.AbstractProviderRegistry;
 import org.onlab.onos.net.provider.AbstractProviderService;
-import org.onlab.onos.store.ClockProviderService;
 import org.slf4j.Logger;
 
 /**
@@ -82,7 +82,7 @@
     protected MastershipTermService termService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected ClockProviderService clockProviderService;
+    protected DeviceClockProviderService deviceClockProviderService;
 
     @Activate
     public void activate() {
@@ -217,7 +217,7 @@
                 return;
             }
             // tell clock provider if this instance is the master
-            clockProviderService.setMastershipTerm(deviceId, term);
+            deviceClockProviderService.setMastershipTerm(deviceId, term);
 
             DeviceEvent event = store.createOrUpdateDevice(provider().id(),
                     deviceId, deviceDescription);
@@ -333,7 +333,7 @@
 
                 if (term.master().equals(myNodeId)) {
                     // only set the new term if I am the master
-                    clockProviderService.setMastershipTerm(did, term);
+                    deviceClockProviderService.setMastershipTerm(did, term);
                 }
 
                 // FIXME: we should check that the device is connected on our end.