Merge ~bjornt/maas:revert-bug-2043970-3.3 into maas:3.3

[Björn Tillenius]

Revert "fix(metadataserver): leave discovered interfaces disconnected"

This reverts commit 41fb68392a2d22da358ed337633c166f70bfbcb0.

[Björn Tillenius (bjornt)]

Self-approve reversal of backport.

review: Approve

diff --git a/src/maasserver/forms/settings.py b/src/maasserver/forms/settings.py
index 41c33ea..ea3598e 100644
--- a/src/maasserver/forms/settings.py
+++ b/src/maasserver/forms/settings.py
@@ -1054,20 +1054,6 @@ CONFIG_ITEMS = {
             "max_value": 90,
         },
     },
-    "auto_vlan_creation": {
-        "default": True,
-        "form": forms.BooleanField,
-        "form_kwargs": {
-            "label": "Automatically create VLANs and Fabrics for interfaces",
-            "required": False,
-            "help_text": (
-                "Enables the creation of a default VLAN and Fabric for "
-                "discovered network interfaces when MAAS cannot connect it "
-                "to an existing one. When disabled, the interface is left "
-                "disconnected in these cases."
-            ),
-        },
-    },
 }
 
 
diff --git a/src/maasserver/models/config.py b/src/maasserver/models/config.py
index bd9d5a6..55dc312 100644
--- a/src/maasserver/models/config.py
+++ b/src/maasserver/models/config.py
@@ -146,7 +146,6 @@ def get_default_config():
         "vault_enabled": False,
         # Windows settings
         "windows_kms_host": None,
-        "auto_vlan_creation": True,
     }
 
 
diff --git a/src/metadataserver/builtin_scripts/network.py b/src/metadataserver/builtin_scripts/network.py
index ee222cf..b21b36a 100644
--- a/src/metadataserver/builtin_scripts/network.py
+++ b/src/metadataserver/builtin_scripts/network.py
@@ -1,7 +1,7 @@
 from django.db.models.expressions import RawSQL
 from netaddr import IPAddress, IPNetwork
 
-from maasserver.enum import INTERFACE_TYPE, IPADDRESS_TYPE, NODE_STATUS
+from maasserver.enum import INTERFACE_TYPE, IPADDRESS_TYPE
 from maasserver.models.config import Config
 from maasserver.models.fabric import Fabric
 from maasserver.models.interface import (
@@ -506,26 +506,13 @@ def update_parent_vlans(node, interface, parent_nics, update_ip_addresses):
                 parent_nic.save()
 
 
-def auto_vlan_creation(node) -> bool:
-    if node.is_controller:
-        # Always create controller's vlans
-        return True
-
-    if node.status == NODE_STATUS.DEPLOYED:
-        # don't create empty vlan/fabric for interfaces discovered by HW sync,
-        # they cannot be used.
-        return False
-
-    return Config.objects.get_config("auto_vlan_creation", True)
-
-
 def guess_vlan_for_interface(node, links):
     # Make sure that the VLAN on the interface is correct. When
     # links exists on this interface we place it into the correct
     # VLAN. If it cannot be determined and its a new interface it
     # gets placed on its own fabric.
     new_vlan = get_interface_vlan_from_links(node, links)
-    if new_vlan is None and auto_vlan_creation(node):
+    if new_vlan is None:
         # If the default VLAN on the default fabric has no interfaces
         # associated with it, the first interface will be placed there
         # (rather than creating a new fabric).
diff --git a/src/metadataserver/builtin_scripts/tests/test_network.py b/src/metadataserver/builtin_scripts/tests/test_network.py
index a9ef0f0..832e918 100644
--- a/src/metadataserver/builtin_scripts/tests/test_network.py
+++ b/src/metadataserver/builtin_scripts/tests/test_network.py
@@ -10,7 +10,6 @@ from maasserver.enum import (
     NODE_TYPE,
 )
 from maasserver.models import Event, EventType
-from maasserver.models.config import Config
 from maasserver.models.fabric import Fabric
 from maasserver.models.interface import (
     BondInterface,
@@ -87,35 +86,6 @@ class TestUpdateInterfaces(MAASServerTestCase, UpdateInterfacesMixin):
         eth0 = node.current_config.interface_set.get(name="eth0")
         self.assertEqual(eth0.numa_node, node.default_numanode)
 
-    def test_dont_create_default_vlan_for_deployed_machines(self):
-        node = factory.make_Machine(status=NODE_STATUS.DEPLOYED)
-        data = FakeCommissioningData()
-        data_eth0 = data.create_physical_network(
-            "eth0",
-            mac_address="11:11:11:11:11:11",
-        )
-        data_eth0.state = "up"
-        self.update_interfaces(node, data)
-        eth0 = PhysicalInterface.objects.get(
-            name="eth0", node_config=node.current_config
-        )
-        self.assertIsNone(eth0.vlan)
-
-    def test_dont_create_default_vlan_if_disabled(self):
-        Config.objects.set_config(name="auto_vlan_creation", value=False)
-        node = factory.make_Machine(status=NODE_STATUS.NEW)
-        data = FakeCommissioningData()
-        data_eth0 = data.create_physical_network(
-            "eth0",
-            mac_address="11:11:11:11:11:11",
-        )
-        data_eth0.state = "up"
-        self.update_interfaces(node, data)
-        eth0 = PhysicalInterface.objects.get(
-            name="eth0", node_config=node.current_config
-        )
-        self.assertIsNone(eth0.vlan)
-
     def test_all_new_physical_interfaces_no_links(self):
         controller = self.create_empty_controller()
         data = FakeCommissioningData()