This is an automated email from the ASF dual-hosted git repository.
paul_a pushed a commit to branch 4.11
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit fe10e684f9a172ac8b2a6af48a1ef5611622a850
Merge: c2f4b36 cca2505
Author: Paul Angus <paul.an...@shapeblue.com>
AuthorDate: Wed Sep 26 10:21:52 2018 -0400
Merge pull request #2743 from nuagenetworks/bugfix/marvin_config_drive
CLOUDSTACK-10380: Fix startvm giving another pw after pw reset
.../engine/orchestration/NetworkOrchestrator.java | 2 +-
.../schema/src/com/cloud/vm/dao/UserVmDaoImpl.java | 12 +-
.../resourcedetail/ResourceDetailsDao.java | 2 +
.../resourcedetail/ResourceDetailsDaoBase.java | 14 +-
.../network/element/VirtualRouterElement.java | 17 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 25 +-
test/integration/component/test_configdrive.py | 2161 ++++++++++----------
test/integration/plugins/nuagevsp/nuageTestCase.py | 126 +-
test/integration/plugins/nuagevsp/nuage_lib.py | 53 +-
.../plugins/nuagevsp/test_nuage_configdrive.py | 2088 +++++++------------
.../plugins/nuagevsp/test_nuage_extra_dhcp.py | 49 +-
.../plugins/nuagevsp/test_nuage_internal_dns.py | 46 +-
.../nuagevsp/test_nuage_network_migration.py | 18 +-
.../plugins/nuagevsp/test_nuage_password_reset.py | 19 +-
.../plugins/nuagevsp/test_nuage_source_nat.py | 20 +-
.../plugins/nuagevsp/test_nuage_static_nat.py | 26 +-
.../plugins/nuagevsp/test_nuage_vpc_internal_lb.py | 130 +-
.../plugins/nuagevsp/test_nuage_vpc_network.py | 6 +-
.../nuagevsp/test_nuage_vsp_domain_template.py | 18 +-
.../nuagevsp/test_nuage_vsp_mngd_subnets.py | 12 +-
tools/marvin/marvin/lib/base.py | 11 +-
tools/marvin/marvin/lib/common.py | 6 +-
tools/marvin/setup.py | 6 +-
23 files changed, 2241 insertions(+), 2626 deletions(-)
