Consistent naming - part 2 - longer model name

sticking with "active_directory" for clarity.

autoinstall-schema.json

@@ -461,7 +461,7 @@
                 "additionalProperties": false
             }
         },
-        "ad": {
+        "active_directory": {
             "type": "object",
             "properties": {
                 "admin_name": {

examples/autoinstall-ad.yaml

@@ -29,7 +29,7 @@ apt:
     - {package: "python-*", pin: "origin *ubuntu.com*", pin-priority: -1}
 keyboard:
   layout: gb
-ad:
+active_directory:
   admin_name: '$ubuntu'
   domain_name: 'ad.ubuntu.com'
 identity:

subiquity/models/subiquity.py

@@ -180,7 +180,7 @@ class SubiquityModel:
             self.target = root
             self.chroot_prefix = []
 
-        self.ad = AdModel()
+        self.active_directory = AdModel()
         self.codecs = CodecsModel()
         self.debconf_selections = DebconfSelectionsModel()
         self.drivers = DriversModel()

subiquity/server/controllers/ad.py

@@ -93,7 +93,7 @@ class AdController(SubiquityController):
     """ Implements the server part of the Active Directory feature. """
     endpoint = API.active_directory
     # No auto install key and schema for now due password handling uncertainty.
-    autoinstall_key = model_name = "ad"
+    autoinstall_key = model_name = "active_directory"
     autoinstall_schema = {
         'type': 'object',
         'properties': {

subiquity/server/controllers/install.py

@@ -406,7 +406,7 @@ class InstallController(SubiquityController):
             policy = self.model.updates.updates
             await self.run_unattended_upgrades(context=context, policy=policy)
         await self.restore_apt_config(context=context)
-        if self.model.ad.do_join:
+        if self.model.active_directory.do_join:
             hostname = self.model.identity.hostname
             if not hostname:
                 with open(self.tpath('etc/hostname'), 'r') as f:

subiquity/server/server.py

@@ -215,7 +215,7 @@ POSTINSTALL_MODEL_NAMES = ModelNames({
     "ubuntu_pro",
     "userdata",
     },
-    desktop={"timezone", "codecs", "ad"})
+    desktop={"timezone", "codecs", "active_directory"})
 
 
 class SubiquityServer(Application):