This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch support-multi-vlan-guestnet
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d644d6e808e reject a trunk nic with a VLAN 1 nic on one VM, and only
treat Guest VLAN 1 nics as needing a legacy host, including in host planning
add c8abe2904b0 show a session expired warning when the session runs out
(#14369)
add b535ae8e6a9 Remove weekly status report and update model for daily
issue triage (#14488)
add 4dae995455e Improve Inherited Context Lookup in getConfigResources
(#11048)
add ac65e3ddab0 server,kvm: Avoid device id conflicts between data
volumes, CD-ROMs and the config drive ISO (#14407)
add b9b5436d6f2 Enhancing storagepool operations and snapshot related
fixes in NetApp ONTAP storage plugin (#13897)
add 454bba0f3e5 server: report distinct read/write volume throttle rates
(#14048)
add 56306ab52cc Merge remote-tracking branch 'apache/4.20' into 4.22
add fe8976babc9 Merge remote-tracking branch 'apache/4.22'
add 92e44bb8c33 Fix daily issue triage job (#14526)
add d6390bd5c30 Validate Storage Capacity Before Volume Create (#14314)
add 4d2e712ecda sbom (#12570)
add 2ebcaf626cb Do not shut down networks that are being implemented in
the orphaned-network cleanup (#14527)
add d02adcde900 Merge branch '4.20' into 4.22
add d63c21bcb12 Merge branch '4.22'
add 41e30627cec Extend NetApp ONTAP codeowners (#14569)
add 3370d9fcd51 remove recurring exception from MS logs (#14441)
add dafb4a014e5 Driver is called when nothing is changed in volume resize
wizard (#14259)
add f00e0c75121 ui: fix SourceNat error when adding a network offering
(#14576)
add 2d886b61918 cloudutils: Do not configure selinux/apparmor and
security_driver when setup cloudstack agent (#13281)
add 2a4d7d9036c Fix Prometheus exporter not recognizing ::1 as IPv6
loopback (#13245)
add fb605640105 core: fix instance snapshot failure (#14543)
add f3cb957463e Major update for el_GR to comply with latest translation
requirements… (#14507)
add a95eb5970c0 systemvm: fix subprocess deadlock in router health check
scripts (#13737)
add 988bbaa1f18 Disk ERROR policy for KVM hypervisors (#14499)
add aa823483186 CSTACKEX-309: enabling resize volume Api validation
notification to s… (#103) (#14220)
add 50055b4cf34 CKS: support headlamp.yaml in upgrade-kubernetes.sh
(#14245)
add bc5522e86e0 Clarify VMware import conversion storage option (#13165)
add 98b8f752a34 Performance improvements of AgentPropertiesFileHandler
(#13852)
add f8f3848321a sbom: allow-listed generators and an sbom Maven profile
(#14570)
add a7be64af7ad Resize Volume form does not show current size and Custom
IOPS (#14262)
add 492682697a7 UI: fix clone offering forms silently reverting user edits
on services (#14062)
add c1c815b21bb packaging: use rng-tools service name on SUSE 15 (#14311)
add 11c0394e449 Merge branch 'main' into support-multi-vlan-guestnet
No new revisions were added by this update.
Summary of changes:
.gitattributes | 2 +-
.github/CODEOWNERS | 2 +-
.github/aw/actions-lock.json | 45 +-
.github/scripts/post-compile.sh | 14 +-
.github/workflows/daily-issue-triage.lock.yml | 1664 +++++--
.github/workflows/daily-issue-triage.md | 36 +-
.github/workflows/sbom.yml | 118 +
.github/workflows/weekly-repo-status.lock.yml | 1471 ------
.github/workflows/weekly-repo-status.md | 141 -
.../cloud/agent/dao/impl/PropertiesStorage.java | 3 +
.../properties/AgentPropertiesFileHandler.java | 75 +-
.../properties/AgentPropertiesFileHandlerTest.java | 37 +
.../main/java/com/cloud/agent/api/to/VolumeTO.java | 9 +
.../main/java/com/cloud/offering/DiskOffering.java | 19 +
.../java/com/cloud/storage/VolumeApiService.java | 18 +
api/src/main/java/com/cloud/vm/DiskProfile.java | 9 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../admin/offering/CreateDiskOfferingCmd.java | 10 +
.../admin/offering/CreateServiceOfferingCmd.java | 10 +
.../admin/offering/UpdateDiskOfferingCmd.java | 7 +
.../api/response/DiskOfferingResponse.java | 12 +
.../api/response/ServiceOfferingResponse.java | 8 +
.../cloudstack/api/response/VolumeResponse.java | 16 +
.../storage/CreateDiskOnlyVmSnapshotCommand.java | 4 +-
.../cloudstack/storage/to/VolumeObjectTO.java | 11 +
.../engine/subsystem/api/storage/VolumeInfo.java | 3 +
.../java/com/cloud/template/TemplateManager.java | 20 +
.../java/com/cloud/storage/DiskOfferingVO.java | 14 +
.../resources/META-INF/db/schema-42300to2400.sql | 2 +
.../META-INF/db/views/cloud.disk_offering_view.sql | 1 +
.../db/views/cloud.service_offering_view.sql | 1 +
.../META-INF/db/views/cloud.volume_view.sql | 1 +
.../cloudstack/storage/volume/VolumeObject.java | 7 +
.../storage/volume/VolumeServiceImpl.java | 6 +-
.../main/java/com/cloud/utils/db/Merovingian2.java | 10 +
.../cloud/utils/db/Merovingian2AcquireTest.java | 82 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 66 +-
.../jobs/impl/AsyncJobManagerImplTest.java | 125 +
.../model/impl/DefaultModuleDefinitionSet.java | 38 +-
packaging/suse15/cloud.spec | 4 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 6 +
.../kvm/resource/LibvirtComputingResource.java | 5 +
.../kvm/resource/LibvirtDomainXMLParser.java | 9 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 30 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 1 +
.../kvm/storage/IscsiAdmStorageAdaptor.java | 138 +-
.../kvm/storage/KVMStoragePoolManager.java | 11 +-
.../kvm/storage/KVMStorageProcessor.java | 16 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 67 +
...ibvirtDiskOnlyVMSnapshotCommandWrapperTest.java | 9 +-
.../main/resources/script/upgrade-kubernetes.sh | 8 +-
.../metrics/PrometheusExporterServerImpl.java | 50 +-
.../metrics/PrometheusExporterServerImplTest.java | 53 +
plugins/storage/volume/ontap/README.md | 4 +-
.../driver/OntapPrimaryDatastoreDriver.java | 186 +-
.../storage/feign/client/AggregateFeignClient.java | 7 +-
.../storage/feign/client/SnapshotFeignClient.java | 94 +
.../cloudstack/storage/feign/model/Aggregate.java | 56 +-
.../{VolumeConcise.java => ConsistencyGroup.java} | 53 +-
...Snapshot.java => ConsistencyGroupSnapshot.java} | 73 +-
...umeConcise.java => ConsistencyGroupVolume.java} | 21 +-
...ConsistencyGroupVolumeProvisioningOptions.java} | 28 +-
.../cloudstack/storage/feign/model/ExportRule.java | 12 +-
.../storage/feign/model/IpInterface.java | 88 +-
.../lifecycle/OntapPrimaryDatastoreLifecycle.java | 106 +-
.../storage/listener/OntapHostListener.java | 183 +-
.../storage/service/StorageStrategy.java | 410 +-
.../storage/service/UnifiedNASStrategy.java | 179 +-
.../storage/service/model/AccessGroup.java | 19 +-
.../storage/utils/OntapStorageConstants.java | 23 +
.../storage/utils/OntapStorageUtils.java | 129 +-
.../vmsnapshot/OntapVMSnapshotStrategy.java | 617 ++-
.../driver/OntapPrimaryDatastoreDriverTest.java | 72 +-
.../OntapPrimaryDatastoreLifecycleTest.java | 315 +-
.../storage/service/StorageStrategyTest.java | 537 ++-
.../storage/service/UnifiedNASStrategyTest.java | 372 ++
.../storage/utils/OntapStorageUtilsTest.java | 14 +
.../vmsnapshot/OntapVMSnapshotStrategyTest.java | 436 +-
pom.xml | 39 +
python/lib/cloudutils/serviceConfig.py | 72 -
python/lib/cloudutils/syscfg.py | 6 -
scripts/vm/hypervisor/kvm/setup_agent.sh | 228 -
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 1 +
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 18 +-
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 11 +
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 7 +
.../java/com/cloud/api/query/vo/VolumeJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 76 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 31 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 2 -
.../network/element/ConfigDriveNetworkElement.java | 2 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 5 +
.../java/com/cloud/storage/StorageManagerImpl.java | 45 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 64 +-
.../storage/snapshot/SnapshotManagerImpl.java | 53 +-
.../com/cloud/template/TemplateManagerImpl.java | 94 +-
.../java/com/cloud/user/AccountManagerImpl.java | 2 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 25 +-
.../cloud/api/query/dao/VolumeJoinDaoImplTest.java | 192 +-
.../ConfigurationManagerCloneIntegrationTest.java | 20 +-
.../configuration/ConfigurationManagerTest.java | 32 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 87 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 184 +
.../cloud/template/TemplateManagerImplTest.java | 175 +
.../cloudstack/vm/UnmanagedVMsManagerImplTest.java | 24 +
.../debian/root/health_checks/cpu_usage_check.py | 5 +-
.../debian/root/health_checks/gateways_check.py | 3 +-
.../debian/root/health_checks/iptables_check.py | 5 +-
.../root/health_checks/memory_usage_check.py | 5 +-
test/integration/smoke/test_disk_offerings.py | 72 +
test/integration/smoke/test_service_offerings.py | 103 +
ui/package-lock.json | 170 +-
ui/public/locales/el_GR.json | 4859 ++++++++++++++------
ui/public/locales/en.json | 10 +-
ui/src/components/CheckBoxSelectPair.vue | 12 +
ui/src/components/offering/ComputeOfferingForm.vue | 14 +
ui/src/components/offering/DiskOfferingForm.vue | 26 +
ui/src/composables/useServiceCapabilityParams.js | 2 +-
ui/src/utils/request.js | 7 +-
ui/src/views/dashboard/SetupTwoFaAtLogin.vue | 11 +-
ui/src/views/dashboard/VerifyTwoFa.vue | 11 +-
ui/src/views/offering/AddComputeOffering.vue | 3 +
ui/src/views/offering/AddDiskOffering.vue | 1 +
ui/src/views/offering/CloneComputeOffering.vue | 7 +
ui/src/views/offering/CloneDiskOffering.vue | 6 +
ui/src/views/offering/CloneNetworkOffering.vue | 11 +-
ui/src/views/offering/CloneVpcOffering.vue | 68 +-
ui/src/views/storage/ResizeVolume.vue | 37 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 1 +
ui/tests/unit/utils/request.spec.js | 84 +
ui/tests/unit/views/dashboard/TwoFaFailure.spec.js | 72 +
132 files changed, 10836 insertions(+), 4831 deletions(-)
create mode 100644 .github/workflows/sbom.yml
delete mode 100644 .github/workflows/weekly-repo-status.lock.yml
delete mode 100644 .github/workflows/weekly-repo-status.md
create mode 100644
framework/db/src/test/java/com/cloud/utils/db/Merovingian2AcquireTest.java
create mode 100644
plugins/integrations/prometheus/src/test/java/org/apache/cloudstack/metrics/PrometheusExporterServerImplTest.java
copy
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeConcise.java
=> ConsistencyGroup.java} (55%)
copy
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{FlexVolSnapshot.java
=> ConsistencyGroupSnapshot.java} (58%)
copy
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeConcise.java
=> ConsistencyGroupVolume.java} (72%)
copy
plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/{VolumeSpaceLogicalSpace.java
=> ConsistencyGroupVolumeProvisioningOptions.java} (70%)
delete mode 100755 scripts/vm/hypervisor/kvm/setup_agent.sh
create mode 100644 ui/tests/unit/utils/request.spec.js
create mode 100644 ui/tests/unit/views/dashboard/TwoFaFailure.spec.js
