new file mode 100644

@@ -0,0 +1,470 @@

+diff --git a/cloudinit/sources/DataSourceVMwareGuestInfo.py b/cloudinit/sources/DataSourceVMwareGuestInfo.py

+index e69de29..59dd685 100644

+--- a/cloudinit/sources/DataSourceVMwareGuestInfo.py

+@@ -0,0 +1,465 @@

++# Cloud-Init Datasource for VMware Guestinfo

++#

++# Copyright (c) 2018 VMware, Inc. All Rights Reserved.

++#

++# This product is licensed to you under the Apache 2.0 license (the "License").

++# You may not use this product except in compliance with the Apache 2.0 License.

++#

++# This product may include a number of subcomponents with separate copyright

++# notices and license terms. Your use of these subcomponents is subject to the

++# terms and conditions of the subcomponent's license, as noted in the LICENSE

++# file.

++#

++# Authors: Anish Swaminathan <anishs@vmware.com>

++#          Andrew Kutz <akutz@vmware.com>

++#

++

++'''

++A cloud init datasource for VMware GuestInfo.

++'''

++

++import base64

++import collections

++import copy

++from distutils.spawn import find_executable

++import json

++import socket

++import zlib

++

++from cloudinit import log as logging

++from cloudinit import sources

++from cloudinit import util

++from cloudinit import safeyaml

++

++from deepmerge import always_merger

++import netifaces

++

++LOG = logging.getLogger(__name__)

++NOVAL = "No value found"

++VMTOOLSD = find_executable("vmtoolsd")

++

++

++class NetworkConfigError(Exception):

++    '''

++    NetworkConfigError is raised when there is an issue getting or

++    applying network configuration.

++    '''

++    pass

++

++

++class DataSourceVMwareGuestInfo(sources.DataSource):

++    '''

++    This cloud-init datasource was designed for use with CentOS 7,

++    which uses cloud-init 0.7.9. However, this datasource should

++    work with any Linux distribution for which cloud-init is

++    avaialble.

++    The documentation for cloud-init 0.7.9's datasource is

++    available at http://bit.ly/cloudinit-datasource-0-7-9. The

++    current documentation for cloud-init is found at

++    https://cloudinit.readthedocs.io/en/latest/.

++    Setting the hostname:

++        The hostname is set by way of the metadata key "local-hostname".

++    Setting the instance ID:

++        The instance ID may be set by way of the metadata key "instance-id".

++        However, if this value is absent then then the instance ID is

++        read from the file /sys/class/dmi/id/product_uuid.

++    Configuring the network:

++        The network is configured by setting the metadata key "network"

++        with a value consistent with Network Config Versions 1 or 2,

++        depending on the Linux distro's version of cloud-init:

++            Network Config Version 1 - http://bit.ly/cloudinit-net-conf-v1

++            Network Config Version 2 - http://bit.ly/cloudinit-net-conf-v2

++        For example, CentOS 7's official cloud-init package is version

++        0.7.9 and does not support Network Config Version 2. However,

++        this datasource still supports supplying Network Config Version 2

++        data as long as the Linux distro's cloud-init package is new

++        enough to parse the data.

++        The metadata key "network.encoding" may be used to indicate the

++        format of the metadata key "network". Valid encodings are base64

++        and gzip+base64.

++    '''

++

++    dsname = 'VMwareGuestInfo'

++

++    def __init__(self, sys_cfg, distro, paths, ud_proc=None):

++        sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc)

++        if not VMTOOLSD:

++            LOG.error("Failed to find vmtoolsd")

++

++    def get_data(self):

++        """

++        This method should really be _get_data in accordance with the most

++        recent versions of cloud-init. However, because the datasource

++        supports as far back as cloud-init 0.7.9, get_data is still used.

++        Because of this the method attempts to do some of the same things

++        that the get_data functions in newer versions of cloud-init do,

++        such as calling persist_instance_data.

++        """

++        if not VMTOOLSD:

++            LOG.error("vmtoolsd is required to fetch guestinfo value")

++            return False

++

++        # Get the metadata.

++        self.metadata = load_metadata()

++

++        # Get the user data.

++        self.userdata_raw = guestinfo('userdata')

