Fix merge conflict in cloud-init

[pcd1193182]

This PR fixes the merge conflict from http://ops.jenkins.delphix.com/job/devops-gate/job/master/job/linux-pkg-update/job/master/job/userland/job/update/549/consoleFull . The conflicts were in changes related to our use of names instead of mac addresses to identify devices.

commit 29ceb900648a33475f9a2bd43768e39ca87b0527
Merge: bede0ac bb80b42
Author:     Paul Dagnelie <pcd@delphix.com>
AuthorDate: Wed Sep 23 10:36:37 2020 -0700
Commit:     Paul Dagnelie <pcd@delphix.com>
CommitDate: Wed Sep 23 10:36:37 2020 -0700

    Merge branch 'refs/heads/upstream-HEAD' into repo-HEAD

diff --cc cloudinit/sources/DataSourceAzure.py
index 36b29eb,f3c6452..b5e282e
--- a/cloudinit/sources/DataSourceAzure.py
+++ b/cloudinit/sources/DataSourceAzure.py
@@@ -1361,9 -1387,17 +1387,16 @@@ def parse_network_config(imds_metadata)
                              '{ip}/{prefix}'.format(
                                  ip=privateIp, prefix=netPrefix))
                  if dev_config:
-                     dev_config.update(
-                         {'match': {'name': nicname},
-                          'set-name': nicname})
 -                    mac = ':'.join(re.findall(r'..', intf['macAddress']))
+                     dev_config.update({
 -                        'match': {'macaddress': mac.lower()},
++                        'match': {'name': nicname},
+                         'set-name': nicname
+                     })
...
                      netconfig['ethernets'][nicname] = dev_config
              evt.description = "network config from imds"
          else:
diff --cc cloudinit/sources/DataSourceOracle.py
index 58fa2c4,20d6487..9e562e4
--- a/cloudinit/sources/DataSourceOracle.py
+++ b/cloudinit/sources/DataSourceOracle.py
@@@ -277,6 -207,70 +207,70 @@@ class DataSourceOracle(sources.DataSour
...
+             elif self._network_config['version'] == 2:
+                 self._network_config['ethernets'][name] = {
+                     'addresses': [vnic_dict['privateIp']],
+                     'mtu': MTU, 'dhcp4': False, 'dhcp6': False,
 -                    'match': {'macaddress': mac_address}}
++                    'match': {'name': name}, 'set-name': name}
+ 
  
  def _read_system_uuid():
      sys_uuid = util.read_dmi_data('system-uuid')
diff --cc cloudinit/sources/tests/test_oracle.py
index 3367cc8,7bd2381..225b96b
--- a/cloudinit/sources/tests/test_oracle.py
+++ b/cloudinit/sources/tests/test_oracle.py
@@@ -407,186 -173,95 +173,95 @@@ class TestIsPlatformViable(test_helpers
          m_read_dmi_data.assert_has_calls([mock.call('chassis-asset-tag')])
  
  
...
-         secondary_nic_cfg = network_config['config'][1]
-         self.assertEqual(nic_name, secondary_nic_cfg['name'])
-         self.assertEqual('physical', secondary_nic_cfg['type'])
-         self.assertEqual(mac_addr, secondary_nic_cfg['mac_address'])
-         self.assertEqual(9000, secondary_nic_cfg['mtu'])
+         secondary_nic_cfg = oracle_ds.network_config['config'][1]
+         assert nic_name == secondary_nic_cfg['name']
+         assert 'physical' == secondary_nic_cfg['type']
+         assert mac_addr == secondary_nic_cfg['mac_address']
+         assert 9000 == secondary_nic_cfg['mtu']
 ...