This is an automated email from the ASF dual-hosted git repository.
rohit pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
from ca17b6a Merge branch '4.11': Fixes #2666 conditional template filter
(#2669)
add caf5857 Fix two typos (from uanble to unable). (#2676)
add d46fa6e Fix test_configdrive.py (#2673)
add 9b83337 Create unit test cases for 'ConfigDriveBuilder' class (#2674)
add 8798014 CLOUDSTACK-10377: Fix Network restart for Nuage (#2672)
new 9146d7b Merge branch '4.11'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/com/cloud/vm/VirtualMachineProfile.java | 3 +
.../com/cloud/vm/VirtualMachineProfileImpl.java | 5 +
.../storage/configdrive/ConfigDrive.java | 11 +-
.../storage/configdrive/ConfigDriveBuilder.java | 322 ++++++++-----
.../configdrive/ConfigDriveBuilderTest.java | 492 ++++++++++++++++++--
.../storage/configdrive/ConfigDriveTest.java | 18 +-
.../resource/HypervDirectConnectResource.java | 2 +-
.../com/cloud/network/element/NuageVspElement.java | 85 ++--
.../network/guru/NuageVspGuestNetworkGuru.java | 83 +++-
.../network/guru/NuageVspGuestNetworkGuruTest.java | 506 +++++++++++----------
.../network/element/VirtualRouterElement.java | 4 +
.../network/element/VpcVirtualRouterElement.java | 8 +
.../element/ConfigDriveNetworkElementTest.java | 19 +-
.../src/test/java/rdpclient/MockServerTest.java | 7 +-
.../resource/NfsSecondaryStorageResource.java | 19 +-
test/integration/component/test_configdrive.py | 131 +++++-
.../plugins/nuagevsp/test_nuage_configdrive.py | 9 +
.../plugins/nuagevsp/test_nuage_vpc_network.py | 8 +-
.../integration/plugins/nuagevsp/test_nuage_vsp.py | 10 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +-
20 files changed, 1245 insertions(+), 499 deletions(-)
copy utils/src/main/java/com/cloud/utils/FileUtil.java =>
engine/storage/configdrive/test/org/apache/cloudstack/storage/configdrive/ConfigDriveTest.java
(72%)
--
To stop receiving notification emails like this one, please contact
[email protected].
