Squashed commit of the following:

commit e7d44d816f3ca7d2764b8984f7b3cd04ac71d369
Merge: fed5dcf e8e2392
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 28 18:26:29 2014 +0000

    Merge "Raise NotImplementedError instead of NotImplemented"

commit fed5dcf5eef78669e30995f4af7a4be94829881b
Merge: 68a13b0 5ae2d91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 28 11:09:28 2014 +0000

    Merge "Ensure assertion matches dict iter order in test"

commit 68a13b0e1ad95d1cd1a1eadd9469ae661dcf88e3
Merge: b50a174 22cce12
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 28 11:09:12 2014 +0000

    Merge "Add support for provider-network extension in nuage Plugin"

commit b50a17400a2d75a22164a8d42e3fe313400812a7
Merge: 6454ce0 9294de4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 28 02:05:25 2014 +0000

    Merge "One Convergence: Skip all tests with 'v6' in name"

commit 22cce1255e1d9bb7ea22ea4282aa11b3f1ca4b4e
Author: Divya ChanneGowda <divya.hc@gmail.com>
Date:   Thu Aug 14 12:03:13 2014 -0700

    Add support for provider-network extension in nuage Plugin

    This implements support for creating provider networks
    with Nuage plugin.

    Implements: blueprint providernet-ext-support-for-nuage-plugin
    Change-Id: Ibabc1561fc7b6bd5ea38617f145af1d0d4545a4f

commit 9294de441e684a81f6e802ba0564083f1ad319d6
Author: Kevin Benton <blak111@gmail.com>
Date:   Thu Aug 21 22:56:13 2014 -0700

    One Convergence: Skip all tests with 'v6' in name

    Adds a check to the test setup for the One Convergence tests
    to look for v6 in the name of the test and skip it if present.
    This prevents IPv6 developers from having to explicitly skip
    each new IPv6 test in the One Convergence unit tests until the
    plugin gains IPv6 support.

    Closes-bug: #1361366
    Change-Id: I5c17d7290302597d5c85ef2c1df95f4f71e1a69b

commit e8e2392321e0fd3e2b8a0345b725f2e8df854a34
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Fri Jul 4 13:12:26 2014 +0200

    Raise NotImplementedError instead of NotImplemented

    NotImplementedError is the name of the exception
    (https://docs.python.org/2/library/exceptions.html).

    NotImplemented is the name of a constant
    (https://docs.python.org/2/library/constants.html).

    It makes no sense to raise a constant. The exception should
    be raised instead.

    Change-Id: I4969e26eb7b46f008ea3c8bd0093490c425f7069
    Closes-Bug: #1339855

commit 5ae2d9145be180ad2e8df7e887091a7fbad8fb08
Author: Kevin Benton <blak111@gmail.com>
Date:   Tue Aug 5 00:04:33 2014 -0600

    Ensure assertion matches dict iter order in test

    Fixes a test_linux_ip_lib test that made an assertion
    on a command that was called that could fail depending
    on the order of the dictionary when it was iterated over.

    This patch makes the assertion match the order that the
    command is constructed by iterating through the dictionary
    as well.

    Partial-Bug: #1348818
    Change-Id: I7baa518169c193f7e98d38632e1db16eb57ffee7

Change-Id: I23dddd2a91f5d2ba59fa6b35d3df6769445cd865
Revert "Squashed commit of the following:"

This reverts commit eb9b7bf570ccc4ba42c986caa95c5078f5b0d26a.

Change-Id: Ic6217973ab0efc6c5fe47f11ff488d00efa017be