Reviewed:  https://review.openstack.org/197751
Committed: https://git.openstack.org/cgit/openstack/neutron/commit/?id=d7e60d59a34a7415a0b0185dbaa99bdc84723608
Submitter: Jenkins
Branch:    feature/qos

commit 3da491cf5fe629559281507f65f12a0e34eaedf7
Author: Assaf Muller <email address hidden>
Date:   Tue Jun 30 13:22:17 2015 -0400

    Disable pylint job
    
    Disabling pylint until it gets unbroken. Pylint 1.4.1 is using
    logilab-common, which had a release on the 30th, breaking pylint.
    Pylint developers are planning a logilab-common release tomorrow
    which should unbreak pylint once again, at which point I'll
    re-enable pylint.
    
    Change-Id: I5d8aaab8192168946c2a0b74abc1a56848ca51a2
    Related-Bug: #1470186

commit 2bbfe6f8253659ebf6951b6426ffc446baacd420
Author: Russell Bryant <email address hidden>
Date:   Tue May 26 17:07:37 2015 -0400

    Move windows requirements to requirements.txt
    
    Commit 276028cca26af573c14938255e40c58358eabd4a added these
    requirements to setup.py from a custom build hook.  These requirements
    can now be expressed in requirements.txt.  We need to move them there
    so that the global requirements sync job can continue to keep setup.py
    in sync with the global version.
    
    Depends-on: I2369971d306c10dc39a1b89698cec95cf7551d07
    Change-Id: I3c07c279d33f6aed46c3a97dd9ba81251e51429a

commit 21ff82d9d33313bb88e5970c7b1829a65f195d33
Author: Rossella Sblendido <email address hidden>
Date:   Fri Dec 5 17:34:23 2014 +0100

    Adds base in-tree functional testing of the ovs_neutron_agent
    
    Base setup and utility methods for functional testing of the
    OVS L2 agent.
    
    Partially-Implements: blueprint restructure-l2-agent
    Co-Authored-By: Rossella Sblendido <email address hidden>
    
    Change-Id: I5b3149b2b8502b9b9a36d3e20d909872cc17f8e8

commit 1ac7581c6b7d343d2ee22e6c562871c0465d9735
Author: Livnat Peer <email address hidden>
Date:   Tue Jun 30 16:25:57 2015 +0300

    fix spelling mistakes
    
    Change-Id: If063f111fa42a6644a1dadc7f0c0b9bbfb359294

commit 9b23617111706ef6a89e8ba45457238acaea26e2
Author: Kevin Benton <email address hidden>
Date:   Mon Jun 29 22:24:22 2015 -0700

    Increase ping count on ARP spoof test
    
    The other IPv4 tests all have a count of 2 to tolerate
    ping failures due to slow ARP response/interface setup/etc.
    This patch increases test_arp_spoof_allowed_address_pairs_0cidr
    to 2 to match.
    
    Closes-Bug: #1470234
    Change-Id: I82bd8397672194f6162eef5392d4f19d57450552

commit 8123144fadd7c5d5e6e56a76ea860512619a2cf6
Author: Moshe Levi <email address hidden>
Date:   Sun Jun 28 14:37:14 2015 +0300

    Fix Consolidate sriov agent and driver code
    
    This patch add mising __init to mech_sriov/mech_driver/
    and update the setup.cfg to the new agent entrypoint
    
    Trivial Fix
    
    Change-Id: I53a527081feb78472f496675bbb3c5121d38a14a

commit 8942fccf02e6e179d47582fdb2792a1ca972da21
Author: Assaf Muller <email address hidden>
Date:   Mon Jun 29 11:38:51 2015 -0400

    Remove failing SafeFixture tests
    
    The fixtures 1.3 release attempted to fix the fixtures resource
    leak issue, but failed to do so completely. Our own SafeFixture
    is still needed: The 1.3 release broke our SafeFixture tests,
    but not the usage of SafeFixture itself. This patch removes
    those failing tests for now to unbreak the gate. Jakub reported
    a bug on fixtures 1.3:
    https://bugs.launchpad.net/python-fixtures/+bug/1469759
    
    We will continue to use SafeFixture until that bug is fixed
    in fixtures, at which point we will be able to require
    fixtures > 1.3.
    
    Change-Id: I59457c3bb198ff86d5ad55a1e623d008f0034b8f
    Closes-Bug: #1469734

