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 ef114bd Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
omit 93bbd91 Fix global setting implementation
omit 083b204 Fix changeOfferingForVolume API for custom disk offering
omit d77de48 update volume_view to update system_use column from service
offering and not disk offering
omit 8b94a54 Remove system_use column from disk offering join
omit e32a7a4 remove system_use column from disk_offering view
omit b6315c3 Upgrade handled with new schema changes
omit 6073e62 review comments addressed
omit 531c25e Added marvin test cases for checking disk offering strictness
omit 7f7395a Addressed review comments and fixed update service offering
flow with storage tags
omit b8c92e7 Removed unused import
omit ec5ac71 Fix domain_router_view to get proper service offering id
omit ccd55de Fix service offering constructor to address custom offering
omit 8639e2b Fix service offering edit flow
omit 550bef0 Fixed service_offering_view
omit 868f0ff Addressed review comments
omit 01e93f7 fix user_vm_view
omit fdec9f4 Fix unit test failures
omit 0eed95a Fix service offering usage as disk offering
omit 2efa23f Fix UI conflicts
omit e783146 Add UI form for changeOfferingForVolume API
omit 74257a6 Added new API changeofferingforVolume API and corresponding
changes
omit 2803671 Added disk offering change checks during resize volume
operation
omit 77eb2f6 Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
omit 6af39c0 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
omit 7ca949f UI: move compute only toggle button outside the box in add
compute offering wizard
omit c6f9341 Fixed diskoffering automatic selection on add compute
offering wizard
omit e0bdd05 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
omit 42b38ae Move uselocalstorage column access from service offering to
disk offering
omit 636c8f4 Fix VM deployment from custom service offering
omit f3ce962 Fix delete compute offering
omit e0b801b Added UI changes in deployvm wizard to accept override disk
offering id
omit 1fe96ce Added diskoffering details to the service offering response
omit 6332ab3 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
omit ec9f606 Remove comments
omit 2cc5b2f Added disk offering strictness to the service offering
response
omit 4a3a0d4 Added disk size strictness in disk offering response
omit 1db4591 Fix User vm response to show proper service offering and disk
offerings
omit 0af9473 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
omit ee3e0e1 Add diskofferingstrictness to serviceoffering vo under quota
omit 4db0811 Added new API params to compute offering creation
omit def208d Fix deployVM flow
omit 4b35038 diskoffering getsize() is only for strict disk offerings
omit c9dce30 Decouple service offering and disk offering states
omit 69592b3 Remove diskofferingid from vminstance VO
omit 34742c1 Decoupled service offering and disk offering
omit 0592efd Few more changes
omit 51248d8 Schema changes and disk offering column change from "type" to
"compute_only"
add 846efdb server: Optional destination host when migrate a vm (#4378)
add 3395a65 ui: Prevent sending default false for isdynamicallyscalable,
haenable in EditVM (#5299)
add 55174d5 add ref=submit missing in button (#5298)
add 1182051 UI: Add multiple management server support (#4885)
add 75b335e Merge branch '4.15' into main
add 6581a1b test/vmware: add live migratevmwithvolume test and fix (#5289)
add fb0dedc ui: fix display host hypervisorversion (#5301)
add 8680f7d UI: Dark mode toggle button on Management Server (#5052)
add 0011d45 Merge branch '4.15' into main
add 2a4c2c2 Global setting to select preferred storage pool (#5249)
add 2786582 Add new registers in guest_os (#4699)
add 28e70c0 Add missing labels (#5305)
add 1bfb2f9 disable hot add memory and cpu via vm settings (#4630)
add 1d17d7c Add internal cs name to vm during the ingest (#5242)
add 87ddc76 db: make *_details.value non-nullable (#5274)
add 0a2a524 vmware: get recommended disk controller only when root or
data disk controller is osdefault (#5258)
add 2215cd7 Merge branch '4.15' into main
add 349120f Externalize config to enable manually setting CPU topology on
KVM VM (#5273)
add 1c29163 appliance: compatibility fix for Packer v1.7.4, update debian
template to 10.10.0 (#5304)
add 36ae367 Merge remote-tracking branch 'origin/4.15' into main
add 0838d79 Add missing command - syncStoragePool in main branch (#5312)
add 664a46a PR multi tags in compute offering [#4398] (#4399)
add 65a48dc Add SharedMountPoint to KVMs supported storage pool types
(#4780)
add 00e014c Add sent and received bytes to listNetworks and
listVirtualMachines. (#4776)
add 873dc54 ui: Show list projects of projects to which the instance is
to be imported (#5325)
add 72182b6 ui: fix error jobid not found & console error when using
filter (#5323)
add 98d3231 Adding support for RHEL8 binary-compatible variants (#5158)
add 69a0ab6 systemvmtemplate: bump to Debian 11.0.0 systemvmtemplate
(#5317)
add 7bfc7f0 server: use id column as secondary sort criteria with sortKey
(#5320)
add 21d7854 s2svpn: Set initial state as Connecting (#5327)
add 6d98056 ui: Zone wizard - Fixes wrong add resource step with
localstorageenabled (#5303)
add 953f5b8 Merge remote-tracking branch 'origin/4.15' into main
add eec43a4 Possiblity to choose between docker and podman from the
command line (#5217)
add f176837 packaging: Adding SUSE 15 support (#5110)
add 6446797 metrics: fix hostsmetricsresponse for zero cpu, locale (#5329)
add 5ed3246 Fix iptable rules in ubuntu 20 for bridge name (#5318)
add c34a0c5 Merge remote-tracking branch 'origin/4.15' into main
add 06f3d90 ui: Update placeholders for adding new tier (#5326)
add 7fa63b3 add license header in HostMetricsResponseTest.java (#5342)
add d23a995 Merge remote-tracking branch 'origin/4.15' into main
add ee01522 Allow users to update volume name (#4618)
add 25206e4 test: Frix travis failure - test_outofbandmanagement.py
(#5346)
add c1fc002 Fix iptable rules when chain reference count is 0 (#5328)
add d841709 Merge remote-tracking branch 'origin/4.15' into main
add 4d9f178 README: update travis badge
add f9fe9da security group: fix component test
test_multiple_nic_support.py failures (#5348)
add 0390281 vr: cleanup files in /var/cache/cloud/processed every day
(#5331)
add 57a55bd Merge remote-tracking branch 'origin/4.15' into main
add 1b041ee adapt condition to use the correct letter for pvlan types
(#5194)
add 9c51009 Remove storage scope validation on KVM live migration (#5321)
add 8a16729 Support vm dynamic scaling with kvm (#4878)
add bc587b8 Schema changes and disk offering column change from "type" to
"compute_only"
add c982017 Few more changes
add 9c17272 Decoupled service offering and disk offering
add c0ba689 Remove diskofferingid from vminstance VO
add c5d1cb5 Decouple service offering and disk offering states
add a07c32a diskoffering getsize() is only for strict disk offerings
add 41b2832 Fix deployVM flow
add 09fa9ae Added new API params to compute offering creation
add 2ffd120 Add diskofferingstrictness to serviceoffering vo under quota
add 15282ae Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
add 940b2aa Fix User vm response to show proper service offering and disk
offerings
add 0ba192c Added disk size strictness in disk offering response
add 5a98e3a Added disk offering strictness to the service offering
response
add f1af2f2 Remove comments
add 17049c8 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
add 41d3c4f Added diskoffering details to the service offering response
add 70c3f22 Added UI changes in deployvm wizard to accept override disk
offering id
add b20b956 Fix delete compute offering
add 4cb3bfc Fix VM deployment from custom service offering
add 3141784 Move uselocalstorage column access from service offering to
disk offering
add e49b1ce UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
add 8f15a73 Fixed diskoffering automatic selection on add compute
offering wizard
add efafce4 UI: move compute only toggle button outside the box in add
compute offering wizard
add 0f2493a Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
add dd99bc6 Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
add f4b69ba Added disk offering change checks during resize volume
operation
add f83163b Added new API changeofferingforVolume API and corresponding
changes
add a0fa327 Add UI form for changeOfferingForVolume API
add 88a8fb2 Fix UI conflicts
add d2ca864 Fix service offering usage as disk offering
add 491eb0a Fix unit test failures
add ffc1eab fix user_vm_view
add 4b7cb85 Addressed review comments
add 65e9c45 Fixed service_offering_view
add 3fb275c Fix service offering edit flow
add 5b3f392 Fix service offering constructor to address custom offering
add 38eb0df Fix domain_router_view to get proper service offering id
add 63a613f Removed unused import
add 822dc00 Addressed review comments and fixed update service offering
flow with storage tags
add 91d0184 Added marvin test cases for checking disk offering strictness
add 2715eba review comments addressed
add 0c2d7ca Upgrade handled with new schema changes
add c0827e1 remove system_use column from disk_offering view
add e431ed3 Remove system_use column from disk offering join
add 1b5feec update volume_view to update system_use column from service
offering and not disk offering
add ba00b16 Fix changeOfferingForVolume API for custom disk offering
add 9a9cab3 Fix global setting implementation
add 3ca5e64 Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
add 326a3d8 Changes for override root disk offering in deployvm wizard in
case of custom offering
add 77f4b64 Fix a unit test case
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 (ef114bd)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering
(77f4b64)
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 +-
agent/conf/agent.properties | 3 +
.../cloud/agent/properties/AgentProperties.java | 7 +
.../com/cloud/agent/api/to/VirtualMachineTO.java | 4 +
.../com/cloud/network/Site2SiteVpnConnection.java | 2 +-
.../java/com/cloud/storage/VolumeApiService.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../command/admin/systemvm/MigrateSystemVMCmd.java | 47 +-
.../api/command/admin/vm/MigrateVMCmd.java | 43 +-
.../api/command/user/volume/UpdateVolumeCmd.java | 23 +-
.../cloudstack/api/response/NetworkResponse.java | 16 +
.../cloudstack/api/response/UserVmResponse.java | 16 +
.../apache/cloudstack/vm/UnmanagedInstanceTO.java | 10 +
.../java/com/cloud/agent/api/ScaleVmCommand.java | 3 -
.../java/com/cloud/resource/CommandWrapper.java | 2 +
.../java/com/cloud/vm/VirtualMachineManager.java | 16 -
.../java/com/cloud/storage/StorageManager.java | 3 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 47 +-
.../engine/orchestration/VolumeOrchestrator.java | 34 +-
.../src/main/java/com/cloud/host/HostVO.java | 17 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 82 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 4 +
.../resources/META-INF/db/schema-41510to41600.sql | 61 ++
.../src/test/java/com/cloud/host/HostVOTest.java | 61 ++
.../KvmNonManagedStorageDataMotionStrategy.java | 11 +-
.../motion/StorageSystemDataMotionStrategy.java | 57 +-
.../KvmNonManagedStorageSystemDataMotionTest.java | 36 +-
.../StorageSystemDataMotionStrategyTest.java | 139 ++++
packaging/{centos8 => suse15}/cloud-ipallocator.rc | 0
packaging/{centos8 => suse15}/cloud.limits | 0
packaging/{centos8 => suse15}/cloud.spec | 34 +-
packaging/{centos8 => suse15}/cloudstack-agent.te | 0
packaging/{centos8 => suse15}/cloudstack-sccs | 0
packaging/{centos8 => suse15}/replace.properties | 0
.../kvm/resource/LibvirtComputingResource.java | 78 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 61 +-
.../kvm/resource/LibvirtVmMemoryDeviceDef.java | 43 +
.../wrapper/LibvirtScaleVmCommandWrapper.java | 103 +++
.../kvm/storage/LibvirtStorageAdaptor.java | 53 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 96 ++-
.../kvm/resource/LibvirtVmMemoryDeviceDefTest.java | 41 +
.../wrapper/LibvirtScaleVmCommandWrapperTest.java | 244 ++++++
.../hypervisor/vmware/resource/VmwareResource.java | 24 +-
.../cloudstack/response/HostMetricsResponse.java | 8 +-
.../response/HostMetricsResponseTest.java | 54 ++
python/lib/cloud_utils.py | 657 ++-------------
python/lib/cloudutils/serviceConfig.py | 165 +++-
python/lib/cloudutils/syscfg.py | 19 +-
python/lib/cloudutils/utilities.py | 60 +-
scripts/vm/hypervisor/versions.sh | 16 +-
scripts/vm/network/security_group.py | 10 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 19 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 3 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 7 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 22 +
.../configuration/ConfigurationManagerImpl.java | 25 +-
.../deploy/DeploymentPlanningManagerImpl.java | 42 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 159 +++-
.../router/VirtualNetworkApplianceManagerImpl.java | 5 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 6 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 9 +-
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../java/com/cloud/storage/StorageManagerImpl.java | 3 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 25 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 144 +++-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 22 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 323 ++++++++
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 5 +
.../etc/cron.daily/clean_cloud_processed_files | 38 +-
.../debian/etc/systemd/system/baremetal-vr.service | 2 +-
systemvm/debian/opt/cloud/bin/baremetal-vr.py | 8 +-
.../component/test_multi_tag_support.py | 217 +++++
.../component/test_multiple_nic_support.py | 6 +-
test/integration/smoke/test_deploy_vm_iso_uefi.py | 10 +-
test/integration/smoke/test_hostha_kvm.py | 20 +-
test/integration/smoke/test_outofbandmanagement.py | 21 +-
test/integration/smoke/test_vm_life_cycle.py | 72 +-
test/integration/smoke/test_vpc_vpn.py | 6 +-
.../systemvmtemplate/scripts/apt_upgrade.sh | 7 +-
.../scripts/configure_systemvm_services.sh | 4 +-
.../scripts/install_systemvm_packages.sh | 15 +-
tools/appliance/systemvmtemplate/template.json | 102 ++-
tools/marvin/marvin/marvinLog.py | 2 +-
tools/marvin/marvin/marvinPlugin.py | 2 +-
ui/docker.sh | 17 +-
ui/public/config.json | 8 +
ui/public/locales/en.json | 122 +--
ui/src/App.vue | 7 +-
ui/src/assets/icons/dark.svg | 39 +
ui/src/assets/icons/light.svg | 40 +
ui/src/components/header/UserMenu.vue | 17 +
ui/src/components/page/GlobalFooter.vue | 10 -
ui/src/components/page/GlobalLayout.vue | 41 +-
ui/src/components/view/DedicateModal.vue | 2 +-
ui/src/components/view/DetailSettings.vue | 6 +-
ui/src/components/view/InfoCard.vue | 12 +-
ui/src/components/view/ListView.vue | 8 -
ui/src/components/view/ResourceLimitTab.vue | 1 +
ui/src/components/view/SearchView.vue | 6 +-
ui/src/components/view/Setting.vue | 406 +++++++++
ui/src/components/view/SettingItem.vue | 185 +++++
ui/src/components/view/TreeView.vue | 2 -
ui/src/components/widgets/Console.vue | 18 +-
ui/src/components/widgets/Drawer.vue | 170 ++++
ui/src/components/widgets/OsLogo.vue | 15 +-
ui/src/config/section/infra/secondaryStorages.js | 16 +-
ui/src/config/section/storage.js | 15 +
ui/src/layouts/UserLayout.vue | 17 +-
ui/src/main.js | 7 +-
ui/src/permission.js | 16 +-
ui/src/store/getters.js | 5 +-
ui/src/store/modules/app.js | 13 +-
ui/src/store/modules/user.js | 30 +-
ui/src/store/mutation-types.js | 3 +
ui/src/style/dark-mode.less | 904 +++++++++++++++++++++
ui/src/style/index.less | 1 +
ui/src/style/vars.less | 99 ++-
ui/src/views/auth/Login.vue | 60 +-
ui/src/views/compute/DeployVM.vue | 19 +-
ui/src/views/compute/EditVM.vue | 9 +-
ui/src/views/compute/MigrateWizard.vue | 21 +-
.../views/compute/wizard/DiskOfferingSelection.vue | 1 +
ui/src/views/compute/wizard/DiskSizeSelection.vue | 21 +
.../views/compute/wizard/NetworkConfiguration.vue | 4 +-
ui/src/views/dashboard/UsageDashboardChart.vue | 2 +-
ui/src/views/iam/AddLdapAccount.vue | 8 +
ui/src/views/infra/HostInfo.vue | 16 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 28 +-
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 2 -
ui/src/views/network/CreateIsolatedNetworkForm.vue | 1 -
ui/src/views/network/CreateL2NetworkForm.vue | 1 -
ui/src/views/network/CreateSharedNetworkForm.vue | 8 +-
ui/src/views/network/CreateVlanIpRange.vue | 1 +
ui/src/views/network/CreateVpc.vue | 2 +-
ui/src/views/network/FirewallRules.vue | 2 +-
ui/src/views/network/PortForwarding.vue | 10 +-
ui/src/views/network/VpcTiersTab.vue | 68 +-
ui/src/views/network/VpnDetails.vue | 2 +-
ui/src/views/offering/AddDiskOffering.vue | 2 +-
ui/src/views/offering/AddNetworkOffering.vue | 2 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 2 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 2 +-
ui/src/views/storage/CreateVolume.vue | 2 +-
ui/src/views/storage/FormSchedule.vue | 9 +-
ui/src/views/storage/TakeSnapshot.vue | 9 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 2 +-
.../cloudstack/utils/bytescale/ByteScaleUtils.java | 47 ++
.../utils/bytescale/ByteScaleUtilsTest.java | 51 ++
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 5 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 9 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 11 +-
151 files changed, 5277 insertions(+), 1288 deletions(-)
create mode 100755 engine/schema/src/test/java/com/cloud/host/HostVOTest.java
copy packaging/{centos8 => suse15}/cloud-ipallocator.rc (100%)
copy packaging/{centos8 => suse15}/cloud.limits (100%)
copy packaging/{centos8 => suse15}/cloud.spec (94%)
copy packaging/{centos8 => suse15}/cloudstack-agent.te (100%)
copy packaging/{centos8 => suse15}/cloudstack-sccs (100%)
copy packaging/{centos8 => suse15}/replace.properties (100%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVmMemoryDeviceDef.java
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtScaleVmCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtVmMemoryDeviceDefTest.java
create mode 100644
plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtScaleVmCommandWrapperTest.java
create mode 100644
plugins/metrics/src/test/java/org/apache/cloudstack/response/HostMetricsResponseTest.java
copy tools/marvin/marvin/misc/build/vm-uninstall.sh =>
systemvm/debian/etc/cron.daily/clean_cloud_processed_files (60%)
create mode 100755 test/integration/component/test_multi_tag_support.py
create mode 100644 ui/src/assets/icons/dark.svg
create mode 100644 ui/src/assets/icons/light.svg
create mode 100644 ui/src/components/view/Setting.vue
create mode 100644 ui/src/components/view/SettingItem.vue
create mode 100644 ui/src/components/widgets/Drawer.vue
create mode 100644 ui/src/style/dark-mode.less
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/bytescale/ByteScaleUtils.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/bytescale/ByteScaleUtilsTest.java
