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/17 08:05:21 UTC
[cloudstack] branch decoupleServiceOfferingDiskOffering updated (c8077e0 -> 03f31c3)
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 c8077e0 Allow only resize to higher disk size from UI
discard 0869bbc Allow resize and automigrate of root volume if required in all cases of service offering change
omit a92cd39 Removed old foreign key constraint on IDs of service offering and disk offering
omit 19380b6 Added shrinkOk flag to scaleVM and changeServiceForVirtualMachines and UI form
omit c345f55 Added shrinkOk param to UI in changeOfferingforVolume form
omit f866342 Added shrinkOK parameter to changeofferingforvolume API
omit b610131 Addes since attributes to new API params
omit 462267d UI: Added automigrate checkbox in scale VM form
omit 541855d Added support for auto migration and auto resize of the root volume upon changing the service offering for VM.
omit 8994747 Resolving merge conflicts with main 4.17
omit 8b42527 Removed DB changes from 4.16 upgrade file
omit 7e3efba Fix resize volume and migrate volume to update volume path if DRS is applied on volume in datastore cluster
omit cca8cc4 Added search field for changeofferingforvolume UI form
omit 9604813 Fix false response on updateDiskOffering API
omit c87082f Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
omit dc8f3ca 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 11a42b3 Fix listdiskoffering after rebasing with main
omit 9231871 UI fix in deploy vm wizard
omit beae7f7 UI changes to disable override root disk size when override root disk offering is enabled
omit 0c46e8b Fixed resize volume UI form for data disk
omit 1c4dc1d Address review comments and fix UI form of deploy VM in case of ISO.
omit 5dfd50c Added tool tip for migrate volume UI form
omit 1359333 Fix smoke test failures
omit fba05fb Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
omit 1050e52 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
omit ad1a1cb Fix unit test in VolumeApiServiceImpl
omit 6022693 Fixed recent unit test cases with new serviceofferingvo constructor
omit 0e41c19 Fix a unit test case
omit 38cba08 Changes for override root disk offering in deployvm wizard in case of custom offering
omit 531147e Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
omit 03b1eda Fix global setting implementation
omit 380611b Fix changeOfferingForVolume API for custom disk offering
omit 123f29e update volume_view to update system_use column from service offering and not disk offering
omit 5707a4d Remove system_use column from disk offering join
omit 1a7f285 review comments addressed
omit 56cc870 Added marvin test cases for checking disk offering strictness
omit 75688bb Addressed review comments and fixed update service offering flow with storage tags
omit 9596e76 Removed unused import
omit 9d3ee62 Fix domain_router_view to get proper service offering id
omit a2deb3a Fix service offering constructor to address custom offering
omit 30079ed Fix service offering edit flow
omit 0ae3446 Fixed service_offering_view
omit 479ee80 Addressed review comments
omit 8b054ea fix user_vm_view
omit 8c09d61 Fix unit test failures
omit 25edbe0 Fix service offering usage as disk offering
omit 3f034f1 Fix UI conflicts
omit 944a0fd Add UI form for changeOfferingForVolume API
omit cf74d67 Added new API changeofferingforVolume API and corresponding changes
omit 51e81e2 Added disk offering change checks during resize volume operation
omit 3632ca1 Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
omit 1cbb397 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
omit 1399b0f UI: move compute only toggle button outside the box in add compute offering wizard
omit ce5a143 Fixed diskoffering automatic selection on add compute offering wizard
omit 69f4da5 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
omit 2c82a70 Move uselocalstorage column access from service offering to disk offering
omit b0ba765 Fix VM deployment from custom service offering
omit 9c26c70 Fix delete compute offering
omit 55246e6 Added UI changes in deployvm wizard to accept override disk offering id
omit dcd6e0e Added diskoffering details to the service offering response
omit 5520af5 Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
omit f773f7c Remove comments
omit afdb79f Added disk offering strictness to the service offering response
omit 9c3aa9d Added disk size strictness in disk offering response
omit ff57439 Fix User vm response to show proper service offering and disk offerings
omit 8cec45e Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
omit 1d7e090 Add diskofferingstrictness to serviceoffering vo under quota
omit 098408f Added new API params to compute offering creation
omit 9f16565 Fix deployVM flow
omit aa8363b diskoffering getsize() is only for strict disk offerings
omit 60cac1b Decouple service offering and disk offering states
omit d14b33d Remove diskofferingid from vminstance VO
omit 60130dc Decoupled service offering and disk offering
omit 565cf45 Few more changes
omit 5664214 Schema changes and disk offering column change from "type" to "compute_only"
add a85a00b kvm: Fixes UEFI XML Definition Error (#5692)
add 9c9de74 Merge remote-tracking branch 'origin/4.16'
add 6e04f87 Fix HostMetricsResponse unit test (#5713)
add 2b54b58 engine/schema: fix findActiveAccountById in AccountDaoImpl.java (#5704)
add 965316b server bug fix: remove network details when network is removed (#5675)
add 14f3b24 Merge remote-tracking branch 'apache/4.16'
add 2df82d8 ui: changes in migrate vm storage and migrate volume form (#5145)
add 895f282 Fix NPE on scale VM operation after the corresponding template is deleted (#5721)
add 4beca92 Fix NPE on scale VM operation after the corresponding template is deleted (#5736)
add e3459b5 Removed redundant call for VM snapshot chain size, in VMware.
add 867ccf6 Merge pull request #5720 from shapeblue/remove-redundant-call-for-snapshot-chain-size
add dfd75d7 api: Fix wrong logger class in *Cmd.java (#5740)
add 4d99f84 server: update capacity_state of host cpu core after disable/enable a host (#5701)
add 4580822 UI: Enable cancel host maintenance when resource state is 'ErrorInPrepareForMaintenance' (#5737)
add 14d09a9 check security groups in basic zones (#5746)
add 46fa7f4 UI bug fix: 'Invalid ip address' when change vm ip address (#5744)
add a277e4e server: fix non-root users are able to list system networks by id (#5729)
add 2e9c941 Merge remote-tracking branch 'origin/4.16'
add 28385be Fix metrics stats for VMs not running (#5633)
add 9363f64 Fix full backup VM restore (#5680)
add 00c6ad2 vmware: Perform volume file search in the VM directory on the datastore while computing the VM snapshot chain size. (#5735)
add 1988068 UI fix: button next not working when adding more physical networks (#5734)
add 93f4eca vmware: fix cpu reservation during vm scale (#5708)
add a47e53f internal ref replaced by uuid (#5738)
add 8bc69e9 conditional broadcastUri (#5745)
add 51d4e54 Merge remote-tracking branch 'apache/4.16'
add d49f67c travis: install python3-setuptools (#5767)
add 937996c Merge remote-tracking branch 'apache/4.16'
add cb75e8f Update listVirtualMachines API documentation with 'projectid=-1' to list all VMs in projects. (#4276)
add 8ace272 Set length for parameters that expect a list of domain ids. (#5763)
add 3bb987d Merge branch '4.16' into main
add 3b9a47e Schema changes and disk offering column change from "type" to "compute_only"
add 7c38304 Few more changes
add 01244e0 Decoupled service offering and disk offering
add 83a4235 Remove diskofferingid from vminstance VO
add bdd9d94 Decouple service offering and disk offering states
add 7b6c9ca diskoffering getsize() is only for strict disk offerings
add b5cc617 Fix deployVM flow
add 66dcc3c Added new API params to compute offering creation
add c266468 Add diskofferingstrictness to serviceoffering vo under quota
add b8c052d Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
add 2b9239b Fix User vm response to show proper service offering and disk offerings
add 5f687f9 Added disk size strictness in disk offering response
add 876f5b3 Added disk offering strictness to the service offering response
add 64125f9 Remove comments
add ac5967e Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
add 4e15ea2 Added diskoffering details to the service offering response
add 6811365 Added UI changes in deployvm wizard to accept override disk offering id
add 49143e7 Fix delete compute offering
add 422234c Fix VM deployment from custom service offering
add 2b74034 Move uselocalstorage column access from service offering to disk offering
add 85ab984 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
add efd74eb Fixed diskoffering automatic selection on add compute offering wizard
add a766396 UI: move compute only toggle button outside the box in add compute offering wizard
add c72bfb0 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
add 82e1cde Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
add e8c8c75 Added disk offering change checks during resize volume operation
add f2be8d8 Added new API changeofferingforVolume API and corresponding changes
add 7d45782 Add UI form for changeOfferingForVolume API
add 43dc747 Fix UI conflicts
add 8ad4657 Fix service offering usage as disk offering
add ecd4cb1 Fix unit test failures
add 1403163 fix user_vm_view
add acc56ff Addressed review comments
add 1d3b830 Fixed service_offering_view
add 84b12a4 Fix service offering edit flow
add 418fb2a Fix service offering constructor to address custom offering
add 54eead4 Fix domain_router_view to get proper service offering id
add c4cedbc Removed unused import
add fab1d6e Addressed review comments and fixed update service offering flow with storage tags
add 396c923 Added marvin test cases for checking disk offering strictness
add 61656ce review comments addressed
add ea58277 Remove system_use column from disk offering join
add 4ac9d6a update volume_view to update system_use column from service offering and not disk offering
add c17ca0c Fix changeOfferingForVolume API for custom disk offering
add 6ff5ba1 Fix global setting implementation
add 05177c5 Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
add 52ee525 Changes for override root disk offering in deployvm wizard in case of custom offering
add 525ba5c Fix a unit test case
add b11af50 Fixed recent unit test cases with new serviceofferingvo constructor
add 1eff22a Fix unit test in VolumeApiServiceImpl
add 7e32390 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add 8d354e7 Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
add ea89cfe Fix smoke test failures
add 7f81b3e Added tool tip for migrate volume UI form
add a81f816 Address review comments and fix UI form of deploy VM in case of ISO.
add 654902c Fixed resize volume UI form for data disk
add f8c0562 UI changes to disable override root disk size when override root disk offering is enabled
add 18a77c3 UI fix in deploy vm wizard
add 13999e1 Fix listdiskoffering after rebasing with main
add 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
add e4d4bfc Added custom Iops to resize volume form and removed the current disk offering during change offering for volume UI form
add b6bfb3f Fix false response on updateDiskOffering API
add 7290360 Added search field for changeofferingforvolume UI form
add c8afc80 Fix resize volume and migrate volume to update volume path if DRS is applied on volume in datastore cluster
add ffa4549 Removed DB changes from 4.16 upgrade file
add fab4f4b Resolving merge conflicts with main 4.17
add 9cdcdf6 Added support for auto migration and auto resize of the root volume upon changing the service offering for VM.
add 482ff78 UI: Added automigrate checkbox in scale VM form
add 69107c8 Addes since attributes to new API params
add 283d653 Added shrinkOK parameter to changeofferingforvolume API
add 243a6a8 Added shrinkOk param to UI in changeOfferingforVolume form
add b0b4c24 Added shrinkOk flag to scaleVM and changeServiceForVirtualMachines and UI form
add 28901c9 Removed old foreign key constraint on IDs of service offering and disk offering
add 16b0db2 Allow resize and automigrate of root volume if required in all cases of service offering change
add 03f31c3 Allow only resize to higher disk size from UI
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 (c8077e0)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering (03f31c3)
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:
.../cloudstack/api/BaseListDomainResourcesCmd.java | 2 +-
.../api/BaseListProjectAndAccountResourcesCmd.java | 2 +-
.../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java | 3 +-
.../admin/address/ReleasePodIpCmdByAdmin.java | 3 +-
.../api/command/admin/cluster/ListClustersCmd.java | 3 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 3 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 3 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 3 +-
.../admin/router/ListVirtualRouterElementsCmd.java | 3 +-
.../storage/CreateSecondaryStagingStoreCmd.java | 2 +-
.../command/admin/systemvm/ScaleSystemVMCmd.java | 3 +-
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 3 +-
.../admin/usage/ListTrafficMonitorsCmd.java | 3 +-
.../api/command/admin/user/GetUserKeysCmd.java | 2 +-
.../api/command/admin/user/MoveUserCmd.java | 2 +-
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 2 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 3 +-
.../user/account/DeleteAccountFromProjectCmd.java | 3 +-
.../user/account/DeleteUserFromProjectCmd.java | 3 +-
.../user/guest/ListGuestOsCategoriesCmd.java | 3 +-
.../api/command/user/guest/ListGuestOsCmd.java | 3 +-
.../command/user/loadbalancer/ListSslCertsCmd.java | 2 +-
.../api/command/user/nat/DisableStaticNatCmd.java | 3 +-
.../api/command/user/nat/EnableStaticNatCmd.java | 2 +-
.../api/command/user/network/DeleteNetworkCmd.java | 3 +-
.../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 2 +-
.../command/user/resource/ListHypervisorsCmd.java | 3 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../command/user/snapshot/ArchiveSnapshotCmd.java | 2 +-
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 2 +-
.../api/command/user/vm/UpdateVmNicIpCmd.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 2 +-
.../engine/orchestration/NetworkOrchestrator.java | 4 +-
.../com/cloud/usage/dao/UsageNetworkDaoImpl.java | 2 +-
.../java/com/cloud/user/dao/AccountDaoImpl.java | 1 +
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 6 +
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 31 ++-
.../kvm/resource/LibvirtComputingResource.java | 2 +
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 22 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 12 +-
.../hypervisor/vmware/resource/VmwareResource.java | 6 +-
.../cluster/ScaleKubernetesClusterCmd.java | 2 +-
.../response/HostMetricsResponseTest.java | 13 +-
.../api/commands/ListExternalFirewallsCmd.java | 3 +-
.../commands/DeleteNetscalerControlCenterCmd.java | 2 +-
.../cloudstack/api/commands/DeleteSspCmd.java | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 2 +-
.../api/auth/DefaultLogoutAPIAuthenticatorCmd.java | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 12 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 25 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 4 +-
.../com/cloud/resource/ResourceManagerImpl.java | 2 +-
.../main/java/com/cloud/server/StatsCollector.java | 32 ++-
.../com/cloud/storage/download/DownloadState.java | 2 +-
.../java/com/cloud/storage/upload/UploadState.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 7 +
.../cloudstack/backup/BackupManagerImpl.java | 3 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 38 +++
.../java/com/cloud/server/StatsCollectorTest.java | 65 +++++
.../AccountManagerImplVolumeDeleteEventTest.java | 4 +
.../cloud/test/stress/StressTestDirectAttach.java | 2 +-
.../main/java/com/cloud/test/utils/SignEC2.java | 2 +-
tools/travis/before_install.sh | 2 +-
ui/public/locales/en.json | 18 +-
.../InstanceVolumesStoragePoolSelectListView.vue | 248 +++++++++++++++++++
ui/src/components/view/StoragePoolSelectView.vue | 274 +++++++++++++++++++++
.../view/VolumeStoragePoolSelectForm.vue | 129 ++++++++++
ui/src/config/section/infra/hosts.js | 2 +-
ui/src/config/section/network.js | 17 +-
ui/src/main.js | 3 +-
.../CapacityState.java => ui/src/role/index.js | 9 +-
ui/src/utils/plugins.js | 27 ++
ui/src/views/compute/DeployVM.vue | 6 +-
ui/src/views/compute/InstanceTab.vue | 11 +-
ui/src/views/compute/KubernetesServiceTab.vue | 9 +-
ui/src/views/compute/MigrateVMStorage.vue | 252 ++++++++++---------
ui/src/views/compute/MigrateWizard.vue | 176 +++++++++----
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 16 +-
ui/src/views/network/CreateL2NetworkForm.vue | 16 +-
ui/src/views/network/CreateNetwork.vue | 9 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 6 -
ui/src/views/network/UpdateNetwork.vue | 7 +-
ui/src/views/offering/AddComputeOffering.vue | 9 +-
ui/src/views/offering/AddDiskOffering.vue | 7 +-
ui/src/views/offering/AddNetworkOffering.vue | 3 +-
ui/src/views/offering/AddVpcOffering.vue | 3 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 7 +-
ui/src/views/storage/MigrateVolume.vue | 143 ++++++-----
ui/tests/common/index.js | 3 +-
91 files changed, 1411 insertions(+), 401 deletions(-)
create mode 100644 ui/src/components/view/InstanceVolumesStoragePoolSelectListView.vue
create mode 100644 ui/src/components/view/StoragePoolSelectView.vue
create mode 100644 ui/src/components/view/VolumeStoragePoolSelectForm.vue
copy api/src/main/java/com/cloud/capacity/CapacityState.java => ui/src/role/index.js (76%)