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

commit 2c40310584826c69fbed01a3f31fb2a2dbc5243f
Author: Salvatore Orlando <email address hidden>
Date:   Fri Aug 14 16:32:38 2015 -0700

    Use pecan controllers for routing
    
    Pecan defines several efficient mechanism for routing requests to
    the appropriate controller, but the current code for Neutron's
    Pecan WSGI server basically uses Pecan hooks to route requests.
    
    This patch partially fixes that, removing the 'resource_identifier'
    pecan hook and replacing it with explicit pecan routes between
    controllers added at resource registration time.
    
    All the remaining hooks, like attribute_population and
    policy_enforments, which were relying on finding the resource
    name in the pecan.request threadlocal variable have been updated.
    
    This patch also:
    - ensures the appropriate plugin is always selected for a given
      resource
    - add a common NeutronPecanController base class for the classes
      CollectionsController and ItemaController
    - Fixes the way in which plurals and singulars are handled in
      neutron.api.v2.resource_heper
    
    Change-Id: I4ec0d2276c3974117b497228d289c3fb0dc5a140

commit fb69960f1e1b5f62c10dfeda22269a8b661cbb8c
Author: Salvatore Orlando <email address hidden>
Date:   Mon Aug 10 16:03:41 2015 -0700

    Introduce a separate RPC server
    
    As the Pecan server only server REST requests over HTTP, this
    patch introduces a new server implementing the RPC over AMQP
    endpoints for agent/server communication.
    
    However, the REST server does not yet have the ability to send
    notifications to the RPC server or directly to the agents.
    This patch simply adapts the ML2 plugin to run the RPC notifiers
    only when initialized in the pecan server, so that notification
    to agents can still be sent.
    
    This patch therefore is tantamount to a poor man's
    implementation of REST/RPC separation which will be iteratively
    improved.
    
    Change-Id: Ie471869d9b2793acdc412f13507038433f6a72c6

commit 496c67e9700a8ae5138242feed07128a1d961956
Author: Kevin Benton <email address hidden>
Date:   Wed Sep 16 16:24:52 2015 -0700

    Remove pecan branch reference from .gitreview file
    
    This needs to be removed before the merge back into
    master so people don't start proposing patches to the
    feature branch by default.
    
    Change-Id: Ia14afe104b38a9b16fd3dc964686a733061d7e5c

commit 40151be9b3d7768de0c231f00d99f05371515c7b
Author: Kevin Benton <email address hidden>
Date:   Wed Sep 16 03:33:05 2015 -0700

    Revert "Revert "Pecan WSGI: prevent plugins from opening AMQP connections""
    
    This reverts commit 4f1fb05959b211c0edc52021af8774a163aa518c.
    Merge of master went in so this can be re-applied and have the
    conflict resovled.
    
    Conflicts:
    	neutron/server/__init__.py
    
    Change-Id: I917e89b2191b3d4646e66a7a313783a56cf0ace5

commit 4f1fb05959b211c0edc52021af8774a163aa518c
Author: Kevin Benton <email address hidden>
Date:   Wed Sep 16 03:02:49 2015 -0700

    Revert "Pecan WSGI: prevent plugins from opening AMQP connections"
    
    This reverts commit 2ba2456f9dae2a4cf30804a562c08832c24b6231
    because it has a conflict with upstream commit
    9f6bd17703b7286be9e7d439d15f4dec2774e13a. We need to merge
    master into pecan with this reverted and then revert the revert
    and resolve the conflict there so we don't have any conflict
    resolutions in merge commits.
    
    Change-Id: I22388de076cbd90da33502249e101749e019e0cb

commit 07d3d1edd7380d993d43eeabc5795f9ff88bb3a6
Author: Sachi King <email address hidden>
Date:   Tue Sep 1 15:10:54 2015 +1000

    Add constraint target to tox.ini
    
    This adds a pip install command to tox.ini that is only used when the
    tox env is passed with the 'constraints' factor appended onto it.
    As such this will not effect developer workflows or current unit tests.
    
    The initial use of this will be in a non-voting job, to verify that the
    constrained checks with tox are stable.  DevStack is already running
    constrained jobs, as such problems are no expected.
    
    To run a tox with pip using constraints on a developer system a
    developer should run the desired tox environment with -constraints.
    For example: $(tox -epy27-constraints)
    Pip will pull the current version of the upper-constraints.txt file down
    from the git.openstack.org, however this method can be overriden to use
    a local file setting the environment variable "UPPER_CONSTRAINTS_FILE"
    to the local path or a different URL, it is passed directly to pip.
    
    This is currently not enabled in the default tox run, however it is
    possible to enable it as a default by adding it to 'envlist' in tox.ini
    
    Closes-Bug: #1496424
    Change-Id: I13579599dfdf846d06d8c39f33265e8b46db6e68
    Depends-On: I17ac389f78af241917b6da7f049085f2b13d30f2
    Implements Blueprint: Requirements-Management
    (cherry picked from commit c029954c8ae041e5f15b14ceef0e2aa060928e05)

