VPNaaS: Fix UT breakage in neutron-vpnaas

[Paul Michali]

The commit for namespaces in neutron (under review 147744, which is approved, but awaiting upstreaming), changes the router creation logic. This breaks the neutron-vpnaas unit tests.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/160983
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=252c98c96547becff9490e14d783c70d7e1ff7e7
Submitter: Jenkins
Branch: master

commit 252c98c96547becff9490e14d783c70d7e1ff7e7
Author: Paul Michali <email address hidden>
Date: Tue Mar 3 16:04:00 2015 -0500

    VPNaaS: Fix unit test breakage

    With the recent refactoring in Neutron, the router creation logic has
    changed. This modifies the VPNaaS repo unit tests to be compatible
    with these changes. Reference review 147744, which is approved and
    awaiting merge.

    Note: There were two tests which were testing DVR, but were calling
    a router vs a DVR. Didn't seem to affect the test done, however, but
    fixed.

    Change-Id: Ic310a323462e02a9b1b8989122e7b20444402d1a
    Closes-Bug: #1427858

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/162286
Committed: https://git.openstack.org/cgit/openstack/neutron-vpnaas/commit/?id=2c7440b9b3f3600739914350d25a41864b19e683
Submitter: Jenkins
Branch: master

commit 2c7440b9b3f3600739914350d25a41864b19e683
Author: Paul Michali <email address hidden>
Date: Fri Mar 6 15:04:37 2015 -0500

    VPNaaS: Fixing UT breakage.

    The issue is that DvrRouter() takes at least 5 args and the
    unit test is passing 4. The odd thing is, that this change
    for 5 args was done in commit 50000741 on 2/23, and there
    have been commits out for review since then, that have passed
    this unit test (e.g. review 160179), whereas test runs today
    are failing.

    In any case, we need this change in ASAP.

    Change-Id: Iafeb55f17487f8b8193a1f1f99529b7786a0c37f
    Related-Bug: 1427858