Merge ~seyeongkim/maas:lp1999827_3.1 into maas:3.1

[Seyeong Kim]

Fix reverse order ip address

When controller's nic has several ip and virtual ip,
SQL collect them reverse order. this fixes it.

(cherry picked from commit cfe8cf628f7189a84a98d74b3c079d744f1c1b5f)

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1999827_3.1 lp:~seyeongkim/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/3393/console
COMMIT: 4371db5a5440df64c14dd53d31517ce8a3323599

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1999827_3.1 lp:~seyeongkim/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/3396/console
COMMIT: 3632f459c5112f12e52144eb059b922eff540497

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1999827_3.1 lp:~seyeongkim/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas-tester/3412/console
COMMIT: 07a0b45d7f92358f0d8bec8b4ca42506e27c7138

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1999827_3.1 lp:~seyeongkim/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1db89db186136160aba825ea9ca36c1fd8be2620

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1999827_3.1 lp:~seyeongkim/maas/+git/maas into -b 3.1 lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 1db89db186136160aba825ea9ca36c1fd8be2620

review: Approve

[MAAS Lander (maas-lander)]

UNABLE TO START LANDING

STATUS: MISSING COMMIT MESSAGE

diff --git a/src/maasserver/models/staticipaddress.py b/src/maasserver/models/staticipaddress.py
index 49723d8..74c736f 100644
--- a/src/maasserver/models/staticipaddress.py
+++ b/src/maasserver/models/staticipaddress.py
@@ -654,7 +654,8 @@ class StaticIPAddressManager(Manager):
                     ELSE staticip.alloc_type
                 END,
                 interface.id,
-                inet 'fc00::/7' >> ip /* ULA after non-ULA */
+                inet 'fc00::/7' >> ip /* ULA after non-ULA */,
+                staticip.id
             """
         iface_sql_query = (
             """
diff --git a/src/maasserver/models/tests/test_staticipaddress.py b/src/maasserver/models/tests/test_staticipaddress.py
index 8e7e8ec..9755da9 100644
--- a/src/maasserver/models/tests/test_staticipaddress.py
+++ b/src/maasserver/models/tests/test_staticipaddress.py
@@ -461,6 +461,35 @@ class TestStaticIPAddressManagerMapping(MAASServerTestCase):
         )
         self.assertEqual(expected_mapping, mapping)
 
+    def test_get_hostname_ip_mapping_ip_order(self):
+        domain = Domain.objects.get_default_domain()
+        node = factory.make_Node()
+        interface1 = factory.make_Interface(INTERFACE_TYPE.PHYSICAL, node=node)
+        subnet = factory.make_Subnet()
+        staticip1 = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet,
+            interface=interface1,
+        )
+        staticip2 = factory.make_StaticIPAddress(
+            alloc_type=IPADDRESS_TYPE.STICKY,
+            ip=factory.pick_ip_in_Subnet(subnet),
+            subnet=subnet,
+            interface=interface1,
+        )
+        self.assertEqual(
+            dict(StaticIPAddress.objects.get_hostname_ip_mapping(subnet)),
+            {
+                f"{node.hostname}.{domain.name}": HostnameIPMapping(
+                    node.system_id, 30, {staticip1.ip}, node.node_type
+                ),
+                f"{interface1.name}.{node.hostname}.{domain.name}": HostnameIPMapping(
+                    node.system_id, 30, {staticip2.ip}, node.node_type
+                ),
+            },
+        )
+
     def test_get_hostname_ip_mapping_returns_fqdn_and_other(self):
         hostname = factory.make_name("hostname")
         domainname = factory.make_name("domain")