You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pe...@apache.org on 2023/11/03 18:11:04 UTC
(cloudstack) 01/02: Merge branch 'main' of https://github.com/apache/cloudstack into nsx-integration
This is an automated email from the ASF dual-hosted git repository.
pearl11594 pushed a commit to branch nsx-isolated-source-nat
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 7c72aa1285cfb39cde0c3e495a5af88a413a048f
Merge: 9ec7dccbd48 121531e2c3a
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Fri Nov 3 09:56:33 2023 -0400
Merge branch 'main' of https://github.com/apache/cloudstack into nsx-integration
.github/workflows/build.yml | 2 +-
.github/workflows/ci.yml | 2 +-
.github/workflows/codecov.yml | 2 +-
.github/workflows/docker-cloudstack-simulator.yml | 2 +-
.github/workflows/linter.yml | 2 +-
.github/workflows/main-sonar-check.yml | 2 +-
.github/workflows/rat.yml | 2 +-
.github/workflows/sonar-check.yml | 2 +-
.github/workflows/ui.yml | 2 +-
.pre-commit-config.yaml | 2 +
agent/src/main/java/com/cloud/agent/Agent.java | 4 +
api/src/main/java/com/cloud/gpu/GPU.java | 105 ++-
.../api/command/admin/acl/CreateRoleCmd.java | 3 +-
.../api/command/admin/host/DeleteHostCmd.java | 4 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +-
.../main/java/com/cloud/agent/api/PingAnswer.java | 13 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 151 ++--
.../offerings/dao/NetworkOfferingDaoImpl.java | 2 +-
.../cloud/upgrade/DatabaseIntegrityChecker.java | 2 +-
.../java/com/cloud/upgrade/dao/Upgrade218to22.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade224to225.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade301to302.java | 2 +-
.../main/resources/META-INF/db/schema-21to22.sql | 4 +-
.../resources/META-INF/db/schema-2212to2213.sql | 2 +-
.../main/resources/META-INF/db/schema-2214to30.sql | 2 +-
.../main/resources/META-INF/db/schema-225to226.sql | 2 +-
.../main/resources/META-INF/db/schema-227to228.sql | 2 +-
.../main/resources/META-INF/db/schema-228to229.sql | 2 +-
.../resources/META-INF/db/schema-229to2210.sql | 2 +-
.../main/resources/META-INF/db/schema-302to40.sql | 2 +-
.../main/resources/META-INF/db/schema-307to410.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 8 +-
.../resources/META-INF/db/schema-41310to41400.sql | 2 +-
.../resources/META-INF/db/schema-41720to41800.sql | 2 +-
.../main/resources/META-INF/db/schema-420to421.sql | 2 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 2 +-
.../datastore/ObjectInDataStoreManagerImpl.java | 2 +-
.../storage/endpoint/DefaultEndPointSelector.java | 2 +-
.../storage/image/db/TemplateDataStoreDaoImpl.java | 8 +-
.../apache/cloudstack/storage/BaseTypeTest.java | 4 +-
.../model/impl/DefaultModuleDefinitionSet.java | 17 +-
.../cloudstack/ca/provider/RootCAProvider.java | 35 +-
.../HypervResource/CloudStackTypes.cs | 2 +-
.../HypervResourceController1Test.cs | 10 +-
.../HypervResourceControllerTest.cs | 10 +-
.../hypervisor/kvm/resource/KVMGuestOsMapper.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 4 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 25 +-
.../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 12 +-
.../resource/XenServerStorageProcessor.java | 2 +-
.../wrapper/xenbase/XenServer610WrapperTest.java | 20 +-
.../contrail/model/InstanceIpModelTest.java | 16 +-
.../network/contrail/model/MockNetworkVO.java | 50 ++
.../contrail/model/VMInterfaceModelTest.java | 16 +-
.../contrail/model/VirtualMachineModelTest.java | 21 +-
.../contrail/model/VirtualNetworkModelTest.java | 38 +-
.../com/cloud/network/nicira/NiciraNvpApiIT.java | 76 +-
.../service/MockTungstenAnswerFactory.java | 28 +-
.../tungsten/service/TungstenElementTest.java | 90 +-
.../tungsten/service/TungstenFabricUtilsTest.java | 6 +-
.../tungsten/service/TungstenServiceImplTest.java | 332 +++----
.../storage/datastore/util/ElastistorUtil.java | 2 +-
.../storage/datastore/util/DateraUtil.java | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 2 +-
pom.xml | 2 +-
.../vm/hypervisor/xenserver/cloud-plugin-storage | 4 +-
scripts/vm/hypervisor/xenserver/vmops | 4 +-
scripts/vm/hypervisor/xenserver/vmopsSnapshot | 6 +-
.../main/java/com/cloud/configuration/Config.java | 2 +-
.../java/com/cloud/network/NetworkModelImpl.java | 38 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 2 +-
.../network/vpc/NetworkACLServiceImplTest.java | 6 +-
.../java/com/cloud/server/StatsCollectorTest.java | 13 +-
setup/db/create-schema.sql | 2 +-
setup/db/templates.sql | 4 +-
test/integration/component/test_browse_volumes.py | 6 +-
.../component/test_vpc_vm_life_cycle.py | 6 +-
test/integration/smoke/test_host_ping.py | 102 +++
.../scripts/configure_systemvm_services.sh | 2 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
ui/public/locales/ar.json | 2 +-
ui/public/locales/ca.json | 2 +-
ui/public/locales/en.json | 974 ++++++++++-----------
ui/public/locales/hu.json | 2 +-
ui/public/locales/it_IT.json | 2 +-
ui/public/locales/nl_NL.json | 2 +-
ui/public/locales/pl.json | 2 +-
ui/public/locales/pt_BR.json | 2 +-
ui/src/components/view/ListView.vue | 30 +-
ui/src/config/section/compute.js | 71 ++
ui/src/config/section/role.js | 4 +-
ui/src/config/section/storage.js | 71 --
ui/src/views/iam/CreateRole.vue | 10 +-
ui/src/views/iam/ImportRole.vue | 9 +-
ui/src/views/offering/AddComputeOffering.vue | 49 +-
usage/src/test/resources/cloud1.xml | 2 +-
usage/src/test/resources/cloud2.xml | 2 +-
.../java/com/cloud/utils/net/Ip4AddressTest.java | 4 +-
.../src/test/java/com/cloud/utils/net/IpTest.java | 4 +-
102 files changed, 1443 insertions(+), 1194 deletions(-)