commit 2dfa49db138d3e7e84a7fff03cb08fe34729daeb
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:24:19 2015 -0700

    Remove plural param to QUOTAS.count
    
    This parameter is no longer in the signature of the count function.
    
    Change-Id: I686f3e3ed1095fdb48dd0515b58b159594f64f9e

commit 6f585ca08a19a0e24232885dfe2490f117b30b3b
Author: Salvatore Orlando <email address hidden>
Date:   Tue Sep 1 10:56:58 2015 -0700

    Return version info on version controller
    
    Just like the global root controller "/" returns info for
    all versions, with this change the version root controller
    "/<version>" will return info about the selected version.
    
    The patch also ensures the root version controller only
    accepts GET requests.
    
    Change-Id: I183c6ff67597fe93e394fc8f07d7229112d4e215

commit 3cf7838344fa009060253bf8ead3c28278f8f54a
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:22:35 2015 -0700

    Log exception.msg before exception.message
    
    The exception translation hook was logging the exception messages
    before variables were interpolated, making it really unhelpful.
    This patch corrects that and falls back to e.message if e.msg isn't
    available.
    
    Change-Id: I331444d577b03257db2fcc96324d020eff9bef08

commit a9eead2b7bdf1123602af13766bfa5c3dc6a2a7e
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:21:04 2015 -0700

    Fix pecan policy enforcement for GET requests
    
    The policy enforcement hook had no effect on responses.
    This patch corrected that. The fix was validated with the
    standard API tests.
    
    Change-Id: I014a18474ff79d48de469d7fc2a12c2e195ce22d

commit 3b8fdf4eaaa3262147a61fa1f2e6debb22ed0cf1
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:13:38 2015 -0700

    Add missing resource discriminator in update resp
    
    The update method of the pecan itemcontroller was not returning
    the response encapsulated correctly in a dictionary with the resource
    type identifier. This was discovered via the standard API tests.
    
    Change-Id: Ie2217972c75b14a0867477f26f434055b33a9ae6

commit 611ca6bf42a20bfc076b3275fec4bd1f1c100691
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:11:28 2015 -0700

    Fix missing check for admin/adv_service
    
    Adds a missing skip for a network ownership check for admins
    and advanced services. This was found via an API test.
    
    Change-Id: I796f6abf56dc7ff0f374b9912b92085f4a993a27

commit 1a87e36c61444531874a4e6b3018c37ca4a0d566
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:04:09 2015 -0700

    Clarify and add a TODO in the controller
    
    This clarifies and adds a TODO regarding the filters and fields
    API parameters.
    
    Change-Id: I01cfd45b99dcfca4e320900caebdc68f6562ddd8

commit 5d8735e15875c9d923046256af5a3c5f1a130e28
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:16:11 2015 -0700

    Set expected HTTP codes for create and delete
    
    Our API tests have HTTP code assertions that our controller
    was not honoring in the create and delete cases.
    
    Change-Id: I3b00348c854b5d887d74c115d06984222f20ccc1

commit cbc7cd6cc4d4cc9cce9c7698b807629812247d3b
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 10:07:51 2015 -0700

    Add basic bulk support to collection controller
    
    This patch adds very basic bulk support to the
    collection controller for bulk operations. TODOs
    are inline for the things that still need to be
    done. Functionality was verified with api tests.
    
    Change-Id: I2c2e6f6e449a51ea60de75325855affa62869692

commit 7ab8ee2118e27a7940f4b66d88f028b30c2fb513
Author: Kevin Benton <email address hidden>
Date:   Tue Sep 15 09:46:05 2015 -0700

    Remove duplicated API server
    
    The server in neutron.cmd.eventlet.api was almost exactly the same
    as neutron.cmd.eventlet.server.main_wsgi_pecan(). This patch just
    gets rid of the former and updates a bash script to reference the
    latter.
    
    Change-Id: Ib1ae1d4de9f61bf9eea7e3ceb7fd971195e452e3

commit 4e4a6cff5d257c85fb062d660ef2d1c9d0941ce9
Author: Salvatore Orlando <email address hidden>
Date:   Thu Aug 13 14:41:21 2015 -0700

    Allow only GET on Root controller
    
    This patch simply ensures a 405 error is returned when a HTTP
    method different from GET is invoked on '/'.
    This differs from the eventlet WSGI server behaviour; however
    returning the same response as for a GET for any method, even
    made up ones - like 'meh' - is a mistake that should not be
    repeated in the Pecan WSGI server.
    
    Change-Id: I4305f374e4aacab718daa6f131f278cc69e8d699

