ONC: Add SearchDomains, IncludedRoutes, ExcludedRoutes to StaticIPConfig

These are needed to support the new ARC VPN type.

BUG=696865
TEST=use chrome.networkingPrivate to create/query a network with the
     new properties

Change-Id: I3157ca6d8ccf51c0071b1c3b6b0f6a47f5dd5360
Reviewed-on: https://chromium-review.googlesource.com/592540Reviewed-by: Steven Bennetts <stevenjb@chromium.org>
Commit-Queue: Kevin Cernekee <cernekee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#501447}

chromeos/network/onc/onc_signature.cc

@@ -183,6 +183,8 @@ const OncFieldSignature ipconfig_fields[] = {
     {::onc::ipconfig::kNameServers, &kStringListSignature},
     {::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
     {::onc::ipconfig::kSearchDomains, &kStringListSignature},
+    {::onc::ipconfig::kIncludedRoutes, &kStringListSignature},
+    {::onc::ipconfig::kExcludedRoutes, &kStringListSignature},
     {::onc::ipconfig::kType, &kStringSignature},
     {::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
     {NULL}};

chromeos/network/onc/onc_translation_tables.cc

@@ -235,6 +235,9 @@ const FieldTranslationEntry static_or_saved_ipconfig_fields[] = {
     {::onc::ipconfig::kGateway, shill::kGatewayProperty},
     {::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
     {::onc::ipconfig::kNameServers, shill::kNameServersProperty},
+    {::onc::ipconfig::kSearchDomains, shill::kSearchDomainsProperty},
+    {::onc::ipconfig::kIncludedRoutes, shill::kIncludedRoutesProperty},
+    {::onc::ipconfig::kExcludedRoutes, shill::kExcludedRoutesProperty},
     {NULL}};
 
 struct OncValueTranslationEntry {

components/onc/docs/onc_spec.md

@@ -362,6 +362,24 @@ static IP configuration (see **StaticIPConfig**).
       should not start with a dot. Example: `["corp.acme.org", "acme.org" ]`.
       If not specified, DHCP values will be used.
 
+* **IncludedRoutes**
+    * (optional) - **array of string**
+    * An array of strings, each of which is an IP block in CIDR notation,
+      whose traffic should be handled by the network. Example:
+      `["10.0.0.0/8", "192.168.5.0/24"]`. If **IncludedRoutes** or
+      **ExcludedRoutes** are not specified, this network
+      will be used to handle traffic for all IPs by default. Currently this
+      property only has an effect if the Network **Type** is *VPN* and the
+      VPN **Type** is *ARCVPN*.
+
+* **ExcludedRoutes**
+    * (optional) - **array of string**
+    * An array of strings, each of which is an IP block in CIDR notation,
+      whose traffic should **not** be handled by the network. Example:
+      `["10.0.0.0/8", "192.168.5.0/24"]`. Currently this
+      only has an effect if the Network **Type** is *VPN* and the VPN
+      **Type** is *ARCVPN*.
+
 * **WebProxyAutoDiscoveryUrl**
     * (optional if part of **IPConfigs**, read-only) - **string**
     * The Web Proxy Auto-Discovery URL for this network as reported over DHCP.

components/onc/onc_constants.cc

@@ -209,6 +209,8 @@ const char kIPv6[] = "IPv6";
 const char kNameServers[] = "NameServers";
 const char kRoutingPrefix[] = "RoutingPrefix";
 const char kSearchDomains[] = "SearchDomains";
+const char kIncludedRoutes[] = "IncludedRoutes";
+const char kExcludedRoutes[] = "ExcludedRoutes";
 const char kType[] = "Type";
 const char kWebProxyAutoDiscoveryUrl[] = "WebProxyAutoDiscoveryUrl";
 }  // namespace ipconfig

components/onc/onc_constants.h

@@ -208,6 +208,8 @@ ONC_EXPORT extern const char kIPv6[];
 ONC_EXPORT extern const char kNameServers[];
 ONC_EXPORT extern const char kRoutingPrefix[];
 ONC_EXPORT extern const char kSearchDomains[];
+ONC_EXPORT extern const char kIncludedRoutes[];
+ONC_EXPORT extern const char kExcludedRoutes[];
 ONC_EXPORT extern const char kType[];
 ONC_EXPORT extern const char kWebProxyAutoDiscoveryUrl[];
 }  // namespace ipconfig