You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2022/12/21 09:05:46 UTC
[cloudstack] branch healthcheck-main updated (ec94c2ca58a -> 33828298d8d)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit ec94c2ca58a Merge branch 'main' into healthcheck-main
omit 55990b3b5c1 healthcheck hack, please don't merge this
add 9ccec161db5 Minor console access refactor and improvements (#6919)
add 6d74815798f Fixing grammar and spelling in en.json (#6884)
add 575fffc097e Allow root admin to deploy in VPCs in child domains (#6832)
add cc676cbc833 Metrics plugin: expose full domain path instead of name (#6959)
add 440d7805cbc Support for parameter `cidrlist` added to the UI (#6869)
add 889045fba5a new plugins: Add non-strict affinity groups (#6845)
add 34e4376c164 ui: fix persist networks config in deploy vm form (#6994)
add 512aa9cbc51 AutoScaling: update smoke test and consider db upgrade from a fork (#6977)
add 33828298d8d healthcheck hack, please don't merge this
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ec94c2ca58a)
\
N -- N -- N refs/heads/healthcheck-main (33828298d8d)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
README.md | 2 +-
.../com/cloud/deploy/DataCenterDeployment.java | 31 ++
.../main/java/com/cloud/deploy/DeploymentPlan.java | 19 +
.../main/java/com/cloud/network/NetworkModel.java | 5 +-
.../java/com/cloud/vm/VirtualMachineProfile.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 1 +
.../cloudstack/api/command/user/vm/StartVMCmd.java | 11 +
.../consoleproxy/ConsoleAccessManager.java | 8 +-
.../com/cloud/deploy/DataCenterDeploymentTest.java | 57 +++
client/pom.xml | 10 +
.../core/spring-core-registry-core-context.xml | 2 +-
.../cloud/deploy/DeploymentPlanningManager.java | 6 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 4 +
.../cloud/entity/api/VMEntityManagerImpl.java | 3 +
.../resources/META-INF/db/schema-41720to41800.sql | 19 +-
.../pom.xml | 4 +-
.../affinity/NonStrictHostAffinityProcessor.java | 133 ++++++
.../non-strict-host-affinity}/module.properties | 2 +-
.../spring-non-strict-host-affinity-context.xml} | 8 +-
.../NonStrictHostAffinityProcessorTest.java | 172 ++++++++
.../non-strict-host-anti-affinity}/pom.xml | 19 +-
.../NonStrictHostAntiAffinityProcessor.java | 19 +-
.../module.properties | 2 +-
...ring-non-strict-host-anti-affinity-context.xml} | 8 +-
.../NonStrictHostAntiAffinityProcessorTest.java | 172 ++++++++
.../cloudstack/metrics/PrometheusExporterImpl.java | 18 +-
plugins/pom.xml | 2 +
.../deploy/DeploymentPlanningManagerImpl.java | 34 +-
.../java/com/cloud/network/NetworkModelImpl.java | 75 ++--
.../java/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../com/cloud/server/ManagementServerImpl.java | 3 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 3 +
.../affinity/AffinityGroupServiceImpl.java | 5 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 40 +-
.../deploy/DeploymentPlanningManagerImplTest.java | 46 +++
.../java/com/cloud/network/NetworkModelTest.java | 18 +
.../component/test_acl_sharednetwork.py | 311 +++++++-------
.../smoke/test_nonstrict_affinity_group.py | 448 +++++++++++++++++++++
test/integration/smoke/test_vm_autoscaling.py | 89 ++--
ui/public/locales/en.json | 39 +-
ui/src/components/view/BulkActionProgress.vue | 3 +
ui/src/components/view/BulkActionView.vue | 13 +-
ui/src/components/widgets/Console.vue | 15 +-
ui/src/components/widgets/TooltipLabel.vue | 10 +-
ui/src/config/section/compute.js | 5 +-
ui/src/views/AutogenView.vue | 11 +
ui/src/views/compute/DeployVM.vue | 18 +-
ui/src/views/compute/StartVirtualMachine.vue | 11 +-
.../compute/wizard/AffinityGroupSelection.vue | 9 +-
.../views/compute/wizard/NetworkConfiguration.vue | 14 +-
ui/src/views/network/LoadBalancing.vue | 24 +-
.../src/main/java/com/cloud/utils/StringUtils.java | 20 +-
52 files changed, 1622 insertions(+), 382 deletions(-)
create mode 100644 api/src/test/java/com/cloud/deploy/DataCenterDeploymentTest.java
copy plugins/affinity-group-processors/{explicit-dedication => non-strict-host-affinity}/pom.xml (89%)
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java
copy plugins/{ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics => affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity}/module.properties (96%)
copy plugins/affinity-group-processors/{host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml => non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml} (85%)
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/test/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessorTest.java
copy plugins/{storage-allocators/random => affinity-group-processors/non-strict-host-anti-affinity}/pom.xml (81%)
copy api/src/main/java/org/apache/cloudstack/affinity/AffinityGroup.java => plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessor.java (69%)
copy plugins/{ha-planners/skip-heurestics/src/main/resources/META-INF/cloudstack/skip-heurestics => affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity}/module.properties (95%)
copy plugins/affinity-group-processors/{host-anti-affinity/src/main/resources/META-INF/cloudstack/host-anti-affinity/spring-host-anti-affinity-context.xml => non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml} (84%)
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/src/test/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessorTest.java
create mode 100644 test/integration/smoke/test_nonstrict_affinity_group.py