fix(instances): a VM without a guest agent shows its ARP address

The ARP lookup passed 3 as the address source; libvirt's
VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP is 2 and libvirt refused 3 as an
unknown source. The error was suppressed, so a VM without a guest agent
never showed an address.

vrtManager/instance.py

@@ -14,6 +14,7 @@ try:
         VIR_DOMAIN_AFFECT_CONFIG,
         VIR_DOMAIN_AFFECT_LIVE,
         VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT,
+        VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP,
         VIR_DOMAIN_RUNNING,
         VIR_DOMAIN_XML_SECURE,
         VIR_DOMAIN_XML_INACTIVE,
@@ -671,8 +672,7 @@ class wvmInstance(wvmConnect):
                 VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT
             )
 
-        arp_flag = 3  # libvirt."VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP"
-        self._ip_cache["arp"] = self._get_interface_addresses(arp_flag)
+        self._ip_cache["arp"] = self._get_interface_addresses(VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP)
 
     def get_net_devices(self, config=False):
         def networks(ctx):

vrtManager/test_interface_addresses.py

@@ -0,0 +1,54 @@
+"""A running VM's addresses come from the guest agent when it answers and
+from the host's ARP table, so a VM without an agent shows its IPv4 address."""
+
+import unittest
+from unittest.mock import MagicMock, patch
+
+from django.conf import settings
+
+if not settings.configured:
+    settings.configure(MAC_OUI="52:54:10")
+
+from libvirt import VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT, VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP
+from vrtManager.instance import wvmInstance
+
+MAC = "52:54:00:00:00:01"
+ARP = {"vnet0": {"hwaddr": MAC, "addrs": [{"type": 0, "addr": "192.0.2.10", "prefix": 0}]}}
+AGENT = {"eth0": {"hwaddr": MAC, "addrs": [{"type": 0, "addr": "192.0.2.20", "prefix": 24}]}}
+
+
+def vm(agent):
+    inst = wvmInstance.__new__(wvmInstance)
+    inst._ip_cache = None
+    inst.instance = MagicMock()
+    inst.instance.interfaceAddresses.side_effect = lambda source: {
+        VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT: AGENT,
+        VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP: ARP,
+    }[source]
+    patch.object(inst, "get_status", return_value=1).start()
+    patch.object(inst, "is_agent_ready", return_value=agent).start()
+    return inst
+
+
+class InterfaceAddressesTestCase(unittest.TestCase):
+    def tearDown(self):
+        patch.stopall()
+
+    def test_a_vm_without_an_agent_shows_its_arp_address(self):
+        inst = vm(agent=False)
+        self.assertEqual(inst.get_interface_addresses(MAC), (["192.0.2.10"], []))
+        self.assertEqual(
+            [c.args for c in inst.instance.interfaceAddresses.call_args_list], [(VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP,)]
+        )
+
+    def test_the_agents_address_comes_first(self):
+        inst = vm(agent=True)
+        self.assertEqual(inst.get_interface_addresses(MAC), (["192.0.2.20"], []))
+        self.assertEqual(
+            [c.args for c in inst.instance.interfaceAddresses.call_args_list],
+            [(VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_AGENT,), (VIR_DOMAIN_INTERFACE_ADDRESSES_SRC_ARP,)],
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()