[cloudstack] branch 4.18-vm-autoscaling updated (b49fa9f28ff -> 609703d8e25)

[we...@apache.org]

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 b49fa9f28ff AS test: unit tests on LibvirtGetAutoScaleMetricsCommandWrapper
     add 780bb2474cd ui: fix gputype in add compute offering (#6646)
     add 547041646ab server: fix delete resource tag permission (#6634)
     add 8e428c7b0c9 Merge remote-tracking branch 'origin/4.17'
     add 052a34c1fb9 ui: fix resource tags visibility in infocard (#6650)
     add 010b47f82eb server: fix ipv6 network deployment with separate guest nw (#6588)
     add 83008e55cf3 Merge remote-tracking branch 'origin/4.17'
     add f23a4db6d26 kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
     add 1fd1f0626a0 Fix SQL query for uuid wrong format (#6654)
     add 44e600e2fc8 server: remove resource tags for disassociated public ip (#6642)
     add 98479183601 api, vmware: allow VM setting/detail for disk controller (root/data) to override template details (#6276)
     add 814dbbaf860 cks: fix k8s cluster deployment with host tagged offering (#6658)
     add bd6bcffccc2 Merge remote-tracking branch 'apache/4.17' into main
     add ad0ae839746 ui: Revise Chinese language pack (#6653)
     add b50292456c0 Merge remote-tracking branch 'apache/main' into 4.18-vm-autoscaling
     add 1fedc471abb AS test: add unit test for XenServer56GetAutoScaleMetricsCommandWrapper
     add c2e8e64cf38 AS: consider multiple public ips in xenserver plugin
     add 609703d8e25 AS plugin: support xcpserver

No new revisions were added by this update.

Summary of changes:
 .../src/main/java/com/cloud/dc/dao/VlanDao.java    |    2 +-
 .../main/java/com/cloud/dc/dao/VlanDaoImpl.java    |   20 +-
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |    9 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |   26 +-
 .../hypervisor/kvm/resource/LibvirtVMDefTest.java  |   29 +-
 .../xenserver/resource/CitrixResourceBase.java     |    9 +-
 .../xenserver/resource/XcpServerResource.java      |   24 +
 .../xenserver/resource/XenServer56Resource.java    |    6 +-
 ...cpServerGetAutoScaleMetricsCommandWrapper.java} |   20 +-
 .../xcp/XcpServerNetworkUsageCommandWrapper.java   |    2 +-
 ...nServer56GetAutoScaleMetricsCommandWrapper.java |    4 +-
 .../XenServer56NetworkUsageCommandWrapper.java     |    2 +-
 .../wrapper/xenbase/XcpServerWrapperTest.java      |   84 +-
 .../wrapper/xenbase/XenServer56WrapperTest.java    |   87 +-
 .../cluster/KubernetesClusterManagerImpl.java      |   16 +-
 .../java/com/cloud/network/Ipv6ServiceImpl.java    |    4 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |    1 +
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |   28 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |   78 +-
 .../com/cloud/network/Ipv6ServiceImplTest.java     |    8 +-
 .../cloud/tags/TaggedResourceManagerImplTest.java  |   45 +-
 ui/public/locales/zh_CN.json                       | 5494 ++++++++++++++------
 ui/src/components/view/InfoCard.vue                |   24 +-
 ui/src/views/offering/AddComputeOffering.vue       |   10 +-
 24 files changed, 4442 insertions(+), 1590 deletions(-)
 copy plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/{xen56/XenServer56GetAutoScaleMetricsCommandWrapper.java => xcp/XcpServerGetAutoScaleMetricsCommandWrapper.java} (78%)