You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ga...@apache.org on 2019/12/10 01:03:16 UTC
[cloudstack] branch typo-fix-shutdowned created (now 5db61c0)
This is an automated email from the ASF dual-hosted git repository.
gabriel pushed a change to branch typo-fix-shutdowned
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
at 5db61c0 Fix typo: the past tense of shutdown is shutdown, not shutdowned
This branch includes the following new commits:
new 5db61c0 Fix typo: the past tense of shutdown is shutdown, not shutdowned
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[cloudstack] 01/01: Fix typo: the past tense of shutdown is
shutdown, not shutdowned
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
gabriel pushed a commit to branch typo-fix-shutdowned
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 5db61c08c13a5d7619192a7ac8fda810562b5e1b
Author: GabrielBrascher <ga...@apache.org>
AuthorDate: Mon Dec 9 23:02:26 2019 -0200
Fix typo: the past tense of shutdown is shutdown, not shutdowned
---
api/src/main/java/com/cloud/vm/VirtualMachine.java | 2 +-
.../apache/cloudstack/engine/orchestration/NetworkOrchestrator.java | 2 +-
engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql | 3 +++
.../apache/cloudstack/network/contrail/model/VirtualMachineModel.java | 2 +-
.../src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java | 2 +-
.../src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java | 2 +-
ui/scripts/instances.js | 2 +-
ui/scripts/metrics.js | 2 +-
8 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/api/src/main/java/com/cloud/vm/VirtualMachine.java b/api/src/main/java/com/cloud/vm/VirtualMachine.java
index a46edd7..d234c48 100644
--- a/api/src/main/java/com/cloud/vm/VirtualMachine.java
+++ b/api/src/main/java/com/cloud/vm/VirtualMachine.java
@@ -52,7 +52,7 @@ public interface VirtualMachine extends RunningOn, ControlledEntity, Partition,
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;
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
index 9e49148..3514a0e 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2970,7 +2970,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra
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());
diff --git a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql b/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
index 43e282d..eb6e6bd 100644
--- a/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
+++ b/engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql
@@ -21,3 +21,6 @@
-- 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';
\ No newline at end of file
diff --git a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
index 4b64c80..c44fcac 100644
--- a/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
+++ b/plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/model/VirtualMachineModel.java
@@ -224,7 +224,7 @@ public class VirtualMachineModel extends ModelObjectBase {
case Migrating:
case Starting:
case Running:
- case Shutdowned:
+ case Shutdown:
case Stopped:
case Stopping:
return true;
diff --git a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
index 83a53aa..18bd7aa 100644
--- a/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
+++ b/server/src/main/java/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
@@ -918,7 +918,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy
}
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);
diff --git a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 8e1d685..2392dfa 100755
--- a/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/main/java/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -290,7 +290,7 @@ public class SnapshotManagerImpl extends MutualExclusiveIdsManagerBase implement
// 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
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 35b17a2..08eb056 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -517,7 +517,7 @@
'Destroyed': 'off',
'Expunging': 'off',
'Stopping': 'warning',
- 'Shutdowned': 'warning'
+ 'Shutdown': 'warning'
}
}
},
diff --git a/ui/scripts/metrics.js b/ui/scripts/metrics.js
index 2784eab..5327d41 100644
--- a/ui/scripts/metrics.js
+++ b/ui/scripts/metrics.js
@@ -447,7 +447,7 @@
'Destroyed': 'off',
'Expunging': 'off',
'Stopping': 'warning',
- 'Shutdowned': 'warning'
+ 'Shutdown': 'warning'
},
compact: true
},