Merge pull request #429 from JrCs/dns-search-domain

Add dns search domain

Author: crawford

Documentation/vmware-guestinfo.md

@@ -21,11 +21,12 @@ property names are prefixed with `guestinfo.` in the VMX, e.g., `guestinfo.hostn
 | `interface.<n>.route.<l>.gateway`     | `IP address`                    |
 | `interface.<n>.route.<l>.destination` | `CIDR IP address`               |
 | `dns.server.<x>`                      | `IP address`                    |
+| `dns.domain.<y>`                      | `DNS search domain`             |
 | `coreos.config.data`                  | `string`                        |
 | `coreos.config.data.encoding`         | `{"", "base64", "gzip+base64"}` |
 | `coreos.config.url`                   | `URL`                           |
 
-Note: "n", "m", "l", and "x" are 0-indexed, incrementing integers. The
+Note: "n", "m", "l", "x" and "y" are 0-indexed, incrementing integers. The
 identifier for an `interface` does not correspond to anything outside of this
 configuration; it serves only to distinguish between multiple `interface`s.
 

datasource/vmware/vmware.go

@@ -58,6 +58,12 @@ func (v vmware) FetchMetadata() (metadata datasource.Metadata, err error) {
 		}
 	}
 
+	for i := 0; ; i++ {
+		if domain := saveConfig("dns.domain.%d", i); domain == "" {
+			break
+		}
+	}
+
 	found := true
 	for i := 0; found; i++ {
 		found = false

network/interface.go

@@ -71,6 +71,9 @@ func (i *logicalInterface) Network() string {
 
 	switch conf := i.config.(type) {
 	case configMethodStatic:
+		if len(conf.domains) > 0 {
+			config += fmt.Sprintf("Domains=%s\n", strings.Join(conf.domains, " "))
+		}
 		for _, nameserver := range conf.nameservers {
 			config += fmt.Sprintf("DNS=%s\n", nameserver)
 		}

network/interface_test.go

@@ -89,13 +89,14 @@ func TestInterfaceGenerators(t *testing.T) {
 		{
 			name:    "testname",
 			netdev:  "[NetDev]\nKind=vlan\nName=testname\n\n[VLAN]\nId=0\n",
-			network: "[Match]\nName=testname\n\n[Network]\nDNS=8.8.8.8\n\n[Address]\nAddress=192.168.1.100/24\n\n[Route]\nDestination=0.0.0.0/0\nGateway=1.2.3.4\n",
+			network: "[Match]\nName=testname\n\n[Network]\nDomains=coreos.com example.com\nDNS=8.8.8.8\n\n[Address]\nAddress=192.168.1.100/24\n\n[Route]\nDestination=0.0.0.0/0\nGateway=1.2.3.4\n",
 			kind:    "vlan",
 			iface: &vlanInterface{logicalInterface: logicalInterface{
 				name: "testname",
 				config: configMethodStatic{
 					addresses:   []net.IPNet{{IP: []byte{192, 168, 1, 100}, Mask: []byte{255, 255, 255, 0}}},
 					nameservers: []net.IP{[]byte{8, 8, 8, 8}},
+					domains:     []string{"coreos.com", "example.com"},
 					routes:      []route{{destination: net.IPNet{IP: []byte{0, 0, 0, 0}, Mask: []byte{0, 0, 0, 0}}, gateway: []byte{1, 2, 3, 4}}},
 				},
 			}},

network/stanza.go

@@ -53,6 +53,7 @@ type configMethod interface{}
 type configMethodStatic struct {
 	addresses   []net.IPNet
 	nameservers []net.IP
+	domains     []string
 	routes      []route
 	hwaddress   net.HardwareAddr
 }

network/vmware.go

@@ -38,6 +38,17 @@ func ProcessVMwareNetconf(config map[string]string) ([]InterfaceGenerator, error
 	}
 	log.Printf("Parsed %d nameservers", len(nameservers))
 
+	log.Println("Parsing search domains")
+	var domains []string
+	for i := 0; ; i++ {
+		if domain, ok := config[fmt.Sprintf("dns.domain.%d", i)]; ok {
+			domains = append(domains, domain)
+		} else {
+			break
+		}
+	}
+	log.Printf("Parsed %d search domains", len(domains))
+
 	var interfaces []InterfaceGenerator
 	for i := 0; ; i++ {
 		var addresses []net.IPNet
@@ -86,6 +97,7 @@ func ProcessVMwareNetconf(config map[string]string) ([]InterfaceGenerator, error
 				hwaddress:   iface.hwaddr,
 				addresses:   addresses,
 				nameservers: nameservers,
+				domains:     domains,
 				routes:      routes,
 			}
 		} else if dhcp {

network/vmware_test.go

@@ -98,6 +98,8 @@ func TestProcessVMwareNetconf(t *testing.T) {
 			config: map[string]string{
 				"dns.server.0":                    "1.2.3.4",
 				"dns.server.1":                    "5.6.7.8",
+				"dns.domain.0":                    "coreos.com",
+				"dns.domain.1":                    "example.com",
 				"interface.0.mac":                 "00:11:22:33:44:55",
 				"interface.0.ip.0.address":        "10.0.0.100/24",
 				"interface.0.ip.1.address":        "10.0.0.101/24",
@@ -124,6 +126,7 @@ func TestProcessVMwareNetconf(t *testing.T) {
 							gateway:     net.ParseIP("10.0.0.1")},
 						},
 						nameservers: []net.IP{net.ParseIP("1.2.3.4"), net.ParseIP("5.6.7.8")},
+						domains:     []string{"coreos.com", "example.com"},
 					},
 				}},
 				&physicalInterface{logicalInterface{
@@ -135,6 +138,7 @@ func TestProcessVMwareNetconf(t *testing.T) {
 							gateway:     net.ParseIP("10.0.1.1")},
 						},
 						nameservers: []net.IP{net.ParseIP("1.2.3.4"), net.ParseIP("5.6.7.8")},
+						domains:     []string{"coreos.com", "example.com"},
 					},
 				}},
 				&physicalInterface{logicalInterface{