From dda672503f250233ad827d714333bd62f6bfe172 Mon Sep 17 00:00:00 2001 From: John Bampton Date: Fri, 15 Dec 2023 21:43:32 +1000 Subject: [PATCH] Remove unneeded duplicate words (#8358) This PR removes some unneeded duplicate words. --- .../engine/orchestration/NetworkOrchestrator.java | 2 +- .../api/commands/ConfigureSimulatorHAProviderState.java | 4 ++-- .../cloud/hypervisor/vmware/resource/VmwareResource.java | 2 +- .../com/cloud/storage/resource/VmwareStorageProcessor.java | 2 +- test/integration/component/test_escalations_instances.py | 6 +++--- usage/src/main/java/com/cloud/usage/UsageManagerImpl.java | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) 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 30fd35e5f37..c6396dbdede 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 @@ -3248,7 +3248,7 @@ public class NetworkOrchestrator extends ManagerBase implements NetworkOrchestra // get updated state for the network network = _networksDao.findById(networkId); if (network.getState() != Network.State.Allocated && network.getState() != Network.State.Setup && !forced) { - s_logger.debug("Network is not not in the correct state to be destroyed: " + network.getState()); + s_logger.debug("Network is not in the correct state to be destroyed: " + network.getState()); return false; } diff --git a/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java index 1d68a184a5a..ef6f2db3391 100644 --- a/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java +++ b/plugins/hypervisors/simulator/src/main/java/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java @@ -69,12 +69,12 @@ public final class ConfigureSimulatorHAProviderState extends BaseCmd { private Boolean activity; @Parameter(name = ApiConstants.RECOVER, type = CommandType.BOOLEAN, - description = "Set true is haprovider for simulator host should be be recoverable", + description = "Set true is haprovider for simulator host should be recoverable", required = true) private Boolean recovery; @Parameter(name = ApiConstants.FENCE, type = CommandType.BOOLEAN, - description = "Set true is haprovider for simulator host should be be fence-able", + description = "Set true is haprovider for simulator host should be fence-able", required = true) private Boolean fenceable; diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 6c457273bc3..a01ddcc81ce 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -3542,7 +3542,7 @@ public class VmwareResource extends ServerResourceBase implements StoragePoolRes if (diskInfo == null) { diskInfo = diskInfoBuilder.getDiskInfoByDeviceBusName(infoInChain.getDiskDeviceBusName()); if (diskInfo != null) { - s_logger.info("Found existing disk from from chain device bus information: " + infoInChain.getDiskDeviceBusName()); + s_logger.info("Found existing disk from chain device bus information: " + infoInChain.getDiskDeviceBusName()); return diskInfo; } } diff --git a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java index 2cf1663e677..be37c16a0ca 100644 --- a/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java +++ b/plugins/hypervisors/vmware/src/main/java/com/cloud/storage/resource/VmwareStorageProcessor.java @@ -2209,7 +2209,7 @@ public class VmwareStorageProcessor implements StorageProcessor { if (diskInfo == null) { diskInfo = diskInfoBuilder.getDiskInfoByDeviceBusName(infoInChain.getDiskDeviceBusName()); if (diskInfo != null) { - s_logger.info("Found existing disk from from chain device bus information: " + infoInChain.getDiskDeviceBusName()); + s_logger.info("Found existing disk from chain device bus information: " + infoInChain.getDiskDeviceBusName()); return diskInfo; } } diff --git a/test/integration/component/test_escalations_instances.py b/test/integration/component/test_escalations_instances.py index 0004cce0b35..89c4f4ce2a6 100644 --- a/test/integration/component/test_escalations_instances.py +++ b/test/integration/component/test_escalations_instances.py @@ -1244,7 +1244,7 @@ class TestListInstances(cloudstackTestCase): status[0], "Listing VM's by name and zone failed" ) - # Verifying Verifying that the size of the list is 1 + # Verifying that the size of the list is 1 self.assertEqual( 1, len(list_vms), @@ -1404,7 +1404,7 @@ class TestListInstances(cloudstackTestCase): status[0], "Listing VM's by name and zone failed" ) - # Verifying Verifying that the size of the list is 1 + # Verifying that the size of the list is 1 self.assertEqual( 1, len(list_vms), @@ -1474,7 +1474,7 @@ class TestListInstances(cloudstackTestCase): status[0], "Listing VM's by name, account and zone failed" ) - # Verifying Verifying that the size of the list is 1 + # Verifying that the size of the list is 1 self.assertEqual( 1, len(list_vms), diff --git a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java index 37906496059..c027b7074fb 100644 --- a/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java +++ b/usage/src/main/java/com/cloud/usage/UsageManagerImpl.java @@ -1899,7 +1899,7 @@ public class UsageManagerImpl extends ManagerBase implements UsageManager, Runna if (usageVpnUsers.size() > 0) { s_logger.debug(String.format("We do not need to create the usage VPN user [%s] assigned to account [%s] because it already exists.", userId, accountId)); } else { - s_logger.debug(String.format("Creating VPN user user [%s] assigned to account [%s] domain [%s], zone [%s], and created at [%s]", userId, accountId, domainId, zoneId, + s_logger.debug(String.format("Creating VPN user [%s] assigned to account [%s] domain [%s], zone [%s], and created at [%s]", userId, accountId, domainId, zoneId, event.getCreateDate())); UsageVPNUserVO vpnUser = new UsageVPNUserVO(zoneId, accountId, domainId, userId, event.getResourceName(), event.getCreateDate(), null); _usageVPNUserDao.persist(vpnUser);