commit 6e693fc91dd79cfbf181e3b015a1816d985ad02c
Author: Elena Ezhova <email address hidden>
Date:   Thu Jun 18 10:42:57 2015 +0300

    Switch to oslo.service
    
    oslo.service has graduated, so neutron should consume it.
    
    Closes-Bug: #1466851
    Depends-On: Ie0fd63f969f954029c3c3cf31337fbe38f59331a
    Depends-On: I2093b37d411df9a26958fa50ff523c258bbe06ec
    Depends-On: I4823d344878fc97e66ddd8fdae25c13a34dede40
    Change-Id: I0155b3d8b72f6d031bf6f855488f80acebfc25d4

commit 71dffb0a2c1720cd8233a329d32958a0160dd6f5
Author: Kevin Benton <email address hidden>
Date:   Mon Jun 29 08:27:41 2015 +0000

    Revert "Removed test_lib module"
    
    This reverts commit 9a6536de6e1a7fe9b2552adc142e254426b82b6f.
    
    We pulled all of the plugins out of the tree, many of which still inherit
    from neutron test classes. This change then stated that we no longer
    support testing other plugins. I think this is a bit premature and should
    have been discussed under the subject
    "Neutron plugins can't use neutron plugin unit tests" or something
    similar.
    
    Change-Id: I68318589f010b731574ea3bfa8df98492bab31fc

commit b21a88603e369a113c8b73c3aebc05fedf8da9d3
Author: Eugene Nikanorov <email address hidden>
Date:   Mon Jun 29 05:45:24 2015 +0400

    Don't access mock's attribute directly especially when it's not needed
    
    Change-Id: I0df2f7110301c096762396fb23e49a081d051f3b

commit 6d35f5fa91faf24694cf22bf9290f4743175b051
Author: Tomoaki Sato <email address hidden>
Date:   Mon Jun 29 10:02:20 2015 +0900

    Fix subnet updating failure on valid allocation pools
    
    Currently subnet updating with both allocation-pool and
    gateway_ip options is failing because of wrong parameter check.
    The check always checks gateway_ip against allocation pools in
    db, even when the allocation_pool parameter is given.The fix
    checks if given parameter of gateway_ip option doesn't conflict
    with given parameters of allocation-pool.
    
    Change-Id: Ia568aa1645b3160ab90a6010efd9a2b9b0d31ac8
    Closes-Bug: #1469573

commit 604101ec58d8dd6e6af4aa61c0b2f0d382f89931
Author: Meenakshi Kaushik <email address hidden>
Date:   Sun May 24 23:30:17 2015 -0700

    Add documentation for Linux Bridge (previously missing)
    
    Change-Id: I092b609f43b37ed85d08bc80d1d048b945abe222
    Closes-Bug: #1455979

commit e50e1a236983e0a59b9667bc546c92555c3d0e34
Author: Eugene Nikanorov <email address hidden>
Date:   Tue May 5 18:18:28 2015 +0400

    Add logging of agent heartbeats
    
    When troubleshooting problems with cluster it would be
    very convenient to have information about agent heartbeats
    logged with some searchable identifier which could create
    1-to-1 mapping between events in agent's logs and server's logs.
    
    Currently agent's heartbeats are not logged at all on server side.
    Since on a large cluster that could create too much logging
    (even for troubleshooting cases), it might make sense to make
    this configurable both on neutron-server side and on agent-side.
    
    DocImpact
    
    Change-Id: I0a127ef274a84bba5de47395d47b62f48bd4be16
    Closes-Bug: #1452582

commit 67658607cf69ad2274d8f32680042ca210c7db86
Author: Assaf Muller <email address hidden>
Date:   Fri Jun 26 17:17:14 2015 -0400

    Revert "Fix 'router_gateway' port status can't be updated"
    
    This patch breaks multinode fullstack tests and in my opinion
    is generally speaking wrong. I've added a comment to explain
    in the patch that's being reverted.
    
    This reverts commit with change ID:
    If428eadadfd36a9b19ea75920120e48ac49659f2
    
    Change-Id: I73b7825ccc26847ef03d60d6154d544a9145f7e5

commit b9656509c178041f729cbaa6a1ca974f4b3c6f5d
Author: Jakub Libosvar <email address hidden>
Date:   Thu Jun 18 16:00:56 2015 +0000

    RootHelperProcess: kill can consume signal number
    
    The kill() method now accepts a signal parameter.
    
    Change-Id: I2eb756a73565d93c979e62eaab358a3a519aa8dd

