Add router interface checking for duplicated subnets should ingore external network

[Dongcan Ye]

When adding router interface by subnet, it will check the router attached port, this will cause add router interface failed in some situation.

=======================Steps to reproduce=======================
$ neutron net-create test
$ neutron subnet-create test 192.168.138.0/24 --name test-subnet
$ neutron router-create test-router

# In this step, ext-net has cidr 192.168.128.0/20
$ neutron router-gateway-set test-router ext-net

$ neutron router-interface-add test-router test-subnet
neutron CLI is deprecated and will be removed in the future. Use openstack CLI instead.
Bad router request: Cidr 192.168.138.0/24 of subnet 72a72809-371b-47e1-a70f-15fb9a342760 overlaps with cidr 192.168.128.0/20 of subnet ec039c18-2eba-47c6-b219-fdc76a0caf66.
Neutron server returns request_ids: ['req-8b9b3d8f-44c9-437c-9b2b-98d1761d4b1c']

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/473356
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=0415f4f50cf1cd020c43acffb1330fda23b65d95
Submitter: Jenkins
Branch: master

commit 0415f4f50cf1cd020c43acffb1330fda23b65d95
Author: Dongcan Ye <email address hidden>
Date: Mon Jun 12 18:39:55 2017 +0800

    Fix bug when checking duplicated subnets for router interface

    If user set gateway for router first, and gateway subnet
    overlapped with tenant subnet, will cause add router interface
    to fail.

    Add router interface checking for duplicated subnets should
    ingore the gateway network.

    This patch also filters gateway network when creating gw port.

    Change-Id: Idcc8be221656ace13b12b62f559e4cb9a6af4f32
    Closes-Bug: #1697410

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/ocata
Review: https://review.openstack.org/476608

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/476608
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=6afcb3aa7823bbb501ccaa0825bb0d98af1a582d
Submitter: Jenkins
Branch: stable/ocata

commit 6afcb3aa7823bbb501ccaa0825bb0d98af1a582d
Author: Dongcan Ye <email address hidden>
Date: Mon Jun 12 18:39:55 2017 +0800

    Fix bug when checking duplicated subnets for router interface

    If user set gateway for router first, and gateway subnet
    overlapped with tenant subnet, will cause add router interface
    to fail.

    Add router interface checking for duplicated subnets should
    ingore the gateway network.

    This patch also filters gateway network when creating gw port.

    Change-Id: Idcc8be221656ace13b12b62f559e4cb9a6af4f32
    Closes-Bug: #1697410
    (cherry picked from commit 0415f4f50cf1cd020c43acffb1330fda23b65d95)

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 11.0.0.0b3 development milestone.

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/neutron 10.0.3 release.