TOOL-16941 cloud-init: upstream merge conflict resolution

[prakashsurya]

No description provided.

[mmaybee]

Could you provide a description of the merge conflicts that were resolved here? It would be nice to know which files were in conflict and why. This could help future merge conflict resolutions.

[prakashsurya]

Could you provide a description of the merge conflicts that were resolved here?

here's a link to the output of git show on the merge commit.

the non test conflicts were relatively easy to fix.. e.g.

-     (hostname, fqdn) = util.get_hostname_fqdn(cfg, cloud)
+     (hostname, fqdn, is_default) = util.get_hostname_fqdn(cfg, cloud)
+    if fqdn[-1] == '.':
+        fqdn = fqdn[:-1]

here, we added some code downstream #59, and upstream made a change in the line above, so we had to manually merge them together.. but didn't actually conflict (changes to different, but adjacent, lines).

-             "match": {"match": nicname},
 -            "match": {"macaddress": mac.lower()},
++            "match": {"match": nic_name},

here, we just needed to update based on the name changes.. i.e. nicname to nic_name.. this is due to upstream matching on macaddress, and us changing that to match on name.. and then the variable containing the nic name changing..

+                 interface_config = {
                      "mtu": MTU,
-                     "dhcp4": False,
-                     "dhcp6": False,
 -                    "match": {"macaddress": mac_address},
 +                    "match": {"name": name},
+                     "dhcp6": False,
+                     "dhcp4": is_primary,
                  }

here, we just needed to update the code to match based on NIC name, instead of mac address.. this is basically to re-apply the work we previously did to new code.. prior work being PRs like #21 and #23..

then, there were also conflicts in test files.. due to us having removed tests previously, and then those tests being modified.. since modifications to code that we've deleted isn't automatically handled, we need to manually resolve that.. I resolved it by just removing the tests (again), and effectively taking our version of the code..

and lastly, some new tests where added, and needed to be updated to reflect the fact that we're matching on NIC name, rather than MAC address.. e.g. in test_azure.py:

+                     "ethernets": {
+                         "eth0": {
+                             "dhcp4": True,
+                             "dhcp4-overrides": {"route-metric": 100},
+                             "dhcp6": False,
 -                            "match": {"macaddress": "00:0d:3a:04:75:98"},
++                            "match": {"name": "eth0"},
+                             "set-name": "eth0",
+                         }
+                     },

@mmaybee does this help?

[mmaybee]

Yes, thank you.