Skip to content
Merged
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: 1 addition & 1 deletion ui/src/components/header/SamlDomainSwitcher.vue
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export default {
const samlAccounts = []
const getNextPage = () => {
this.loading = true
api('listAndSwitchSamlAccount', { listAll: true, details: 'min', page: page, pageSize: 500 }).then(json => {
api('listAndSwitchSamlAccount', { details: 'min', page: page, pageSize: 500 }).then(json => {
if (json && json.listandswitchsamlaccountresponse && json.listandswitchsamlaccountresponse.samluseraccount) {
samlAccounts.push(...json.listandswitchsamlaccountresponse.samluseraccount)
}
Expand Down
6 changes: 3 additions & 3 deletions ui/src/components/view/SearchView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -449,7 +449,7 @@ export default {
},
fetchZones () {
return new Promise((resolve, reject) => {
api('listZones', { listAll: true, showicon: true }).then(json => {
api('listZones', { showicon: true }).then(json => {
const zones = json.listzonesresponse.zone
resolve({
type: 'zoneid',
Expand All @@ -475,7 +475,7 @@ export default {
},
fetchPods () {
return new Promise((resolve, reject) => {
api('listPods', { listAll: true }).then(json => {
api('listPods').then(json => {
const pods = json.listpodsresponse.pod
resolve({
type: 'podid',
Expand All @@ -488,7 +488,7 @@ export default {
},
fetchClusters () {
return new Promise((resolve, reject) => {
api('listClusters', { listAll: true }).then(json => {
api('listClusters').then(json => {
const clusters = json.listclustersresponse.cluster
resolve({
type: 'clusterid',
Expand Down
5 changes: 1 addition & 4 deletions ui/src/components/view/SettingsTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -142,10 +142,7 @@ export default {
methods: {
fetchData (callback) {
this.tabLoading = true
const params = {
[this.scopeKey]: this.resource.id,
listAll: true
}
const params = { [this.scopeKey]: this.resource.id }
if (this.filter) {
params.keyword = this.filter
}
Expand Down
2 changes: 0 additions & 2 deletions ui/src/config/section/offering.js
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,6 @@ export default {
icon: 'wifi-outlined',
docHelp: 'adminguide/networking.html#network-offerings',
permission: ['listNetworkOfferings', 'listInfrastructure'],
params: { isrecursive: 'true' },
columns: ['name', 'state', 'guestiptype', 'traffictype', 'networkrate', 'domain', 'zone', 'order'],
details: ['name', 'id', 'displaytext', 'guestiptype', 'traffictype', 'internetprotocol', 'networkrate', 'ispersistent', 'egressdefaultpolicy', 'availability', 'conservemode', 'specifyvlan', 'specifyipranges', 'supportspublicaccess', 'supportsstrechedl2subnet', 'service', 'tags', 'domain', 'zone'],
resourceType: 'NetworkOffering',
Expand Down Expand Up @@ -339,7 +338,6 @@ export default {
icon: 'deployment-unit-outlined',
docHelp: 'plugins/nuage-plugin.html?#vpc-offerings',
permission: ['listVPCOfferings', 'listInfrastructure'],
params: { isrecursive: 'true' },
resourceType: 'VpcOffering',
columns: ['name', 'state', 'displaytext', 'domain', 'zone', 'order'],
details: ['name', 'id', 'displaytext', 'internetprotocol', 'distributedvpcrouter', 'tags', 'service', 'domain', 'zone', 'created'],
Expand Down
2 changes: 1 addition & 1 deletion ui/src/store/modules/user.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ const user = {
})
} else {
const hide = message.loading(i18n.global.t('message.discovering.feature'), 0)
api('listZones', { listall: true }).then(json => {
api('listZones').then(json => {
const zones = json.listzonesresponse.zone || []
commit('SET_ZONES', zones)
}).catch(error => {
Expand Down
9 changes: 9 additions & 0 deletions ui/src/views/AutogenView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -876,6 +876,15 @@ export default {
if (this.$showIcon()) {
params.showIcon = true
}

if (['listAnnotations', 'listRoles', 'listZonesMetrics', 'listPods',
'listClustersMetrics', 'listHostsMetrics', 'listStoragePoolsMetrics',
'listImageStores', 'listSystemVms', 'listManagementServers',
'listConfigurations', 'listHypervisorCapabilities',
'listAlerts', 'listNetworkOfferings', 'listVPCOfferings'].includes(this.apiName)) {
delete params.listall
}

api(this.apiName, params).then(json => {
var responseName
var objectName
Expand Down
4 changes: 2 additions & 2 deletions ui/src/views/compute/DeployVM.vue
Original file line number Diff line number Diff line change
Expand Up @@ -1919,7 +1919,7 @@ export default {
return new Promise((resolve) => {
this.loading.zones = true
const param = this.params.zones
const args = { listall: true, showicon: true }
const args = { showicon: true }
if (zoneId) args.id = zoneId
api(param.list, args).then(json => {
const zoneResponse = json.listzonesresponse.zone || []
Expand Down Expand Up @@ -1951,7 +1951,7 @@ export default {
param.loading = true
param.opts = []
const options = param.options || {}
if (!('listall' in options)) {
if (!('listall' in options) && !['zones', 'pods', 'clusters', 'hosts', 'dynamicScalingVmConfig', 'hypervisors'].includes(name)) {
options.listall = true
}
api(param.list, options).then((response) => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/compute/EditVM.vue
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ export default {
fetchOsTypes () {
this.osTypes.loading = true
this.osTypes.opts = []
api('listOsTypes', { listAll: true }).then(json => {
api('listOsTypes').then(json => {
this.osTypes.opts = json.listostypesresponse.ostype || []
}).catch(error => {
this.$notifyError(error)
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/iam/SSLCertificateTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ export default {
methods: {
fetchData () {
const params = {}
params.listAll = true
params.page = this.page
params.pageSize = this.pageSize
params.accountid = this.resource.id
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/image/AddKubernetesSupportedVersion.vue
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/image/IsoZones.vue
Original file line number Diff line number Diff line change
Expand Up @@ -426,7 +426,7 @@ export default {
fetchZoneData () {
this.zones = []
this.zoneLoading = true
api('listZones', { listall: true, showicon: true }).then(json => {
api('listZones', { showicon: true }).then(json => {
const zones = json.listzonesresponse.zone || []
this.zones = [...zones.filter((zone) => this.currentRecord.zoneid !== zone.id)]
}).finally(() => {
Expand Down
6 changes: 1 addition & 5 deletions ui/src/views/image/RegisterOrUploadIso.vue
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true

this.zoneLoading = true
Expand All @@ -241,12 +240,9 @@ export default {
})
},
fetchOsType () {
const params = {}
params.listAll = true

this.osTypeLoading = true

api('listOsTypes', params).then(json => {
api('listOsTypes').then(json => {
const listOsTypes = json.listostypesresponse.ostype
this.osTypes = this.osTypes.concat(listOsTypes)
}).finally(() => {
Expand Down
7 changes: 1 addition & 6 deletions ui/src/views/image/RegisterOrUploadTemplate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -464,7 +464,6 @@ export default {
fetchZone () {
const params = {}
let listZones = []
params.listAll = true
params.showicon = true
this.allowed = false

Expand Down Expand Up @@ -509,13 +508,10 @@ export default {
})
},
fetchOsTypes () {
const params = {}
params.listAll = true

this.osTypes.opts = []
this.osTypes.loading = true

api('listOsTypes', params).then(json => {
api('listOsTypes').then(json => {
const listOsTypes = json.listostypesresponse.ostype
this.osTypes.opts = listOsTypes
this.defaultOsType = this.osTypes.opts[1].description
Expand Down Expand Up @@ -732,7 +728,6 @@ export default {
const params = {}

if (value.includes(this.$t('label.all.zone'))) {
params.listAll = true
this.fetchHyperVisor(params)
return
}
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/image/TemplateZones.vue
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ export default {
fetchZoneData () {
this.zones = []
this.zoneLoading = true
api('listZones', { listall: true, showicon: true }).then(json => {
api('listZones', { showicon: true }).then(json => {
const zones = json.listzonesresponse.zone || []
this.zones = [...zones.filter((zone) => this.currentRecord.zoneid !== zone.id)]
}).finally(() => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/infra/zone/ZoneWizardZoneDetailsStep.vue
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,7 @@ export default {
})
},
fetchData () {
api('listHypervisors', { listAll: true }).then(json => {
api('listHypervisors').then(json => {
this.hypervisors = json.listhypervisorsresponse.hypervisor
if ('listSimulatorHAStateTransitions' in this.$store.getters.apis) {
this.hypervisors.push({ name: 'Simulator' })
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/CreateIsolatedNetworkForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,6 @@ export default {
if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
params.id = this.resource.zoneid
}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/CreateL2NetworkForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,6 @@ export default {
if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
params.id = this.resource.zoneid
}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/CreateNetwork.vue
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@ export default {
if (this.resource && this.resource.zoneid) {
params.id = this.resource.zoneid
}
params.listAll = true
this.actionZonesLoading = true
return api('listZones', params).then(json => {
this.actionZones = json.listzonesresponse.zone
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/CreateSharedNetworkForm.vue
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,6 @@ export default {
if (this.resource.zoneid && this.$route.name === 'deployVirtualMachine') {
params.id = this.resource.zoneid
}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/network/CreateVpc.vue
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ export default {
},
fetchZones () {
this.loadingZone = true
api('listZones', { listAll: true, showicon: true }).then((response) => {
api('listZones', { showicon: true }).then((response) => {
const listZones = response.listzonesresponse.zone || []
this.zones = listZones.filter(zone => !zone.securitygroupsenabled)
this.form.zoneid = ''
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/GuestIpRanges.vue
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ export default {
const params = {
zoneid: this.resource.zoneid,
networkid: this.resource.id,
listall: true,
page: this.page,
pagesize: this.pageSize
}
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/network/LoadBalancing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -735,7 +735,6 @@ export default {
this.loading = true
this.lbRules.forEach(rule => {
api('listLBStickinessPolicies', {
listAll: true,
lbruleid: rule.id
}).then(response => {
this.stickinessPolicies.push(...response.listlbstickinesspoliciesresponse.stickinesspolicies)
Expand Down
9 changes: 2 additions & 7 deletions ui/src/views/offering/AddComputeOffering.vue
Original file line number Diff line number Diff line change
Expand Up @@ -802,7 +802,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand All @@ -815,11 +814,9 @@ export default {
})
},
fetchStorageTagData () {
const params = {}
params.listAll = true
this.storageTagLoading = true
this.storageTags = []
api('listStorageTags', params).then(json => {
api('listStorageTags').then(json => {
const tags = json.liststoragetagsresponse.storagetag || []
for (const tag of tags) {
if (!this.storageTags.includes(tag.name)) {
Expand All @@ -831,10 +828,8 @@ export default {
})
},
fetchDeploymentPlannerData () {
const params = {}
params.listAll = true
this.deploymentPlannerLoading = true
api('listDeploymentPlanners', params).then(json => {
api('listDeploymentPlanners').then(json => {
const planners = json.listdeploymentplannersresponse.deploymentPlanner
this.deploymentPlanners = this.deploymentPlanners.concat(planners)
this.deploymentPlanners.unshift({ name: '' })
Expand Down
2 changes: 0 additions & 2 deletions ui/src/views/offering/AddDiskOffering.vue
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand All @@ -418,7 +417,6 @@ export default {
},
fetchStorageTagData () {
const params = {}
params.listAll = true
this.storageTagLoading = true
api('listStorageTags', params).then(json => {
const tags = json.liststoragetagsresponse.storagetag || []
Expand Down
5 changes: 1 addition & 4 deletions ui/src/views/offering/AddNetworkOffering.vue
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down Expand Up @@ -649,11 +648,9 @@ export default {
}
},
fetchSupportedServiceData () {
const params = {}
params.listAll = true
this.supportedServiceLoading = true
this.supportedServices = []
api('listSupportedNetworkServices', params).then(json => {
api('listSupportedNetworkServices').then(json => {
this.supportedServices = json.listsupportednetworkservicesresponse.networkservice
for (var i in this.supportedServices) {
var networkServiceObj = this.supportedServices[i]
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/offering/AddVpcOffering.vue
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
1 change: 0 additions & 1 deletion ui/src/views/offering/UpdateOfferingAccess.vue
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ export default {
},
fetchZoneData () {
const params = {}
params.listAll = true
params.showicon = true
this.zoneLoading = true
api('listZones', params).then(json => {
Expand Down
2 changes: 1 addition & 1 deletion ui/src/views/tools/ManageInstances.vue
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ export default {
param.loading = true
param.opts = []
const options = param.options || {}
if (!('listall' in options)) {
if (!('listall' in options) && !['zones', 'pods', 'clusters'].includes(name)) {
options.listall = true
}
api(param.list, options).then((response) => {
Expand Down