apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-02 20:02:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.15'

Browse Source
This commit is contained in:
Rohit Yadav 2021-04-05 14:59:15 +05:30
commit 3066c95548
122 changed files with 218 additions and 239 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/CitrixHelper.java
View File

@ -16,6 +16,7 @@
// under the License.
package com.cloud.hypervisor.xenserver.resource;
import com.cloud.storage.Storage;
import com.xensource.xenapi.Host;
/**
@ -44,4 +45,14 @@ public class CitrixHelper {
}
return "";
}
public static String getSRNameLabel(final String poolUuid,
final Storage.StoragePoolType poolType,
final String poolPath) {
if (Storage.StoragePoolType.PreSetup.equals(poolType) &&
!poolPath.contains(poolUuid)) {
return poolPath.replaceFirst("/", "");
}
return poolUuid;
}
}

12
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/XenServerStorageProcessor.java
View File

@ -798,7 +798,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
try {
final Connection conn = hypervisorResource.getConnection();
final SR poolSr = hypervisorResource.getStorageRepository(conn, data.getDataStore().getUuid());
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)data.getDataStore();
final SR poolSr = hypervisorResource.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(primaryStore.getUuid(), primaryStore.getPoolType(), primaryStore.getPath()));
VDI.Record vdir = new VDI.Record();
vdir.nameLabel = volume.getName();
vdir.SR = poolSr;
@ -871,7 +873,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
if (srcStore instanceof NfsTO) {
final NfsTO nfsStore = (NfsTO) srcStore;
try {
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, destVolume.getDataStore().getUuid());
final PrimaryDataStoreTO destStore = (PrimaryDataStoreTO)destVolume.getDataStore();
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(destStore.getUuid(), destStore.getPoolType(), destStore.getPath()));
final String srUuid = primaryStoragePool.getUuid(conn);
final URI uri = new URI(nfsStore.getUrl());
final String volumePath = uri.getHost() + ":" + uri.getPath() + nfsStore.getPathSeparator() + srcVolume.getPath();
@ -1153,7 +1157,9 @@ public class XenServerStorageProcessor implements StorageProcessor {
final DataTO cacheData = cmd.getCacheTO();
final DataTO destData = cmd.getDestTO();
final int wait = cmd.getWait();
final String primaryStorageNameLabel = srcData.getDataStore().getUuid();
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)srcData.getDataStore();
final String primaryStorageNameLabel = CitrixHelper.getSRNameLabel(primaryStore.getUuid(),
primaryStore.getPoolType(), primaryStore.getPath());
String secondaryStorageUrl = null;
NfsTO cacheStore = null;
String destPath = null;

8
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/Xenserver625StorageProcessor.java
View File

@ -328,7 +328,7 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
destSr = hypervisorResource.prepareManagedSr(conn, details);
} else {
final String srName = destStore.getUuid();
final String srName = CitrixHelper.getSRNameLabel(destStore.getUuid(), destStore.getPoolType(), destStore.getPath());
final Set<SR> srs = SR.getByNameLabel(conn, srName);
if (srs.size() != 1) {
@ -494,7 +494,8 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
final DataTO destData = cmd.getDestTO();
final int wait = cmd.getWait();
final PrimaryDataStoreTO primaryStore = (PrimaryDataStoreTO)srcData.getDataStore();
final String primaryStorageNameLabel = primaryStore.getUuid();
final String primaryStorageNameLabel = CitrixHelper.getSRNameLabel(primaryStore.getUuid(),
primaryStore.getPoolType(), primaryStore.getPath());
String secondaryStorageUrl = null;
NfsTO cacheStore = null;
String destPath = null;
@ -1001,7 +1002,8 @@ public class Xenserver625StorageProcessor extends XenServerStorageProcessor {
final SR srcSr = createFileSr(conn, uri.getHost() + ":" + uri.getPath(), volumeDirectory);
Task task = null;
try {
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn, primaryStore.getUuid());
final SR primaryStoragePool = hypervisorResource.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(primaryStore.getUuid(), primaryStore.getPoolType(), primaryStore.getPath()));
final VDI srcVdi = VDI.getByUuid(conn, volumeUuid);
task = srcVdi.copyAsync(conn, primaryStoragePool, null, null);
// poll every 1 seconds ,

7
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateVolumeCommandWrapper.java
View File

@ -29,6 +29,7 @@ import com.cloud.agent.api.storage.MigrateVolumeAnswer;
import com.cloud.agent.api.storage.MigrateVolumeCommand;
import com.cloud.agent.api.to.DiskTO;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.hypervisor.xenserver.resource.XenServer610Resource;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@ -62,10 +63,8 @@ public final class XenServer610MigrateVolumeCommandWrapper extends CommandWrappe
chapInitiatorUsername, chapInitiatorSecret, false);
}
else {
StorageFilerTO destPoolTO = command.getPool();
String destPoolUuid = destPoolTO.getUuid();
destPool = xenServer610Resource.getStorageRepository(connection, destPoolUuid);
final StorageFilerTO pool = command.getPool();
destPool = xenServer610Resource.getStorageRepository(connection, CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
}
Map<String, String> other = new HashMap<>();

7
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen610/XenServer610MigrateWithStorageCommandWrapper.java
View File

@ -24,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import com.cloud.utils.Pair;
import org.apache.cloudstack.storage.to.VolumeObjectTO;
import org.apache.log4j.Logger;
@ -35,12 +34,14 @@ import com.cloud.agent.api.to.NicTO;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VirtualMachineTO;
import com.cloud.agent.api.to.VolumeTO;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.hypervisor.xenserver.resource.XenServer610Resource;
import com.cloud.hypervisor.xenserver.resource.XsHost;
import com.cloud.hypervisor.xenserver.resource.XsLocalNetwork;
import com.cloud.network.Networks.TrafficType;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
import com.cloud.utils.Pair;
import com.cloud.utils.exception.CloudRuntimeException;
import com.xensource.xenapi.Connection;
import com.xensource.xenapi.Host;
@ -88,7 +89,9 @@ public final class XenServer610MigrateWithStorageCommandWrapper extends CommandW
for (final Pair<VolumeTO, StorageFilerTO> entry : volumeToFiler) {
final StorageFilerTO storageFiler = entry.second();
final VolumeTO volume = entry.first();
vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, volume.getPath()), xenServer610Resource.getStorageRepository(connection, storageFiler.getUuid()));
vdiMap.put(xenServer610Resource.getVDIbyUuid(connection, volume.getPath()),
xenServer610Resource.getStorageRepository(connection,
CitrixHelper.getSRNameLabel(storageFiler.getUuid(), storageFiler.getType(), storageFiler.getPath())));
}
// Get the vm to migrate.

4
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCreateCommandWrapper.java
View File

@ -28,6 +28,7 @@ import com.cloud.agent.api.storage.CreateAnswer;
import com.cloud.agent.api.storage.CreateCommand;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.agent.api.to.VolumeTO;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@ -50,7 +51,8 @@ public final class CitrixCreateCommandWrapper extends CommandWrapper<CreateComma
VDI vdi = null;
try {
final SR poolSr = citrixResourceBase.getStorageRepository(conn, pool.getUuid());
final SR poolSr = citrixResourceBase.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
if (command.getTemplateUrl() != null) {
VDI tmpltvdi = null;

11
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixDeleteStoragePoolCommandWrapper.java
View File

@ -26,6 +26,7 @@ import org.apache.log4j.Logger;
import com.cloud.agent.api.Answer;
import com.cloud.agent.api.DeleteStoragePoolCommand;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@ -46,16 +47,16 @@ public final class CitrixDeleteStoragePoolCommandWrapper extends CommandWrapper<
// getRemoveDatastore being true indicates we are using managed storage and need to pull the SR name out of a Map
// instead of pulling it out using getUuid of the StorageFilerTO instance.
String srNameLabel;
if (command.getRemoveDatastore()) {
Map<String, String> details = command.getDetails();
String srNameLabel = details.get(DeleteStoragePoolCommand.DATASTORE_NAME);
sr = citrixResourceBase.getStorageRepository(conn, srNameLabel);
srNameLabel = details.get(DeleteStoragePoolCommand.DATASTORE_NAME);
}
else {
sr = citrixResourceBase.getStorageRepository(conn, poolTO.getUuid());
srNameLabel = CitrixHelper.getSRNameLabel(poolTO.getUuid(), poolTO.getType(), poolTO.getPath());
}
sr = citrixResourceBase.getStorageRepository(conn, srNameLabel);
citrixResourceBase.removeSR(conn, sr);

9
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixModifyStoragePoolCommandWrapper.java
View File

@ -28,6 +28,7 @@ import com.cloud.agent.api.Answer;
import com.cloud.agent.api.ModifyStoragePoolAnswer;
import com.cloud.agent.api.ModifyStoragePoolCommand;
import com.cloud.agent.api.to.StorageFilerTO;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.hypervisor.xenserver.resource.CitrixResourceBase;
import com.cloud.resource.CommandWrapper;
import com.cloud.resource.ResourceWrapper;
@ -49,7 +50,10 @@ public final class CitrixModifyStoragePoolCommandWrapper extends CommandWrapper<
final boolean add = command.getAdd();
if (add) {
try {
final String srName = command.getStoragePath() != null ? command.getStoragePath() : pool.getUuid();
String srName = command.getStoragePath();
if (srName == null) {
srName = CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath());
}
final SR sr = citrixResourceBase.getStorageRepository(conn, srName);
citrixResourceBase.setupHeartbeatSr(conn, sr, false);
final long capacity = sr.getPhysicalSize(conn);
@ -75,7 +79,8 @@ public final class CitrixModifyStoragePoolCommandWrapper extends CommandWrapper<
}
} else {
try {
final SR sr = citrixResourceBase.getStorageRepository(conn, pool.getUuid());
final SR sr = citrixResourceBase.getStorageRepository(conn,
CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getType(), pool.getPath()));
final String srUuid = sr.getUuid(conn);
final String result = citrixResourceBase.callHostPluginPremium(conn, "setup_heartbeat_file", "host", citrixResourceBase.getHost().getUuid(), "sr", srUuid, "add",
"false");

13
plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java
View File

@ -58,17 +58,18 @@ import com.cloud.exception.AgentUnavailableException;
import com.cloud.exception.OperationTimedoutException;
import com.cloud.host.Host;
import com.cloud.hypervisor.Hypervisor.HypervisorType;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.StoragePool;
import com.cloud.hypervisor.xenserver.resource.CitrixHelper;
import com.cloud.storage.Snapshot;
import com.cloud.storage.SnapshotVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.StoragePool;
import com.cloud.storage.VolumeDetailVO;
import com.cloud.storage.VolumeVO;
import com.cloud.storage.dao.SnapshotDao;
import com.cloud.storage.dao.VolumeDao;
import com.cloud.storage.dao.VolumeDetailsDao;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.Pair;
import com.cloud.utils.StringUtils;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.vm.VMInstanceVO;
import com.cloud.vm.dao.VMInstanceDao;
@ -326,7 +327,9 @@ public class XenServerStorageMotionStrategy implements DataMotionStrategy {
volumeToStorageUuid.add(new Pair<>(volumeTo, iqn));
}
else {
volumeToStorageUuid.add(new Pair<>(volumeTo, ((StoragePool)entry.getValue()).getUuid()));
StoragePool pool = (StoragePool)entry.getValue();
String srNameLabel = CitrixHelper.getSRNameLabel(pool.getUuid(), pool.getPoolType(), pool.getPath());
volumeToStorageUuid.add(new Pair<>(volumeTo, srNameLabel));
}
}

2
ui/src/components/header/ProjectMenu.vue
View File

@ -58,7 +58,7 @@ export default {
loading: false
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/components/header/SamlDomainSwitcher.vue
View File

@ -57,7 +57,7 @@ export default {
loading: false
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/components/view/DedicateDomain.vue
View File

@ -64,7 +64,7 @@ export default {
this.domainError = this.error
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/components/view/DetailSettings.vue
View File

@ -150,7 +150,7 @@ export default {
this.updateResource(newItem)
}
},
mounted () {
created () {
this.updateResource(this.resource)
},
methods: {

2
ui/src/components/view/ListResourceTable.vue
View File

@ -143,7 +143,7 @@ export default {
}
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/components/view/ResourceLimitTab.vue
View File

@ -73,7 +73,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/components/view/SettingsTab.vue
View File

@ -120,7 +120,7 @@ export default {
this.scopeKey = ''
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

3
ui/src/views/AutogenView.vue
View File

@ -424,8 +424,7 @@ export default {
eventBus.$on('exec-action', (action, isGroupAction) => {
this.execAction(action, isGroupAction)
})
},
mounted () {
if (this.device === 'desktop') {
this.pageSize = 20
}

2
ui/src/views/auth/Login.vue
View File

@ -134,8 +134,6 @@ export default {
}
},
created () {
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/AssignInstance.vue
View File

@ -119,7 +119,7 @@ export default {
loading: false
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/AttachIso.vue
View File

@ -64,7 +64,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/BackupScheduleWizard.vue
View File

@ -63,7 +63,7 @@ export default {
closeSchedule: this.closeAction
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/ChangeAffinity.vue
View File

@ -99,7 +99,7 @@ export default {
loading: false
}
},
mounted () {
created () {
for (const group of this.resource.affinitygroup) {
this.selectedRowKeys.push(group.id)
}

2
ui/src/views/compute/CreateKubernetesCluster.vue
View File

@ -361,8 +361,6 @@ export default {
name: ''
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/CreateSSHKeyPair.vue
View File

@ -113,8 +113,6 @@ export default {
name: ''
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/CreateSnapshotWizard.vue
View File

@ -110,7 +110,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

3
ui/src/views/compute/DeployVM.vue
View File

@ -1109,8 +1109,7 @@ export default {
this.form.getFieldDecorator('cpunumber', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('cpuSpeed', { initialValue: undefined, preserve: true })
this.form.getFieldDecorator('memory', { initialValue: undefined, preserve: true })
},
mounted () {
this.dataPreFill = this.preFillContent && Object.keys(this.preFillContent).length > 0 ? this.preFillContent : {}
this.fetchData()
},

2
ui/src/views/compute/DestroyVM.vue
View File

@ -88,7 +88,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/KubernetesServiceTab.vue
View File

@ -203,6 +203,7 @@ export default {
if (!this.isAdmin()) {
this.vmColumns = this.vmColumns.filter(x => x.dataIndex !== 'instancename')
}
this.handleFetchData()
},
watch: {
resource (newData, oldData) {
@ -220,7 +221,6 @@ export default {
}
},
mounted () {
this.handleFetchData()
this.setCurrentTab()
},
methods: {

2
ui/src/views/compute/MigrateWizard.vue
View File

@ -153,7 +153,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/ScaleKubernetesCluster.vue
View File

@ -110,8 +110,6 @@ export default {
},
created () {
this.originalSize = !this.isObjectEmpty(this.resource) ? this.resource.size : 1
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/compute/ScaleVM.vue
View File

@ -84,7 +84,7 @@ export default {
memoryKey: 'details[0].memory'
}
},
mounted () {
created () {
this.fetchData({
keyword: '',
pageSize: 10,

2
ui/src/views/compute/StartVirtualMachine.vue
View File

@ -149,7 +149,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
if (this.$store.getters.userInfo.roletype === 'Admin') {
this.fetchPods()
this.fetchClusters()

2
ui/src/views/compute/UpgradeKubernetesCluster.vue
View File

@ -90,8 +90,6 @@ export default {
})
},
created () {
},
mounted () {
this.fetchData()
},
methods: {

7
ui/src/views/dashboard/CapacityDashboard.vue
View File

@ -153,7 +153,7 @@ export default {
}
}
},
mounted () {
created () {
this.fetchData()
},
watch: {
@ -163,11 +163,6 @@ export default {
}
}
},
created () {
setTimeout(() => {
// to do after initial timeout
}, 1000)
},
methods: {
getStatus (value) {
if (value > 85) {

4
ui/src/views/dashboard/Dashboard.vue
View File

@ -55,8 +55,10 @@ export default {
showOnboarding: false
}
},
mounted () {
created () {
this.fetchData()
},
mounted () {
this.showCapacityDashboard = Object.prototype.hasOwnProperty.call(store.getters.apis, 'listCapacity')
this.project = false
if (store.getters.project && store.getters.project.id) {

2
ui/src/views/dashboard/UsageDashboard.vue
View File

@ -131,7 +131,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.project = store.getters.project
this.fetchData()
this.$store.watch(

2
ui/src/views/iam/AddAccount.vue
View File

@ -257,7 +257,7 @@ export default {
})
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/iam/AddLdapAccount.vue
View File

@ -234,8 +234,6 @@ export default {
}
]
this.selectedFilter = this.filters[0].id
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/iam/AddUser.vue
View File

@ -229,8 +229,6 @@ export default {
this.apiConfig.params.forEach(param => {
this.apiParams[param.name] = param
})
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/iam/ConfigureSamlSsoAuth.vue
View File

@ -66,7 +66,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/iam/CreateRole.vue
View File

@ -132,7 +132,7 @@ export default {
loading: false
}
},
mounted () {
created () {
this.fetchRoles()
},
beforeCreate () {

2
ui/src/views/iam/DomainActionForm.vue
View File

@ -165,8 +165,6 @@ export default {
break
}
}
},
mounted () {
if (this.action.dataView && this.action.icon === 'edit') {
this.fillEditFormFieldValues()
}

6
ui/src/views/iam/DomainView.vue
View File

@ -125,15 +125,15 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
this.fetchData()
},
beforeRouteUpdate (to, from, next) {
next()
},
beforeRouteLeave (to, from, next) {
next()
},
created () {
this.fetchData()
},
watch: {
'$route' (to, from) {
if (to.fullPath !== from.fullPath && !to.fullPath.includes('action/')) {

2
ui/src/views/iam/EditUser.vue
View File

@ -137,7 +137,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/iam/RolePermissionTab.vue
View File

@ -144,7 +144,7 @@ export default {
apis: []
}
},
mounted () {
created () {
this.apis = Object.keys(this.$store.getters.apis).sort((a, b) => a.localeCompare(b))
this.fetchData()
},

2
ui/src/views/iam/SSLCertificateTab.vue
View File

@ -140,8 +140,6 @@ export default {
}
]
this.detailColumn = ['name', 'certificate', 'certchain']
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/image/AddKubernetesSupportedVersion.vue
View File

@ -190,8 +190,6 @@ export default {
name: this.$t('label.all.zone')
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/image/IsoZones.vue
View File

@ -191,8 +191,6 @@ export default {
(userInfo.account !== this.resource.account || userInfo.domain !== this.resource.domain)) {
this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })
}
},
mounted () {
this.fetchData()
},
watch: {

2
ui/src/views/image/RegisterOrUploadTemplate.vue
View File

@ -411,8 +411,6 @@ export default {
this.$set(this.format, 'opts', [])
this.$set(this.osTypes, 'loading', false)
this.$set(this.osTypes, 'opts', [])
},
mounted () {
this.fetchData()
},
computed: {

2
ui/src/views/image/TemplateZones.vue
View File

@ -204,8 +204,6 @@ export default {
(userInfo.account !== this.resource.account || userInfo.domain !== this.resource.domain)) {
this.columns = this.columns.filter(col => { return col.dataIndex !== 'status' })
}
},
mounted () {
this.fetchData()
},
watch: {

2
ui/src/views/image/UpdateKubernetesSupportedVersion.vue
View File

@ -88,8 +88,6 @@ export default {
name: this.$t('state.disabled')
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/image/UpdateTemplateIsoPermissions.vue
View File

@ -145,7 +145,7 @@ export default {
) : this.projects
}
},
mounted () {
created () {
this.isImageTypeIso = this.$route.meta.name === 'iso'
this.fetchData()
},

2
ui/src/views/infra/AddPrimaryStorage.vue
View File

@ -381,7 +381,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/AddSecondaryStorage.vue
View File

@ -181,7 +181,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/ClusterAdd.vue
View File

@ -150,7 +150,7 @@ export default {
}
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/CpuSockets.vue
View File

@ -73,7 +73,7 @@ export default {
columns: []
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/HostAdd.vue
View File

@ -171,7 +171,7 @@ export default {
}
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/HostInfo.vue
View File

@ -125,7 +125,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/InfraSummary.vue
View File

@ -221,7 +221,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/MigrateData.vue
View File

@ -99,7 +99,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchImageStores()
},
methods: {

2
ui/src/views/infra/PodAdd.vue
View File

@ -147,7 +147,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/Resources.vue
View File

@ -61,7 +61,7 @@ export default {
resourcesList: []
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/network/DedicatedVLANTab.vue
View File

@ -184,7 +184,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/network/EditTrafficLabel.vue
View File

@ -145,7 +145,7 @@ export default {
}
},
inject: ['parentFetchData'],
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/infra/network/IpRangesTab.vue
View File

@ -40,7 +40,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/network/IpRangesTabGuest.vue
View File

@ -129,7 +129,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/network/IpRangesTabManagement.vue
View File

@ -192,7 +192,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/network/IpRangesTabPublic.vue
View File

@ -271,7 +271,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/network/IpRangesTabStorage.vue
View File

@ -180,7 +180,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {

8
ui/src/views/infra/network/ServiceProvidersTab.vue
View File

@ -35,7 +35,8 @@
:itemNsp="item"
:nsp="nsps[item.title]"
:resourceId="resource.id"
:zoneId="resource.zoneid"/>
:zoneId="resource.zoneid"
:tabKey="tabKey"/>
</a-tab-pane>
</a-tabs>
</a-spin>
@ -1107,7 +1108,7 @@ export default {
beforeCreate () {
this.form = this.$form.createForm(this)
},
mounted () {
created () {
this.fetchData()
},
watch: {
@ -1128,6 +1129,9 @@ export default {
},
methods: {
fetchData () {
if (!this.resource || !('id' in this.resource)) {
return
}
this.fetchServiceProvider()
},
fetchServiceProvider (name) {

2
ui/src/views/infra/network/TrafficTypesTab.vue
View File

@ -89,7 +89,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
if (this.resource.id) {
this.fetchData()
}

59
ui/src/views/infra/network/providers/ProviderItem.vue
View File

@ -103,45 +103,38 @@ export default {
},
inject: ['provideSetNsp', 'provideExecuteAction'],
watch: {
loading (newValue, oldValue) {
if (newValue !== oldValue && !newValue) {
this.fetchData()
}
},
nsp (newData, oldData) {
if (newData && Object.keys(newData).length > 0) {
this.nsp = newData
this.resource = this.nsp
this.$set(this.resource, 'zoneid', this.zoneId)
this.provideSetNsp(this.resource)
this.fetchData()
}
}
},
mounted () {
if (!this.nsp || Object.keys(this.nsp).length === 0) {
this.resource = {
name: this.itemNsp.title,
state: 'Disabled',
physicalnetworkid: this.resourceId,
zoneid: this.zoneId
}
} else {
this.resource = this.nsp
this.$set(this.resource, 'zoneid', this.zoneId)
}
if (this.itemNsp && Object.keys(this.itemNsp).length > 0) {
this.provider = this.itemNsp
this.provideSetNsp(this.resource)
nsp () {
this.fetchData()
}
},
created () {
if (!this.resourceId || !this.zoneId) {
return
}
this.fetchData()
},
methods: {
async fetchData () {
if (!this.provider.lists || this.provider.lists.length === 0) {
return
if (!this.nsp || Object.keys(this.nsp).length === 0) {
this.resource = {
name: this.itemNsp.title,
state: 'Disabled',
physicalnetworkid: this.resourceId,
zoneid: this.zoneId
}
} else {
this.resource = this.nsp
this.$set(this.resource, 'zoneid', this.zoneId)
}
if (this.itemNsp && Object.keys(this.itemNsp).length > 0) {
this.provider = this.itemNsp
this.provideSetNsp(this.resource)
if (!this.provider.lists || this.provider.lists.length === 0) {
return
}
this.provider.lists.map(this.fetchOptions)
}
this.provider.lists.map(this.fetchOptions)
},
async fetchOptions (args) {
if (!args || Object.keys(args).length === 0) {

2
ui/src/views/infra/routers/RouterHealthCheck.vue
View File

@ -131,7 +131,7 @@ export default {
this.updateResource(newItem)
}
},
mounted () {
created () {
this.updateResource(this.resource)
},
methods: {

2
ui/src/views/infra/zone/PhysicalNetworksTab.vue
View File

@ -85,7 +85,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/zone/SystemVmsTab.vue
View File

@ -93,7 +93,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/infra/zone/ZoneWizardAddResources.vue
View File

@ -699,7 +699,7 @@ export default {
options: ['primaryStorageScope', 'primaryStorageProtocol', 'provider']
}
},
mounted () {
created () {
this.currentStep = this.prefillContent.resourceStep ? this.prefillContent.resourceStep : 0
if (this.stepChild && this.stepChild !== '') {
this.currentStep = this.steps.findIndex(item => item.fromKey === this.stepChild)

2
ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue
View File

@ -369,7 +369,7 @@ export default {
]
}
},
mounted () {
created () {
this.physicalNetworks = this.prefillContent.physicalNetworks
this.steps = this.filteredSteps()
this.currentStep = this.prefillContent.networkStep ? this.prefillContent.networkStep : 0

73
ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
View File

@ -394,6 +394,8 @@ export default {
this.$emit('fieldsChanged', changedFields)
}
})
this.fetchData()
},
mounted () {
this.form.setFieldsValue({
@ -414,41 +416,6 @@ export default {
localstorageenabled: this.localstorageenabled,
localstorageenabledforsystemvm: this.localstorageenabledforsystemvm
})
const cForm = this.form
api('listHypervisors', { listAll: true }).then(json => {
this.hypervisors = json.listhypervisorsresponse.hypervisor
if ('listSimulatorHAStateTransitions' in this.$store.getters.apis) {
this.hypervisors.push({ name: 'Simulator' })
}
cForm.setFieldsValue({
hypervisor: this.currentHypervisor
})
})
if (!this.isAdvancedZone || this.securityGroupsEnabled) {
api('listNetworkOfferings', { state: 'Enabled', guestiptype: 'Shared' }).then(json => {
this.networkOfferings = {}
json.listnetworkofferingsresponse.networkoffering.forEach(offering => {
this.setupNetworkOfferingAdditionalFlags(offering)
this.networkOfferings[offering.id] = offering
})
this.availableNetworkOfferings = this.getAvailableNetworkOfferings(this.currentHypervisor)
cForm.setFieldsValue({
networkOfferingId: this.currentNetworkOfferingId
})
})
}
api('listDomains', { listAll: true }).then(json => {
this.domains = {}
json.listdomainsresponse.domain.forEach(dom => {
this.domains[dom.id] = dom
})
cForm.setFieldsValue({
domain: this.domain
})
})
},
computed: {
isAdvancedZone () {
@ -532,6 +499,42 @@ export default {
}
},
methods: {
fetchData () {
const cForm = this.form
api('listHypervisors', { listAll: true }).then(json => {
this.hypervisors = json.listhypervisorsresponse.hypervisor
if ('listSimulatorHAStateTransitions' in this.$store.getters.apis) {
this.hypervisors.push({ name: 'Simulator' })
}
cForm.setFieldsValue({
hypervisor: this.currentHypervisor
})
})
if (!this.isAdvancedZone || this.securityGroupsEnabled) {
api('listNetworkOfferings', { state: 'Enabled', guestiptype: 'Shared' }).then(json => {
this.networkOfferings = {}
json.listnetworkofferingsresponse.networkoffering.forEach(offering => {
this.setupNetworkOfferingAdditionalFlags(offering)
this.networkOfferings[offering.id] = offering
})
this.availableNetworkOfferings = this.getAvailableNetworkOfferings(this.currentHypervisor)
cForm.setFieldsValue({
networkOfferingId: this.currentNetworkOfferingId
})
})
}
api('listDomains', { listAll: true }).then(json => {
this.domains = {}
json.listdomainsresponse.domain.forEach(dom => {
this.domains[dom.id] = dom
})
cForm.setFieldsValue({
domain: this.domain
})
})
},
handleSubmit (e) {
e.preventDefault()
this.form.validateFields((err, values) => {

2
ui/src/views/network/AclListRulesTab.vue
View File

@ -229,7 +229,7 @@ export default {
ruleFormMode: 'edit'
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/CreateIsolatedNetworkForm.vue
View File

@ -303,8 +303,6 @@ export default {
name: ' '
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/network/CreateL2NetworkForm.vue
View File

@ -275,8 +275,6 @@ export default {
name: ' '
}
]
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/network/CreateSharedNetworkForm.vue
View File

@ -499,8 +499,6 @@ export default {
})
},
created () {
},
mounted () {
this.fetchData()
},
methods: {

2
ui/src/views/network/CreateVpc.vue
View File

@ -147,7 +147,7 @@ export default {
this.apiParams[param.name] = param
})
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/network/EgressRulesTab.vue
View File

@ -156,7 +156,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
filters: {

2
ui/src/views/network/EnableStaticNat.vue
View File

@ -155,7 +155,7 @@ export default {
pageSize: 10
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/network/FirewallRules.vue
View File

@ -198,7 +198,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
filters: {

2
ui/src/views/network/GuestIpRanges.vue
View File

@ -147,7 +147,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/IngressEgressRuleConfigure.vue
View File

@ -256,7 +256,7 @@ export default {
return val.toUpperCase()
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/network/InternalLBAssignVmForm.vue
View File

@ -119,7 +119,7 @@ export default {
fetchLoading: false
}
},
mounted () {
created () {
this.fetchData()
},
methods: {

2
ui/src/views/network/InternalLBAssignedVmTab.vue
View File

@ -97,7 +97,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/IpAddressesTab.vue
View File

@ -189,7 +189,7 @@ export default {
listPublicIpAddress: []
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/LoadBalancing.vue
View File

@ -521,7 +521,7 @@ export default {
searchQuery: null
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/PortForwarding.vue
View File

@ -367,7 +367,7 @@ export default {
searchQuery: null
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/PublicIpResource.vue
View File

@ -85,7 +85,7 @@ export default {
}
}
},
mounted () {
created () {
if ('id' in this.resource) {
this.fetchData()
}

2
ui/src/views/network/RoutersTab.vue
View File

@ -103,7 +103,7 @@ export default {
]
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/StaticRoutesTab.vue
View File

@ -101,7 +101,7 @@ export default {
newRoute: null
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/VpcTab.vue
View File

@ -408,7 +408,7 @@ export default {
this.setCurrentTab()
}
},
mounted () {
created () {
this.handleFetchData()
this.setCurrentTab()
},

2
ui/src/views/network/VpcTiersTab.vue
View File

@ -388,7 +388,7 @@ export default {
}
}
},
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/network/VpnDetails.vue
View File

@ -86,7 +86,7 @@ export default {
}
},
inject: ['parentFetchData', 'parentToggleLoading'],
mounted () {
created () {
this.fetchData()
},
watch: {

2
ui/src/views/offering/AddComputeOffering.vue
View File

@ -819,8 +819,6 @@ export default {
name: this.$t('label.all.zone')
}
]
},
mounted () {
if (this.$route.meta.name === 'systemoffering') {
this.isSystem = true
}

Some files were not shown because too many files have changed in this diff Show More