commit c63dcf0b428ea99e8a9a88bc964a51e65b6dddf0
author Darin Petkov <petkov@chromium.org> Thu May 24 11:51:43 2012 +0200
committer Gerrit <chrome-bot@google.com> Thu May 24 10:24:34 2012 -0700
tree 41dddf2c66f4b179375d8185c5ad0d627f9c9c49
parent d1cd79736d7a9969c966a76a5906ea408bad3731

shill: wimax: Refactor service management out of WiMax into WiMaxProvider.

This allows WiMAX service management to be independent from the
availability of WiMAX devices.

BUG=chrome-os-partner:9907
TEST=unit tests

Change-Id: I52ad31ed8ef1d271b04bbd2cfc17729a5c112831
Reviewed-on: https://gerrit.chromium.org/gerrit/23511
Commit-Ready: Darin Petkov <petkov@chromium.org>
Reviewed-by: Darin Petkov <petkov@chromium.org>
Tested-by: Darin Petkov <petkov@chromium.org>

wimax_service.cc

diff --git a/wimax_service.cc b/wimax_service.cc
index c404f4c..24e0604 100644
--- a/wimax_service.cc
+++ b/wimax_service.cc
@@ -12,6 +12,7 @@
 #include <chromeos/dbus/service_constants.h>
 
 #include "shill/key_value_store.h"
+#include "shill/manager.h"
 #include "shill/scope_logger.h"
 #include "shill/store_interface.h"
 #include "shill/technology.h"
@@ -28,10 +29,8 @@
 WiMaxService::WiMaxService(ControlInterface *control,
                            EventDispatcher *dispatcher,
                            Metrics *metrics,
-                           Manager *manager,
-                           const WiMaxRefPtr &wimax)
+                           Manager *manager)
     : Service(control, dispatcher, metrics, manager, Technology::kWiMax),
-      wimax_(wimax),
       need_passphrase_(true) {
   PropertyStore *store = this->mutable_store();
   // TODO(benchan): Support networks that require no user credentials or
@@ -64,9 +63,16 @@
 }
 
 void WiMaxService::Stop() {
-  SLOG(WiMax, 2) << __func__;
+  if (!IsStarted()) {
+    return;
+  }
+  LOG(INFO) << "Stopping WiMAX service: " << GetStorageIdentifier();
   proxy_.reset();
   SetStrength(0);
+  if (device_) {
+    device_->OnServiceStopped(this);
+    device_ = NULL;
+  }
 }
 
 bool WiMaxService::Start(WiMaxNetworkProxyInterface *proxy) {
@@ -104,6 +110,7 @@
       Bind(&WiMaxService::OnSignalStrengthChanged, Unretained(this)));
   UpdateConnectable();
   proxy_.reset(local_proxy.release());
+  LOG(INFO) << "WiMAX service started: " << GetStorageIdentifier();
   return true;
 }
 
@@ -116,13 +123,30 @@
 }
 
 void WiMaxService::Connect(Error *error) {
+  if (device_) {
+    Error::PopulateAndLog(
+        error, Error::kAlreadyConnected, "Already connected.");
+    return;
+  }
+  device_ = manager()->wimax_provider()->SelectCarrier(this);
+  if (!device_) {
+    Error::PopulateAndLog(
+        error, Error::kNoCarrier, "No suitable WiMAX device available.");
+    return;
+  }
   Service::Connect(error);
-  wimax_->ConnectTo(this, error);
+  device_->ConnectTo(this, error);
 }
 
 void WiMaxService::Disconnect(Error *error) {
+  if (!device_) {
+    Error::PopulateAndLog(
+        error, Error::kNotConnected, "Not connected.");
+    return;
+  }
   Service::Disconnect(error);
-  wimax_->DisconnectFrom(this, error);
+  device_->DisconnectFrom(this, error);
+  device_ = NULL;
 }
 
 string WiMaxService::GetStorageIdentifier() const {
@@ -130,7 +154,11 @@
 }
 
 string WiMaxService::GetDeviceRpcId(Error *error) {
-  return wimax_->GetRpcIdentifier();
+  if (device_) {
+    return device_->GetRpcIdentifier();
+  }
+  error->Populate(Error::kNotSupported);
+  return "/";
 }
 
 bool WiMaxService::Is8021x() const {