Fix typo: the past tense of shutdown is shutdown, not shutdowned (#3659)

Author: GabrielBrascher

api/src/main/java/com/cloud/vm/VirtualMachine.java

@@ -52,7 +52,7 @@ public enum State {
         Migrating(true, "VM is being migrated.  host id holds to from host"),
         Error(false, "VM is in error"),
         Unknown(false, "VM state is unknown."),
-        Shutdowned(false, "VM is shutdowned from inside");
+        Shutdown(false, "VM state is shutdown from inside");
 
         private final boolean _transitional;
         String _description;

engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java

@@ -2970,7 +2970,7 @@ public void destroyExpendableRouters(final List<? extends VirtualRouter> routers
         for (final VirtualRouter router : routers) {
             if (router.getState() == VirtualMachine.State.Stopped ||
                     router.getState() == VirtualMachine.State.Error ||
-                    router.getState() == VirtualMachine.State.Shutdowned ||
+                    router.getState() == VirtualMachine.State.Shutdown ||
                     router.getState() == VirtualMachine.State.Unknown) {
                 s_logger.debug("Destroying old router " + router);
                 _routerService.destroyRouter(router.getId(), context.getAccount(), context.getCaller().getId());

engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql

@@ -22,6 +22,9 @@
 -- KVM: enable storage data motion on KVM hypervisor_capabilities
 UPDATE `cloud`.`hypervisor_capabilities` SET `storage_motion_supported` = 1 WHERE `hypervisor_capabilities`.`hypervisor_type` = 'KVM';
 
+-- #3659 Fix typo: the past tense of shutdown is shutdown, not shutdowned
+UPDATE `cloud`.`vm_instance` SET state='Shutdown' WHERE state='Shutdowned';
+
 -- Fix OS category for some Ubuntu and RedHat OS-es
 UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=277 AND display_name="Ubuntu 17.04";
 UPDATE `cloud`.`guest_os` SET `category_id`='10' WHERE `id`=278 AND display_name="Ubuntu 17.10";
@@ -33,4 +36,3 @@ UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=283 AND display_name=
 UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=284 AND display_name="Red Hat Enterprise Linux 7.5";
 UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=285 AND display_name="Red Hat Enterprise Linux 7.6";
 UPDATE `cloud`.`guest_os` SET `category_id`='4' WHERE `id`=286 AND display_name="Red Hat Enterprise Linux 8.0";
-

plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java

@@ -224,7 +224,7 @@ boolean isActiveInstance(VMInstanceVO instance) {
             case Migrating:
             case Starting:
             case Running:
-            case Shutdowned:
+            case Shutdown:
             case Stopped:
             case Stopping:
                 return true;

server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java

@@ -918,7 +918,7 @@ private boolean allowToLaunchNew(long dcId) {
         }
         List<ConsoleProxyVO> l =
             _consoleProxyDao.getProxyListInStates(dcId, VirtualMachine.State.Starting, VirtualMachine.State.Running, VirtualMachine.State.Stopping,
-                VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdowned, VirtualMachine.State.Unknown);
+                VirtualMachine.State.Stopped, VirtualMachine.State.Migrating, VirtualMachine.State.Shutdown, VirtualMachine.State.Unknown);
 
         String value = _configDao.getValue(Config.ConsoleProxyLaunchMax.key());
         int launchLimit = NumbersUtil.parseInt(value, 10);

server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java

@@ -290,7 +290,7 @@ public Snapshot revertSnapshot(Long snapshotId) {
         // in order to revert the volume
         if (instanceId != null) {
             UserVmVO vm = _vmDao.findById(instanceId);
-            if (vm.getState() != State.Stopped && vm.getState() != State.Shutdowned) {
+            if (vm.getState() != State.Stopped && vm.getState() != State.Shutdown) {
                 throw new InvalidParameterValueException("The VM the specified disk is attached to is not in the shutdown state.");
             }
             // If target VM has associated VM snapshots then don't allow to revert from snapshot

ui/scripts/instances.js

@@ -517,7 +517,7 @@
                         'Destroyed': 'off',
                         'Expunging': 'off',
                         'Stopping': 'warning',
-                        'Shutdowned': 'warning'
+                        'Shutdown': 'warning'
                     }
                 }
             },

ui/scripts/metrics.js

@@ -447,7 +447,7 @@
                         'Destroyed': 'off',
                         'Expunging': 'off',
                         'Stopping': 'warning',
-                        'Shutdowned': 'warning'
+                        'Shutdown': 'warning'
                     },
                     compact: true
                 },