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/12/31 05:42:34 UTC
[cloudstack] branch decoupleServiceOfferingDiskOffering updated (f896ec2 -> 1bccb83)
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.
discard f896ec2 Fix migratevolume form to pick selected storage pool id in list diskofferings API
discard 1843c6c Fix resize volume operation to update the VM settings
discard 06f3c45 Converted from check box to toggle in scale VM, changeoffering, resize and migrate volume forms
discard 1a1d3fe Make UI changes to provide root disk size box when the linked disk offering is of custom
discard da83906 Fixing vue syntax error
discard 03f31c3 Allow only resize to higher disk size from UI
discard 16b0db2 Allow resize and automigrate of root volume if required in all cases of service offering change
discard 28901c9 Removed old foreign key constraint on IDs of service offering and disk offering
discard b0b4c24 Added shrinkOk flag to scaleVM and changeServiceForVirtualMachines and UI form
discard 243a6a8 Added shrinkOk param to UI in changeOfferingforVolume form
discard 283d653 Added shrinkOK parameter to changeofferingforvolume API
discard 69107c8 Addes since attributes to new API params
discard 482ff78 UI: Added automigrate checkbox in scale VM form
discard 9cdcdf6 Added support for auto migration and auto resize of the root volume upon changing the service offering for VM.
discard fab4f4b Resolving merge conflicts with main 4.17
discard ffa4549 Removed DB changes from 4.16 upgrade file
discard c8afc80 Fix resize volume and migrate volume to update volume path if DRS is applied on volume in datastore cluster
discard 7290360 Added search field for changeofferingforvolume UI form
discard b6bfb3f Fix false response on updateDiskOffering API
discard e4d4bfc Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
discard a627f4e Fixed UI in migrate and changeofferingfor volume to handle empty disk offering list Removed the volume's current disk offering from listDiskOffering response list
discard 13999e1 Fix listdiskoffering after rebasing with main
discard 18a77c3 UI fix in deploy vm wizard
discard f8c0562 UI changes to disable override root disk size when override root disk offering is enabled
discard 654902c Fixed resize volume UI form for data disk
discard a81f816 Address review comments and fix UI form of deploy VM in case of ISO.
discard 7f81b3e Added tool tip for migrate volume UI form
discard ea89cfe Fix smoke test failures
discard 8d354e7 Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
discard 7e32390 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
discard 1eff22a Fix unit test in VolumeApiServiceImpl
discard b11af50 Fixed recent unit test cases with new serviceofferingvo constructor
discard 525ba5c Fix a unit test case
discard 52ee525 Changes for override root disk offering in deployvm wizard in case of custom offering
discard 05177c5 Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
discard 6ff5ba1 Fix global setting implementation
discard c17ca0c Fix changeOfferingForVolume API for custom disk offering
discard 4ac9d6a update volume_view to update system_use column from service offering and not disk offering
discard ea58277 Remove system_use column from disk offering join
discard 61656ce review comments addressed
discard 396c923 Added marvin test cases for checking disk offering strictness
discard fab1d6e Addressed review comments and fixed update service offering flow with storage tags
discard c4cedbc Removed unused import
discard 54eead4 Fix domain_router_view to get proper service offering id
discard 418fb2a Fix service offering constructor to address custom offering
discard 84b12a4 Fix service offering edit flow
discard 1d3b830 Fixed service_offering_view
discard acc56ff Addressed review comments
discard 1403163 fix user_vm_view
discard ecd4cb1 Fix unit test failures
discard 8ad4657 Fix service offering usage as disk offering
discard 43dc747 Fix UI conflicts
discard 7d45782 Add UI form for changeOfferingForVolume API
discard f2be8d8 Added new API changeofferingforVolume API and corresponding changes
discard e8c8c75 Added disk offering change checks during resize volume operation
discard 82e1cde Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
discard c72bfb0 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
discard a766396 UI: move compute only toggle button outside the box in add compute offering wizard
discard efd74eb Fixed diskoffering automatic selection on add compute offering wizard
discard 85ab984 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
discard 2b74034 Move uselocalstorage column access from service offering to disk offering
discard 422234c Fix VM deployment from custom service offering
discard 49143e7 Fix delete compute offering
discard 6811365 Added UI changes in deployvm wizard to accept override disk offering id
discard 4e15ea2 Added diskoffering details to the service offering response
discard ac5967e Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
discard 64125f9 Remove comments
discard 876f5b3 Added disk offering strictness to the service offering response
discard 5f687f9 Added disk size strictness in disk offering response
discard 2b9239b Fix User vm response to show proper service offering and disk offerings
discard b8c052d Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
discard c266468 Add diskofferingstrictness to serviceoffering vo under quota
discard 66dcc3c Added new API params to compute offering creation
discard b5cc617 Fix deployVM flow
discard 7b6c9ca diskoffering getsize() is only for strict disk offerings
discard bdd9d94 Decouple service offering and disk offering states
discard 83a4235 Remove diskofferingid from vminstance VO
discard 01244e0 Decoupled service offering and disk offering
discard 7c38304 Few more changes
discard 3b9a47e Schema changes and disk offering column change from "type" to "compute_only"
add cc85627 UI: fix create Isolated/L2 network form (#5779)
add 79d924f Insert correct template size when live migrating VM with volumes (#5758)
add 29c7518 UI: Fixes error when delete domain (#5710)
add 99313f8 Merge branch '4.16' into main
add 01f1aae Improve VMWare logs (#5353)
add 995ce06 Enhance log message in FirstFitPlanner (#5762)
add 936ebbb api: Fix search cluster by name (#5782)
add 39e41f6 Allow force reboot VM from user account, to start VM on the same host (#5791)
add 2a331b3 Merge release branch 4.16 to main
add f03ed8c cleanup of unused code and cleanup of cleanup procedure (#5562)
add b32f369 Merge branch '4.16' into main
add 4b7dcfa README: again that time of the year! :christmas_tree: (#5792)
add 9b0a141 Provision to sort ISOs from UI, and Updated Templates/ISOs API response to return in the order of sortkey (#5800)
add 12d95a2 Remove unused gravatar fetch (#5806)
add 9607ae9 server: Fix NPE while adding network to VPC (#5723)
add 8ba5b92 server: Fix NPE while deleting a domain (#5753)
add 19325d0 Change UI VM deployment to show SSH keys only if user has keys (#5804)
add 7823868 network: update ip in lb/pf/dnat tables when update vm nic ip (#5757)
add 0c0254d Merge branch '4.16' into main
add e3b0c08 simplify code using optional chaining in multiple config files (#5764)
add 7cb4604 simplify code using object shorthand in multiple files (#5766)
add b63498d server: Fix a typo (#5761)
add d8d5665 api: Allow users to list VMs by Backup Offering Id (#5679)
add 7791b3c ui: simplify code using optional chaining in the zone view (#5626)
add d0721c5 ui: Change permission to access console proxy button (#5625)
add 49b2dfc ui: simplify code using optional chaining in ZoneWizardLaunchZone view (#5619)
add ae62e1d fixes cannot add new port forwarding rules after auto select VM next time (#5690)
add 9a5a073 ui: Fix configure Sticky policy form (#5814)
add 6728b69 kvm: don't always force scsi controller for aarch64 VMs (#5802)
add d13057a ui: show tags only for supported resources (#5798)
add 6208976 Fix UI issue 5777 Root disk size is not shown as 'Disk Size' on VM deployment. (#5796)
add dcdcd09 Randomize managed volume copy host (#5789)
add c0ddda3 [VMware] Fix service offerings listing on appliances deployment options (#5752)
add 9798fa0 kvm: support qemu-system-x86>=5.2 (#5755)
add 8952cd5 kvm: add hosts using cloudstack ssh private key (ccc21 hackathon) (#5684)
add 5eccbc9 ui: Add footer text option for login screen (#5628)
add eb04a46 ui: Add clear all notification button (#5549)
add d7a9873 ui: fix add network offering for vpc (#5809)
add 10bda85 ui: auto-prefill edit tariff label (#5714)
add 4ba2ad5 test: fix component test test_configdrive.py (#5528)
add c84198d Merge remote-tracking branch 'origin/4.16'
add 204fd5c merge: fix forward merge import issue
add 44f6730 ui: Allow users to list VMs by Backup Offering Id in UI (#5818)
add fa9d813 Schema changes and disk offering column change from "type" to "compute_only"
add fa8e630 Few more changes
add 345ea59 Decoupled service offering and disk offering
add 3e0f5c4 Remove diskofferingid from vminstance VO
add 27d191b Decouple service offering and disk offering states
add 27dbc49 diskoffering getsize() is only for strict disk offerings
add 0e514dd Fix deployVM flow
add 196175d Added new API params to compute offering creation
add ff81fd0 Add diskofferingstrictness to serviceoffering vo under quota
add 2dbe47a Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
add 1c2e876 Fix User vm response to show proper service offering and disk offerings
add e5ea262 Added disk size strictness in disk offering response
add da33cd8 Added disk offering strictness to the service offering response
add d49f90e Remove comments
add 31af7f5 Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
add 99a6dd6 Added diskoffering details to the service offering response
add 8a01c44 Added UI changes in deployvm wizard to accept override disk offering id
add 4851ac0 Fix delete compute offering
add f146a01 Fix VM deployment from custom service offering
add d3b3d65 Move uselocalstorage column access from service offering to disk offering
add 28c801f UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
add 81bda1a Fixed diskoffering automatic selection on add compute offering wizard
add bf74c2f UI: move compute only toggle button outside the box in add compute offering wizard
add af2f61a Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
add 224db2b Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
add 33975f1 Added disk offering change checks during resize volume operation
add 075487f Added new API changeofferingforVolume API and corresponding changes
add 32f1af7 Add UI form for changeOfferingForVolume API
add 63e2943 Fix UI conflicts
add 9ce50a1 Fix service offering usage as disk offering
add 8345df8 Fix unit test failures
add 917ed34 fix user_vm_view
add bb4b46e Addressed review comments
add 58cfe0a Fixed service_offering_view
add 46e166c Fix service offering edit flow
add ca22a60 Fix service offering constructor to address custom offering
add 95fbebf Fix domain_router_view to get proper service offering id
add aa24ce3 Removed unused import
add 874c72d Addressed review comments and fixed update service offering flow with storage tags
add 22eb0bc Added marvin test cases for checking disk offering strictness
add 25607b5 review comments addressed
add 4739e79 Remove system_use column from disk offering join
add cf6912d update volume_view to update system_use column from service offering and not disk offering
add 05a1666 Fix changeOfferingForVolume API for custom disk offering
add 99737e2 Fix global setting implementation
add 956fc80 Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
add ea6c195 Changes for override root disk offering in deployvm wizard in case of custom offering
add e1e9408 Fix a unit test case
add 5364bc6 Fixed recent unit test cases with new serviceofferingvo constructor
add 6fb3fd3 Fix unit test in VolumeApiServiceImpl
add e33cc3a Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add 8cf7f9b Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
add 83b455c Fix smoke test failures
add 3c7528c Added tool tip for migrate volume UI form
add ca29f68 Address review comments and fix UI form of deploy VM in case of ISO.
add 9049a9c Fixed resize volume UI form for data disk
add b53a99d UI changes to disable override root disk size when override root disk offering is enabled
add 24cf1d2 UI fix in deploy vm wizard
add f976294 Fix listdiskoffering after rebasing with main
add 5b52986 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 375e5ac Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
add bfaff82 Fix false response on updateDiskOffering API
add 0a1488c Added search field for changeofferingforvolume UI form
add 7e5490e Fix resize volume and migrate volume to update volume path if DRS is applied on volume in datastore cluster
add ca79952 Removed DB changes from 4.16 upgrade file
add 592638b Resolving merge conflicts with main 4.17
add 980dfbd Added support for auto migration and auto resize of the root volume upon changing the service offering for VM.
add 3a8908d UI: Added automigrate checkbox in scale VM form
add fe857f4 Addes since attributes to new API params
add 4336afe Added shrinkOK parameter to changeofferingforvolume API
add 716237d Added shrinkOk param to UI in changeOfferingforVolume form
add 7c23222 Added shrinkOk flag to scaleVM and changeServiceForVirtualMachines and UI form
add ec91836 Removed old foreign key constraint on IDs of service offering and disk offering
add 47bdcd7 Allow resize and automigrate of root volume if required in all cases of service offering change
add 25d8e1c Allow only resize to higher disk size from UI
add 3ff84b7 Fixing vue syntax error
add c998601 Make UI changes to provide root disk size box when the linked disk offering is of custom
add 1117363 Converted from check box to toggle in scale VM, changeoffering, resize and migrate volume forms
add b14efa8 Fix resize volume operation to update the VM settings
add 1bccb83 Fix migratevolume form to pick selected storage pool id in list diskofferings API
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 (f896ec2)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering (1bccb83)
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:
README.md | 2 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 8 +
.../StorageSubsystemCommandHandlerBase.java | 10 +
debian/control | 2 +-
.../KvmNonManagedStorageDataMotionStrategy.java | 13 +-
.../KvmNonManagedStorageSystemDataMotionTest.java | 4 +-
.../kvm/resource/LibvirtComputingResource.java | 10 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 2 +-
.../vmware/manager/VmwareHostService.java | 2 +
.../vmware/manager/VmwareStorageManagerImpl.java | 67 +--
.../hypervisor/vmware/resource/VmwareResource.java | 494 ++++-----------------
.../VmwareSecondaryStorageResourceHandler.java | 21 +-
.../storage/resource/VmwareStorageProcessor.java | 176 ++------
.../driver/ScaleIOPrimaryDataStoreDriver.java | 4 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 14 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 7 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 4 +
.../configuration/ConfigurationManagerImpl.java | 15 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 12 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 14 +-
.../network/element/VpcVirtualRouterElement.java | 5 +-
.../com/cloud/resource/ResourceManagerImpl.java | 32 +-
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 94 ++--
.../cloud/resource/ResourceManagerImplTest.java | 26 +-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 4 -
test/integration/component/test_configdrive.py | 15 +-
test/integration/smoke/test_router_dhcphosts.py | 96 ++--
ui/public/config.json | 1 +
ui/public/locales/en.json | 4 +
ui/src/components/CheckBoxSelectPair.vue | 38 +-
ui/src/components/header/UserMenu.vue | 13 +-
ui/src/components/page/GlobalLayout.vue | 20 +-
ui/src/components/view/DetailSettings.vue | 3 +-
ui/src/components/view/InfoCard.vue | 18 +-
ui/src/components/view/ListView.vue | 3 +-
ui/src/components/view/ResourceLimitTab.vue | 3 +-
ui/src/components/view/SettingsTab.vue | 3 +-
ui/src/components/view/UploadResourceIcon.vue | 12 +-
ui/src/components/widgets/Console.vue | 2 +-
ui/src/config/section/compute.js | 6 +-
ui/src/config/section/image.js | 3 +
ui/src/config/section/infra/clusters.js | 12 +-
ui/src/config/section/infra/hosts.js | 15 +-
ui/src/config/section/infra/zones.js | 12 +-
ui/src/config/section/offering.js | 5 +
ui/src/layouts/UserLayout.vue | 45 +-
ui/src/permission.js | 11 +-
ui/src/role/index.js | 2 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 17 +-
ui/src/style/dark-mode.less | 4 +
ui/src/style/vars.less | 7 +
ui/src/utils/plugins.js | 74 ++-
ui/src/utils/request.js | 57 ++-
ui/src/views/AutogenView.vue | 3 +-
ui/src/views/compute/AssignInstance.vue | 3 +-
ui/src/views/compute/ChangeAffinity.vue | 3 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 3 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 3 +-
ui/src/views/compute/DeployVM.vue | 32 +-
ui/src/views/compute/KubernetesServiceTab.vue | 3 +-
ui/src/views/compute/MigrateWizard.vue | 3 +-
ui/src/views/compute/ScaleVM.vue | 3 +-
ui/src/views/compute/StartVirtualMachine.vue | 9 +-
ui/src/views/compute/backup/BackupSchedule.vue | 3 +-
ui/src/views/compute/backup/FormSchedule.vue | 3 +-
.../compute/wizard/ComputeOfferingSelection.vue | 4 +-
ui/src/views/iam/AddAccount.vue | 15 +-
ui/src/views/iam/AddLdapAccount.vue | 6 +-
ui/src/views/iam/AddUser.vue | 18 +-
ui/src/views/iam/ChangeUserPassword.vue | 3 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 6 +-
ui/src/views/iam/CreateRole.vue | 3 +-
ui/src/views/iam/DomainActionForm.vue | 9 +-
ui/src/views/iam/DomainView.vue | 3 +-
ui/src/views/iam/EditUser.vue | 6 +-
ui/src/views/iam/ImportRole.vue | 6 +-
ui/src/views/image/IsoZones.vue | 3 +-
ui/src/views/image/RegisterOrUploadIso.vue | 15 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 12 +-
ui/src/views/image/TemplateZones.vue | 3 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 3 +-
ui/src/views/infra/AddPrimaryStorage.vue | 3 +-
ui/src/views/infra/AddSecondaryStorage.vue | 3 +-
ui/src/views/infra/ClusterAdd.vue | 9 +-
ui/src/views/infra/HostAdd.vue | 39 +-
ui/src/views/infra/InfraSummary.vue | 6 +-
ui/src/views/infra/MigrateData.vue | 6 +-
ui/src/views/infra/PodAdd.vue | 6 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 3 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 7 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 15 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 6 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 3 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 3 +-
.../infra/network/providers/AddNiciraNvpDevice.vue | 3 +-
.../network/providers/AddPaloAltoFirewall.vue | 3 +-
.../infra/network/providers/AddSrxFirewall.vue | 3 +-
.../views/infra/network/providers/ProviderItem.vue | 3 +-
.../infra/network/providers/ProviderListView.vue | 6 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 14 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 145 +++---
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 8 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 5 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 42 +-
ui/src/views/network/AclListRulesTab.vue | 3 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 3 +-
ui/src/views/network/CreateL2NetworkForm.vue | 3 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 6 +-
ui/src/views/network/CreateVlanIpRange.vue | 6 +-
ui/src/views/network/CreateVpc.vue | 4 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 3 +-
ui/src/views/network/IpAddressesTab.vue | 6 +-
ui/src/views/network/LoadBalancing.vue | 7 +-
ui/src/views/network/PortForwarding.vue | 3 +-
ui/src/views/network/VpcTiersTab.vue | 3 +-
ui/src/views/network/VpnDetails.vue | 3 +-
ui/src/views/offering/AddNetworkOffering.vue | 114 +++--
ui/src/views/offering/AddVpcOffering.vue | 2 -
ui/src/views/offering/UpdateOfferingAccess.vue | 3 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 3 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 9 +-
ui/src/views/storage/FormSchedule.vue | 3 +-
ui/src/views/storage/ResizeVolume.vue | 3 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 2 +-
ui/src/views/storage/ScheduledSnapshots.vue | 3 +-
ui/src/views/storage/TakeSnapshot.vue | 2 +-
ui/src/views/storage/UploadLocalVolume.vue | 9 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 21 +-
ui/tests/unit/views/AutogenView.spec.js | 36 +-
ui/tests/unit/views/compute/MigrateWizard.spec.js | 9 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 27 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 5 +-
136 files changed, 1212 insertions(+), 1170 deletions(-)