++

++        # Get the vendor data.

++        self.vendordata_raw = guestinfo('vendordata')

++

++        return True

++

++    def setup(self, is_new_instance):

++        """setup(is_new_instance)

++        This is called before user-data and vendor-data have been processed.

++        Unless the datasource has set mode to 'local', then networking

++        per 'fallback' or per 'network_config' will have been written and

++        brought up the OS at this point.

++        """

++

++        # Get information about the host.

++        host_info = get_host_info()

++        LOG.info("got host-info: %s", host_info)

++

++        # Ensure the metadata gets updated with information about the

++        # host, including the network interfaces, default IP addresses,

++        # etc.

++        self.metadata = always_merger.merge(self.metadata, host_info)

++

++        # Persist the instance data for versions of cloud-init that support

++        # doing so. This occurs here rather than in the get_data call in

++        # order to ensure that the network interfaces are up and can be

++        # persisted with the metadata.

++        try:

++            self.persist_instance_data()

++        except AttributeError:

++            pass

++

++    @property

++    def network_config(self):

++        if 'network' in self.metadata:

++            LOG.debug("using metadata network config")

++        else:

++            LOG.debug("using fallback network config")

++            self.metadata['network'] = {

++                'config': self.distro.generate_fallback_config(),

++            }

++        return self.metadata['network']['config']

++

++    def get_instance_id(self):

++        # Pull the instance ID out of the metadata if present. Otherwise

++        # read the file /sys/class/dmi/id/product_uuid for the instance ID.

++        if self.metadata and 'instance-id' in self.metadata:

++            return self.metadata['instance-id']

++        with open('/sys/class/dmi/id/product_uuid', 'r') as id_file:

++            self.metadata['instance-id'] = str(id_file.read()).rstrip()

++            return self.metadata['instance-id']

++

++

++def decode(key, enc_type, data):

++    '''

++    decode returns the decoded string value of data

++    key is a string used to identify the data being decoded in log messages

++    ----

++    In py 2.7:

++    json.loads method takes string as input

++    zlib.decompress takes and returns a string

++    base64.b64decode takes and returns a string

++    -----

++    In py 3.6 and newer:

++    json.loads method takes bytes or string as input

++    zlib.decompress takes and returns a bytes

++    base64.b64decode takes bytes or string and returns bytes

++    -----

++    In py > 3, < 3.6:

++    json.loads method takes string as input

++    zlib.decompress takes and returns a bytes

++    base64.b64decode takes bytes or string and returns bytes

++    -----

++    Given the above conditions the output from zlib.decompress and

++    base64.b64decode would be bytes with newer python and str in older

++    version. Thus we would covert the output to str before returning

++    '''

++    LOG.debug("Getting encoded data for key=%s, enc=%s", key, enc_type)

++

++    raw_data = None

++    if enc_type == "gzip+base64" or enc_type == "gz+b64":

++        LOG.debug("Decoding %s format %s", enc_type, key)

++        raw_data = zlib.decompress(base64.b64decode(data), zlib.MAX_WBITS | 16)

++    elif enc_type == "base64" or enc_type == "b64":

++        LOG.debug("Decoding %s format %s", enc_type, key)

++        raw_data = base64.b64decode(data)

++    else:

++        LOG.debug("Plain-text data %s", key)

++        raw_data = data

++

++    if isinstance(raw_data, bytes):

++        return raw_data.decode('utf-8')

++    return raw_data

++

++

++def get_guestinfo_value(key):

++    '''

++    Returns a guestinfo value for the specified key.

++    '''

++    LOG.debug("Getting guestinfo value for key %s", key)

++    try:

++        (stdout, stderr) = util.subp(

++            [VMTOOLSD, "--cmd", "info-get guestinfo." + key])

++        if stderr == NOVAL:

++            LOG.debug("No value found for key %s", key)

++        elif not stdout:

++            LOG.error("Failed to get guestinfo value for key %s", key)

++        else:

++            return stdout.rstrip()

++    except util.ProcessExecutionError as error:

++        if error.stderr == NOVAL:

++            LOG.debug("No value found for key %s", key)

++        else:

++            util.logexc(

++                LOG, "Failed to get guestinfo value for key %s: %s", key, error)

++    except Exception:

++        util.logexc(

++            LOG, "Unexpected error while trying to get guestinfo value for key %s", key)

++    return None

++

++

++def guestinfo(key):

++    '''

++    guestinfo returns the guestinfo value for the provided key, decoding

++    the value when required

++    '''

++    data = get_guestinfo_value(key)

++    if not data:

++        return None

++    enc_type = get_guestinfo_value(key + '.encoding')

++    return decode('guestinfo.' + key, enc_type, data)

++

++

++def load(data):

++    '''

++    load first attempts to unmarshal the provided data as JSON, and if

++    that fails then attempts to unmarshal the data as YAML. If data is

++    None then a new dictionary is returned.

++    '''

++    if not data:

++        return {}

++    try:

++        return json.loads(data)

++    except:

++        return safeyaml.load(data)

++

++

++def load_metadata():

++    '''

++    load_metadata loads the metadata from the guestinfo data, optionally

++    decoding the network config when required

++    '''

++    data = load(guestinfo('metadata'))

++    LOG.debug('loaded metadata %s', data)

++

++    network = None

++    if 'network' in data:

++        network = data['network']

++        del data['network']

++

++    network_enc = None

++    if 'network.encoding' in data:

++        network_enc = data['network.encoding']

++        del data['network.encoding']

++

++    if network:

++        LOG.debug('network data found')

++        if isinstance(network, collections.Mapping):

++            LOG.debug("network data copied to 'config' key")

++            network = {

++                'config': copy.deepcopy(network)

++            }

++        else:

++            LOG.debug("network data to be decoded %s", network)

++            dec_net = decode('metadata.network', network_enc, network)

++            network = {

++                'config': load(dec_net),

++            }

++

++        LOG.debug('network data %s', network)

++        data['network'] = network

++

++    return data

++

++

++def get_datasource_list(depends):

++    '''

++    Return a list of data sources that match this set of dependencies

++    '''

++    return [DataSourceVMwareGuestInfo]

++

++

++def get_default_ip_addrs():

++    '''

++    Returns the default IPv4 and IPv6 addresses based on the device(s) used for

++    the default route. Please note that None may be returned for either address

++    family if that family has no default route or if there are multiple

++    addresses associated with the device used by the default route for a given

++    address.

++    '''

++    gateways = netifaces.gateways()

++    if 'default' not in gateways:

++        return None, None

++

++    default_gw = gateways['default']

++    if netifaces.AF_INET not in default_gw and netifaces.AF_INET6 not in default_gw:

++        return None, None

++

++    ipv4 = None

++    ipv6 = None

++

++    gw4 = default_gw.get(netifaces.AF_INET)

++    if gw4:

++        _, dev4 = gw4

++        addr4_fams = netifaces.ifaddresses(dev4)

++        if addr4_fams:

++            af_inet4 = addr4_fams.get(netifaces.AF_INET)

++            if af_inet4:

++                if len(af_inet4) > 1:

++                    LOG.warn(

++                        "device %s has more than one ipv4 address: %s", dev4, af_inet4)

++                elif 'addr' in af_inet4[0]:

++                    ipv4 = af_inet4[0]['addr']

++

++    # Try to get the default IPv6 address by first seeing if there is a default

++    # IPv6 route.

++    gw6 = default_gw.get(netifaces.AF_INET6)

++    if gw6:

++        _, dev6 = gw6

++        addr6_fams = netifaces.ifaddresses(dev6)

++        if addr6_fams:

++            af_inet6 = addr6_fams.get(netifaces.AF_INET6)

++            if af_inet6:

++                if len(af_inet6) > 1:

++                    LOG.warn(

++                        "device %s has more than one ipv6 address: %s", dev6, af_inet6)

++                elif 'addr' in af_inet6[0]:

++                    ipv6 = af_inet6[0]['addr']

++

++    # If there is a default IPv4 address but not IPv6, then see if there is a

++    # single IPv6 address associated with the same device associated with the

++    # default IPv4 address.

++    if ipv4 and not ipv6:

++        af_inet6 = addr4_fams.get(netifaces.AF_INET6)

