commit 6515aabcd1fbbb9ff2090c9675c17eeef64e7474
author Chris Masone <cmasone@chromium.org> Wed Oct 12 16:19:09 2011 -0700
committer Gerrit <chrome-bot@google.com> Fri Oct 21 19:57:20 2011 -0700
tree 4654871364cc5c2aec8de64a64506cbe57788e49
parent f0aae10f69aa3b6083f0fcfb1b501f79a8b6b15e

[shill] Make profiles backed with StoreInterfaces

Rely on persistence of data in StoreInterface to maintain
Service/Device/IPConfig info for entities that are not
currently active, instead of maintaining lists in Profile
objects themselves.

BUG=chromium-os:17253
TEST=unit, run on device

Change-Id: I206f44ddf16c584354f8fcadb57032f047f33d0a
Reviewed-on: http://gerrit.chromium.org/gerrit/10024
Commit-Ready: Chris Masone <cmasone@chromium.org>
Reviewed-by: Chris Masone <cmasone@chromium.org>
Tested-by: Chris Masone <cmasone@chromium.org>

manager.cc

diff --git a/manager.cc b/manager.cc
index 452cda3..5f08ccb 100644
--- a/manager.cc
+++ b/manager.cc
@@ -133,9 +133,8 @@
   // Persist profile, device, service information to disk.
   vector<ProfileRefPtr>::iterator it;
   for (it = profiles_.begin(); it != profiles_.end(); ++it) {
-    (*it)->Finalize();
+    (*it)->Save();
   }
-  ephemeral_profile_->Finalize();
 
   adaptor_->UpdateRunning();
   modem_info_.Stop();
@@ -151,17 +150,14 @@
   return profiles_.back();
 }
 
-bool Manager::MoveToActiveProfile(const ProfileRefPtr &from,
-                                  const ServiceRefPtr &to_move) {
-  return ActiveProfile()->AdoptService(to_move) &&
-      from->AbandonService(to_move->UniqueName());
+bool Manager::MoveServiceToProfile(const ServiceRefPtr &to_move,
+                                   const ProfileRefPtr &destination) {
+  const ProfileRefPtr from = to_move->profile();
+  return destination->AdoptService(to_move) &&
+      from->AbandonService(to_move);
 }
 
 void Manager::RegisterDevice(const DeviceRefPtr &to_manage) {
-  // TODO(pstew): Should DefaultProfile have a list of devices, analogous to
-  // the list of services that it manages?  If so, we should do a similar merge
-  // thing here.
-
   vector<DeviceRefPtr>::iterator it;
   for (it = devices_.begin(); it != devices_.end(); ++it) {
     if (to_manage.get() == it->get())
@@ -172,6 +168,13 @@
   // TODO(pstew): Should check configuration
   if (running_)
     to_manage->Start();
+
+  // NB: Should we keep a ptr to default profile and only persist that here?
+  for (vector<ProfileRefPtr>::iterator it = profiles_.begin();
+       it != profiles_.end();
+       ++it) {
+    (*it)->Save();
+  }
 }
 
 void Manager::DeregisterDevice(const DeviceRefPtr &to_forget) {
@@ -190,15 +193,16 @@
 void Manager::RegisterService(const ServiceRefPtr &to_manage) {
   VLOG(2) << __func__ << to_manage->UniqueName();
 
+  bool merged = false;
   for (vector<ProfileRefPtr>::iterator it = profiles_.begin();
-       it != profiles_.end();
+       !merged && it != profiles_.end();
        ++it) {
-    if ((*it)->MergeService(to_manage))  // this will merge, if possible.
-      break;
+    merged = (*it)->MergeService(to_manage);  // Will merge, if possible.
   }
 
   // If not found, add it to the ephemeral profile
-  ephemeral_profile_->AdoptService(to_manage);
+  if (!merged)
+    ephemeral_profile_->AdoptService(to_manage);
 
   // Now add to OUR list.
   vector<ServiceRefPtr>::iterator it;
@@ -216,11 +220,7 @@
                                           service_paths);
 }
 
-void Manager::DeregisterService(const ServiceConstRefPtr &to_forget) {
-  // If the service is in the ephemeral profile, destroy it.
-  if (!ephemeral_profile_->AbandonService(to_forget->UniqueName())) {
-    // if it's in one of the real profiles...um...I guess mark it unconnectable?
-  }
+void Manager::DeregisterService(const ServiceRefPtr &to_forget) {
   vector<ServiceRefPtr>::iterator it;
   for (it = services_.begin(); it != services_.end(); ++it) {
     if (to_forget->UniqueName() == (*it)->UniqueName()) {