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/02/19 14:02:27 UTC
[cloudstack] branch master updated (b01e011 -> 458d3b5)
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 b01e011 Merge release branch 4.13 to master
add 458d3b5 Multiple networks support for vms in advanced zone with securit… (#3639)
No new revisions were added by this update.
Summary of changes:
.../java/com/cloud/agent/api/RebootCommand.java | 11 +
.../com/cloud/agent/api/SecurityGroupRulesCmd.java | 14 +-
.../network/security/SecurityGroupManager.java | 2 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 38 +-
.../src/main/java/com/cloud/vm/dao/NicDao.java | 2 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 9 +
.../kvm/resource/LibvirtComputingResource.java | 123 +++-
...irtNetworkRulesVmSecondaryIpCommandWrapper.java | 4 +-
.../wrapper/LibvirtPlugNicCommandWrapper.java | 10 +-
.../wrapper/LibvirtRebootCommandWrapper.java | 8 +-
.../LibvirtSecurityGroupRulesCommandWrapper.java | 9 +-
.../wrapper/LibvirtStartCommandWrapper.java | 26 +-
.../wrapper/LibvirtUnPlugNicCommandWrapper.java | 5 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 7 +-
scripts/vm/network/security_group.py | 466 +++++++++++++--
.../network/security/SecurityGroupManagerImpl.java | 42 +-
.../security/SecurityGroupManagerImpl2.java | 7 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 24 +-
.../component/test_multiple_nic_support.py | 629 +++++++++++++++++++++
tools/marvin/marvin/lib/utils.py | 10 +-
ui/scripts/instanceWizard.js | 47 +-
ui/scripts/instances.js | 10 +
ui/scripts/network.js | 8 +
ui/scripts/ui-custom/instanceWizard.js | 17 +-
24 files changed, 1404 insertions(+), 124 deletions(-)
rename {server => engine/components-api}/src/main/java/com/cloud/network/security/SecurityGroupManager.java (95%)
create mode 100644 test/integration/component/test_multiple_nic_support.py