nova network: Cidr after deployment is not equal to cidr by default

[Dennis Dmitriev]

When cluster is deployed with Nova network, our network verification test is failed with the following error:

Traceback (most recent call last):
...
  File "/home/jenkins/workspace/package_testing_deb/fuelweb_test/models/fuel_web_client.py", line 1240, in check_fixed_network_cidr
    'Cidr after deployment is not equal'
AssertionError: Cidr after deployment is not equal to cidr by default

It is happened because output of the command 'nova network-list' was changed. Tatyana Leontovich suggested to use 'nova net-list' instead 'nova network-list' with expected output.

api: '1.0'
astute_sha: c440db0449f3fe6ce6007b514e9133d8f6d0c750
auth_required: true
build_id: 2014-10-15_12-56-31
build_number: '22'
feature_groups:
- mirantis
fuellib_sha: c03e89d3e59685ccd1c230a53f4eb8da95047aac
fuelmain_sha: aa19ee635a48df8398b08a8934f3264d46ca55ce
nailgun_sha: bddd4a2571af02de3a7d8f0640928a5c2f16d48c
ostf_sha: de177931b53fbe9655502b73d03910b8118e25f1
production: docker
release: '6.0'
release_versions:
  2014.2-6.0:
    VERSION:
      api: '1.0'
      astute_sha: c440db0449f3fe6ce6007b514e9133d8f6d0c750
      build_id: 2014-10-15_12-56-31
      build_number: '22'
      feature_groups:
      - mirantis
      fuellib_sha: c03e89d3e59685ccd1c230a53f4eb8da95047aac
      fuelmain_sha: aa19ee635a48df8398b08a8934f3264d46ca55ce
      nailgun_sha: bddd4a2571af02de3a7d8f0640928a5c2f16d48c
      ostf_sha: de177931b53fbe9655502b73d03910b8118e25f1
      production: docker
      release: '6.0'

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/128680
Committed: https://git.openstack.org/cgit/stackforge/fuel-main/commit/?id=a51416a48c9bb7481a6b870d825c07f274fd0184
Submitter: Jenkins
Branch: master

commit a51416a48c9bb7481a6b870d825c07f274fd0184
Author: Dennis Dmitriev <email address hidden>
Date: Wed Oct 15 18:18:53 2014 +0300

    Fix check_fixed_network_cidr for nova network

    * Replace 'nova network-list' with 'nova net-list'
      in check_fixed_network_cidr function;
    * Add network checks to Jenkins 'bvt_2' and 'smoke' tests
      ('TestHaVLAN' and 'deploy_simple_cinder')
    * Fix default local patches to local repositories in settings.py

    Change-Id: I859e308e3d1b4ff360b5e730275b21868e775d9f
    Closes-Bug: #1381586

[Nastya Urlapova (aurlapova)]

In https://github.com/stackforge/fuel-main/blob/a51416a48c9bb7481a6b870d825c07f274fd0184/fuelweb_test/models/fuel_web_client.py#L1227
we expect cidr nailgun cidr is 10.0.0.0/16
after deploy with juno we got list of sub-nets
root@node-1:~# . openrc; nova net-list
Tatyanka_Leontov
+--------------------------------------+---------------+---------------+
Tatyanka_Leontov
| ID | Label | CIDR |
Tatyanka_Leontov
+--------------------------------------+---------------+---------------+
Tatyanka_Leontov
| 6ef5f761-846a-4e1e-a08f-4ef8cd9fad3d | novanetwork_0 | 10.0.0.0/27 |
Tatyanka_Leontov
| 8a9b6b94-ac16-4f17-bb46-277a327563cd | novanetwork_1 | 10.0.0.32/27 |
Tatyanka_Leontov
| c4bfe01b-ed30-4de7-b194-0a2efa48eac3 | novanetwork_2 | 10.0.0.64/27 |
Tatyanka_Leontov
| a1c4ddb4-e6b0-481f-bd3b-743a3586557b | novanetwork_3 | 10.0.0.96/27 |
Tatyanka_Leontov
| 9681d285-7409-418c-bf88-cc43bc1937e2 | novanetwork_4 | 10.0.0.128/27 |
Tatyanka_Leontov
| 268e8bd5-187d-40d7-bb82-88e5fbf078a7 | novanetwork_5 | 10.0.0.160/27 |
Tatyanka_Leontov
| 6e052de3-2add-483d-b0e5-f635baa6dd6a | novanetwork_6 | 10.0.0.192/27 |
Tatyanka_Leontov
| 08f7b6be-51d4-48a0-92a1-072b3cdd0b47 | novanetwork_7 | 10.0.0.224/27 |

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/129006
Committed: https://git.openstack.org/cgit/stackforge/fuel-main/commit/?id=a2c456354b94cc0c664af7e75e6864f546748091
Submitter: Jenkins
Branch: master

commit a2c456354b94cc0c664af7e75e6864f546748091
Author: NastyaUrlapova <email address hidden>
Date: Thu Oct 16 21:39:43 2014 +0400

    Hot fix for CI temporary

    Related-Bug: #1381586

    Change-Id: I030834c0477d5cfeede8857182210cfbd30b0095

[Tatyanka (tatyana-leontovich)]

So here we split one net /16 on 8 ones /27, as result cidr in check differ from nailgun has. We should to add separate check for this case, and verify if net from nova net list is subnet of net that was register in nailgun

[Roman Prykhodchenko (romcheg)]

AFAIK there is a patch on review for this bug. Could you please attach the link here?

[Dennis Dmitriev (ddmitriev)]

There was a patch for fuel-main repository created by Tatyana Leontovich: https://review.openstack.org/#/c/130269/
It should be included into fuel-qa repository.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

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

commit fcfb342d3076a4ec3695d455331d25c33d8c52ff
Author: Dennis Dmitriev <email address hidden>
Date: Wed Feb 18 13:22:59 2015 +0200

    Add additional network verification for nova subnets

    Based on the review by Tatyana Leontovich:
    https://review.openstack.org/#/c/130269/

    If we split the fixed network into smallest ones, check that all
    created subnets do not go beyond the nova fixed network and do not
    intersect each other.

    Change-Id: I9834fd958382e7a44d667f50d49d28e5bdc393f7
    Implements: blueprint implement-regressive-tests-and-checks
    Closes-Bug: #1381586