Merge ~bjornt/maas:bug-1930554-3.0 into maas:3.0

[Björn Tillenius]

LP #1930554: vm-host CLI command is now named vmhost

Commit c57ec00472a1911eac55df79e24e1801f9b89321 renamed the handler,
which caused the API command to remove the -.

(cherry picked from commit 08618ef9c58309390ec358b133759fec7c1e6dc1)

[Björn Tillenius (bjornt)]

Self-approve backport.

review: Approve

diff --git a/src/maasserver/api/pods.py b/src/maasserver/api/pods.py
index bf9729b..fd36ca2 100644
--- a/src/maasserver/api/pods.py
+++ b/src/maasserver/api/pods.py
@@ -40,7 +40,7 @@ DISPLAYED_POD_FIELDS = (
 )
 
 
-class VMHostHandler(OperationsHandler):
+class VmHostHandler(OperationsHandler):
     """
     Manage an individual VM host.
 
@@ -421,7 +421,7 @@ class VMHostHandler(OperationsHandler):
 
 # Pods are being renamed to VM hosts. Keep the old name on the API as well for
 # backwards-compatibility.
-class PodHandler(VMHostHandler):
+class PodHandler(VmHostHandler):
     """
     Manage an individual Pod.
 
@@ -437,7 +437,7 @@ class PodHandler(VMHostHandler):
         return ("pod_handler", (pod_id,))
 
 
-class VMHostsHandler(OperationsHandler):
+class VmHostsHandler(OperationsHandler):
     """
     Manage the collection of all the VM hosts in MAAS.
     """
@@ -526,7 +526,7 @@ class VMHostsHandler(OperationsHandler):
 
 # Pods are being renamed to VM hosts. Keep the old name on the API as well for
 # backwards-compatibility.
-class PodsHandler(VMHostsHandler):
+class PodsHandler(VmHostsHandler):
     """
     Manage the collection of all the pods in the MAAS.
 
diff --git a/src/maasserver/urls_api.py b/src/maasserver/urls_api.py
index 8a94ed8..e7511ce 100644
--- a/src/maasserver/urls_api.py
+++ b/src/maasserver/urls_api.py
@@ -64,8 +64,8 @@ from maasserver.api.partitions import PartitionHandler, PartitionsHandler
 from maasserver.api.pods import (
     PodHandler,
     PodsHandler,
-    VMHostHandler,
-    VMHostsHandler,
+    VmHostHandler,
+    VmHostsHandler,
 )
 from maasserver.api.rackcontrollers import (
     RackControllerHandler,
@@ -159,8 +159,8 @@ device_handler = RestrictedResource(DeviceHandler, authentication=api_auth)
 devices_handler = RestrictedResource(DevicesHandler, authentication=api_auth)
 pod_handler = RestrictedResource(PodHandler, authentication=api_auth)
 pods_handler = RestrictedResource(PodsHandler, authentication=api_auth)
-vm_host_handler = RestrictedResource(VMHostHandler, authentication=api_auth)
-vm_hosts_handler = RestrictedResource(VMHostsHandler, authentication=api_auth)
+vm_host_handler = RestrictedResource(VmHostHandler, authentication=api_auth)
+vm_hosts_handler = RestrictedResource(VmHostsHandler, authentication=api_auth)
 virtual_machine_handler = RestrictedResource(
     VirtualMachineHandler, authentication=api_auth
 )