Upgrade test check for nova network while neutron used

[Maksym Strukov]

upgrade_ha_one_controller_env test waits for 10 smiles on step 5 when checking services are up. 10 smiles complies to env with nova network, but neutron is used in thread http://jenkins-product.srt.mirantis.net:8080/job/6.1.system_test.ubuntu.ceph_multinode_compact_neutron.upgrade/

Actual:

test failed with assert:

AssertionError: Expected service count is 10, but get 7 count, actual list [<Service: nova-consoleauth>, <Service: nova-scheduler>, <Service: nova-conductor>, <Service: nova-cert>, <Service: nova-compute>, <Service: nova-compute>, <Service: nova-compute>]

[Maksym Strukov (unbelll)]

reproduced on CI http://jenkins-product.srt.mirantis.net:8080/job/6.1.system_test.ubuntu.ceph_multinode_compact_neutron.upgrade/35/consoleText

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/181508

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/181508
Committed: https://git.openstack.org/cgit/stackforge/fuel-qa/commit/?id=dc2965058ea5b15ade41173ba9abc23f7dcd5750
Submitter: Jenkins
Branch: master

commit dc2965058ea5b15ade41173ba9abc23f7dcd5750
Author: Maksym Strukov <email address hidden>
Date: Fri May 8 22:07:29 2015 +0300

    Respect network type in upgrade_ha_one_controller_env test

    Respect different types of networks when checking services is up
    after deployment in test upgrade_ha_one_controller_env test.
    Should wait for 7 nova services if neutron network enabled
    instead of 10 when nova used.

    Change-Id: I989603b71c8a2df207c65b98e5c57bd66adbe3a6
    Closes-Bug: #1453246

[Andrey Sledzinskiy (asledzinskiy)]

AssertionError: Unexpected count of networks detected, expected: 1, current 2 count, full list [<Network: net04_ext>, <Network: net04>]

For neutron we should expect 2 networks, for nova 1

[OpenStack Infra (hudson-openstack)]

Related fix proposed to branch: master
Review: https://review.openstack.org/182636

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/182636
Committed: https://git.openstack.org/cgit/stackforge/fuel-qa/commit/?id=1909183b74aebd605efe50e8020ed73cb4d45198
Submitter: Jenkins
Branch: master

commit 1909183b74aebd605efe50e8020ed73cb4d45198
Author: Maksym Strukov <email address hidden>
Date: Wed May 13 14:57:56 2015 +0300

    Respect network type in upgrade_ha_one_controller_env test

    Respect different types of networks when checking services is up
    after deployment in test upgrade_ha_one_controller_env test.
    Should wait for 2 networks if neutron enabled instead of 1 when
    nova used.

    Change-Id: I060b6f87724b26110b0d1d8eb64e1e3f41923afc
    Closes-Bug: #1453246