This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch dummy
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit f854aea8225 donot merge
add 525c2c6fe93 Show in which primary storage volumes are allocated in
instance details page and volume migration pop-ups (#8835)
add 3321971adc1 UI: Update AddAccountOrUserToProject to show a drop down
for account & user (#9072)
add fcca3e8f391 api,server: encryptformat in volume response (#9106)
add 7aacbcb559e api: listApis should return params based on caller (#8973)
add 4bd0b1c24f1 ui: refactor global createmenu (#9139)
add 43ab8a93674 cks,ui: fix npe and check for disable zone (#9105)
add acae5c5b9eb kvm: Update the java doc for the method
disconnectPhysicalDiskByPath (#9210)
add 6edcf32c5ee Fix vsphere storage policy when compute offering uses the
disk offering attached to it (#9203)
add 2e3f76ec031 Improve error messaging / logs when listing VMs on the
remote KVM host (for import) (#9204)
add edf7394919f server: search template name and display text if keyword
is passed (#9215)
add ca597200156 vpc,event: fix events for createVpc (#9055)
add 15772189990 server,event: fix events for storage maintenance (#9056)
add 4ec0f823cf3 ScaleIO volume live migration - use usable bytes from
source disk to format the destination disk (#9174)
add 0f770194df7 Configure config drive ISO with password file on
reinstallation of VM with password-enabled template (#9113)
add 503ae64a3db Upload volume format check with the supported hypervisor,
fail if supported hypervisor not found on zone (#9224)
add 4de975ff252 list by isEncrypted (#8643)
add c756e4370ad List volumes by service offering id (#9211)
add 10dc5ad7744 ui; fix admin dashboard vue warnings (#9140)
add e2e46e31087 ui: fix dashboard on saml user login (#9097)
add 5c749eced26 logging: httpupload do not warn with exception trace
(#9220)
add b2ef53b8a2d kvm: replace ISO path in vm XML configuration during vm
migration (#9212)
add 6fe835e1183 Merge branch '4.19'
add cb48202b348 fix build error LibvirtGetVolumeStatCommandWrapper
add 1cf1786ebb8 [Quota] Add API to list preset variables (#8372)
add 8221be3a8ce Fix marvin package version while building packages (#9230)
add 78ace3a750c saml: introduce saml2.check.signature (#9219)
add f45267174a1 ui: list only accessible networks during import (#9194)
add 0f8a839a1d9 engine/schema: force index in user_vm_view to speed up VM
instance listing (#9198)
add b3c3f917186 api: add to cpu speed parameter a description of the
cgroup2 case (#9191)
add 517cddcb15c Fix error message if specific host does not have capacity
(#9218)
add 2fef0a32bc8 cks: fix list apis response count (#8701)
add abbc61c01ec engine-orchestration: expunge destroyed system vm volume
(#9197)
add 19e9020c9bb ui: fix dashboard retrievals based on permissions (#9237)
add 034a5c84662 linstor: ui show Server and resource-group fields with
custom protocol (#9138)
add 37f4398c80e linstor: Support VM-Instance Disk snapshots (#8796)
add 74f5e52e6ea Fix unit test failure (#9238)
add 2ca0857bd59 api: listVM API improvement followup, change returning of
stats detail (#9177)
add 6ce2a58f9bc ui: improve sort utility for metrics (#9247)
add df5c5465594 server: remove username required condition for
listVmsForImport (#9124)
add ce9b2c52f32 cks: fix events (#9070)
add 8d02e5f808c test: fix test/integration/smoke/test_register_userdata.py
which caused networks not to be deleted (#9244)
add cb9b3134f7f Merge branch '4.19'
add 24d56589c97 donot merge
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 (f854aea8225)
\
N -- N -- N refs/heads/dummy (24d56589c97)
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/event/EventTypes.java | 6 +-
...terHelper.java => KubernetesServiceHelper.java} | 2 +-
.../java/com/cloud/network/NetworkService.java | 5 +
.../java/com/cloud/network/vpc/VpcService.java | 2 +
api/src/main/java/com/cloud/vm/UserVmService.java | 27 +-
.../cloudstack/api/ApiCommandResourceType.java | 15 +-
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/offering/CreateServiceOfferingCmd.java | 6 +-
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 4 +-
.../api/command/user/volume/ListVolumesCmd.java | 18 +
.../api/command/user/vpc/CreateVPCCmd.java | 6 +-
.../cloudstack/api/response/VolumeResponse.java | 12 +-
.../org/apache/cloudstack/query/QueryService.java | 5 +-
.../api/command/user/vpc/CreateVPCCmdTest.java | 5 +-
...meStatsAnswer.java => GetVolumeStatAnswer.java} | 42 ++-
...StatsCommand.java => GetVolumeStatCommand.java} | 25 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 9 +
.../core/spring-core-registry-core-context.xml | 2 +-
...re-lifecycle-kubernetes-context-inheritable.xml | 4 +-
.../engine/orchestration/VolumeOrchestrator.java | 5 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 3 +-
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 1 -
.../storage/datastore/db/ImageStoreDaoImpl.java | 2 +-
.../META-INF/db/schema-41900to41910-cleanup.sql | 4 +
.../META-INF/db/views/cloud.user_vm_view.sql | 2 +-
.../META-INF/db/views/cloud.volume_view.sql | 1 +
.../activationrule/presetvariables/Account.java | 4 +-
.../presetvariables/BackupOffering.java | 1 +
.../presetvariables/ComputeOffering.java | 1 +
.../presetvariables/ComputingResources.java | 5 +
.../activationrule/presetvariables/Domain.java | 1 +
.../presetvariables/GenericPresetVariable.java | 4 +
.../quota/activationrule/presetvariables/Host.java | 2 +
.../presetvariables/PresetVariableDefinition.java} | 24 +-
.../presetvariables/PresetVariables.java | 11 +
.../quota/activationrule/presetvariables/Role.java | 1 +
.../activationrule/presetvariables/Storage.java | 4 +
.../activationrule/presetvariables/Value.java | 50 +++
.../cloudstack/quota/constant/QuotaTypes.java | 10 +
.../activationrule/presetvariables/ValueTest.java | 14 +
.../api/command/QuotaPresetVariablesListCmd.java | 66 ++++
....java => QuotaPresetVariablesItemResponse.java} | 29 +-
.../api/response/QuotaResponseBuilder.java | 8 +
.../api/response/QuotaResponseBuilderImpl.java | 128 +++++++
.../apache/cloudstack/quota/QuotaServiceImpl.java | 2 +
.../api/response/QuotaResponseBuilderImplTest.java | 45 ++-
.../wrapper/LibvirtGetRemoteVmsCommandWrapper.java | 26 +-
.../LibvirtGetVolumeStatCommandWrapper.java | 63 ++++
.../wrapper/LibvirtMigrateCommandWrapper.java | 86 +++++
.../LibvirtMigrateVolumeCommandWrapper.java | 23 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 3 +
.../kvm/storage/KVMStorageProcessor.java | 2 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 15 +-
.../hypervisor/kvm/storage/ScaleIOStoragePool.java | 5 +
.../hypervisor/kvm/storage/StorageAdaptor.java | 18 +-
.../LibvirtConvertInstanceCommandWrapperTest.java | 1 +
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 12 +
.../cluster/KubernetesClusterManagerImpl.java | 110 ++++--
.../cluster/KubernetesClusterService.java | 5 +-
...rImpl.java => KubernetesServiceHelperImpl.java} | 58 +++-
.../KubernetesClusterActionWorker.java | 14 +-
.../KubernetesClusterDestroyWorker.java | 6 +
...ernetesClusterResourceModifierActionWorker.java | 70 ++--
.../KubernetesClusterScaleWorker.java | 11 +-
.../actionworkers/KubernetesClusterStopWorker.java | 6 +
.../version/KubernetesVersionManagerImpl.java | 65 ++--
.../version/AddKubernetesSupportedVersionCmd.java | 6 +
.../DeleteKubernetesSupportedVersionCmd.java | 6 +
.../UpdateKubernetesSupportedVersionCmd.java | 14 +-
.../cluster/CreateKubernetesClusterCmd.java | 11 +-
.../cluster/DeleteKubernetesClusterCmd.java | 11 +
...oveVirtualMachinesFromKubernetesClusterCmd.java | 6 +
.../cluster/ScaleKubernetesClusterCmd.java | 6 +
.../cluster/StartKubernetesClusterCmd.java | 28 +-
.../cluster/StopKubernetesClusterCmd.java | 6 +
.../cluster/UpgradeKubernetesClusterCmd.java | 6 +
.../spring-kubernetes-service-context.xml | 4 +-
...t.java => KubernetesServiceHelperImplTest.java} | 10 +-
.../version/KubernetesVersionManagerImplTest.java | 73 ++++
.../version/KubernetesVersionServiceTest.java | 22 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 58 +++-
.../storage/datastore/util/LinstorUtil.java | 6 +-
.../snapshot/LinstorVMSnapshotStrategy.java | 371 +++++++++++++++++++++
.../spring-storage-volume-linstor-context.xml | 2 +
.../driver/ScaleIOPrimaryDataStoreDriver.java | 23 +-
.../driver/ScaleIOPrimaryDataStoreDriverTest.java | 31 +-
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 15 +-
.../apache/cloudstack/saml/SAML2AuthManager.java | 33 +-
.../cloudstack/saml/SAML2AuthManagerImpl.java | 2 +-
.../command/SAML2LoginAPIAuthenticatorCmdTest.java | 24 ++
pom.xml | 2 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 33 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 2 +
.../java/com/cloud/api/query/vo/VolumeJoinVO.java | 8 +-
.../configuration/ConfigurationManagerImpl.java | 26 +-
.../com/cloud/event/ActionEventInterceptor.java | 13 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 14 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 11 +
.../main/java/com/cloud/server/StatsCollector.java | 6 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 15 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 14 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 29 +-
.../annotation/AnnotationManagerImpl.java | 14 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 20 +-
.../core/spring-server-core-managers-context.xml | 2 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 7 +
.../storage/resource/HttpUploadServerHandler.java | 3 +-
test/integration/smoke/test_register_userdata.py | 65 ++--
tools/marvin/mvn-setup.py | 2 +
ui/public/locales/en.json | 4 +-
ui/public/locales/pt_BR.json | 4 +-
ui/src/components/header/CreateMenu.vue | 181 ++++------
.../InstanceVolumesStoragePoolSelectListView.vue | 7 +-
ui/src/components/view/SearchView.vue | 63 +++-
ui/src/components/view/VolumesTab.vue | 22 +-
ui/src/components/widgets/ResourceLabel.vue | 17 +-
ui/src/config/section/compute.js | 14 +-
ui/src/config/section/image.js | 12 +
ui/src/config/section/storage.js | 2 +-
ui/src/permission.js | 6 +-
ui/src/utils/plugins.js | 4 +
ui/src/utils/sort.js | 15 +-
ui/src/views/AutogenView.vue | 1 +
ui/src/views/compute/CreateKubernetesCluster.vue | 3 +-
ui/src/views/compute/KubernetesServiceTab.vue | 7 +-
.../views/compute/wizard/MultiNetworkSelection.vue | 32 +-
ui/src/views/dashboard/CapacityDashboard.vue | 6 +-
ui/src/views/dashboard/UsageDashboard.vue | 106 +++---
ui/src/views/infra/AddPrimaryStorage.vue | 20 +-
ui/src/views/project/AddAccountOrUserToProject.vue | 70 +++-
ui/src/views/storage/MigrateVolume.vue | 2 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 6 +-
132 files changed, 2264 insertions(+), 623 deletions(-)
rename
api/src/main/java/com/cloud/kubernetes/cluster/{KubernetesClusterHelper.java =>
KubernetesServiceHelper.java} (94%)
copy core/src/main/java/com/cloud/agent/api/{GetVolumeStatsAnswer.java =>
GetVolumeStatAnswer.java} (61%)
copy core/src/main/java/com/cloud/agent/api/{GetVolumeStatsCommand.java =>
GetVolumeStatCommand.java} (70%)
copy framework/{db/src/main/java/com/cloud/utils/db/Encrypt.java =>
quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableDefinition.java}
(63%)
create mode 100644
plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaPresetVariablesListCmd.java
copy
plugins/database/quota/src/main/java/org/apache/cloudstack/api/response/{QuotaUpdateResponse.java
=> QuotaPresetVariablesItemResponse.java} (61%)
create mode 100644
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetVolumeStatCommandWrapper.java
rename
plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/{KubernetesClusterHelperImpl.java
=> KubernetesServiceHelperImpl.java} (64%)
rename
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/cluster/{KubernetesClusterHelperImplTest.java
=> KubernetesServiceHelperImplTest.java} (89%)
create mode 100644
plugins/integrations/kubernetes-service/src/test/java/com/cloud/kubernetes/version/KubernetesVersionManagerImplTest.java
create mode 100644
plugins/storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/snapshot/LinstorVMSnapshotStrategy.java
