Use Managed properties for Preferred and Provider.

This includes some necessary ONC translation fixes.

BUG=279351
R=armansito@chromium.org, pneubeck@chromium.org

Review URL: https://codereview.chromium.org/482243002

Cr-Commit-Position: refs/heads/master@{#291085}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291085 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 82 insertions, 28 deletions

diff --git a/chromeos/test/data/network/shill_openvpn_with_errors.json b/chromeos/test/data/network/shill_openvpn_with_errors.json
deleted file mode 100644
index 9ac9d53..0000000
--- a/chromeos/test/data/network/shill_openvpn_with_errors.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    // Missing GUID.
-    "Type": "vpn",
-    "Name": "my vpn",
-    // String instead of Int.
-    "SaveCredentials": "false",
-    "Provider.Type": "openvpn",
-    "Provider.Host": "vpn.my.domain.com",
-    "OpenVPN.AuthRetry": "interact",
-    "OpenVPN.User": "abc ${LOGIN_EMAIL} def",
-    "OpenVPN.Password": "some password",
-    "OpenVPN.StaticChallenge": "Please enter token OTP",
-    "OpenVPN.CompLZO": "true",
-    // Int instead of String.
-    "OpenVPN.ServerPollTimeout": 10,
-    "OpenVPN.RemoteCertKU": "e0",
-    "OpenVPN.RemoteCertTLS": "server",
-    "OpenVPN.Port": "443",
-    "OpenVPN.TLSRemote": "my.domain.com",
-    "OpenVPN.KeyDirection": "1",
-    "OpenVPN.RenegSec": "0",
-    "OpenVPN.RemoteCertEKU": "TLS Web Server Authentication",
-    "OpenVPN.Proto": "udp",
-    "OpenVPN.PushPeerInfo": "true",
-    "OpenVPN.TLSAuthContents": "-----BEGIN OpenVPN Static key V1-----\n83f8e7ccd99be189b4663e18615f9166\nd885cdea6c8accb0ebf5be304f0b8081\n5404f2a6574e029815d7a2fb65b83d0c\n676850714c6a56b23415a78e06aad6b1\n34900dd512049598382039e4816cb5ff\n1848532b71af47578c9b4a14b5bca49f\n99e0ae4dae2f4e5eadfea374aeb8fb1e\na6fdf02adc73ea778dfd43d64bf7bc75\n7779d629498f8c2fbfd32812bfdf6df7\n8cebafafef3e5496cb13202274f2768a\n1959bc53d67a70945c4c8c6f34b63327\nfb60dc84990ffec1243461e0b6310f61\ne90aee1f11fb6292d6f5fcd7cd508aab\n50d80f9963589c148cb4b933ec86128d\ned77d3fad6005b62f36369e2319f52bd\n09c6d2e52cce2362a05009dc29b6b39a\n-----END OpenVPN Static key V1-----\n"
-}
diff --git a/chromeos/test/data/network/shill_output_l2tpipsec.json b/chromeos/test/data/network/shill_output_l2tpipsec.json
new file mode 100644
index 0000000..4848ab4
--- /dev/null
+++ b/chromeos/test/data/network/shill_output_l2tpipsec.json
@@ -0,0 +1,14 @@
+{ "GUID": "guid",
+  "Type": "vpn",
+  "Name": "MyL2TPVPN",
+  "Provider": {
+    "Host": "some.host.org",
+    "L2TPIPsec.PSK": "some_preshared_key",
+    "L2TPIPsec.User": "some username",
+    "L2TPIPsec.XauthPassword": "some xauth password",
+    "L2TPIPsec.XauthUser": "some xauth username",
+    "L2TPIPsec.Password": "some password",
+    "Type": "l2tpipsec",
+  },
+  "SaveCredentials": true
+}
diff --git a/chromeos/test/data/network/shill_output_openvpn.json b/chromeos/test/data/network/shill_output_openvpn.json
new file mode 100644
index 0000000..692834c
--- /dev/null
+++ b/chromeos/test/data/network/shill_output_openvpn.json
@@ -0,0 +1,34 @@
+{
+  "AutoConnect":true,
+  "GUID":"{a3860e83-f03d-4cb1-bafa-b22c9e746950}",
+  "Name":"my vpn",
+  "Provider": {
+    "Host":"vpn.my.domain.com",
+    "OpenVPN.AuthRetry":"interact",
+    "OpenVPN.CACertPEM":[
+      "pem1",
+      "pem2"
+    ],
+    "OpenVPN.CompLZO":"true",
+    "OpenVPN.KeyDirection":"1",
+    "OpenVPN.Password":"some password",
+    "OpenVPN.Port":"443",
+    "OpenVPN.Proto":"udp",
+    "OpenVPN.PushPeerInfo":"true",
+    "OpenVPN.RemoteCertEKU":"TLS Web Server Authentication",
+    "OpenVPN.RemoteCertKU":"e0",
+    "OpenVPN.RemoteCertTLS":"server",
+    "OpenVPN.RenegSec":"0",
+    "OpenVPN.ServerPollTimeout":"10",
+    "OpenVPN.StaticChallenge":"Please enter token OTP",
+    "OpenVPN.TLSAuthContents":"-----BEGIN OpenVPN Static key V1-----\n83f8e7ccd99be189b4663e18615f9166\nd885cdea6c8accb0ebf5be304f0b8081\n5404f2a6574e029815d7a2fb65b83d0c\n676850714c6a56b23415a78e06aad6b1\n34900dd512049598382039e4816cb5ff\n1848532b71af47578c9b4a14b5bca49f\n99e0ae4dae2f4e5eadfea374aeb8fb1e\na6fdf02adc73ea778dfd43d64bf7bc75\n7779d629498f8c2fbfd32812bfdf6df7\n8cebafafef3e5496cb13202274f2768a\n1959bc53d67a70945c4c8c6f34b63327\nfb60dc84990ffec1243461e0b6310f61\ne90aee1f11fb6292d6f5fcd7cd508aab\n50d80f9963589c148cb4b933ec86128d\ned77d3fad6005b62f36369e2319f52bd\n09c6d2e52cce2362a05009dc29b6b39a\n-----END OpenVPN Static key V1-----\n",
+    "OpenVPN.TLSRemote":"my.domain.com",
+    "OpenVPN.User":"abc ${LOGIN_EMAIL} def",
+    "OpenVPN.VerifyHash":"some hash",
+    "OpenVPN.VerifyX509Name":"some x509 name",
+    "OpenVPN.VerifyX509Type":"name-prefix",
+    "Type":"openvpn",
+  },
+  "SaveCredentials":false,
+  "Type":"vpn"
+}
diff --git a/chromeos/test/data/network/shill_output_openvpn_with_errors.json b/chromeos/test/data/network/shill_output_openvpn_with_errors.json
new file mode 100644
index 0000000..3639283
--- /dev/null
+++ b/chromeos/test/data/network/shill_output_openvpn_with_errors.json
@@ -0,0 +1,28 @@
+{
+    // Missing GUID.
+    "Type": "vpn",
+    "Name": "my vpn",
+    // String instead of Boolean.
+    "SaveCredentials": "false!",
+    "Provider": {
+      "Host": "vpn.my.domain.com",
+      "OpenVPN.AuthRetry": "interact",
+      "OpenVPN.User": "abc ${LOGIN_EMAIL} def",
+      "OpenVPN.Password": "some password",
+      "OpenVPN.StaticChallenge": "Please enter token OTP",
+      "OpenVPN.CompLZO": "true",
+      // Int instead of String.
+      "OpenVPN.ServerPollTimeout": 10,
+      "OpenVPN.RemoteCertKU": "e0",
+      "OpenVPN.RemoteCertTLS": "server",
+      "OpenVPN.Port": "443",
+      "OpenVPN.TLSRemote": "my.domain.com",
+      "OpenVPN.KeyDirection": "1",
+      "OpenVPN.RenegSec": "0",
+      "OpenVPN.RemoteCertEKU": "TLS Web Server Authentication",
+      "OpenVPN.Proto": "udp",
+      "OpenVPN.PushPeerInfo": "true",
+      "OpenVPN.TLSAuthContents": "-----BEGIN OpenVPN Static key V1-----\n83f8e7ccd99be189b4663e18615f9166\nd885cdea6c8accb0ebf5be304f0b8081\n5404f2a6574e029815d7a2fb65b83d0c\n676850714c6a56b23415a78e06aad6b1\n34900dd512049598382039e4816cb5ff\n1848532b71af47578c9b4a14b5bca49f\n99e0ae4dae2f4e5eadfea374aeb8fb1e\na6fdf02adc73ea778dfd43d64bf7bc75\n7779d629498f8c2fbfd32812bfdf6df7\n8cebafafef3e5496cb13202274f2768a\n1959bc53d67a70945c4c8c6f34b63327\nfb60dc84990ffec1243461e0b6310f61\ne90aee1f11fb6292d6f5fcd7cd508aab\n50d80f9963589c148cb4b933ec86128d\ned77d3fad6005b62f36369e2319f52bd\n09c6d2e52cce2362a05009dc29b6b39a\n-----END OpenVPN Static key V1-----\n",
+      "Type": "openvpn"
+    }
+}
diff --git a/chromeos/test/data/network/shill_wifi_with_state.json b/chromeos/test/data/network/shill_wifi_with_state.json
index 865162b..8ae1dc5 100644
--- a/chromeos/test/data/network/shill_wifi_with_state.json
+++ b/chromeos/test/data/network/shill_wifi_with_state.json
@@ -1,9 +1,11 @@
 {
    "AutoConnect": true,
+   "Connectable": true,
    "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
    "Mode": "managed",
    "Name": "OpenWrt",
    "Passphrase": "some passphrase",
+   "Priority": 1,
    "Security": "psk",
    "State": "idle",
    "Strength": 10,
diff --git a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc
index 1e6d3da..271a7182 100644
--- a/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc
+++ b/chromeos/test/data/network/translation_of_shill_l2tpipsec.onc
@@ -20,7 +20,7 @@
     },
     "L2TP": {
       "Username": "some username",
-      "Password": "some password"
-    }
+      "Password": "some password",
+    },
   }
 }
diff --git a/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc b/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
index c49bf16..d149a43 100644
--- a/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
+++ b/chromeos/test/data/network/translation_of_shill_wifi_with_state.onc
@@ -1,6 +1,8 @@
 {
+  "Connectable": true,
   "GUID": "{64c4f86b-cf6a-4e4a-8eff-456def}",
   "Name": "OpenWrt",
+  "Priority": 1,
   "Type": "WiFi",
   "WiFi": {
     "AutoConnect": true,