You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2021/09/20 10:15:30 UTC
[cloudstack] branch decoupleServiceOfferingDiskOffering updated
(7897b70 -> 187efe7)
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch decoupleServiceOfferingDiskOffering
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 7897b70 Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
omit db4a82b Fixed UI in migrate and changeofferingfor volume to handle empty disk offering list Removed the volume's current disk offering from listDiskOffering response list
omit 9e52e17 Fix listdiskoffering after rebasing with main
omit a944deb UI fix in deploy vm wizard
omit 2828dc3 UI changes to disable override root disk size when override root disk offering is enabled
omit 95d9a9a Fixed resize volume UI form for data disk
omit be24ab0 Address review comments and fix UI form of deploy VM in case of ISO.
omit 08d508c Added tool tip for migrate volume UI form
omit 1c814d2 Fix smoke test failures
omit 934c1c8 Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
omit 4adf8ee Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
omit 85e5955 Fix unit test in VolumeApiServiceImpl
omit a6be701 Fixed recent unit test cases with new serviceofferingvo constructor
omit ff6689c Fix a unit test case
omit 1cb06e8 Changes for override root disk offering in deployvm wizard in case of custom offering
omit ff02bed Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
omit 276c587 Fix global setting implementation
omit 9c0bd35 Fix changeOfferingForVolume API for custom disk offering
omit ab2ef6c update volume_view to update system_use column from service offering and not disk offering
omit 9bc7068 Remove system_use column from disk offering join
omit eb174d1 remove system_use column from disk_offering view
omit e65827c Upgrade handled with new schema changes
omit 3679dcd review comments addressed
omit d3af2e5 Added marvin test cases for checking disk offering strictness
omit c2489f0 Addressed review comments and fixed update service offering flow with storage tags
omit 285bc10 Removed unused import
omit b568c38 Fix domain_router_view to get proper service offering id
omit 469f53e Fix service offering constructor to address custom offering
omit 4cae3dc Fix service offering edit flow
omit 23b96f1 Fixed service_offering_view
omit 9515e4c Addressed review comments
omit 35295f5 fix user_vm_view
omit 51b34c6 Fix unit test failures
omit 2e73724 Fix service offering usage as disk offering
omit 8e81e15 Fix UI conflicts
omit fb6608f Add UI form for changeOfferingForVolume API
omit dd37a0f Added new API changeofferingforVolume API and corresponding changes
omit 9bc718a Added disk offering change checks during resize volume operation
omit 5c9aab2 Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
omit b252e63 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
omit edb4e69 UI: move compute only toggle button outside the box in add compute offering wizard
omit 7a8b303 Fixed diskoffering automatic selection on add compute offering wizard
omit 9e5b359 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
omit 99c55b3 Move uselocalstorage column access from service offering to disk offering
omit efe328a Fix VM deployment from custom service offering
omit e597268 Fix delete compute offering
omit 0311ffa Added UI changes in deployvm wizard to accept override disk offering id
omit cb844d2 Added diskoffering details to the service offering response
omit 4138295 Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
omit be0553c Remove comments
omit 0cea291 Added disk offering strictness to the service offering response
omit 4862698 Added disk size strictness in disk offering response
omit 62cf4a2 Fix User vm response to show proper service offering and disk offerings
omit acfd7e4 Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
omit 75bf47c Add diskofferingstrictness to serviceoffering vo under quota
omit 65250d9 Added new API params to compute offering creation
omit 57f5013 Fix deployVM flow
omit 1300ac8 diskoffering getsize() is only for strict disk offerings
omit 0d61900 Decouple service offering and disk offering states
omit 827e5bb Remove diskofferingid from vminstance VO
omit 57745af Decoupled service offering and disk offering
omit 60cb2e9 Few more changes
omit 67b03f5 Schema changes and disk offering column change from "type" to "compute_only"
add dc17cf4 Prevent double counting storage pools (#5398)
add eba577c ui: show nicAdapter selection for VMware non-readfromova template (#5429)
add 35efdd1 ui: Hide settings button if not on development mode (#5431)
add 8baf384 ui: fix add management ip range form (#5427)
add c6055a2 api, ui: return default ui pagesize as part of capability response (#5432)
add 4147d5a ui: Move eventBus listener to mounted (#5435)
add 2a243b8 Merge branch '4.15' into main
add 8ca3e4a ui: Remove double footer (#5437)
add d162005 ui: Send deployvm api call as post (#5438)
add 931ba55 utils: remove duplicate commons-lang3 dependency (#5441)
add 470ceb4 ui: Allow searching in dropdowns (#5395)
add 6e50e10 ui: select newly created network in deploy vm (#5423)
add 7c7b624 ui: Fix Scale VM failure - missing args when customized compute offering is used (#5439)
add c85eb10 server: fix addCluster for vmware, others (#5421)
add fb8d40d server: skip max guest limit check for KVM host (#5417)
add 073a54b ui: removed whitespace after string (#5450)
add 3c2360c VM has wrong network statistics with multiple nics in shared networks (#4741)
add f409e7a api: Update DNS on changing VM name (#5425)
add 3f827ef UI: Support to upload resource icons (#5157)
add 4b1fc19 ui: Refresh Usage dashboard when swapping between Project and Default view (#5447)
add 1f3f02b api: Updated pod response, moved the parameters: startip, endip, vlanid, forsystemvms to ipranges (new parameter to hold the list of IP range details). (#5424)
add e6058b0 ui: Fix Load Balancer Rules alignment issue (#5451)
add 95ef292 kvm: honor migrate.wait and abort vm migration job (#5388)
add 1bf6862 Persist vpn connection state before restarting (#4635)
add 66c39c1 storage: Linstor volume plugin (#4994)
add 35990d7 tests: move misc tests to broken (#5456)
add 3ca3843 [Vmware] Fix for ovf templates with prefix (#5448)
add 981dac7 server: allow listing custom offerings for a running VM (#5420)
add f0eac35 kvm: Add check if host meets the minimum requirements (#5369)
add 1914244 server: Updated the event message with proper json format for cmd info and job result. (#5453)
add 854a0a1a Display ACL id for the private gateway (#5460)
add 4aaa850 Updating pom.xml version numbers for release 4.15.2.0
add b28dd81 Updating pom.xml version numbers for release 4.15.3.0-SNAPSHOT
add 696c716 Merge remote-tracking branch 'origin/4.15' into main
add f2315ec ui: list static routes with listall=true (#5463)
add 939ef4e Merge remote-tracking branch 'origin/4.15' into main
add 8228ece [Vmware] Add missing condition to cleanup nics if there are commands to send (#5449)
add 40b4b2c ui: Move resource icon to first colume for VM list view (#5465)
add 3b4523f Display vlan ip range for specified domainid (#4634)
add 747608f Add New API endpoint: UpdateVlanIpRange (#5411)
add f50cc27 server: fix list public ip returns duplicated records (#5464)
add 0facba9 Merge remote-tracking branch 'origin/4.15' into main
add b9bc0ff Schema changes and disk offering column change from "type" to "compute_only"
add dd059b6 Few more changes
add 4865228 Decoupled service offering and disk offering
add 7c790a9 Remove diskofferingid from vminstance VO
add 3ee106d Decouple service offering and disk offering states
add f0db712 diskoffering getsize() is only for strict disk offerings
add f5da084 Fix deployVM flow
add d4536b8 Added new API params to compute offering creation
add ae36a85 Add diskofferingstrictness to serviceoffering vo under quota
add fb48b4c Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
add 468eefd Fix User vm response to show proper service offering and disk offerings
add ec4a740 Added disk size strictness in disk offering response
add 6d35c08 Added disk offering strictness to the service offering response
add 310d5c3 Remove comments
add e43842b Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
add e098999 Added diskoffering details to the service offering response
add b906e04 Added UI changes in deployvm wizard to accept override disk offering id
add cfd4492 Fix delete compute offering
add 9aaad97 Fix VM deployment from custom service offering
add c8eae0a Move uselocalstorage column access from service offering to disk offering
add ac47803 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
add db7bdb9 Fixed diskoffering automatic selection on add compute offering wizard
add d61dd85 UI: move compute only toggle button outside the box in add compute offering wizard
add 8b321ac Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
add 7459fdc Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
add daaef28 Added disk offering change checks during resize volume operation
add 413900d Added new API changeofferingforVolume API and corresponding changes
add a16a93d Add UI form for changeOfferingForVolume API
add dc5a678 Fix UI conflicts
add 0d8f9cd Fix service offering usage as disk offering
add 19deb0e Fix unit test failures
add cfbe3ed fix user_vm_view
add 12e483d Addressed review comments
add 35814ad Fixed service_offering_view
add 753c9c5 Fix service offering edit flow
add b6134d4 Fix service offering constructor to address custom offering
add f5d55f9 Fix domain_router_view to get proper service offering id
add b97f34a Removed unused import
add a62e07f Addressed review comments and fixed update service offering flow with storage tags
add 39ec65f Added marvin test cases for checking disk offering strictness
add b4ea31c review comments addressed
add 150e131 Upgrade handled with new schema changes
add 7da967c remove system_use column from disk_offering view
add 8bf02e7 Remove system_use column from disk offering join
add 92fb162 update volume_view to update system_use column from service offering and not disk offering
add b4bb70f Fix changeOfferingForVolume API for custom disk offering
add 216ac79 Fix global setting implementation
add 14f3179 Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
add 9ce1cb4f Changes for override root disk offering in deployvm wizard in case of custom offering
add c3628bd Fix a unit test case
add 39e7e5b Fixed recent unit test cases with new serviceofferingvo constructor
add d231f94 Fix unit test in VolumeApiServiceImpl
add a59b230 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add b29a1c4 Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
add 345f157 Fix smoke test failures
add e3ac26d Added tool tip for migrate volume UI form
add b2d8380 Address review comments and fix UI form of deploy VM in case of ISO.
add 4dce530 Fixed resize volume UI form for data disk
add 76563b8 UI changes to disable override root disk size when override root disk offering is enabled
add a25e93c UI fix in deploy vm wizard
add 664f426 Fix listdiskoffering after rebasing with main
add e02841f Fixed UI in migrate and changeofferingfor volume to handle empty disk offering list Removed the volume's current disk offering from listDiskOffering response list
add e9462dc Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
add 8e868a1 Fix false response on updateDiskOffering API
add 187efe7 Added search field for changeofferingforvolume UI form
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (7897b70)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering (187efe7)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
agent/conf/agent.properties | 6 +
.../com/cloud/agent/api/storage/OVFHelper.java | 48 +-
.../cloud/configuration/ConfigurationService.java | 7 +
api/src/main/java/com/cloud/event/EventTypes.java | 5 +
.../main/java/com/cloud/server/ResourceIcon.java | 35 +-
.../java/com/cloud/server/ResourceIconManager.java | 31 +-
.../java/com/cloud/server/ResourceManagerUtil.java | 31 +-
.../main/java/com/cloud/server/ResourceTag.java | 31 +-
.../com/cloud/server/TaggedResourceService.java | 12 -
api/src/main/java/com/cloud/storage/Storage.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 4 +
.../java/org/apache/cloudstack/api/BaseCmd.java | 12 +-
.../apache/cloudstack/api/ResponseGenerator.java | 6 +-
.../admin/domain/ListDomainChildrenCmd.java | 25 +
.../api/command/admin/domain/ListDomainsCmd.java | 25 +
.../admin/resource/icon/DeleteResourceIconCmd.java | 104 ++
.../resource/icon/ListResourceIconCmd.java} | 72 +-
.../admin/resource/icon/UploadResourceIconCmd.java | 144 +++
.../api/command/admin/user/ListUsersCmd.java | 30 +
.../command/admin/vlan/UpdateVlanIpRangeCmd.java | 167 +++
.../api/command/admin/zone/CreateZoneCmd.java | 2 +-
.../api/command/admin/zone/UpdateZoneCmd.java | 2 +-
.../api/command/user/account/ListAccountsCmd.java | 25 +
.../command/user/config/ListCapabilitiesCmd.java | 2 +
.../api/command/user/iso/ListIsosCmd.java | 26 +
.../api/command/user/network/ListNetworksCmd.java | 29 +
.../api/command/user/project/ListProjectsCmd.java | 25 +
.../user/resource/ListDetailOptionsCmd.java | 4 +-
.../api/command/user/tag/CreateTagsCmd.java | 8 +-
.../api/command/user/tag/DeleteTagsCmd.java | 2 +-
.../command/user/template/ListTemplatesCmd.java | 24 +
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 35 +
.../command/user/volume/AddResourceDetailCmd.java | 2 +-
.../user/volume/ListResourceDetailsCmd.java | 2 +-
.../user/volume/RemoveResourceDetailCmd.java | 2 +-
.../api/command/user/vpc/ListVPCsCmd.java | 25 +
.../api/command/user/vpn/AddVpnUserCmd.java | 2 +-
.../api/command/user/zone/ListZonesCmd.java | 8 +-
.../cloudstack/api/response/AccountResponse.java | 10 +-
.../api/response/CapabilitiesResponse.java | 8 +
.../cloudstack/api/response/DomainResponse.java | 11 +-
.../cloudstack/api/response/IpRangeResponse.java | 76 ++
.../cloudstack/api/response/NetworkResponse.java | 19 +-
.../cloudstack/api/response/PodResponse.java | 52 +-
.../cloudstack/api/response/ProjectResponse.java | 15 +-
.../api/response/ResourceIconResponse.java | 61 +
.../api/response/SetResourceIconResponse.java | 28 +-
.../cloudstack/api/response/TemplateResponse.java | 11 +-
.../cloudstack/api/response/UserResponse.java | 11 +-
.../cloudstack/api/response/UserVmResponse.java | 15 +-
.../cloudstack/api/response/VpcResponse.java | 15 +-
.../cloudstack/api/response/ZoneResponse.java | 15 +-
.../org/apache/cloudstack/query/QueryService.java | 4 +
.../test/java/com/cloud/storage/StorageTest.java | 2 +
.../admin/vlan/UpdateVlanIpRangeCmdTest.java | 78 ++
client/pom.xml | 5 +
.../com/cloud/storage/template/OVAProcessor.java | 36 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 4 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 27 +-
.../schema/src/main/java/com/cloud/dc/VlanVO.java | 10 +-
.../java/com/cloud/network/dao/IPAddressDao.java | 3 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 9 +
.../com/cloud/network/dao/UserIpv6AddressDao.java | 3 +
.../cloud/network/dao/UserIpv6AddressDaoImpl.java | 10 +
.../com/cloud/resource/icon/ResourceIconVO.java | 167 +++
.../icon/dao/ResourceIconDao.java} | 29 +-
.../resource/icon/dao/ResourceIconDaoImpl.java | 79 ++
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41520to41600.sql | 17 +
engine/storage/integration-test/pom.xml | 6 +
.../image/deployasis/DeployAsIsHelperImpl.java | 31 +-
.../image/deployasis/DeployAsIsHelperImplTest.java | 50 +
plugins/hypervisors/kvm/pom.xml | 5 +
.../kvm/resource/LibvirtComputingResource.java | 20 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 28 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 9 +-
.../kvm/storage/KVMStoragePoolManager.java | 2 +-
.../kvm/storage/KVMStorageProcessor.java | 4 +-
.../kvm/storage/LinstorStorageAdaptor.java | 586 ++++++++++
.../hypervisor/kvm/storage/LinstorStoragePool.java | 191 +++
.../kvm/resource/LibvirtComputingResourceTest.java | 40 +
.../apache/cloudstack/api/ListVMsMetricsCmd.java | 1 +
plugins/pom.xml | 1 +
plugins/storage/volume/cloudbyte/pom.xml | 5 +-
.../storage/datastore/util/ElastistorUtil.java | 57 +-
.../storage/volume/{cloudbyte => linstor}/pom.xml | 23 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 768 ++++++++++++
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 335 ++++++
.../LinstorPrimaryDatastoreProviderImpl.java | 73 ++
.../storage/datastore/util/LinstorUtil.java | 81 ++
.../storage-volume-linstor/module.properties | 2 +
.../spring-storage-volume-linstor-context.xml | 32 +
pom.xml | 8 +-
python/lib/cloudutils/serviceConfig.py | 21 +
python/lib/cloudutils/syscfg.py | 17 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 32 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 49 +-
.../java/com/cloud/api/ApiSerializerHelper.java | 28 +-
server/src/main/java/com/cloud/api/ApiServer.java | 16 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 93 +-
.../com/cloud/api/query/ViewResponseHelper.java | 4 +-
.../com/cloud/api/query/dao/DataCenterJoinDao.java | 2 +-
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 12 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 16 +-
.../configuration/ConfigurationManagerImpl.java | 326 +++++-
.../metadata/ResourceMetaDataManagerImpl.java | 7 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 13 +-
.../com/cloud/resource/ResourceManagerImpl.java | 35 +-
.../resourceicon/ResourceIconManagerImpl.java | 230 ++++
.../com/cloud/server/ManagementServerImpl.java | 36 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../com/cloud/tags/ResourceManagerUtilImpl.java | 186 +++
.../com/cloud/tags/TaggedResourceManagerImpl.java | 152 +--
.../main/java/com/cloud/test/IPRangeConfig.java | 86 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 59 +-
.../core/spring-server-core-managers-context.xml | 6 +
.../metadata/ResourceMetaDataManagerTest.java | 7 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 12 +
.../integration/{smoke => broken}/misc/__init__.py | 0
.../{smoke => broken}/misc/test_deploy_vm.py | 0
.../misc/test_escalations_templates.py | 0
.../{smoke => broken}/misc/test_vm_ha.py | 0
.../{smoke => broken}/misc/test_vm_sync.py | 0
test/integration/plugins/linstor/README.md | 31 +
.../plugins/linstor/test_linstor_volumes.py | 1218 ++++++++++++++++++++
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/lib/base.py | 10 +-
ui/public/locales/en.json | 15 +-
ui/src/components/header/ProjectMenu.vue | 8 +-
ui/src/components/header/SamlDomainSwitcher.vue | 5 +
ui/src/components/header/UserMenu.vue | 46 +-
ui/src/components/page/GlobalLayout.vue | 5 +-
ui/src/components/view/DedicateDomain.vue | 19 +-
ui/src/components/view/DetailsTab.vue | 4 +-
ui/src/components/view/FormView.vue | 7 +-
ui/src/components/view/InfoCard.vue | 206 +++-
ui/src/components/view/ListView.vue | 29 +-
.../view/ResourceIcon.vue} | 40 +-
ui/src/components/view/SearchView.vue | 29 +-
ui/src/components/view/TreeView.vue | 10 +-
ui/src/components/view/UploadResourceIcon.vue | 314 +++++
ui/src/config/section/compute.js | 1 -
ui/src/core/lazy_lib/components_use.js | 2 +
ui/src/main.js | 4 +-
ui/src/store/modules/user.js | 10 +-
ui/src/utils/plugins.js | 33 +
ui/src/views/AutogenView.vue | 85 +-
ui/src/views/auth/Login.vue | 22 +-
ui/src/views/compute/AssignInstance.vue | 62 +-
ui/src/views/compute/AttachIso.vue | 7 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 7 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 8 +-
ui/src/views/compute/DeployVM.vue | 90 +-
ui/src/views/compute/DestroyVM.vue | 7 +-
ui/src/views/compute/EditVM.vue | 3 +
ui/src/views/compute/InstanceTab.vue | 28 +-
ui/src/views/compute/MigrateVMStorage.vue | 7 +-
ui/src/views/compute/ScaleVM.vue | 4 +-
ui/src/views/compute/backup/FormSchedule.vue | 14 +
ui/src/views/compute/wizard/MultiDiskSelection.vue | 7 +-
.../views/compute/wizard/MultiNetworkSelection.vue | 7 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 49 +-
.../views/compute/wizard/TemplateIsoRadioGroup.vue | 13 +-
ui/src/views/dashboard/CapacityDashboard.vue | 17 +-
ui/src/views/dashboard/UsageDashboard.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 36 +-
ui/src/views/iam/AddLdapAccount.vue | 41 +-
ui/src/views/iam/AddUser.vue | 40 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 7 +-
ui/src/views/iam/CreateRole.vue | 14 +-
ui/src/views/iam/DomainActionForm.vue | 12 +-
ui/src/views/iam/DomainView.vue | 11 +-
ui/src/views/iam/EditUser.vue | 8 +-
ui/src/views/iam/ImportRole.vue | 7 +-
ui/src/views/iam/PermissionEditable.vue | 7 +-
.../views/image/AddKubernetesSupportedVersion.vue | 5 +
ui/src/views/image/IsoZones.vue | 29 +-
ui/src/views/image/RegisterOrUploadIso.vue | 9 +
ui/src/views/image/RegisterOrUploadTemplate.vue | 109 +-
ui/src/views/image/TemplateZones.vue | 29 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 43 +-
ui/src/views/infra/AddPrimaryStorage.vue | 114 +-
ui/src/views/infra/AddSecondaryStorage.vue | 25 +-
ui/src/views/infra/ClusterAdd.vue | 35 +-
ui/src/views/infra/HostAdd.vue | 42 +-
ui/src/views/infra/MigrateData.vue | 18 +-
ui/src/views/infra/PodAdd.vue | 15 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 45 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 7 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 7 +-
.../views/infra/network/IpRangesTabManagement.vue | 25 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 112 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 6 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 7 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 7 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 7 +-
.../network/providers/AddPaloAltoFirewall.vue | 7 +-
.../infra/network/providers/AddSrxFirewall.vue | 7 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 6 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 15 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 12 +
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 20 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 19 +-
ui/src/views/network/AclListRulesTab.vue | 24 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 7 +-
ui/src/views/network/CreateL2NetworkForm.vue | 10 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 13 +-
ui/src/views/network/CreateVlanIpRange.vue | 6 +-
ui/src/views/network/CreateVpc.vue | 20 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 49 +-
ui/src/views/network/EgressRulesTab.vue | 10 +-
ui/src/views/network/EnableStaticNat.vue | 14 +-
ui/src/views/network/FirewallRules.vue | 10 +-
.../views/network/IngressEgressRuleConfigure.vue | 10 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 6 +-
ui/src/views/network/IpAddressesTab.vue | 12 +-
ui/src/views/network/LoadBalancing.vue | 65 +-
ui/src/views/network/NicsTable.vue | 56 +-
ui/src/views/network/PortForwarding.vue | 28 +-
ui/src/views/network/StaticRoutesTab.vue | 5 +-
ui/src/views/network/VpcTab.vue | 26 +-
ui/src/views/network/VpcTiersTab.vue | 21 +-
ui/src/views/offering/AddComputeOffering.vue | 15 +-
ui/src/views/offering/AddDiskOffering.vue | 15 +-
ui/src/views/offering/AddNetworkOffering.vue | 8 +
ui/src/views/offering/AddVpcOffering.vue | 8 +
ui/src/views/offering/ImportBackupOffering.vue | 23 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 10 +
ui/src/views/project/AddAccountOrUserToProject.vue | 30 +-
ui/src/views/storage/AttachVolume.vue | 7 +-
ui/src/views/storage/ChangeOfferingForVolume.vue | 5 +
.../views/storage/CreateSnapshotFromVMSnapshot.vue | 6 +-
ui/src/views/storage/CreateVolume.vue | 19 +-
ui/src/views/storage/FormSchedule.vue | 22 +-
ui/src/views/storage/MigrateVolume.vue | 16 +-
ui/src/views/storage/ResizeVolume.vue | 10 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 15 +-
ui/src/views/storage/UploadLocalVolume.vue | 20 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 53 +-
ui/src/views/tools/ManageInstances.vue | 21 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 2 +-
.../com/cloud/usage/parser/NetworkUsageParser.java | 2 +-
utils/pom.xml | 4 -
244 files changed, 8837 insertions(+), 975 deletions(-)
copy ui/src/views/iam/PermissionEditable.vue => api/src/main/java/com/cloud/server/ResourceIcon.java (63%)
copy ui/src/views/iam/PermissionEditable.vue => api/src/main/java/com/cloud/server/ResourceIconManager.java (63%)
copy ui/src/views/iam/PermissionEditable.vue => api/src/main/java/com/cloud/server/ResourceManagerUtil.java (63%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/DeleteResourceIconCmd.java
copy api/src/main/java/org/apache/cloudstack/api/command/{user/resource/ListDetailOptionsCmd.java => admin/resource/icon/ListResourceIconCmd.java} (52%)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/resource/icon/UploadResourceIconCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/IpRangeResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ResourceIconResponse.java
copy ui/src/views/iam/PermissionEditable.vue => api/src/main/java/org/apache/cloudstack/api/response/SetResourceIconResponse.java (63%)
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/vlan/UpdateVlanIpRangeCmdTest.java
create mode 100644 engine/schema/src/main/java/com/cloud/resource/icon/ResourceIconVO.java
copy engine/schema/src/main/java/com/cloud/{network/dao/UserIpv6AddressDao.java => resource/icon/dao/ResourceIconDao.java} (57%)
create mode 100644 engine/schema/src/main/java/com/cloud/resource/icon/dao/ResourceIconDaoImpl.java
create mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/image/deployasis/DeployAsIsHelperImplTest.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStoragePool.java
copy plugins/storage/volume/{cloudbyte => linstor}/pom.xml (73%)
create mode 100644 plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/driver/LinstorPrimaryDataStoreDriverImpl.java
create mode 100644 plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/LinstorPrimaryDataStoreLifeCycleImpl.java
create mode 100644 plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/provider/LinstorPrimaryDatastoreProviderImpl.java
create mode 100644 plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorUtil.java
copy test/integration/smoke/misc/__init__.py => plugins/storage/volume/linstor/src/main/resources/META-INF/cloudstack/storage-volume-linstor/module.properties (94%)
create mode 100644 plugins/storage/volume/linstor/src/main/resources/META-INF/cloudstack/storage-volume-linstor/spring-storage-volume-linstor-context.xml
create mode 100644 server/src/main/java/com/cloud/resourceicon/ResourceIconManagerImpl.java
create mode 100644 server/src/main/java/com/cloud/tags/ResourceManagerUtilImpl.java
rename test/integration/{smoke => broken}/misc/__init__.py (100%)
rename test/integration/{smoke => broken}/misc/test_deploy_vm.py (100%)
rename test/integration/{smoke => broken}/misc/test_escalations_templates.py (100%)
rename test/integration/{smoke => broken}/misc/test_vm_ha.py (100%)
rename test/integration/{smoke => broken}/misc/test_vm_sync.py (100%)
create mode 100644 test/integration/plugins/linstor/README.md
create mode 100644 test/integration/plugins/linstor/test_linstor_volumes.py
copy ui/src/{views/iam/PermissionEditable.vue => components/view/ResourceIcon.vue} (55%)
create mode 100644 ui/src/components/view/UploadResourceIcon.vue