Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/linters/codespell.txt
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ ingore
initalize
initator
inspite
instace
instal
instnace
intefaces
Expand Down Expand Up @@ -376,7 +375,6 @@ renabling
reponse
reqest
reqiured
requried
reserv
reserverd
reseted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
// C# versions of certain CloudStack types to simplify JSON serialisation.
// Limit to the number of types, because they are written and maintained manually.
// JsonProperty used to identify property name when serialised, which allows
// later adoption of C# naming conventions if requried.
// later adoption of C# naming conventions if required.
namespace HypervResource
{
public class PrimaryDataStoreTO
Expand Down
4 changes: 2 additions & 2 deletions server/src/test/java/com/cloud/api/ApiResponseHelperTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ public void testCreateTrafficTypeResponse() {
}
}

private UnmanagedInstanceTO getUnmanagedInstaceForTests() {
private UnmanagedInstanceTO getUnmanagedInstanceForTests() {
UnmanagedInstanceTO instance = Mockito.mock(UnmanagedInstanceTO.class);
Mockito.when(instance.getPowerState()).thenReturn(UnmanagedInstanceTO.PowerState.PowerOff);
Mockito.when(instance.getClusterName()).thenReturn("CL1");
Expand All @@ -477,7 +477,7 @@ private UnmanagedInstanceTO getUnmanagedInstaceForTests() {

@Test
public void testCreateUnmanagedInstanceResponseVmwareDcVms() {
UnmanagedInstanceTO instance = getUnmanagedInstaceForTests();
UnmanagedInstanceTO instance = getUnmanagedInstanceForTests();
UnmanagedInstanceResponse response = apiResponseHelper.createUnmanagedInstanceResponse(instance, null, null);
Assert.assertEquals(1, response.getDisks().size());
Assert.assertEquals(1, response.getNics().size());
Expand Down
6 changes: 3 additions & 3 deletions test/integration/component/test_netscaler_nw_off.py
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,7 @@ def test_02_multiple_netscaler_capacilty(self):

# Validate the following
# 1. Add another netscaler device and spawn a new VM again
# 2. VM deployement should be successful
# 2. VM deployment should be successful

self.debug("Adding another netscaler device: %s" %
self.services["netscaler_2"]["ipaddress"])
Expand Down Expand Up @@ -1672,7 +1672,7 @@ def test_shared_to_dedicated_upgrade(self):
# LB rules
# 5. Deploy instance with dedicated network offering in account 3.
# Create Lb rules.
# 6. Configure another instace of netscaler in dedicated mode
# 6. Configure another instance of netscaler in dedicated mode
# 7. upgrade networkj for user 1 to dedicated network offering.
# Create LB rules. LB rule creation should be successful

Expand Down Expand Up @@ -2063,7 +2063,7 @@ def test_shared_to_dedicated_upgrade(self):
# LB rules
# 5. Deploy instance with dedicated network offering in account 3.
# Create Lb rules.
# 6. Configure another instace of netscaler in dedicated mode
# 6. Configure another instance of netscaler in dedicated mode
# 7. upgrade networkj for user 1 to dedicated network offering.
# Create LB rules. LB rule creation should be successful

Expand Down
2 changes: 1 addition & 1 deletion test/integration/component/test_vpc_vm_life_cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -1274,7 +1274,7 @@ def test_02_deploy_vm_vpcvr_stopped(self):
except Exception as e:
self.fail("Failed to deploy the virtual instance: %s" % e)

self.debug("Verify the deployment of virtual instace")
self.debug("Verify the deployment of virtual instance")
vms = VirtualMachine.list(
self.apiclient,
id=vm.id,
Expand Down
2 changes: 1 addition & 1 deletion ui/src/components/view/DedicateDomain.vue
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {
props: {
error: {
type: Boolean,
requried: true
required: true
}
},
data () {
Expand Down
16 changes: 8 additions & 8 deletions ui/src/components/view/DeployVMFromBackup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1589,7 +1589,7 @@ export default {
})
this.fetchBootTypes()
this.fetchBootModes()
this.fetchInstaceGroups()
this.fetchInstanceGroups()
this.fetchIoPolicyTypes()
nextTick().then(() => {
['name', 'keyboard', 'boottype', 'bootmode', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
Expand Down Expand Up @@ -1640,7 +1640,7 @@ export default {
{ id: 'storage_specific', description: 'storage_specific' }
]
},
fetchInstaceGroups () {
fetchInstanceGroups () {
this.options.instanceGroups = []
getAPI('listInstanceGroups', {
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
Expand Down Expand Up @@ -2467,12 +2467,12 @@ export default {
configuration.cpunumber = 0
configuration.cpuspeed = 0
configuration.memory = 0
for (var harwareItem of configuration.hardwareItems) {
if (harwareItem.resourceType === 'Processor') {
configuration.cpunumber = harwareItem.virtualQuantity
configuration.cpuspeed = harwareItem.reservation
} else if (harwareItem.resourceType === 'Memory') {
configuration.memory = harwareItem.virtualQuantity
for (var hardwareItem of configuration.hardwareItems) {
if (hardwareItem.resourceType === 'Processor') {
configuration.cpunumber = hardwareItem.virtualQuantity
configuration.cpuspeed = hardwareItem.reservation
} else if (hardwareItem.resourceType === 'Memory') {
configuration.memory = hardwareItem.virtualQuantity
}
}
configurations.push(configuration)
Expand Down
10 changes: 5 additions & 5 deletions ui/src/components/view/ResourceCountUsage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
v-if="taggedUsage[item]"
class="list-item__collapse"
@change="handleCollapseChange(item)">
<a-collapse-panel key="1" :header="collpaseActive[item] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + this.tagData[item].tagsasstring">
<a-collapse-panel key="1" :header="collapseActive[item] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + this.tagData[item].tagsasstring">
<a-list
size="small"
:loading="loading"
Expand Down Expand Up @@ -96,7 +96,7 @@ export default {
],
taggedUsage: {},
tagData: {},
collpaseActive: {}
collapseActive: {}
}
},
created () {
Expand Down Expand Up @@ -168,11 +168,11 @@ export default {
}
},
handleCollapseChange (type) {
if (this.collpaseActive[type]) {
this.collpaseActive[type] = null
if (this.collapseActive[type]) {
this.collapseActive[type] = null
return
}
this.collpaseActive[type] = true
this.collapseActive[type] = true
}
}
}
Expand Down
10 changes: 5 additions & 5 deletions ui/src/components/view/ResourceLimitTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
v-if="item.taggedresource && item.taggedresource.length > 0"
class="tagged-limit-collapse"
@change="handleCollapseChange(item.resourcetypename)">
<a-collapse-panel key="1" :header="collpaseActive[item.resourcetypename] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + item.tagsasstring">
<a-collapse-panel key="1" :header="collapseActive[item.resourcetypename] ? $t('label.tagged.limits') : $t('label.tagged.limits') + ' - ' + item.tagsasstring">
<div v-for="(subItem, subItemIndex) in item.taggedresource" :key="subItemIndex">
<a-form-item
:v-bind="subItem.resourcetypename"
Expand Down Expand Up @@ -94,7 +94,7 @@ export default {
return {
formLoading: false,
dataResource: [],
collpaseActive: {},
collapseActive: {},
resourceTypeIdNames: {}
}
},
Expand Down Expand Up @@ -259,11 +259,11 @@ export default {
})
},
handleCollapseChange (type) {
if (this.collpaseActive[type]) {
this.collpaseActive[type] = null
if (this.collapseActive[type]) {
this.collapseActive[type] = null
return
}
this.collpaseActive[type] = true
this.collapseActive[type] = true
}
}
}
Expand Down
12 changes: 6 additions & 6 deletions ui/src/components/view/TestWebhookDeliveryView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export default {
collapseKey: undefined,
loading: false,
testDeliveryInterval: null,
testDeliveryIntervalCouter: 0
testDeliveryIntervalCounter: 0
}
},
beforeCreate () {
Expand Down Expand Up @@ -154,8 +154,8 @@ export default {
return (duration > 0 ? duration / 1000.0 : 0) + ''
},
computedOverlayStyle () {
var opacity = this.testDeliveryIntervalCouter <= 10.0 ? 0 : 0.3
var width = this.testDeliveryIntervalCouter
var opacity = this.testDeliveryIntervalCounter <= 10.0 ? 0 : 0.3
var width = this.testDeliveryIntervalCounter
return 'opacity: ' + opacity + '; width: ' + width + '%;'
}
},
Expand All @@ -168,7 +168,7 @@ export default {
if (this.testDeliveryInterval) {
clearInterval(this.testDeliveryInterval)
}
this.testDeliveryIntervalCouter = 0
this.testDeliveryIntervalCounter = 0
},
testWebhookDelivery () {
this.resetTestDeliveryInterval()
Expand Down Expand Up @@ -223,8 +223,8 @@ export default {
this.resetTestDeliveryInterval()
return
}
this.testDeliveryIntervalCouter = this.testDeliveryIntervalCouter + 1
if (this.testDeliveryIntervalCouter >= 100) {
this.testDeliveryIntervalCounter = this.testDeliveryIntervalCounter + 1
if (this.testDeliveryIntervalCounter >= 100) {
this.executeTestWebhookDeliveryOrReset()
}
}, this.timedDeliveryWait / 100)
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/AttachIso.vue
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ export default {
})
},
fetchData () {
const isoFiters = ['featured', 'community', 'selfexecutable']
const isoFilters = ['featured', 'community', 'selfexecutable']
this.loading = true
const promises = []
isoFiters.forEach((filter) => {
isoFilters.forEach((filter) => {
promises.push(this.fetchIsos(filter))
})
Promise.all(promises).then(() => {
Expand Down
12 changes: 6 additions & 6 deletions ui/src/views/compute/CreateAutoScaleVmGroup.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3172,12 +3172,12 @@ export default {
configuration.cpunumber = 0
configuration.cpuspeed = 0
configuration.memory = 0
for (var harwareItem of configuration.hardwareItems) {
if (harwareItem.resourceType === 'Processor') {
configuration.cpunumber = harwareItem.virtualQuantity
configuration.cpuspeed = harwareItem.reservation
} else if (harwareItem.resourceType === 'Memory') {
configuration.memory = harwareItem.virtualQuantity
for (var hardwareItem of configuration.hardwareItems) {
if (hardwareItem.resourceType === 'Processor') {
configuration.cpunumber = hardwareItem.virtualQuantity
configuration.cpuspeed = hardwareItem.reservation
} else if (hardwareItem.resourceType === 'Memory') {
configuration.memory = hardwareItem.virtualQuantity
}
}
configurations.push(configuration)
Expand Down
16 changes: 8 additions & 8 deletions ui/src/views/compute/DeployVM.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1920,7 +1920,7 @@ export default {
}
this.fetchBootTypes()
this.fetchBootModes()
this.fetchInstaceGroups()
this.fetchInstanceGroups()
this.fetchIoPolicyTypes()
nextTick().then(() => {
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
Expand Down Expand Up @@ -1976,7 +1976,7 @@ export default {
{ id: 'storage_specific', description: 'storage_specific' }
]
},
fetchInstaceGroups () {
fetchInstanceGroups () {
this.options.instanceGroups = []
getAPI('listInstanceGroups', {
account: this.$store.getters.project?.id ? null : this.$store.getters.userInfo.account,
Expand Down Expand Up @@ -3224,12 +3224,12 @@ export default {
configuration.cpunumber = 0
configuration.cpuspeed = 0
configuration.memory = 0
for (var harwareItem of configuration.hardwareItems) {
if (harwareItem.resourceType === 'Processor') {
configuration.cpunumber = harwareItem.virtualQuantity
configuration.cpuspeed = harwareItem.reservation
} else if (harwareItem.resourceType === 'Memory') {
configuration.memory = harwareItem.virtualQuantity
for (var hardwareItem of configuration.hardwareItems) {
if (hardwareItem.resourceType === 'Processor') {
configuration.cpunumber = hardwareItem.virtualQuantity
configuration.cpuspeed = hardwareItem.reservation
} else if (hardwareItem.resourceType === 'Memory') {
configuration.memory = hardwareItem.virtualQuantity
}
}
configurations.push(configuration)
Expand Down
16 changes: 8 additions & 8 deletions ui/src/views/compute/DeployVnfAppliance.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1761,7 +1761,7 @@ export default {
}
this.fetchBootTypes()
this.fetchBootModes()
this.fetchInstaceGroups()
this.fetchInstanceGroups()
this.fetchIoPolicyTypes()
nextTick().then(() => {
['name', 'keyboard', 'boottype', 'bootmode', 'userdata', 'iothreadsenabled', 'iodriverpolicy', 'nicmultiqueuenumber', 'nicpackedvirtqueues'].forEach(this.fillValue)
Expand Down Expand Up @@ -1816,7 +1816,7 @@ export default {
{ id: 'storage_specific', description: 'storage_specific' }
]
},
fetchInstaceGroups () {
fetchInstanceGroups () {
this.options.instanceGroups = []
getAPI('listInstanceGroups', {
account: this.$store.getters.userInfo.account,
Expand Down Expand Up @@ -2767,12 +2767,12 @@ export default {
configuration.cpunumber = 0
configuration.cpuspeed = 0
configuration.memory = 0
for (var harwareItem of configuration.hardwareItems) {
if (harwareItem.resourceType === 'Processor') {
configuration.cpunumber = harwareItem.virtualQuantity
configuration.cpuspeed = harwareItem.reservation
} else if (harwareItem.resourceType === 'Memory') {
configuration.memory = harwareItem.virtualQuantity
for (var hardwareItem of configuration.hardwareItems) {
if (hardwareItem.resourceType === 'Processor') {
configuration.cpunumber = hardwareItem.virtualQuantity
configuration.cpuspeed = hardwareItem.reservation
} else if (hardwareItem.resourceType === 'Memory') {
configuration.memory = hardwareItem.virtualQuantity
}
}
configurations.push(configuration)
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/EditVM.vue
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ export default {
this.fetchZoneDetails()
this.fetchSecurityGroups()
this.fetchOsTypes()
this.fetchInstaceGroups()
this.fetchInstanceGroups()
this.fetchServiceOfferingData()
this.fetchTemplateData()
this.fetchUserData()
Expand Down Expand Up @@ -335,7 +335,7 @@ export default {
this.$notifyError(error)
}).finally(() => { this.osTypes.loading = false })
},
fetchInstaceGroups () {
fetchInstanceGroups () {
this.groups.loading = true
this.groups.opts = []
const params = {
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/wizard/OsBasedImageSelection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
@change="handleGuestOsCategoryChange">
<template #radio-option="{ item }">
<div class="radio-option">
<div class="radio-opion__icon">
<div class="radio-option__icon">
<resource-icon v-if="item.icon && item.icon.base64image" :image="item.icon.base64image" size="os" style="margin-bottom: 2px; margin-left: 1px" />
<font-awesome-icon v-else-if="['-1', '0'].includes(item.id)" :icon="['fas', item.id === '0' ? 'user' : 'images']" size="2x" :style="categoryFontAwesomeIconStyle" />
<os-logo v-else size="2x" :os-name="item.name" />
Expand Down Expand Up @@ -367,7 +367,7 @@ export default {
text-overflow: ellipsis;
}

.radio-opion__icon {
.radio-option__icon {
width: 30px;
height: 30px;
object-fit: contain;
Expand Down
6 changes: 3 additions & 3 deletions ui/src/views/extension/CreateExtension.vue
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
<tooltip-label :title="$t('label.path')" :tooltip="apiParams.path.description"/>
</template>
<div class="path-input-container">
<span v-if="!!safeName" :title="extenstionBasePath" class="path-input-base">
{{ extenstionBasePath }}
<span v-if="!!safeName" :title="extensionBasePath" class="path-input-base">
{{ extensionBasePath }}
</span>
<a-input
v-model:value="form.path"
Expand Down Expand Up @@ -137,7 +137,7 @@ export default {
}
return value.replace(/[^a-zA-Z0-9._-]/g, '_').toLowerCase()
},
extenstionBasePath () {
extensionBasePath () {
return (this.$store.getters.features.extensionspath || '[EXTENSIONS_PATH]') + '/' + this.safeName + '/'
}
},
Expand Down
Loading
Loading