commit b9e9cfb08bf0609dcfea46403c510607e858926a
Author: Jakub Libosvar <email address hidden>
Date:   Wed Jun 17 13:10:13 2015 +0000

    Move NetcatTester to common/net_helpers
    
    The NetcatTester is a testing tool that can be used also in fullstack
    tests so I think it should go there to avoid imports in fullstack tests
    from functional.
    
    Tests for original helpers module was removed.
    
    Change-Id: I7229eba1dbc2ca3d524a1a021256b6202f4aecee

commit b622e6538ae5a606c1bc9830a2afe816a92a2ca5
Author: Jakub Libosvar <email address hidden>
Date:   Tue Jun 16 15:29:17 2015 +0000

    ip_lib: Add flush() command to IpNeigh to clean arp cache
    
    Change-Id: I938974e3d67373cd18d8a9c6538f1f8b2d09e965

commit b20fd81dbd497e058384a0af065dd0f1fdc4c728
Author: Jakub Libosvar <email address hidden>
Date:   Fri Jun 5 14:32:51 2015 +0000

    Refactor NetcatTester class
    
    Following capabilities were added:
       - used transport protocol is passed as a constant instead of bool
       - src port for testing was added
       - connection can be established explicitly
       - change constructor parameters of NetcatTester
    
    As a part of removing bool for protocol definition
    get_free_namespace_port() was also modified to match the behavior.
    
    Change-Id: Id2ec322e7f731c05a3754a65411c9a5d8b258126

commit 83e37980dcd0b2bad6d64dd2cb23bcd2891cafca
Author: jingliuqing <email address hidden>
Date:   Sat Jun 27 13:41:54 2015 +0800

    Use REST rather than ReST
    
    Change-Id: I06c9deaab58c5ec13bfeec39fb8fd4b1fe21f42d

commit 1b60df85ba3ad442c2e4e7e52538e1b9a1bf9378
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 25 18:34:38 2015 -0700

    Add a double-mock guard to the base test case
    
    Use mock to patch mock with a check to prevent multiple active
    patches to the same target. Multiple patches to the same target
    result in non-deterministic behavior when stopall() tries to
    undo the patches.[1]
    
    1. http://bugs.python.org/issue21239
    
    Change-Id: I3dd3d561a0267d80f464c15d69a4258b0a5e8aba
    Closes-Bug: #1468998

commit 78700ba70620f7b53b5ae71332cca853f5afa467
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 25 22:08:41 2015 -0700

    Remove duplicated mock patch of ip_lib
    
    The functional tests for agents were patching ip_lib in the
    function to configure an agent, so any tests that relied on
    multiple agents would patch ip_lib multiple times.
    
    Partial-Bug: #1468998
    Change-Id: Ibccf586dea870ec222369c0876f17f8eaf9a1aca

commit f242b171e910da460b8d98182dc10c5840c2c7d0
Author: Kyle Mestery <email address hidden>
Date:   Thu Jun 25 20:36:47 2015 +0000

    Consolidate sriov agent and driver code
    
    In preparation for decomposing the built-in reference implementation,
    this commits consolidates the sriov agent and driver code into a
    coherent place for it's life in the new repository. I've also given
    the unit tests a new home.
    
    DocImpact
    UpgradeImpact
    
    Partially-Implements: blueprint reference-implementation-split
    Partial-Bug: #1468433
    Closes-Bug: #1427317
    
    Change-Id: Ic8b5215de76e191030228bc28773cd6535e889d8
    Signed-off-by: Kyle Mestery <email address hidden>

commit 724c78071da28bae838a4145a9d4cea42f853048
Author: Kyle Mestery <email address hidden>
Date:   Wed Jun 24 19:12:06 2015 +0000

    Restructure agent code in preparation for decomp
    
    This commit moves the L2 agents (Linuxbridge and OVS) into the
    ML2 directory, while at the same time also moving the ML2 server
    bits into toplevel directories. It also moves the configuration
    files and unit tests. We also move the l2pop RPC mixin while
    here as well.
    
    DocImpact
    UpgradeImpact
    
    Partially-Implements: blueprint reference-implementation-split
    Partial-Bug: #1468433
    Closes-Bug: #1427317
    Change-Id: If6feca7b7a6bdd6c3c6feb929fa26fb4b1f72770
    Signed-off-by: Kyle Mestery <email address hidden>