++        if af_inet6:

++            if len(af_inet6) > 1:

++                LOG.warn(

++                    "device %s has more than one ipv6 address: %s", dev4, af_inet6)

++            elif 'addr' in af_inet6[0]:

++                ipv6 = af_inet6[0]['addr']

++

++    # If there is a default IPv6 address but not IPv4, then see if there is a

++    # single IPv4 address associated with the same device associated with the

++    # default IPv6 address.

++    if not ipv4 and ipv6:

++        af_inet4 = addr6_fams.get(netifaces.AF_INET4)

++        if af_inet4:

++            if len(af_inet4) > 1:

++                LOG.warn(

++                    "device %s has more than one ipv4 address: %s", dev6, af_inet4)

++            elif 'addr' in af_inet4[0]:

++                ipv4 = af_inet4[0]['addr']

++

++    return ipv4, ipv6

++

++

++def get_host_info():

++    '''

++    Returns host information such as the host name and network interfaces.

++    '''

++

++    host_info = {

++        'network': {

++            'interfaces': {

++                'by-mac': collections.OrderedDict(),

++                'by-ipv4': collections.OrderedDict(),

++                'by-ipv6': collections.OrderedDict(),

++            },

++        },

++    }

++

++    hostname = socket.getfqdn()

++    if hostname:

++        host_info['hostname'] = hostname

++        host_info['local-hostname'] = hostname

++

++    default_ipv4, default_ipv6 = get_default_ip_addrs()

++    if default_ipv4:

++        host_info['local-ipv4'] = default_ipv4

++    if default_ipv6:

++        host_info['local-ipv6'] = default_ipv6

++

++    by_mac = host_info['network']['interfaces']['by-mac']

++    by_ipv4 = host_info['network']['interfaces']['by-ipv4']

++    by_ipv6 = host_info['network']['interfaces']['by-ipv6']

++

++    ifaces = netifaces.interfaces()

++    for dev_name in ifaces:

++        addr_fams = netifaces.ifaddresses(dev_name)

++        af_link = addr_fams.get(netifaces.AF_LINK)

++        af_inet4 = addr_fams.get(netifaces.AF_INET)

++        af_inet6 = addr_fams.get(netifaces.AF_INET6)

++

++        mac = None

++        if af_link and 'addr' in af_link[0]:

++            mac = af_link[0]['addr']

++

++        # Do not bother recording localhost

++        if mac == "00:00:00:00:00:00":

++            continue

++

++        if mac and (af_inet4 or af_inet6):

++            key = mac

++            val = {}

++            if af_inet4:

++                val["ipv4"] = af_inet4

++            if af_inet6:

++                val["ipv6"] = af_inet6

++            by_mac[key] = val

++

++        if af_inet4:

++            for ip_info in af_inet4:

++                key = ip_info['addr']

++                if key == '127.0.0.1':

++                    continue

++                val = copy.deepcopy(ip_info)

++                del val['addr']

++                if mac:

++                    val['mac'] = mac

++                by_ipv4[key] = val

++

++        if af_inet6:

++            for ip_info in af_inet6:

++                key = ip_info['addr']

++                if key == '::1':

++                    continue

++                val = copy.deepcopy(ip_info)

++                del val['addr']

++                if mac:

++                    val['mac'] = mac

++                by_ipv6[key] = val

++

++    return host_info

++

++

++def main():

++    '''

++    Executed when this file is used as a program.

++    '''

++    metadata = {'network': {'config': {'dhcp': True}}}

++    host_info = get_host_info()

++    metadata = always_merger.merge(metadata, host_info)

++    print(util.json_dumps(metadata))

++

++

++if __name__ == "__main__":

++    main()

++

++# vi: ts=4 expandtab

@@ -2,7 +2,7 @@

 Name:           cloud-init

 Version:        19.1

-Release:        1%{?dist}

+Release:        2%{?dist}

 Summary:        Cloud instance init scripts

 Group:          System Environment/Base

 License:        GPLv3

