This is an automated email from the ASF dual-hosted git repository. rohit pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 9146d7b7a0df2867d86e3cec352c631b4826962e Merge: ca17b6a 8798014 Author: Rohit Yadav <[email protected]> AuthorDate: Wed Jun 6 12:41:18 2018 +0530 Merge branch '4.11' .../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} | 20 +- .../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, 1244 insertions(+), 502 deletions(-) -- To stop receiving notification emails like this one, please contact [email protected].