commit 82fddfbb651911c7cb6818428ff7604c9745499c
Author: sridhargaddam <email address hidden>
Date:   Mon Jun 22 14:13:56 2015 +0000

    Fix ip_lib get_gateway for default gateway on an iface
    
    Currently get_gateway() of IpRouteCommand class always assumes
    the presence of gateway_ip when default_route is seen.
    Since we can also have interface routes without the gw_ip,
    this patch fixes the issue by parsing the output accordingly.
    
    Closes-Bug: #1467531
    Change-Id: Icf988994b61cbdeb1261c5a0887f29ced41ada07

commit 3c45132f256082252ae8726b560f807686620216
Author: Waldemar Znoinski <email address hidden>
Date:   Fri Jun 26 09:28:51 2015 +0000

    fixing typo in gerrit query link in third party policies doc
    
    Change-Id: Iaef37a58f85439a1a6c5c1ae071a223865479a8e

commit bd3604277f6a550d8757aa96a3164a189ab3af6d
Author: Kevin Benton <email address hidden>
Date:   Wed Jun 24 06:50:48 2015 -0700

    Use last address in v6 allocation pool generation
    
    This reverts commit 1d61c5f736b9df7253a1939fe55f1875f988d1f4,
    which reverted ee51ef72d37a02005a7733b7f2faf7236db850a1 due
    to an issue with the allocation pools being mis-aligned with
    the last address of a v6 subnet.
    
    IPv6 does not have a subnet broadcast address so the last IP
    address can be used as a regular address. This patch tweaks the
    automatic allocation pool generation to include that last address
    on v6 networks.
    
    This was found because
    NetworksTestDHCPv6.test_dhcp_stateful_fixedips_outrange makes the
    assumption that the default generated pools cover the entire usable
    address space.
    
    Related-Bug: #1466322
    Closes-Bug: #1468163
    Change-Id: I5a2518c819757cd1fb43244901fe3e2f6c576b34

commit e120bad02841ed54ed071d82bffc47671f612137
Author: Pavel Bondar <email address hidden>
Date:   Thu Jun 25 16:52:08 2015 +0300

    Extend SubnetRequestFactory to access subnet dict
    
    SubnetRequestFactory incorporates logic for preparing arguments and
    building right request.
    Subnet dict, context and subnetpool are used to make decision on
    what kind of reqest should be created.
    SubnetRequestFactory can be overriden on ipam driver level,
    it allows to easily extend existent Request model.
    
    Partially-Implements: blueprint neutron-ipam
    
    Change-Id: I9de120381172657a527bb35990d25525c41939ab

commit 6a1f8388d3f0ebd791aa1c466f5310efec5e83cc
Author: Pavel Bondar <email address hidden>
Date:   Tue Jun 23 14:01:29 2015 +0300

    Decompose _save_subnet
    
    Moved allocation pool generation and validation into separate method.
    
    Partially-Implements: blueprint neutron-ipam
    
    Change-Id: Ibe241c7b6389e444145b0600f8fcee28e478bc62

commit 4b4cedaf853664535c05d47c99c920e74d1deb3a
Author: Cedric Brandily <email address hidden>
Date:   Thu Jun 11 22:12:01 2015 +0200

    Define SafeFixture base fixture
    
    Currenty useFixture(myfixture)[1] ensures to call myfixture.cleanUp only
    if myfixture.setUp succeed.
    
    This change defines a workaround to ensure cleanUp call even if setUp
    fails until testtools/fixtures support it: SafeFixture[2] which ensures
    cleanUp call if setUp fails and replaces fixtures.Fixture use by
    SafeFixture. This workaround will be removed when the bug will fixed in
    testtools and fixtures[3].
    
    [1] testtools.TestCase.useFixture, fixtures.Fixture.useFixture
    [2] neutron.tests.tools
    [3] see related bugs
    
    Change-Id: I875934e8dde321a450c83fb95d175affd1f3bb83
    Closes-Bug: #1464410
    Partial-Bug: #1453888
    Related-Bug: #1456353
    Related-Bug: #1456370