commit be9bff66be7939b42cea47675f6c0542003a8c54
Author: Kevin Benton <email address hidden>
Date:   Mon Aug 31 10:22:50 2015 -0700

    Rename 'newapi' to 'pecan_wsgi'
    
    'newapi' was too generic and not really descriptive of the conversion
    to pecan. Since there isn't any ambiguity, we will just keep all of
    the pecan components in a directory called 'pecan_wsgi'.
    
    Change-Id: I61f1cfcad4ff00582e0a481400642dd656d5245e

commit ae319ee3590ffeaac3a31f98894bfbf9a82926c0
Author: Salvatore Orlando <email address hidden>
Date:   Tue Aug 11 03:37:46 2015 -0700

    Implement TODO for version listing
    
    Return a list of currently enabled API versions building
    the response in the same way as it is done for the eventlet
    WSGI API in order to ensure backward compatibility.
    
    The only version listed is obviously 2.0, but the solution
    devised in this patch allows version controller for self
    declaring the version they implement.
    
    This patch also replaces the use of _lookup when such method
    is not strictly necessary.
    To this aim, the minimum version of Pecan has been bumped to
    1.0 as previouse releases did not support dots "." as valid
    characters in URI path segments.
    
    Change-Id: Ia748194b2c07a04a711d32ce8058a006e73621ef

commit bcf369b4d099c1cd3a39d47dc015e9ff280a8dfb
Author: Salvatore Orlando <email address hidden>
Date:   Fri Jul 31 15:17:11 2015 -0700

    Fix hooks for dealing with member actions
    
    This patch ensures that operations like add_router_interface
    are correctly dispatched to the plugin.
    It does so by introducing fairly ugly hacks in the
    resource_identifier, and attribute_population pecan hooks.
    
    This is however the best possible solution wiht the current
    infrastructure which basically relies on hooks for request
    dispatching.
    
    Change-Id: I34880d1ce796cfd6f81d16fc1b9fd8387b5db056

commit 2ba2456f9dae2a4cf30804a562c08832c24b6231
Author: Salvatore Orlando <email address hidden>
Date:   Fri Jul 24 04:32:56 2015 -0700

    Pecan WSGI: prevent plugins from opening AMQP connections
    
    The Pecan WSGI server is supposed to server REST requests only.
    As several plugins initialize their RPC interfaces upon initialization,
    this results in establishing undesired connections to the AMQP server.
    
    This patch does not alter plugin behavior or initialization process,
    but ensures that the setup_rpc operation performed by a plugin has no
    effect when executed in the Pecan WSGI server.
    
    This patch also performs some refactoring for server launchers.
    
    Change-Id: I56384f5f964ea90d72babf911aa5639989e9c3d8

commit e2a87ff044a29ccd205744d30afd04d6b510fab1
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 07:35:48 2015 -0700

    Switch controller to actually call the plugins
    
    This swaps out the controller methods to actually dispatch the
    requests to the plugins and return the result. After this patch
    merges, pecan should serve as a minimally working API server for
    development purposes.
    
    TODOs:
    * AMQP server - this will not listen for AMQP messages
    * Cleanup policy and context modules - they only serve a happy path
    * Implement the notifiers
    * Move the functional tests into an appropriate location
    * Bulk operations
    * Address any other of the TODOs in the code
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Co-Authored-By: Brandon Logan <email address hidden>
    Change-Id: If5dc76a2974d13d45f0cc88419bcccb3332576cf

commit 5a5a88074352f47ebb8808ae3344004e2cdeea51
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 07:32:44 2015 -0700

    Add extensions listing to the controller
    
    Extensions aren't like normal resources handled by the
    core plugin or a service plugin so they need special code
    to handle them. The resource identifier hook also had to
    be tweaked to let the request slip through without having
    an entry in the attributes map.
    
    Change-Id: I5f42bdd7aa3c103b2ff3550ce1b0d9a3baf35a35
    Co-Authored-By: Brandon Logan <email address hidden>
    Partially-Implements: blueprint wsgi-pecan-switch

commit 77da74feeacbcd2e1d06dab3d2084da7ab41a656
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 07:17:38 2015 -0700

    Add placeholder for notifier hook
    
    DHCP notifications, ceilometer, nova, etc.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: Ifd4b16abbd8375b97d3f87f036b0c9466fe2e3af

