This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch nsx-integration
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 88a07f479f6 NSX - add LB route Advertizement (#8192)
add 861107fa5b1 CKS: make clustertype optional to keep backwards
compatibility (#8180)
add e65c9ffe700 Fix: Select another pod if all hosts in the pod becomes
unavailable (#8085)
add b2e83271f8b ui: Admin, account and project dashboard improvements
(#8193)
add 11b5831d726 Advanced SG: allow create/update physical networks with
vlan range (#8122)
add 3d7281d4516 Merge branch '4.18' into main
add d3917ef8f68 Remove powermock form VM Manager test (#8199)
add 68e504aff97 Linstor backup snaphots (#8067)
add e7900478eb2 ui: fix vmware nicadapter detail for register template
(#8173)
add 29a223bf9b7 Merge remote-tracking branch 'apache/4.18'
add 86444809c3a updated the api documentation for createNetworkOffering
and updateNetworkOffering (#7545)
add e7bb89c4b28 Merge release branch 4.18 to main
add 7b31a5196d4 Update requirements file and fix minimum pre-commit
version (#7901)
add 30ca5d1a196 Flexible URI for connection with DB and new MariaDB driver
(#7895)
add 053521077c0 Merge branch 'main' into nsx-integration
No new revisions were added by this update.
Summary of changes:
.pre-commit-config.yaml | 2 +-
.../admin/network/CreateNetworkOfferingCmd.java | 3 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 2 +-
client/conf/db.properties.in | 11 +
client/pom.xml | 7 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 23 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 298 ++++++++++++++---
.../org.mockito.plugins.MockMaker | 0
framework/db/pom.xml | 5 +
.../main/java/com/cloud/utils/db/DriverLoader.java | 1 +
.../java/com/cloud/utils/db/TransactionLegacy.java | 153 ++++++---
.../com/cloud/utils/db/TransactionLegacyTest.java | 117 +++++++
.../cluster/CreateKubernetesClusterCmd.java | 2 +-
plugins/storage/volume/linstor/pom.xml | 6 +
.../api/storage/LinstorBackupSnapshotCommand.java | 21 +-
.../LinstorRevertBackupSnapshotCommand.java | 21 +-
.../LinstorBackupSnapshotCommandWrapper.java | 167 ++++++++++
.../LinstorRevertBackupSnapshotCommandWrapper.java | 92 ++++++
.../kvm/storage/LinstorStorageAdaptor.java | 10 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 352 +++++++++++++++++++--
.../LinstorPrimaryDatastoreProviderImpl.java | 4 +-
.../util/LinstorConfigurationManager.java} | 32 +-
.../storage/datastore/util/LinstorUtil.java | 89 ++++++
.../spring-storage-volume-linstor-context.xml | 2 +
pom.xml | 5 +
requirements.txt | 5 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 16 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 26 +-
29 files changed, 1275 insertions(+), 201 deletions(-)
copy {agent =>
engine/orchestration}/src/test/resources/mockito-extensions/org.mockito.plugins.MockMaker
(100%)
create mode 100644
framework/db/src/test/java/com/cloud/utils/db/TransactionLegacyTest.java
copy
core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
=>
plugins/storage/volume/linstor/src/main/java/com/cloud/api/storage/LinstorBackupSnapshotCommand.java
(71%)
copy
core/src/main/java/org/apache/cloudstack/storage/command/IntroduceObjectAnswer.java
=>
plugins/storage/volume/linstor/src/main/java/com/cloud/api/storage/LinstorRevertBackupSnapshotCommand.java
(71%)
create mode 100644
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LinstorBackupSnapshotCommandWrapper.java
create mode 100644
plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LinstorRevertBackupSnapshotCommandWrapper.java
copy
plugins/{integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterHelperImpl.java
=>
storage/volume/linstor/src/main/java/org/apache/cloudstack/storage/datastore/util/LinstorConfigurationManager.java}
(55%)