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 e920655 Added shrinkOk flag to scaleVM and
changeServiceForVirtualMachines and UI form
discard b6c9eec Added shrinkOk param to UI in changeOfferingforVolume form
discard e4ec849 Added shrinkOK parameter to changeofferingforvolume API
discard 7c194b3 Addes since attributes to new API params
omit 42e5425 UI: Added automigrate checkbox in scale VM form
omit d230364 Added support for auto migration and auto resize of the root
volume upon changing the service offering for VM.
omit 5e930c8 Resolving merge conflicts with main 4.17
omit 222bd89 Removed DB changes from 4.16 upgrade file
omit 2273452 Fix resize volume and migrate volume to update volume path if
DRS is applied on volume in datastore cluster
omit 114094b Added search field for changeofferingforvolume UI form
omit 179b025 Fix false response on updateDiskOffering API
omit d4641ef Added custom Iops to resize volume form and removed the
current disk offering during change offering for volume UI form
omit b15d0a2 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 59b1a3d Fix listdiskoffering after rebasing with main
omit e0cdd16 UI fix in deploy vm wizard
omit d30a386 UI changes to disable override root disk size when override
root disk offering is enabled
omit 434c015 Fixed resize volume UI form for data disk
omit f8ed1e9 Address review comments and fix UI form of deploy VM in case
of ISO.
omit 07fbae4 Added tool tip for migrate volume UI form
omit ccfd41f Fix smoke test failures
omit 1a5808b Rename global configuration parameter from
storage.pool.tags.disk.offering.strictness to
match.storage.pool.tags.with.disk.offering
omit c88fff3 Added storage id for the list disk offering API and
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
omit a99caa8 Fix unit test in VolumeApiServiceImpl
omit 8a41fae Fixed recent unit test cases with new serviceofferingvo
constructor
omit 882d701 Fix a unit test case
omit 49467a7 Changes for override root disk offering in deployvm wizard in
case of custom offering
omit fb3f8b2 Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
omit 97bd725 Fix global setting implementation
omit 4fd350a Fix changeOfferingForVolume API for custom disk offering
omit a72936e update volume_view to update system_use column from service
offering and not disk offering
omit cecda20 Remove system_use column from disk offering join
omit 7a41a88 review comments addressed
omit e1f53c4 Added marvin test cases for checking disk offering strictness
omit b6b35fe Addressed review comments and fixed update service offering
flow with storage tags
omit adae083 Removed unused import
omit 54b1ad7 Fix domain_router_view to get proper service offering id
omit dea935b Fix service offering constructor to address custom offering
omit c144e93 Fix service offering edit flow
omit 6c46288 Fixed service_offering_view
omit 98d41a3 Addressed review comments
omit a4e69d9 fix user_vm_view
omit 6fa31b4 Fix unit test failures
omit dd8da07 Fix service offering usage as disk offering
omit 47685ef Fix UI conflicts
omit 5c8d3a1 Add UI form for changeOfferingForVolume API
omit b7ba141 Added new API changeofferingforVolume API and corresponding
changes
omit 6686176 Added disk offering change checks during resize volume
operation
omit 787060b Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
omit 8c22797 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
omit 43b9f2b UI: move compute only toggle button outside the box in add
compute offering wizard
omit cae5738 Fixed diskoffering automatic selection on add compute
offering wizard
omit 094e064 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
omit 61a809b Move uselocalstorage column access from service offering to
disk offering
omit 4bd6ce0 Fix VM deployment from custom service offering
omit 94007aa Fix delete compute offering
omit a47a5f2 Added UI changes in deployvm wizard to accept override disk
offering id
omit 15266ac Added diskoffering details to the service offering response
omit 0fdc774 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
omit 79e5572 Remove comments
omit f609d27 Added disk offering strictness to the service offering
response
omit 6c3943f Added disk size strictness in disk offering response
omit e11fa75 Fix User vm response to show proper service offering and disk
offerings
omit fc6f5d7 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
omit 8e03700 Add diskofferingstrictness to serviceoffering vo under quota
omit 2e946c7 Added new API params to compute offering creation
omit 9051d3e Fix deployVM flow
omit 311b371 diskoffering getsize() is only for strict disk offerings
omit 6ffead7 Decouple service offering and disk offering states
omit f137b49 Remove diskofferingid from vminstance VO
omit 6e23c75 Decoupled service offering and disk offering
omit 47c6246 Few more changes
omit c165e20 Schema changes and disk offering column change from "type" to
"compute_only"
add ddd2fca Refactor few process of VirtualMachineManagerImpl and improve
logs (#4966)
add f96df2c server: Add OperationTimedoutException to known list (#5702)
add 6635421 ui: show button for dynamic Scaling for VM in case of KVM
hypervisor, since it is supported now (#5703)
add e2c85de schema: Add SQL command to alter the table 'ipsec_psk' when
upgrading to 4.17 (#5668)
add 80cb361 Handle NullPointerException when sending email alerts (#5649)
add 5664214 Schema changes and disk offering column change from "type" to
"compute_only"
add 565cf45 Few more changes
add 60130dc Decoupled service offering and disk offering
add d14b33d Remove diskofferingid from vminstance VO
add 60cac1b Decouple service offering and disk offering states
add aa8363b diskoffering getsize() is only for strict disk offerings
add 9f16565 Fix deployVM flow
add 098408f Added new API params to compute offering creation
add 1d7e090 Add diskofferingstrictness to serviceoffering vo under quota
add 8cec45e Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
add ff57439 Fix User vm response to show proper service offering and disk
offerings
add 9c3aa9d Added disk size strictness in disk offering response
add afdb79f Added disk offering strictness to the service offering
response
add f773f7c Remove comments
add 5520af5 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
add dcd6e0e Added diskoffering details to the service offering response
add 55246e6 Added UI changes in deployvm wizard to accept override disk
offering id
add 9c26c70 Fix delete compute offering
add b0ba765 Fix VM deployment from custom service offering
add 2c82a70 Move uselocalstorage column access from service offering to
disk offering
add 69f4da5 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
add ce5a143 Fixed diskoffering automatic selection on add compute
offering wizard
add 1399b0f UI: move compute only toggle button outside the box in add
compute offering wizard
add 1cbb397 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
add 3632ca1 Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
add 51e81e2 Added disk offering change checks during resize volume
operation
add cf74d67 Added new API changeofferingforVolume API and corresponding
changes
add 944a0fd Add UI form for changeOfferingForVolume API
add 3f034f1 Fix UI conflicts
add 25edbe0 Fix service offering usage as disk offering
add 8c09d61 Fix unit test failures
add 8b054ea fix user_vm_view
add 479ee80 Addressed review comments
add 0ae3446 Fixed service_offering_view
add 30079ed Fix service offering edit flow
add a2deb3a Fix service offering constructor to address custom offering
add 9d3ee62 Fix domain_router_view to get proper service offering id
add 9596e76 Removed unused import
add 75688bb Addressed review comments and fixed update service offering
flow with storage tags
add 56cc870 Added marvin test cases for checking disk offering strictness
add 1a7f285 review comments addressed
add 5707a4d Remove system_use column from disk offering join
add 123f29e update volume_view to update system_use column from service
offering and not disk offering
add 380611b Fix changeOfferingForVolume API for custom disk offering
add 03b1eda Fix global setting implementation
add 531147e Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
add 38cba08 Changes for override root disk offering in deployvm wizard in
case of custom offering
add 0e41c19 Fix a unit test case
add 6022693 Fixed recent unit test cases with new serviceofferingvo
constructor
add ad1a1cb Fix unit test in VolumeApiServiceImpl
add 1050e52 Added storage id for the list disk offering API and
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add fba05fb Rename global configuration parameter from
storage.pool.tags.disk.offering.strictness to
match.storage.pool.tags.with.disk.offering
add 1359333 Fix smoke test failures
add 5dfd50c Added tool tip for migrate volume UI form
add 1c4dc1d Address review comments and fix UI form of deploy VM in case
of ISO.
add 0c46e8b Fixed resize volume UI form for data disk
add beae7f7 UI changes to disable override root disk size when override
root disk offering is enabled
add 9231871 UI fix in deploy vm wizard
add 11a42b3 Fix listdiskoffering after rebasing with main
add 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
add c87082f Added custom Iops to resize volume form and removed the
current disk offering during change offering for volume UI form
add 9604813 Fix false response on updateDiskOffering API
add cca8cc4 Added search field for changeofferingforvolume UI form
add 7e3efba Fix resize volume and migrate volume to update volume path if
DRS is applied on volume in datastore cluster
add 8b42527 Removed DB changes from 4.16 upgrade file
add 8994747 Resolving merge conflicts with main 4.17
add 541855d Added support for auto migration and auto resize of the root
volume upon changing the service offering for VM.
add 462267d UI: Added automigrate checkbox in scale VM form
add b610131 Addes since attributes to new API params
add f866342 Added shrinkOK parameter to changeofferingforvolume API
add c345f55 Added shrinkOk param to UI in changeOfferingforVolume form
add 19380b6 Added shrinkOk flag to scaleVM and
changeServiceForVirtualMachines and 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 (e920655)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering
(19380b6)
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:
api/src/main/java/com/cloud/vm/NicProfile.java | 13 +-
.../src/main/java/com/cloud/vm/VmWork.java | 7 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 1810 +++++++-------------
.../java/com/cloud/vm/VmWorkAddVmToNetwork.java | 6 +
.../src/main/java/com/cloud/vm/VmWorkMigrate.java | 27 +-
.../main/java/com/cloud/vm/VmWorkMigrateAway.java | 5 +
.../java/com/cloud/vm/VmWorkMigrateForScale.java | 5 +
.../com/cloud/vm/VmWorkMigrateWithStorage.java | 7 +
.../src/main/java/com/cloud/vm/VmWorkReboot.java | 5 +
.../main/java/com/cloud/vm/VmWorkReconfigure.java | 8 +
.../java/com/cloud/vm/VmWorkRemoveNicFromVm.java | 5 +
.../com/cloud/vm/VmWorkRemoveVmFromNetwork.java | 6 +
.../src/main/java/com/cloud/vm/VmWorkRestore.java | 5 +
.../src/main/java/com/cloud/vm/VmWorkStart.java | 4 +
.../src/main/java/com/cloud/vm/VmWorkStop.java | 5 +
.../java/com/cloud/vm/VmWorkStorageMigration.java | 7 +-
.../java/com/cloud/vm/VmWorkUpdateDefaultNic.java | 6 +
.../main/java/com/cloud/storage/VMTemplateVO.java | 10 +-
.../resources/META-INF/db/schema-41610to41700.sql | 4 +
.../java/com/cloud/agent/manager/Commands.java | 7 +
.../cloudstack/quota/QuotaAlertManagerImpl.java | 11 +-
.../quota/QuotaAlertManagerImplTest.java | 5 +-
.../java/com/cloud/alert/AlertManagerImpl.java | 70 +-
.../java/com/cloud/alert/AlertManagerImplTest.java | 99 ++
ui/src/config/section/compute.js | 2 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 17 +-
.../com/cloud/usage/UsageAlertManagerImplTest.java | 85 +
.../utils/exception/CSExceptionErrorCode.java | 1 +
.../cloudstack/utils/mailing/SMTPMailSender.java | 34 +-
.../utils/mailing/SMTPMailSenderTest.java | 64 +-
30 files changed, 1062 insertions(+), 1278 deletions(-)
create mode 100644
server/src/test/java/com/cloud/alert/AlertManagerImplTest.java
create mode 100644
usage/src/test/java/com/cloud/usage/UsageAlertManagerImplTest.java