commit 481d9a4f356d325e60e4c208c93693d755097bcd
Author: venkata anil <email address hidden>
Date:   Wed Jun 24 07:33:09 2015 +0000

    dhcp fails if extra_dhcp_opts for stateless subnet enabled
    
    vm on a network having IPv4 and IPv6 dhcpv6 stateless subnets,
    fails to get IPv4 address, when vm uses a port with extra_dhcp_opts.
    
    neutron creates entries in dhcp host file for each subnet of a port.
    Each of these entries will have same mac address as first field,
    and may have client_id, fqdn, ipv4/ipv6 address for dhcp/dhcpv6 stateful,
    or tag as other fields.
    For dhcpv6 stateless subnet with extra_dhcp_opts,
    host file will have only mac address and tag.
    
    If the last entry in host file for the port with extra_dhcp_opts,
    is for dhcpv6 stateless subnet, then dnsmasq tries to use this entry,
    (as dnsmasq reads the hosts file from EOF) to resolve
    dhcp request even for IPv4, treats as 'no address found'
    and fails to send DHCPOFFER.
    
    So we sort the fixed_ips, so that ipv6 subnets for the port are added
    first in host file, to avoid this issue.
    
    Change-Id: I3bea58d86a3508e49cbac1d03c6b640836b4a7a2
    Closes-bug: #1466144

commit 0a82b8ae1951073ff5f9b096485b3acf1a541428
Author: Swaminathan Vasudevan <email address hidden>
Date:   Fri Apr 24 16:58:48 2015 -0700

    Fix FloatingIP Namespace creation in DVR for Late Binding
    
    DVR has dependency on the portbinding host to determine
    where to start the FloatingIP Namespace when floatingip
    is configured. But when we assign a floatingip to a port
    that is not bound, even though the API will succeed, the
    FloatingIP Namespace will not be created by the Agent and
    so the FloatingIP will not be functional.
    
    This patch addresses the issue by creating the Namespace
    and configuring the rules when the late binding happens.
    
    The agent will be requesting the FIP agent gateway port,
    if required and then proceed to configure the FloatingIP
    Namespace.
    
    Change-Id: I9b9158bddb626c2bb535acd709452560546fd184
    Closes-Bug: #1447034
    Closes-Bug: #1460408

commit 0eb44ca1f23ee4d031ddf2e03a1ebc6a16428d3f
Author: Gary Kotton <email address hidden>
Date:   Thu May 28 02:17:52 2015 -0700

    NSXv: update ini file to support dhcp_lease_time
    
    Add the variable to enable the admin to set the DHCP lease time.
    
    This was added in commit 7681e4c50afda18fd75fe7207352d1a26ee0755b
    
    DocImpact
    
    Change-Id: Ic37932c09d3b4c88363a7f1f38a687cd6e090c1f

commit aaa070868e8fb891e6ab5f8355bb03ee3e837c9e
Author: Pavel Bondar <email address hidden>
Date:   Thu Jun 11 15:04:48 2015 +0300

    Use sets to calculate added/original/removed ips
    
    Original algorithm to calculate added/removed ips had O(n^2) complexity.
    Using sets achieves O(n) for average case.
    After refactoring input is no longer affected,
    updated tests to reflect that.
    However, dataset is too small to get any significant performance
    improvement.
    
    Using sets requires additional preparation and post operations:
    - converting 'original_ips' and 'new_ips' to sets from ip_addresses
    - building map(dict) for storing reference from ip_address to 'ips'
      element
    - converting calculated add/orignal/remove sets back to list of dicts
      using map (dict of references).
    
    Partially-Implements: blueprint neutron-ipam
    
    Change-Id: Iecddc406f7b91cfdfb976882504113734e19b565

commit 0faf4a264525ade97cd6c0ba6b3f34fceb88c210
Author: Cyril Roelandt <email address hidden>
Date:   Mon Jun 22 13:02:17 2015 +0000

    Python3: do not use __builtin__
    
    It has been replaced with builtins in Python 3. Use six.moves.builtins, since
    it works with Python 2 and 3.
    
    Change-Id: I9e1b0060a5b18116d991cafb1de085d4d084db38
    Blueprint: neutron-python3

commit 3c72832c8b84af673722a34bba25eefc82154b47
Author: Kevin Benton <email address hidden>
Date:   Mon Jun 15 23:10:09 2015 -0700

    Retry port status update on StaleDataError
    
    During update_port_status, a port may be concurrently updated/deleted
    by another process, which will result in a StaleDataError being
    thrown. In the event it was an update, we want to retry to make sure
    the port status is set to the desired state so third parties like Nova
    get notified.
    
    This patch uses the oslo_db wrap_db_retry decorator after converting
    the StaleDataError into a RetryRequest that the decorator can catch.
    
    Closes-Bug: #1465407
    Change-Id: I0a9230d30f435ec3d48f033136e85c40ad489ef9