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/07 06:11:15 UTC
[cloudstack] branch decoupleServiceOfferingDiskOffering updated
(93030fc -> dc87f6c)
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 93030fc Fixed resize volume UI form for data disk
omit 2cc48e1 Address review comments and fix UI form of deploy VM in case of ISO.
omit 59a3f9d Added tool tip for migrate volume UI form
omit 3386daa Fix smoke test failures
omit 597877c Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
omit 34c1e90 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
omit 9a146d1 Fix unit test in VolumeApiServiceImpl
omit ee455a0 Fixed recent unit test cases with new serviceofferingvo constructor
omit a5746d7 Fix a unit test case
omit b803db8 Changes for override root disk offering in deployvm wizard in case of custom offering
omit 974c33c Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
omit 974da76 Fix global setting implementation
omit c8a6da7 Fix changeOfferingForVolume API for custom disk offering
omit a3d8c84 update volume_view to update system_use column from service offering and not disk offering
omit 639cb41 Remove system_use column from disk offering join
omit 8e9fd95 remove system_use column from disk_offering view
omit 765deee Upgrade handled with new schema changes
omit d422b1d review comments addressed
omit 54216af Added marvin test cases for checking disk offering strictness
omit 8ed5f59 Addressed review comments and fixed update service offering flow with storage tags
omit a15598e Removed unused import
omit 3609d4c Fix domain_router_view to get proper service offering id
omit a7dfd0f Fix service offering constructor to address custom offering
omit cdadf30 Fix service offering edit flow
omit 03406a6 Fixed service_offering_view
omit 1a8e74e Addressed review comments
omit 9abc7de fix user_vm_view
omit 346ea9e Fix unit test failures
omit 95ef3ce Fix service offering usage as disk offering
omit 8e9eef3 Fix UI conflicts
omit dbc4958 Add UI form for changeOfferingForVolume API
omit 6d4a74b Added new API changeofferingforVolume API and corresponding changes
omit 80f613c Added disk offering change checks during resize volume operation
omit ad8e074 Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
omit 95f3086 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
omit 1bbf4cd UI: move compute only toggle button outside the box in add compute offering wizard
omit cfa824b Fixed diskoffering automatic selection on add compute offering wizard
omit 0a9ff2d UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
omit a9855dc Move uselocalstorage column access from service offering to disk offering
omit 2c97fe8 Fix VM deployment from custom service offering
omit 1f83f45 Fix delete compute offering
omit e6f617a Added UI changes in deployvm wizard to accept override disk offering id
omit 37ca437 Added diskoffering details to the service offering response
omit c45bedd Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
omit 659d725 Remove comments
omit 2a6c930 Added disk offering strictness to the service offering response
omit 8f62f56 Added disk size strictness in disk offering response
omit dbe51d9 Fix User vm response to show proper service offering and disk offerings
omit 7b99251 Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
omit 9e54b18 Add diskofferingstrictness to serviceoffering vo under quota
omit ce901a2 Added new API params to compute offering creation
omit 57ccec1 Fix deployVM flow
omit bba93f7 diskoffering getsize() is only for strict disk offerings
omit 123d767 Decouple service offering and disk offering states
omit 321c426 Remove diskofferingid from vminstance VO
omit 130b4a8 Decoupled service offering and disk offering
omit 067ffcf Few more changes
omit fd1cf54 Schema changes and disk offering column change from "type" to "compute_only"
add 5837f90 engine/schema: Use same upgrade path as 4.15.1-4.16.0 as for 4.15.2 (#5385)
add 14323c9 updated maven dependency due to #5363 (#5366)
add 961e85e Fix of creating volumes from snapshots without backup to secondary storage (#5349)
add a1a3aff Merge remote-tracking branch 'origin/4.15' into main
add 76d5ce3 allow cert renewal even if auth strictness is false (#4852)
add 37761c6 travis: fix consistent failures noticed on few tests (#5399)
add 571a361 tests: component test ports/fixes in python3 (#5082)
add 73cabcd xcp-ng: allow passing vm boot options (#5335)
add 4e53997 server: do not remove volume from DB if fail to expunge it from primary storage or secondary storage (#5373)
add aec034b ui: Refresh page on deployvm result (#5393)
add ea2cd07 UI - Scale VM - Fix compute offering selection not working (#5392)
add 8998479 vmware: check checksum before copying systemvm ISO to decide if it is needed (#5380)
add 557dc5e api: List details of template download state for stores corresponding to a zone (#5379)
add fc285e2 vmware: Cancel the pending tasks for worker VM before destroying it (#5374)
add 989a468 vr: ipsec/l2tp vpn secret with no ID selectors (#5375)
add 70f2420 router: Use source IP from subnet for snat (#5376)
add 56f4da6 Merge remote-tracking branch 'apache/4.15' into main
add e507b57 Add 4.15.2 schema and upgrade path (#5403)
add eb64141 Merge branch '4.15' into main
add 2297c73 vmware: delete snapshot disk after backup to secondary storage (#5333)
add cf6dc66 server: check server capacity when start/deploy a vm (#5339)
add 4de3542 Merge branch '4.15' into main
add a5e7e08 Filter disk / service offerings by domain at DB level (#5307)
add 13d8489 Merge branch '4.15' into main
add 7a7e449 usage: fix backup usage (#5259)
add 0bc6e05 ui: Honour default.ui.page.size (#5394)
add b2fd1f6 server: Allow public templates with no url to be migrated (#5404)
add a000361 Merge remote-tracking branch 'apache/4.15' into main
add 1ed828b CLOUDSTACK-10436:remind users to use correct permission for tmp dir and fixed an NPE (#5066)
add 01683ca Legacy UI: Display Accounts Tab to Project Admins (#5408)
add f564597 api, ui: fix NPE with deployVirtualMachine when null boottype (#5387)
add d1db7f4 Merge remote-tracking branch 'origin/4.15' into main
add ff4b49b UI: Add router links to notifications and show error description (#5402)
add 27a65b4 Schema changes and disk offering column change from "type" to "compute_only"
add 6dc7a6a Few more changes
add cd28895 Decoupled service offering and disk offering
add 7a99940 Remove diskofferingid from vminstance VO
add 84d28c7 Decouple service offering and disk offering states
add d9e7e4d diskoffering getsize() is only for strict disk offerings
add f793491 Fix deployVM flow
add af1a1b5 Added new API params to compute offering creation
add 84f1060 Add diskofferingstrictness to serviceoffering vo under quota
add 25a2138 Added overrideDiskOfferingId parameter in deploy VM API which will override disk offering for the root disk both in template and ISO case
add 40210e2 Fix User vm response to show proper service offering and disk offerings
add 8942204 Added disk size strictness in disk offering response
add 915c5e5 Added disk offering strictness to the service offering response
add ad69d4d Remove comments
add 3793821 Added UI changes for Disk offering strictness in add compute offering form and Disk size strictness in add disk offering form
add ff9dfe8 Added diskoffering details to the service offering response
add f886c5b Added UI changes in deployvm wizard to accept override disk offering id
add d3d8028 Fix delete compute offering
add 42dffb9 Fix VM deployment from custom service offering
add 423eed6 Move uselocalstorage column access from service offering to disk offering
add f4b6149 UI: Separated compute and disk releated parameters in add compute offering wizard, also added association to disk offering
add 22be99f Fixed diskoffering automatic selection on add compute offering wizard
add 02ac1c5 UI: move compute only toggle button outside the box in add compute offering wizard
add c7424d8 Added volumeId parameter to listDiskOfferings API and the disksizestrictness flag of the current disk offering is honored while list disk offerings
add 6bf376e Added configuration parameter to decide whether to check volume tags on the destination storagepool during migration
add e30f4f9 Added disk offering change checks during resize volume operation
add fd327a2 Added new API changeofferingforVolume API and corresponding changes
add 7b7b41f Add UI form for changeOfferingForVolume API
add 2fb10ef Fix UI conflicts
add a02f11c Fix service offering usage as disk offering
add a2e32bd Fix unit test failures
add ed184a9 fix user_vm_view
add 999f01c Addressed review comments
add 2632093 Fixed service_offering_view
add 67086bf Fix service offering edit flow
add 77d353c Fix service offering constructor to address custom offering
add f8e33a1 Fix domain_router_view to get proper service offering id
add 8acaca0 Removed unused import
add d922aad Addressed review comments and fixed update service offering flow with storage tags
add e16decc Added marvin test cases for checking disk offering strictness
add 44a1905 review comments addressed
add 8322751 Upgrade handled with new schema changes
add e891ea7 remove system_use column from disk_offering view
add 232d8bb Remove system_use column from disk offering join
add 4f4068a update volume_view to update system_use column from service offering and not disk offering
add d6a635f Fix changeOfferingForVolume API for custom disk offering
add 732606c Fix global setting implementation
add 1c652c5 Fix list volumes, after changing system_use column from disk offering to service offering in volume_view
add d679cb1 Changes for override root disk offering in deployvm wizard in case of custom offering
add 8c97159 Fix a unit test case
add c062058 Fixed recent unit test cases with new serviceofferingvo constructor
add a576b01 Fix unit test in VolumeApiServiceImpl
add 190bd59 Added storage id for the list disk offering API and corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add 82e6eb6 Rename global configuration parameter from storage.pool.tags.disk.offering.strictness to match.storage.pool.tags.with.disk.offering
add e022b4d Fix smoke test failures
add a4fe63a Added tool tip for migrate volume UI form
add 6223974 Address review comments and fix UI form of deploy VM in case of ISO.
add 11eb652 Fixed resize volume UI form for data disk
add 764d8ad UI changes to disable override root disk size when override root disk offering is enabled
add dc87f6c UI fix in deploy vm wizard
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 (93030fc)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering (dc87f6c)
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/command/user/vm/DeployVMCmd.java | 21 +-
.../java/com/cloud/storage/JavaStorageLayer.java | 26 +-
.../main/java/com/cloud/storage/StorageLayer.java | 2 +-
.../engine/orchestration/DataMigrationUtility.java | 3 +-
.../engine/orchestration/VolumeOrchestrator.java | 32 +-
.../service/dao/ServiceOfferingDetailsDao.java | 4 +-
.../service/dao/ServiceOfferingDetailsDaoImpl.java | 7 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 6 +-
...grade221to222.java => Upgrade41510to41520.java} | 39 +-
...e41510to41600.java => Upgrade41520to41600.java} | 10 +-
.../resourcedetail/ResourceDetailsDao.java | 1 +
.../resourcedetail/ResourceDetailsDaoBase.java | 19 +
.../resourcedetail/dao/DiskOfferingDetailsDao.java | 4 +-
.../dao/DiskOfferingDetailsDaoImpl.java | 10 +-
.../storage/datastore/db/SnapshotDataStoreDao.java | 2 +
.../storage/datastore/db/TemplateDataStoreDao.java | 2 +-
...cleanup.sql => schema-41510to41520-cleanup.sql} | 2 +-
...to41510-cleanup.sql => schema-41510to41520.sql} | 3 +-
...cleanup.sql => schema-41520to41600-cleanup.sql} | 2 +-
...ma-41510to41600.sql => schema-41520to41600.sql} | 2 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 2 +-
.../storage/image/db/SnapshotDataStoreDaoImpl.java | 10 +
.../storage/image/db/TemplateDataStoreDaoImpl.java | 4 +-
.../ca/provider/RootCACustomTrustManager.java | 51 +-
.../cloudstack/ca/provider/RootCAProvider.java | 9 +-
.../ca/provider/RootCACustomTrustManagerTest.java | 37 +-
.../cloudstack/ca/provider/RootCAProviderTest.java | 3 +-
.../kvm/storage/KVMStorageProcessor.java | 154 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 8 +-
.../vmware/manager/VmwareManagerImpl.java | 114 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 15 +-
.../hypervisor/vmware/resource/VmwareResource.java | 4 +-
.../storage/resource/VmwareStorageProcessor.java | 54 +-
plugins/hypervisors/xenserver/pom.xml | 5 +
.../xenserver/discoverer/XcpServerDiscoverer.java | 15 +
.../xenserver/resource/CitrixResourceBase.java | 24 +
.../discoverer/XcpServerDiscovererTest.java | 22 +
.../CloudStackPrimaryDataStoreDriverImpl.java | 36 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 177 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 -
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 11 +-
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 34 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 22 +-
systemvm/debian/opt/cloud/bin/configure.py | 4 +-
.../maint/test_escalation_templates.py | 7 +-
.../maint/test_escalations_hosts.py | 0
.../maint/test_ha_pool_maintenance.py | 0
.../maint/test_vpc_host_maintenance.py | 0
.../maint/test_vpc_on_host_maintenance.py | 18 +-
.../maint/test_zone_level_local_storage_setting.py | 0
.../test_escalation_listTemplateDomainAdmin.py | 0
.../test_escalations_vpncustomergateways.py | 0
.../test_ps_resource_limits_volume.py | 0
.../test_ss_project_limits.py | 0
test/integration/broken/test_vpc_vm_life_cycle.py | 792 +++++++
.../{component => broken}/test_vpn_service.py | 0
.../{component => broken}/test_vr_metadata.py | 0
test/integration/component/maint/test_bugs.py | 7 +-
.../component/maint/test_redundant_router.py | 3 +-
.../test_redundant_router_deployment_planning.py | 6 +-
.../component/test_add_remove_network.py | 211 +-
test/integration/component/test_affinity_groups.py | 6 +-
.../component/test_base_image_updation.py | 27 +-
.../integration/component/test_browse_templates.py | 53 +-
test/integration/component/test_browse_volumes.py | 2187 ++++++++++----------
test/integration/component/test_configdrive.py | 42 +-
.../component/test_deploy_vm_userdata_reg.py | 29 +-
test/integration/component/test_egress_fw_rules.py | 85 +-
.../component/test_escalations_networks.py | 66 +-
.../component/test_escalations_templates.py | 11 +-
.../component/test_escalations_vmware.py | 12 +-
.../component/test_escalations_volumes.py | 6 +-
test/integration/component/test_lb_secondary_ip.py | 135 +-
.../component/test_multiple_ips_per_nic.py | 55 +-
.../component/test_multiple_nic_support.py | 39 +-
.../component/test_multiple_public_interfaces.py | 499 ++---
.../component/test_organization_states.py | 12 +-
.../component/test_persistent_networks.py | 6 +-
test/integration/component/test_portable_ip.py | 3 +-
.../integration/component/test_ps_domain_limits.py | 71 +-
test/integration/component/test_ps_limits.py | 58 +-
.../integration/component/test_ps_resize_volume.py | 29 +-
.../component/test_redundant_router_cleanups.py | 3 +-
.../component/test_rootvolume_resize.py | 6 +-
test/integration/component/test_shared_networks.py | 3 +-
test/integration/component/test_snapshots.py | 126 +-
.../integration/component/test_ss_domain_limits.py | 208 +-
test/integration/component/test_ss_limits.py | 11 +-
test/integration/component/test_ss_max_limits.py | 31 +-
test/integration/component/test_stopped_vm.py | 39 +-
.../component/test_volume_destroy_recover.py | 43 +-
test/integration/component/test_volumes.py | 338 ++-
test/integration/component/test_vpc_network.py | 137 +-
.../component/test_vpc_network_internal_lbrules.py | 9 +-
.../component/test_vpc_network_lbrules.py | 181 +-
.../component/test_vpc_network_pfrules.py | 301 +--
.../component/test_vpc_network_staticnatrule.py | 657 +++---
test/integration/component/test_vpc_offerings.py | 3 +-
.../component/test_vpc_vm_life_cycle.py | 776 +------
.../component/test_vpc_vms_deployment.py | 76 +-
tools/marvin/marvin/cloudstackTestCase.py | 161 +-
tools/marvin/marvin/config/test_data.py | 10 +
tools/marvin/marvin/lib/base.py | 1 +
tools/marvin/marvin/lib/common.py | 4 +-
tools/marvin/marvin/lib/utils.py | 7 +-
ui/src/components/header/HeaderNotice.vue | 9 +-
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 13 +-
ui/src/utils/plugins.js | 27 +-
ui/src/views/AutogenView.vue | 35 +-
ui/src/views/compute/DeployVM.vue | 86 +-
ui/src/views/compute/ScaleVM.vue | 14 +-
ui/src/views/compute/StartVirtualMachine.vue | 3 -
ui/src/views/compute/wizard/ComputeSelection.vue | 10 +-
.../com/cloud/usage/parser/BackupUsageParser.java | 68 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 3 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 35 +-
.../cloud/hypervisor/vmware/util/VmwareClient.java | 52 +
121 files changed, 4456 insertions(+), 4530 deletions(-)
copy engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade221to222.java => Upgrade41510to41520.java} (86%)
rename engine/schema/src/main/java/com/cloud/upgrade/dao/{Upgrade41510to41600.java => Upgrade41520to41600.java} (97%)
copy engine/schema/src/main/resources/META-INF/db/{schema-41510to41600-cleanup.sql => schema-41510to41520-cleanup.sql} (93%)
copy engine/schema/src/main/resources/META-INF/db/{schema-41500to41510-cleanup.sql => schema-41510to41520.sql} (84%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41510to41600-cleanup.sql => schema-41520to41600-cleanup.sql} (93%)
rename engine/schema/src/main/resources/META-INF/db/{schema-41510to41600.sql => schema-41520to41600.sql} (99%)
rename test/integration/{component => broken}/maint/test_escalation_templates.py (98%)
rename test/integration/{component => broken}/maint/test_escalations_hosts.py (100%)
rename test/integration/{component => broken}/maint/test_ha_pool_maintenance.py (100%)
rename test/integration/{component => broken}/maint/test_vpc_host_maintenance.py (100%)
rename test/integration/{component => broken}/maint/test_vpc_on_host_maintenance.py (93%)
rename test/integration/{component => broken}/maint/test_zone_level_local_storage_setting.py (100%)
rename test/integration/{component => broken}/test_escalation_listTemplateDomainAdmin.py (100%)
rename test/integration/{component => broken}/test_escalations_vpncustomergateways.py (100%)
rename test/integration/{component => broken}/test_ps_resource_limits_volume.py (100%)
rename test/integration/{component => broken}/test_ss_project_limits.py (100%)
create mode 100644 test/integration/broken/test_vpc_vm_life_cycle.py
rename test/integration/{component => broken}/test_vpn_service.py (100%)
rename test/integration/{component => broken}/test_vr_metadata.py (100%)