@@ -13,16 +13,18 @@ Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{na

 %define sha1 cloud-init=6de398dd755959dde47c8d6f6e255a0857017c44

 Source1:        cloud-photon.cfg

 Source2:        99-disable-networking-config.cfg

+Source3:        dscheck_VMwareGuestInfo

 Patch0:         photon-distro.patch

 Patch2:         vca-admin-pwd.patch

 Patch3:         photon-hosts-template.patch

-Patch5:         datasource-guestinfo.patch

+Patch5:         DataSourceVMwareGuestInfo.patch

 Patch6:         systemd-service-changes.patch

 Patch7:         makecheck.patch

 Patch8:         systemd-resolved-config.patch

 Patch9:         cloud-init-azureds.patch

 Patch10:        ds-identity.patch

+Patch11:        ds-guestinfo-photon.patch

 BuildRequires:  python3

 BuildRequires:  python3-libs

@@ -60,6 +62,8 @@ Requires:       python3-six

 Requires:       python3-setuptools

 Requires:       python3-xml

 Requires:       python3-jsonschema

+Requires:       python3-deepmerge

+Requires:       python3-netifaces

 BuildArch:      noarch

 %description

@@ -79,6 +83,7 @@ ssh keys and to let the user run various scripts.

 %patch8 -p1

 %patch9 -p1

 %patch10 -p1

+%patch11 -p1

 find systemd -name "cloud*.service*" | xargs sed -i s/StandardOutput=journal+console/StandardOutput=journal/g

@@ -97,6 +102,7 @@ cp -p %{SOURCE1} %{buildroot}/%{_sysconfdir}/cloud/cloud.cfg

 # Disable networking config by cloud-init

 cp -p %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/cloud/cloud.cfg.d/

+install -m 755 %{SOURCE3} $RPM_BUILD_ROOT/%{_bindir}/

 %check

 easy_install_3=$(ls /usr/bin |grep easy_install |grep 3)

@@ -143,10 +149,13 @@ rm -rf $RPM_BUILD_ROOT

 %{python3_sitelib}/*

 %{_bindir}/cloud-init*

 %{_bindir}/cloud-id

+%{_bindir}/dscheck_VMwareGuestInfo

 %{_datadir}/bash-completion/completions/cloud-init

 %dir /var/lib/cloud

 %changelog

+*   Tue Jul 23 2019 Keerthana K <keerthanak@vmware.com> 19.1-2

+-   support for additional features in VMGuestInfo Datasource.

 *   Tue Jun 25 2019 Keerthana K <keerthanak@vmware.com> 19.1-1

 -   Upgrade to version 19.1 and fix cloud-init GOS logic.

 *   Thu Jun 13 2019 Keerthana K <keerthanak@vmware.com> 18.3-4

@@ -32,7 +32,7 @@ datasource_list: [

 #                  CloudSigma, 

 #                  Ec2, 

 #                  CloudStack,

-#                  VmxGuestinfo, 

+                  VMwareGuestInfo,

                   None 

                  ]

deleted file mode 100644

@@ -1,149 +0,0 @@

-diff -rupN cloud-init-0.7.9/cloudinit/sources/DataSourceVmxGuestinfo.py cloud-init-0.7.9-new/cloudinit/sources/DataSourceVmxGuestinfo.py

-+++ cloud-init-0.7.9-new/cloudinit/sources/DataSourceVmxGuestinfo.py	2017-05-08 07:47:27.388662680 -0700

-@@ -0,0 +1,145 @@

-+# vi: ts=4 expandtab

-+#

-+# Copyright (C) 2017 VMware Inc.

-+#

-+# Author: Anish Swaminathan <anishs@vmware.com>

-+#

-+import os

-+import base64

-+

-+from cloudinit import log as logging

-+from cloudinit import sources

-+from cloudinit import util

-+

-+from distutils.spawn import find_executable

-+

-+LOG = logging.getLogger(__name__)

-+

-+class DataSourceVmxGuestinfo(sources.DataSource):

-+    def __init__(self, sys_cfg, distro, paths, ud_proc=None):

-+        sources.DataSource.__init__(self, sys_cfg, distro, paths, ud_proc)

-+        self.metadata = {}

-+        self.userdata_raw = ''

-+        self.vmtoolsd = find_executable("vmtoolsd")

-+        if not self.vmtoolsd:

-+            LOG.error("Failed to find vmtoolsd")

-+

-+    def get_data(self):

-+        if not self.vmtoolsd:

-+            LOG.error("vmtoolsd is required to fetch guestinfo value")

-+            return False

-+        hostname = self._get_guestinfo_value('hostname')

-+        if hostname:

-+            self.distro.set_hostname(hostname)

-+        ud = self._get_guestinfo_value('userdata')

-+        if ud:

-+            LOG.debug("Decoding base64 format guestinfo.userdata")

-+            self.userdata_raw = base64.b64decode(ud)

-+        found = True

-+        dev_index = 0

-+        network_settings = ''

-+        while found:

-+            key_begin = 'interface.' + str(dev_index)

-+            key_iname = key_begin + '.name'

-+            interface_name = self._get_guestinfo_value(key_iname)

-+            if interface_name:

-+                network_settings += 'auto ' + interface_name + '\n'

-+                network_settings += 'iface ' + interface_name

-+                key_proto = key_begin + '.dhcp'

-+                dhcp_enabled = self._get_guestinfo_value(key_proto)

-+                key_address = key_begin + '.address'

-+                address = self._get_guestinfo_value(key_address)

-+                bootproto = 'dhcp'

-+                if dhcp_enabled:

-+                    if dhcp_enabled == 'yes':

-+                        network_settings += ' dhcp\n'

-+                    elif dhcp_enabled == 'no':

-+                        network_settings += ' static\n'

-+                        bootproto = 'static'

-+                    else:

-+                        LOG.warning("Invalid value for yes/no parameter for %s, setting to dhcp", key_proto)

-+                elif address:

-+                    bootproto = 'static'

-+                    dhcp_enabled == 'no'

-+                    network_settings += ' static\n'

-+                else:

-+                    dhcp_enabled == 'yes'

-+                    network_settings += ' dhcp\n'

-+                    LOG.debug("Setting network bootproto to dhcp by default")

-+                key_mac = key_begin + '.mac'

-+                mac = self._get_guestinfo_value(key_mac)

-+                if address:

-+                    network_settings += 'address ' + address + '\n'

-+                if mac:

-+                    network_settings += 'hwaddress ' + mac + '\n'

-+                key_netmask = key_begin + '.netmask'

-+                netmask = self._get_guestinfo_value(key_netmask)

-+                if netmask:

-+                    network_settings += 'netmask ' + netmask + '\n'

-+                key_dnsserver = 'dns.servers'

-+                dnsserver = self._get_guestinfo_value(key_dnsserver)

-+                if dnsserver:

-+                    network_settings += 'dns-nameservers '

-+                    dnsserver = dnsserver.split(',')

-+                    for d in dnsserver:

-+                        network_settings += d + ' '

-+                    network_settings += '\n'

-+                key_dnsdomain = 'dns.domains'

-+                dnsdomain = self._get_guestinfo_value(key_dnsdomain)

-+                if dnsdomain:

-+                    network_settings += 'dns-search '

-+                    dnsdomain = dnsdomain.split(',')

-+                    for d in dnsdomain:

-+                        network_settings += d + ' '

-+                    network_settings += '\n'

-+                route_index = 0

-+                default_destination_set = False

-+                while True:

-+                    key_route = key_begin + '.route.' + str(route_index)

-+                    route = self._get_guestinfo_value(key_route)

-+                    if route:

-+                        network_settings += "routes.%s " % (route_index)

-+                        route = route.split(',')

-+                        if len(route) > 2:

-+                            LOG.debug("Route information for %s route in %s device incorrect - ", 

-+                                                "expected 2 values", route_index, dev_index)

-+                            continue

-+                        elif len(route) == 2:

-+                            network_settings += route[0] + ' ' + route[1] + '\n'# Gateway Destination

-+                        else: #length = 1

-+                            if not default_destination_set:

-+                                network_settings += route[0] + ' 0.0.0.0/0' + '\n'

-+                                default_destination_set = True

-+                            else:

-+                                LOG.debug("Default destination set previously, not setting route %s", route_index) 

-+                    else:

-+                        break

-+                    route_index += 1

-+            else:

-+                found = False

-+            dev_index += 1

-+        self.distro.apply_network(network_settings, False)

-+        return True

-+

-+    def _get_guestinfo_value(self, key):

-+        LOG.debug("Getting guestinfo value for key %s", key)

-+        value = ''

-+        try:

-+            (value, _err) = util.subp([self.vmtoolsd, "--cmd", "info-get guestinfo." + key])

-+            if _err:

-+                LOG.error("Failed to get guestinfo value for key %s", key)

-+        except util.ProcessExecutionError as error:

-+            util.logexc(LOG,"Failed to get guestinfo value for key %s: %s", key, error)

-+        except Exception:

-+            util.logexc(LOG,"Unexpected error while trying to get guestinfo value for key %s", key)

-+        return value.rstrip()

-+

-+    def get_instance_id(self):

-+        with open('/sys/class/dmi/id/product_uuid', 'r') as id_file:

-+            return str(id_file.read()).rstrip()

-+

-+def get_datasource_list(depends):

-+    """

-+    Return a list of data sources that match this set of dependencies

-+    """

-+    return [DataSourceVmxGuestinfo]

new file mode 100644

@@ -0,0 +1,99 @@

+diff --git a/cloudinit/sources/DataSourceVMwareGuestInfo.py b/cloudinit/sources/DataSourceVMwareGuestInfo.py

+index e69de29..59dd685 100644

+--- a/cloudinit/sources/DataSourceVMwareGuestInfo.py

+@@ -108,6 +108,94 @@

+         # Get the vendor data.

+         self.vendordata_raw = guestinfo('vendordata')

+ 

++        hostname = get_guestinfo_value('hostname')

++        if hostname:

++            self.distro.set_hostname(hostname)

++        found = True

++        dev_index = 0

++        network_settings = ''

++        while found:

++            key_begin = 'interface.' + str(dev_index)

++            key_iname = key_begin + '.name'

++            interface_name = get_guestinfo_value(key_iname)

++            if interface_name:

++                network_settings += 'auto ' + interface_name + '\n'

++                network_settings += 'iface ' + interface_name

++                key_proto = key_begin + '.dhcp'

++                dhcp_enabled = get_guestinfo_value(key_proto)

++                key_address = key_begin + '.address'

++                address = get_guestinfo_value(key_address)

++                bootproto = 'dhcp'

++                if dhcp_enabled:

++                    if dhcp_enabled == 'yes':

++                        network_settings += ' dhcp\n'

++                    elif dhcp_enabled == 'no':

++                        network_settings += ' static\n'

++                        bootproto = 'static'

++                    else:

++                        LOG.warning("Invalid value for yes/no parameter for %s, setting to dhcp", key_proto)

++                elif address:

++                    bootproto = 'static'

++                    dhcp_enabled == 'no'

++                    network_settings += ' static\n'

++                else:

++                    dhcp_enabled == 'yes'

++                    network_settings += ' dhcp\n'

++                    LOG.debug("Setting network bootproto to dhcp by default")

++                key_mac = key_begin + '.mac'

++                mac = get_guestinfo_value(key_mac)

++                if address:

++                    network_settings += 'address ' + address + '\n'

++                if mac:

++                    network_settings += 'hwaddress ' + mac + '\n'

++                key_netmask = key_begin + '.netmask'

++                netmask = get_guestinfo_value(key_netmask)

++                if netmask:

++                     network_settings += 'netmask ' + netmask + '\n'

++                key_dnsserver = 'dns.servers'

++                dnsserver = get_guestinfo_value(key_dnsserver)

++                if dnsserver:

++                    network_settings += 'dns-nameservers '

++                    dnsserver = dnsserver.split(',')

++                    for d in dnsserver:

++                        network_settings += d + ' '

++                    network_settings += '\n'

++                key_dnsdomain = 'dns.domains'

++                dnsdomain = get_guestinfo_value(key_dnsdomain)

++                if dnsdomain:

++                    network_settings += 'dns-search '

++                    dnsdomain = dnsdomain.split(',')

++                    for d in dnsdomain:

++                        network_settings += d + ' '

++                    network_settings += '\n'

++                route_index = 0

++                default_destination_set = False

++                while True:

++                    key_route = key_begin + '.route.' + str(route_index)

++                    route = get_guestinfo_value(key_route)

++                    if route:

++                        network_settings += "routes.%s " % (route_index)

++                        route = route.split(',')

++                        if len(route) > 2:

++                            LOG.debug("Route information for %s route in %s device incorrect - ",

++                                                "expected 2 values", route_index, dev_index)

++                            continue

++                        elif len(route) == 2:

++                            network_settings += route[0] + ' ' + route[1] + '\n'# Gateway Destination

++                        else: #length = 1

++                            if not default_destination_set:

++                                network_settings += route[0] + ' 0.0.0.0/0' + '\n'

++                                default_destination_set = True

++                            else:

++                                LOG.debug("Default destination set previously, not setting route %s", route_index)

++                    else:

++                        break

++                    route_index += 1

++            else:

++                found = False

++            dev_index += 1

++        self.distro.apply_network(network_settings, False)

++

+         return True

+ 

+     def setup(self, is_new_instance):

new file mode 100644

@@ -0,0 +1,46 @@

+#!/bin/sh

+

+# Cloud-Init Datasource for VMware Guestinfo

+#

+# Copyright (c) 2019 VMware, Inc. All Rights Reserved.

+#

+# This product is licensed to you under the Apache 2.0 license (the "License").

+# You may not use this product except in compliance with the Apache 2.0 License.

+#

+# This product may include a number of subcomponents with separate copyright

+# notices and license terms. Your use of these subcomponents is subject to the

+# terms and conditions of the subcomponent's license, as noted in the LICENSE

+# file.

+

+#

+# This file should be installed to /usr/bin/dscheck_VMwareGuestInfo

+# without the ".sh" extension. The extension only exists to make it easier

+# to identify the file during development.

+#

+# This file provides cloud-init's ds-identify program a shell type that

+# can be resolved with "type dscheck_VMwareGuestInfo" and used to validate

+# where a datasource is installed and useable.

+#

+# Cloud-init's ds-identify program in /usr/lib/cloud-init includes functions

+# to determine whether or not datasources can be used. Because the program

+# is a shell script and uses "type dscheck_DATASOURCE_NAME" to determine

+# if there is a matching bash type that can answer for the datasource,

+# it's possible to respond with an external script. While other datasources

+# have functions in ds-identify, the "type" command looks up types both

+# in Bash's function table as well as script in the PATH. Therefore the

+# ds-identify program, when looking up whether or not the datasource

+# VMwareGuestInfo can be used, will defer to this file when it is in the

+# PATH and named dscheck_VMwareGuestInfo.

+#

+

+if ! command -v vmtoolsd >/dev/null 2>&1; then

+  exit 1

+fi

+

+if { vmtoolsd --cmd "info-get guestinfo.metadata" || \

+     vmtoolsd --cmd "info-get guestinfo.userdata" || \

+     vmtoolsd --cmd "info-get guestinfo.vendordata"; } >/dev/null 2>&1; then

+   exit 0

+fi

+

+exit 1

new file mode 100644

@@ -0,0 +1,441 @@

+From c997ff2f4ced80be724c52e1105f75ece966765b Mon Sep 17 00:00:00 2001

+From: Pantelis Antoniou <pantelis.antoniou@konsulko.com>

+Date: Wed, 3 Dec 2014 13:23:28 +0200

+Subject: [PATCH] OF: DT-Overlay configfs interface

+

+This is a port of Pantelis Antoniou's v3 port that makes use of the

+new upstreamed configfs support for binary attributes.

+

+Original commit message:

+

+Add a runtime interface to using configfs for generic device tree overlay

+usage. With it its possible to use device tree overlays without having

+to use a per-platform overlay manager.

+

+Please see Documentation/devicetree/configfs-overlays.txt for more info.

+

+Changes since v2:

+- Removed ifdef CONFIG_OF_OVERLAY (since for now it's required)

+- Created a documentation entry

+- Slight rewording in Kconfig

+

+Changes since v1:

+- of_resolve() -> of_resolve_phandles().

+

+Originally-signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com>

+Signed-off-by: Phil Elwell <phil@raspberrypi.org>