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 9c0e838 Fixed service_offering_view
discard 61aa647 Addressed review comments
discard 09e0f3c fix user_vm_view
discard b3c1ce9 Fix unit test failures
discard e87ab92 Fix service offering usage as disk offering
discard 58b64d8 Fix UI conflicts
discard 7e68912 Add UI form for changeOfferingForVolume API
discard 5f0f690 Added new API changeofferingforVolume API and corresponding
changes
discard ce963a8 Added disk offering change checks during resize volume
operation
discard 524860c Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
discard 16e4754 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
discard 6648810 UI: move compute only toggle button outside the box in add
compute offering wizard
discard 180dbb3 Fixed diskoffering automatic selection on add compute
offering wizard
discard 07c7ea0 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
discard d20c28b Move uselocalstorage column access from service offering to
disk offering
discard 8cb9a64 Fix VM deployment from custom service offering
discard 2ca0958 Fix delete compute offering
discard 0f114b4 Added UI changes in deployvm wizard to accept override disk
offering id
discard 151af11 Added diskoffering details to the service offering response
discard f799abf Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
discard 6b6de21 Remove comments
discard 24dd93a Added disk offering strictness to the service offering
response
discard 2bb2a44 Added disk size strictness in disk offering response
discard a3cb7ee Fix User vm response to show proper service offering and disk
offerings
discard 5bd56e2 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
discard 46d2df8 Add diskofferingstrictness to serviceoffering vo under quota
discard 45a8cfb Added new API params to compute offering creation
discard d9f0a16 Fix deployVM flow
discard 8af7dda diskoffering getsize() is only for strict disk offerings
discard 185ca73 Decouple service offering and disk offering states
discard 3902557 Remove diskofferingid from vminstance VO
discard 3c13458 Decoupled service offering and disk offering
discard 78d49f0 Few more changes
discard 0d1adf5 Schema changes and disk offering column change from "type" to
"compute_only"
add 75a2c0b Add YouTube channel link in the README (#5272)
add d8c407d ui: Add 'on / off' to status icon and make it case
insensitive (#5278)
add b6350be Merge branch '4.15' into main
add f9fbd86 ui: Fix failure in deletion of templates (#5283)
add f421a96 ui: fix handle action response (#5285)
add 43c8da2 API-call to declare host as Degraded (#4111)
add 1389862 engine/storage: Fix regression on create volume from snapshot
(#5282)
add 95de827 server: Fix migration issue in
UserVmManagerImpl.migrateVirtualMachineWithVolume (#5288)
add 2f8d557f api: Change GET/POST request max length of VM user data to
4K/1M (#4737)
add 949cf71 api: Display last updated time for VM (#4685)
add ea7d3b3 Cleanup volume information from db when deleted (#4551)
add 3c8c704 kubernetes: Deploy kubernetes-provider when creating a
cluster (#5254)
add 766fc80 ui: fix capitalise filter (#5269)
add ee5b01f ui: Show host as unsecure in listview (#5292)
add 05d1d56 vr: restart conntrackd instead of '/usr/sbin/conntrackd -d'
(#5275)
add d9503f4 UI - Zone Wizard - Fixes the IP range form fields are too
narrow (#5287)
add 1ccb420 server: skip zone check for PERHOST iso during attachIso
(#5270)
add cb1078a Merge remote-tracking branch 'apache/4.15' into main
add d5015d7 ui: Prettify ManageInstances.vue (#5295)
add 51248d8 Schema changes and disk offering column change from "type" to
"compute_only"
add 0592efd Few more changes
add 34742c1 Decoupled service offering and disk offering
add 69592b3 Remove diskofferingid from vminstance VO
add c9dce30 Decouple service offering and disk offering states
add 4b35038 diskoffering getsize() is only for strict disk offerings
add def208d Fix deployVM flow
add 4db0811 Added new API params to compute offering creation
add ee3e0e1 Add diskofferingstrictness to serviceoffering vo under quota
add 0af9473 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
add 1db4591 Fix User vm response to show proper service offering and disk
offerings
add 4a3a0d4 Added disk size strictness in disk offering response
add 2cc5b2f Added disk offering strictness to the service offering
response
add ec9f606 Remove comments
add 6332ab3 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
add 1fe96ce Added diskoffering details to the service offering response
add e0b801b Added UI changes in deployvm wizard to accept override disk
offering id
add f3ce962 Fix delete compute offering
add 636c8f4 Fix VM deployment from custom service offering
add 42b38ae Move uselocalstorage column access from service offering to
disk offering
add e0bdd05 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
add c6f9341 Fixed diskoffering automatic selection on add compute
offering wizard
add 7ca949f UI: move compute only toggle button outside the box in add
compute offering wizard
add 6af39c0 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
add 77eb2f6 Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
add 2803671 Added disk offering change checks during resize volume
operation
add 74257a6 Added new API changeofferingforVolume API and corresponding
changes
add e783146 Add UI form for changeOfferingForVolume API
add 2efa23f Fix UI conflicts
add 0eed95a Fix service offering usage as disk offering
add fdec9f4 Fix unit test failures
add 01e93f7 fix user_vm_view
add 868f0ff Addressed review comments
add 550bef0 Fixed service_offering_view
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 (9c0e838)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering
(550bef0)
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 | 1 +
api/src/main/java/com/cloud/event/EventTypes.java | 4 +
.../java/com/cloud/resource/ResourceService.java | 8 +-
.../java/com/cloud/resource/ResourceState.java | 12 ++-
.../main/java/com/cloud/user/AccountService.java | 2 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
...enanceCmd.java => CancelHostAsDegradedCmd.java} | 58 +++++-----
...nanceCmd.java => DeclareHostAsDegradedCmd.java} | 58 +++++-----
.../api/command/user/vm/DeployVMCmd.java | 4 +-
.../api/command/user/vm/UpdateVMCmd.java | 9 +-
.../cloudstack/api/response/UserVmResponse.java | 12 +++
.../java/com/cloud/template/TemplateManager.java | 9 +-
.../src/main/java/com/cloud/vm/UserVmVO.java | 2 +-
.../storage/datastore/db/VolumeDataStoreDao.java | 2 +
.../resources/META-INF/db/schema-41510to41600.sql | 1 +
.../storage/motion/AncientDataMotionStrategy.java | 20 +++-
.../allocator/AbstractStoragePoolAllocator.java | 5 +
.../storage/image/db/VolumeDataStoreDaoImpl.java | 12 ++-
.../hypervisor/vmware/VmwareServerDiscoverer.java | 9 +-
.../hypervisor/vmware/resource/VmwareResource.java | 3 +-
.../storage/resource/VmwareStorageProcessor.java | 3 +-
.../xenserver/discoverer/XcpServerDiscoverer.java | 3 +-
.../xenserver/resource/CitrixResourceBase.java | 17 ++-
.../discoverer/XcpServerDiscovererTest.java | 9 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 9 +-
.../cluster/KubernetesClusterManagerImpl.java | 51 ++++++++-
.../cluster/KubernetesClusterService.java | 1 +
.../KubernetesClusterActionWorker.java | 119 +++++++++++++++++++++
.../KubernetesClusterStartWorker.java | 1 +
.../KubernetesClusterUpgradeWorker.java | 6 +-
.../main/resources/conf/k8s-control-node-add.yml | 4 +
.../src/main/resources/conf/k8s-control-node.yml | 4 +
.../src/main/resources/conf/k8s-node.yml | 4 +
.../main/resources/script/deploy-cloudstack-secret | 68 ++++++++++++
.../src/main/resources/script/deploy-provider | 35 +++---
.../main/resources/script/upgrade-kubernetes.sh | 4 +
.../cloudstack/metrics/MetricsServiceImpl.java | 1 +
.../contrail/management/MockAccountManager.java | 6 ++
scripts/util/create-kubernetes-binaries-iso.sh | 8 ++
.../java/com/cloud/api/query/QueryManagerImpl.java | 4 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 17 ++-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 7 ++
.../configuration/ConfigurationManagerImpl.java | 13 ++-
.../com/cloud/resource/ResourceManagerImpl.java | 96 ++++++++++++++++-
.../com/cloud/server/ManagementServerImpl.java | 4 +
.../java/com/cloud/storage/StorageManagerImpl.java | 1 +
.../com/cloud/template/TemplateManagerImpl.java | 16 +--
.../java/com/cloud/user/AccountManagerImpl.java | 4 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 15 ++-
.../OutOfBandManagementServiceImpl.java | 8 ++
.../api/query/dao/TemplateJoinDaoImplTest.java | 17 +--
.../cloud/resource/MockResourceManagerImpl.java | 13 +++
.../cloud/resource/ResourceManagerImplTest.java | 96 +++++++++++++++++
.../com/cloud/user/MockAccountManagerImpl.java | 5 +
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 3 +-
test/integration/smoke/test_kubernetes_clusters.py | 8 +-
ui/public/locales/en.json | 3 +-
ui/src/components/view/InfoCard.vue | 6 ++
ui/src/components/view/ListView.vue | 11 +-
ui/src/components/widgets/Status.vue | 105 +++++++++---------
ui/src/views/AutogenView.vue | 16 +--
ui/src/views/image/TemplateZones.vue | 3 +
ui/src/views/infra/zone/IpAddressRangeForm.vue | 51 +++++----
ui/src/views/network/AclListRulesTab.vue | 1 -
ui/src/views/network/EgressRulesTab.vue | 7 +-
ui/src/views/network/FirewallRules.vue | 12 +--
.../views/network/IngressEgressRuleConfigure.vue | 7 +-
ui/src/views/network/LoadBalancing.vue | 12 +--
ui/src/views/network/PortForwarding.vue | 12 +--
ui/src/views/tools/ManageInstances.vue | 119 +++++++++++----------
71 files changed, 963 insertions(+), 315 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/host/{CancelMaintenanceCmd.java
=> CancelHostAsDegradedCmd.java} (63%)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/host/{CancelMaintenanceCmd.java
=> DeclareHostAsDegradedCmd.java} (61%)
create mode 100755
plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret
copy test/scripts/script_lock_test/test_task.sh =>
plugins/integrations/kubernetes-service/src/main/resources/script/deploy-provider
(55%)
