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 2020/01/30 09:37:08 UTC

[cloudstack] branch master updated (518ed53 -> ac581d1)

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

dahn pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.


    from 518ed53  Merge remote-tracking branch 'origin/4.13'
     add ac581d1  New feature: Resource count (CPU/RAM) take only running vms into calculation (#3760)

No new revisions were added by this update.

Summary of changes:
 api/src/main/java/com/cloud/vm/UserVmService.java  |   2 +-
 .../api/command/user/vm/DeployVMCmd.java           |   3 +
 .../cloudstack/api/command/user/vm/StartVMCmd.java |   8 +-
 .../java/com/cloud/vm/VirtualMachineManager.java   |   3 +
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |  39 +-
 .../src/main/java/com/cloud/vm/dao/UserVmDao.java  |   2 +-
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |   7 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |   3 +
 .../resourcelimit/ResourceLimitManagerImpl.java    |  52 +-
 .../src/main/java/com/cloud/vm/UserVmManager.java  |   5 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  | 123 +--
 .../component/test_resource_count_running_vms.py   | 927 +++++++++++++++++++++
 tools/marvin/marvin/codes.py                       |   8 +
 tools/marvin/marvin/lib/common.py                  |  48 +-
 14 files changed, 1168 insertions(+), 62 deletions(-)
 create mode 100644 test/integration/component/test_resource_count_running_vms.py