You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2022/11/23 10:08:03 UTC

[cloudstack] branch 4.18-vm-autoscaling updated (d7ed27241bc -> 288c58e58e8)

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a change to branch 4.18-vm-autoscaling
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


    from d7ed27241bc AS api: fix description of parameter "interval" in AutoScaleVmGroup API commands
     add 982450ed81b Remove password change notice on SSH Key Pair reset (#6862)
     add b8b66b7a3db Fix typos and improve javadocs on ByteScaleUtils (#6877)
     add e65c22d8835 Fix spelling (#6860)
     add 8e538028b23 Enable Flake8 rule W391 (#6606)
     add 60420b0dd80 gha(python): fix `W391` blank line at end of file (#6897)
     add c5e657ddd80 VOLUME.DETACH, created during VM removal has type VirtualMachine instead of Volume and has "Vm Id: XXX" in the description. (#199) (#6891)
     add 9638c422a3d Merge remote-tracking branch 'apache/main' into 4.18-vm-autoscaling
     add 288c58e58e8 AS UI: tick VM scaling capability when create new network offering

No new revisions were added by this update.

Summary of changes:
 .github/linters/.flake8                            |  7 +++-
 CHANGES.md                                         | 10 +++---
 api/src/main/java/com/cloud/agent/api/Answer.java  |  2 +-
 api/src/main/java/com/cloud/network/Networks.java  |  2 +-
 .../network/lb/LoadBalancingRulesService.java      |  4 +--
 .../admin/annotation/ListAnnotationsCmd.java       |  2 +-
 .../command/user/vpn/ListRemoteAccessVpnsCmd.java  |  2 +-
 cloud-cli/cloudapis/__init__.py                    |  1 -
 cloud-cli/cloudapis/cloud.py                       |  2 --
 .../cloudstack/api/agent/test/AnswerTest.java      |  2 +-
 .../java/com/cloud/vm/VirtualMachineManager.java   |  2 +-
 .../subsystem/api/storage/DataMotionStrategy.java  |  2 +-
 .../engine/orchestration/NetworkOrchestrator.java  |  2 +-
 .../com/cloud/upgrade/dao/Upgrade2214to30.java     |  2 +-
 .../com/cloud/upgrade/dao/Upgrade304to305.java     |  2 +-
 .../com/cloud/upgrade/dao/Upgrade430to440.java     |  2 +-
 .../resources/META-INF/db/schema-2211to2212.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-305to306.sql |  2 +-
 .../main/resources/META-INF/db/schema-410to420.sql |  2 +-
 .../resources/META-INF/db/schema-41610to41700.sql  |  2 +-
 .../main/resources/META-INF/db/schema-420to421.sql |  2 +-
 .../storage/datastore/DataObjectManagerImpl.java   |  4 +--
 .../presetvariables/PresetVariableHelper.java      |  6 ++--
 .../presetvariables/PresetVariableHelperTest.java  |  8 ++---
 .../HypervResource/HypervResourceController.cs     |  2 +-
 ...on.v2.Msvm_VirtualSystemMigrationSettingData.cs |  2 +-
 .../kvm/resource/LibvirtComputingResource.java     |  4 +--
 .../wrapper/LibvirtScaleVmCommandWrapper.java      |  2 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |  4 +--
 ...bvirtGetAutoScaleMetricsCommandWrapperTest.java |  4 +--
 .../wrapper/LibvirtScaleVmCommandWrapperTest.java  |  2 +-
 .../src/main/java/com/cloud/ovm/object/OvmVm.java  |  2 +-
 .../scripts/vm/hypervisor/ovm/ConfigFileOps.py     |  1 -
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |  1 -
 .../scripts/vm/hypervisor/ovm/OvmDispatcher.py     |  8 ++---
 .../scripts/vm/hypervisor/ovm/OvmFaultConstants.py |  4 +--
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |  1 -
 .../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py    |  1 -
 .../vm/hypervisor/ovm/OvmSecurityGroupModule.py    | 38 ----------------------
 .../vm/hypervisor/ovm/OvmStoragePoolModule.py      |  2 --
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |  3 --
 .../vmware/manager/VmwareStorageManagerImpl.java   |  2 +-
 .../hypervisor/vmware/resource/VmwareResource.java |  2 +-
 .../CitrixOvsCreateGreTunnelCommandWrapper.java    |  2 +-
 .../wrapper/xenbase/CitrixSetupCommandWrapper.java |  2 +-
 .../agent/OpenDaylightControllerResource.java      |  2 +-
 .../driver/DateraPrimaryDataStoreDriver.java       |  4 +--
 .../kvm/storage/LinstorStorageAdaptor.java         |  2 +-
 .../apache/cloudstack/ldap/LdapConfiguration.java  |  2 +-
 .../cloudstack/ldap/LdapContextFactorySpec.groovy  |  6 ++--
 .../ldap/LdapCreateAccountCmdSpec.groovy           |  2 +-
 python/lib/cloud_utils.py                          |  1 -
 python/lib/cloudutils/networkConfig.py             |  1 -
 python/lib/cloudutils/serviceConfig.py             |  2 +-
 python/lib/cloudutils/syscfg.py                    |  2 +-
 scripts/network/exdhcp/dhcpd_edithosts.py          |  1 -
 .../ping/prepare_kickstart_kernel_initrd.py        |  1 -
 .../storage/secondary/cloud-install-sys-tmplt.py   |  2 +-
 scripts/vm/hypervisor/xenserver/perfmon.py         |  1 -
 scripts/vm/network/ovs-pvlan-kvm-vm.sh             |  4 +--
 scripts/vm/network/security_group.py               |  2 +-
 scripts/vm/network/vnet/ovstunnel.py               |  1 -
 .../main/java/com/cloud/configuration/Config.java  |  4 +--
 .../configuration/ConfigurationManagerImpl.java    |  4 +--
 .../main/java/com/cloud/hypervisor/KVMGuru.java    |  4 +--
 .../ExternalLoadBalancerDeviceManagerImpl.java     |  2 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |  2 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |  2 +-
 .../com/cloud/server/ManagementServerImpl.java     |  2 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |  2 +-
 .../main/java/com/cloud/test/PodZoneConfig.java    |  2 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |  2 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |  2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 20 ++++++++++--
 .../java/com/cloud/hypervisor/KVMGuruTest.java     |  8 ++---
 .../network/element/VirtualRouterElementTest.java  |  4 +--
 services/console-proxy/rdpconsole/README.txt       |  2 +-
 .../rdpconsole/src/main/java/common/Client.java    |  2 +-
 ...nnelJoinRequestServerMCSChannelConfirmPDUs.java |  2 +-
 .../src/main/java/streamer/debug/MockSink.java     |  2 +-
 systemvm/agent/js/ajaxviewer.js                    |  2 +-
 systemvm/debian/etc/vpcdnsmasq.conf                |  2 +-
 systemvm/debian/opt/cloud/bin/dnsmasq.sh           |  4 +--
 systemvm/debian/opt/cloud/bin/loadbalancer.sh      |  4 +--
 systemvm/debian/opt/cloud/bin/vr_cfg.sh            |  2 +-
 systemvm/debian/root/func.sh                       |  2 +-
 .../maint/test_zone_level_local_storage_setting.py |  6 ++--
 .../broken/test_ps_resource_limits_volume.py       |  1 -
 test/integration/broken/test_vr_metadata.py        |  1 -
 .../maint/test_ip_resource_count_for_vpc.py        |  2 --
 .../component/maint/test_redundant_router.py       |  2 +-
 .../component/test_acl_isolatednetwork_delete.py   |  1 -
 .../component/test_acl_sharednetwork.py            |  2 --
 .../component/test_advancedsg_networks.py          |  2 +-
 .../component/test_affinity_groups_projects.py     |  3 --
 test/integration/component/test_baremetal.py       |  1 -
 test/integration/component/test_brocade_vcs.py     |  1 -
 .../test_concurrent_create_volume_from_snapshot.py |  1 -
 test/integration/component/test_cpu_limits.py      |  2 +-
 .../integration/component/test_dhcp_dns_offload.py |  1 -
 test/integration/component/test_egress_rules.py    |  3 --
 .../component/test_escalations_instances.py        |  5 +--
 .../component/test_escalations_ipaddresses.py      |  4 +--
 .../component/test_escalations_templates.py        |  3 --
 .../component/test_escalations_vmware.py           |  3 --
 test/integration/component/test_haproxy.py         |  4 +--
 .../component/test_hypervisor_capabilities.py      |  1 -
 test/integration/component/test_invalid_gw_nm.py   |  1 -
 test/integration/component/test_ldap.py            |  1 -
 .../integration/component/test_ldap_auto_import.py |  2 --
 .../component/test_multiple_nic_support.py         |  1 -
 .../component/test_network_vpc_custom_dns.py       |  1 -
 .../component/test_redundant_router_services.py    |  1 -
 test/integration/component/test_tags.py            |  2 +-
 test/integration/component/test_vpc_offerings.py   |  2 +-
 .../component/test_vpc_vms_deployment.py           |  2 +-
 .../plugins/solidfire/TestAddRemoveHosts.py        |  1 -
 .../plugins/solidfire/TestManagedSystemVMs.py      |  1 -
 .../integration/plugins/solidfire/TestSnapshots.py |  1 -
 test/integration/plugins/solidfire/TestVolumes.py  |  1 -
 .../plugins/storpool/TestStorPoolVolumes.py        |  2 --
 test/integration/plugins/storpool/sp_util.py       |  1 -
 test/integration/smoke/test_create_network.py      |  1 -
 .../smoke/test_deploy_vm_root_resize.py            |  3 --
 .../test_enable_role_based_users_in_projects.py    |  1 -
 test/integration/smoke/test_metrics_api.py         |  1 -
 test/integration/smoke/test_network_permissions.py |  2 +-
 test/integration/smoke/test_non_contigiousvlan.py  |  1 -
 test/integration/smoke/test_pvlan.py               |  4 +--
 test/integration/smoke/test_register_userdata.py   |  2 --
 test/integration/smoke/test_vm_life_cycle.py       |  2 +-
 .../testpaths/testpath_delta_snapshots.py          |  1 -
 test/metadata/func/regression.xml                  |  2 +-
 test/metadata/func/regression_new.xml              |  2 +-
 test/metadata/func/regression_test.xml             |  2 +-
 test/metadata/func/regression_user.xml             |  2 +-
 test/metadata/func/regression_works.xml            |  2 +-
 test/metadata/func/vmapi.xml                       |  4 +--
 test/selenium/browser/firefox.py                   |  1 -
 test/selenium/common/__init__.py                   |  2 --
 test/selenium/common/shared.py                     |  1 -
 test/selenium/cspages/__init__.py                  |  2 --
 test/selenium/cspages/cspage.py                    |  1 -
 test/selenium/cspages/dashboard/__init__.py        |  2 --
 test/selenium/cspages/dashboard/dashboardpage.py   |  1 -
 test/selenium/cspages/login/__init__.py            |  2 --
 test/selenium/cstests/__init__.py                  |  1 -
 test/selenium/cstests/regressiontests/__init__.py  |  1 -
 test/selenium/cstests/smoketests/__init__.py       |  1 -
 test/selenium/cstests/smoketests/smokecfg.py       |  1 -
 test/selenium/lib/Global_Locators.py               |  2 --
 test/selenium/smoke/main.py                        |  3 --
 .../main/java/com/cloud/test/utils/TestClient.java |  2 +-
 tools/docker/README.md                             |  2 +-
 tools/marvin/marvin/cloudstackException.py         |  1 -
 tools/marvin/marvin/config/test_data.py            |  2 +-
 tools/marvin/marvin/lib/utils.py                   |  3 +-
 tools/marvin/marvin/misc/build/bashUtils.py        |  1 -
 tools/marvin/marvin/misc/build/restartMgmt.py      |  1 -
 tools/marvin/marvin/sandbox/__init__.py            |  2 --
 tools/marvin/marvin/sandbox/advanced/__init__.py   |  2 --
 tools/marvin/marvin/sandbox/advancedsg/__init__.py |  2 --
 tools/marvin/marvin/sandbox/basic/__init__.py      |  2 --
 tools/marvin/marvin/sandbox/demo/__init__.py       |  1 -
 tools/marvin/marvin/sandbox/demo/live/__init__.py  |  1 -
 .../marvin/sandbox/demo/simulator/__init__.py      |  2 --
 .../sandbox/demo/simulator/testcase/__init__.py    |  2 --
 .../demo/simulator/testcase/libs/__init__.py       |  2 --
 tools/ngui/static/js/lib/angular.js                |  4 +--
 tools/transifex/README-transifex.txt               |  2 +-
 .../database_comparision_during_upgrade/README     |  4 +--
 tools/whisker/LICENSE                              |  2 +-
 tools/whisker/descriptor-for-packaging.xml         |  2 +-
 tools/whisker/descriptor.xml                       |  2 +-
 ui/public/locales/ar.json                          |  2 +-
 ui/public/locales/ca.json                          |  2 +-
 ui/public/locales/de_DE.json                       |  8 ++---
 ui/public/locales/el_GR.json                       |  8 ++---
 ui/public/locales/en.json                          |  8 ++---
 ui/public/locales/es.json                          |  2 +-
 ui/public/locales/fr_FR.json                       |  2 +-
 ui/public/locales/hu.json                          |  2 +-
 ui/public/locales/it_IT.json                       |  2 +-
 ui/public/locales/ja_JP.json                       |  8 ++---
 ui/public/locales/ko_KR.json                       |  8 ++---
 ui/public/locales/nb_NO.json                       |  2 +-
 ui/public/locales/nl_NL.json                       |  2 +-
 ui/public/locales/pl.json                          |  2 +-
 ui/public/locales/pt_BR.json                       |  8 ++---
 ui/public/locales/ru_RU.json                       |  2 +-
 ui/public/locales/zh_CN.json                       | 10 +++---
 ui/src/style/README.md                             |  2 +-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |  4 +--
 ui/src/views/network/LoadBalancing.vue             |  2 +-
 ui/src/views/offering/AddNetworkOffering.vue       |  1 +
 .../cloud/utils/rest/HttpUriRequestBuilder.java    |  2 +-
 .../cloudstack/utils/bytescale/ByteScaleUtils.java | 24 +++++++-------
 .../src/test/java/com/cloud/utils/ScriptTest.java  |  2 +-
 .../utils/bytescale/ByteScaleUtilsTest.java        | 34 +++++++++----------
 201 files changed, 237 insertions(+), 365 deletions(-)