commit 1736361860933b0e05443e6a9efce8d9275e5c30
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 07:13:12 2015 -0700

    Add hook for policy enforcement
    
    Add a hook to enforce policy.json.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I49096f2e6ea70477dbbd399fd81f33bd19dbc453

commit 7778a38e49b52f2f47f433f4f728d4c2372a715d
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 07:06:20 2015 -0700

    Add quota enforcement hook
    
    Add a quota enforcement hook so quotas are enforced before
    they reach the controller. This spot may need to be revisited
    in the future if we want quotas enforced on internal AMQP APIs.
    
    Change-Id: Ia5a134d941df921e44a413613ea11b636f4b8515
    Partially-Implements: blueprint wsgi-pecan-switch

commit 99a0947aaab4bb832931a0cce02b0d152c0c0af8
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 06:59:45 2015 -0700

    Add ownership validation hook
    
    Add hook to validate same ownership between objects that
    aren't shared (e.g. port and network or port and subnet).
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I2cb8dd6c49bac05d30a1f46408cabd5b73663c0b

commit 7cc7c2deb8a3116d44a54da950837cadcf065bd7
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 05:46:44 2015 -0700

    Add attribute population hook
    
    Add a hook to populate POST and PUT request bodies with
    all of the necessary attributes that the caller didn't
    specifiy.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I4afe09ea6cb1bcdf887ae4e36a473f713fe006cf

commit 9c1a3858c7163ce84f299dffabaf2b0f370ee466
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 05:17:49 2015 -0700

    Add resource/plugin identification hook
    
    Adds a hook that identifies the resource type and
    identifies the associated plugin (core or service).
    Both are placed into the request context for use by
    other hooks and the controller.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I90854c240e6e40e429d00945d7db8e96923f83f7

commit 40b1c798546dcd57509e25339a449de9047abc0f
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 03:46:22 2015 -0700

    Add hook to create a context from the headers
    
    Adds a hook to parse the HTTP headers and turn them into a
    Neutron context. The context is then attached to the thread-local
    request object so future hooks and the controller can operate on it.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I982f7dc7f736c2b3539dffcf81c4ad141434b68f

commit 72c40a5bb7d6f659ca8ef8ed785f889383795462
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 02:28:33 2015 -0700

    Add hook to translate exceptions into HTTP codes
    
    Adds a hook to catch neutron exceptions and translate them into
    a corresponding HTTP error code. If no corresponding code is found,
    an HTTP 500 is returned with the original exception logged so
    internal state isn't leaked to the user.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Co-Authored-By: Brandon Logan <email address hidden>
    Change-Id: Ia25733d6e394e034995890c806ed04e387d4ab58

commit 0a46c8542817b3f4a5f88e298696072f4708671a
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 02:05:22 2015 -0700

    Add startup hook after pecan init for plugins
    
    Add a startup method to initialize all of the plugins after the
    pecan app is configured but before it is returned to guaruntee
    that everything is ready before the app starts taking requests.
    
    Change-Id: Id18ac5ab979b5f2cb49b69d8650248010e02fe76
    Partially-Implements: blueprint wsgi-pecan-switch

commit ad33f2550d1131db613761e9cfa47c0a719806b6
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 01:57:05 2015 -0700

    Add keystone middleware wrapper to pecan app
    
    Adds keystone middleware to enforce authentication if
    auth_strategy is set to keystone.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Change-Id: I59a97579b1f2397597a127f02d00e99468f1e4a0

commit dfd4c801d27a158102ebddcf6886f07f9838f88d
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 01:04:24 2015 -0700

    Initial pecan structure
    
    This patch is the initial work for the pecan refactor.
    
    * Adds pecan as a requirement
    * Adds a simple API server named 'neutron-dev-server' for use
      when neutron server is not deployed in a web server
    * Wraps the app with the openstack request ID middleware
    * Adds a basic V2 controller that breaks out requests by method
    * Adds functional tests to ensure request ID is set and requests
      are properly sent to the V2 controller.
    
    Partially-Implements: blueprint wsgi-pecan-switch
    Co-Authored-By: Brandon Logan <email address hidden>
    Co-Authored-By: Mark McClain <email address hidden>
    Change-Id: Ic9697ff30ab8359b62ce01eb73dc927065a8e3e6

commit 148bf97ef562241e9d5bb67a55497f8b82c5a829
Author: Kevin Benton <email address hidden>
Date:   Thu Jun 11 00:13:18 2015 -0700

    Set .gitreview defaultbranch to feature/pecan
    
    Set the default branch for the git review file
    so the branch doesn't have to be specified with
    the git review command.
    
    Change-Id: I3be4ae2a62e92e758b2719161ab1674d0f8bb6af