commit 44dba7bd56949b0a17758abd0037ab6151c9c01d
author Paul Stewart <pstew@chromium.org> Tue Apr 16 09:43:42 2013 -0700
committer ChromeBot <chrome-bot@google.com> Tue Apr 16 13:49:42 2013 -0700
tree a8ff05d89c749a538a5c298ba45d68ea8067a341
parent 1abbd48292d8e7d21981af16dc4e7d78b1727c2a

Technology: Add EthernetEap

Add a type for configuring shared EAP authentication parameters
for Ethernet networks.

CQ-DEPEND=CL:48227
BUG=chromium:227433
TEST=Recompile shill

Change-Id: I8791e285c35ed551f5c55b56a61200e98c30a328
Reviewed-on: https://gerrit.chromium.org/gerrit/48230
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Paul Stewart <pstew@chromium.org>
Tested-by: Paul Stewart <pstew@chromium.org>

technology.cc

diff --git a/technology.cc b/technology.cc
index ce6e7ac..d383b19 100644
--- a/technology.cc
+++ b/technology.cc
@@ -30,6 +30,8 @@
 Technology::Identifier Technology::IdentifierFromName(const string &name) {
   if (name == flimflam::kTypeEthernet) {
     return kEthernet;
+  } else if (name == kTypeEthernetEap) {
+    return kEthernetEap;
   } else if (name == flimflam::kTypeWifi) {
     return kWifi;
   } else if (name == flimflam::kTypeWimax) {
@@ -53,6 +55,8 @@
 string Technology::NameFromIdentifier(Technology::Identifier id) {
   if (id == kEthernet) {
     return flimflam::kTypeEthernet;
+  } else if (id == kEthernetEap) {
+    return kTypeEthernetEap;
   } else if (id == kWifi) {
     return flimflam::kTypeWifi;
   } else if (id == kWiMax) {

technology.h

diff --git a/technology.h b/technology.h
index 0e045d0..1863b4c 100644
--- a/technology.h
+++ b/technology.h
@@ -18,6 +18,7 @@
  public:
   enum Identifier {
     kEthernet,
+    kEthernetEap,
     kWifi,
     kWiFiMonitor,
     kWiMax,

technology_unittest.cc

diff --git a/technology_unittest.cc b/technology_unittest.cc
index 65d0dba..46200a9 100644
--- a/technology_unittest.cc
+++ b/technology_unittest.cc
@@ -20,6 +20,8 @@
 
 TEST_F(TechnologyTest, IdentifierFromName) {
   EXPECT_EQ(Technology::kEthernet, Technology::IdentifierFromName("ethernet"));
+  EXPECT_EQ(Technology::kEthernetEap,
+            Technology::IdentifierFromName("etherneteap"));
   EXPECT_EQ(Technology::kWifi, Technology::IdentifierFromName("wifi"));
   EXPECT_EQ(Technology::kWiMax, Technology::IdentifierFromName("wimax"));
   EXPECT_EQ(Technology::kCellular, Technology::IdentifierFromName("cellular"));
@@ -34,6 +36,8 @@
 
 TEST_F(TechnologyTest, NameFromIdentifier) {
   EXPECT_EQ("ethernet", Technology::NameFromIdentifier(Technology::kEthernet));
+  EXPECT_EQ("etherneteap",
+            Technology::NameFromIdentifier(Technology::kEthernetEap));
   EXPECT_EQ("wifi", Technology::NameFromIdentifier(Technology::kWifi));
   EXPECT_EQ("wimax", Technology::NameFromIdentifier(Technology::kWiMax));
   EXPECT_EQ("cellular", Technology::NameFromIdentifier(Technology::kCellular));