Merge pull request #1523 from nlivens/bug/CLOUDSTACK-9365 CLOUDSTACK-9365 : updateVirtualMachine with userdata should not error when a VM is attached to multiple networks from which one or more doesn't support userdata
* pr/1523: Marvin script for cloudstack-9365 CLOUDSTACK-9365 : updateVirtualMachine with userdata should not error when a VM is attached to multiple networks from which one or more doesn't support userdata Signed-off-by: Will Stevens <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/cb55624a Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/cb55624a Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/cb55624a Branch: refs/heads/master Commit: cb55624af8239cf9ead3e24c4187ebdd1715325c Parents: 82b702d 9df51fa Author: Will Stevens <[email protected]> Authored: Fri May 20 08:34:54 2016 -0400 Committer: Will Stevens <[email protected]> Committed: Fri May 20 08:34:55 2016 -0400 ---------------------------------------------------------------------- server/src/com/cloud/vm/UserVmManagerImpl.java | 38 ++-- server/test/com/cloud/vm/UserVmManagerTest.java | 52 +++++ .../test_deploy_vm_userdata_multi_nic.py | 188 +++++++++++++++++++ 3 files changed, 264 insertions(+), 14 deletions(-) ----------------------------------------------------------------------
