Bottom allocation pool calculation needs improvement

[Zhiyuan Cai]

After DVR support is added, we need to merge the top gateway ip to the bottom allocation pool and also remove the bottom gateway ip from the bottom allocation pool. The current bottom allocation pool calculation only merges the top gateway ip with one ip range, so in the following case:

pools: [x.x.x.2, x.x.x.5], [x.x.x.7, x.x.x.10]
top gateway ip: x.x.x.6

after merge, the pools become: [x.x.x.2, x.x.x.6], [x.x.x.7, x.x.x.10]
while should be: [x.x.x.2, x.x.x.10]

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/431301
Committed: https://git.openstack.org/cgit/openstack/tricircle/commit/?id=f0b6233181bf27ecd13b97b43fb641a274f5adb8
Submitter: Jenkins
Branch: master

commit f0b6233181bf27ecd13b97b43fb641a274f5adb8
Author: zhiyuan_cai <email address hidden>
Date: Thu Feb 9 11:30:15 2017 +0800

    Improve bottom allocation pool calculation

    1. What is the problem
    Current bottom allocation pool calculation only merges the top gateway
    ip with one ip range, so if the top gateway ip can connect two ip
    ranges, the two ranges are not merged. For example,

    pools: [x.x.x.2, x.x.x.5], [x.x.x.7, x.x.x.10]
    top gateway ip: x.x.x.6

    after merge, the pools become: [x.x.x.2, x.x.x.6], [x.x.x.7, x.x.x.10]
    while should be: [x.x.x.2, x.x.x.10]

    2. What is the solution to the problem
    Rewrite the calculation method to merge two ranges if they are connected
    by the top gateway ip.

    3. What the features need to be implemented to the Tricircle
    No new features.

    Change-Id: I4d56e9c992a3ad1106918551a3b4c23d09264928
    Closes-Bug: #1657621

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/tricircle 3.0.0 release.