commit f8046b8f975417255baf5cc7cdd025c63aa2f918
author Darin Petkov <petkov@chromium.org> Tue Apr 24 16:29:23 2012 +0200
committer Gerrit <chrome-bot@google.com> Tue Apr 24 12:01:12 2012 -0700
tree d72de95d06314b2b2243e7e5c240d0cce29abb5e
parent fdfdc87aba2f979ac98c52a70a14739fcf34c96f

shill: vpn: Create a VPN device for L2TP/IPSec and apply IP configuration.

Also, implement a new DeviceInfo API for retrieving the interface
index based on the interface name.

BUG=chromium-os:18496,chromium-os:29912
TEST=unit tests

Change-Id: I7d9e667d2c63baa96ed2b01dfa580de7d361b5f3
Reviewed-on: https://gerrit.chromium.org/gerrit/20931
Tested-by: Darin Petkov <petkov@chromium.org>
Reviewed-by: Paul Stewart <pstew@chromium.org>
Reviewed-by: Ben Chan <benchan@chromium.org>
Commit-Ready: Darin Petkov <petkov@chromium.org>

l2tp_ipsec_driver_unittest.cc

diff --git a/l2tp_ipsec_driver_unittest.cc b/l2tp_ipsec_driver_unittest.cc
index 91e2698..fa786b2 100644
--- a/l2tp_ipsec_driver_unittest.cc
+++ b/l2tp_ipsec_driver_unittest.cc
@@ -19,7 +19,9 @@
 #include "shill/mock_metrics.h"
 #include "shill/mock_nss.h"
 #include "shill/mock_service.h"
+#include "shill/mock_vpn.h"
 #include "shill/mock_vpn_service.h"
+#include "shill/vpn.h"
 
 using std::find;
 using std::map;
@@ -41,9 +43,12 @@
   L2TPIPSecDriverTest()
       : device_info_(&control_, &dispatcher_, &metrics_, &manager_),
         manager_(&control_, &dispatcher_, &metrics_, &glib_),
-        driver_(new L2TPIPSecDriver(&control_, &manager_, &glib_)),
+        driver_(new L2TPIPSecDriver(&control_, &dispatcher_, &metrics_,
+                                    &manager_, &device_info_, &glib_)),
         service_(new MockVPNService(&control_, &dispatcher_, &metrics_,
-                                    &manager_, driver_)) {
+                                    &manager_, driver_)),
+        device_(new MockVPN(&control_, &dispatcher_, &metrics_, &manager_,
+                            kInterfaceName, kInterfaceIndex)) {
     driver_->nss_ = &nss_;
   }
 
@@ -56,11 +61,15 @@
   virtual void TearDown() {
     driver_->child_watch_tag_ = 0;
     driver_->pid_ = 0;
+    driver_->device_ = NULL;
     driver_->service_ = NULL;
     ASSERT_TRUE(temp_dir_.Delete());
   }
 
  protected:
+  static const char kInterfaceName[];
+  static const int kInterfaceIndex;
+
   void SetArg(const string &arg, const string &value) {
     driver_->args_.SetString(arg, value);
   }
@@ -88,9 +97,13 @@
   MockManager manager_;
   L2TPIPSecDriver *driver_;  // Owned by |service_|.
   scoped_refptr<MockVPNService> service_;
+  scoped_refptr<MockVPN> device_;
   MockNSS nss_;
 };
 
+const char L2TPIPSecDriverTest::kInterfaceName[] = "ppp0";
+const int L2TPIPSecDriverTest::kInterfaceIndex = 123;
+
 void L2TPIPSecDriverTest::GetLogin(string */*user*/, string */*password*/) {}
 
 void L2TPIPSecDriverTest::Notify(
@@ -435,6 +448,7 @@
 TEST_F(L2TPIPSecDriverTest, Notify) {
   map<string, string> config;
   static const char kPeer[] = "99.88.77.66";
+  config["INTERNAL_IFNAME"] = kInterfaceName;
   config["GATEWAY_ADDRESS"] = "192.168.1.1";
   config["LNS_ADDRESS"] = kPeer;
   scoped_refptr<MockService> service(
@@ -442,9 +456,14 @@
   scoped_refptr<MockConnection> connection(
       new StrictMock<MockConnection>(&device_info_));
   service->set_mock_connection(connection);
+  EXPECT_CALL(device_info_, GetIndex(kInterfaceName))
+      .WillOnce(Return(kInterfaceIndex));
   EXPECT_CALL(manager_, GetDefaultService()).WillOnce(Return(service));
   EXPECT_CALL(*connection, RequestHostRoute(IsIPAddress(kPeer)))
       .WillOnce(Return(true));
+  EXPECT_CALL(*device_, SetEnabled(true));
+  EXPECT_CALL(*device_, UpdateIPConfig(_));
+  driver_->device_ = device_;
   FilePath psk_file = SetupPSKFile();
   driver_->Notify("connect", config);
   EXPECT_FALSE(file_util::PathExists(psk_file));