GitHub user rhtyd opened a pull request:

    Fwd merge 4.9+marvintestfixes on master

    @blueorangutan package

You can merge this pull request into a Git repository by running:

    $ git pull master-marvinfixes

Alternatively you can review and apply these changes as the patch at:

To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:

    This closes #1708
commit 47104cf2b359800be55b34a546a7085a67add86b
Author: Paul Angus <>
Date:   2016-09-26T11:08:41Z

    fix ping tests to properly recognise successful ping test

commit 7a1efd687e31e26f5b687d43c320751610a0aeab
Author: Boris <>
Date:   2016-09-29T15:57:58Z

    CLOUDSTACK-9514: Making the credentials of the host to be picked up from the
    Use config file, instead of hardcoded crendentials
    Signed-off-by: Rohit Yadav <>

commit 052a9af0235134ea0256993345662a21a7d4e809
Author: Murali Reddy <>
Date:   2016-09-29T16:17:15Z

    CLOUDSTACK-9515: internal LB vm is not handled when parsing cmd_line.json,
    resulting in internal LB vm not come up
    parsing cmd_line to create 'ips' data bag, never handled internal lb vm, 
but still
    worked due to another bug. support for internal lb vm is added with this fix

commit fcdc2cc52979e74c6a67c765251c429bf354e90f
Author: Murali Reddy <>
Date:   2016-09-29T17:11:34Z

    CLOUDSTACK-9511: fix to handle multiple physical 
    modified script to handle case where there can be multple physical networks
    in the zone
    Signed-off-by: Rohit Yadav <>

commit 99da5338ff0b36be8cb139927e00782c15d1a235
Author: Paul Angus <>
Date:   2016-09-30T07:46:29Z

    fix macchinina template specificied for vmware in Marvin tests
    - Fix macchnina template url
    - Fix a variable scope issue
    Signed-off-by: Rohit Yadav <>

commit 79f0adf3974e45ad416a50e0fc24ae6f529eff62
Author: Paul Angus <>
Date:   2016-09-30T07:47:30Z

    Marvin Tests: Fix VPC network offering selection
    Signed-off-by: Rohit Yadav <>

commit 0eb4fae8b7e6f48a961d424b1f168c277bc82c78
Author: Rohit Yadav <>
Date:   2016-09-30T09:42:37Z

    CLOUDSTACK-9161: move quota test to plugins
    The quota integration test requires special setup and is moved to plugins
    directory as in 4.9 and master branch.
    Signed-off-by: Rohit Yadav <>

commit 1f27874eaf0d1d8cb793527bd5b12cd262e3de2e
Author: Murali Reddy <>
Date:   2016-09-30T11:29:12Z

    CLOUDSTACK-9522: Check for available attribute in marvin response
    - Handle case where physical network instance does not have vlan attribute
    - Handle case where listIso response may not have status attribute
    Signed-off-by: Rohit Yadav <>

commit d4f0bf1ca92205f1838d68ec022d62450675a669
Author: Boris <>
Date:   2016-10-03T10:57:15Z

    CLOUDSTACK-9526: Marvin - Fix a hardcoded 
username and password
    Signed-off-by: Rohit Yadav <>

commit dc932687888aa068ff4d4e657a76c07cff26cd90
Author: Rohit Yadav <>
Date:   2016-10-03T10:30:05Z

    CLOUDSTACK-9524: Check router hypervisor before ssh to VR
    SSH to VR for vmware, goes via the mgmt server and uses ssh keys at
    /var/cloudstack path. Add suitable checks to tests failing on vmware.
    Signed-off-by: Rohit Yadav <>

commit 394f2e359f2af9de6c7e586659fed47051f44146
Author: Boris <>
Date:   2016-10-03T14:53:51Z

    CLOUDSTACK-9527: Skip tests not supported for hypervisor
    - test_01_test_vm_volume_snapshot not supported for Xen, tests keep failing
    - Skip snapshot tests for centos6/kvm as snapshot is not supported by older
      qemu-img versions
    Signed-off-by: Rohit Yadav <>

commit 5545bcaa9de9ddcc2e4842dc5d2bb073897ebef2
Author: Rohit Yadav <>
Date:   2016-10-04T12:12:53Z

    CLOUDSTACK-9531: Try template teardown without failure
    As per previous discussions and ticket, a template deletion may result in 
    (exception thrown) for templates that are not properly downloaded. The 
    method, a template may be tried for deletion but on failure we may ignore it
    as account deletion/tearDown would retry to cleanup resource owned by the 
    Signed-off-by: Rohit Yadav <>

commit b0d527688f2bd781d99511ac72c638aeca12f95b
Author: Boris <>
Date:   2016-10-03T14:53:51Z

    CLOUDSTACK-9527: test_01_test_vm_volume_snapshot making test negative again
    - test_01_test_vm_volume_snapshot not supported for Xen, tests keep failing
    Signed-off-by: Rohit Yadav <>

commit 0c146e14c645811c02d6e3c74fd24ed5b3a2953c
Author: Rohit Yadav <>
Date:   2016-10-04T18:25:46Z

    CLOUDSTACK-9532: Use macchinina as a template for failing tests
    - Switches to macchinina as template for VM in the tests
    - Modifies the ostype of the macchinina template to 'Other Linux (64-bit)'
    - Check template download status, fixes Nonetype iterable issue
    Signed-off-by: Rohit Yadav <>

commit 93ac134f1e5c4c4c22029eca241f75362303837a
Author: Murali Reddy <>
Date:   2016-10-05T09:22:06Z

    CLOUDSTACK-9533: gateway of public IP is not handled correctly when parsing 
    cmd_line.json to create ips.json databag
    using 'gateway' in cmd_line for the public ip gateway while creating 
ips.json databag

commit 409e504f6f96c19dd934f69049aec82e40c755cd
Author: Rohit Yadav <>
Date:   2016-10-06T10:03:09Z

    CLOUDSTACK-9529: Cleanup resources after marvin test completes
    - Cleans up volumes, snapshots and VM after running test_snapshots
    Signed-off-by: Rohit Yadav <>

commit dea1d13817f100852d57b7803f21d517ce1ae2ee
Author: Rohit Yadav <>
Date:   2016-10-13T16:38:54Z

    Merge branch 'shapeblue/4.8-marvinpingtests' into 4.9

commit 745ce4cad4e8e854448012d9aba9bc882fd5ef29
Author: Rohit Yadav <>
Date:   2016-10-13T17:27:47Z

    Merge branch 'shapeblue/4.9-marvintestfixes' into master
    Signed-off-by: Rohit Yadav <>


If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at or file a JIRA ticket
with INFRA.

Reply via email to