This is an automated email from the ASF dual-hosted git repository.
andrijapanic pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from 70d1535 Merge remote-tracking branch 'origin/4.13'
add ce896a4 [Vmware] Enable PVLAN support on L2 networks (#3732)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/network/Network.java | 22 ++
.../java/com/cloud/network/NetworkProfile.java | 5 +
.../java/com/cloud/offering/NetworkOffering.java | 2 +-
.../api/command/user/network/CreateNetworkCmd.java | 8 +
.../service/NetworkOrchestrationService.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 11 +
.../engine/orchestration/NetworkOrchestrator.java | 34 ++-
.../java/com/cloud/network/dao/NetworkDao.java | 2 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 72 +++++
.../main/java/com/cloud/network/dao/NetworkVO.java | 11 +
.../com/cloud/hypervisor/HypervisorGuruBase.java | 8 +
.../com/cloud/network/IpAddressManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 80 +++++-
.../com/cloud/network/guru/DirectNetworkGuru.java | 4 +
.../com/cloud/network/guru/GuestNetworkGuru.java | 4 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 2 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 4 +-
.../cloud/network/CreatePrivateNetworkTest.java | 3 +-
.../com/cloud/network/NetworkServiceImplTest.java | 120 +++++++++
.../java/com/cloud/network/dao/NetworkDaoTest.java | 64 +++--
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 7 +-
test/integration/smoke/test_network.py | 289 ++++++++++++++++++++-
tools/marvin/marvin/lib/base.py | 4 +
ui/l10n/en.js | 5 +
ui/scripts/sharedFunctions.js | 96 ++++++-
utils/src/main/java/com/cloud/utils/UriUtils.java | 11 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 33 ++-
28 files changed, 835 insertions(+), 72 deletions(-)
create mode 100644
server/src/test/java/com/cloud/network/NetworkServiceImplTest.java
