commit a92b15e198b50f3acb9b6ed634543a0ba386af9c
Merge: a8de471 2833fc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 12 10:17:15 2013 +0000

    Merge "Fix migration" into milestone-proposed

commit a8de47197134f406c6cec5837c44dd5bc6ad6f96
Merge: 172c444 9ba5b55
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 12 09:32:36 2013 +0000

    Merge "DB migration upgrade/downgrade not employed for brocade-plugin" into milestone-proposed

commit 172c4441c46933570c851490e87f8a39683165f0
Merge: df760c4 438b2eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 12 09:32:14 2013 +0000

    Merge "Fallback to Quota Conf Driver if Quotas table is not defined" into milestone-proposed

commit df760c413541ebbb02507208a408dcd94fbc7c40
Merge: bfe1dca 8d8b27d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 12 09:31:32 2013 +0000

    Merge "Use L3 api from vpn ipsec driver via service plugin" into milestone-proposed

commit 9ba5b551ebfd5511f524397d5efbac0a2b07488f
Author: Shiv Haris <sharis@brocade.com>
Date:   Fri Oct 11 16:27:53 2013 -0700

    DB migration upgrade/downgrade not employed for brocade-plugin
    
    Fixes bug: 1238921
    
    Change-Id: I441d82a92588d7318a2f3b725643bc1b050a2c9c
    (cherry picked from commit 9d01010e8826eafc48044fc4018944a34bc96ba4)

commit 8d8b27d3938b4b8a220d7e74ae4c051fc7e92bfc
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Fri Oct 11 11:46:32 2013 -0700

    Use L3 api from vpn ipsec driver via service plugin
    
    VPNaaS and ML2 plugin won't work, because ML2 plugin
    supports service version of L3.
    In this commit, we modify ipsec driver to use L3 plugin.
    This is also backward compatible change, because if L2 plugin
    supports L3 get_service_plugin API returns L2 plugin.
    
    Fixes bug 1238846
    
    Change-Id: I36e541bb2e3e1df2e01f73a74f3e9005af6c38b7
    Note: Exsiting unit test covers this change
    (cherry picked from commit 8eb573528551d4a74c146c9d171505f7d472bb6a)

commit 438b2ebfcd879571504359881f3881f60179e7f1
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Oct 9 19:50:35 2013 +0900

    Fallback to Quota Conf Driver if Quotas table is not defined
    
    commit de15e0b9c5 enabled Quota DB driver default considering
    production environments, but it breaks plugins without per-tenant
    quota extension. In these plugin quotas tables is not loaded.
    
    This commit fallbacks to ConfDriver if Quota model is not loaded by
    checking neutron.db.quota_db which defines Quota model is imported.
    
    Change-Id: Idaaaa9810598cfd3e5ce70020f498643b4819d16
    Closes-Bug: #1236993
    (cherry picked from commit 46495f4995b6604cb249b688aaa249ef4e8b18ef)

commit bfe1dca0563cd5beadf91e3688924c44f5063778
Author: Bob Kukura <rkukura@redhat.com>
Date:   Thu Oct 3 12:25:24 2013 -0400

    Fix auto-deletion of ports when deleting subnets in ML2
    
    When a subnet is deleted, certain ports referencing it are
    auto-deleted. The implementation of NeutronDBPluginV2.delete_subnet()
    does this at the DB level, so ML2's mechanism drivers were not being
    called.
    
    Ml2Plugin.delete_subnet() is changed to not use the base class's
    method, and to auto-delete ports by calling its own delete_port()
    method outside of the transaction. A loop avoids race conditions with
    ports being asynchronously added to the subnet.
    
    The logic in Ml2Plugin.delete_network() is also fixed to properly
    handle auto-deleting ports and subnets, and debug logging is added to
    the various delete methods.
    
    Closes-Bug: 1234195
    Partial-Bug: 1235486
    Change-Id: I6d74f89d39ea8afe6915f1d2f9afdf66c0076f5a
    (cherry picked from commit ed78b563e13f1ed9189d7c4b9cd4317f2a50e734)

commit 2833fc3d171205ce70d7ad8875838bdb9c0d57a4
Author: Ann Kamyshnikova <akamyshnikova@mirantis.com>
Date:   Fri Oct 11 12:05:59 2013 +0400

    Fix migration
    
    In migration 338d7508968c_vpnaas_peer_address_ was mistake in
    usage alter_column's parameter type_.
    
    Closes-Bug: #1238561
    
    Change-Id: I6e0eb8260cf5e8d8f557b174c7985e2f7ca1c912
    (cherry picked from commit a272a2838313b56edc1463f6d81a01414b37a78f)

commit 1cb74d6311ee77f4349e9c1caf62593638c71f0f
Merge: aa894ed 16b501f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 18:06:41 2013 +0000

    Merge "Fixes port status hanging to build status" into milestone-proposed

commit aa894ed2dc1ff1d6e3f9d4e956d649ab73366f6b
Merge: 5b36c69 ba99783
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 11 08:11:35 2013 +0000

    Merge "Fix dhcp_release lease race condition" into milestone-proposed

commit 16b501f5f0fc7577418a3d4a0d1bd62218e41d39
Author: Petrut Lucian <lpetrut@cloudbasesolutions.com>
Date:   Wed Sep 25 20:07:01 2013 +0300

    Fixes port status hanging to build status
    
    ML2 plugin changes the port status to "build" when get_device_details
    is called. For this reason, the port status must be updated once the
    port details are processed.
    
    Fixes bug: #1224991
    
    Change-Id: I2c0321073cc07e1764fedbfbecbc844557ac6bc9
    (cherry picked from commit 01194b356e39e3b0affca67015efb7634bf28697)

commit 5b36c69d3ba4b9e5992ff4f0210cce2c9f2d114c
Merge: 0b3e52f e05e0e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 22:57:07 2013 +0000

    Merge "Correct the typo %{edge_id)s" into milestone-proposed

commit 0b3e52f6f9039dcdb441d32f8ea37acc9cf8240f
Merge: 1864531 d6ab23e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 21:21:43 2013 +0000

    Merge "BigSwitch: correct net to backend on floating IP disassociation" into milestone-proposed

commit ba99783a80ee0f92135dcfd562f3cfc9dad46d86
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Oct 8 12:24:21 2013 -0700

    Fix dhcp_release lease race condition
    
    There is a possible race condition when delete or updating fixed_ips
    on ports where an instance could renew its ip address again after
    dhcp_release has already been executed. To fix this, the order of
    reload_allocation and release_lease need to be switched. This way an
    instance will not be able to renew it's ip address after it is
    removed from the host file.
    
    Fixes bug: 1237028
    
    Change-Id: If05ec2be507378c634f5c1856dab0fbd396f43cc

commit 18645314ea8687835436c52f937ede2b4ae9cbca
Merge: 6c55e34 dbd6432
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 15:58:02 2013 +0000

    Merge "Add quota table in PLUMgrid plugin" into milestone-proposed

commit 6c55e3443e8be42577a6aafc13fed4e7a53a088f
Merge: 24ed85e cd8c8b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 10 15:56:18 2013 +0000

    Merge "Disassociate floating IPs from port on terminate" into milestone-proposed

commit e05e0e81ccb94d4aedc198c2f38509fde1142d04
Author: YangLei <yanglyy@cn.ibm.com>
Date:   Wed Oct 9 17:46:35 2013 +0800

    Correct the typo %{edge_id)s
    
    Use %(edge_id)s instead of %{edge_id)s.
    
    Fixes bug #1237888
    
    Change-Id: Id8376ff8ec50e3022f9aca9b8954d8044d849f64
    (cherry picked from commit f13106d73fe6d628339d541f905ff5cfa5c264e8)

commit 24ed85ebe4910c61010bf50ab4cd8eaa06960594
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Oct 4 16:17:37 2013 -0400

    Change rpc_support_old_agents default to False
    
    Changes the rpc_support_old_agents config variable default value to
    False, so that the vlan_id field (redundant with the segmentation_id
    field) is no longer included in RPC messages from the linuxbridge and
    mlnx plugins to their corresponding L2 agents. This can be set to True
    if needed to support L2 agents older than midway through the havana
    cycle.
    
    Closes-Bug: 1235323
    Change-Id: I919824c5b02e28e3563e64e98bb106bf722327ec
    (cherry picked from commit f969d47a959ee1aa309cb697ea6a27965278810a)

commit d6ab23ee696e449d8bf3301ab8ee131d57fd9622
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Oct 8 23:02:20 2013 -0700

    BigSwitch: correct net to backend on floating IP disassociation
    
    The corrects the network that is updated on the backendw when a
    floating IP is disassociated. It was incorrectly sending the
    tenant's network when the update is to the external network the
    floating address belongs to.
    
    Closes-Bug: #1237209
    Change-Id: I55211ba3b0062e167843830bb318eb8e46249160
    (cherry picked from commit 39b8bddb1124d16eae15f667f8d921e8ddf5701d)

commit dbd6432c2389da35a5ca1e6e50fd22b30fefe4ea
Author: Edgar Magana <emagana@gmail.com>
Date:   Tue Oct 8 11:26:05 2013 -0700

    Add quota table in PLUMgrid plugin
    
    Quota DB driver is enabled in Neutron by default.
    PLUMgrid plugin was missing the "quota" table. It has
    been added in this commit.
    
    Fix bug# 1236970
    
    Change-Id: I5170a8be2b412a3bcf1edcacce5574f0073b84d4
    (cherry picked from commit 23bec4f7cb6e84a8d717c0b5ccc222f51c67f072)

commit cd8c8b367f7df75337438b10e1a1c0f6d5031810
Author: Dave Cahill <dcahill@midokura.com>
Date:   Fri Sep 27 10:44:00 2013 +0000

    Disassociate floating IPs from port on terminate
    
    Bugfix - floating IPs were left associated after VM
    was terminated. Now call disassociate_floatingips
    within delete_port as in other networking plugins.
    
    Add L3NatDBIntTestCase suite to cover the
    floating IP disassociation case, and fix all failing
    tests from that suite.
    
    Change-Id: I856c46631e495d513065fc9e987898408441a21e
    Closes-Bug: #1231913
    (cherry picked from commit f4b78c7f17e29448ed54b136eeb4ac700b324120)

commit 774fd17e4b2be8dacfaa13dedaaaa0703c40c73a
Merge: 850b7b8 a7a4833
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 22:42:13 2013 +0000

    Merge "Add a route to reach the MD server when a subnet is created" into milestone-proposed

commit 850b7b8c2896f5dc796e0f86d7b243e4991cbd79
Merge: a86b821 4182876
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 20:57:57 2013 +0000

    Merge "NEC plugin: Fix nec-agent unexpected exit due to RPC exception" into milestone-proposed

commit a86b821b578ef67b82d8457c4277159581536c58
Merge: 1cafc97 b4c2db5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 16:00:28 2013 +0000

    Merge "Add clear_db to cleanup for TestCiscoNexusPlugin" into milestone-proposed

commit 1cafc973774452803adc79846c0f4dd2b6361366
Merge: 27f5da9 15d863a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 16:00:18 2013 +0000

    Merge "Update ML2 README file for havana" into milestone-proposed

commit a7a4833e00eb86f44146771e429973a64fb04d9e
Author: Rossella Sblendido <rossella@midokura.com>
Date:   Wed Sep 25 14:55:04 2013 +0000

    Add a route to reach the MD server when a subnet is created
    
    When the first subnet is created, the dhcp port is created and
    midonet plugin correctly adds the static route to reach the MD
    server in create_port. When a second or following subnets are
    created, a new ip is added to the dhcp port. This patch takes
    care of adding the static route to correcly reach the MD server
    in update_port. This fixes the problem of VMs not being able to
    reach the MD if assigned to the second subnet
    
    Closes-bug: #1231914
    Change-Id: Ifc95f901d4222b76a4254e21295829ac8d82493b
    (cherry picked from commit 3568a9cac73a2da19e86d82f561be10ae9dbe9a0)

commit b4c2db5ea0ed3116de49b69dae4c4f6c9114a152
Author: Sean McCully <sean_mccully@yahoo.com>
Date:   Wed Oct 2 02:36:05 2013 -0500

    Add clear_db to cleanup for TestCiscoNexusPlugin
    
    Fixes Bug: #1234012
    Change-Id: I0829f04ac1a0760d96babcb1154f4f569a0f848f
    (cherry picked from commit b4167ed095dbd47a137ff22674ae13aba3a50513)

commit 27f5da9552ce895296b375416e8b5662b452a5fc
Merge: 8468eac 1bdea91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 11:05:09 2013 +0000

    Merge "BigSwitch: sync state on disassociate floating ip" into milestone-proposed

commit 8468eac35eaaa70be4e0a194020622a7cf3d5d0d
Merge: 3375f66 9e97305
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 9 11:05:00 2013 +0000

    Merge "Set correct plugin support in Embrane based plugins" into milestone-proposed

commit 9e97305a5b9ca40c9778701180a6b4772d28d0b6
Author: Ivar Lazzaro <ivar@embrane.com>
Date:   Mon Oct 7 17:12:11 2013 -0700

    Set correct plugin support in Embrane based plugins
    
    Change-Id: I87480415f55894e17458a85ef7918babaceb5e47
    Closes-Bug: 1236627
    (cherry picked from commit 15103e58443af95451a9ba22bc4a9083950d386e)

commit 3375f66b9f186ec095d22060cea987697426de79
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Thu Sep 26 16:57:58 2013 +0200

    Fix l2 pop doesn't propagate ip address updates
    
    Propagates ip address changes when an ip address is :
    added, removed, or changed.
    Add a new rpc call for the updates of forwarding informations.
    
    Fixes: Bug #1234137
    Change-Id: Ib5b971bd02f20a0ea73f88ce9685e944226bb5a2
    (cherry picked from commit e6a368a697e936f40a0882b236b2be17e1520436)

commit 4182876144fb78c419621332832ab5a10d4dda4a
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Oct 4 15:53:03 2013 +0900

    NEC plugin: Fix nec-agent unexpected exit due to RPC exception
    
    Changes nec-agent to catch RPC exceptions in the main
    daemon loop. It fixes the following two bugs.
    
    - nec-agent dies with RPC timeout in secgroup RPC
      (Closes-Bug: #1235106)
    
    - port_added message can be dropped when RPC timeout occurs
      (Closes-Bug: #1235111). Moves exception catch from PluginApi
      to the main daemon loop.
    
    Change-Id: I12394b739fc35bff271543f4625c5e3152e534ae
    (cherry picked from commit 3df505e448d38929c20721b22d81e47bf917af6a)

commit 15d863acf3ef15ad1fa63fe136c4c7b804705d36
Author: Bob Kukura <rkukura@redhat.com>
Date:   Sun Oct 6 21:41:08 2013 -0400

    Update ML2 README file for havana
    
    Closes-Bug: 1235308
    Change-Id: I684581c00ff28bc9cdb36034a9a970275b0a0090
    (cherry picked from commit 2d7e2756271fff6413a572e11f9248465f23f1bb)

commit 74c60abeec1ceee572b4c8a7988eabab45e00d38
Merge: 6077cad 82fee2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 20:09:52 2013 +0000

    Merge "Enable Quota DB driver by default" into milestone-proposed

commit 6077cad4f5955cd90dc1c3e40a74e008584ff3c9
Merge: bc50764 99440a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 8 20:08:19 2013 +0000

    Merge "Avoid race with udev during ovs agent startup" into milestone-proposed

commit bc507645f1b570e048bd0d2616d5243b4ca5534f
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Oct 2 12:14:14 2013 -0700

    Prevent L3 agent looping calls from hanging
    
    This patch adopts several measures to prevent _sync_routers_task
    and _rpc_loop from hanging because of subprocess.Popen.communicate
    not returning.
    
    1) Perform a sleep everytime a command is completed, similarly to
    what is done in openstack.common.processutils.execute
    2) Disable by default GARP, as kernel crashes caused by arping
    have been observed
    3) Prevent a non-critical keyerror in _router_removed from triggering
    again a full sync, which might put the system under significant load.
    
    This patch also adds debug log statements aimed at improving the
    ability of debugging similar failures.
    
    Change-Id: I003316bce0f38b7d2ea7d563b5a0a58676834398
    Partial-Bug: 1224001
    (cherry picked from commit 591ee00a67fbbe5f106ba12140b9f9420dee5907)

commit 99440a63af5a2c4c2e139036c42db5c64e9495b2
Author: Ralf Haferkamp <rhafer@suse.de>
Date:   Thu Aug 29 20:50:55 2013 +0200

    Avoid race with udev during ovs agent startup
    
    After taking down the veth link between the physical bridge and the integration
    bridge call udevadm settle to wait for any udev events to be completely
    processed by the operating system before recreating the veth pair.
    
    Some distributions (e.g. openSUSE) have udev rules installed by default that
    call e.g. ifdown <interface> during the remove event. If that is processed
    after the ovs agent already brought up the veth pair again the veth pair's
    link will be down after the agent completed startup and networking will be
    broken for all VM instances.
    
    Change-Id: I95520ea96a9804c5261a0c994bbca137535cc37c
    Closes-Bug: #1218556
    (cherry picked from commit 8d88ee7411d43f148b45d0a145fe32a75765a3ac)

commit 1bdea915869fc619f829c6c0c1b5f6ffcac05032
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Fri Oct 4 00:19:12 2013 -0700

    BigSwitch: sync state on disassociate floating ip
    
    Sends the state of port's parent network to the backend controller
    when a floating IP is disassociated from a port.
    
    Closes-Bug: #1235074
    Change-Id: I8375e6564b5d08f1adc7e7aef6affc97c8d03c5e
    (cherry picked from commit 0bae949eed229613c77c4943edbf68c1c140f977)

commit b988984907d36ffbe593014c9433f2b0d26feb60
Author: mathieu-rohon <mathieu.rohon@gmail.com>
Date:   Wed Oct 2 14:13:36 2013 +0200

    change port status only if port is bound to the good host
    
    if host is set in the rpc message update_device_up/down sent by the agent,
    the port status will be changed only if the port is bound to the host.
    
    Change-Id: I0e607c734fbebf0b69f83c3bbd3e25a9783672dc
    Closes-Bug: #1224967

commit 82fee2ff4d298d26149a99519f33935746f82570
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Oct 7 08:38:07 2013 +0900

    Enable Quota DB driver by default
    
    Closes-Bug: #1189671
    
    Quota driver is now loaded in lazy mode, i.e. the driver is loaded
    the first time the driver is accessed. This is to make unit tests
    work. Some unit tests like extension test cases need to use Config
    Quota driver (previous default) but QuotaEngine is initialized
    when quota.py is imported. Thus the unit tests had no chance to
    specify quota_driver.
    
    Change-Id: I9e20961d5a6322361e3c0284b3c2a7ca86755c70

commit d90649f0e9c8babc4896550d312e4ea862e51a03
Merge: 90c4237 615cb67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 02:46:50 2013 +0000

    Merge "create milestone migration for Havana release"

commit 90c4237cb8b3fce078b41cacfec236e2cf907298
Merge: 427c6e8 c544da9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Oct 3 01:54:13 2013 +0000

    Merge "Updated from global requirements"

commit 615cb67e0082b6a2d2ab1c91623e9b2a20ddedec
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Oct 2 21:41:50 2013 -0400

    create milestone migration for Havana release
    
    Change-Id: Iba8076dee730105d2cd78ce76a038e947075f1fe

commit 427c6e8394aca9a8f65df18828a704faab27da08
Merge: 26eabb5 21bf6f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:34:27 2013 +0000

    Merge "add greenthread.sleep to increase yields"

commit 26eabb583155af1ffe2e9cb8c9851cffedec8738
Merge: af7514a db4b8af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 3 00:34:16 2013 +0000

    Merge "Should not add metadata filter rules if disable metadata proxy"

commit af7514a767e1a51337dd16fa4a53eb3d9de298a4
Merge: 4c92e74 6fd4513
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 2 23:56:13 2013 +0000

    Merge "Imported Translations from Transifex"

commit 4c92e74e089af1365b9b14d67b0a7c20823543c2
Merge: 7da3d24 76e7542
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 2 22:33:29 2013 +0000

    Merge "Disable lazy translation"

commit 21bf6f7e4945bc7e8c303273ad10c28b6cfc8b08
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Oct 2 16:51:33 2013 -0400

    add greenthread.sleep to increase yields
    
    This is a stopgap Havana release.  Add eventlet greenthread.sleep to
    increase thread yields.
    
    Partially fixes: 1230407
    Partially fixes: 1224001
    
    Change-Id: I18953cf8e457ebb33780817582b4788fb5ed6f73

commit 6fd4513ca209b29aec4f8513055c8bccf3a10ce4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Oct 2 06:10:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I1e2f7f674208fccf5e93224023c750ec7049d89d

commit 76e7542f0f54779f469df7125ff7b94480c44963
Author: Ben Nemec <bnemec@redhat.com>
Date:   Tue Oct 1 23:15:23 2013 +0000

    Disable lazy translation
    
    Late in the Havana cycle bug 1225099 was found in the lazy
    translation code, and to be safe it was decided to disable lazy
    translation for Havana. This change does that.
    
    Change-Id: Ia934a7df9386baf6ae8eb9ff48c24386c47ecd23
    Partial-bug: 1225099

commit c544da9e87bf108cc23b28e65c2d9a4513fa6e55
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Oct 1 16:13:29 2013 +0000

    Updated from global requirements
    
    Change-Id: Id6c3328045ab356a232eb0fe71033f1272b76c5d

commit 7da3d24f8ad0a5cb03c6e310a3f0d176a8476423
Author: Arvind Somya <asomya@cisco.com>
Date:   Mon Sep 30 13:56:59 2013 -0400

    Cisco plugin should check for switch - vlan bindings
    
    This commit fixes the issue where the Cisco plugin tries to create a
    vlan twice on a switch if the first create is not bound to a port.
    Also fixes an issue where the plugin tried to untrunk vlans from
    a port for SVI interfaces.
    
    Change-Id: Ifb13eb65d667367cffe120e1761d34f09b6d356d
    Fixes: Bug #1233300

commit b94a60252851736b21dfba50563b24e42a9bc45a
Merge: 6d089df 1cc76b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 1 08:13:30 2013 +0000

    Merge "Increase number of concurrent_connections to nvp"

commit 6d089df931e3804caf9aff0c10950dfd844ae25e
Merge: 88daf83 223bf0a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 30 19:12:36 2013 +0000

    Merge "Imported Translations from Transifex"

commit 88daf8376f834cf17010e28c145ee4502a3a2c2d
Merge: 646cd75 f157b9c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 14:41:14 2013 +0000

    Merge "Improve ml2_conf.ini"

commit 646cd759b65f5d3deb5ccf6c678a496be32dcd91
Merge: 8041be7 955a966
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 07:26:16 2013 +0000

    Merge "Fix to enable delete of firewall in PENDING_CREATE state"

commit 8041be7962ecb35a6d3fe74448f993551ff64a9b
Merge: 01debad 5dcbddf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 30 07:16:55 2013 +0000

    Merge "Reverse the order of interface update and DNAT rule config"

commit 223bf0a12a0b22874f93a22aaaf90db5e108e994
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 30 06:11:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I262ad747c87e89db84a4c07afd6eafb455107be3

commit db4b8afd1d7b42d7c6fd4ccbe35531a7dcf4898d
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Sun Sep 29 19:48:51 2013 -0700

    Should not add metadata filter rules if disable metadata proxy
    
    The metadata filter rules should not be added into iptables if Neutron
    metadata proxy is disabled.
    This patchset fixes this issue by adding a condition when adding metadata
    filter rules to iptables.
    
    Closes-Bug #1224290
    
    Change-Id: I7f14d281c31c1828a90abac8821635773238b2d0

commit 01debad5665bcae5c0f4745759ae744f85daa723
Author: Gary Kotton <gkotton@vmware.com>
Date:   Sun Sep 29 07:11:49 2013 -0700

    Ensure that security group agent is bound prior to accessing
    
    When the Neutron agents start and the security group agent callbacks
    are not registered there may be exceptions.
    
    Fixes bug: #1232758
    
    Change-Id: I4c1ff96b8acfcee4c84a73c9400040c96f8418a9

commit f157b9c8251616fd18757cfa9a45a04ee1e2deb1
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Mon Sep 30 01:11:43 2013 +0800

    Improve ml2_conf.ini
    
    ml2_type_vxlan section is missing, also does option vni_ranges.
    
    Change-Id: Icf9328d82603640279d1c5aa31f41b6ff23c26f0
    Fixes-Bug: #1231124

commit 791de592d7eff9ac3baf7045035ea0bcc74a3f8c
Merge: 95aabfe 8919e7d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Sep 29 16:55:36 2013 +0000

    Merge "Imported Translations from Transifex"

commit 95aabfe2c20535feddc0919555a4207518db6520
Merge: e3e44ed 6925bd7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 29 14:21:31 2013 +0000

    Merge "ML2 Cisco Nexus mech driver portbinding support"

commit e3e44ed32b56ea4e12c8c7c87c6db7473ec6c131
Merge: 3ce3347 294f1a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 29 07:14:16 2013 +0000

    Merge "Add missing migration for fields in Cisco Nexus table"

commit 8919e7d0cb80891ba480d5185a9d4de599a540fc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Sep 29 06:11:06 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I1a404bc25caf8e5b574dd8c2ccaea3fc12d3a06d

commit 3ce334742e53e4e6998dfb2b9d5ec0fff642bc6a
Merge: ccd27a9 03f39f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 29 05:29:51 2013 +0000

    Merge "Add error log for SystemExit in l3-agent"

commit ccd27a9b1cc6a867cdfda80d97e664e9f7b0ef64
Merge: 12d0442 19804bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 29 04:41:08 2013 +0000

    Merge "Fix auto-deletion of ports and subnets in ML2"

commit 12d0442b2b6d87c2fa31c66451ae00ad44c831ca
Merge: 5527e76 028cca9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 29 04:32:29 2013 +0000

    Merge "Fixes Hyper-V agent RPC calls for ML2 support"

commit 6925bd7e00d5c39d20450bcf41e848435b6d9830
Author: Rich Curran <rcurran@cisco.com>
Date:   Fri Sep 27 11:35:08 2013 -0400

    ML2 Cisco Nexus mech driver portbinding support
    
    This commit adds portbinding extension support to
    the cisco nexus mechanism driver.
    
    Fixes bug: 1220878
    
    Change-Id: I72003961b46190b82681b471f4f9cb5b11d3d068

commit 294f1a4a3bc061b955fb02bc88368e4d3686c9be
Author: Henry Gessau <gessau@cisco.com>
Date:   Sat Sep 28 12:19:33 2013 -0400

    Add missing migration for fields in Cisco Nexus table
    
    Change-Id: Ib31ec7f92d568c21d607b0bf003494acd1e3a3e8
    Closes-bug: #1232360

commit 5527e76c6127c2709085dcc5cc0b787dd527de3e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Sep 28 06:11:06 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic9c08119fd931bb8cbd849be95833cbeb4c6d9e1

commit 10614aabd301c5b843f72b01336aa25762788a04
Merge: 8c40f90 1027758
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 05:38:19 2013 +0000

    Merge "Pythonic method names for l3_agent unit tests"

commit 8c40f90d226f4502e213f1557050b85d25c1749b
Merge: 1cd7e6d dec1e32
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 05:38:10 2013 +0000

    Merge "Fix adding identical metering rules on two labels"

commit 1cd7e6d1f0fdc06c3ed040eabfba4b11def485ff
Merge: 4f14217 8a37d04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 28 05:38:01 2013 +0000

    Merge "Add host routes and dns nameservers to Midonet DHCP"

commit 19804bb5c5ad8ba10fbda1bf213f698d97c137e7
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Sep 27 17:54:45 2013 -0400

    Fix auto-deletion of ports and subnets in ML2
    
    When a network is deleted, certain ports and any subnets referencing
    it are auto-deleted. The implementation of
    NeutronDBPluginV2.delete_network() does this at the DB level, so ML2's
    mechanism drivers were not being called.
    
    Ml2Plugin.delete_network() is changed to not use the base class's
    method, and to auto-delete ports and subnets by calling its own
    delete_port() and delete_subnet() methods outside of the
    transaction. A loop avoids race conditions with ports or subnets being
    asynchronously added to the network.
    
    Closes-Bug: 1230330
    Change-Id: Icf21400c9938eec29d70da8497b9ef92642131e2

commit 1cc76b5f715a48498e4b7ca368494a0ec79f9bfa
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Sep 27 11:36:15 2013 -0700

    Increase number of concurrent_connections to nvp
    
    This patch increases the number of concurrent connections from 5 to 10
    to nvp.
    
    Fixes bug: 1232189
    
    Change-Id: Ia05a7cf8001424e82a3c02e6bd92e2fa1d4a40ee

commit 955a966b0b616cca58242ea2841f23f868be058e
Author: Sridar Kandaswamy <skandasw@cisco.com>
Date:   Fri Sep 27 10:10:35 2013 -0700

    Fix to enable delete of firewall in PENDING_CREATE state
    
    Firewall will in PENDING_CREATE state if there is no underlying router in the
    tenant. When the router and an associated i/f is created then with a sequence
    of msgs it is set to ACTIVE state by the plugin. If a delete is triggered when
    in PENDING_CREATE state in such a situation, the msg was ignored - fixing this to
    account for the fact that a delete makes sense in this situation so the agent
    sends the appropriate msg back to the plugin so it can delete it.
    
    Change-Id: Id1db0a8413fd815b518fe4dc57fc6277c09e7f00
    Closes-Bug: #1223478

commit 03f39f10cc97db7a1a4bd5b0b9c5cf11dcd604aa
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Mon Sep 23 02:04:57 2013 -0700

    Add error log for SystemExit in l3-agent
    
    The SystemExit exception should be logged in l3-agent, the
    operator may miss the useful exception messages to debug.
    
        * Add error log for SystemExit in l3-agent.
        * Add unit test for None and Wrong interface_driver.
    
    Closes-Bug #1229105
    
    Change-Id: I9ac60a528c1e88827078d552a30c8d571066d21c

commit 4f14217300f61a4accbaf4b8f5ccb5f1cd1dad35
Merge: 4706c96 96e0eb2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 14:42:17 2013 +0000

    Merge "Raise an exception if no router_id provided"

commit 4706c961558a3d64d436da05da44169d50670534
Merge: ab4f22d 4757ccf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 14:08:57 2013 +0000

    Merge "Redefine behavior for NvpAdvancedPlugin during network creation"

commit ab4f22d4aa20b44e50dd3cb4d56a4a055f2841a1
Merge: 494cf75 20b9738
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 12:25:53 2013 +0000

    Merge "Send proper exception info as expected by the neutron client"

commit 494cf7500530d141b73f17fd2b90928df0b3d80f
Merge: 6766725 92b4c34
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 12:25:44 2013 +0000

    Merge "Allowed Address Pairs support in NEC plugin"

commit 8a37d04bfda7a583d02a3fac262f4f9242d7ed76
Author: Joe Mills <joe@midokura.com>
Date:   Tue Sep 24 10:42:08 2013 +0000

    Add host routes and dns nameservers to Midonet DHCP
    
    In the Midonet plugin, the host routes and dns nameserver information
    was not being passed down to the midonet client API. This fix addresses
    this by passing down the correct information.
    
    Change-Id: I142ad4ceccdcf8b0e13db55fa54513f82995efc5
    Closes-Bug: #1229655

commit 5dcbddf516750e21359c859f8da0ab829f67d3f9
Author: Kaiwei Fan <fank@vmware.com>
Date:   Thu Sep 26 23:49:15 2013 -0700

    Reverse the order of interface update and DNAT rule config
    
    Configure DNAT rule first before adding floating ip address to interface
    so advanced service router will not receive packets by accident before
    DNAT rule configured.
    
    Verified that traffic goes to the VM the created floating ip associated
    with right after config.
    
    Change-Id: I415d1138511f41c209f1f2a9c2f12c2cfd3d16f0
    Closes-Bug: #1229548

commit 67667256bea7d64ae66e5ae42ce49bb189731f38
Merge: 4a1156b 13f100c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 04:00:40 2013 +0000

    Merge "Add an option for always synchronizing status"

commit 4a1156be34996fd2015e251ebecbc6d0f865f2c4
Merge: 0a84f0c 3e1116e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 03:59:34 2013 +0000

    Merge "Ensure router exists when auto_schedule_routers"

commit 0a84f0c1e6b7af275dbd837a2b78599577811e15
Merge: bf7a895 524a09f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 27 03:27:22 2013 +0000

    Merge "Sync rootwrap with code from oslo"

commit 96e0eb23a458f068f540d98132ee261053c45585
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Mon Sep 16 19:38:56 2013 -0700

    Raise an exception if no router_id provided
    
    IF both service neutron-l3-agent and neutron-server are up,
    but no router id configured in /etc/neutron/l3_agent.ini, an
    exception will be raised on DB as "DBError: IntegrityError",
    because the variable router_ids has a default '' value that
    doesn't match the DB grammar.
    
        * Check router id is specified in _init_() of l3 when
          not using namespace.
        * Move part of checking config params actions to new function
          _check_config_params()
        * Add corresponding unit tests.
    
    Closes-Bug: #1226366
    
    Change-Id: I905f8a4061c5b250782e025681dfefcc41c8c03c

commit bf7a8951d61b3cce6f622c7917a8f63a2a1470b4
Merge: 71570fd fef1ced
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 21:44:39 2013 +0000

    Merge "Allow sharing of firewall rules and policies in policy.json"

commit 71570fda02ed22e9ab9d4c220e1c17a8228995a8
Merge: ae56b4e 092a9e9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 26 20:43:48 2013 +0000

    Merge "Imported Translations from Transifex"

commit 4757ccfc8eb10bee756deb36c72d7a7ca37bdbff
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri Sep 13 13:34:00 2013 -0700

    Redefine behavior for NvpAdvancedPlugin during network creation
    
    When using the NvpAdvancedPlugin, *all* logical switches should
    be created through VCNS. VCNS will then proxy the requests to
    NVP. This patch implements such a behavior. This is achieved by
    replacing the use of nvplib.create_lswitch with the one of the
    vcns driver, as the remaining logic can be left as it is.
    
    Fixes bug #1225011
    
    Change-Id: I6c276f747d02ac0d4934c38bf2858cf9b73c5e24

commit 1027758c4fc5361238b30db2720266b7be35f75e
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Sep 27 00:10:50 2013 +0800

    Pythonic method names for l3_agent unit tests
    
    When review https://review.openstack.org/#/c/46863/, i find there
    are some unconsistent method names in test_l3_agent.py, this patch
    fixes this code style problem.
    
    Change-Id: I0e657e02155e1fcd580f083f4b5ba56274eadf88
    Partial-Bug: #1229155

commit 13f100ce5d60e8a5fa9d1c1239502e5853f83207
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Sep 26 05:41:17 2013 -0700

    Add an option for always synchronizing status
    
    This patch adds an option for always synchronizing operational status
    on a show operation; regardless of the synchronization thread, when
    this option is enabled, the resource status is always fetched from
    the backend.
    
    The patch also fixes an issue observed when running test_nvp_sync
    alone.
    
    Bug #1229149
    Bug #1229243
    
    Change-Id: Ifef52ac1c48e32f413d51fc04fd926073335665d

commit 3e1116eb0f1d94530707cd6ef4b37f17e9a13918
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Thu Sep 19 01:53:44 2013 +0800

    Ensure router exists when auto_schedule_routers
    
    Currently, the auto_schedule_routers() accepts parameter router_ids,
    which may contain invalid router ids, since we've already filtered
    them via plugin.get_routers(), we can directly use that safe object.
    
    Closes-Bug: #1217998
    Closes-Bug: #1210877
    
    Change-Id: I6196f16cca65fee4e848173d0a0a10fde967195d

commit ae56b4e11e1871b912bdbd1a47ae1684dce8a578
Merge: 0836aab 752b7ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 12:05:23 2013 +0000

    Merge "Ensure nullable=False for netid in packetfilters table"

commit 0836aab266281749fd2431fff0ad8124f9ad1036
Merge: 4b4e791 12f18dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 26 09:15:38 2013 +0000

    Merge "Change hard coded numbers to constants in security group tests"

commit 092a9e941c347ec0a9c6fcffa6f0a43cdb9204df
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 26 06:11:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7df8b25fbe78ee7181ff6448ad3fd24d1f64a2a9

commit 524a09ff076b995ae9f4ded6d8b8c833c9ceaeaa
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Sep 24 09:50:32 2013 +0800

    Sync rootwrap with code from oslo
    
    The rootwrap module had been directly edited in commit 1d366293.
    These are all minor changes bringing neutron up to commit c03f247
    
    c03f247 Skip hidden files while traversion rootwrap filters
    3f4d1d5 Fix os.getlogin() problem with no tty
    fc04531 Send rootwrap exit error message to stderr
    3663010 rootwrap: improve Python 3 compatibility
    28395d9 Fixes files with wrong bitmode
    
    Fixes bug #1229492
    
    Change-Id: Ica406e021700578b27c3337498011059c3a78719

commit 4b4e79184b3e007bf6e45c8df504ef150f3abb8e
Merge: 040ae43 a5815ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 20:01:50 2013 +0000

    Merge "Sync gettextutils from oslo"

commit 028cca90c7c5e2b17205740d9198cbb443e6a2b2
Author: Petrut Lucian <lpetrut@cloudbasesolutions.com>
Date:   Tue Sep 17 19:15:41 2013 +0300

    Fixes Hyper-V agent RPC calls for ML2 support
    
    Adds support for the RPC report status in the Hyper-V
    agent and plugin.
    
    Fixes bug: #1226654
    
    Change-Id: Ie5eee875afc062c536856589d6a3fd0414190f6d

commit 040ae430dae6b8d35be685833d3ddf6d69fa5f30
Merge: d7839c3 6ef2811
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 19:00:34 2013 +0000

    Merge "Fix port deletion in NEC Plugin"

commit d7839c380a2f4c09268f282f41b494b4a094d467
Merge: bbe0781 c3b4f24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 18:51:17 2013 +0000

    Merge "Remove code that bypasses some midonet plugin unit tests"

commit bbe07814c40578123233bb8a1bef2a3958c79d90
Merge: e057cd9 f2828d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 17:12:02 2013 +0000

    Merge "add portbinding host into vip port"

commit 92b4c34e05770e8b3c31459158a018bdd5449c3e
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Sep 25 13:26:33 2013 +0900

    Allowed Address Pairs support in NEC plugin
    
    Closes-Bug: #1230184
    Change-Id: I84d4dda9f88f7bbb524e173b0274db013f69b7e3

commit f2828d96f51a1e5547b0d83ecc49a7b4decae409
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Thu Sep 19 12:45:31 2013 +0800

    add portbinding host into vip port
    
    When creating vip port, add 'host' into port data.
    
    Bug #1227091
    
    Change-Id: I0f59b3b56a4a26561a10e5645c8ebf803b2c6a70

commit e057cd90001848da45ce691251d667e17103785a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 25 06:10:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: If9e70e7e9f8a94b3f073105ba7c5b072ca3648d9

commit 7539477a97657aebec317ca7990aa4bc93a63fe8
Merge: 9b6e573 78aa125
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 03:06:27 2013 +0000

    Merge "Fix FWaaS plugin to allow one firewall per tenant"

commit 9b6e573a272055c8292678fe6b43ca817c5ecb94
Merge: 8c7e791 f143726
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 03:06:16 2013 +0000

    Merge "Require oslo.config 1.2.0 final"

commit 8c7e791a9edc641cd033730a47b127d43aadf7d1
Merge: 7cc4037 4b8bbe5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 03:04:45 2013 +0000

    Merge "Port Cisco nexus subplugin UT to ML2 mech driver UT"

commit 7cc40375242cec8f38c5fde6e7ab01a0a46fb7d8
Merge: 81f69ca 0764fc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 25 01:03:47 2013 +0000

    Merge "Properly synchronize status for ports deleted from backend"

commit a5815ce9db6ef82c6a305305c13dd957c3f4618c
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Sep 24 22:42:51 2013 +0000

    Sync gettextutils from oslo
    
    Add type check for Message params when setting locale to avoid
    AttributeError.
    
    Fixes bug: #1229364
    
    Change-Id: I6fe55ebc4eea5fef1d335ad83a84c4879f7f06f9

commit f14372630a5d26335e88df46fb40217847fa055e
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Sep 24 21:21:46 2013 +0100

    Require oslo.config 1.2.0 final
    
    Now that 1.2.0 has been released, require it rather than one of the beta
    release tarballs.
    
    Closes-Bug: #1182861
    Change-Id: I75ffc4a572d14488d19491a38742d6920951c171

commit 81f69ca2b288ebe932d8f703aa9f5e8715d1f452
Merge: 91f1836 c8c7400
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 24 20:34:49 2013 +0000

    Merge "Imported Translations from Transifex"

commit 91f18368a54a5d870bb1da56857f658efa305221
Merge: 3edfddf f3076fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 18:18:51 2013 +0000

    Merge "Neutron network delete fails with brocade plugin"

commit 3edfddf3aaaf5ac21005a2a8016ef67474df7ff4
Merge: 090aa26 7a3e935
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 18:17:54 2013 +0000

    Merge "Apply VPN migration to correct plugin"

commit 0764fc75c1b93e2361704ee40b68a5098d7b73b2
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Sep 24 07:40:51 2013 -0700

    Properly synchronize status for ports deleted from backend
    
    Ensure that the status for a port is properly synchronized even
    when the port itself does not exist anymore in the backend, avoiding
    raising exceptions due to missing results in the NVP query.
    
    This patch also adjusts a comment and improves exception handling
    in _nvp_get_port_id
    
    Bug 1229331
    
    Change-Id: Ibaa581006c994a543c1795dd3f1d50086583b953

commit c8c7400a5abdb93ba9b59a5083f733164b17176b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 24 06:10:18 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3752ae949a430854eceea2cc10f08024e9a566d7

commit 752b7ab29ddc75d8ae54c52d824ecc94a9551b56
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Sep 24 12:19:41 2013 +0900

    Ensure nullable=False for netid in packetfilters table
    
    From the initial commit of NEC plugin, network_id of packetfilters
    table is nullable=False, but in folsom_initial db migration script
    nullable is set to True. This commit ensure nullable=False for
    network_id in packetfilters table in any migration revision.
    
    Change-Id: I2f1ebc16b57d8d6548255079c66d326d97fda5b6
    Closes-Bug: #1229508

commit 6ef28110c0c2b11ec63266e4d22a1b7c75cf7f5f
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Sep 23 18:03:39 2013 +0900

    Fix port deletion in NEC Plugin
    
    Cascade on delete from ports.id to packetfitlers.in_port is added
    to ensure packet filter entries associated with a port.
    Also joined query of packetfilter with port query is added
    to avoid additional packetfilter query by port_id.
    
    Fixes: bug #1212102
    
    Change-Id: I8a67649f3361480eda6377b1d8a30bebd18aa714

commit f3076fea667c3eef4746440b4b80e9d0603ef3a6
Author: Shiv Haris <sharis@brocade.com>
Date:   Thu Sep 12 12:37:22 2013 -0700

    Neutron network delete fails with brocade plugin
    
    Fixes bug: 1223747
    
    Change-Id: I4a8235d4dcb0c14477835afafd0b5459ce6b01f6

commit 090aa26bf5c9a3e7f6532c70bbad3451c0a09bf8
Merge: 868fcea f1d91b2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 24 00:24:57 2013 +0000

    Merge "LBaaS: include inactive members when retrieving logical config"

commit 4b8bbe572840a602719494e406b9a07febca3a6a
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Thu Sep 19 18:06:37 2013 -0400

    Port Cisco nexus subplugin UT to ML2 mech driver UT
    
    Fixes bug 1227889
    
    This fix ports the Cisco Nexus sub-plugin unit tests
    (neutron/tests/unit/cisco/test_nexus_plugin.py) to the Cisco ML2 mechanism
    driver. The new test script will be
    neutron/tests/unit/ml2/drivers/test_cisco_nexus.py.
    
    Test cases which will be excluded from this port:
        - Test cases involving provider networks.
        - Test cases involving add/remove router networks
    since these features are not currently supported in the Cisco ML2
    mechanism driver.
    
    Change-Id: I7aed85031cf402c418089d263c7e949c4631b1eb

commit 7a3e935cf6f52974028241d38e11a8d510441724
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 23 13:42:53 2013 -0700

    Apply VPN migration to correct plugin
    
    This patch ensures the migration is executed when
    VPNDriverPlugin is loaded among service plugins.
    
    Bug 1229394
    
    Change-Id: Ibf50d23aebc60b2ba22ef5a51c268b93761c2171

commit 78aa12567d226fe73df483d75e0d1980e6d3625e
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Fri Sep 20 16:40:52 2013 -0700

    Fix FWaaS plugin to allow one firewall per tenant
    
    The reference implementation of the FWaaS iptables
    agent/driver supports only one firewall per tenant
    in Havana release. However, the FWaaS plugin will
    let you create more than one firewall. This is
    being fixed in this patch to not allow creating
    the second firewall if a firewall already exists
    for the tenant.
    
    Change-Id: I8f1cad9791723ba919b5774a63982c204686ddfe
    Closes-Bug: #1228442

commit 868fceab316b07dc98c542a51ceac53f2df6aaa2
Merge: 6015949 d731097
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 17:22:34 2013 +0000

    Merge "Fix for status always in PENDING_CREATE for Edge service router"

commit 601594993b6f65365216e3aae065c400af3d311d
Merge: 8668e29 512055e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 15:58:50 2013 +0000

    Merge "Port Cisco nexus and network db UT to ML2 mech driver UT"

commit 12f18ddbcfe062ffb06ccd585b84b2f28a4beac7
Author: Arvind Somya <asomya@cisco.com>
Date:   Wed Sep 4 12:20:14 2013 -0400

    Change hard coded numbers to constants in security group tests
    
    Security groups tests in Neutron contain a lot of hard coded HTTP return codes
    and protocol numbers. These should be changed to use constants.
    
    Change-Id: Ibecff3821c54f12848a05648f35381a0c73a0896
    Fixes: Bug 1218928

commit 8668e29ca308f9f93ecfe13a2c9b47986963ccb1
Merge: 3e90938 2a76286
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 14:14:56 2013 +0000

    Merge "Ensure names are truncated to accommodate NVP limit"

commit 3e909386cab83e5e8b77805323532ff0a57f57d1
Merge: 9448069 396a0e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 14:12:03 2013 +0000

    Merge "Fix usage of _fields method in provider_configuration.py"

commit 94480693c60ead3dce849917e21f0ab3e2a026b0
Merge: 18fe2ac 363134c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 23 14:11:54 2013 +0000

    Merge "Imported Translations from Transifex"

commit 18fe2ac6037827865b25d56c71c0406dee01ecb3
Merge: f7d4f46 79706d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 12:22:28 2013 +0000

    Merge "Flip to pythonic method names for context unit tests"

commit f1d91b2456353b92bda7017422aaa97d6720d7a9
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Sep 23 16:14:00 2013 +0400

    LBaaS: include inactive members when retrieving logical config
    
    Closes-Bug: #1229082
    Change-Id: I16f452b51a98d912ba8bdf374b4d1e9285d757dc

commit f7d4f46589404ebdd519ee7d437c3a5d51b46796
Merge: ed8b85e a37b413
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 08:32:50 2013 +0000

    Merge "Use built-in print() instead of print statement"

commit dec1e329c2ebba9fd0f9e96d1ae85aa084ccba6f
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Mon Sep 9 13:02:19 2013 +0200

    Fix adding identical metering rules on two labels
    
    Fixes: Bug #1229075
    
    Change-Id: Id86c83ec9c7af78fc08e662bb0a9202f0f759c0c

commit ed8b85e6d6fff6cccca8785d3112257729263923
Merge: 4fa69a1 d4d06df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 23 06:35:37 2013 +0000

    Merge "Handle long integer conversion in NEC portinfo validation tests"

commit 363134c3ef7b788cf3ba43b6ba94d1011a76becb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 23 06:11:51 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I625bfc9c649f6f25f706a8696406a7962bc6f0a9

commit 396a0e42755af96d8b96d42ae1bcf4ae4604443d
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Sep 20 07:15:38 2013 +0400

    Fix usage of _fields method in provider_configuration.py
    
    Apply _fields() method to each dict in the list.
    
    Change-Id: I9357212e203843ffa4a05216d9c79fe8831971a5
    Closes-Bug: #1227971

commit 4fa69a17e8f31c56929203bb903f942a7ad04dba
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Sep 22 06:10:15 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3f3a7af761414c22066278cae9452a6917d4340a

commit 79706d5c879adeca69af3d3ad170d4e8b3eb6808
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Sat Sep 21 18:37:31 2013 -0700

    Flip to pythonic method names for context unit tests
    
    Fixes bug #1228738
    
    Change-Id: Ia1864e64d7d2848f5892484eb5ad592a1f523fae

commit d000a9254f519c2b281cbca328e7e212f9ae44d6
Merge: 9840eaa 6b7182d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 21 22:47:56 2013 +0000

    Merge "NVP plugin: Set default max_lp_per_bridged_ls to 5000"

commit d4d06dfd18d8d085ccd390d6ebae7e3808fa8d09
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Fri Sep 20 08:47:25 2013 -0700

    Handle long integer conversion in NEC portinfo validation tests
    
    There are a couple of tests for NEC portinfo validation that pass an id
    which gets converted to a base-16 integer and then that gets converted
    to a hex string. The problem is the integer conversion can make it a
    long integer and then the hex built-in appends 'L' to the string, and
    the tests do not account for that. This patch handles that case.
    
    Closes-Bug: #1228212
    
    Change-Id: Id3aed686329dae9cc4777213a4d2bcf406652e15

commit 9840eaa9597e6d02ad9d46a2250f30184edc19c6
Merge: dd1eb47 8eb1427
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 21 17:24:31 2013 +0000

    Merge "Fix URL used in NCS mechanism driver sync_full() operation"

commit a37b4133b75439bfcdb0a2475d41752445adaa2a
Author: Chang Bo Guo <guochbo@cn.ibm.com>
Date:   Wed Sep 18 02:35:53 2013 -0700

    Use built-in print() instead of print statement
    
    In python 3 print statement is not supported, so we should use
    only print() functions.
    
    This patch also removes print in unit test, left by accident
    
    Fixes bug 1226943
    
    Change-Id: I5ace50cb9e149682344b4c986ef9318f8dc50f72

commit dd1eb478fc29fe938dc38eb66910c355410b8d5d
Merge: f612beb 4314261
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 21 13:12:24 2013 +0000

    Merge "Remove ununsed method update_providers"

commit f612beb56e043c0a5047985fec152a9bdd2bf43d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Sep 21 06:10:04 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9c87eada75602c2754b95577b35a50f773cdfac0

commit 512055ec63fcb081cda01b9ef40c15a91f78d7ac
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Thu Sep 19 23:30:56 2013 -0400

    Port Cisco nexus and network db UT to ML2 mech driver UT
    
    Fixes bug 1227964
    
    This fix ports the Cisco Nexus database and network database
    unit tests to the Cisco ML2 mechanism driver UT.
    The existing test scripts which are ported:
        neutron/tests/unit/cisco/test_nexus_db.py
        neutron/tests/unit/cisco/test_network_db.py
    The new test scripts are:
        neutron/tests/unit/ml2/drivers/test_cisco_nexus_db.py
        neutron/tests/unit/ml2/drivers/test_cisco_network_db.py
    
    Note that the QoS database related tests in
    test_network_db.py are not ported because QoS is
    not currently supported in the Cisco ML2
    mechanism driver.
    
    Change-Id: Ib47dab9dafde7c4b8cf0a4930379750f00b9455c

commit 43142614ddfaafd867812ae4afaa6ccf3b8d9c2a
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Sep 20 13:09:01 2013 -0700

    Remove ununsed method update_providers
    
    Fixes bug: 1228370
    
    Change-Id: Ie9182718dc87217c05d8f0d4d1a10bb538cfb8cc

commit 76112fe5fb1479ba38b6b0e08d5c6a69f7b405c4
Merge: 3e10519 3726f0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 20 18:50:25 2013 +0000

    Merge "Allow non-admin user to list service providers"

commit 6b7182d8e2b9f21959222305a21cd1174ac963bc
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Sep 19 05:02:12 2013 -0700

    NVP plugin: Set default max_lp_per_bridged_ls to 5000
    
    This patch increases the default value from 64 to 5000
    
    Bug 1227592
    
    Change-Id: I19baa6dc48541ee5238748d21e8c410e4cdb5c00

commit 3e105196516c8c54750856af794d1618bec1ffac
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 20 06:11:26 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ibb176fafb9d27baccb95ef4e6616c9aedbf86ba5

commit 2a762867b2c5b67c5790d70e94c801d7d2f3f00c
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Sep 19 17:27:29 2013 -0700

    Ensure names are truncated to accommodate NVP limit
    
    Switches created through Advanced Plugin should have
    their name truncated as well. To this aim, move things
    around to avoid awkward imports or code duplications
    
    Fixes bug #1227927
    
    Change-Id: I3cc69356227d3bd63603ee1e53d82e6561f4cad0

commit 177bfb030e60267fb009b181e752ec6c37d9010b
Merge: 00f69ee 89e3892
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 21:21:12 2013 +0000

    Merge "Change daemon Pidfile class to not use root_helper"

commit 00f69eeeb18b347c7cf23ae57f6f5c1bcb83c682
Merge: 73b24b2 abf2f32
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 21:18:51 2013 +0000

    Merge "Do not apply security groups to logical ports"

commit 73b24b26060f6e04155854252ac2632d1678ae67
Merge: 983ae63 e68617c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 21:18:43 2013 +0000

    Merge "Fix handling of floating IP association info in Nicira plugin"

commit 983ae6353a63448e1c228ba516add023e6c86f6d
Merge: 2d3df2a c5bdd78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 19:03:59 2013 +0000

    Merge "Fix ovs-vsctl call in add_tunnel_port()"

commit 2d3df2a206452a97d980636a5c9b180e955bcf1b
Merge: 2816333 005879e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 19:02:50 2013 +0000

    Merge "Change header from LLC to Foundation"

commit 28163333649e13413bd7ac6720e4d0e515607333
Merge: 3468a03 3cc8e78
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 19:01:43 2013 +0000

    Merge "Cisco plugin portbinding extension support"

commit d731097843d0b031bcdf6a8d67548f4bdf733016
Author: Kaiwei Fan <fank@vmware.com>
Date:   Mon Sep 16 15:02:34 2013 -0700

    Fix for status always in PENDING_CREATE for Edge service router
    
    The root cause is when deployment finished, we only update router status to
    active if the status is in pending create. The problem happens when the
    background sync thread update router status to active, so the status update
    for vcns_router_binding table is skipped. We fixed this by seperating
    checking and updating status for router and binding table.
    
    Also fixed an issue where Edge is not deleted if neutron service is
    restarted. The root cause is when neutron service restarts, the cache for
    router type is empty. And because we delete the router from db before
    we delete Edge, we're not able to locate the router from db to determine
    the router type. The fix is to use binding table to determine the router
    type.
    
    Also piggyback a missing attribute for updating Edge interface. It must have
    been removed by accident when resolving conflict during service plugin merge.
    
    Closes-Bug: #1226229
    Change-Id: I3d0639d245e71ea2a3faba70fef1a0ebb87e19fd

commit 005879ee07c9c02de9d8c47215600f1d36afa41b
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Sep 20 01:29:20 2013 +0800

    Change header from LLC to Foundation
    
    Change-Id: I11d7e734ae56568f2387a208efe0d1487377cbf9
    Closes-Bug: #1214176

commit 3468a03f42c05423b1aeb44cb09b9681f6a8b433
Merge: 984d6f2 59196b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 16:01:41 2013 +0000

    Merge "Sync gettextutils from oslo"

commit 3cc8e78956ee0d1132d723d1513466778268b13c
Author: Arvind Somya <asomya@cisco.com>
Date:   Thu Aug 29 13:23:52 2013 -0400

    Cisco plugin portbinding extension support
    
    This commit adds portbinding extension support to the Cisco plugin.
    
    Change-Id: I87554607860b040b693edeecc2706ca8edbe49b6
    Fixes: Bug #1218033

commit 984d6f2b50a357d329a1b53897cb58122375adb3
Merge: 1f67990 f521d50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 14:55:04 2013 +0000

    Merge "FWaaS - fix reordering of rules in policy"

commit 1f67990b93a9e7548da2d72ca63a6b200d47db76
Merge: 7a1feb0 5ca1ff6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 19 14:51:19 2013 +0000

    Merge "Fix bridge logical chaining"

commit c5bdd78f81b3d8d4e57d917569c543e3cf3d0bf8
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Thu Sep 19 16:57:49 2013 +0300

    Fix ovs-vsctl call in add_tunnel_port()
    
    When a new GRE tunnel is created OVS agent calls ovs-vsctl
    incorrectly. Command:
    
        sudo ovs-vsctl --timeout=2 --may-exist add-port br-tun gre-1
    
    is produced instead of correct one:
    
       sudo ovs-vsctl --timeout=2 -- --may-exist add-port br-tun gre-1
    
    Fixes bug 1227675
    
    Change-Id: I010961658a37028e41621c4a529b5a14e7587c7f

commit 3726f0fb481b9590ae35407474d3e428453fdf12
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Sep 19 17:45:39 2013 +0400

    Allow non-admin user to list service providers
    
    Add get_service_provider rule to policy.json
    
    Change-Id: If4f8103231694fbf79088f7a95a277d68eecce0f
    Closes-Bug: #1227697

commit 20b97388efcc3540066ca7743c761c1ec899dd2c
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Sep 19 15:07:23 2013 +0400

    Send proper exception info as expected by the neutron client
    
    The python neutron client for the V2 API expects the neutron API
    to send information back such as the type and detail of the exception
    in the body of the message
    
    Change-Id: I9486d757258c4be72799c41102babe1f7923121c
    Closes-bug: #1226400

commit 7a1feb0cc98df31c8a7d1c49b47aaec2a84c0bec
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 19 06:10:12 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I24a354aae33cd01f97cf4edb0fde4f193b0eb320

commit 5ca1ff689e82224d9d8ed36e5f49d43bfd37f4a5
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Sep 18 16:13:08 2013 -0700

    Fix bridge logical chaining
    
    network param was not being passed to self._convert_to_nvp_transport_zone
    
    Fixes bug: 1227405
    
    Change-Id: Id6f8ad96f68bee4ab2f31daa73870ca841dece62

commit 59196b62f93b052c51d2598d948a27815cb75f43
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Wed Sep 18 23:11:06 2013 +0000

    Sync gettextutils from oslo
    
    Some Messages, such as those created from Invalid exceptions, use a
    Message within a Message, and we were only translating the base Message
    but not the Message substitution within.
    
    Fixes bug: #1221808
    
    Change-Id: Ic3119df23a090cfaa160c1461e955f0af55fe1cf

commit 289d353d8c371d02239afe0458b5a0312a7ed354
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Sep 18 12:41:01 2013 -0700

    Fix KeyError for NVP plugin during portbinding update
    
    Add missing unit test coverage, that unveiled the issue.
    
    Closes-Bug: 1227247
    
    Change-Id: I0d5a3b637d86308d82bf96bdb07928b19fd1b284

commit 53b7df3eea71960d67fb50c33d7fab86f665488d
Merge: f797905 fbc02fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 14:37:49 2013 +0000

    Merge "Dynamically adjust max number of leases"

commit f797905d2093da3799449429c22675d75ac148f7
Merge: b800c68 276a3b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 13:57:35 2013 +0000

    Merge "BigSwitch plugin: allow 'external' keyword in router rules"

commit b800c686683274ca6b571f28f31c2d685ede2ab4
Merge: 6a84573 341727e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 13:57:27 2013 +0000

    Merge "Make router-interface-delete work in N1kv plugin"

commit 6a845737b03429a84d38f0465fb65985169dc08a
Merge: 65f0fbd 0688094
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 18 13:57:10 2013 +0000

    Merge "Imported Translations from Transifex"

commit 65f0fbd8a560ff1def13c25fb7335e2a020ced38
Merge: 45e26f1 9b18a80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 13:14:17 2013 +0000

    Merge "Port binding registration with NeutronDbPlugin causes Neutron crash"

commit c3b4f24883c04cd139292ecf9cee31cff43e3973
Author: Rossella Sblendido <rossella@midokura.com>
Date:   Tue Sep 17 10:12:22 2013 +0000

    Remove code that bypasses some midonet plugin unit tests
    
    Multiple subnets unit tests were skipped
    
    Closes-Bug: #1227079
    Change-Id: Iffe731722d0e6c515bc64923673218ddde98c1f6

commit 45e26f1046b198ea8983b3bdd96c06a3bef4dde3
Merge: 49f94e3 ec12ac4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 11:16:11 2013 +0000

    Merge "Prevent update_port ip_address from matching address_pair"

commit 49f94e33c588384e166efd03d4fcebb3d0d750b5
Merge: a17714f 34213db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 10:44:33 2013 +0000

    Merge "Fixing two comments regarding bind_port in ml2"

commit 8eb142748d9f63a0e4d5902f55bb66281d0df615
Author: Luke Gorrie <luke@snabb.co>
Date:   Fri Sep 13 14:30:28 2013 +0000

    Fix URL used in NCS mechanism driver sync_full() operation
    
    The URL was incorrect due to a simple argument-passing bug.
    
    Change-Id: I2fabacdb2838022a1d187ceb70cb090c15457b7c
    Closes-Bug: #1224981

commit f521d509db2b38051dbef5e2000d145d37b71672
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Tue Sep 17 23:27:20 2013 -0700

    FWaaS - fix reordering of rules in policy
    
    Due to a recent change, reodering of rules within the
    same policy was failing. This is fixed by checking if
    the rules belong to the same policy we allow reordering.
    
    There was also a missing call to reorder due to which
    the position number on the rules was not reflected correctly
    after the reordering. This is also fixed.
    
    Closes bug: #1226941
    
    Change-Id: I7f52e8b9d578c290ace3bb615bf68bd213398303

commit a17714f23d325a5eb1756435c4d0cffe948a615a
Merge: 8f40aa4 37b78c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 06:35:17 2013 +0000

    Merge "BigSwitch plugin: passes context to all update_network calls"

commit 0688094d8169ec7c195710fb091a5f5370b8eaac
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 18 06:10:05 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4210dec928be0490517665470d08c37df806fb59

commit 9b18a8035f2e804040f5d0778c83cf72b06b6c41
Author: sukhdev <sukhdev@aristanetworks.com>
Date:   Mon Sep 16 12:00:13 2013 -0700

    Port binding registration with NeutronDbPlugin causes Neutron crash
    
    fixes bug: 1226169
    
    port binding feature of ML2 plugin registers a callback function with
    db_base_plugin_v2.NeutronDbPluginV2, which is invoked during a query of
    port DB. This function is registered by name instead by refefence. This
    causes wrong context to be passed to the function upon invocation, which
    causes the exception. If this query is made during neutron
    initilization, Neutron service will fail to start.
    
    This fix changes the registration from function name to function
    pointer
    
    Change-Id: I44f7f1a222f80c9ce35f7d49610e52170f76dfd1

commit 34213db15a5b31f3639677751925f754bc09f414
Author: Mohammad Banikazemi <mb@us.ibm.com>
Date:   Tue Sep 17 15:56:01 2013 -0400

    Fixing two comments regarding bind_port in ml2
    
    Fixes two comment lines regarding when bind_port
    is called. The correct comment should indicate that
    bind_port is called prior to "create_port_precommit or
    update_port_precommit" rather than
    "create_network_precommit or update_network_precommit".
    
    Change-Id: I5c0cb49efb43b15fdc5a7f88569e19fcf8d72819

commit 8f40aa4ce107e8fb6e060d05a26cab42e90ee677
Merge: d54eab6 18d991a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 00:14:50 2013 +0000

    Merge "Support advanced NVP LBaaS Service"

commit d54eab63c9c113d5ea83c6e6658fccaf665a9520
Merge: 6aa2312 db9c24a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 18 00:14:41 2013 +0000

    Merge "Support for NVP advanced FwaaS service"

commit 37b78c5d48a9a5da1e9b0187b2004d5352e7c877
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Sep 17 13:22:32 2013 -0700

    BigSwitch plugin: passes context to all update_network calls
    
    There were a few calls to update the network on the backend
    that were not having the context passed to them so they were
    incorrectly using the admin context. This patch corrects that
    by passing the context to all network update calls. It also
    disallows calls to _send_update_network that don't provide
    the context because there is not a use case for that condition.
    
    Closes-Bug: #1226803
    Change-Id: I7f0cbb797df9f565d0a00a7c67278cd96301f244

commit 6aa23125777eaba971217850c654cf4f8bf8a02e
Merge: 4afee80 f01aed9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 20:46:55 2013 +0000

    Merge "Fix error raised when router-interface-delete on no-snat routers"

commit 276a3b422d54b6976fed8c23ed54bd9bb707e4ff
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Sep 17 13:43:02 2013 -0700

    BigSwitch plugin: allow 'external' keyword in router rules
    
    Allows 'external' keyword in addition to 'any' keyword
    in BigSwitch router rules support.
    
    Closes-Bug: #1226814
    Change-Id: Ia92513e89b0c95c5b3b98921e126fdd21cc4f405

commit fbc02fd569983122a9f5284a71f3c3aaaa03d260
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Sep 13 17:48:20 2013 -0400

    Dynamically adjust max number of leases
    
    This change dynamically adjusts the maximum number of leases based on
    the size of the subnets associated with a network.  The upper bound is
    limited by a configurable option to keep the max reasonable and prevent
    denial of service.
    
    Closes bug: 1225200
    
    Change-Id: I75c3907bcf45cd991eadf5dd8c8ad7f1eaab3c85

commit 18d991a6b20300f9b601638383829e7cbd58b697
Author: linb <linb@vmware.com>
Date:   Tue Aug 20 13:35:10 2013 +0800

    Support advanced NVP LBaaS Service
    
    The patch adds NVP advanced LBaaS service support for NVP with
    VCNS:
            * NVP LBaaS is an advanced Service of NVP depending on NVP
              advanced service router
                - Once an advanced router id created, one corresponding
                  vshield edge will be deployed, and then we can configure
                  LB service On the vshield edge
            * NVP LBaaS service plugin still uses LBaaS DB service logic,
              while finally calling vShield Edge to support FWaaS service
                - When creating VIP object, service attaches the object to
                  the advanced router with routedserviceinsertion service.
                  Then before pushing VIP VCNS call, the server would first
                  pushing associated POOL VCNS call and associated Monitor
                  VCNS call to vShield Edge. Deleting VIP is opposite
                  operation
                - Refering to CUD operation of other objects, service would
                  first find the associated VIP object and then find the edge bound to
                  the router which vip inserted. Then service would push corresponding
                  VCNS call to Vshield Edge
            * on driver part, the driver will first convert the object
              to VSM known object input, and then send a synchronous JSON
              calling to VSM, and receive the result
    
    Implements: blueprint nvp-lbaas-plugin
    Change-Id: Iec41f2dc103daddf3bed4d09c147df3865b3dccd

commit 341727eaef6e84b275a801b8ad397d6a72ad0278
Author: Bob Melander <bob.melander@gmail.com>
Date:   Tue Sep 17 19:55:46 2013 +0200

    Make router-interface-delete work in N1kv plugin
    
    Fixes bug 1226729
    
    Change-Id: If2c6bc544dfa45cb98d5951c99f158d49191b031

commit db9c24a5194c7b11c1720227808f87add44375ed
Author: berlin <linb@vmware.com>
Date:   Thu Aug 22 15:58:58 2013 +0800

    Support for NVP advanced FwaaS service
    
    The patch adds advanced FWaaS service support for NVP with
    VCNS:
            * NVP FWaaS is an advanced Service of NVP depending on NVP
              advanced service router
                - Once an advanced router id created, one corresponding
                  vshield edge will be deployed, and then we can configure
                  FW service on the vshield edge
            * NVP FWaaS service plugin still uses FWaaS DB service logic,
              while finally calling vShield Edge to support FWaaS service
                - When firewall object is created, we will attach the
                  object to the advanced router with routedserviceinsertion_db
                  service
            * on driver part, the driver will first convert the object
              to VSM known object input, and then send a synchronous JSON
              calling to VSM, and receive the result
    
    Implements: blueprint nvp-fwaas-plugin
    Change-Id: Id43af8821f5c553356e3cc870993eef99ef7def3

commit 4afee8006c671cb2ffdad9d7fd2ef4b12284ac16
Merge: 5b40d09 7c87972
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 15:57:56 2013 +0000

    Merge "Increase size of peer_address attribute in VPNaaS"

commit 5b40d09056904b2fc68dfc1787e6a1bed6ed8075
Merge: b314ad7 0c4b95c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 17 14:18:19 2013 +0000

    Merge "Imported Translations from Transifex"

commit 7c879724a50ab848fabaf7a175447ce3f3672d76
Author: Paul Michali <pcm@cisco.com>
Date:   Mon Sep 16 10:08:56 2013 -0400

    Increase size of peer_address attribute in VPNaaS
    
    Increased the size so that peer_address could be FQDN. API
    document changed constraint from IPAddress to string, however
    in the plugin/service code, it is already a string and there is
    no specific restriction on the value. Database migration will
    be performed, due to the size change.
    
    bug 1225128
    
    Change-Id: Idc0d545491074fc0a1a3bd0256fdbba0a3a0718c

commit b314ad771d6df780c3cc3700de6a9c324064c693
Merge: f119099 a442ace
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 13:58:23 2013 +0000

    Merge "Fixes hyperv neutron agent test, and removes exit"

commit 0c4b95c68e0700527e16c21daa5c3e04bcddf02c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 17 06:09:45 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I32c66648232b2d01897889dc15d4498e1ac3de2e

commit f119099bbaab7785177f1ab5c9eb894a3cdaea11
Merge: cabcabd de1db20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 17 02:36:47 2013 +0000

    Merge "Fix failure in multi-chunk state sync for nicira plugin"

commit f01aed9a1e2b2c686f91787c6382a466a9211d95
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Sep 16 16:28:19 2013 -0700

    Fix error raised when router-interface-delete on no-snat routers
    
    Previously, a 500 error would be raised trying to remove a subnet
    from a no-snat router because we were trying to remove the snat
    rules that didn't exist in the router.
    
    Fixes bug: 1226323
    
    Change-Id: Ieff0ed4bdbac39ac07e597753272a4f5d40cb346

commit a442aceb6ff3942cd9ea30f89394586ff0140dfe
Author: Sean McCully <sean_mccully@yahoo.com>
Date:   Sat Sep 14 15:14:33 2013 -0500

    Fixes hyperv neutron agent test, and removes exit
    
    Fixes test for hyperv neutron agent, and removes
    sys.exit from hyperv neutron agent
    
    Fixes: bug #1225509
    Change-Id: Icf67c6775b6a25a5223ffa7e2d863c2bc0486c2c

commit cabcabdda2386f0254b928e5d56267556caf5109
Merge: 0d973a8 44fd0f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 18:14:18 2013 +0000

    Merge "_validate_network_tenant_ownership must be less strict"

commit 0d973a837dd9579ee69b0e13311b8a71edfd641e
Merge: 32a7bd6 31f48f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 18:14:06 2013 +0000

    Merge "FWaaS - fix policy association of firewall rule"

commit 32a7bd685a1eae37e2debb169f5a4926f4140d88
Merge: 495bdeb 7d1d9c1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 16 16:40:38 2013 +0000

    Merge "Imported Translations from Transifex"

commit 44fd0f74e5b19593e9d37eaec1f87134003b10f4
Author: Avishay Balderman <avishayb@radware.com>
Date:   Wed Sep 11 13:46:56 2013 +0200

    _validate_network_tenant_ownership must be less strict
    
    Neutron, currently does a strict validation code
    so that for non-shared network the subnets and
    ports must belong to the same tenant as the network. In
    the case of a "service VM" created by
    admin user, this function should return thus allowing
    admin users to create ports and networks in a tenant
    network.
    
    Change-Id: Ied831402d56b98a1323d30eb6a769fd2df5278ee
    Closes-Bug: #1221315

commit 495bdeb580353d467093fef4fe7f15a15d210726
Merge: 1bf5e72 0ff9373
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 16 09:41:32 2013 +0000

    Merge "Fix haproxy agent unit test to be runnable alone by tox"

commit 7d1d9c177fcaec3da53e6a6ec5f04f50ec4221b5
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 16 06:09:44 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3eebef458f0501227d971d455c00b98bb295dfed

commit 1bf5e729c9f77a007018d0fdef16507fb901a099
Merge: 3973235 7e2622c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 23:44:34 2013 +0000

    Merge "Enhance exception translation to better handle NeutronExceptions"

commit 397323580f96b2130cf3bf2675637cf84fe61b82
Merge: 289524b 3555240
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 23:44:18 2013 +0000

    Merge "Don't need to init testr in run_tests.sh"

commit 289524bd78be7ea28caa156896c0b1289c72ae2b
Merge: abd3aca 576a56c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 23:10:26 2013 +0000

    Merge "Add router ownership check on vpnservice creation"

commit abd3acafd687aca16e0c8dfa1b6013d5f68d8e9a
Merge: 878bead 6aa6f5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 22:46:31 2013 +0000

    Merge "Using constant error codes instead of hard-coded"

commit 878beadd9a2c40a73cda6e528334ec26b5654d18
Merge: cd0a709 c659a7d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Sep 15 22:43:07 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6aa6f5cb5e35e4e3fd50453829b15f48ac064cf8
Author: Evgeny Fedoruk <evgenyf@radware.com>
Date:   Sun Sep 15 03:48:41 2013 -0700

    Using constant error codes instead of hard-coded
    
    Change all hard-coded error codes to be constants
    from webob.exc.py in test_db_plugin.py
    
    Fixes bug: #1225614
    
    Change-Id: I9e58bb84afc66293afa56968a745b798bb88bf16

commit cd0a709f2d43f6a925a6e1dff3a9195e378ca7f4
Merge: e09b69d 84d73ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 08:38:34 2013 +0000

    Merge "Don't add neutron metadata_nat_rules if disable metadata proxy"

commit e09b69de323c5af9f6f812e14e4ee3020b0577e6
Merge: 28b52f8 644f0c6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 15 08:31:30 2013 +0000

    Merge "Stop popen patch correctly in test_agent_linux_utils"

commit c659a7df46cfe6f8f3f1790a0d7b45a4bfe9f54c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Sep 15 06:09:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I182234e0d9a95feda9d8cfb17c6be9f2da3d03f6

commit 28b52f849d77cc1de4b8949445ac80a5682abe62
Merge: db80297 402a448
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 14 21:53:02 2013 +0000

    Merge "Add new L3 RPC topic support to Ryu plugin"

commit 31f48f5cd3c616a7646adb3bea86338beea6a737
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Sat Sep 14 13:38:08 2013 -0700

    FWaaS - fix policy association of firewall rule
    
    If an existing firewall rule already associated with a
    firewall policy is associated with a different firewall
    policy, the new association should fail. The check for
    the existing association was not being made, hence the
    firewall rule was being removed from the older policy
    and being associated with the newer policy (incorrect
    behavior). This is being fixed here.
    
    If the association with the newer policy has to be made
    the rule should first be removed from the existing policy
    association.
    
    Change-Id: I30c41d77e7fde673f0dccbc98e1cd7bd0d7b384f
    Closes-Bug: #1223465

commit db802972b804b38fc204578afc37b7f3855ac34d
Merge: 18873ae 140029e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 14 19:53:19 2013 +0000

    Merge "Use same hostname function as nova"

commit 0ff9373de6e11d7040b6b289cb3239a9ee9a924d
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sat Sep 14 14:26:53 2013 +0400

    Fix haproxy agent unit test to be runnable alone by tox
    
    haproxy agent uses periodic_interval option that can interfere
    with the same option declared in neutron/service.py when running
    'tox services.loadbalancer'
    
    Change-Id: Ibcc91d603f5f31c7a376e0c735e8bf566198231d
    Closes-Bug: #1221726

commit 18873ae7cd97507df95c3277e6386fbca9a7706a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Sep 14 06:09:52 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I29024cf2b1f8bf04e7fd57066142665add77eef4

commit 6519728486771d92a89053be5ae977eb0f010e70
Merge: 932e5b5 eea6218
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 14 03:24:58 2013 +0000

    Merge "Prevent stale DHCP directories for dhcp agent nodes"

commit 140029ebd006c116ee684890dd70e13b7fc478ec
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Sep 13 16:12:30 2013 -0400

    Use same hostname function as nova
    
    Certain plugin implementations of port binding depend on the port's
    binding:host_id set by nova matching the compute node's hostname
    reported by neutron agents in agents_db. Nova uses
    socket.gethostname() to obtain the hostname, so this changes neutron
    to also use socket.gethostname(), instead of socket.getfqdn() to
    obtain the default hostname. If deployments require a specific
    hostname format or value, the hostname can be specified in nova and
    neutron configuration files.
    
    Closes-Bug: 1223000
    Change-Id: I5de9c6b0df16eca482037a5bdc3a77dc52f4adba

commit 932e5b5c8282759c6af2f2b5784cd7ecf4f2e09d
Merge: 23abacf b94c88f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 18:42:00 2013 +0000

    Merge "Fixes Hyper-V agent unsopported network_type issue"

commit 23abacf00a02782fe9295de8497043492cc852bb
Merge: 6a243f7 bdaf3a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 18:39:13 2013 +0000

    Merge "Add NvpPluginV2 to migration 4a666eb208c2"

commit eea6218e425766cefc62757da85b9de058d8e312
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Sep 11 11:49:48 2013 -0700

    Prevent stale DHCP directories for dhcp agent nodes
    
    This change fixes an issue that is most acute in test/dev
    environments but that may affect production environments
    as well: the presence of DHCP directories that no longer
    represent networks that exist in the Neutron DB. This
    issue can manifest itself over time if you delete networks
    from the Server while the Agent node is down.
    
    Without this fix, at the agent start-up the method
    existing_dhcp_networks will return an empty list, and
    as a consequence the directories that belong to networks
    that have been removed from the server will stay because
    the sync logic will not process them as it only looks at
    the mismatch between active networks on the agent and
    active networks on the server. With the fix instead, we
    return *all* existing dhcp networks; if they are meant to
    be active, the agent will bring them up, if they no longer
    exist on the server, then the agent will dispose of the
    resources. The dnsmasq driver will do the right thing when
    enabling or disabling the process.
    
    Fixes bug #1195770
    
    Change-Id: I194064a449801713051d01193adc706bcb687c82

commit 6a243f745693e189facec0378b8373945807bbd4
Merge: 836e0bb 0eefad1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 17:51:00 2013 +0000

    Merge "Fix incorrect comment re:distributed router in nicira plugin"

commit 836e0bb7cb9d7224a0e7fe55d9cb95fd1e7894d3
Merge: 0665623 edd17ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 17:15:46 2013 +0000

    Merge "Hash device_id only if it is longer than the allowed MAX size for NVP"

commit 576a56cc043f741d14ea68e3ff9a81d39c1846f8
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Wed Sep 11 18:52:01 2013 -0700

    Add router ownership check on vpnservice creation
    
    Router ownership must be checked on vpnservice creation.
    In this commit, we added the check.
    
    Fixes bug 1224196
    
    Change-Id: I14b18225f82ebe691f253fbd7645ecfc7f12faad

commit 066562393da660e57644ba7c41293a8bd8e884ed
Merge: 3f9fe8f 494bc5f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 13 17:09:14 2013 +0000

    Merge "Imported Translations from Transifex"

commit b94c88f80ac2473ec6a61c26bf0e2843a63456b2
Author: Alessandro Pilotti <apilotti@cloudbasesolutions.com>
Date:   Fri Sep 13 19:44:22 2013 +0300

    Fixes Hyper-V agent unsopported network_type issue
    
    Fixes an issue when an exception is raised in case of not
    supported network types.
    
    Fixes bug: #1224583
    
    Change-Id: I847aa825fbf5b7086c9960c051014cc1d7515f62

commit 0eefad166334fe447927238b95453f55148c4263
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Sep 13 08:28:52 2013 -0700

    Fix incorrect comment re:distributed router in nicira plugin
    
    Change-Id: I22445cc477a86cb99e97740fd8a9ddb796c1ebac

commit de1db2023597dd3555da33bd86582627c85d4856
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Sep 12 15:23:46 2013 -0700

    Fix failure in multi-chunk state sync for nicira plugin
    
    Bug 1224719
    
    This patch ensures the 'result_count' attribute from NVP API responses
    is properly handled, and adds support for '_page_cursor' request query
    parameter in the fake nvp api client in order to ensure issues like this
    are captured by unit tests.
    
    Change-Id: I1d6179bd58a14d19729fc882f004b6d1afccbe3d

commit 644f0c64c9c26523965ebb64f44a4dbcd99ae019
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri Sep 13 07:44:40 2013 -0700

    Stop popen patch correctly in test_agent_linux_utils
    
    Fixes bug #1225009
    
    Change-Id: Ic9f3491be2fb7481bbf3fd843a421d66d9248a20

commit fef1ced9708024604b54e02eebb9eff21996fccb
Author: Dan Florea <dflorea@cisco.com>
Date:   Wed Aug 21 12:30:18 2013 -0700

    Allow sharing of firewall rules and policies in policy.json
    
    Updated policy for firewall_policy and firewall_rule to allow sharing
    among tenants. Added a new firewall sharing rule to enable this.
    
    Change-Id: I5d4d9f94fb3abffe4d1b03c46fd5b13a8a4a4f09
    Fixes: bug #1217103

commit e68617c141c8a16a26bc4ade641aa4a5a809619d
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Sep 11 07:19:28 2013 -0700

    Fix handling of floating IP association info in Nicira plugin
    
    Bug 1223902
    
    This patch fixes the _update_fix_assoc routine in the Nicira plugin,
    ensuring the association of a floating IP with a router is removed
    when the floating IP is disassociated.
    This patch also adds a unit test for validating behaviour when a floating
    IP is associated to a port on a different router, which was an
    uncovered use case. This new unit test required some refactoring in
    test_l3_plugin.py.
    
    Change-Id: Ibfd53a637f4d14a368b0aeff289c15f993df58dd

commit bdaf3a26bb924a0debc7e753cdf2135dcc20d833
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Sep 13 02:35:48 2013 -0700

    Add NvpPluginV2 to migration 4a666eb208c2
    
    Bug 1224882
    
    This migration alters a table used by NvpPluginV2 as well, so
    it must be included in the plugin list.
    
    Change-Id: Ifc5104d813c76fa8de000ec977ca3242e90e433d

commit abf2f328e87195e87a03ccdef11d3bd787aec891
Author: Rossella Sblendido <rossella@midokura.com>
Date:   Wed Sep 4 17:01:59 2013 +0000

    Do not apply security groups to logical ports
    
    Security groups rules were applied to logical ports and this caused
    Floating IP not to work correctly.
    Correct some typo.
    
    Change-Id: I174e60f8eb8a4d00b71fffc127e2d2d36836835d
    Closes-Bug: #1221336

commit 402a44850ba1783368fb349fafecdeedd9da7fd2
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Fri Sep 13 14:56:22 2013 +0900

    Add new L3 RPC topic support to Ryu plugin
    
    fixes bug #1224796
    
    This patch adds RPC consumer for the new topic for L3 callbacks to
    Ryu plugin.
    
    Change-Id: Id9b3af474e65ab4c5b58121e1dcb160f80a71633

commit 3f9fe8f6a5cb0a48c1c2741b01a7bee1a0a3b7cc
Merge: 8a1e0d2 0739b2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 08:08:18 2013 +0000

    Merge "Fix incorrect NotImplementedError"

commit 8a1e0d24af59c63223ea04e735794fd2086b2236
Merge: 6ffeb03 df1d4ca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 07:46:26 2013 +0000

    Merge "Fix error code for deletion of router which is in use by vpnservice"

commit 494bc5f4ec8d189be56d09eee85803c686bb4065
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 13 06:10:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4c978bcffa92b00deaf86a3da826ebe2a4ca0eb4

commit 6ffeb038056a7a8716eeee69fe6f64a2daaeb709
Merge: 409e92f 515866a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 13 00:26:15 2013 +0000

    Merge "Fix ovs_lib's issue of parsing flow proto field"

commit 409e92fce39488d12917959e4472e9e80fbad03d
Merge: 497a9a6 8372bba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 23:27:57 2013 +0000

    Merge "pass default l3_gateway_service_uuid if not specified"

commit 497a9a684ac883092ecbecd56bfde19c79f77c83
Merge: a38ee7e 72f85b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 23:27:49 2013 +0000

    Merge "Avoid performing extra query for fetching qos bindings"

commit a38ee7ee84b8711e81c0a601c1c93ee2d0ad36f8
Merge: fedab81 f342f25
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 23:26:49 2013 +0000

    Merge "Clean up code of virt_phy_sw_v2 module"

commit fedab81c72f8131a0028a4adf0c554db6cff4d27
Merge: 3b07942 7664f57
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 23:25:41 2013 +0000

    Merge "Add (useful) missing headlines to nvp unit test files"

commit 3b079429075cee6321979486773909cc3937e132
Merge: 49ddd81 c24058d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 21:51:27 2013 +0000

    Merge "Fix LinuxBridge test name from Openvswitch"

commit 7664f578b51c666e4bca9287a283833bcd74c724
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Sep 12 14:33:17 2013 -0700

    Add (useful) missing headlines to nvp unit test files
    
    For Aaron Rosen's amusement, even though slightly ashamed.
    
    Change-Id: Idadb7a86dddb2523987852179ebe23f6272846fb

commit 8372bbac08b296f632e5b743e3419d721b7abec1
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Sep 12 12:42:29 2013 -0700

    pass default l3_gateway_service_uuid if not specified
    
    Previously, if one created an external network of type l3_ext and did
    not specify the default_gw_service_uuid via --provider:physical_network
    an exception would be raised on the backend as we need to specify the
    l3_gw_service_uuid we want nvp to use.
    
    Fixes bug: 1224660
    
    Change-Id: I6312956528c17d6a704d4e4ef629916f6463312a

commit 7e2622c2fc89611a34c242792f46572545bcdffb
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Fri Aug 16 16:07:47 2013 +0000

    Enhance exception translation to better handle NeutronExceptions
    
    NeutronExceptions have a 'message' class attribute that holds the
    generic error message template, e.g. "Network %(network)s not found",
    unfortunately, because the names are the same, it was overshadowing the
    actual exception instance 'message', e.g. "Network 1 not found", after
    translation when the exception was serialized to JSON.
    
    This patch puts the exception's actual message in a new field called
    'msg' and overwrites NeutronException unicode() so that 'msg' is used
    during serialization and we'll get the correct message on the REST API
    response.
    
    Fixes bug: #1212882
    
    Change-Id: I3965bffb1c2c2eee0af440d1ecd30ccb3bb958d5

commit df1d4ca3d5c9158468866f7145a18ca46cd92e18
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Wed Sep 11 16:24:13 2013 -0700

    Fix error code for deletion of router which is in use by vpnservice
    
    In this commit, we check router is in use by a vpnservice or not when
    we delete router.
    
    Fixes bug 1224174
    
    Change-Id: I55a4b9b93715fbb36816c69729d88eb494bcf15e

commit 49ddd813d3fb9b04c2361f0677b655361ab43238
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Sep 11 11:24:54 2013 -0700

    Fixed typo defult_tz_uuid
    
    Fixes bug: 1224038
    
    Change-Id: I0a4c7a63fefc02c4b8ae52d61fd036be8d375351

commit c24058d2fb464cd7534d2586fdb185cd07354785
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Sep 12 10:30:30 2013 -0700

    Fix LinuxBridge test name from Openvswitch
    
    Fixes bug: 1224598
    
    Change-Id: I791108f39e5fc7fcd9532b29d4b117d47907261c

commit f342f25807442f0243011ba5fa331aacb013bcaf
Author: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@cloudwatt.com>
Date:   Thu Sep 12 14:38:28 2013 +0200

    Clean up code of virt_phy_sw_v2 module
    
     Removes two methods not used:
     * _get_all_segmentation_ids
     * _validate_vlan_id
    
     About log formatting:
     * In the __init__, '\n' can be removed from this line:
         LOG.debug(_("Loaded device plugin %s\n"),
    
    Closes-Bug: 1180783
    
    Change-Id: Ic0aea7e8016f198e2ba245c710e12bc490720039

commit 72f85b5e616e3aabcab862b944c1a3a2c2844431
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Aug 22 09:08:52 2013 -0700

    Avoid performing extra query for fetching qos bindings
    
    Bug 1215872
    
    Add a relationship with eager loading in the Port and Network models,
    thus preventing the 'extend' functions from performing extra queries.
    This patch also slight alters the methods for processing qos_queue
    bindings in order to allow them for populating the qos_queue id in
    the response being created.
    
    Change-Id: Ie80d12aeed5de94afa61f23d7bcfc21372f23c4f

commit ca99b92719817a77b84286617d0da0b0e3e080ba
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 12 06:09:42 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I92988cad8948c56116469793ebda55933d358d7e

commit 116b2faeca2752d12905c3c0504a6b5df2e0eb15
Merge: 7c711da 7e79e69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 03:53:40 2013 +0000

    Merge "Vxlan / L2population support to Linuxbridge Agent"

commit 7c711da4624583cc4909ec50dc2597fbe18c1b26
Merge: 386bba3 b6133c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 03:07:58 2013 +0000

    Merge "OVS agent implementation of l2-population"

commit 386bba3657cc63c82cbaf643d48dab19cda318c8
Merge: dbf051d 95bf8e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 12 02:31:39 2013 +0000

    Merge "Add l2 population base classes"

commit 7e79e6973e879bc14ca02977fe98e8382b507ea2
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Wed Sep 11 14:19:39 2013 +0200

    Vxlan / L2population support to Linuxbridge Agent
    
    This patch introduces VXLAN support for Linuxbridge agent alongside
    with ml2 plugin support in linubridge mechnism driver.
    
    A new vxlan configuration section is added for vxlan related parameters.
    
    The agent also implements l2population RPC callbacks which allows ml2
    plugin using l2population mechnism driver to populate vxlan forwarding
    and neighbor tables following portbinding events. It allows agent to
    respond locally to ARP requests for remote VMs and avoid dataplane based
    learning. This should help limiting the use of multicast or flooding
    for broadcast emulation in vxlan networks.
    
    These changes should anyway have a limited risk, as agent behaviour
    shouldn't be affected, except when vxlan is enabled alongside ml2 plugin.
    
    Implements: blueprint l2-population
    
    Change-Id: I99a961c53f9e451409f1affb079042936d8ae5c6

commit dbf051dac76bce2d70c6699022fa83f64ca6ebe2
Merge: 525eeb1 37388cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 23:51:12 2013 +0000

    Merge "Fix unable to ping floating ip from internal_ip"

commit b6133c35dd587f6b01e8ec12757347b2767713a6
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Thu Aug 22 16:51:01 2013 +0200

    OVS agent implementation of l2-population
    
    This patchset implements l2-population RPC callbacks in OVS agents,
    it enables plugin to populate forwarding table following portbindings
    events.
    
    For now, it doesn't include ARP responder implementation which is
    deferred to a future patchset (As this feature isn't yet supported by
    OVS, it will require the use of an external responder such as ebtables)
    
    It anyway brings some improvements in tunnelling management, as agent
    will tear-down unecessary tunnels, and flood packets on a per-network
    basis rather than to all other agents.
    
    These changes should anyway have a limited risk, as tunnel management
    won't be affected as long as l2_population option is not set. This
    option must be used in conjonction with ml2 plugin using l2population
    mechanism driver.
    
    Implements: blueprint l2-population
    
    Change-Id: I5185eefedb0ff392bc8b99d16f810813e26ff58d

commit 95bf8e6a4068508bed63574b36d90fdecb289969
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Mon Jul 22 14:45:34 2013 +0200

    Add l2 population base classes
    
    This patch initiates the blueprint l2-population
    Implemented as a ml2 Mechanism driver.
    
    OVS & LinuxBridge drivers will be added as dependencies.
    
    Rebased on ML2 Portbinding.
    
    Change-Id: Ia2345aa262ec791c9f38b6e41e1e4b46f69cadac

commit 525eeb15ac2243a769a08f72fe9a65160d250984
Author: dekehn <dekehn@gmail.com>
Date:   Wed Sep 11 14:26:35 2013 -0600

    bp: pxeboot-port, provide  pxeboot on ports
    
    Add extra_dhcp_opts extension to Ml2 plugin.
    
    Implements:bp:pxeboot-ports
    
    Change-Id: Id1d3923c4d2e3cf86731e2f2e9013fbee4ed68c7

commit 37388cc074b21a808ac7513d1f60ec681872b47c
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Sep 5 13:22:46 2013 -0700

    Fix unable to ping floating ip from internal_ip
    
    The following patch adds a no-dnat rule so that an internal_ip
    can communicate with it's floatingip.
    
    Fixes bug: 1221419
    
    Change-Id: I3899b01f316902d1139e47b153aadb7ecb1ff983

commit ec12ac444cf79eb216a41af15a4a8bfb3f22daff
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Sep 10 20:32:28 2013 -0700

    Prevent update_port ip_address from matching address_pair
    
    Previously one could update a port to match one of the address_pairs.
    This patch prevents that.
    
    Fixes bug: 1223646
    
    Change-Id: Ic8cecfdb83b3fd9d2691bb41e0427cf578577fc8

commit 494c97a413371b443c8e8d38abfb4dfd02090e86
Merge: ddc780d f43eb49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 17:52:32 2013 +0000

    Merge "Support for NVP advanced service router"

commit ddc780dc30a8ce874041c7e0eb3b5980d866d190
Merge: 715b16a 4535505
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 17:45:19 2013 +0000

    Merge "Ensure pid file is removed when metadata ns daemon receives SIGTERM"

commit 3555240db39186cd4c47fc54417614252ededb06
Author: Kui Shi <skuicloud@gmail.com>
Date:   Thu Sep 12 01:04:09 2013 +0800

    Don't need to init testr in run_tests.sh
    
    In run_tests.sh, function init_testr will initialize testr if the
    directory .testrepository is not existed. Actually, testr will do
    the check before run the test:
    
    In Python package testrepository, setuptools_command.py:Testr.run
    
    68 def run(self):
    69     """Set up testr repo, then run testr"""
    70     if not os.path.isdir(".testrepository"):
    71         self._run_testr("init")
    
    So, init_testr can be removed safely.
    
    Fixes Bug #1224285
    
    Change-Id: Ia74d9fff92b8efba9b72e5c7387f761144daa193

commit 84d73ec5999339919c937687c81de77732886bd4
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Sat Sep 7 19:51:42 2013 -0700

    Don't add neutron metadata_nat_rules if disable metadata proxy
    
    This patchset fixes this issue by adding a condition when adding nat
    rules of neutron metadata proxy.
    
    fixes bug #1212168
    
    Change-Id: I99775aad73c49a8df3043690440d214614279a2b

commit 715b16aca7e21621aa48ca869b284728db3a8f90
Author: Bob Melander <bob.melander@gmail.com>
Date:   Wed Apr 3 21:22:30 2013 +0200

    Adds support for L3 routing/NAT as a service plugin
    
    - Adds L3 routing/NAT service plugin
    - Removes L3 routing/NAT from ML2 plugin
    - Moves "router:external" attribute to new extension "External-net"
    - Introduces separate RPC topic for L3 callbacks from L3 agent
    
    Implements: blueprint quantum-l3-routing-plugin
    
    Change-Id: Id9af10c2910f9a1730b163203a68d101ffc3b282

commit f43eb49f56accab87e4d1b6defcf78d1e697f9e6
Author: Kaiwei Fan <fank@vmware.com>
Date:   Thu Aug 22 23:25:52 2013 -0700

    Support for NVP advanced service router
    
    When creating an LR:
        - deploy an Edge asynchronously
        - create a L2 switch for connecting LR and Edge
        - attach a router port to the L2 switch.
        - assign ip address 169.254.2.1/28 and nexthop 169.254.2.3 to LR
    When set external gateway:
        - configure Edge interface and default gateway
        - Add static routes to Edge for all logic networks attached to LR via nexthop 169.254.2.1
        - configure SNAT rules for all logic networks attached to LR
    When add router interface:
        - Add static route/SNAT rule for the network attached to LR
    When associate floating IP address:
        - configure DNAT rule for the floating ip and the port
    
    Tests being done:
        - Verified Edge is deployed asynchronously and LR is attached to the internal created L2 switch
        - Manually attach Edge's vNic to the L2 switch and Edge is able to ping 169.254.2.1
        - Verified router-delete deletes Edge asynchronously and remove the internal L2 switch
        - Verified SNAT/DNAT/static-routes rules are configured on Edge in correct order
        - Verified external vnic ip address/netmask and default gateway is configured
    
    Implements: blueprint nvp-service-router
    Change-Id: If9eff53df4d65cf4e318dedbfaafc742f6c6ab7f

commit 515866acf292feffbb6ad7fc177c3ba337aff42e
Author: Chengli XU <xuchengli@corp.netease.com>
Date:   Wed Sep 11 13:58:15 2013 +0800

    Fix ovs_lib's issue of parsing flow proto field
    
    When 'proto' other than 'ip' and nw_src/nw_dst are provided at the same
    time, the proto parameter will be ignored.
    
    Fixes bug: 1223668
    
    Change-Id: Ie813e66995e2a9310ec4b48c0f7de673db2097f1

commit 39ef7594bd8f27253507135c4f72cce84a324466
Merge: f510859 cdbce39
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 11 07:38:53 2013 +0000

    Merge "Imported Translations from Transifex"

commit f5108594c21aca519aeaed7858899509e24e5385
Merge: e541ca2 1dabc06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 11 07:16:50 2013 +0000

    Merge "Register an extend_dict function for ext_gw_mode extension"

commit cdbce39d7935b8f7c62858238a470f1cb1154c20
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Sep 11 06:09:42 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8de01b47a78ae301d9760ee8ab0e596e967e333f

commit 1dabc0629e642aab6076fc0ca4e7f9698341a797
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Sep 10 15:38:16 2013 -0700

    Register an extend_dict function for ext_gw_mode extension
    
    Bug 1223585wq
    
    Use dict extension methods instead of overriding make_router_dict in
    order to make this extension consistent with all the others.
    
    Change-Id: I94fa7e70e5a869963ec4dfa9de85c8d922976843

commit e541ca285d5a0f484c886fb28514b84580c3dc02
Author: Justin Hammond <justin.hammond@rackspace.com>
Date:   Tue Sep 3 15:57:52 2013 -0500

    Adds help text to brocade configuration options
    
    Help text was added to the configuration options defined in the brocade neutron
    plugin. This help text should assist users of the brocade plugin. The OSTYPE
    configuration option was not used in the plugin and was labeled as such so a
    user of the plugin would not worry about the meaning of it.
    
    The example etc file /etc/neutron/plugins/brocade/brocade.ini has been updated
    to share the same help values where applicable.
    
    Fixes-Bug: #1157511
    
    Change-Id: Ie068396e77902037a7a0b5334d4dfb0dcdd3575e

commit 89e38929d2bc626b639df9912a98d24b25a7e964
Author: Brian Haley <brian.haley@hp.com>
Date:   Tue Aug 27 17:36:43 2013 -0400

    Change daemon Pidfile class to not use root_helper
    
    Some users of the Pidfile class don't specify root_helper,
    which then defaults to 'sudo', which will generate an error.
    Remove root_helper altogether since we actually don't need
    root priveleges to read /proc/$pid/cmdline.
    
    Changed code to use open.readline() instead of a shell, and
    tweaked tests accordingly.
    
    Also cleaned-up the rootwrap filters that allow it as they
    are not used anymore.
    
    Fixes bug 1218142
    
    Change-Id: I6691feb1c9f7bfa261a7ec464fd8f3f92168c302

commit 72c969f3324033c2e44e0b5a95648aeacb6da68b
Merge: 98e16a0 8de863d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 10 16:16:18 2013 +0000

    Merge "Imported Translations from Transifex"

commit 98e16a06e463bdd83ba617fbb845f8b92852c24a
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Sep 9 14:04:50 2013 -0400

    add missing comma to supported alias string list
    
    Fixes bug: 1222949
    
    Change-Id: Iac7f3b7605149e706e2ea8a30700dccd09f3c57e

commit 4535505fc1ee6aae49f3b054cffd48b88f062e31
Author: Darragh O'Reilly <dara2002-openstack@yahoo.com>
Date:   Tue Sep 10 09:06:28 2013 +0000

    Ensure pid file is removed when metadata ns daemon receives SIGTERM
    
    These files from the metadata namespace proxy are not being removed
    because delete_pid() is registered with atexit. This means it only runs
    when a process exits normally and won't run when a process receives a
    signal.
    
    This patch registers a signal handler for SIGTERM that calls exit()
    to make the process exit normally so delete_pid() gets called.
    
    Fixes bug: 1223250
    
    Change-Id: I6309802e2109359560ccc084559ec8e4d310cce2

commit 8de863ddfdd72d3e10def4ffbb50895ab1ba3846
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Sep 10 06:09:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib94bfe915a60c9c1a1d2375b9a15c666f065d865

commit 5281b806d2e54f6b8a589e1e4acde3d434b31723
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Mon Sep 9 14:54:32 2013 -0700

    Avoid KeyError 'distributed' exception when using NVP <3.x
    
    This patch fixes an issue found when creating routers with
    NVP plugin and NVP platform 2.2
    
    Fixes bug 1220931
    
    Change-Id: Ia7b358b59e48a723c07efec015bb650accaa3322

commit d7855621b13ae3783f49552f5955f555f1ba2d9d
Merge: 2a2125a 155cb48
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 16:33:45 2013 +0000

    Merge "Make neutron.common.log.log print module path"

commit 2a2125a4a60dfe570e3759bff50bbb5c8179ebd0
Merge: 56aca21 860e919
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 9 15:31:16 2013 +0000

    Merge "Imported Translations from Transifex"

commit 56aca213a6377bb818f8417389fd6ea5c40bca9d
Merge: 17336c6 db3b1c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 15:24:41 2013 +0000

    Merge "Enhance unittest for hyperv_neutron_agent"

commit 17336c6540396984759cf5050cc7f731c4d84616
Merge: 0321107 9842dcb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 15:03:30 2013 +0000

    Merge "Fix message i18n error"

commit 0321107cc50fc566a37c5532f14e25dd585880bd
Merge: c896e34 9f60611
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 12:46:04 2013 +0000

    Merge "LBaaS: Fix healthmonitor disassociation for non-admin"

commit c896e34bd3def5d8df7df36e5b14a8afe9ea9d04
Merge: 57ce39f becadd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 9 09:03:01 2013 +0000

    Merge "Move declaration of int_br_device_count earlier"

commit 9f60611c90b397e2964add8cc5f798ceba4a0487
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Wed Sep 4 22:00:40 2013 +0400

    LBaaS: Fix healthmonitor disassociation for non-admin
    
    Due to specifics of policy engine, checked object should have
    tenant_id to be checked by rule admin_or_owner.
    In 'disassociate' operation neutron API layer works with
    PoolHealthMonitorAssociation which doesn't have tenant_id field.
    Need to add it to resulting dict returned by get_pool_health_monitor.
    
    Change-Id: I6c58558b09ff34dedd7da30866275de44d3ba993
    Closes-bug: 1220668

commit 860e91966b4cacaa2915e5786c64200ae2b51708
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Sep 9 06:10:05 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3f069fcb0ff5645581152ca33d12ed802d0779e5

commit 9842dcb34cb79b942391fdab4a00dd790b5e299e
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Tue Aug 27 08:02:04 2013 +0800

    Fix message i18n error
    
    Partial-Bug: #1217100
    
    Using tools/check_i18n.py to scan source directory, and fix most of
    the errors.
    
    - Message internationalization
    - First letter must be capital
    - Using comma instead of percent in LOG.xxx
    
    Note: all extension's description are not touched in this patch,
    can be fixed after discussing.
    Note: all nicira/check_nvp_config.py print messages are not fixed.
    
    Change-Id: I79ef06fd42f6780beb5019c592662536c2a51864

commit db3b1c01b51f9ebd00a9a63403b1ad16123c2579
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Mon Aug 19 08:13:41 2013 -0700

    Enhance unittest for hyperv_neutron_agent
    
    Change-Id: Idc726ba668eba56a64dc498b49ec0e5e397590b5

commit 57ce39fa66a23ff7b5adb589b1b5b262a0a00ce8
Merge: 9707c73 8b9cc77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 7 16:58:56 2013 +0000

    Merge "Enclose command args in with_venv.sh"

commit 9707c73a9bc27b7a855c01fd03e2fdfaa32bb814
Merge: 45beae8 f7c55db
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Sep 7 16:58:03 2013 +0000

    Merge "Imported Translations from Transifex"

commit 45beae8cc0233fe2770114af70863df331bf282e
Merge: 0f81818 fc0e7cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 7 16:57:54 2013 +0000

    Merge "Fix IF checks on spawned green thread instance"

commit f7c55db888dac0dfd8f24208fc5b44f1de39955b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Sep 7 06:10:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4602704b4a4f1be5a49f1431eebd58072dfb7704

commit 0f81818165085dc125c694bba97d443e0152382a
Merge: e82f0eb fe92e1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 6 23:37:45 2013 +0000

    Merge "Mock midonetclient in test_midonet_lib"

commit fc0e7cd5ab01cb54ba7f2696e15c49e1fb827bc7
Author: Kaiwei Fan <fank@vmware.com>
Date:   Thu Sep 5 13:57:13 2013 -0700

    Fix IF checks on spawned green thread instance
    
    Initially the symptom looks like race condition between two threads when
    stopping the task manager. After further analysis/troubleshooting, it
    turns out that two threads are spawned if a task manager is stopped and
    started again, causing unexpected errors.
    
    The IF check on the spawned thread sometimes return True sometime return False
    if not compared against None explicitly. This makes start() method
    think no thread has been started or stop() method think no thread is started.
    Change the check to compare against None.
    
    Also fixed a problem in unit-test where a thread may never terminated when
    a stop call is invoked during db access.
    
    Closes-Bug: 1221486
    Change-Id: I0d67bfe8fef7a390f0d6bc0f5a42835f86a9fb27

commit e82f0eb5df898f930f6d6a476b5d9550b1625d76
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri Sep 6 12:57:48 2013 -0700

    Prevents 400 NVP errors caused by a None display_name
    
    The API forbids a resource name to be None, but the
    Model does not. Such errors may  be induced by
    programming directly against the plugin interface. With
    this fix we avoid raising 400 faults which may be introduced
    by involuntary programming errors.
    
    Fixes bug 1221896
    
    Change-Id: Ic1201c5af5691f2bed38753453f73c229858b10f

commit 155cb48bca9b66fa5188e5c1c63adf696cd6d127
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sat Sep 7 02:10:57 2013 +0900

    Make neutron.common.log.log print module path
    
    Closes-Bug: #1221663
    
    neutron.common.log.log is useful for logging arguments of a method.
    It outputs class name and method name, but module path is not output.
    A module path is useful to search the log message.
    
    Change-Id: Ic2903da750cc13980d5cdee153bb079f7d4ee122

commit e26639b190fb974ba61fb2e479029e26cb3c6a70
Merge: 5bae582 902dc88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 6 14:49:52 2013 +0000

    Merge "Replace assertEquals with assertEqual"

commit 5bae5828d3ae5e614c88c5c0f1ffa768a1228feb
Author: Rich Curran <rcurran@cisco.com>
Date:   Fri Sep 6 08:45:18 2013 -0400

    Load ML2 mech drivers as listed in ml2_conf.ini
    
    stevedore requires an additional parameter to be used (name_order=True) to
    sort the loaded extensions to match the order used in the parameter "names".
    
    bug 1221490
    
    Change-Id: I614716c45d91cdf152650fba5ec8ced1e9c5aad4

commit fe92e1efbf7672b33c90b1598b579b88488c0770
Author: Rossella Sblendido <rossella@midokura.com>
Date:   Fri Sep 6 10:42:31 2013 +0000

    Mock midonetclient in test_midonet_lib
    
    Change-Id: Idb4de82c193b2f2589131b06bad04bc858499a21
    Closes-bug: #1221674

commit 0739b2fe827b3beefb5ad81c063cbc4d00525a9d
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Sep 6 13:27:19 2013 +0800

    Fix incorrect NotImplementedError
    
    neutron.common.exceptions doesn't define NotImplementedError, but
    some codes still use it. We should use builtin
    exceptions.NotImplementedError instead.
    
    Note: this patch also fixes a never run code in nvp.
    
    Closes-Bug: #1221500
    Change-Id: I5f367ab5edc1e7fbbc2e4eba5fe36d148d4d062d

commit 902dc88b4c511859f164fed4c4ac8ce0c60b09ee
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Sep 6 15:27:20 2013 +0800

    Replace assertEquals with assertEqual
    
    The method assertEquals has been deprecated since python 2.7.
    http://docs.python.org/2/library/unittest.html#deprecated-aliases
    
    Also in Python 3, a deprecated warning is raised when using assertEquals
    therefore we should use assertEqual instead.
    
    Fixes bug #1221601
    
    Change-Id: Id502cfbc210c6c3fe0a256d5350e159ffa220141

commit 394741cb9015910c39d4643d9e30998c7b0d2c2e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Sep 6 06:09:44 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I874308f83a54defeb77336acc1c0318172db1bb6

commit 1a25274e7acdb80993cff1974fbcdfb64dc26d24
Merge: ee023ba d6f28ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 6 00:34:03 2013 +0000

    Merge "vArmour gateway agent and FWaaS driver"

commit ee023ba698a2032517f98185f05a00a7d5fff2a0
Merge: dfe3719 dc48ac1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 22:26:49 2013 +0000

    Merge "Allow default network and policy profiles"

commit dfe371978c7bb252a93cacc8a4c7c8ff752af460
Merge: 6813920 c25d740
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 22:18:37 2013 +0000

    Merge "Install metering_agent.ini and vpn_agent.ini"

commit 68139207eb5aba876a66ea12d2371d5053a80e4b
Merge: 0c1f968 6d10373
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 22:12:48 2013 +0000

    Merge "LBaaS: make haproxy stats parsing more safe"

commit edd17eae6ab9101f8d780ced3b01b8eec8c663e1
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Aug 21 17:51:34 2013 -0700

    Hash device_id only if it is longer than the allowed MAX size for NVP
    
    This ensure that a VM uuid stays untouched, avoiding potential
    confusion when inspecting NVP port tags. This patch also abstracts
    the hashing method out by introducing a device_id_to_vm_id method.
    Filtering logic is preserved, and a test has been added to ensure
    that. However such a logic is not currently used in the NeutronPlugin
    (because of the introduction of async status updates), but it has
    been added as utility method to nvplib.
    
    Fixes bug #1215204
    
    Change-Id: Ib96ecae438e30f195c8b45176abc1cf55b4b363f

commit c25d74026211587999d9a54aa5ffc0747d8acb2c
Author: Sascha Peilicke <saschpe@gmx.de>
Date:   Thu Sep 5 10:30:44 2013 +0200

    Install metering_agent.ini and vpn_agent.ini
    
    Fixes Bug: 1221451
    Change-Id: I83c4e4e0cfd6605930acfcc4f69ea9ece35abc24

commit 0c1f9681dc9706edc0b61f981c698d6100c66312
Merge: 7f78814 ee26de1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 20:30:23 2013 +0000

    Merge "fix conversion type missing"

commit 7f788143838009239bcc4223b103e863632a52c3
Merge: b15c0b3 3e00a45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 20:25:05 2013 +0000

    Merge "Fix NVP plugin to send notifications for gateway-less subnets"

commit dc48ac1a9c02c236157347f715190a2b1107ec70
Author: Abhishek Raut <abhraut@cisco.com>
Date:   Fri Aug 30 17:39:26 2013 -0700

    Allow default network and policy profiles
    
    Allow for default network/policy profile to be used if
    no network/policy profile is specified during network/port creation
    in the Cisco N1KV plugin.
    
    Change-Id: I6120abb5abb9a869eb7310453cf27dd8f72bfd1d
    Closes-Bug: #1218588

commit ee26de1ed22fc67591a7b5465132f78af1f1c0f4
Author: Kun Huang <gareth@unitedstack.com>
Date:   Thu Sep 5 14:20:23 2013 +0800

    fix conversion type missing
    
    Conversion type is missing in some places which would cause some
    unexcepted error. By using 'grep -rn "%(\w\+)\W"', we could find
    all cases of '%(variable_a)' and fix them.
    
    Change-Id: I05cbaac73976c70be8428bf5a2d0017ea7059cb3
    Closes-Bug: #1221036

commit b15c0b3c95b28fb528e8e7f7442250b6a1b00ff7
Merge: 38f17e1 50c9199
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 16:13:17 2013 +0000

    Merge "Add sub-type field to VXLAN network profiles for Cisco N1KV plugin"

commit 38f17e1e0327747f0c7a5b3c8d7d4295635a183e
Merge: 9206e15 0efce61
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 16:13:07 2013 +0000

    Merge "Implement Allowed Address Pairs"

commit 9206e150a334062157a9338120fd1cf37962965c
Merge: 81d2352 d834935
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 15:31:20 2013 +0000

    Merge "Use admin context to retrieve metadata ports in NVP plugin"

commit 50c9199d6a83409e6cb5ebc3ca4eefce9a2f0531
Author: Abhishek Raut <abhraut@cisco.com>
Date:   Mon Aug 19 21:20:11 2013 -0700

    Add sub-type field to VXLAN network profiles for Cisco N1KV plugin
    
    Rename VXLAN type of network profiles to Overlay network profiles.
    Add a new sub type column to Overlay network profiles. Support
    enhanced VXLAN and native VXLAN as Overlay sub types. Allow plugin to
    be flexible to support newer sub types.
    
    Change-Id: I3899b01f316902d1139e47b153a9db7ecb3ff982
    Implements: blueprint cisco-plugin-n1k-enh-vxlan-support

commit becadd39df087544ac1ce97926cc3014fd286e08
Author: Derek Higgins <derekh@redhat.com>
Date:   Wed Sep 4 23:05:08 2013 +0100

    Move declaration of int_br_device_count earlier
    
    _report_state is being called by setup_rpc so int_br_device_count needs
    to be initialized earlier. To avoid
    AttributeError: object has no attribute 'int_br_device_count'
    
    This wasn't caught by unit tests for 3 separate reason
    o The reference to self.int_br_device_count is wrapped in
      except Exception: log / pass
    - This reference has been moved outside of the try/except
    
    o Unit tests set report_interval to 0 so the heartbeat wasn't called
      during unit tests.
    - now removed
    
    o The function passed into FixedIntervalLoopingCall isn't started
      anyways so wasn't calling self._report_state
    - replaced FixedIntervalLoopingCall with a mock that calls the
      function once.
    
    Fixes bug #1221054
    
    Change-Id: I572af4ee017c1f7f016c8f9981ca54d1301442d1

commit 81d2352724f21fecd74f2553212184a396de3c85
Merge: 384d4d9 0253740
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 12:45:57 2013 +0000

    Merge "Implement MidoNet Neutron plugin for Havana"

commit 384d4d98f7ea31dfb6dc239816dbcf9e705d331f
Merge: a7751b8 e19178e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 12:07:09 2013 +0000

    Merge "Iptables metering driver"

commit a7751b89a237ce4d596d1027fa7679dc723bdd4a
Merge: be152bf 5619bc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 12:07:01 2013 +0000

    Merge "Add method to get iptables traffic counters"

commit be152bfdba76c1a391f0fff53d1bcb77234ca4de
Merge: d9029a3 d632b66
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 12:06:32 2013 +0000

    Merge "Allow None for binding:profile attribute"

commit d9029a3398d7de38fca4916e2c38d9f554dbfaf6
Merge: f74185a dabbb1b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 10:59:40 2013 +0000

    Merge "Ensure unit tests do not let looping calls roam freely"

commit 0efce6195fa7be80e110bd841dc9b3537a94c376
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Aug 16 10:56:21 2013 -0700

    Implement Allowed Address Pairs
    
    The following patch adds the concept of allowed address pairs.
    This allows one to add additional ip/mac address pairs on a port to
    allow traffic that matches those specified values. This is useful in order
    to leverage dataplane failover mechanisms like vrrp. This patch adds support
    for the NVP plugin, the OVS plugin, and Ml2.
    
    DocImpact
    
    implements blueprint: allowed-address-pairs
    
    Change-Id: Ie73b3886c5be8e1fc4ade86a0cfb854267f345ac

commit f74185a2ce6439b1de3a7e316c872af291ce596a
Merge: 28f7422 18eea48
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 5 10:13:04 2013 +0000

    Merge "Imported Translations from Transifex"

commit 28f74220d367a9c8c29e0464c4606569866cb808
Merge: 61a0574 f96cf93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 09:58:01 2013 +0000

    Merge "VCNS driver implementation"

commit 61a0574ab25503d992780108aab929a1c0381285
Merge: 0f5e2bd b6d0c40
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 07:47:06 2013 +0000

    Merge "ML2 Mechanism Driver for Cisco Nexus"

commit 18eea486012a158c9cfa3df0b28eeda36e65015d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Sep 5 06:14:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6d5621e3af8df67133ab4689bd6df52c1a82cb75

commit 0f5e2bd607a612a848b6ec674dd5f23a8e4959b7
Merge: 9b76de1 d5b09d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 5 06:01:30 2013 +0000

    Merge "Add support for the multiprovider API to ML2"

commit d6f28ffc9b36d272d23e0d089d2bbfc6193aa30a
Author: garyduan <garyduan@gmail.com>
Date:   Sat Aug 24 17:34:00 2013 -0700

    vArmour gateway agent and FWaaS driver
    
    This patch enables vArmour's routing and firewall services to be deployed in
    openstack environment.
    - as gateway for internal networks
    - support SNAT and DNAT (floating IP)
    - FWaaS services
    
    Implements: blueprint varmour-fwaas-driver
    Change-Id: I6ddfa3137ed7e2a3fcf16a764d1340a8eae9359a

commit d834935648655f56a813dfa44a57bf5801fdba51
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Sep 4 18:04:55 2013 -0700

    Use admin context to retrieve metadata ports in NVP plugin
    
    The port that connects the router and the metadata
    network is created with admin context, so use the
    elevated one.
    
    Change-Id: Idd416fe0841f6aea80da3a3b66a80a451e0360fd
    Closes-Bug: 1220877

commit 3e00a45ff766e049951981614013a8d425fa34fd
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Sep 4 13:11:43 2013 -0700

    Fix NVP plugin to send notifications for gateway-less subnets
    
    It was noted that an update notification should be sent
    regardless; this patch addresses that. Since there is
    no longer the need to distinguish on whether to send
    the RPC message or not, the operation has been factored
    out to avoid code duplication.
    
    Closes-Bug: 1220881
    
    Change-Id: If553a84b7221f8c98d758654d317217a909c43dc

commit dabbb1bfc567b06573b55a3e250cd3d5d98ade16
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Sep 4 12:22:23 2013 -0700

    Ensure unit tests do not let looping calls roam freely
    
    Bug 1220871
    
    This patch does minimal changes in neutron.plugins.nicira.common.sync
    providing unit tests with a reference to the looping call object, so
    that they can control its lifecycle.
    Also, it perform a bit of refactoring in test_l3_agent.py in the way
    mocks are created and started.
    
    Change-Id: I73a1eb8ecdb7c6d46ff12afba549dd27095b7202

commit f96cf93e70f8c434499efb903820aa72665a7fd4
Author: Kaiwei Fan <fank@vmware.com>
Date:   Tue Aug 20 14:28:58 2013 -0700

    VCNS driver implementation
    
    Implement API/driver interface for configuring vShield Edge Appliance.
    
    Currently implemented functions:
        - Deploy an Edge
        - Destroy an Edge
        - Configuring interfaces
        - Configuring SNAT/DNAT rules
        - Configuring default gateway and static routes
        - Query Edge status
        - Task-based asynchronous model
        - Allow old routes/nat config to be skipped if new updates are coming
    
    Implements: blueprint vcns-driver
    Change-Id: I881bde907f4c90de4c919d008b76b8c2a2d0e1fd

commit 8b9cc772ea3637513179efb797cfd94e49cdb1c1
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Thu Sep 5 06:14:18 2013 +0800

    Enclose command args in with_venv.sh
    
    Change-Id: I6d2ca2f8fca951fe2d90265da8728438dd7d7567
    Closes-Bug: #1220937

commit 9b76de161d690faee341a87e8066d40329b4f5b0
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Sep 4 14:36:11 2013 -0400

    ensure that Arista test destroys the database
    
    Out of order test execution has revealed that the database was not
    properly cleaned up after each test run.  This patch adds a call to
    clear the database after each test.
    
    Fixes bug: 1220784
    
    Change-Id: I8a706887f89f21ede88177e441a3b562fd8f74dc

commit b6d0c40f20a74d61fc1f34a2a948fbeb838fdf45
Author: Rich Curran <rcurran@cisco.com>
Date:   Wed Aug 21 17:43:12 2013 -0400

    ML2 Mechanism Driver for Cisco Nexus
    
    Port of the quantum/plugin/cisco/nexus plugin to run under the Modular
    Layer 2 (ML2) infrastructure as defined in
    https://blueprints.launchpad.net/quantum/+spec/ml2-mechanism-drivers
    
    Implements blueprint ml2-md-cisco-nexus
    
    Change-Id: Ifdd03bec554a08266de859387f1901858a3be4a1

commit 062ee16e09fb2ba7d89a80bdeb8de1eee978ac2e
Merge: 052d745 169729c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 17:34:12 2013 +0000

    Merge "Add jump to float-snat chain after clearing snat chain"

commit 052d74531a8016b68f873b37eb36119e302c18ee
Merge: 48d2bae bba99f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 17:33:31 2013 +0000

    Merge "Reference driver implementation (IPsec) for VPNaaS"

commit 48d2bae56d439f83d4f130472501bb61fd52b8af
Merge: 42cfd92 d4c3047
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 17:33:22 2013 +0000

    Merge "Embrane Neutron Plugin"

commit 42cfd92556d86db184057c8c933dee87b9f63e03
Merge: 7dc98c0 d2a5c0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 17:33:11 2013 +0000

    Merge "OpenFlow distributed router support in NEC plugin"

commit 7dc98c07a9863ae6fe3967d7bbc1ef5a2be23ac7
Merge: b0475db d6f50e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 16:54:35 2013 +0000

    Merge "Fixes formatting exception from logging in BigSwitch plugin"

commit b0475db9ddd3ccd8355d9a79fa8d9f6c3a757171
Merge: 18386c6 70902ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 16:52:03 2013 +0000

    Merge "LBaaS: add status of pool-monitor association to the pool return dict"

commit d632b66dc8b701ca777af4335b6505b4c4cd7828
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Sep 3 21:57:53 2013 +0900

    Allow None for binding:profile attribute
    
    We need to pass None in binding:profile to allow an administrator
    to clear binding:profile attribute.
    
    Closes-Bug: #1220011
    
    Adds dedicated unit tests to the plugins which uses binding:profile
    attribute (Mellanox and NEC plugins at now).
    
    This commit also adds common unit tests for binding:profile to
    the common PortBindingTestCase class.
    - create_port with binding:profile whose value is None or {}
    - update_port with binding:profile whose value is None or {}
    - Reject binding:profile from non-admin user
    
    Note that _make_port() in BigSwitch plugin test is updated
    to allow passing arg_list() from the base test class.
    
    Fix a bug in NEC plugin that 500 is returned when putting
    binding:profile None to a port whose binding:profile is
    already None (Closes-Bug: #1220720)
    
    Change-Id: I146afe961cd445a023adc7233588d8034fdb8437

commit 18386c6fcb81543ab6bb6ec6675cec08344e7692
Merge: 085b290 5ec6a60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 15:47:55 2013 +0000

    Merge "Add Neutron l3 metering agent"

commit d5b09d891ab52c2eb1dc21bab4faa45e2b18ad81
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Fri Aug 23 09:03:49 2013 +0000

    Add support for the multiprovider API to ML2
    
    This implements support for creating provider networks with
    multiple different segments with the ML2 plugin.
    
    Implements: blueprint ml2-multi-segment-api
    
    Change-Id: Id6fc22841fddabfbe685de9605d4a4682ee1102d

commit 085b290bd8cb9751d67ca5ff37c6a15764ecf2b5
Merge: 8aa7c0d c7cf2ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 14:41:16 2013 +0000

    Merge "Introduce periodic state synchronization with backend"

commit 8aa7c0d91e46be6c621c6a7ed1fe78b40ad325b7
Merge: 0f35cdd d518c8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 14:35:02 2013 +0000

    Merge "Adding more unit tests for the FWaaS agent"

commit 6d1037335bbe969cfbc6d9657c24865ca226c7e9
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed Sep 4 17:48:50 2013 +0400

    LBaaS: make haproxy stats parsing more safe
    
    Change-Id: Ic21b310608bb98be29ea50ab7c56ca859a9ed5c0
    Closes-Bug: #1220692

commit 70902ad4358fee050a4a8ebbc3ff2aa50278058e
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Sep 2 13:44:51 2013 +0400

    LBaaS: add status of pool-monitor association to the pool return dict
    
    Closes-Bug: #1219692
    Change-Id: Icc7ca4a48c43a8462860cdbc42626079bffadc26

commit d2a5c0f982e8e4f9fbdce17b90925b8d8df56c75
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Aug 23 15:22:04 2013 +0900

    OpenFlow distributed router support in NEC plugin
    
    Implements blueprint nec-distribute-router
    
    Two types of neutron router will be supported: l3-agent and distributed.
    A type can be specified through "provider" attribute of a router.
    The naming of the attribute "provider" is intentional since I plan to
    support the service provider framework for router in the future and
    would like to make it easy to migrate.
    
    distributed router in NEC OpenFLow controller now does not support NAT,
    so l3-agent and distributed router coexists. To achieve it, l3-agent
    scheudler logic is modified in NEC plugin to exclude distributed routers
    from candidates of floating IP hosting routers.
    
    To support the above feature, the following related changes are done:
    - Adds a new driver to PFC driver which supports OpenFlow based router
      support in NEC OpenFlow products in PFlow v5.
    - Update ofc_client to extract detail error message
      from OpenFlow controller
    
    This commit also changes the following outside of NEC plugin:
    - Makes L3 agent notifiers configurable.
      l3-agent router and OpenFlow distributed router can coexist.
      Notication to l3-agent should be done only when routers are
      hosted by l3-agent, so we need custom L3 agent notifiers
      to filter non l3-agent routers.
    - Split test_agent_scheduler base class (in OVS plugin) into
      the base setup and testcases. By doing so we can implement
      custom testcases related to agent scheduler.
    
    Change-Id: I538201742950a61b92fb05c49a9256bc96ae9014

commit bba99f29ad8500770bd838366c96ae371787d98f
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Wed Jun 5 16:24:38 2013 -0700

    Reference driver implementation (IPsec) for VPNaaS
    
    Implements blueprint ipsec-vpn-reference
    
    This patch implements reference driver implementation for VPNaaS.
    The driver uses openswan to manage vpn connections.
    
    Future work: Support ikepolicy and ipsec update
    Support service type framework
    Intelligent updating of resources
    
    This commit adds jinja2 for requirements.txt for
    generating cofig file.
    
    Change-Id: I8c5ed800a71ca014dc7bdbb6a57c4f8d18fa82e0

commit 0f35cddf1ab81ace17a081242ef5dd019fe14d74
Merge: 7700de6 0f94119
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 05:18:39 2013 +0000

    Merge "Verify MTU is valid for ipsec_site_connection"

commit 7700de6e7a31f9cc4f9a3442417cfdfca8332b27
Merge: 71bbefb 8bc02a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 04:47:04 2013 +0000

    Merge "Implement ML2 port binding"

commit c7cf2edcefe49a636092ad43a621569c3cefd4a8
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Jun 21 00:20:45 2013 +0200

    Introduce periodic state synchronization with backend
    
    Blueprint nicira-plugin-get-improvements
    
    With this patch GET operations on the Nicira plugin will not
    be forwarded anymore to the NVP backend.
    Resource operational status will be periodically retrieved from
    the NVP backend using a DynamicLoopingCall.
    The process has been designed with the aim of avoiding:
    1) frequent queries to NVP for retrieving resource status
    2) execution of large queries to NVP for retrieving the status
       of a consistent number of resources.
    The process can be tuned using a set of configuration variables.
    GET operations will now return a status which might differ
    from the actual status of the resource. For retrieving status
    in a punctual way, the field 'status' should be explicitly
    specified in the GET request (only 'show' support has been
    implemented in this patch)
    
    This patchs also makes some changes to the fake nvp api client in
    order to ensure each instance has a private set of dictionaries for
    fake nvp entities.
    
    Change-Id: Ia745b80d2826de32ba8d6883c0d6e0893047e123

commit 0f9411948221b1df70d4a3f3d1271f821bea74aa
Author: Paul Michali <pcm@cisco.com>
Date:   Mon Sep 2 07:02:12 2013 -0400

    Verify MTU is valid for ipsec_site_connection
    
    Since the check relies on the vpnservice subnet to determine whether
    this is IPv4 ro IPv6, we must check in the plugin. Test is done at
    create/update time and ensures that the MTU is equal to or greater
    than the minimum allowed values, which are set to 68 for IPv4
    minimum and 1280 for IPv6, respectively.
    
    Refactored code to allow reuse of create and update test functions,
    by allowing tests to override some settings, and to provide a dict
    of changed items (for update).
    
    bug 1219489
    
    Change-Id: I3e62ef786d3a02c761903a15d546ee8758c0bf7f

commit 71bbefbcc6d5e9cb12aaba1c3c8231e8f4241eb9
Merge: 923fbbf ba4ed39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 01:43:24 2013 +0000

    Merge "Refactoring for nicira plugin to support NVP DHCP/Metadata services"

commit 923fbbf65b51c5b4c0c296fa30ce866e16da94b3
Merge: 7080ab0 96adb2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 01:42:12 2013 +0000

    Merge "Default to not capturing log output in tests"

commit 7080ab058d6f34377b45f4bafca450cdde39ce16
Merge: 0160ee2 88dd89b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 4 01:35:51 2013 +0000

    Merge "LBaaS integration with service type framework"

commit 8bc02a7fbeaf2e0c8bccbaad52f41d026c1bbf40
Author: Bob Kukura <rkukura@redhat.com>
Date:   Mon Aug 12 21:58:36 2013 -0400

    Implement ML2 port binding
    
    The ml2 plugin uses mechanism drivers to determine which network
    segment and what VIF driver to use for a port. Mechanism drivers
    supporting the openvswitch, linuxbridge, and hyperv agents are
    added. The binding:host attribute is set on ports belonging to the
    dhcp and l3 agents so that they can be bound.
    
    To use with devstack until it is updated, set
    "Q_ML2_PLUGIN_MECHANISM_DRIVERS=openvswitch,linuxbridge" in localrc.
    
    The hyperv L2 agent does not currently implement the agents_db RPC,
    and will therefore not work with its ml2 mechanism driver. This issue
    will be tracked as a bug to be fixed in a separate merge.
    
    implements blueprint: ml2-portbinding
    
    Change-Id: Icb9c70d8b0d7fcb34b57adc760bb713b740e5dad

commit ba4ed39616c3c6fabf24ca390c7037877c672fba
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Aug 14 16:23:31 2013 -0700

    Refactoring for nicira plugin to support NVP DHCP/Metadata services
    
    This initial patch is aimed at decoupling core plugin services from
    DHCP and metadata services. The abstraction being introduced is
    needed so that the code can support both models where dhcp and
    metadata services are provided by external RPC agents or solely by
    the server-side plugin.
    
    Supports blueprint nvp-dhcp-metadata-services
    
    Change-Id: I396ee7bbcbd866e4e9d4a79887e844b4f5ec3c9e

commit 0160ee2c5c744934626f1e8e100990b829dcb27b
Merge: 7baa238 cd17893
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 21:49:40 2013 +0000

    Merge "ML2 type and mech managers should use instance vars for drivers lists"

commit d518c8f39ef7b39cf4508c41e163d1cc89a5571d
Author: Sridar Kandaswamy <skandasw@cisco.com>
Date:   Fri Aug 23 00:39:18 2013 -0700

    Adding more unit tests for the FWaaS agent
    
    Change-Id: Ic3de53ed9fa47f6518cbb25dac4ee7782c97bfbb
    Fixes: bug #1215771

commit 7baa238552e00f2f96791f5852e6fabaddaff694
Author: sukhdev <sukhdev@aristanetworks.com>
Date:   Mon Jul 15 16:26:58 2013 -0700

     Arista ML2 Mechanism driver
    
    This patch implements Arista's modular L2 mechanism driver to
    automate the management of virtual networks along with physical networks
    using Arista hardware devices (Spine and Leaf switches)
    
    This driver uses ML2 Mechanism Driver-API to interface with Neutron ML2 Plugin.
    
    implements: blueprint arista-ml2-mechanism-driver
    
    Change-Id: I1c4ca36cf3d7af013b7b3353e7b7d89fe39f91bf

commit 30c115843d3a0b6d56c23cf140d178d44d6866de
Merge: 854f5f3 a775ab3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 20:34:03 2013 +0000

    Merge "ML2 Mechanism Driver for Tail-f Network Control System (NCS)"

commit cd17893dbce60028f0d946f9d30c3c2afea0f2e3
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Tue Sep 3 13:34:42 2013 -0400

    ML2 type and mech managers should use instance vars for drivers lists
    
    Fixes bug 1220296
    
    The ML2 plugin's type and mechanism managers currently maintain
    dictionaries/lists of type drivers, mechanism drivers, and ordered mechanism
    drivers in (static) class variables. Once a type/mechanism/ordered-mechanism
    driver of any given type is added to this list, then no new drivers of that
    type are allowed to be registered, and therefore no new configuration for
    that driver type is accepted.
    
    This static nature of the driver dictionaries/lists is causing ML2 mechanism
    driver unit test cases to fail. For example, if a non-vendor-specific ML2
    plugin test case configures a VLAN type driver with no VLAN range, and then
    a vendor specific test case attempts to configure a VLAN type driver with
    some test VLAN range, then the new VLAN configuration is ignored because of
    the previously (staticly) registered VLAN driver.
    
    The proposed fix is to convert these driver dictionaries/lists to instance
    variables, and clear them upon each instantiation of an ML2 type manager
    or ML2 mechanism manager.
    
    Change-Id: I3b5209640de229899561e2a3ec7c6dafe9a05e64

commit 88dd89b2ff68db9ce58078f0adf0bb4b5a789918
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sun Jul 7 10:50:56 2013 +0400

    LBaaS integration with service type framework
    
    The patch makes the following changes:
    
    * adds new attribute of the pool: provider, which is provider name
    as it is written in configuration
    * adds support for multiple plugin drivers for loadbalancer
    * cleans up healthmonitor-related plugin driver API
    Drivers should work with healthmonitor associations only
    * adds ability to update provider attribute for the pool used
    to reassociate pools with new providers in case their providers
    were removed from configuration
    
    implements blueprint lbaas-integration-with-service-types
    
    DocImpact
    
    Change-Id: I4295c9bcceb38e60f813d5596af48bd8194c1c9b

commit a775ab3b61122993fbbecabc57d09f38abb03570
Author: Luke Gorrie <luke@snabb.co>
Date:   Thu Jul 18 09:25:48 2013 +0000

    ML2 Mechanism Driver for Tail-f Network Control System (NCS)
    
    Define a new ML2 Mechanism Driver that replicates Neutron network/port
    configuration changes to NCS: http://www.tail-f.com/network-control-system/
    
    Configuration is sent using a HTTP/JSON interface.
    
    Implements blueprint tailf-ncs
    
    Change-Id: I1f73fa3f2e4eec8e5a0f2865aec2d934e25c76d1

commit 96adb2a6c255f96e9d82c86ec37072c30aec021c
Author: Maru Newby <marun@redhat.com>
Date:   Tue Sep 3 16:35:52 2013 +0000

    Default to not capturing log output in tests
    
    Viewing log output while tests are still running can be useful for
    debugging, but log output was previously always captured.  This
    change ensures that log capture is off by default, but can still
    be enabled by setting OS_LOG_CAPTURE=1 in the shell environment.
    
    testr invocation is unchanged and will continue to capture logs by
    default.
    
    Change-Id: I9d0fb648541280cacfebb47f67f608378ae66ef3

commit 0253740a23d5cb58db539230dd8513b2f845afe1
Author: Rossella Sblendido <rossella@midokura.com>
Date:   Sat Aug 24 00:17:38 2013 +0000

    Implement MidoNet Neutron plugin for Havana
    
    Implement L2, L3, security groups, metadata server support for
    MidoNet Neutron plugin for Havana.
    
    blueprint midonet-plugin-havana
    
    Change-Id: I0dd1a2ca17d760443c4c7a464a66b6d0a2cf194a

commit c1f34a61de227fc551496dff3197466a1cdacccb
Merge: 818b6e0 99310d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 15:54:00 2013 +0000

    Merge "Export portinfo thru portbinding ext in NEC plugin"

commit 818b6e0141862672d124722ea49a786a11e9f441
Merge: 34a208d a07bbac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 3 14:59:42 2013 +0000

    Merge "Allow subclasses to modify dict_extend hooks"

commit 34a208d1f3829173815beca81d07b53633a12989
Author: Russell Bryant <rbryant@redhat.com>
Date:   Tue Sep 3 02:51:14 2013 -0400

    Sync rpc fix from oslo-incubator
    
    Sync the following fix from oslo-incubator:
    
    76972e2 Support a new qpid topology
    
    This includes one other commit, so that the above fix could be brought
    over cleanly:
    
    5ff534d Add config for amqp durable/auto_delete queues
    
    Closes-bug: #1178375
    Change-Id: I99d6a1771bc3223f86db0132525bf22c271fe862

commit 957533f685caf9ffc0d9cad569598455d59ade34
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed Aug 14 16:11:24 2013 +0400

    LBaaS: update status of members according to health statistics
    
    Added members health stats reporting to the haproxy driver.
    During pool stats update db plugin checks for members stats
    and updates members statuses if any
    
    Fixes bug 1160125
    
    Change-Id: I77bf13615607fcf91bf877c228811ea8008b2457

commit a07bbac1c40dd4f748fe9a40f8adb3654b3ed8e3
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 2 17:37:22 2013 -0700

    Allow subclasses to modify dict_extend hooks
    
    Partial-Bug 1219991
    
    This change modifies the hook processing for dict_extend routines
    to call the method on the instance if a hook is registered as a string.
    Otherwise, the callable hook is directly invoked as an unbound method.
    
    This patch fixes hook registration for all extensions except port_binding.
    This is because some plugins are currently working around this limitation
    by invoking both the global hook and another dict_extend function,
    which might either be registered as another hook, or invoked explicitly
    before returning the response.
    Fixing this would go beyong the scope of this patch.
    
    Change-Id: Ibe78433e6554aa7fdf5156fc75b8339254876e78

commit 99310d51743eaef8c57c0ab0d8e4eeef0ea63f50
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Aug 21 15:43:19 2013 +0900

    Export portinfo thru portbinding ext in NEC plugin
    
    blueprint nec-port-binding
    
    * Add host-id support in port-binding extension.
    * Expose portinfo thourgh binding:profile attr in a port.
      portinfo is a mapping between neutron port id and OpenFlow switch
      physical information (datapath_id and port_no)
    
    It changes the following in portinfo db model
    * Add cascade on delete to delete an associated portinfo
      when deleting the port.
    * Use joined query for portinfo model to retrieve an associated
      portinfo when querying a port.
    
    Change-Id: Id88d93dc0770a1290714436324b1b53c0b023eeb

commit 795155c743e269e8b4c600add3c4d6b21957f2e0
Merge: b63c6f9 a9230a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 2 22:05:26 2013 +0000

    Merge "Adds metrics collection support in Hyper-V"

commit b63c6f9f839188ade489d77747164b0fec8ab116
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Mon Sep 2 18:21:01 2013 +0200

    Fix DHCP agent to work without extra_dhcp_opt extension
    
    With the introduction of extra_dhcp_opt extension, DHCP agent
    stopped serving mac adresses when used in conjunction with a
    plugin that doesn't support this extension. This fixes the agent
    by not assuming that port dict contains extra_dhcp_opt key.
    
    Closes Bug: #1219893
    
    Change-Id: I5bb52f3092f04c5e332b43cb3a04de05edc29cf5

commit 854f5f3c0d56af45fac2ede9ee6a41e3241d1db8
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Sun Sep 1 10:24:16 2013 -0700

    Make ipsec_site_connection dpd_timeout == dpd_interval return 400
    
    dpd_timeout == dpd_interval is a invalid case,
    so in this commit, we modify validation and added test.
    Fixes bug 1219440
    
    Change-Id: I14fb9aa7df890f9c5a27f18f20d7dc1a316b2d79

commit e19178e1469abb015fe0af8275c032b6e38b0112
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Fri Jul 12 13:05:56 2013 +0200

    Iptables metering driver
    
    this is a part of the blueprint bandwidth-router-measurement
    
    Change-Id: I37e4dc5abeaca4e13b32155bb7e2f07883ef9b2d

commit 5619bc7121879d36ceafceef8c9f76d27791ca6b
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Thu Jul 4 11:44:25 2013 +0200

    Add method to get iptables traffic counters
    
    Add methods to iptables_manager to get traffic counters.
    this is a part of the blueprint bandwidth-router-measurement
    
    Change-Id: I6485d1239085e46398126c81e674e399952a4597

commit 5ec6a60602eda70d6e65173085036b1b593afd44
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Thu Jul 4 16:00:30 2013 +0200

    Add Neutron l3 metering agent
    
    This is the agent side of :
    blueprint bandwidth-router-measurement
    blueprint bandwidth-router-label
    
    This patch initiates agent side by adding a new
    l3 metering agent and a Noop Driver.
    
    DocImpact
    
    Change-Id: Ib34721209c282b2669ff5488a33293d9f86467ef

commit 169729cd114603b355faf5effd08ea660b81551f
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Wed Aug 28 19:32:34 2013 +0000

    Add jump to float-snat chain after clearing snat chain
    
    Clearing the chain in this code eliminates the rule to jump to the
    floating-snat chain.  This is the simplest way to get it working
    again.
    
    Change-Id: Ic1818e10bd64170b6f0a2f52af8dc0814d7e04e0
    Fixes: Bug #1218040

commit d6f50e8476feb3c76db485fa033d0b1c22ee024d
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Thu Aug 29 15:16:00 2013 -0700

    Fixes formatting exception from logging in BigSwitch plugin
    
    Corrects the data type expected for the HTTP code that comes
    back from the back-end controller in a debug log call.
    
    Closes-Bug: #1220521
    Change-Id: Ic71b24c724222ade5e695addf291c6488d665da9

commit a9230a38977d6acb804ee8bb6f58c19957dce013
Author: Alessandro Pilotti <apilotti@cloudbasesolutions.com>
Date:   Thu Aug 22 03:14:00 2013 +0300

    Adds metrics collection support in Hyper-V
    
    Blueprint: hyper-v-metrics
    
    Hyper-V Server 2012 supports a new set of metrics API that can be used to
    provide switch port metrics data to external applications, e.g. Ceilometer.
    
    Metrics collection is disabled by default and can be enabled with a config
    option.
    
    Metrics are configured via ACLs applied by the Hyper-V plugin agent.
    
    Change-Id: Ife2a53db84936bae7c73b8c027022bbc5e89d48a

commit 090e7d47a8fbe2df66d68e78751e74df01fb504f
Merge: fa15b6f 1f9b4e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 14:47:52 2013 +0000

    Merge "Minimize ovs l2 agent calls to get_vif_port_set()"

commit fa15b6f1d50924053c4ced7e65c0948b72fece39
Merge: 3519cc0 fbd55e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 14:20:48 2013 +0000

    Merge "Remove trailing comma"

commit 3519cc02229ca3b29a75e3d8d7ebf6a094bc1419
Merge: 8937999 2778b9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 10:40:40 2013 +0000

    Merge "Adds support for the Hyper-V WMI V2 namespace"

commit 893799910474a31800aeeac580d956b25a70a5e5
Merge: 04418e4 706554b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 10:12:18 2013 +0000

    Merge "Fix script to build rpm required for L2 OVS agent for XenServer"

commit 04418e47713f01ea9a6e346d4cf75574cbbcf590
Merge: c5e3a84 04f62ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 06:34:44 2013 +0000

    Merge "Support for Floating IPs in PLUMgrid plugin"

commit c5e3a84d7766be26cebe4c1f7222d4f44fa7a264
Merge: b81bc42 69dd729
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 06:34:21 2013 +0000

    Merge "BigSwitch plugin - add portbinding info in requests to controller"

commit b81bc42796a9a2fbd0ce4ff8643a4c402e0da069
Merge: c5bdc18 80df449
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 06:09:34 2013 +0000

    Merge "Make Neutron NVP plugin future-versions friendly"

commit c5bdc18faeeaadbec1eeb35e3ac0ba7cd133822e
Merge: dab69bf 317c8f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 06:09:26 2013 +0000

    Merge "subnet calls of ml2 mechanism driver"

commit dab69bf49878f3a75f54dcd06b4a937120004fda
Merge: 19069f8 5fd99ed
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 28 03:30:32 2013 +0000

    Merge "Imported Translations from Transifex"

commit 19069f82ce8f80945e425fb4c51cd8d9a27106d2
Merge: 6ae4258 0fd99cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 23:07:13 2013 +0000

    Merge "Enable authentication between PLUMgrid Director and Plugin"

commit 80df449aa5a4753705b64cb68492508c91efd580
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Aug 27 12:53:58 2013 -0700

    Make Neutron NVP plugin future-versions friendly
    
    This patch enables the plugin to deal correctly with
    newer versions of the NVP platform; this is done by
    allowing the plugin to fall back to the closest known
    version of the NVP platform. This is acceptable behavior
    as L2/L3 operations implemented by the platform are most
    certainly backward compatible.
    
    This patch also improves test coverage for this part of the
    code, which is critical to the correct behavior of the plugin.
    
    Fixes bug #1217479
    
    Change-Id: Ifcce47c6ee2bc2bc96ddfe9298d252700aceca3f

commit 706554ba17e6ca5862625b090bd7616749f3375b
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Aug 22 13:23:21 2013 -0700

    Fix script to build rpm required for L2 OVS agent for XenServer
    
    Use up to date way to retrieve the version info.
    
    Fixes bug #1215619
    
    Change-Id: I7263fd61a8ea407626d2330f7546f4046e803b50

commit 317c8f318f82aed4174839ba1fe256d65cff59bc
Author: Zang MingJie <zealot0630@gmail.com>
Date:   Mon Aug 26 17:31:46 2013 +0800

    subnet calls of ml2 mechanism driver
    
    Implements blueprint ml2-mechanism-driver-subnet-calls
    
    Change-Id: Ib9a8009975959692f46f80fb2a850fcc2b22debe

commit 5fd99edf66a84ab3a3c1554d2bd8df867cdb914d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 27 06:13:26 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia664404f7d37fff4cbc76fb43227584fcdd106a2

commit 6ae42583ebb2996829586a1a6ee601cb54767d63
Merge: a3fd75c e43c5c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 03:45:59 2013 +0000

    Merge "Fix port creation issue appeared with postgresql backend"

commit a3fd75c2b47bd622f9d4d09248d8ff8991110708
Merge: a2eb7ae 0d2402b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:30:32 2013 +0000

    Merge "Deal with 501 errors from NVP correctly"

commit a2eb7ae2a7e240cbd95bff6f15d22bde690d386e
Merge: 3b929a8 d46e3cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 27 02:03:33 2013 +0000

    Merge "Use system locale when Accept-Language header is not provided"

commit 996bb5e218ec8bb938aad972a19594a75194d528
Author: Rudrajit Tapadar <rtapadar@cisco.com>
Date:   Fri Aug 9 23:42:45 2013 -0700

    Multi-segment and trunk support for the Cisco N1Kv Plugin
    
    This patch adds vlan and vxlan trunk support in the
    Cisco N1Kv plugin. It also adds support for multi-segment
    networks for bridging vlan networks with vxlan networks.
    
    Change-Id: Ibecbbfbce1eb4d18ef6a1bc5250622b9ae87d39c
    Implements: blueprint multi-segment-and-trunk-support-cisco-nexus1000v

commit 9928edb42da42af3463d4a989a0797be46198908
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Thu Aug 22 20:17:00 2013 -0700

    Refactor BigSwitch error handling to use db rollbacks
    
    This patch adjusts most of the logic handling the
    calls to the controller in the BigSwitch/floodlight
    plugin to make use of the db rollbacks from
    sqlalchemy for free on exceptions. This eliminates
    several complex try-except blocks and makes
    maintaining db<->controller consistency easier.
    
    Fixes: bug #1215823
    Change-Id: Ia636c40e744b3b1c543e891791bf492df4f675d2

commit 289695acf2d6edb5ce80105533c71e27d604f20d
Merge: 3ca3f0a 209c0e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 1 18:50:03 2013 +0000

    Merge "Add extra_dhcp_opt extension to BigSwitch/Floodlight plugin"

commit 3ca3f0a26109eac3611444de039d994c20056acd
Merge: ccd6b1f cf1af8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 1 18:32:00 2013 +0000

    Merge "Analyze re-raised exceptions in Cisco Plugin"

commit ccd6b1fd2297e4d10d433e29fd245c0c08ef3a91
Merge: bf53381 0b70392
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 1 16:44:24 2013 +0000

    Merge "Add missing match in OVS agent tunnel mac leaning"

commit bf53381c64fff0066c4ad0f1e55d460fdad783b6
Merge: 6c11b95 0c4ba5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 1 08:35:29 2013 +0000

    Merge "Correct VPNaaS limit checks in extension"

commit 6c11b959d9e8ad2748a1dd7e8574fe827e5da7cc
Merge: 6902013 a8c064e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 1 04:46:29 2013 +0000

    Merge "Fix 500 error on invalid security-group-rule creation for NVP"

commit 6902013ff6c8cb1abf47cdc6455dd78e9f63b2ee
Merge: d91bc54 4cc297f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 31 20:19:10 2013 +0000

    Merge "Return 400 if creating a distributed router on old NVP platforms"

commit d91bc54749fa4ffdda203db5ad88dc4f20c72eb8
Author: dekehn <dekehn@gmail.com>
Date:   Fri Aug 30 20:15:12 2013 -0600

    bp: pxeboot-port, provide pxeboot on ports
    
    Teach neutron how to manage PXE boot.
    
    Allow pxe boot parameters to be specified when creating a network port.
    
    Implements bp:pxeboot-ports
    
    Change-Id: I45fe7a16bc6c5975a765dd6a065558b9ba702e5b

commit 9c34ac63c72c9586b62519d10968fbde3459ed1e
Merge: 4dd8bb8 d72848c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 23:56:45 2013 +0000

    Merge "Create RPC connection before modifying OVS bridges"

commit 4dd8bb8637de6788d3e0d7797d4090bc4094407a
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Aug 30 15:15:24 2013 -0700

    Fix comment typo s/no/so
    
    Change-Id: I1c7b0834202caca6b3bb79acd243c96b865583bc

commit 0b703922e380438452b7fddf8ddff9392cb0d1cd
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Fri Aug 30 22:30:04 2013 +0200

    Add missing match in OVS agent tunnel mac leaning
    
    Learned flows introduced in commit a369f9e39691c01a4e4f7f8668cb37fc17ba03b3
    to learn remote mac addresses on tunnels currently only match local VLAN,
    but not destination mac address, as a consequence, connectivity may be
    erratic as soon as more than two agents are used
    
    Change-Id: I467e47d0dd2c1e5aca12a4e240e348116d530d4f
    Closes-Bug: #1219074

commit d72848c9afba40d21235a4e95cf8e69549290dca
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Thu Aug 29 07:11:44 2013 +0100

    Create RPC connection before modifying OVS bridges
    
    On startup, the agent removes and readds flows to the OVS bridges.  If
    an RPC setup error exits the process prematurely, this can leave the
    bridges in an unsafe state.  It is better to set the RPC communication
    up before making changes to the host system.
    
    Closes-Bug: 1217980
    Change-Id: Ib9bbb864b9129bb7b1376a150a37a0c07908d74b
    Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>

commit f9465f289a1812c94d81183ffd0ed5dbe865ee5f
Merge: 0f3750c 95b0959
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 30 16:39:57 2013 +0000

    Merge "Imported Translations from Transifex"

commit 4cc297f103172ab41665e6237ceb63bff303ad86
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Aug 13 14:13:14 2013 -0700

    Return 400 if creating a distributed router on old NVP platforms
    
    Without checking for the right NVP support, creating a distributed
    router will silently fail, i.e. ithe 'distributed' attribute will
    be ignored and a centralized router will be created instead.
    
    Supports blueprint nvp-distributed-router
    
    Change-Id: If8e40c0907d78c30f9ba918aaaff57e58ebb8055

commit 0f3750ceb7ce305018c3a9db1d2ff890a84f5a3e
Merge: 0ea7a34 9951318
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 07:08:31 2013 +0000

    Merge "Corrects error in ml2 rpc log message formatting"

commit 95b09597bdb1ffbf633e4056b7c5684fd1bb6514
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 30 06:13:51 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I503e7e0273a8b344646a99373ddd87451ed7fd75

commit 9951318dd5ac067a141bab8bd933007e63133591
Author: Zang MingJie <zealot0630@gmail.com>
Date:   Thu Aug 29 15:46:17 2013 +0800

    Corrects error in ml2 rpc log message formatting
    
    Change-Id: Ic6f445408ef83c2aa0376c94f395363503412814

commit 0ea7a341aab5c35132d27b639f0cf729e13b4131
Merge: ae44534 55bfb41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 04:13:17 2013 +0000

    Merge "Load tables of service plugins when migration auto generation"

commit ae44534a2201b02d300e79601fb08d8fdb99fcd1
Merge: 4e2c1ff 634fd1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 02:22:24 2013 +0000

    Merge "Support for NVP distributed router"

commit 0c4ba5e0b8da2e87d72314198ee3feca52c0031f
Author: Paul Michali <pcm@cisco.com>
Date:   Fri Aug 23 16:16:01 2013 -0400

    Correct VPNaaS limit checks in extension
    
    For the following VPNaaS attributes, ensure that these validation
    tests are performed in the extension:
    
        keepalive >= 60 (seconds)
        mtu >= 0 (octets)
        DPD interval > 0 (seconds)
        DPD timeout > 0 (seconds)
    
    Currently, the units for keepalive can only be seconds. If this
    changes in the future (e.g. to allow kilobytes units), then the
    test for the value will need to be changed.
    
    To correctly test the MTU limits for an IPSec connection, the
    protocol must be taken into consideration, which is defined by
    the vpnservice object. Because of this dependency, we cannot
    validate this in the extension, and will instead, just make
    sure the value is positive.
    
    Likewise, the attribute validators cannot ensure that the
    DPD timeout is greater than the interval (again, because the
    validators can only check the individual attributes one at
    a time).
    
    The range validator was modified to allow single ended ranges
    for some of these attributes. The range also ensures the value
    is an integer.
    
    Companion changes are being made in the CLI code for these limit
    changes.
    
    Update: Fixed typo causing tox failure.
    
    bug 1216117
    
    Change-Id: I85d6175d81fbe7d27231aed48fb4691351e0db4c

commit 4e2c1ff163c78f33806eda630d371c65912243c8
Merge: 828601f 3ba8096
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 30 00:13:41 2013 +0000

    Merge "Fix unsuitable assertTrue/assertFalse in api ut"

commit 828601fa31042d3e2642fbb8a52eee423598f9e9
Merge: e5a39d7 274481b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 22:01:09 2013 +0000

    Merge "Forbid update of subnet gateway ip when in use by a port"

commit 3ba80960075bf7873e96914f1be54ae176069a8d
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Aug 30 05:35:32 2013 +0800

    Fix unsuitable assertTrue/assertFalse in api ut
    
    Some usages of assertTrue()/assertFalse() are incorrect, improve
    them to more explicit assert from the unit test suite.
    
    Closes-Bug: #1218621
    Change-Id: I22be2af05f06e91020dbaa4cf08bf395d68f563b

commit e5a39d722416fb95773e15cc6987b6c66ca61375
Merge: c8c962d 192d7f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 20:46:20 2013 +0000

    Merge "Improve dhcp agent structure to support multiple dhcp models"

commit c8c962de86f082b7c7338a623c7a51798db7a53c
Merge: c96d322 811a232
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 20:25:35 2013 +0000

    Merge "Fix incorrect usage of assertTrue()"

commit c96d32281fd98721bcdcf5c90fdc1c9cfd977817
Merge: 58cd00c 8db51da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 17:32:51 2013 +0000

    Merge "Add list of pool ids to HealthMonitor dict"

commit 634fd1d23fb241bc4990275d5a4da0c3ab66e2de
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 3 22:07:09 2013 +0200

    Support for NVP distributed router
    
    Blueprint nvp-distributed-router
    
    This patch adds support for NVP distributed logical routers
    adding a simple attribute extension.
    The default router type can be controlled used the default_router_type
    option in the nvp section of neutron configuration.
    In order to ensure backward compatibility, pre-existing routers
    will be treated as centralized routers.
    
    Change-Id: Iaab9ffb6071c93990be711ebb56c212230544a7a

commit 58cd00cd1f82a29f1a32a61bc97a4779c8d6ec92
Merge: 7753ce5 32814b7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 29 13:28:55 2013 +0000

    Merge "Imported Translations from Transifex"

commit 55bfb412f1732e97da76f1b34e581d2429df38e6
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Aug 29 21:08:06 2013 +0900

    Load tables of service plugins when migration auto generation
    
    When we run "neutron-db-manage revision --autogenerate", it detects
    table deletion of service plugins even when they are configured.
    We need to load tables of service plugins to teach alembic such
    tables exist.
    
    Change-Id: I9186d36496069c8253683bd200326b80a6565fa6
    Closes-Bug: #1218338

commit 32814b7d077814e0d8c43b820d3e08976f9c352b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 29 06:14:33 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8a48ee88df7f54559cd1b05245d6523a127ef665

commit 7753ce5fc3e489857e785dac08c951d32050f8d5
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Thu Aug 29 13:46:04 2013 +0800

    Use assertEqual instead of assertEquals
    
    Closes-Bug: #1218185
    
    For unittest, assertEquals is deprecated in py3, use assertEqual
    instead.
    
    Change-Id: Ia71b51a0f2625aec5fb4644853a79c2ea80a799c

commit aacd1c3d2093c5fa6888e8e0cd41246d5247c797
Merge: d132b4c 6584524
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 05:06:14 2013 +0000

    Merge "Fix a race condition in add_tunnel_endpoint()"

commit d132b4c039fff1a350547a4048c560ef1e9cb9cc
Merge: a34f6f0 58ca4c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 29 04:51:44 2013 +0000

    Merge "Add recent neutron extentions and IB support"

commit 658452478fb35f3200e5d62b23d328be72d35039
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Tue Apr 30 15:12:15 2013 +0300

    Fix a race condition in add_tunnel_endpoint()
    
    If there are multiple OVS agents concurrently executing
    'tunnel_sync' RPC call a race condition can occur
    leading to insertion of two different TunnelEndpoint
    entries having the same 'id' value.
    
    Unfortunately, we can not rely on:
      - @lockutils.synchronized(), because a Neutron installation can use
        more than one API node
      - with_lockmode('update'), because it works differently in PostgreSQL
        comparing to MySQL and doesn't guarantee that no new rows have been
        added to the table since the select query was issued. Please take a
        look at http://www.postgresql.org/files/developer/concurrency.pdf for
        more details.
    
    The proposed fix:
      - ensures there is a unique constraint set for 'id' column
      - wraps creation of a new TunnelEndpoint entry into a
        repeatedly executed transactional block (so even if a concurrent
        DB transaction has been flushed or commited earlier than this one
        we can handle an integrity error and try again, in spite of the
        specified transactions isolation level value)
    
    Fixes bug 1167916
    
    Change-Id: I62dc729d595f090436199d5e1b6b98a884ead7a5

commit 274481bf30150f3900e0a860ca7321cdd682850e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Aug 8 10:38:11 2013 -0700

    Forbid update of subnet gateway ip when in use by a port
    
    Bug 1186322
    
    If a port is currently using the subnet's gateway IP, which usually
    happens for router interfaces, do not allow updates to the gateway IP.
    This patch adds an extra query on the IPAllocation model, which
    returns at most a single record, and is executed in _validate_subnet
    only when the subnet is updated.
    
    Change-Id: Ie29be1b83f9a639562bfc84f3f2c082833126d32

commit a34f6f0e868bcd0a22dca4c0879247791c997434
Merge: c2f819d 50af21d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 28 16:35:21 2013 +0000

    Merge "Imported Translations from Transifex"

commit c2f819d59bb3bb8b43db4328fb43c64c605fd9ae
Merge: 40f2bd8 5c5d040
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 16:35:11 2013 +0000

    Merge "Correct spelling mistake"

commit 40f2bd89a15161156bf9a12ca581ffb20b51d798
Merge: a555cf3 417dd17
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 16:35:02 2013 +0000

    Merge "Avoid performing extra query for fetching mac learning binding"

commit a555cf3287d4bd4db86bb7025ed998dcdf4a2586
Merge: 090e7d4 a8b619d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 28 16:32:34 2013 +0000

    Merge "Allow for skipping admin roles loading on context creation"

commit 5c5d04047adbb73571ffd6692f6965b38704a56a
Author: lawrancejing <lawrancejing@gmail.com>
Date:   Wed Aug 28 21:26:32 2013 +0800

    Correct spelling mistake
    
    Change-Id: I3bd2f76e73459e50d255f75f79262af537b29596

commit a8b619dd611fb68167332fa7373bbd3fe578ecde
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 28 00:32:31 2013 -0700

    Allow for skipping admin roles loading on context creation
    
    Bug 1216866
    
    There are cases in which an admin context is created only to grab a db
    session and ensure no tenant filters are applied in _model_query. In
    these cases evaluating the policy engine for grabbing admin roles is not
    necessary, and can cause unexpected and serious issues if the context is
    grabbed before all the extensions are loaded.
    
    Change-Id: I0cbf4b51ca1286373c16eb907840a32f4b8190c6

commit 50af21db4df6baedaab3b2047aef954af5844353
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 28 06:13:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I963fdd0c311be49a96a337e439f4028756baafbe

commit 811a23275da1d35b6ea7dce81ea3d6ac219f42b9
Author: Rosario Di Somma <rosario.disomma@dreamhost.com>
Date:   Tue Aug 27 09:25:59 2013 -0400

    Fix incorrect usage of assertTrue()
    
    The usage of assertTrue() is incorrect, more explicit assert
    from the unit test suite(like assertIsNotNone or assertIn)
    should be used instead.
    
    Fixes: bug #1217028
    Change-Id: I30a80bc9e122d28c22b698e0cb97068c1040bfc3
    Signed-off-by: Rosario Di Somma <rosario.disomma@dreamhost.com>

commit 209c0e0a0d92199ce44f8c787c2582aa41fb27d7
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Mon Aug 19 09:34:36 2013 -0700

    Add extra_dhcp_opt extension to BigSwitch/Floodlight plugin
    
    Adds support for the DHCP options extenion to the
    BigSwitch/Floodlight plugin.
    
    Fixes: bug #1206655
    Change-Id: Ida30ca44ecbb9d1208303e47519427a4111f6025

commit fbd55e7dbd1c4ca2a1fc33b1ec5f54a484bda691
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Tue Aug 27 08:17:55 2013 +0800

    Remove trailing comma
    
    Closes-Bug: #1217135
    
    There are trailing commas in default value of some options, uncomment
    them will cause CRITICAL error for neutron-server. These sample config
    may mislead operators, so this patch fix them to the correct format.
    
    Change-Id: Ie0b7626aade653b761257eb2bf397cb3cc5a961e

commit 0fd99cba9be7bbe1f9c2368417eaf6d38af74fb6
Author: Edgar Magana <emagana@gmail.com>
Date:   Sun Aug 25 13:11:27 2013 -0700

    Enable authentication between PLUMgrid Director and Plugin
    
    Implements blueprint plumgrid-plugin-rest-access
    
    Change-Id: I0f9a6c39c09f756ee5fc7c9d6993e59b1e6be639

commit 3b929a838aa4466e5be3a066400739e4bac1d14a
Merge: 2e590cc 716af60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 18:19:44 2013 +0000

    Merge "Separate l3 db tests for l3 agent into their own test case"

commit 2778b9fe4fd3e4348d4d18e2dd890c39d1b12cb8
Author: Claudiu Belu <cbelu@cloudbasesolutions.com>
Date:   Wed Aug 7 07:15:09 2013 -0700

    Adds support for the Hyper-V WMI V2 namespace
    
    Blueprint: hyper-v-wmi-v2
    
    The Hyper-V APIs are mainly based on WMI. The original 2008 Hyper-V
    release introduced the "root\virtualization" namespace which got
    superseded in Hyper-V Server / Windows Server 2012 by the
    "root\virtualization\v2" namespace (referred as V2 in the sources).
    
    The original namespace has been dropped in the upcoming Hyper-V 2012
    R2 (currently available in preview), which means that the Grizzly code
    will not be compatible with it as is.
    
    The Hyper-V driver is structured with a clear decoupling between OS
    interaction classes (so called *utils modules and classes) and the
    agent's logic.
    
    This allows us to provide an implementation of the V2 API without
    impacting the rest of the agent's code, based on a factory module
    added to instantiate the proper version of the *utils classes: the
    original "V1" ones for versions of the OS predating 2012 and the
    newer "V2" ones starting from Hyper-V 2012 (Windows kernel version
    6.2).
    
    Change-Id: I380d8c65715242d8a5b94b5061ebe4f30e6c2090

commit 2e590cc1ac8fede40e0039f583bb362c419d3f20
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 26 06:20:37 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9300e32b84f02492c8cf32cfff65f3eb207672d5

commit 855a4aadbfe156797cb6a05969d78e616a501aa7
Merge: 5a55dff a369f9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 26 01:06:44 2013 +0000

    Merge "Enable GRE and VXLAN with the same ID"

commit d4c3047ba4d46b3b6fe56940832e6e1142c2e441
Author: Ivar Lazzaro <ivar@embrane.com>
Date:   Mon Jul 22 13:32:31 2013 -0700

    Embrane Neutron Plugin
    
    Implements blueprint embrane-neutron-plugin
    
    This commit implements the main Embrane plugin, which covers
    route and extratoute extensions.
    
    The plugin will rely on existing plugins for leveraging L2 networks,
    for now it only supports OpenVSwitch and vlan networks, but more
    supports are to come if the model is approved (or a different one
    is suggested).
    
    Change-Id: I90aff8ec4324bd3a7c59c411374db6a118d1a72b

commit 5a55dffb38a9789db660f87353a999f3014a3d56
Merge: 793ab62 b89baa1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Aug 25 15:36:38 2013 +0000

    Merge "Imported Translations from Transifex"

commit 793ab62d08d9a7262c9ea813542456f286082c79
Merge: 1c2e111 e0f78bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 25 07:15:44 2013 +0000

    Merge "Add metadata_proxy_socket into configuration files"

commit b89baa14772918c59c3ce5ef89fbcd2744b7d7d9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Aug 25 06:14:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iec84d6c1aced5c2cbd976f899811396f9f9e6753

commit cf1af8d282cd549ff554c7e1f5663cd3999d843e
Author: Paul Michali <pcm@cisco.com>
Date:   Fri Aug 23 11:47:24 2013 -0400

    Analyze re-raised exceptions in Cisco Plugin
    
    Checked all cases of re-raised exceptions. In several cases, the exception
    was redundant (re-raising the same exception), so the try block and
    exception handling was removed.
    
    In one case, exceptions raised from two sources were re-raised with a
    a different exception. Instead of doing this, the original exceptions
    were changed and the try block and re-raised exception were removed.
    
    In cases where there were database exceptions that were re-raised as
    Neutron exceptions, the traceback was left as-is, since it was more
    informative to know the higher level source of the issue.
    
    The same was true for the exception mentioned in the bug, where the
    original failure was in the ncclient library parsing the configuration
    and it would be more descriptive to know that there was a connection
    failure or a config failure, that to know the library method.
    
    bug 1213159
    
    Change-Id: Ie334d2548bf651c61e878bf797adaf8c5880eb86

commit 04f62ad8d874d7e9541bd26b379d5232992f12dd
Author: Edgar Magana <emagana@gmail.com>
Date:   Thu Aug 22 18:42:04 2013 -0700

    Support for Floating IPs in PLUMgrid plugin
    
    Implements blueprint plumgrid-plugin-floatingip
    
    Include operations supporting create, update and delete of Floating IPs
    Drivers been updated properly
    
    Change-Id: I8ed5e620e45f026e0673be78971329a93353370d

commit 69dd72931fd09f346f4a3e455bf9ec28f5639369
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Fri Aug 23 05:51:54 2013 -0700

    BigSwitch plugin - add portbinding info in requests to controller
    
    Include portbinding info in requests to controller so it receives
    information about the compute node like the VIF type and the host
    ID. Also includes better debug output on back-end failures.
    
    Fixes: bug #1216061
    Change-Id: Ib85c8a088ee9fb94baaf8f28849b318b32d9d672

commit 1f9b4e77d93b165a0aeeaae0de610389debd5198
Author: Maru Newby <marun@redhat.com>
Date:   Thu Aug 22 07:57:00 2013 +0000

    Minimize ovs l2 agent calls to get_vif_port_set()
    
    The ovs l2 agent was previously calling get_vif_port_set() on the
    integration bridge once per rpc_loop() iteration and then again in
    the periodic _report_state() call that returns the current device
    count to the neutron service.  Since get_vif_port_set() is an
    expensive call (relying on shell commands) and since there
    is minimal risk associated with reporting stats that are a few
    seconds old, this patch caches the device count for reuse by
    _report_state().
    
    Partial-Bug: 1177973
    
    Change-Id: Ice73384ed1ba1e97120028cd0a9bff94a62a41a4

commit 192d7f35a7b61cd557c114080e49e3c6f0f69ab4
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Aug 1 17:13:26 2013 -0700

    Improve dhcp agent structure to support multiple dhcp models
    
    This patch introduces some minor refactoring of the dhcp
    code so that it is easy to support both an in-node/same
    process dhcp provisioning model (e.g. with dnsmasq) and
    proxy model, where DHCP is provided by an external node.
    
    Higher separation of concerns is also achieved by doing
    better data encapsulation.
    
    Implements blueprint dhcp-flexi-model
    
    Change-Id: Icbd215e9682ecaebb6a4300423f3564e8e677566

commit 417dd1727ba38966f53e83c69583650f2cf190fc
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 21 05:14:54 2013 -0700

    Avoid performing extra query for fetching mac learning binding
    
    Bug 1214879
    
    Add a relationship performing eager load in the Port model, thus preventing
    the 'extend' function from performing an extra query.
    This patch also replaces assertTrue with assertEqual in unit tests as it
    needs to evaluate whether the value of the mac_learning_enabled attribute
    is equal to the boolean literal True, whereas assertTrue verifies that the
    expression passed to it evaluates to True. This means that any value but
    False will be enough for the test to pass, which is not correct.
    
    Change-Id: I03345ef3a125fdfa1ec7f6c3363d76efc12ced82

commit 716af601730402859f101758ac6928b450fa8ac1
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 23 03:37:57 2013 -0700

    Separate l3 db tests for l3 agent into their own test case
    
    Bug 1215871
    
    This patch does a simple refactoring of test_l3_plugin, pushing out tests
    aimed at validating the interactions of the l3 agent with the server.
    
    These tests explicitly use TestL3NatPlugin, whereas all the
    other tests use a configurable plugin, which might be specificed by a child
    class. This might lead to confusion and possibly errors in unit tests for
    child classes, especially those not using the l3 agent - for which running
    these test is also superfluous.
    
    Change-Id: Ia9ed320ea775fc548e6a5b711c67c9f3b0ae2f6d

commit e43c5c1ea6441ad7d36e25bd283a5a580bf5cb09
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Aug 22 19:08:34 2013 +0400

    Fix port creation issue appeared with postgresql backend
    
    IPAllocationPool has relation to IPAvailabilityRange which is setup to
    load eagerly. Eager loading is implemented with left outer join which is
    incompatible with with_lockmode('update') on postgresql.
    The fix redefines eager loading with options(joinedload) making it use
    inner join.
    
    fixes bug 1215350
    
    Change-Id: I148d37f2a1c2a340327d36c240eb8173aee9219a

commit 0d2402b3fe8109160515f9b00dcdce3c35b8584e
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Aug 22 13:12:15 2013 -0700

    Deal with 501 errors from NVP correctly
    
    This is done by adding the error code to the exception
    handlers dictionary as done for other error codes.
    
    Fixes bug #1215583
    
    Change-Id: Ic876c6bccaf94cae626dfc908c4a34dfbcead406

commit a369f9e39691c01a4e4f7f8668cb37fc17ba03b3
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Wed Aug 7 11:19:46 2013 +0200

    Enable GRE and VXLAN with the same ID
    
    Current packet processing in br-tun is based on tun-id,
    as a consequence, two networks using different tunnel
    types but sharing the same tun-id would not be properly isolated.
    
    To ensure proper isolation within a single bridge, NORMAL action
    can't be used any more as it floods unknown unicasts on all
    bridges ports. It is replaced by a learn action that dynamically
    sets-up flows when packets are recieved from tunnel ports. As mac
    address are learnt in explicit flows (in table 20), we can use a
    default action in that table to flood unknown unicasts to the
    right set of ports, like broadcasts and multicasts packets.
    
    See https://wiki.openstack.org/wiki/Ovs-flow-logic for a more
    detailled explanation of the flow logic
    
    Another alternative could have been to use distinct bridges for
    each tunnel type (whithout modifying the current flow logic),
    but previous alternative may be preferable as it paves the way
    for new tunneling optimisations (like RPC based mac learning and
    partial-mesh flooding proposed in bp/l2-population)
    
    Change-Id: I1dfe74f96680c2c6fe4d8d4aac4821c6b020c005
    Closes-Bug: #1196963

commit 1c2e111a0be07c9005e212ca634a1ea174f616a5
Merge: be8f37e c06550e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 12:14:42 2013 +0000

    Merge "Disallow non-admin to specify binding:profile"

commit 58ca4c40b93c8eb3701001ffaa42e19c127d7aad
Author: Irena Berezovsky <irenab@mellanox.com>
Date:   Sun Aug 11 09:19:03 2013 +0300

    Add recent neutron extentions and IB support
    
    Additions to Mellanox Plugin:
    Add ML2 compatibility support.
    Enable Infiniband Network Type.
    Keep the compatibility to Linux Bridge Plugin to allow Network node deployment via Linux Bridge L2 Agent.
    Add support for Host Port Binding and L3/DHCP Agent Scheduler.
    
    Implements: blueprint mlnx-plugin-improvments
    
    Change-Id: Ieca518bbd07a39258cd14ceeecd3f9d3e2b6f219

commit be8f37e52f832f0250e7336d7d231190a1abb55f
Merge: 828b1ee 0109cc9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:42:52 2013 +0000

    Merge "Adding VPC support to the Cisco plugin"

commit 828b1ee73ff6a11c57c35cb3d4adab8d45a9114d
Merge: ef132bd 7bbd215
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:42:43 2013 +0000

    Merge "Remove calls to policy.check and policy.enforce from plugin code"

commit ef132bdd7746ccb4f8b5cc39d0cf074807089158
Merge: a98e011 0ec5a89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 10:34:24 2013 +0000

    Merge "Fix auth_url in metadata_agent.ini"

commit a98e011fe66a7cd16ada36b8f45fac9d492b32f6
Merge: 7282594 e52b5e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 06:50:35 2013 +0000

    Merge "Fix typos and code style check"

commit 728259460895794bff607ab5244b15f6228370b7
Merge: c7b0803 2ad940f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 06:34:35 2013 +0000

    Merge "Syslog support for neutron metadata proxy"

commit c7b08035bbc13b45696165c6284d8c4a5709edd0
Merge: 486c48f 6b0c899
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 05:21:22 2013 +0000

    Merge "Use subnet id instead of wrong built-in id()"

commit e0f78bf02569de81d37cb90b3b1836a9889cc8c6
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Thu Aug 22 12:14:26 2013 +0800

    Add metadata_proxy_socket into configuration files
    
    Change-Id: I76856c2f804be92fa8cc667b4653d2e5e58e422a
    Fixes: Bug #1215261

commit c06550e6fe3effc76587ef5b040d27714914f1ca
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Aug 22 11:34:43 2013 +0900

    Disallow non-admin to specify binding:profile
    
    Change-Id: Iefa4b251f3b0a373fb9b2b7d576e14d58afece59
    Fixes-Bug: #1214873

commit 486c48f975e9ddda512ca653edcc497a2ffdf67d
Merge: 6d00e70 495fd24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 22 02:31:59 2013 +0000

    Merge "make neutron-ns-metadata-proxy configurable"

commit a8c064ed322bf92a867a42b99a5b94cfef137a3d
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Aug 20 16:51:29 2013 -0700

    Fix 500 error on invalid security-group-rule creation for NVP
    
    Validate that, when creating rules specifying a protocol different
    from TCP, UDP, ICMP and ICMPv6, no port (range) is specified because
    NVP does not like it.
    
    The extra validation is specific to the NVP plugin because other
    plugins may choose a different failure mode. For example, the ovs
    plugin does not complain at all, but it just ignores the port range
    if the protocol is not a port-oriented one.
    
    Fixes bug #1213293
    
    Change-Id: I46e9032b5cf7f7d88b9d05c3bf020784b04217d9

commit 6d00e70f9814ced3172f8194c6a5c31c14e3fe1e
Merge: f5303e0 4420863
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 21 18:02:38 2013 +0000

    Merge "Add missing ForeignKeyConstraint to Cisco providernet migration"

commit 0ec5a89360816df570ced3e5f990aa1cee429170
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Thu Aug 22 01:05:27 2013 +0800

    Fix auth_url in metadata_agent.ini
    
    Closes-Bug: #1214921
    
    The value of auth_url is incorrect, some operators may not change
    that value and problem will occur. According to keystone, 35357 is
    the port number which the public admin listens on, 5000 should be
    used for neutron instead.
    
    Change-Id: I0b35f25c1845d02f8b9b3cd8c759920d52003c0c

commit f5303e007539343aac3b485cf01b794bd806552d
Merge: 0801dcf 62040d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 21 16:43:49 2013 +0000

    Merge "Add ext-gw-mode support to ML2"

commit 0801dcf7364e42fffb68f380bd14053c95cbc229
Merge: 02dd56e f0f81ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 21 16:38:08 2013 +0000

    Merge "remove binaries under bin"

commit 0109cc967c0a8adb9073b6e89276312cb5a95bc4
Author: Arvind Somya <asomya@cisco.com>
Date:   Tue May 28 12:47:09 2013 -0700

    Adding VPC support to the Cisco plugin
    
    Adding VPC(Virtual Port Channel) support to the Cisco plugin.
    
    Change-Id: I898e4355d05f6f43593deb2d977dfc1e55fb2fc8
    Implements: Blueprint cisco-plugin-vpc-support

commit 7bbd215da8ba8877d134c994c72dcfbdcd0a664a
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 21 02:47:19 2013 -0700

    Remove calls to policy.check and policy.enforce from plugin code
    
    Completes blueprint make-authz-orthogonal
    
    This patch removes a few explicit policy checks recently added to
    the plumgrid and cisco plugins.
    They are not necessary as the same checks are already performed
    by the policy engine.
    
    Change-Id: Ie99f5fa6ad4a9568b050827bc479a62dd40e18ac

commit 6b0c899d36d5a98963342e9cffb351fc3a1f4fd2
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Tue Aug 20 00:05:15 2013 +0800

    Use subnet id instead of wrong built-in id()
    
    In _validate_subnet(), built-in id() is used as param for exceptions,
    this patch fixes it via using proper subnet id.
    
    Closes-Bug: #1213930
    
    Change-Id: I9a88f4dc7b771047f4061fb94ba65f0515afa745

commit 02dd56eda2a3cfa188d45613d2ca43e169e54d5a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 21 06:21:49 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9112615ea4700ea15f85fdb3ef82812dac4df14b

commit d46e3cd59c374b01ff379e63c18cbb16e340fb98
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Aug 20 19:16:06 2013 +0000

    Use system locale when Accept-Language header is not provided
    
    Remove en_US as the default language when no header is provided, and use
    None instead. Upon translation None will be defaulted to system as it
    was before the translation changes.
    
    Fixes bug: #1214476
    
    Change-Id: I0fe22c526710e69ae0731e7d0b42170e6f3a8523

commit d16e185d34df811bf858bf93cf056d0cb945e22d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jun 19 16:09:05 2013 -0700

    Add multiple provider network extension
    
    The following commit adds the ability to associate multiple
    different provider networks on a single network.
    
    Implements blueprint map-networks-to-multiple-provider-networks
    
    Change-Id: I3c70fb2426899f728a401566debab7f66e7246bc

commit 44208638bcf230cd4db12aa8aa5e7c04640a1aa4
Author: HenryGessau <gessau@cisco.com>
Date:   Tue Aug 20 13:26:17 2013 -0400

    Add missing ForeignKeyConstraint to Cisco providernet migration
    
    Change-Id: Ieb6126fe80f71a5c44434861d65b6a1c97957eed
    Closes-Bug: #1214497

commit 589071a1fb1a783198bfe2da4e5c1213adbc9c1a
Merge: 32c3862 a197628
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 20 15:15:29 2013 +0000

    Merge "Imported Translations from Transifex"

commit 8db51da1e25f1c148fbe8d8f27d144a39d1850f3
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Aug 15 02:40:49 2013 +0400

    Add list of pool ids to HealthMonitor dict
    
    List of pool ids will allow users (and horizon dashboard) to
    show associations between pools and monitors more conveniently.
    
    fixes bug 1212258
    
    Change-Id: Ie1e48e554382a6a4df9e1ba6312c505ba2ca8c02

commit 32c38625d575a037cad1fcf3c6282c70e6d87a2c
Merge: 0316852 0e84610
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 09:42:42 2013 +0000

    Merge "Update mailmap"

commit 0316852e6390301926a71681078afd77b5ce92d2
Merge: cae08ee 5d38927
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 08:11:06 2013 +0000

    Merge "Remove global DB_ENGINE from Neutron"

commit a197628418120fed275e7acef755d4b0ca27394d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 20 06:18:06 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie1d6b2c1f158609b9bb58aedec542060ce2cd2e7

commit cae08ee0b8bbd00f575ec49471d19d5fc0e1b158
Merge: 7a79ea4 f0b77aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 20 05:04:34 2013 +0000

    Merge "Fix ML2 VXLAN TypeDriver DB migration"

commit 62040d03b3b7f02ff7f67ed08e0dc867eef183dc
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Fri Aug 16 13:24:20 2013 +0200

    Add ext-gw-mode support to ML2
    
    Closes-Bug: #1212772
    
    ML2 doesn't support ext-gw-mode, resulting in L3 agents not
    setting-up NAT rules in neutron routers (currently, l3 agents
    will assume enable_snat=false if plugin doesn't provide this
    parameter as described in bug 1212868)
    
    This patchset adds the support of ext-gw-mode to ML2 plugin.
    
    In order to support ext-gw-mode alembic migration (as well as
    other potential migrations on plugin dbs), folsom_initial
    migration script is fixed to include ML2 plugin. Otherwise
    databases won't be set-up during migration script (but at
    plugin startup by sqlalchemy), resulting in migration failures.
    
    Change-Id: I95ec18e0a4f0e5b661f3a5d679c434f18f100fa6

commit 7a79ea4f2f1c3d597e9857d0c38b4da3cc303161
Merge: dd6dd5b 33591a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 17:34:50 2013 +0000

    Merge "Ensure nvp resources are tagged with an up-to-date version of Neutron"

commit dd6dd5b3aee503c27b8a116b84502ee4e01093fe
Merge: ac23c7b 71ecc6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 16:20:57 2013 +0000

    Merge "Enable SNAT by default in L3 agents"

commit ac23c7b3f3370340a7c243850baff46dadb0dd23
Merge: 545c025 71f2184
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 16:17:15 2013 +0000

    Merge "Set BigSwitch plugin to use existing host database model"

commit 545c025a4867d55c7b4d060e6493aac825e8941b
Merge: 8d3d7f8 e6be003
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 19 16:16:40 2013 +0000

    Merge "Imported Translations from Transifex"

commit 8d3d7f8b67a0ad227624c012bd71f9e3c875fb92
Merge: fc3ab14 b719f21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 19 15:34:26 2013 +0000

    Merge "Fix wrong example in HACKING.rst"

commit e52b5e8e98dd640c69d009a3d5546a479e394d81
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Sun Aug 18 11:58:41 2013 +0800

    Fix typos and code style check
    
    In neutron/api/extensions.py, there are some typos, no needed blank
    lines and docstrings can be improved (according to HACKING.rst).
    
    Closes-Bug: #1213541
    
    Change-Id: I01087d133e1b2a7e69f0bcc2ae359a3a2042b1dc

commit 2ad940f376cf06d7e594dcd45516cb9510aa54a1
Author: Li Ma <nick.ma@live.cn>
Date:   Tue Aug 13 09:33:28 2013 -0700

    Syslog support for neutron metadata proxy
    
    When neutron metadata proxy reads the cli args
    which are propagated from its parent processes
    (l3-agent and dhcp-agent), if log-dir and log-file
    are not defined in the context, it will also
    double-check whether syslog is enabled and
    its facility in the user-defined configuration
    files (/etc/neutron).
    As a result, the log behavior of each neutron
    component becomes consistent.
    File log is the default logging function. The syslog
    is enabled when use_syslog is explicitly defined and
    file log options are all disabled.
    
    Fixes: bug #1184500
    Change-Id: I7804fa8794071d21513e068d084607691215522f

commit 0e8461034bfeb257626d9d1215fe93a277dc524b
Author: lawrancejing <lawrancejing@gmail.com>
Date:   Sun Aug 18 04:16:39 2013 +0800

    Update mailmap
    
    Update mailmap and keep this file
    in alphabetical order.
    
    Change-Id: I657b83202de3fdf6f4624567dfa8a53ca3ea5b39

commit 71ecc6ba46433999cf6b6c346670337b875832a0
Author: Francois Eleouet <f.eleouet@gmail.com>
Date:   Fri Aug 16 13:24:20 2013 +0200

    Enable SNAT by default in L3 agents
    
    If ext-gw-mode extension isn't supported by plugin, it won't
    return enable_snat param in router info. Agent will currently
    default to enable_snat = false, which changes from expected
    default behaviour prior to ext-gw-mode introduction.
    
    This patch changes L3 agent to enable SNAT by default if plugin
    doesn't support ext-gw-mode extension.
    
    Change-Id: I35e8f8c20392bff9ac2f875f2c9a1038ab06ad7b
    Closes-Bug: #1212868

commit e6be003ce7edd9803172e6acf34f1cc19a93423c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 19 06:14:59 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib9d5a27121f3b0bfa269ccbdd15cec0e42ffe3bc

commit fc3ab14658f88223d74120f6b2858214e34d075b
Merge: 0b38414 aa9b053
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 19 01:21:17 2013 +0000

    Merge "Imported Translations from Transifex"

commit 0b38414b1a79065fefe0b66421dfaea690bed938
Merge: 4e94646 e1165ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 18 22:30:13 2013 +0000

    Merge "Fixes Windows setup dependency bug"

commit 71f2184c617123b90f8e911056f23e3346c7c592
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Mon Aug 12 18:11:09 2013 -0700

    Set BigSwitch plugin to use existing host database model
    
    The BigSwitch plugin had a data model duplicating one
    that was recently added into the base portbindings db
    file. This patch removes the BigSwitch model and
    updates the BigSwitch plugin to reference the plugin-
    agnostic model.
    
    Fixes: bug #1211641
    Change-Id: I1fdbf8690e71fb2d6e9d6a6dbd0571fa2c32a7e0

commit b719f21cd9112578aa2bcb1304fdf4d3dfa90e73
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Sun Aug 18 14:17:40 2013 +0800

    Fix wrong example in HACKING.rst
    
    Example of Human Alphabetical Order Examples section in HACKING.rst
    is wrong, this patch fixes it to the right order.
    
    Closes-Bug: #1213568
    
    Change-Id: Ib7f8baf20c437c3fa776201998c36f33bdde2f78

commit aa9b05322ee98e53ccf6e5d364285ea14027203c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Aug 18 06:14:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9cb3808aa3ff8daae6897b409942458776dbf63b

commit 4e94646d22afd639edc2e266bdc4e7a2f41b6725
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Aug 17 06:14:51 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8889ccd7b9ae63776cb853e97185c1c23742e040

commit 33591a37f6808d4a21253aea46a89a8293a66fd3
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri Aug 16 13:58:46 2013 -0700

    Ensure nvp resources are tagged with an up-to-date version of Neutron
    
    This is made possible by using version.version_info
    
    Fixes bug #1213242
    
    Change-Id: Iad75f7c6f6c045a2f473388529174cf02f413899

commit 438b2f3dcba70dd244012bfa6c04c631b554ef20
Merge: 16724b0 08e4510
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 20:57:00 2013 +0000

    Merge "Fix case error in qpid exchange name.  s/Direct/direct/"

commit 16724b01595fa57ba4db61501372ec1b23dd264c
Merge: 3073804 50a50f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 19:36:02 2013 +0000

    Merge "Bumps hacking to 0.7.0"

commit 3073804194958a3d96afd0e3ea72efd7f2170cf5
Merge: b04837e 77a1d0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 19:31:49 2013 +0000

    Merge "Revert "Refactor configuring of floating ips on a router.""

commit b04837e0a570406d29cf6964ce8fc7bbf3d0f628
Merge: 1480792 81a654f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 18:40:27 2013 +0000

    Merge "Returns 503 if the NVP cluster is in maintenance mode"

commit 1480792e84e0927cc9c5dbbf252bb4cf8457bd34
Merge: 3958b0c adf3b8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 17:49:48 2013 +0000

    Merge "Handle nvp default l3 gw service misconfiguration appropriately"

commit 3958b0c4605aa7fe4d8c18fcf6f047bf932a9e11
Merge: 4c0a7e0 ad9eefd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 17:41:27 2013 +0000

    Merge "Include PLUMgrid plugin in some alembic migration files"

commit 77a1d0c95a83a9697782a7e3ab6e8dea16cd4174
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Fri Aug 16 10:17:48 2013 -0700

    Revert "Refactor configuring of floating ips on a router."
    
    This patch breaks gating job.
    Because nat rule for metadata will be only added on the
    router_add.
    Revert it for now.
    
    Fixes bug 1211829
    This reverts commit 9382ee659212285a203550cf60476dd146d27a29.
    
    Change-Id: I05925798cddc7a706e922025ef6ce27b6638ffb6

commit 4c0a7e0a181aef67a90a1a31c43318373c9e38f5
Merge: e79cc52 7abd09b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 16 16:48:28 2013 +0000

    Merge "Fixes typos in midonet_lib.py"

commit 08e45107467fbf0ceb487ed0aebc55dc98a6da7d
Author: David Ripton <dripton@redhat.com>
Date:   Fri Aug 16 10:19:59 2013 -0400

    Fix case error in qpid exchange name.  s/Direct/direct/
    
    Fixes bug #1211338
    
    (This is a minimal merge of just oslo-incubator bec54ac5 and
    no other oslo changes.)
    
    Change-Id: I129f9486f13be91868824e0e0534c4760d50589b

commit f0b77aa053a2d5456d72d178d4fac8e2684cc111
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Fri Aug 16 09:19:25 2013 +0000

    Fix ML2 VXLAN TypeDriver DB migration
    
    The migration for the ML2 VXLAN TypeDriver was incorrectly setting
    primary key attributes on separate lines for 'ip_address' and
    'udp_port'. Also, a primary key cannot have autoincrement set, so
    add this to 'udp_port' as well.
    
    Fixes bug 1213134
    
    Change-Id: I0b2e2685bf524dd9c0333ac4511287ad6a5eb87e

commit 50a50f19068b4bfa32b02e547e7930ad8fdaf694
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Aug 16 14:23:14 2013 +0800

    Bumps hacking to 0.7.0
    
    Change-Id: Ibdb816cd2cb6a221236a8294808fd41b3e417570

commit e79cc52ee5224c2b7a0368903eb4b7fe60fd8983
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 16 06:14:28 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2fa289226749646eb37c14dd8719e54584141a04

commit f0f81ad7adf28454a2a44c98bdda0f1c1eca903d
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Wed Jul 10 18:38:21 2013 +0800

    remove binaries under bin
    
    bp: remove-bin-directory
    
    There are some binaries which are expected to run in branch, so
    we have to keep them there now.
    
    Change-Id: I5134d975cbd69f929a325ab80a6d19ce1f122656

commit 7abd09ba639180a177cb5fd7673e59084d06c4fc
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Aug 16 08:49:06 2013 +0800

    Fixes typos in midonet_lib.py
    
    Fixes bug #1212898
    
    Change-Id: I688de064947b0079153bd3c5e5376e8b16a7d5c1

commit d6e9767162a912b749de1d4d69f6604634d0c8df
Merge: 30d7852 1d36629
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 22:08:48 2013 +0000

    Merge "Fixes files with wrong bitmode"

commit 30d78524378110bc3eab317e5ff36645c612ea5c
Merge: 6dc7f32 5db010a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 21:42:24 2013 +0000

    Merge "Unify exception thrown in l3-agent-scheduler fails"

commit 6dc7f321c68c87b38efcb7cb23fbce581526758c
Merge: b26ee88 2d33536
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 21:42:15 2013 +0000

    Merge "Remove long db transaction for metadata access network"

commit b26ee8872b61b446b9882292e2384fbec32fb42e
Merge: 1a749a0 d97b560
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 21:42:06 2013 +0000

    Merge "Do not call remove_router_lport in remove_router_interface"

commit e1165ce1180bba1a11098cfacfe3c722a084dbcf
Author: alexpilotti <ap@pilotti.it>
Date:   Thu Aug 15 19:49:31 2013 +0300

    Fixes Windows setup dependency bug
    
    Fixes bug: #1212385
    
    The neutron project includes a setup hook that allows to dinamically
    include setup dependencies.
    
    Due to recent changes in the pbr project, the hook raises an exception
    on Windows, which ends the setup process.
    
    This fix solves the issue by adapting the hook to the recent pbr changes.
    
    Change-Id: I4b00d74d23a7167a10ba86458943ff16ca51b0db

commit 1a749a0d1d4be3dfa1bf3dcebc6d60daba4963ac
Merge: 557d28e 2786a6c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 18:21:22 2013 +0000

    Merge "Mock os.makdirs to avoid directory creation in unit tests"

commit ad9eefdae75b87a9bb4aef563bc359c1d5a939e7
Author: Edgar Magana <emagana@gmail.com>
Date:   Thu Aug 8 18:35:52 2013 -0700

    Include PLUMgrid plugin in some alembic migration files
    
    Fixes bug# 1210348
    
    Change-Id: I8d33d2c8f0849afdd3ebda5297b4064858132c9b

commit 557d28ee0aca071326f566eb1e948cbc714fa26d
Merge: 511113d 43838a2
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 15 17:05:46 2013 +0000

    Merge "Imported Translations from Transifex"

commit 511113d42ed9bedcc81aaf8df7d4284481d55220
Merge: 91a8985 f634d3d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 14:23:53 2013 +0000

    Merge "Fixes typos in comments"

commit f634d3dd8e8d6c2899228d12e1fa1d0e2269e785
Author: Hui HX Xiang <xianghui@cn.ibm.com>
Date:   Tue Aug 13 23:52:56 2013 -0700

    Fixes typos in comments
    
    Correct some spelling mistakes in comments.
    l3_db.py
    db_base_plugin_v2.py
    
    Change-Id: I79f2b1b1935ca3805bb1c90c09e5d16f32b165ae

commit 5db010a9a737356e426e6f2e10c8fcafb36c533c
Author: Jaume Devesa <devvesa@gmail.com>
Date:   Wed Jul 24 16:54:09 2013 +0200

    Unify exception thrown in l3-agent-scheduler fails
    
    Since you can only attach a single l3 agent to a router, when you try
    to add another l3 agent to a router that already have one, the l3
    agent scheduler raises an exception.
    
    This fix removes the discrimination by id: either it is the same agent
    or another one, the router can not be hosted and the same exception is
    raised.
    
    Change-Id: If832bbd4bf17e4e0c4720172aded4c9fffedc6fc
    Fixes: bug #1154622

commit 91a8985683b707aac281d92542e9bc4f3dba87ed
Merge: ea16d65 93195ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 08:11:06 2013 +0000

    Merge "Restore Babel to requirements.txt"

commit ea16d6583abff37276fe37cf32a2dbaf766fc766
Merge: 046cb3f 8c416e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 06:26:49 2013 +0000

    Merge "LBaaS: throw proper exception on duplicating monitor association"

commit 046cb3f7a1b053ca92747929712243ef085d076b
Merge: 1bf2724 81156e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 15 06:26:40 2013 +0000

    Merge "Add metering extension and base class"

commit 43838a2303eed659f26d10d142587b9c87ea21b6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 15 06:15:20 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I45fe5fe57b916f9db7daa89f2af00300ef33ce57

commit 2786a6cafa6edaf5438a3dacf54b160d8a733e7b
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Aug 14 12:05:43 2013 -0700

    Mock os.makdirs to avoid directory creation in unit tests
    
    The directory 'dhcp' under neutron state path should not be
    created during unit tests. This patch mocks up calls to
    os.makedirs and ensures that methods that rely on it, like
    _populate_network_cache, are mocked as well.
    
    Fixes bug #1211952
    
    Change-Id: I83998d4e631b1ebeab90b4c3c0276aa2ffe22c50

commit 1bf2724eead422aa9598f89ab96139cee1d22916
Merge: 6641d32 47dca82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 20:00:05 2013 +0000

    Merge "Fix test_update_status unit test in Loadbalancer test suite"

commit 6641d3296df9bcdcaf3de6e3d61a5023757bbb56
Merge: 748c58d 9aecb8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 19:59:56 2013 +0000

    Merge "Add wrap_name param to the iptables_manager class"

commit 81a654fdebab13639d2d4ffacfc254b5893bbe7f
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri Aug 9 16:27:22 2013 -0700

    Returns 503 if the NVP cluster is in maintenance mode
    
    If the NVP cluster is in 'readonly-mode' during a maintenance
    window, some NVP operations may raise a Forbidden error. This
    is not currently handled correctly, and Neutron server ends up
    returning 500. This patch addresses the problem by ensuring
    the right error code is returned.
    
    Fixes bug 1204715
    
    Change-Id: Ibd2cac8286a0978a95f9006142c2a405053dfa00

commit 47dca8211ab50f971f95a47a40a7f4cdc79e3b3a
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Wed Aug 14 16:53:22 2013 +0400

    Fix test_update_status unit test in Loadbalancer test suite
    
    Add proper check of the updated object.
    
    fixes bug 1212229
    
    Change-Id: Icbe0a127a045ff93630dfa7f8d3fd6af771ddc5e

commit 81156e4a3931787cdf7e1b9301ca3f80bc009d6a
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Fri Jun 14 17:35:50 2013 +0200

    Add metering extension and base class
    
    This a part of the blueprint bandwidth-router-label
    
    This patch initiates the blueprint by adding base class
    to associate labels and metering rules to tenant's routers.
    
    Change-Id: Ia93b49d881e79c3291730cff7b80f26c56fedb48

commit 8c416e8dc3cc20f3f16c72bbec289b13e0de5d40
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Aug 6 17:44:30 2013 +0400

    LBaaS: throw proper exception on duplicating monitor association
    
    Fixes bug 1208728
    
    Change-Id: I6cf27766eedff34a6ed5062a50b049ab0a5bf96a

commit 93195ef9c6441901823648a7e443dc0d82491ba4
Author: Clint Byrum <clint@fewbar.com>
Date:   Wed Aug 14 00:52:32 2013 -0700

    Restore Babel to requirements.txt
    
    Babel is needed by code synced in from oslo-incubator, namely
    neutron.openstack.common.gettextutils.
    
    Fixes bug #1212135
    
    Change-Id: I7f490fb8cf9a4fcba1711cf464f934d60d6d435e

commit 748c58d1daa2c3f1c940427cc585f9ef4a000e7a
Merge: 591ce97 8577533
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 14 07:08:39 2013 +0000

    Merge "Imported Translations from Transifex"

commit 591ce97ab90279c7f8a4210df3c24c73eb4b99c0
Merge: 5f8878d b8b28bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:32:56 2013 +0000

    Merge "Enable conversion for composite attribute items"

commit 5f8878d6b011be4b5cca6f7ec1281cf0b082339f
Merge: e7acc15 7e48716
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 14 06:32:47 2013 +0000

    Merge "Firewall as a Service (FWaaS) Iptables Driver"

commit 8577533acffeee68028d6270623d825d498e2ec3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 14 06:15:03 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I514ff9ce5de7a8c774420d032f9850c7fab67cb4

commit e7acc15571bc6f1e837afaab3ae13a9233036d4e
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 13 15:58:39 2013 -0400

    Drop quantum dhcp lease update bin
    
    In d9832282cf656b162c51afdefb830dacab72defe we dropped
    the DHCP lease logic from neutron... including
    the neutron-dhcp-agent-dnsmasq-lease-update.
    
    Both the neutron and quantum bins were removed from setup.cfg
    so we should also drop the quantum-dhcp-agent-dnsmasq-lease-update
    as well.
    
    Change-Id: I568845dc28aa4dc9012435de2f0689aafa00a43c

commit f08d412fb4df1e140fb17ff3bfe44ee812602481
Merge: 3e82d12 3f3346e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 23:48:47 2013 +0000

    Merge "allow subclasses to modify the parents model hooks"

commit 3e82d12d15a4e7caeacb0e8c2bb6c8cb9e5110e9
Merge: 72ef3ce 9382ee6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 23:44:17 2013 +0000

    Merge "Refactor configuring of floating ips on a router."

commit 72ef3cebb97c2cf3048398c262e923657830163f
Merge: fc5882d ed2acda
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 22:29:40 2013 +0000

    Merge "Remove last vestiges of nose"

commit fc5882da8ff430c729c42cc3660ca842295742f7
Merge: 1887f15 5508e8b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 22:29:32 2013 +0000

    Merge "Updated from global requirements"

commit 1887f1576672e34eba619a275274ac981e821b81
Merge: 9dfba2c 9e13846
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 21:55:01 2013 +0000

    Merge "make assertRaises() test for specific exceptions"

commit 9dfba2cbcf35457a97163b1e063bb59f552f5f86
Merge: a0caa72 3e52602
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 20:23:03 2013 +0000

    Merge "Nicira plugin: Reduce message severity to DEBUG from INFO"

commit a0caa724ece8d6d2c21ac6cbf95280ab27f7ba87
Merge: 98e1bea 708a089
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 20:07:05 2013 +0000

    Merge "Fix copy and paste error in docstring."

commit 9e1384679f7b2388677b35a95cea0cf9a5610549
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Aug 13 15:49:55 2013 -0400

    make assertRaises() test for specific exceptions
    
    fixes bug: 1211951
    
    Change-Id: Icf1401cc29e0a9c7fc68089e4c38f278181779be

commit 9382ee659212285a203550cf60476dd146d27a29
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Tue Aug 13 00:11:29 2013 +0000

    Refactor configuring of floating ips on a router.
    
    This approach to configuring floating ips is stateless and idempotent.
    This allows it to handle corner cases, such as reusing a floating ip
    address with a different floating ip id in a way that is easier to
    understand.
    
    The concept is to wipe the floating ips clean and rebuild them each
    time with the following optimizations.  To avoid bad performance in
    manipulating iptables, it is called in the context of a call to
    defer_apply_on.  To avoid a disruption in network flow a set
    difference is use to determine the set of addresses that no longer
    belong on the inteface rather than removing them all blindly.
    
    Change-Id: I0cfb58d487b1925e0a0db2a701c5ea3c56a0b2b5
    Fixes: Bug #1209011

commit 98e1beacdc300a28dd26de4c2ba4d7b3ab5c4f2d
Merge: 7a6c9ca 94b91ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 18:13:37 2013 +0000

    Merge "Remove references to enable_metadata_access_network_option"

commit 7a6c9ca8f3f65808b69fc0064c4e5dc514e8d820
Merge: 69b7f7e 50c4972
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 17:46:54 2013 +0000

    Merge "Revert "Sync rpc/impl_qpid.py from oslo-incubator.""

commit 708a08931e873ec69949c5d7a6869d4eeeda4ba4
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Aug 13 10:38:09 2013 -0700

    Fix copy and paste error in docstring.
    
    Change-Id: I763791f733b75b971d3db3a90d5eeefc62947266

commit 69b7f7eae4f78468569dceefd136d149dfed3666
Merge: c7bd098 cf8586a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 17:24:45 2013 +0000

    Merge "fix up inadevertant octal to make hacking pass"

commit 3e526029c3562d585cb5ee8810b679acbb83c4fc
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Aug 13 09:24:05 2013 -0700

    Nicira plugin: Reduce message severity to DEBUG from INFO
    
    Bug 1211860
    
    This applies to the message logged for missing or empty cluster attributes.
    
    Change-Id: I30dfac773f5ac268ffb6658984108f1698caabfd

commit 94b91ee461e0c15239e8f9f66fec88ff07463d43
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Aug 13 09:04:50 2013 -0700

    Remove references to enable_metadata_access_network_option
    
    Bug 1211850
    
    This configuration variable is vestigial and not used anywhere
    in the code. References to it should be removed to avoid confusion.
    
    Change-Id: I13f86fe8b964c163324160b4c983e773e6b93e40

commit c7bd098271591f0e95babe2b9d27acc8f80d8bff
Merge: 9686e28 d983228
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 15:45:59 2013 +0000

    Merge "Remove DHCP lease logic"

commit 9686e2854444aa1697f09ac65ec19d62e54587bf
Merge: 3d6adf7 2e7f35c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 15:45:07 2013 +0000

    Merge "Fix some NVP tests do not do cleanup of nvp ports"

commit cf8586a8810748e927c7428c229e203a8fdf938e
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Aug 13 11:30:56 2013 -0400

    fix up inadevertant octal to make hacking pass
    
    Change-Id: I82097f1f507ddf0827714598c27ec3c950bdeaee

commit 3d6adf7ed2b9edbbc945d1b79f8a1f72e98e5df5
Merge: 334e646 43692be
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 13 15:09:54 2013 +0000

    Merge "Imported Translations from Transifex"

commit d97b56086c0442c58b02c58afb9dd0ed32d6f748
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Aug 13 07:08:27 2013 -0700

    Do not call remove_router_lport in remove_router_interface
    
    Bug 1211149
    
    The call will cause a failure as the router port is already removed
    by _nvp_delete_router_port.
    This patch also add the support on the fake nvp api client to verify
    this kind of condition.
    
    Change-Id: Ieb5ca5c239ccc993b96dd5bad0b412211b45417e

commit 50c4972ca533005d787948f7b229b0e0ebe347d9
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Aug 13 09:52:12 2013 -0400

    Revert "Sync rpc/impl_qpid.py from oslo-incubator."
    
    This reverts commit 3f4bb0443e96e9b7d04e3e4e77a8bb4e8647e01e.
    
    Fixes LP Bug #1211778.
    
    Change-Id: I254995a1bf5416fb70fbcac28ee399b1373efde7

commit 1d3662934062e21b2fe360505e8e5998d54f4c60
Author: lawrancejing <lawrancejing@gmail.com>
Date:   Tue Aug 13 21:25:07 2013 +0800

    Fixes files with wrong bitmode
    
    Some modules have bitmode 755. Changed to 644
    
    Change-Id: Ic91854ac2b46cb8c9b46eb575f5cfb9cce056670

commit 334e646170d2fae302bf3132033706daf66020a6
Merge: f3c016d 3f4bb04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 13 07:10:22 2013 +0000

    Merge "Sync rpc/impl_qpid.py from oslo-incubator."

commit 43692be4565f5e2c71cf674bc9359fdc0c01699a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 13 06:14:22 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4f909a71b04e20767183908d834fa79fa253e62e

commit 7e487160867d2c2059d556d0d3af50bc8e8838fa
Author: Rajesh Mohan <rajesh.mlists@gmail.com>
Date:   Fri Jun 21 17:55:08 2013 -0700

    Firewall as a Service (FWaaS) Iptables Driver
    
    blueprint quantum-fwaas-iptables-driver
    
    This is IPTables Driver for "Firewall As A
    Service" feature.
    
    This implements
    - Fwaas rules are mapped to IPTables
    - The rules are installed in the network
      namespace of quantum-routers
    
    Change-Id: I157182f2c86fbcf8c141b9ad3cfc71168153ebf8

commit d9832282cf656b162c51afdefb830dacab72defe
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jul 16 16:06:32 2013 -0700

    Remove DHCP lease logic
    
    Previously neutron was keeping track of dhcp lease time in order
    to ensure it didn't hand out an ip address that was already leased.
    This patch removes that logic and instead leverages the dhcp_release
    utility. This allows us to reuse ip addresses immediately after a port
    is deleted. This patch also bumps the lease time to 24 hours instead
    of 2 minutes with reduces the amount of dhcp traffic.
    
    DocImpact
    
    There is a DocImpact for this bug related to the upgrade path. One should
    first upgrade their dhcp-agents. Then wait till the dhcp_lease time has
    expired. Lastly, update neutron-server in order to avoid the case where
    an instance is deleted and the dnsmasq process has not released the lease
    and neturon allocates that ip to a new port.
    
    Fixes bug: 1202392
    Implements blueprint: remove-dhcp-lease
    
    Change-Id: Ifcb4f093c92904ceb896438987d53e692eb7fb26

commit 2e7f35c88b0192f553be34f973f35d39927f1746
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Aug 7 11:24:01 2013 -0700

    Fix some NVP tests do not do cleanup of nvp ports
    
    Some of the NVP test do not execute self.addCleanup(self.fc.reset_all)
    from setUp() as NiciraPluginV2TestCase is not the first mixin.
    This casuses left over ports to still exist between different testcases.
    This patch only fixes this issue for TestNiciraPortsV2 and
    NiciraPortSecurityTestCaseas, some of the other tests require the setUp()
    for the first mixin to be called for their tests to work.
    
    Note: this is why the tests for the Remove DHCP lease logic are failing.
    
    Fixes bug: 1209355
    
    Change-Id: I932471cdb8925353c5825cd70c8217511d6d7938

commit f3c016d76ae205365e939e320a6e394b61593adb
Merge: 4b6f645 b49cc5b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 21:47:15 2013 +0000

    Merge "Add support for the Nexus 1000V into the Cisco Plugin."

commit 4b6f645debfaab472caa017bc0cf0504183b9f4b
Merge: 6d21246 a4cd43f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 17:18:01 2013 +0000

    Merge "Add missing space in the message produced by @log"

commit 6d2124676131c65a9c140875ba22225caa525644
Merge: 96be44e 04f689d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 17:17:53 2013 +0000

    Merge "Fix resource status in NEC Plugin"

commit 96be44edb31205814f2dc0238e0c421a161ff5da
Merge: 1e2cc8b 17ef53c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 17:14:44 2013 +0000

    Merge "Firewall as a Service (FWaaS) Agent"

commit 1e2cc8b12de1d1ff7c50fe7956c31d91e4da23be
Merge: edc4dba a2e1666
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 16:28:23 2013 +0000

    Merge "Cleanup remaining code that used 'status' fields of HealthMonitor"

commit edc4dba047faa85a43e8d0143f5ae71bcbfb7725
Merge: 95382cb 9c21ae2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 12 16:28:15 2013 +0000

    Merge "sync some configuration items with codes"

commit 3f4bb0443e96e9b7d04e3e4e77a8bb4e8647e01e
Author: David Ripton <dripton@redhat.com>
Date:   Mon Aug 12 10:38:17 2013 -0400

    Sync rpc/impl_qpid.py from oslo-incubator.
    
    Fixes bug #1211338 (seen in Neutron, marked in launchpad as oslo
    since the bug was in oslo code).
    
    Change-Id: I11971c1213b095979bd4f2e878ea2bcad3ceb617

commit 04f689daa9df689287891d3505b89e3cfed8cd7a
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Mon Aug 12 14:10:40 2013 +0900

    Fix resource status in NEC Plugin
    
    This commit makes sure that the plugin exposes right status in a
    response body, and does not overwrite ERROR status until another
    operation to the backend has succeeded.
    
    This commit also changes NEC Plguin to use neutron constants instead of
    OperationalStatus defined in this plugin.
    
    Fixes: bug #1211319
    Change-Id: Ic61b8e1b9d3f6c2be9567dd5a4606aa6d439c564

commit a4cd43f998e4f0d34be4cca8269a920fbfed1a46
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Mon Aug 12 13:22:35 2013 +0200

    Add missing space in the message produced by @log
    
    Fixes bug: #1211275
    
    Change-Id: I06140058cd4e0819cc9e8879516e54f67f54836d

commit 9aecb8f812ceb544f74526829407503a1c55057d
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Wed Jun 26 10:18:38 2013 +0200

    Add wrap_name param to the iptables_manager class
    
    Use this optional parameter instead
    of binary_name to wrap the chain names.
    
    Fixes: bug #1194049
    Change-Id: I69b4d9043769703248e19184eaedbdbf7a43d96e

commit 95382cb443a6e3f093e87b214adc21d1d04498a2
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 12 06:14:41 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6d6d891e91f6bce1b205ed5f23a472ef2d81d327

commit 17ef53cda6ee04456a0f26b1abaeb997d58ba0d0
Author: Sridar Kandaswamy <skandasw@cisco.com>
Date:   Fri Jun 21 16:33:24 2013 -0700

    Firewall as a Service (FWaaS) Agent
    
    blueprint: quantum-fwaas-agent
    
    This is the first iteration of the FWaaS Agent with some basic
    functionality to enable integration of Plugin - Agent - Driver.
    
    An inheritance approach is taken with the L3 Agent to enable the
    agent side messaging.
    
    Unit tests, included, coverage being increased
    
    Change-Id: Ib0970fdc4ad1ac53df66fba172a5a7f7d7ee3f1b

commit ed2acda49a758006627bdaf7bfc27d4efa925c25
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Aug 9 13:05:12 2013 -0300

    Remove last vestiges of nose
    
    We don't use nose anymore, but it was still referenced in a few places.
    
    Delete them.
    
    Closes-Bug: 1210998
    Change-Id: I5e00edd071b8e99e54cdbbf2de277aa95eb57567

commit b49cc5b771e647dca09730474db8b468d5bbaec3
Author: Abhishek Raut <abhraut@cisco.com>
Date:   Tue Jul 9 12:29:54 2013 -0700

    Add support for the Nexus 1000V into the Cisco Plugin.
    
    This will enable the Cisco Nexus 1000V to integrate with the Cisco plugin
    and be used to drive the realization of Neutron constructs.
    Network profile and Policy profile are introduced as extended neutron
    resources, while n1kv:profile_id is introduced as an extended attribute
    for network and port objects. Necessary changes to the Cisco plugin are
    made to accomodate Nexus 1000V as a configurable vswitch plugin.
    
    Implements: blueprint cisco-plugin-n1k-support
    Change-Id: I951e10c57d74c935fca8754c0e21e1ac9df35704

commit 6eae3007558f3887d32bb422c17c4679b7515d07
Merge: 62e7827 b188105
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 9 22:58:48 2013 +0000

    Merge "Imported Translations from Transifex"

commit 62e7827757c2d6bc12a2922e0079c60c940fe531
Merge: 2a3ee2d bffaf03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 22:58:40 2013 +0000

    Merge "Fix broken database migration for Cisco plugin"

commit 5508e8b04e761d0b389dde03f8d7e7eae9523125
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Aug 7 19:17:07 2013 -0300

    Updated from global requirements
    
    Also, revert commit 9826e0932596e77414b16b3c4ba237d847b30db1
    
    Change-Id: Ibf423f14a5c37aa298b2115bfd4936f660c6f530

commit b1881058f721d90db24e1d3afddabef69bfd40c0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 9 19:55:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I60c32ce8269362f707bdfd5d0952f808c449a666

commit 2a3ee2d6390c5b0d9c31f1ed9c3509ec21845e39
Merge: e2acdd6 a7d18bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 19:48:26 2013 +0000

    Merge "Make DbPlugin accept status in create_network()."

commit e2acdd651c846c977086b855ba171535d5cca4ad
Merge: 0052f7c 47c0d2e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 15:32:17 2013 +0000

    Merge "Add support for service plugins to the migration framework"

commit bffaf03a81b2402b83c62f4effb9dfb7f6588148
Author: HenryGessau <gessau@cisco.com>
Date:   Fri Aug 9 09:48:31 2013 -0400

    Fix broken database migration for Cisco plugin
    
    Remove migration for a table that was never used.
    Correct table drop order due to foreignkey dependency.
    
    Closes bug: #1210219
    
    Change-Id: I38bcedf7a84967bea2c1679a6a6ab51a9451b33a

commit 2d335360866b68586ed00a7b7a725ccdbb0f9c62
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jul 23 23:50:07 2013 +0200

    Remove long db transaction for metadata access network
    
    Bug 1204277
    
    Removes nested transactions wrapping plugin ops, and adds
    rollback code where required.
    Also ensures NeutronPlugin.py does not attempt to remove router
    ports twice.
    
    Change-Id: I299d4ed688a70b6dff506c999355661cf783ae26

commit b8b28bd679746040bb520e7b273d0e822820cac1
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 2 11:47:09 2013 -0700

    Enable conversion for composite attribute items
    
    Bug 1207881
    
    Enable 'dict validators' to convert composite attributes' items
    using a 'convert_to' specification in a way similar to first-level
    API attributes.
    This is needed in order to ensure boolean sub-attributes are
    properly handled.
    
    Change-Id: I7f466befaa88112cf7e9b77d854ac292b2af638f

commit 0052f7c0db5c884ea912cc1635d50fc53e4c4239
Merge: 4d98e72 7f08e16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 12:47:54 2013 +0000

    Merge "LBaaS: pass the complete healthmonitor object to driver"

commit 4d98e72e4c453506db50c9d786b66948917780ee
Merge: 3021cf1 7247359
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 10:24:14 2013 +0000

    Merge "Fix H102, H103 Apache 2.0 license hacking check error"

commit 47c0d2ebd55d4c5de2c3e914a7c3f91a8d31a20d
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed Aug 7 16:15:51 2013 +0400

    Add support for service plugins to the migration framework
    
    Implements blueprint migrations-for-service-plugins
    Fixes bug 1209151
    
    Change-Id: If7fc7a4488352e9b65b6973d8ea631e0d9ed8b68

commit 3021cf19d3d48b362f5c950b35c9e559d31deb7d
Merge: 6cd3e19 c4657c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 05:13:34 2013 +0000

    Merge "Ignore pbr*.egg directory"

commit 3f3346e598cc6418a5dae18776810f62d6f5375a
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Aug 9 00:53:33 2013 -0400

    allow subclasses to modify the parents model hooks
    
    fixes bug 1210387
    
    This change modifies the model hook processing to call the method on the
    instance if a hook is registered as a string.  If the hook is a
    callable, then callable is called with the hook arguments.
    
    Change-Id: Id14ae89f3f12a500920d248226e0ecba8e35e74c

commit 6cd3e190c6ef6f5df9b1b101bd45102e44ca8588
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Thu Aug 8 12:33:10 2013 -0700

    Make SubnetMismatchForPort extend BadRequest rather than Conflict
    
    Nova is trying to do a better job of mapping Neutron exceptions and
    change I4c087684ef77988e5f463d7f2f50fc2a04f37db0 is trying to map 409 to
    the proper nova exception. In looking at what raises a 409 exception in
    Neutron, the SubnetMismatchForPort exception seemed like a candidate for
    changing from Conflict (409) to BadRequest (400) to ease that mapping.
    
    Note that the only thing currently using this exception is the L3 router
    extension when removing a router interface and the 400 response code is
    already listed in the API docs as a possible response code:
    
    http://docs.openstack.org/api/openstack-network/2.0/content/router_remove_interface.html
    
    Also note that it's generally OK to change APIs for a more accurate
    response code:
    
    https://wiki.openstack.org/wiki/APIChangeGuidelines#Generally_Considered_OK
    
    Related-Bug: #1209446
    
    Change-Id: I4507e1db69d738ec0f943f1b8b1209f269d5aebf

commit 9c21ae2c412f87671d80d92b667c6bd68021422d
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Thu Aug 8 23:15:31 2013 +0800

    sync some configuration items with codes
    
    Bug #1210173
    
    Change-Id: I3622a45f0907e49391156322553665845978a551

commit fd1c78a81582b0e6d56af070c8d978fd53e3b15b
Merge: bab8557 fefad06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 9 00:04:40 2013 +0000

    Merge "Remove unused *AlreadyAttached exceptions"

commit adf3b8d3b1796337aac7cd5ff7683782eb715f96
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Aug 8 17:04:05 2013 -0700

    Handle nvp default l3 gw service misconfiguration appropriately
    
    Bug 1185885
    
    Avoid returning an unrelated, backend-specific, error message to
    the user, and ensure the logical router is removed from the
    NVP backend.
    
    Change-Id: I5f7b88480dab80a2138486e612e144b971691cf5

commit bab855777b9fd68eb75153a3cbc41447aee7d3ac
Merge: b9fab8e f3708c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 22:26:44 2013 +0000

    Merge "Externalize error messages in the API"

commit c4657c3e01c0daa1386c31b7dd8892d6a6a3ff9b
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Fri Aug 9 06:06:07 2013 +0800

    Ignore pbr*.egg directory
    
    Change-Id: I8a143a20947fef1d1d6a28e53893efe01f49884c
    Fixes: Bug #1210306

commit fefad06eabc7fb23ccb3ca1a6093d3460065adc7
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Thu Aug 8 14:24:43 2013 -0700

    Remove unused *AlreadyAttached exceptions
    
    This patch simply removes two exceptions which are not being used.
    
    Closes-Bug: #1210276
    
    Change-Id: I5a3412160f49f6e37f3d9182ce4d4a59b1d7bc09

commit b9fab8e0050cdb9279b5e43e8a9f787f976083d4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 8 19:55:46 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I94106b16c4f1bfb6ed7f7cb9d085d55f1ac42da7

commit c355d721dcb61381be4387775f5f2459f0a33c26
Merge: 40adc2c 5f658a8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 8 13:35:43 2013 +0000

    Merge "Imported Translations from Transifex"

commit 40adc2c20adf3c5e5606c6b6a73abdff6afeadaf
Merge: 69fcafd 777b59a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 07:53:29 2013 +0000

    Merge "Fix lbaas_pool_scheduler db migration"

commit 69fcafddf26581d61d215353753acbcee5897bf5
Merge: c06c4fb e0de5bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 07:53:21 2013 +0000

    Merge "Sync oslo gettextutils"

commit c06c4fbf8b76f7317c798dd95cc033630d768248
Merge: 1cc56cf 5b36603
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 07:53:13 2013 +0000

    Merge "Separate packet filter activation from port operation in NEC Plugin"

commit 1cc56cf0ea1f6e0b21d313512f3f4060f259d366
Merge: 2ed063a a484fa5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 07:06:13 2013 +0000

    Merge "Fix path for the linuxbridge plugin in folsom initial DB structure"

commit 5f658a824847df70704acd65555d2d74219bbfd4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 8 06:14:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia98195c8bfc07b001298e6cf546d0b54cab24250

commit 2ed063a7385534aef149e9f968415b410e129a56
Merge: 94962f0 45987ed
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 05:49:59 2013 +0000

    Merge "Change decorator to webob as doesn't need to be wsgi"

commit 724735977e35850313b3d73e74238a08dea370e1
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Aug 7 03:48:29 2013 +0900

    Fix H102, H103 Apache 2.0 license hacking check error
    
    Closes-Bug: #1209070
    
    This commit addresses H102 and H103 hacking check.
      H102  Apache 2.0 license header not found
      H103  Header does not match Apache 2.0 License notice
    
    Also ignores H233 hacking check in tox.ini.
      H233  Python 3.x incompatible use of print operator
    
    Change-Id: I081964bf0b9e21614da2f146bd3ba8d28e211024

commit 94962f0142deade9a2a797dad0717e8b71246725
Merge: 5cb5d7b 6dcf88f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 03:31:30 2013 +0000

    Merge "Fix two typos in routing table configuration"

commit 5cb5d7b09792bf09a14740aca6af7c411ebfd110
Merge: 4b6c350 d12fcad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 02:46:03 2013 +0000

    Merge "Enable localizable REST API responses via the Accept-Language header"

commit 4b6c35091e951ed96897d88b931e104fc677d49c
Merge: d4fe7a7 967e71c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 8 01:36:56 2013 +0000

    Merge "Fix BigSwitch plugin to handle device_id re-use in porttracker code"

commit 5b36603e698b42ad6583ab8fe3aa01c5104f425b
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Mon Aug 5 15:15:56 2013 +0900

    Separate packet filter activation from port operation in NEC Plugin
    
    Fixes: bug #1209422
    Change-Id: I5480e0798e64221f2f096732db6584634caddfb1

commit d4fe7a79d7338fb5f2b26e05d982b9e594b04633
Merge: 13791c1 9bc8b99
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 23:27:35 2013 +0000

    Merge "Fix wrong column name in db migration script of ryu plugin"

commit f3708c1d095fe5b08c54fcbf2913ff76b3c4ff34
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Wed Jul 31 16:04:31 2013 +0000

    Externalize error messages in the API
    
    This patch does more internationalization for the REST API error
    messages that don't currently have it to take advantage of the new
    support added by bp user-locale-api to show error messages in the locale
    requested by the user through the Accept-Language HTTP header.
    
    Partially implements bp user-locale-api
    
    Change-Id: I92780b42c125a91ab4916b7a31e4b71d306a89a1

commit d12fcadaa0d08b56d82d45cf2f80729fdc685f1a
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Jul 30 18:52:05 2013 +0000

    Enable localizable REST API responses via the Accept-Language header
    
    Add support for doing language resolution for a request, based on the
    Accept-Language HTTP header. Using the lazy gettext functionality, from
    oslo gettextutils, it is possible to use the resolved language to
    translate exception messages to the user requested language and
    return that translation from the API.
    
    Partially implements bp user-locale-api.
    
    Change-Id: I63edc8463836bfff257daa8a2c66ed5d3a444254

commit 6dcf88f58d994d50a1166e2cd494eb8103e7fb83
Author: Edgar Magana <emagana@gmail.com>
Date:   Wed Aug 7 13:43:37 2013 -0700

    Fix two typos in routing table configuration
    
    Fixes bug # 1209389
    
    Change-Id: I56bca9fa8cae9e78d1de980640256bf18fef1787

commit a484fa569e1f3318217fa6738c3e8e25be4a7933
Author: Edgar Magana <emagana@gmail.com>
Date:   Wed Aug 7 13:35:23 2013 -0700

    Fix path for the linuxbridge plugin in folsom initial DB structure
    
    Fixes bug# 1209377
    
    Change-Id: I5c543bed1798a93f69951d5c37cbc654cf23b062

commit 13791c1983cc43215c87afb0531b1f4abf898291
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 7 19:57:22 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I63533a673e63caebbf65ad87e71004082066195f

commit dc12dfb340cf440a4af4de71202ddc53b946042a
Merge: 9aeb5c2 9b50a25
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 19:53:44 2013 +0000

    Merge "Remove openstack.common.exception usage"

commit 9aeb5c2b57c20b751b0197954f334bc15948cb6e
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Aug 7 11:34:46 2013 -0700

    Correct NVP license header files
    
    Note: Pointed out by Akihiro but pushed by me as I was the one who
    push these files originally so I have to change the license.
    
    Fixes bug: 1209359
    
    Change-Id: I57d0fc588983e1934ad9321d54e642b72bdbdc9c

commit ad20ac761ccc80dc46da47a6c457aaf5dfbd7373
Merge: f5c8908 05691c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 17:51:48 2013 +0000

    Merge "Do not alter test_config global in test_extension_ext_gw_mode"

commit f5c89082a53a67e7dbd7a51af61911b3f986f47b
Merge: 624356b 08112f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 16:24:43 2013 +0000

    Merge "Cisco plugin db code cleanup, part II"

commit 624356bc8cd089d72565cb7f051782a997dd29e8
Merge: 195d117 86b6600
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 16:23:07 2013 +0000

    Merge "Delete useless and wrong comments in NEC Plugin"

commit 195d117bda167189f3b0b491f02b4694ff29cd22
Merge: 6646c1d 76fc0ad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 7 16:16:12 2013 +0000

    Merge "refactor port binding codes"

commit 777b59a295b963272c5f1482f025d4184074f46f
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed Aug 7 18:36:16 2013 +0400

    Fix lbaas_pool_scheduler db migration
    
    Fixes bug 1209263
    
    Change-Id: I98b05a1a7dde4bcddfcc37e36c57d47465633e6e

commit 9bc8b9967631064821112b5c7ff3b65fb0b176f6
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Wed Aug 7 20:01:46 2013 +0900

    Fix wrong column name in db migration script of ryu plugin
    
    Fixes bug #1209172
    
    A column name of tunnelkeys table which db migration script of ryu
    plugin creates is wrong.
    This patch fixes the column name.
    
    Change-Id: Ic3a445ea200111c0d7db93951804e7c4570420f2

commit 6646c1d54b153af22352c7a7662188334e3f6b5d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Aug 7 06:14:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9fd1c6211c108e110b4d299af62677e6dc0889fc

commit e0de5bf99ea11df126c826223a36a8be273e5375
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Tue Aug 6 19:30:38 2013 +0000

    Sync oslo gettextutils
    
    Change-Id: Id347e157ca2ccefe510b3328ea0047c87f25b3e4

commit 967e71c0318606558d866f3853c98e74aa963922
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Aug 6 08:19:08 2013 -0700

    Fix BigSwitch plugin to handle device_id re-use in porttracker code
    
    Updates the BigSwitch port_tracker code to use the sqlalchemy merge method
    instead of the add method for the port location tracking code to avoid primary
     key constraint errors if device-ids are moved or re-used
    
    Fixes: bug #1208990
    Change-Id: I06065ac888873b00f445d4356b17f084ee38c1ea

commit 45987edfbd9a264c1273e1b3489ccaeb6d3be2a8
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Aug 5 13:57:56 2013 -0700

    Change decorator to webob as doesn't need to be wsgi
    
    This patch changes the decorates in the metadata agents to webob.Request
    as they don't need to go through wsgi. Note: wsgi.Request's base class
    is webob.Request.
    
    Fixes bug: 1208907
    
    Change-Id: I069635eb67812136d314fc260cebf65886a95597

commit 05691c2e4c69e389ec52f8083f0b1d17590aa02b
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 10 01:32:51 2013 +0200

    Do not alter test_config global in test_extension_ext_gw_mode
    
    Bug 1199557
    
    Instead, allow subclasses to instruct the base test class which
    API extension manager they should use as it is already done with
    the plugin name.
    
    Change-Id: If4e53ffca3bdeb4fb218918358437aca41489de4

commit 7f08e166199ef7b8f74bb9c2d40012ff9b9211dd
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Aug 5 12:39:22 2013 +0400

    LBaaS: pass the complete healthmonitor object to driver
    
    Fixes bug: #1208372
    
    Change-Id: I72198446f4de3907d92fc9c2bbdb403cf2e87341

commit a2e1666190da7d82c520aef92ef0f44d7a294c5d
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Tue Aug 6 16:36:25 2013 +0400

    Cleanup remaining code that used 'status' fields of HealthMonitor
    
    Also cleanup some comments in abstract_driver
    
    fixes bug 1208822
    
    Change-Id: Ibfee548a1e27cc25b8607fb24018e3b35148a955

commit 08112f087ffb221513db2872b6db0726d0c30702
Author: HenryGessau <gessau@cisco.com>
Date:   Mon Jul 29 00:08:50 2013 -0400

    Cisco plugin db code cleanup, part II
    
    Remove an unused table.
    Prefix Cisco tablenames with cisco_.
    Make full use of neutron model base class.
    DRY out the nexusport binding queries.
    Follow coding guidelines for imports.
    Improve cisco/db/network_db_v2.py test coverage.
    Improve cisco/db/nexus_db_v2.py test coverage.
    
    Change-Id: I8ea110de37552176f2d9bcbff4ca3e0b65dfacdc
    Closes-bug: #1202687
    Partial-bug: #1190619

commit a7d18bbc56e4315e39d4dd82acfb3b058c21d2a6
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Thu Aug 1 14:21:20 2013 +0900

    Make DbPlugin accept status in create_network().
    
    This commit makes NeutronDbPluginV2 get network status from input at
    create_network() to allow other plugins to set network status while
    creating DB entry.
    
    Now plugins can create network with any status in a single DB commit.
    (e.g. Set network status to 'DOWN' when admin_state_up is False.)
    
    This commit also changes NeutronDbPluginV2TestCase() to make default
    network status configurable in each plugin test case.
    
    Fixes: bug #1207167
    Change-Id: Id3ad26719036c631e4b268150407a2c69919203f

commit 9b50a25c2817f804b6898f04eccfcebf895e82da
Author: Julien Danjou <julien@danjou.info>
Date:   Tue Jul 30 13:16:51 2013 +0200

    Remove openstack.common.exception usage
    
    This file is deprecated, stop using it.
    
    Change-Id: I5d79b8c0134bb5f4021487542d4d0a964281b8bf
    Fixes-Bug: #1208734

commit f27fba3ad77d907713e3e1cbfa45d33e0135c08b
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Mon Aug 5 13:42:45 2013 +0900

    Make NEC Plugin ignore duplicated messgae from the agent
    
    Fixes: bug #1208708
    Change-Id: I7d2b779fd0a7356c03e5ef911a98c164a53903ce

commit 86b660023c1073715940d45e1429323e17ac9ddd
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Tue Aug 6 14:07:07 2013 +0900

    Delete useless and wrong comments in NEC Plugin
    
    This commit deletes useless and wrong comments in NEC Plugin, and adds
    _clean_nec_ini() to Cleanup to make sure it is called.
    
    Fixes: bug #1208716
    Change-Id: I5c7950617cdf5d66f5f5cf3334bf2d5e617148eb

commit 07b0c929796a2a917c32fd434b912d7c6a6fdd8c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Aug 6 06:14:33 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0a97e668c78692bc1b6a93ef05c39cc4ba2b5879

commit 537674c33e18ad5325cf1ea1ddc21071e2660f85
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Aug 5 19:55:49 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3ba2e72c5aa066bede69da52c43bfdafab314c07

commit 5d389270d92b7256642fa2c010d1a8f62bce85f2
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Aug 5 08:51:16 2013 -0700

    Remove global DB_ENGINE from Neutron
    
    Related-Bug 1207402
    
    This global is not used anymore as it's been replaced by a similar
    global variable in neutron/openstack/common/db/sqlalchemy/session.py
    
    Change-Id: Id4614069af490020d18f14011853787930076e0a

commit 3313448f2de1ce288944af101a794d706fd43abb
Author: ZhiQiang Fan <aji.zqfan@gmail.com>
Date:   Mon Jul 29 18:40:46 2013 +0800

    Avoid overwrite value of deprecated name in conf.
    
    See bug/1194064 #2 Mark McLoughlin's comment
    
    Fixes: Bug #1194064
    
    Change-Id: I421d2decfa8829796fe7b6c14f954f3cccc17215

commit 715200de2a2daca8544bbc8102eacc4d0bc6ca3f
Author: Amir Sadoughi <amir.sadoughi@gmail.com>
Date:   Fri Aug 2 04:07:51 2013 -0500

    Adds Babel dependency missing from 555d27c
    
    Fixes bug 1207882
    
    Change-Id: Ic958ca774446b807d8675a1de94e6afafd6c97ba

commit c607bafbe5cad26a2d052d5e510f272fda8786cf
Merge: 6004fbe ec2eb04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 4 06:45:22 2013 +0000

    Merge "VPNaaS datamodel IKEPolicy lifetime unit typo"

commit 6004fbecdec7c9aeb15cfc80fc941b9a4824c09e
Merge: cae6375 4c7c0d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 3 18:25:47 2013 +0000

    Merge "Remove status* fields from HealthMonitor model"

commit cae63758642ec12581ae363253c0c8cb6bb6d770
Merge: bcb279e 8d4bb3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 3 18:25:39 2013 +0000

    Merge "Fix typo in FK name in VPNaaS DB schema migration"

commit bcb279e910cd8b083d95023f8e9260020e6ec46c
Merge: 04d9704 ac1c900
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 3 18:22:37 2013 +0000

    Merge "Fix enum definition in FWaaS DB schema migration"

commit 04d970489b42fc22f231a616b6152fce7a183b9a
Merge: efc9a15 9826e09
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 3 18:04:12 2013 +0000

    Merge "Fix the alphabetical order in requirement files"

commit efc9a1542e20e16f1ed0e0c097b12ae2cf627f4b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Aug 2 19:55:37 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib406019d5ccc27576a4b01dd2566e2988cb82306

commit 4c7c0d4a7a42aef4ec50d63a27541e6e00ba3792
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Aug 2 23:35:27 2013 +0400

    Remove status* fields from HealthMonitor model
    
    Status and status_description fields of HealthMonitor
    model are never changed during lifetime of the object
    and doesn't represent the status of it's pysical
    implementation. Instead, status and status_description
    of PoolMonitorAssociation is used. Another reason for
    removing those fields is that HealthMonitor acts as
    template which is instantiated on device. Status field
    for template makes no sense.
    
    fixes bug 1207650
    
    Change-Id: Iea9d7f73c3a2db43c553ed06a64fe5ff42427167

commit 8d4bb3ea29e71e11e76734d648b3a098c4ffeb53
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Fri Aug 2 18:12:42 2013 +0300

    Fix typo in FK name in VPNaaS DB schema migration
    
    Applying of migration 52ff27f7567a fails due to the typo
    in a table name referenced by a FK ('ipsecsiteonnections'
    instead of 'ipsec_site_connections').
    
    Fixes bug 1207811
    
    Change-Id: I9ee2933660c92d095db91003671478e691acecb1

commit ac1c9005e90d0ad65d7078e0e1604ca0ff2c7431
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Fri Aug 2 18:00:04 2013 +0300

    Fix enum definition in FWaaS DB schema migration
    
    Applying of migration 39cf3f799352 fails due to the error
    in definiton of action Enum type (values are not passed).
    
    Fixes bug 1207805
    
    Change-Id: Ibfdc268b400433c9013ca4c475f6b1fa32d338fb

commit 256f9743a376b4b4f850bdd39cf218b78d1ddaa4
Merge: 3a99e7d e55e8b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 17:32:59 2013 +0000

    Merge "Fix alias for ext-gw-mode extension in nicira plugin"

commit 9826e0932596e77414b16b3c4ba237d847b30db1
Author: zhhuabj <zhhuabj@cn.ibm.com>
Date:   Sat Aug 3 00:44:34 2013 +0800

    Fix the alphabetical order in requirement files
    
    Fix the alphabetical order in requirement files,
    Bring into correspondence with other project,like
    https://github.com/openstack/requirements/blob/ \
    master/requirements.txt
    
    Fixes bug #1207823
    
    Change-Id: If70ff2a815343615870e54991aa0d3db3adc5147

commit 3a99e7ddcb4e9917f822b9b41e7af8b85eb3c944
Merge: 92d8205 6b253e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 16:04:35 2013 +0000

    Merge "Remove comments from requirements.txt (workaround pbr bug)"

commit 92d8205a306f8bc959c8cea704273b2ad76d5713
Merge: c39e0b0 473a415
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 16:04:27 2013 +0000

    Merge "Fix branch in db migrations"

commit ec2eb04e20a45485ddb1928f4bcabbe07fb1084c
Author: Swaminathan Vasudevan <swaminathan.vasudevan@hp.com>
Date:   Fri Aug 2 06:57:04 2013 -0700

    VPNaaS datamodel IKEPolicy lifetime unit typo
    
    There was a typo in handling the IKEPolicy
    lifetime, during the IKEPolicy creation time.
    
    -Fixed the typo issue
    
    Fixes bug 1207572
    
    Change-Id: If8c56619c9a340a04e336b6b83d219df10b91e6c

commit c39e0b06d0fe9eecc74f9a082f77593b1fa44888
Merge: 19cc71d 555d27c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 2 13:53:16 2013 +0000

    Merge "Sync gettextutils from oslo"

commit 473a415e3e1a5e8aee3ab9e85f52975b49f6e055
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Fri Aug 2 10:59:55 2013 +0400

    Fix branch in db migrations
    
    Fixes bug 1207641
    
    Change-Id: Ic980a2c04a084f1bcfce549422d27b8a384b08f5

commit 19cc71d6331753f439bea24d0e9fb0ee7c39ef36
Author: fumihiko kakuma <kakuma@valinux.co.jp>
Date:   Fri Aug 2 13:38:23 2013 +0900

    Rename a variable name _ENGINE to _DB_ENGINE in metaplugin.
    
    fixes bug 1206717
    
    Change-Id: I9050021a9198b06d6796098282effd34ecd61710

commit e55e8b14bd91c0d52742c9298370e58874a38e37
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Aug 1 16:03:15 2013 -0700

    Fix alias for ext-gw-mode extension in nicira plugin
    
    Also add a unit test for verifying that a 400 is raised when
    enable_snat is an invalid string.
    
    Bug 1207556
    
    Change-Id: If33b8c72a08fbf7de1a837a65f083f09903c1809

commit 0a21ea951b733480574e98a62321de75e2ba53de
Merge: 688338a 2d4821c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 21:50:25 2013 +0000

    Merge "LBaaS: add status field to PoolMonitorAssociation table"

commit 688338a9965cd3be158be0c407fc022009d29ac8
Merge: 758c4f3 4623d0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 21:50:03 2013 +0000

    Merge "Fix docstring to reflect what the method actually does."

commit 758c4f33b4a0889190a01ecbcc01a5e83a826268
Merge: 3fa930e 90f6806
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 1 21:22:57 2013 +0000

    Merge "Imported Translations from Transifex"

commit 3fa930e51353fd72105ae1e45b66dc9f907adfdc
Merge: b23ccda ab1a932
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 20:33:17 2013 +0000

    Merge "Followup fixes to FWaaS API patch"

commit 4623d0ee259d832022bf9f06587ffa92a734759a
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Aug 1 13:24:18 2013 -0700

    Fix docstring to reflect what the method actually does.
    
    Change-Id: If36aa375de718f45620c7cae439656562b87c6e7

commit 90f6806097e1bac98d060a623a0e5c999889f0d7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Aug 1 19:55:30 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib153df117f394e605d8571acc0b68240ee7ac722

commit 555d27c7efce82c3ffc62c623412551ec345360c
Author: Luis A. Garcia <luis@linux.vnet.ibm.com>
Date:   Mon Jul 29 21:43:11 2013 +0000

    Sync gettextutils from oslo
    
    The oslo changes necessary for delayed translation were refactored in
    oslo. This patch set brings in the refactored changes, implemented
    under the same change-id mentioned below.
    
    Partially implements bp user-locale-api
    
    Change-Id: I27640a3c8b255be51bc6396d238098bd25af61ec

commit b23ccdabd5f8271d6d05108e1ca7de0a5fc2abf5
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Fri Jul 26 13:39:45 2013 +0400

    Fix lbaas db migration
    
    Currently the migration is skipped in all cases.
    Added * to run migration for all plugins until we have
    proper handling for service plugins in migration framework
    
    Fixes bug 1183705
    Also fixes bug 1205250
    
    Change-Id: Ib019408b8822e3e128c7c271b92875b542413fcf

commit ab1a932872a6ff7821b7723879d6d75ab3b7154f
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Wed Jul 31 23:25:59 2013 -0700

    Followup fixes to FWaaS API patch
    
    Fixes: bug #1206620
    
    This adds the minor fixes which were suggested be fixed
    as a followup to the FWaaS API patch.
    
    Change-Id: I8112dcb4f750bb367dcc6464cda7a826b7be811e

commit 1230276b36e6dd9c97ce54d3fcf1c054ed57d84e
Merge: 4e16ed9 744ffcf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 1 03:34:10 2013 +0000

    Merge "PLUMgrid plugin v2"

commit 4e16ed91cdbab538a366fa301aa789a77c1a0abd
Merge: 025af59 f581b2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 23:29:34 2013 +0000

    Merge "Avoid performing extra query for fetching port security binding"

commit 025af596afae67d0a9eabaa26601220464a65b71
Merge: d5585b0 8f02b4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 23:29:26 2013 +0000

    Merge "Sync latest gettextutils from oslo-incubator"

commit 744ffcf141203979c3c9dfd0444c8fad09948df8
Author: Edgar Magana <emagana@gmail.com>
Date:   Wed Jul 10 15:11:16 2013 -0700

    PLUMgrid plugin v2
    
    This commit implements blueprint plumgrid-plugin-v2
    
    Includes PLUMlib Library
    Fake PLUMLib library for Unit Tests
    Remove the use of topologies
    Includes IOVISOR VIF driver
    Implements External Networks
    
    Change-Id: I8ba90862e5a416d04d3327b46fcb0f6f3fa65248

commit d5585b0fd0329bfe78cab7ad6f9dc1a923f31d9d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jul 31 19:55:41 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I68d49e5273b23f4564dc9b94967c22ef39abefbc

commit df2118342580b40e7621db076c2f960b89381782
Merge: 4b15f10 88dc6ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 19:50:20 2013 +0000

    Merge "Prompted error message is not correct for PortNotFound"

commit 4b15f10fba7ed4f07e6eb58c3f2e30049fae8304
Merge: a0bf351 29d3b4f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 18:45:23 2013 +0000

    Merge "Create peer router port in appropriate port driver function"

commit a0bf351f235b1738c24cba8073545533742ab561
Merge: 8104728 3d5bec9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 15:50:58 2013 +0000

    Merge "Dhcp agent sync_state may block or delay configuration of new networks."

commit 810472823ee7ffb9d5f9bbf119a122824c7ca670
Merge: ea8090a cce692d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 15:50:50 2013 +0000

    Merge "Fix test fail in neutron.tests.unit.test_security_groups_rpc"

commit ea8090a758e60faa3e74ce8516cb96774c79827b
Merge: f9c3b84 7856f68
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 15:22:05 2013 +0000

    Merge "VPN as a Service (VPNaaS) API and DataModel"

commit 29d3b4ffd81436ed946aebbda0174de232d93aec
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 31 03:56:22 2013 -0700

    Create peer router port in appropriate port driver function
    
    Bug 1204288
    
    Removes peer port creation from add_router_interface.
    Also fixes port_drivers dict which had a duplicate key.
    In addition clears attachment on the NVP logical switch part
    being paired with the logical router port before plugging
    the patch attachment.
    
    Change-Id: I336b29bdf017b2d34d97412fbe034845fe314fc7

commit f581b2faf11b49852b0e1d6f2ddd8d19b8b69cdf
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Jul 15 00:21:12 2013 +0200

    Avoid performing extra query for fetching port security binding
    
    Bug 1201957
    
    Add a relationship performing eager load in Port and Network
    models, thus preventing the 'extend' function from performing
    an extra database query.
    Also fixes a comment in securitygroups_db.py
    
    Change-Id: If0f0277191884aab4dcb1ee36826df7f7d66a8fa

commit f9c3b841a506d17d741e29501c78b0cdfedb687b
Merge: 335f4f0 49e953a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 07:39:23 2013 +0000

    Merge "Make NEC Plugin keep error resources"

commit 2d4821c8c0851a971419da8e2919671043554da6
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed Jul 10 18:08:35 2013 +0400

    LBaaS: add status field to PoolMonitorAssociation table
    
    also fixes branch in migrations
    
    Fixes bug 1166395
    
    Change-Id: I451603cf152d84c750edb6fb1da59b4c7563cbce

commit 6b253e0cc3ea6caa28e17b3cd2e5dfd60bbc7bb2
Author: Hirofumi Ichihara <ichihara.hirofumi@lab.ntt.co.jp>
Date:   Wed Jul 31 15:37:53 2013 +0900

    Remove comments from requirements.txt (workaround pbr bug)
    
    Workaround for pbr bug #1191923
    
    Change-Id: I3ab1f5bde70fea3ac30323449b645aef46352f81

commit 8f02b4a7f5cb596295d42715486b0e1ef2359595
Author: Matt Odden <mrodden@us.ibm.com>
Date:   Tue Jul 9 05:22:28 2013 +0000

    Sync latest gettextutils from oslo-incubator
    
    Pull some necessary changes from oslo for
    implementing user-locale-api
    
    partially implements bp user-locale-api
    
    Change-Id: I6ac57e094e155760129e8df0e60bc7f2968aa439

commit 88dc6ea2eb99aa184eec5873218f3ab491abbfd1
Author: Yang Yu <yuyangbj@cn.ibm.com>
Date:   Mon Jul 22 14:14:36 2013 +0800

    Prompted error message is not correct for PortNotFound
    
    When deleting a non-existing port, the error message would be
    "Port XXXX could not be found on network None" for some plugins.
    "network None" is not correct enough here.
    
    Fixes bug #1203631
    
    Change-Id: Ie5d1ec99a2726ff3fec07f83f83a12d24613ae57

commit 335f4f0366e78573b7a6f9d051248b363fdc3f9b
Merge: afb56c4 b0232ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 03:50:35 2013 +0000

    Merge "Remove last of assertEquals"

commit afb56c44946de588b5c46867c4d02d20541f5a76
Merge: 758f3c6 e31c9fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 03:48:16 2013 +0000

    Merge "defer firewall updates to iptables data structures"

commit 758f3c612470127afed3ff769c15c3feaa6c9e53
Merge: 841301e 4e9b8bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 02:04:02 2013 +0000

    Merge "Fix logic for building field_list in update"

commit 841301edd9e19bd191cdec82ab9cf9a53dd094ef
Merge: ef0405a 1584005
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 31 02:03:53 2013 +0000

    Merge "Fixing some typos found during translation"

commit b0232ceff24ad51bcd4ad6ce08ea0736576abebf
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jul 30 18:30:55 2013 -0700

    Remove last of assertEquals
    
    Change-Id: I6411563df90235e1fea0760e1550b705d4fd7182

commit ef0405a39b3bff067b03db92e347b52f9c35018c
Merge: e0fca20 270fd80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 23:11:45 2013 +0000

    Merge "Separate NVP create lport operation and neutron db transaction"

commit e0fca209665abae49242ae7e8392f16ed85183ad
Merge: ba82733 c2a8294
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 23:04:30 2013 +0000

    Merge "Add default route to dhcp agent netns."

commit cce692dc528290dda19ef70b9bb6e2dab5018abd
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jul 24 16:35:24 2013 -0700

    Fix test fail in neutron.tests.unit.test_security_groups_rpc
    
    If running:
    
    tox -epy27 neutron.tests.unit.test_security_groups_rpc
    
    Tests fail with: DuplicateOptError: duplicate option: root_helper
    as this is already registered and can be removed.
    
    Fixes bug: 1204700
    
    Change-Id: I8b591357988c5546ae55b6531cf1786b7eb84e20

commit ba82733dd20434c7a9b301530ff5e706f0066a4f
Merge: 54beb19 b9726b0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 30 20:58:52 2013 +0000

    Merge "Imported Translations from Transifex"

commit b9726b05fb0873f8371f658cf53319621154fd8b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 30 19:55:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I580ef2f72510fbc330cf5cffa1acf3248ad4a3e9

commit 54beb19acc8b820e8a8ac03bb544e85d542a6e48
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Tue Jul 30 21:56:12 2013 +0400

    Fix ill-formed column definition in migration downgrade step.
    
    fixes bug 1206612
    
    Change-Id: I64a5850cfef28cc4c7f32bdbf50420dc92e4e6f5

commit 7856f68ec3229d0f7bf177532022a32b6543730d
Author: Swaminathan Vasudevan <swaminathan.vasudevan@hp.com>
Date:   Mon May 20 07:00:21 2013 -0700

    VPN as a Service (VPNaaS) API and DataModel
    
    implements:blueprint VPNaaS-Python-API
    
    It provides the basic API and
    DataModel for the "VPN As A
    Service" feature that includes:
    * VPNService
    * IPsecSiteConnection
    * IKEPolicy
    * IPsecPolicy
    
    Change-Id: I059d4db05118a4eecd388b8e8db0d714a8f9cb8f

commit 331b1d4ee25604959e9ab39d6185300f33ff5b72
Merge: 6ec7b25 a5a88c7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 17:31:09 2013 +0000

    Merge "Firewall as a Service (FWaaS) APIs and DB Model"

commit 6ec7b25bc432c7316a94dc0b2f8ef70ba2f1670b
Merge: c0d3c58 a8dca28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 14:58:11 2013 +0000

    Merge "Update to latest oslo rootwrap"

commit 49e953a8ef9d552e9c5be1e2e807634c68af5c5f
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Mon Jul 29 22:07:19 2013 +0900

    Make NEC Plugin keep error resources
    
    NEC Plugin used to ignore OFC errors while deleting resources from OFC,
    and it could leave some unused resources on OFC. If OFC generates id
    which is in remained resources when creating new resource, it will fail.
    
    This commit makes NEC Plugin keep logical resource when it failed to
    delete resource from OFC not to leave orphan resource on OFC, and raise
    exception to tell the user that the resouce status is Error.
    
    NOTE: The user can retry deletion. If the resouce was successfully
    deleted from OFC in retries, the logical resource will be deleted.
    
    Fixes: bug #1206416
    Change-Id: Ifea38dfe3fe8b18d7ae1cedf86a23008549250cc

commit 1584005b23bed9139a0ba38f757766053ced14b4
Author: Gabriel Wainer <gabrielcw@gmail.com>
Date:   Mon Jul 29 21:55:06 2013 -0300

    Fixing some typos found during translation
    
    Change-Id: Ic0e9ea6aa84c30996b29dce3bfa06b443e9adcc4

commit 270fd80391ea1dd8f3be13d38df81be71ae751ee
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 10 14:44:12 2013 +0200

    Separate NVP create lport operation and neutron db transaction
    
    Bug 1200001
    
    This patch removes the NVP call for creating a logical port from
    the SQL transaction context used for creating the Neutron port.
    It also ensures orphaned data are properly removed from both
    the Neutron DB and the NVP backend.
    
    Change-Id: I028a1493ecf732f2422e0eaa2020bac4ebdbb457

commit 4e9b8bc3c60cd22ca4c96baa70ab72f9206fe4d5
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jun 25 16:36:20 2013 +0200

    Fix logic for building field_list in update
    
    Bug 1194520
    
    Change-Id: Ie3ea7b77dc9a4f712e3e838c20c062db1b2d9faa

commit a5a88c7ed30deea47a4e1f63bb29523bc0af36d0
Author: snaiksat <sumitnaiksatam@gmail.com>
Date:   Thu May 9 21:31:17 2013 -0700

    Firewall as a Service (FWaaS) APIs and DB Model
    
    Implements: blueprint quantum-fwaas
    
    blueprint: quantum-fwaas-plugin
    
    This is the first iteration of the FWaaS implementation and
    is geared towards implementing the model that will be
    required to at least address the reference implementation.
    
    This iteration will not include implementation of the following
    features:
    * grouping or dynamic objects
    * application/service objects
    
    Change-Id: I57a62d6e9d3f1e6c4dd44cd5c745710a3d9e488e

commit c0d3c5864ce461133035745be6b580066ee726d9
Merge: 48f214c e08e959
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 30 00:07:16 2013 +0000

    Merge "Clean-up in the unit tests for NVP plugin"

commit 48f214cc2590ed1b6de316186c4be51cafa10aff
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jul 29 19:55:41 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2ea5d3340d3c5cd3baf901c31252375aff4c2a1f

commit a8dca282dc0fc66b16a4112b691791ae0655c64f
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon Jul 29 17:39:49 2013 +0200

    Update to latest oslo rootwrap
    
    Update Neutron rootwrap to the latest from oslo-incubator. This allows
    to get rid of the DnsMasqFilter (which was already replaced by
    EnvFilter) in preparation for the havana release, as well as get a few
    bugfixes.
    
    All the changes are coming directly from the Oslo "rootwrap" module
    sync.
    
    Change-Id: Ic373710cce0716323f4349414bb5b231f48d9177

commit e08e959834ee2c0685bf594421216ebf58da2d2f
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Jul 24 16:03:49 2013 -0700

    Clean-up in the unit tests for NVP plugin
    
    Simplify and reduce duplication in the unit test framework
    for the NVP plugin.
    
    Fixes bug 1204694
    
    Change-Id: Ia96e1c2386ac013c24a2c7716d0e97ea6fdcf5d1

commit e31c9fd3fed661e850fb149bf3005051e3a7c7f8
Author: Peter Feiner <peter@gridcentric.ca>
Date:   Wed Jul 24 20:12:48 2013 +0000

    defer firewall updates to iptables data structures
    
    One of two patches that fixes bug #1194438.
    
    In the iptables firewall driver, each port method (update_port_filter,
    prepare_port_filter, remove_port_filter) makes O(N) calls, where
    N=len(firewall.ports), to IptablesManager methods that update dozens
    of data structures. When the firewall methods are called in sequence,
    e.g., by SecurityGroupAgentRpcMixin, the calls to IptablesManager's
    methods start to add up.
    
    This patch changes IptablesFirewallDriver to defer and coalesce calls
    to IptablesManager. Now a sequence of M port method calls results in
    O(N) calls to IptablesManager methods instead of O(N*M) as before.
    
    Change-Id: If17eeaec197beae8b8aecffca1f19d4535a7226e

commit ca421e7e626f2f2e8fe2a3d567fa6f828dbff709
Merge: f11dbbe 2be27ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 09:39:43 2013 +0000

    Merge "Fix creation of trusted queues for the NVP plugin."

commit f11dbbe748980d3ddcad298b2b8fea579d93f1e0
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Fri Jul 26 12:01:08 2013 +0800

    Sync dhcp agent configuration items
    
    Implements: Bug #1205180
    
    Change-Id: Ic5089087fb6dd7d71740556ab8d3d4d6b82920d1

commit 7218ed2d58bbc7e8cc0d6dca946fdb69faac6f04
Merge: e12ed79 0f4f315
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 29 03:23:19 2013 +0000

    Merge "Fix l3_agent unit tests"

commit e12ed79936be652ca0229342f0997b686d4bf19f
Author: Tom Fifield <tom@openstack.org>
Date:   Sun Jul 28 11:35:01 2013 -0700

    Update references with new Mailing List location
    
    Yesterday, openstack@lists.launchpad.org was migrated with
    all users to openstack@list.openstack.org.
    
    This patch updates references to the old mailing list with the
    new, to ensure that people encountering them don't accidentally
    try and join the old list!
    
    Change-Id: Id52268cc077bcc89e345a1cd28203ce2fce75db7

commit 2be27ae096104f9340e7a73a3d519c338c821234
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jul 23 14:19:27 2013 -0700

    Fix creation of trusted queues for the NVP plugin.
    
    Currently if an admin tries to create a trusted queue, Neutron will
    fail with MissingDSCPForTrusted exception. However, the NVP semantic
    is exactly the opposite, namely the DSCP field must be specified for
    untrusted queues and omitted trusted ones.
    
    Fixes bug #1204256
    
    Change-Id: I935fab45fc811a296411283a641b66c5ca96264d

commit 52e06310257c175ba77da1254319408d4821e3bf
Merge: ead9a26 c1b1af7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 18:21:53 2013 +0000

    Merge "ML2 tunnel drivers validate provider networks correctly"

commit ead9a26ff0b7edbd2e0af0f6478022c385b3d36e
Merge: 6c925fb bfdf526
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 16:09:29 2013 +0000

    Merge "NVP sample config option should match code."

commit 6c925fbadc811e180af1531c1f321301cbb3f54d
Merge: ad78a88 f81fe3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 16:09:21 2013 +0000

    Merge "Deal with intermittent OverflowError in gate-neutron-python26"

commit c1b1af72e93da37383d6111195bfc8c63cc49fae
Author: mathieu-rohon <mathieu.rohon@gmail.com>
Date:   Thu Jul 25 10:38:16 2013 +0200

    ML2 tunnel drivers validate provider networks correctly
    
    there was a copy/paste error in GRE/VXlan type drivers implementation.
    the segment wasn't returned while validating the provider network.
    
    Change-Id: I7df6d2e714d09618644f935a9ed41354b62de9d0
    Fixes: bug #1202244

commit 76fc0addc985195dc6fddd78c9030cc5d24cfe88
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Tue Jul 23 13:21:24 2013 +0800

    refactor port binding codes
    
    Bug #1195047
    
    This patch:
    1. removes the iteration in get_ports to call extend_dict_binding
    2. uses a unified way for plugins to do this kind of stuff
    
    ml2 will enhance the binding so that it can have different binding
    for port according to port's host.
    mlnx and bigswitch are also exceptions due to the dynamic binding info.
    
    Change-Id: I5a77eb7395e14482a856e033f536f72a1bf82e06

commit e4ddee8e826b14011efc3631d8b03f25027f3dbb
Merge: 32ad89f d88ea97
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 08:04:52 2013 +0000

    Merge "Ensure that L3 managed port have status ACTIVE"

commit ad78a887ab3a2891ebed98bda9b60547e2a2d986
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Jul 26 11:48:22 2013 +0400

    Fix migration branch appeared after recent commit
    
    Fix migration branch introduced by commit that added
    providernet extension support for cisco plugin
    
    fixes bug 1205229
    
    Change-Id: Id0f364316f19e077a388d4a343d1042a287fa96a

commit 0f4f3150f4c2a2bba8712e3439a02337eb726a2b
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Jul 26 00:45:10 2013 +0400

    Fix l3_agent unit tests
    
    Mock FixedIntervalLoopingCall in unit tests so
    _rpc_loop doesn't interfere with the tests
    
    fixes bug 1205085
    
    Change-Id: I54cc152890734afc7a5b86dd9ae4ea133bd7574b

commit 32ad89fd8a66c50181f47f1c593080f5f27aeb47
Merge: fe89774 d6cddd4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 06:49:42 2013 +0000

    Merge "do not raise exception on ip address recycle operation"

commit bfdf52672c019a7705a53bdb0fe8aba38ef937db
Author: Nick Bartos <nick@pistoncloud.com>
Date:   Thu Jul 25 19:48:42 2013 -0700

    NVP sample config option should match code.
    
    Fixes bug #1205169
    Change-Id: I894ce7b2a733127fe2185833f6407c0391eb9e2a

commit f81fe3ed5884616255d4eace358ff4dc9fd23ad8
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Jul 24 17:35:28 2013 -0700

    Deal with intermittent OverflowError in gate-neutron-python26
    
    This occurence looks like is related to a failure in
    utils.execute. This patch attempts to deal with the error
    by mocking out Popen.communicate altogether.
    
    Fixes bug #1202065
    
    Change-Id: I4092efb17939b69dd2d1965aaf619a9b2be03ef4

commit fe897743cb4bcc06f2566b28d42620e102060973
Merge: 473a9b5 d104fd2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 26 00:00:06 2013 +0000

    Merge "Allow to clear extra routes from router"

commit 473a9b501b1a7f3c25c1a1e02a818c3964189acc
Merge: eb753f7 1b36e20
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 22:06:07 2013 +0000

    Merge "Service Type Framework refactoring"

commit eb753f74cf7d94c15af312c79ad730370259cf66
Merge: 85e4262 5808a65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 22:05:59 2013 +0000

    Merge "Allow OVS default veth MTU to be configured."

commit 85e42622c593e6b4ef027adb2628b7a8d45902df
Merge: 0315fe2 8f81d21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 22:04:06 2013 +0000

    Merge "Passing the error message as keyword argument"

commit 0315fe22a9b28f5025bf3beb77e7ae8ba41e5334
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jul 25 19:55:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9bb42699713d030078b11a84a99f984ab702369b

commit d88ea97228ec8bb38f071c3969fdbb3abf6ab575
Author: Gary Kotton <gkotton@vmware.com>
Date:   Thu Jun 20 11:04:59 2013 +0000

    Ensure that L3 managed port have status ACTIVE
    
    Some plugins may set the port status as DOWN when it is created. This was not
    updated when the port was actually up. This patch ensures that gateway and
    router ports that are created will be set as ACTIVE when they are actually
    up and running.
    
    Ports that are attached to additional bridges in the OVS will only update the
    port status as ACTIVE. There will be no tags set on the specific ports as this
    will break the existing functionality.
    
    Fixes bug 1192883
    
    Change-Id: I9993f56963ac704f0f345102d2e8b2d99dd9ad9e

commit 1b36e2077141749495bb32b423f3df8cbbd0eb40
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sun Jul 7 10:50:56 2013 +0400

    Service Type Framework refactoring
    
    implements blueprint service-type-framework-cleanup
    
    * Defines logic and API for ServiceProvider - read-only entity
    that admins provide in configuration and which is stored in memory
    * ServiceType entity which maps to ServiceOfferings in new terms
    is removed for now.
    * Routed service insertion fixed to not to refer to service providers.
    * In case configuration changes and some service providers are removed
    then the resources must be cleanup in a special way (undeploy logical
    resources). This is a matter of future work
    * Add migration.
    
    Change-Id: I400ad8f544ec8bdc7d2efb597c995f284ff05829

commit 3d5bec962c1e5bb923107f54585c94a9b24f2d30
Author: Stephen Ma <stephen.ma@hp.com>
Date:   Thu Jul 25 07:25:48 2013 -0700

    Dhcp agent sync_state may block or delay
    configuration of new networks.
    
    Fixes Bug 1202722
    
    Change-Id: I368cb064057d48be1491df6825cc67c265706b50

commit 450174b103c89d0cbac3b44840edcb8b1192674c
Merge: 5658b59 4a8c3af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 25 14:26:56 2013 +0000

    Merge "Add support to the port binding extension for the NVP plugin."

commit 8f81d21ef144f93a9d4f71624d5c0b8b65a1f4d1
Author: sysnet <sysnet@sysnet28.sysnet>
Date:   Wed Jul 24 19:50:04 2013 -0400

    Passing the error message as keyword argument
    
    as expected by the base exception class
    (OpenstackException) which does not accept
    any positional arguments
    
    Fixes: bug #1204321
    Change-Id: I320807f6f629fc337a612ad2f9c55ae2c156cfd9

commit d6cddd430c237c9496a97978070e6891d4625d00
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Wed Jul 17 03:00:23 2013 +0000

    do not raise exception on ip address recycle operation
    
    Currenty a exception will raise on ip address recycle operation if the ip
    address doesn't belong to any allocation pool which will make user unable
    to update port, even worse it will make user unable to create new port.
    So do not raise exception if the ip address to be recycled doesn't belong
    to any allocation, just delete it from the ip allocation table.
    
    fixes bug 1201692
    
    Change-Id: Icfbded5158f1f4043f69bb1463fd4c830c9714a9

commit 5658b599d0cdddf5c3d578d9247126bd48b8b441
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jul 24 16:43:21 2013 -0700

    Fixed miss spelled updated in test name
    
    Change-Id: I1df4fe57f50332332c70badf4bc6a6c1c8d5636c

commit 60bd2997f27c52abce89b10a0d01ae9541919a2f
Merge: 8fb3f48 731401e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 22:24:45 2013 +0000

    Merge "Providernet extension support for the Cisco Nexus plugin"

commit 8fb3f4889fc1c88fcdc982a7cd11e66c7f2a9047
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jul 24 19:55:13 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0016fe61920c65c48d5e50c396669b8399e2c387

commit b1311a3ab8677b352aec63c553726f5e44d681d7
Merge: b686644 acebf76
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 19:41:08 2013 +0000

    Merge "Fix DHCP agent to work with latest dnsmasq"

commit b68664491627fe32d39653b93a0e318a4da8be52
Merge: ed0b40b 7f0ba38
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jul 24 18:15:09 2013 +0000

    Merge "Imported Translations from Transifex"

commit ed0b40b463a627d50cbf7be70e47f41f0c6079dc
Merge: f9a14a4 a669a91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 18:14:58 2013 +0000

    Merge "set static route for windows 2003"

commit f9a14a490b359ddd9a99dffeed3140967554d16f
Merge: 1d90d0a 1c8e5f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 18:14:50 2013 +0000

    Merge "remove "get_agents" rule in policy.json"

commit 1d90d0aa758deab5647765e18574811286fb506a
Merge: 85dc410 078a73c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 24 18:14:42 2013 +0000

    Merge "Remove use_namespaces option from etc/lbaas_agent.ini"

commit 85dc410ef8f79366931bc754440039d265f8a6b4
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Mon Jul 22 09:01:30 2013 +0000

    remove netifaces dependency of ryu-agent
    
    Fixes bug #1203663
    
    This patch removes the netifaces dependency.
    
    Change-Id: I0970ca7d8c92fcd1c3dfaded4a9ce6e82b8c033f

commit 495fd24fb0a776c207c36d437cb31e0d8807774a
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Jul 18 13:13:05 2013 +0200

    make neutron-ns-metadata-proxy configurable
    
    Introduced a new configuration parameter for DHCP and L3 agent
    to be able to set the path of the metadata socket to be used
    by neutron-ns-metadata-proxy when started inside the DHCP or L3
    agent. Also moved the configuration parameter of the
    neutron-ns-metadata-proxy to the CLI parameters.
    
    fixes bug #1202628
    
    Change-Id: I3b1aa72b4e06c00f7fed152f0ee03d52b6bbc279

commit acebf769a41a9a55cdc6789bf4962ea64cf87773
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Tue Jul 23 15:17:20 2013 +0000

    Fix DHCP agent to work with latest dnsmasq
    
    The latest dnsmasq no longer accepts hostnames which begin with a number. This
    affects Fedora 19 right now, and will mean Fedora 19 will not work with Neutron
    DHCP. dnsmasq should work with hostnames beginning with a number (RFC 1123 says
    this is valid), but until this is fixed, many users will be left unable to use
    Fedora 19 with Neutron.
    
    This patch adds a "host-" prefix to each hostname entry generated by the DHCP
    agent. This fixes the issue in Neutron.
    
    Fixes bug 1204125
    
    Change-Id: I0e29ec033969c3fb958ed3a12b8962b73b0e3d94

commit 731401e59c11755f2de457a95719478f7035ccba
Author: HenryGessau <gessau@cisco.com>
Date:   Tue Jul 9 10:49:40 2013 -0400

    Providernet extension support for the Cisco Nexus plugin
    
    Implements blueprint provider-network-extensions-cisco
    
    Change-Id: Ia22c21a7a66d22040811a9b43e7749892405e5e7

commit 7f0ba38b0f47629d239ea6f67beafac2b89d727f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 23 19:55:14 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iecab3832ba9fd65099b354d5bf9f80d1a063a762

commit b5d1c993de542927632feb530c0e86fcba2d8005
Merge: f10777b b40edd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 19:24:51 2013 +0000

    Merge "Clean up Cisco plugin config parameters"

commit f10777b3980e4bf243caa3954e12a653b506805b
Merge: c596888 4bd7bea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 19:24:43 2013 +0000

    Merge "LBaaS: add delete_health_monitor() to driver API"

commit c596888f0734c9d18ed3eabeff859a3946a9d000
Merge: 7eec32b 9b0ccf6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 19:24:36 2013 +0000

    Merge "remove policy checks in port_security tests"

commit 4a8c3af72f9b9385556abdc9681368d6a1db8ad4
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jun 4 15:45:06 2013 -0700

    Add support to the port binding extension for the NVP plugin.
    
    Also, this patch removes the non-serializable object for
    port profile. This went undetected for quite some time.
    
    Implements blueprint nvp-port-binding-extension
    
    Change-Id: I380570f08e92f75d6431dcda6fac2a770887bb48

commit 5808a65fa12be096278f3793909a62bf1d79e82b
Author: Jun Park <jun.park.earth@gmail.com>
Date:   Fri Jul 19 11:58:00 2013 -0600

    Allow OVS default veth MTU to be configured.
    
    In some environments where a packet is dropped when a VLAN tag is
    added to the packet, you need to increase the MTU size of veth
    interfaces to 1504.
    
    Fixes: bug #1075336
    Change-Id: I4f03b4cdc571a462096d419d6dd8324cf096156b

commit 7eec32bb6e5dfafbdbf59f1c9873f785cc28f7e4
Merge: 1a0be97 95a63d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 16:15:29 2013 +0000

    Merge "Fixes Opt type of "topologyname""

commit 9b0ccf6125809a5a568926101a04b52ed69a269d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Jul 22 18:33:10 2013 -0700

    remove policy checks in port_security tests
    
    This patch removes the unneeded policy checks in the port_security_tests
    that are now done in the policy engine.
    
    Fixes bug: 1203925
    
    Change-Id: Iee8a2f4e8a8fdbb5e070b4bab78f7c6ba21daba1

commit 1a0be976d8421ab4fc5e6ff4f57b51ba8f143005
Merge: 1b3a505 7b69d98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 14:10:19 2013 +0000

    Merge "nvp plugin rxtx_factor readonly update port"

commit 1b3a505a0154a83d36c7baba1496289b163e98c1
Merge: d79d092 b6d787c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 05:54:51 2013 +0000

    Merge "Cisco plugin check for a valid nexus driver"

commit 1c8e5f1d3bfd9ced27f0a314538db41e04bc874c
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Tue Jul 23 11:09:45 2013 +0800

    remove "get_agents" rule in policy.json
    
    Bug #1200933
    
    keep the current API behaviour due to compatibility
    and leave list op authz in new API version.
    
    Change-Id: Ia0a9b8738fa8ffe913d2e2b1ef28232abb18340d

commit d79d092aff4b24a374553bb01f6199137b42830d
Merge: d766f1f c98ec24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 23 02:01:42 2013 +0000

    Merge "GRE tunnels should include local_ip."

commit d766f1ffdfaeabe4d9aa6d78259a5f167fa7cc45
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jul 22 19:55:14 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iccd8aff56e7bf6ba45ab4ddc15aef05f1ab9ed30

commit 4bd7bea0dbb54b6ed287f21ab7a6d65b177f017c
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Fri Jul 19 17:00:13 2013 +0400

    LBaaS: add delete_health_monitor() to driver API
    
    Currently there is create_health_monitor() in the driver API so
    a driver may create an object on device but there is no delete_health_monitor()
    and monitor objects will remain on device forever.
    Driver should at least call plugin to delete a db object.
    
    Fixes bug 1198996
    
    Change-Id: Idcdaea0636e01381064983d8de5bfe3936357fb9

commit 5294b8a90c7a6a9c1d149b03c6fcb2dc51f04241
Merge: aa39de6 da65fe6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 22 06:21:04 2013 +0000

    Merge "Add agent scheduling for LBaaS namespace agent"

commit aa39de6b31c14a24cb9f52f10758108faa69a9aa
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jul 21 19:55:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ieabd6279524cbb26c3ae093550840f13c0e584f0

commit a669a910b9a411cdd0e6b3914a214014ed126289
Author: Peng Yong <ppyy@pubyun.com>
Date:   Wed Jun 12 10:05:03 2013 +0800

    set static route for windows 2003
    
    Fixes: bug #1190108
    
    Change-Id: I97266cf007d2a5d7ca8080d83bdfadd121d0fbeb

commit 5256ad49aedfe6c3768335e3592df3436f0bed12
Merge: a7c23c3 6cb8672
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Jul 20 21:33:28 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6cb8672eaf02d6e47158e8da4eac8bb95910e3b5
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Jul 20 19:55:42 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Idb25d3056791dced787695f8dea4720b8652235a

commit a7c23c3247ac3acafaef26c9b8f16bdd007e3a13
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri Jul 19 18:50:26 2013 +0200

    Add help strings to Config Options
    
    Add an help string to the config options
    
    Change-Id: I9248a335db961aa5d776a545dcfba0ddb0f08bb2

commit c5b903b2a462e47114a52eca4d297ce98a94ba49
Merge: ce013f2 59fe071
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 20 02:29:55 2013 +0000

    Merge "Avoid refreshing firewall rules unnecessarily."

commit c2a829458ddbbb0c8ee4d937cc726416eeb457bc
Author: Lianghwa Jou <lianghwajou@gmail.com>
Date:   Wed Jul 17 22:24:29 2013 -0700

    Add default route to dhcp agent netns.
    
    Remove code block "if self.conf.enable_metadata_network:". No need to treat it
    differently. Default route will be set as any other network.
    
    Change-Id: I71eaaf46bbd01f577988211b650fdbe3972d1fa0
    Fixes: bug #1196889

commit ce013f2875ffe850fad285ed36cf4cde5a85dbc3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jul 19 19:54:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2c8877e5987b5251bf59680d77c281dde895e58c

commit 59fe0711dfd551739d5f5f98d05ffaf329467c07
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Tue Jul 16 18:10:37 2013 +0000

    Avoid refreshing firewall rules unnecessarily.
    
    Adds a parameter to refresh_firewall allowing an array of ports to
    be passed.  If an array is passed then the firewall will be refreshed
    only for those ports.  If not passed, it will still refresh all
    ports as it did before.
    
    Change-Id: I539a135dbc3861e31cbb5c69cef0ff8c0f834527
    Fixes: Bug #1202328

commit 21347901a08296414fe90b63ca597637b279c32b
Merge: f341ad5 375d8be
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 15:33:49 2013 +0000

    Merge "remove repeated allocation_pools check in unittest"

commit da65fe6951531146113185726dd0c955aa3df75d
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Wed May 29 11:58:17 2013 +0400

    Add agent scheduling for LBaaS namespace agent
    
    - adds simple chance scheduling on create pool operation
    - adds PoolsLoadbalancerAgentBinding db table
    - adds lbaas_agentscheduler extension to list pools hosted by a particular agent
      and to get an agent hosting a particular pool
    - adds agent notifiers mapping to AgentSchedulerDbMixin to make it easier
      for services to add their agent notifiers to the core plugin
    
    Implements blueprint lbaas-agent-scheduler
    Change-Id: Id98649fd5c7873dcd5be1a2b117b8bed25f06cc2

commit f341ad570313e619ae8d75d611f0d4fcbc285cb9
Merge: 2291f29 713838e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 08:55:20 2013 +0000

    Merge "Fix revision branches appeared after merging recent patches"

commit 2291f29dc6c1fd25b48a65023a49155ec4fa1e63
Merge: 2c44e76 a1e483d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 06:39:35 2013 +0000

    Merge "Add support for the agent extension to NVP Plugin."

commit 2c44e76095af95955a29cd79438a7f06cff3ff6a
Merge: 0f12912 c2427c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 19 04:20:20 2013 +0000

    Merge "Add decorator helping to log method calls."

commit 0f129121a1c8331c702204cf95951444ae53ef9c
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Jul 18 17:53:18 2013 -0700

    Allow to clear extra routes in NVP
    
    Since the neutron client can unset any attribute, ensure
    we can handle empty routes as a way to clear the extraroutes
    for the router.
    
    Fixes bug #1202890
    
    Change-Id: Ib240a42ba1075d9a410da904b3d3ae9e19b2d86e

commit d104fd2e21d3a90e5fe7f94e728df0c6dc4619ff
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Thu Jul 18 12:09:13 2013 -0700

    Allow to clear extra routes from router
    
    Ensure that we can handle None field for routes as no
    neutron client has the ability to clear arbitrary
    fields.
    
    Some refactoring for the unit tests is done to reduce
    duplication.
    
    Fixes bug #1193143
    
    Change-Id: I067e70ee87354e50a5a7d91c383449464bb33eb0

commit d364d03127dae01f4788b10304c629a9b3f2ce72
Merge: 6d300d9 7fe0de8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 21:37:49 2013 +0000

    Merge "Update the ML2 README file with the latest tunnel changes"

commit 713838e24cfd1a0cfdbedf20b08da15e82cd60e3
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Jul 19 00:35:37 2013 +0400

    Fix revision branches appeared after merging recent patches
    
    The branch was introduced with "Add status description field for lbaas objects"
    
    fixes bug 1202859
    
    Change-Id: I59394fa2c4d8cee84ce7040a9d03288ec1e4bab4

commit b6d787cdc32445858b1a2e89fd373790103444c2
Author: Arvind Somya <asomya@cisco.com>
Date:   Thu Jul 18 16:03:22 2013 -0400

    Cisco plugin check for a valid nexus driver
    
    The Cisco plugin model should check for a valid Nexus driver before performing any
    operations on hardware nexus devices.
    
    Change-Id: Ib7760cc7bb24e2c7f6692cbd8274aefa71dc21a1
    Fixes: Bug #1202822

commit 6d300d93d38daf0ae61108ecd8c73556c60cdbcf
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jul 18 19:55:06 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iceac6cb82323287bfcd9c9ee8c80519125f63490

commit a1e483d049a104a8475febc828107c4b323f6def
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Jun 26 12:13:49 2013 -0700

    Add support for the agent extension to NVP Plugin.
    
    Of DHCP and L3 agents, NVP uses DHCP; This patch adds support
    for the extension to this plugin.
    
    This patch also moves some tests around, as a result of the
    refactory done in https://review.openstack.org/#/c/35266/
    Some code duplication is also removed.
    
    Implements blueprint nvp-agent-scheduler-extension
    
    Change-Id: I4ca1148e81fdb39bf6b58eef806536439e9f0c6f

commit c98ec249614b44d8e1a44cb07903338c3056e772
Author: Adin Scannell <adin@scannell.ca>
Date:   Mon May 27 13:21:42 2013 -0400

    GRE tunnels should include local_ip.
    
    This addresses the issue of having one or more multi-homed host.
    
    Because you may only specify one local IP for a quantum agent, and
    other hosts could be routed across different subnets (even for small
    installations, for various reasons), it's important to also specify
    the used local_ip when setting up the GRE tunnels. As long as the
    address is routable on both ends, this will work. If the local_ip is
    not specified, then traffic will mysteriously be dropped on one end
    where the IP does not match the expected IP in the GRE tunnel.
    
    Bug: https://bugs.launchpad.net/quantum/+bug/1184696
    
    Change-Id: I5d612bf9e4f6652af8b155cdd1748d73ac4539ff
    Signed-off-by: Adin Scannell <adin@scannell.ca>

commit b40edd1d00c651daa698883c6bd87c8ce40f216b
Author: HenryGessau <gessau@cisco.com>
Date:   Wed Jul 17 17:23:06 2013 -0400

    Clean up Cisco plugin config parameters
    
    Fixes: bug 1201537
    
    Change-Id: Ibb5a9a12ee451c317ae747924b336ffa044a20b1

commit 7fe0de83280e549eb46882e99cffcffbd2fb589b
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Thu Jul 18 10:47:20 2013 +0000

    Update the ML2 README file with the latest tunnel changes
    
    The ML2 README file was slightly out of date with all of the H2 changes
    which went in around GRE and VXLAN tunneling. This patch updates it to
    reflect what the code is capable of currently.
    
    Fixes bug 1202743.
    
    Change-Id: I578c1b62115f298c9de32d62161171fd2f3f5b7c

commit a8e4cb916ca94a442f2104696707267b1d680de4
Merge: a803154 1761fce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 10:05:43 2013 +0000

    Merge "Register agent schedulers options in one place"

commit a803154d681595c0903bd09216c30b3ed6726be8
Merge: f9665c9 32e5b05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 10:05:36 2013 +0000

    Merge "Add status description field for lbaas objects"

commit c2427c277368109b1ab747c3447e8c95f954733a
Author: Sylvain Afchain <sylvain.afchain@enovance.com>
Date:   Mon Jul 15 10:42:12 2013 +0200

    Add decorator helping to log method calls.
    
    Fixes bug 1201328
    
    Change-Id: I5c3a00c737903aa59cc6a2a248ee61aa53e54fbe

commit f9665c9d56144f384e6538a7584307c6dc8f3fdd
Merge: 0401524 b9900c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 08:33:43 2013 +0000

    Merge "port-update fails when using SELECT FOR UPDATE lock"

commit 375d8be9a6902a13ba1fd97f0f8863ebfb97e7ad
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu Jul 18 16:27:07 2013 +0800

    remove repeated allocation_pools check in unittest
    
    Change-Id: I902a225c5e06b05009b6d923167c4ac3d6fbf6b7

commit 04015245e83ba18ff0f8d7fb0ba2026bca34a625
Merge: 1bd4563 1f4e8a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 08:04:40 2013 +0000

    Merge "Apply Oslo ModelBase to NeutronBase"

commit 95a63d1b701b5b0c7fe731bf170ccd4f22de9fa6
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jul 18 15:31:14 2013 +0900

    Fixes Opt type of "topologyname"
    
    Changed topologyname from IntOpt to StrOpt
    
    Fixes bug #1202538
    
    Change-Id: I8cabf1868d5eac04dd31271932d5c4fadae78935

commit 1bd456371f9909d5cb33536e84a3fdd7aac40f8c
Merge: 7efd795 4a01e35
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 18 04:08:23 2013 +0000

    Merge "rename quantum into neutron"

commit 7b69d98e196a98295048d311786b9f23586dc4fd
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jul 17 14:56:16 2013 -0700

    nvp plugin rxtx_factor readonly update port
    
    The following change done in nova 7de916 started passing in the
    rxtx_factor on update port rather than just on create_port which
    is what we only originally supported. Therefore currently when
    booting a vm and specifying --nic port-id it will fail to boot with:
    Cannot update read-only attribute rxtx_factor. This patch is a work
    around to allow the rxtx_factor value to be passed in on update port even
    though we ignore the value. Later we'll implement updating rxtx_factor on
    ports but this is a good work around for now.
    
    Fixes bug: 1202406
    
    Change-Id: Iedd488b7bdc9b1a1317000d249f03b0eafbea419

commit 7efd7957a2125c4b079149cb5ba086f8b16e93de
Merge: 0b4ada8 dab95c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 14:50:02 2013 +0000

    Merge "LBaaS: update DB pool stats received from lbaas agent"

commit 0b4ada836c472c4f29a4d77084041721ec50d93a
Merge: 6aaf08e 8417fe1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 12:16:01 2013 +0000

    Merge "Improve lbaas haproxy plugin_driver test coverage"

commit 6aaf08edb3b7b28d5feeef4e1f803b19b0ee1769
Merge: 9104b4e aa3e64f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 09:06:28 2013 +0000

    Merge "modernize quantum config in proper place"

commit 9104b4edad28447727b9a4bf9491f1ae52eec081
Merge: 68a866e 0043044
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 09:06:19 2013 +0000

    Merge "Improve packet-filter test coverage in NEC Plugin"

commit 68a866e3cc36610eda7fca17572b77bab3d5c7e1
Merge: b58825a 28d6ca9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 09:06:11 2013 +0000

    Merge "Fixes argument mismatch in l3-agent"

commit 28d6ca99277b5f8edf61d03af07da0658fee920e
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Tue Jul 16 21:54:11 2013 -0700

    Fixes argument mismatch in l3-agent
    
    Fixes bug 1202055
    Also fixes deletion problem in snat rule
    
    Change-Id: I007a81003e343300836ad226c2dc64b95c5a3247

commit b58825af1ba5350da892c147b8235158ee11ce0d
Merge: 88f6d5e de19674
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 05:50:02 2013 +0000

    Merge "Fix argument name mismatch in L3-RPC sync_routers"

commit 88f6d5ec7cddc5884a2a21f0703320050c75ca3d
Merge: 4642f03a 81e8777
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 03:32:13 2013 +0000

    Merge "Add VXLAN tunneling support for the ML2 plugin"

commit 4642f03a9fbc1fa543991c9fb882c90f5cfd65f2
Merge: 7750c38 6bdfcca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 03:31:59 2013 +0000

    Merge "Add gre tunneling support for the ML2 plugin"

commit de1967452e935e8d78255c448715a588d19ae838
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Jul 16 17:05:19 2013 +0900

    Fix argument name mismatch in L3-RPC sync_routers
    
    In sync_routers L3-RPC method l3-agent sends router_ids but the
    server side expected router_id. This commit fixes the server side
    to accept router_ids, and drops "fullsync" arg from the agent side
    (fullsync is not used anywhere and it does not affect RPC signature).
    This change allows l3-agent to sync only the specified routers
    instead of all routers.
    
    Fixes bug #1201553
    
    As a result of the above change, auto_schedule_routers() and
    list_active_sync_routers_on_active_l3_agent() in L3 scheduler
    needs to handle a list of router IDs. This commit changes L3 scheduler
    to accept a list of router IDs in the above two methods.
    
    Also fixes the argument order of fullsync and router_ids in get_routers
    in L3PluginApi. L3-agent main code expects router_ids as the second arg.
    
    Change-Id: I22e8d11b9676cbcfe9e72449031bb63071be8314

commit 7750c38e12fa632f80ae05d5a2c7a5b561fa3788
Merge: 3ba25fa 60a392f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 17 01:50:55 2013 +0000

    Merge "Nicira NVP plugin support for l3_ext_gw_mode extension"

commit 0043044f2e8ee3de8a9995bdbf51aad77f1a3fa9
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Tue Jul 9 17:18:10 2013 +0900

    Improve packet-filter test coverage in NEC Plugin
    
    blueprint nec-plugin-test-coverage
    
    This commit adds unit tests for packet-filter in NEC Plugin.
    
    This commit refactors packet-filter in NEC Plugin.
    - Put packet-filter classes and methods into nec/packet_filter.py (a) and
      nec/db/packetfilter.py (b), NEC Plugin specific codes are in (a)
    - Change stateless methods to class methods in extenstions/packetfilter.py
    - Add 'convert_to' option to the attribute map of packet-filter to convert
      some string parameter to int at the api layer
    
    Also, this commit includes the following changes in packet-filter.
    - Fix attribute map of packet-filter; set in_port to allow_put=False
    - Add new methods to update attribute map properly
    - Make packet-filters ignore status of associated resource (network)
    
    Change-Id: I7c0b76afb603f1f078b28610181b16ce66225d37

commit 3ba25fa0601f411e05095bf350c0095ce3d60c8f
Merge: 70c2fcf 24e6ef3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 22:58:31 2013 +0000

    Merge "Limit min<=max port check to TCP/UDP in secgroup rule"

commit 70c2fcf1a0e6406c92f6916073810fdfe7e83afc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 16 19:58:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4fb77ed07b85b2f01ebb48b57adb10dfbadb3167

commit 078a73c6166fdd6f126feb8f7c7debf12b518159
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Mon Jul 15 09:42:12 2013 +0400

    Remove use_namespaces option from etc/lbaas_agent.ini
    
    fixes bug 1201249
    
    Remove option from ini file since it is nor registered nor used
    in lbaas agent.
    
    Change-Id: I611f794279fea4a4155309cd0668e3b9718221b1

commit 256e49b814ef03f195cdc0c6743271b7e976472e
Merge: 5f99588 47381ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 19:03:51 2013 +0000

    Merge "Enable logging before using it"

commit 5f99588e2a7c677a9059601e241adfef1faf04a8
Merge: c971426 ff48cc7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 18:40:35 2013 +0000

    Merge "xenapi - rename quantum to neutron"

commit c9714262eeb02058d7cf518c1791c6f4efb62441
Merge: aa083ce 7ce9bc9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 18:12:12 2013 +0000

    Merge "Enable policy control over external_gateway_info sub-attributes"

commit aa083ce5f7ac8a43f445ba70cd6a995a1bf96584
Merge: b99b020 57e1fa3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 16:46:17 2013 +0000

    Merge "Improve l3-agent performance and prevent races in it."

commit 7ce9bc96aba0fe7649465ca8cf9d517db366b4b4
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon May 13 13:12:46 2013 +0200

    Enable policy control over external_gateway_info sub-attributes
    
    Part 2 of blueprint l3-ext-gw-modes
    
    This patch extends the logic for building policy rule matches in order to
    include sub-attributes as well. This logic will be leveraged by the
    ext-gw-mode api extension.
    
    Change-Id: I7f46a395597b71bb1c5110aa4e792a04a5010d4c

commit aa3e64f9125e4c41de90213b75b2826bfd663527
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Sat Jul 13 16:11:08 2013 +0800

    modernize quantum config in proper place
    
    Bug #1200558
    
    At the beginning, we have not registered some configuration
    items. To modernize these items, we must do it after we register
    them.
    
    Change-Id: I90d2cdbe97daa2ec0a8c8b6c9686b6f76c4de9e4

commit 6bdfccaf1b011a9354ef82a73500e6ce0967b2ed
Author: mathieu-rohon <mathieu.rohon@gmail.com>
Date:   Tue Jul 16 13:24:25 2013 +0200

    Add gre tunneling support for the ML2 plugin
    
    This patch add the type_driver GRE to enable the creation of GRE
    tunnels with the OVS agent.
    No Endpoints ID are managed. Only Endpoint IP are stored in DB,
    and this IP is proposed as an endpoint ID for the OVS agent.
    It also fixes the bug 1201471.
    
    Implements: blueprint ml2-gre
    Change-Id: I1a33a4bd3ebc4c97eecf17a59ce16b8c2066ec66

commit 81e87775c8ab56c4b4c7b5048041caef7670bc9d
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Wed Jun 26 07:13:32 2013 +0000

    Add VXLAN tunneling support for the ML2 plugin
    
    Add an ML2 Type Driver for VXLAN networks to allow the creation
    of VXLAN networks with the OVS agent.
    
    Change-Id: I7fcc384cc44d5adc752510847d8ba5f46bbb79fb
    Implements: blueprint ml2-vxlan

commit 57e1fa32648a28ae83e3c3033258fe08de2e5fca
Author: Nachi Ueno <nachi@ntti3.com>
Date:   Fri Jul 12 12:21:46 2013 -0700

    Improve l3-agent performance and prevent races in it.
    
    Fixes bug 1194026
    Fixes bug 1200749
    
    Introduce a looping call for performing synchronization with
    neutron server.
    The sync will be performed only if router changes are notified
    via rpc. Only affected routers will be synchronized.
    
    Changes will be implemented by the l3 agent spawning a
    distinct greenthread for each router - iptables will
    be executed only once using iptables_manager.defer_apply_on.
    
    This patch will prevent the occurence of the following issues:
    - Out-of-order rpc message processing
    - Long processing time for router changes due to serial execution
    - Occasional and expected RPC blocks for long periods
    - Unnecessary processing of multiple requests
    
    Change-Id: I0978d1c38ac5c38c4548e5b1877857bb5cac3b81

commit ff48cc7d030b5f8ca33a7bd3af38eb8be6d39995
Author: Mate Lakat <mate.lakat@citrix.com>
Date:   Mon Jul 8 11:11:16 2013 +0100

    xenapi - rename quantum to neutron
    
    Some changes were missing from the previous rename patch, so it broke
    XenServer support. This patch contains the missing adjustments.
    
    related to blueprint remove-use-of-quantum
    
    Change-Id: I1ee5cc38d555bd5c26edf00a456ec71919604d79

commit dab95c486180bdd23ead4c916cbccece052b57fa
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Jul 16 13:02:02 2013 +0400

    LBaaS: update DB pool stats received from lbaas agent
    
    Fixes bug 1201401
    
    Change-Id: I84e2fbdb3e6368529c1d829d4e8134e6b0b54311

commit b99b020b297e9407889ae254a57234add31a3f5f
Merge: b454674 dcb94c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:30:07 2013 +0000

    Merge "Use the correct tunnel_type to notify agents"

commit b4546747966412aac2d77998da689d8a7d4fbf75
Merge: 7135b6b fe18aa1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:20:59 2013 +0000

    Merge "Ensure PortSecurityDBTestCase loads correct plugin"

commit 7135b6bca99af34a9f375a96bb10c194494fc37a
Merge: 223738d c2d8b0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 02:20:33 2013 +0000

    Merge "Re-assign quantum.api module as last operation"

commit 223738d3c4415012e321afff1e5ba05b03c28868
Merge: 5eeb582 62d872e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 16 01:57:20 2013 +0000

    Merge "Preserve packet:byte counts in iptables_manager."

commit 5eeb5822f719826c98c2d67e8fdf89e3680fcee4
Merge: 67fb081 14d3939
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 23:01:34 2013 +0000

    Merge "Fix random OverflowError exceptions in gate-neutron-python26 tests"

commit c2d8b0b27c92a819074d6bc619510c563150c01e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 10 18:11:01 2013 +0200

    Re-assign quantum.api module as last operation
    
    Bug 1199443
    
    This avoids reset of locals in quantum/api/__init__.py,
    resulting in sys being None when assigning quantum.api.extensions
    to neutron.api.extensions
    
    Change-Id: I2da8b336679b643c92824399a05ca1b9980d1598

commit fe18aa12d48377e9dae7990396fdaf59c960f687
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Jul 15 00:23:46 2013 +0200

    Ensure PortSecurityDBTestCase loads correct plugin
    
    Bug 1201569
    
    If a plugin is passed to the setUp method, that plugin
    should be loaded instead od DB_PLUGIN_KLASS
    
    Change-Id: I81df9f62e7399f5a76a07e504679ee8311e5855e

commit 60a392f0aa0d5a8c865e81f65566549b7a753c24
Author: Salvatore <salv.orlando@gmail.com>
Date:   Thu Apr 4 12:35:50 2013 +0200

    Nicira NVP plugin support for l3_ext_gw_mode extension
    
    Bug 1121129
    
    This patch adds support the 'configurable external gateway' extension
    in the NVP plugin.
    
    Change-Id: I531ebe0053b1b9e21d6f0685776acebe3173b170

commit 14d393906a554531f1f6bcea02a42fc2e28676cf
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Mon Jul 15 11:08:13 2013 -0700

    Fix random OverflowError exceptions in gate-neutron-python26 tests
    
    These errors seem to be linked to the NEC plugin and http connections
    not being stubbed out correctly. This patch ensures do_request is
    stubbed out prior to the tests execution; this should be enough
    to prevent timeouts from occurring again. Stubbing out the call has
    no effect on the coverage of the agent scheduler tests for the NEC
    plugin.
    
    Fixes bug #1201478
    
    Change-Id: Iee3cb3cb3137cedcf97c707ea7fde9114b7264b6

commit 67fb08158ab1bda5deee7d8627cdabe1ef5d965d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jul 15 19:55:12 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I241d1c1217fcf32e2d02832db15a9c5ab5da4359

commit 69ebd0870aada3b58f1f1c39813ec1a62ce26b6e
Merge: a79faea ff7bb5f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 17:54:08 2013 +0000

    Merge "Add support for the extra route extension in the NVP plugin."

commit dcb94c962ffd7961a6fb9979712ed468175a855e
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Mon Jul 15 14:04:21 2013 +0800

    Use the correct tunnel_type to notify agents
    
    Bug #1201274
    
    Change-Id: I9de55d168ba03cb6a5273b4c2ce140cd190e38ee

commit a79faea6538e575473266ef1f2aeecbcc4271d69
Merge: ab777fd 3732f02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 04:20:21 2013 +0000

    Merge "Prevent possible server list damage in BigSwitch plugin"

commit ab777fd06d4e9188d29e5e7e92e0adf55c2e99ef
Merge: 2a1e764 341586e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 15 03:54:26 2013 +0000

    Merge "Modify the OVS agent to support multiple tunnel_types concurrently."

commit 2a1e764d80a1fd858860aed99c1c6fb59a51ee05
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jul 14 19:55:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7b87dc99e2d271703e357495c303b7e95295e11b

commit 8e8d5924f928ec29d895dd1e9aca127ea56f42ea
Merge: cac2612 042d15a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 14 03:08:30 2013 +0000

    Merge "Import Oslo's common rootwrap to Neutron"

commit 3732f022778a7c4a47c58029ae77e32a0a4a6ee9
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Wed Jul 10 16:28:12 2013 -0700

    Prevent possible server list damage in BigSwitch plugin
    
    The old failover logic for the BigSwitch plugin modified a
    list of controllers as it tested them. If the code for one
    thread unexpectedly raised an exception or died, the global
    server list could lose a server permanently.
    This patch addresses that by flagging servers as failed instead
    so the global server list is never modified.
    
    Fixes: bug #1200022
    Change-Id: Id2dcb820ef9f62fd03e3215bff3345e56c78afe2

commit cac2612f2f9c7787e827b0f5e1e163d995a359e0
Merge: d487320 1353b99
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 14 02:58:25 2013 +0000

    Merge "Ensure a name of packet filter is stored in NEC plugin"

commit d48732079ed7369f9a210c8003bcfceea6865a4c
Merge: c783fae 933498e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 13 21:20:07 2013 +0000

    Merge "Rename to Neutron in sample init.d script"

commit 933498e861a91724c6c0d8efddde80ec00fdc47e
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sat Jul 13 11:08:29 2013 +0200

    Rename to Neutron in sample init.d script
    
    Related to LP Bug #1199794
    
    Change-Id: I809a4d6c8e2ab047a1530f3fd6ef9aa60c0c638f

commit c783faec837e5f47d8df5cde53d27e6815b1a542
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Jul 13 19:55:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I32e4f200b66efe913a21000a3cb6b2abc1c568b2

commit cab04def374de967d97a779327058332e1527558
Merge: e0521cf b12502e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 13 19:10:02 2013 +0000

    Merge "Fix TestDhcpAgentEventHandler test that fails in some Jenkins runs."

commit 341586e47b731d6586be39f6bf96c28ae530d4b4
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Fri Jun 14 14:25:08 2013 +0000

    Modify the OVS agent to support multiple tunnel_types concurrently.
    
    This change modifies the "tunnel_type" configuration option to be a ListOpt
    instead of a StrOpt. This is intended to allow the agent to work in an ML2
    environment where multiple, disparate "tunnel_types" are supported at the
    same time. For now, the agent will enforce a single "tunnel_type".
    
    Fixes bug #1191089
    
    Change-Id: Ic025e54a8a3e92fe1fe44ebf08d71c2210c7d82b

commit e0521cfef999269d3379d58603e39ab68bdf086e
Merge: 463a656 eafcc41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 13 17:17:54 2013 +0000

    Merge "Cisco plugin db code cleanup"

commit 463a6565d14f6018c2fef563de08b4d96795eb75
Merge: c3d65fa 5b4ef2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jul 13 17:17:45 2013 +0000

    Merge "Add option to ignore backend HTTP error in BigSwitch plugin"

commit 47381ff70a9be29a1a3d853c4ff84f51a8c8618b
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Fri Jul 12 17:18:42 2013 +0800

    Enable logging before using it
    
    Bug #1200530
    
    Change-Id: I086353c93fae0f6ec74d16a485c215c1b3815ee6

commit 4a01e35f3f190fe0cef13b2cf81e561e7285dd49
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Fri Jul 12 12:32:55 2013 +0800

    rename quantum into neutron
    
    Bug #1200474
    
    Change-Id: Ib83e58008fc53b57c4063057ce4c5707b55f0ff2

commit eafcc4107cf941471dc2030d1d2cbc7bcbd3b73d
Author: HenryGessau <gessau@cisco.com>
Date:   Fri Jul 12 13:49:03 2013 -0400

    Cisco plugin db code cleanup
    
    Remove redundant model classes.
    Follow code style guidelines for imports.
    
    Fixes bug 1200723
    
    Change-Id: I2949065bb1d053805032e0a429f77e93dfc61a55

commit ff7bb5f77a059ec58a2afcc472cc51818d81a5ba
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jun 18 18:24:03 2013 -0700

    Add support for the extra route extension in the NVP plugin.
    
    The underlying feature is available in NVP 3.2, which introduces a
    new type of router. Therefore, create_lrouter needs to be made
    version 'aware'.
    
    This led to a number of fixes in the nvplib, especially around how
    version is retrieved and how version-dependent methods are called.
    
    Implements blueprint nvp-extra-route-extension
    
    Change-Id: Ie4e2d93f70e1948a62563c8523aea61bb2194c84

commit c3d65facddc5837761cb704c0cc878ec3919e082
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jul 12 19:55:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0aa0c983eb0867b6d306844f16db86df7e6d94f9

commit b12502e7e6709c874a756a92141f84667944a274
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Jul 12 23:02:30 2013 +0400

    Fix TestDhcpAgentEventHandler test that fails in some Jenkins runs.
    
    Add mocking of check_version method that have ran dnsmasq process to retrieve version
    
    fixes bug 1200698
    
    Change-Id: I6476d62bc4394bdf9701a2aa26a435f8bcb00d0d

commit bd18990d787b6c8b2e762bc9ec60d26714c2e1cb
Merge: bf11f60 9d5c540
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 14:13:57 2013 +0000

    Merge "Improve DHCP agent performance"

commit bf11f609d04535f2acfe6690dbc6e3c4594f936c
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Fri Jul 5 16:03:59 2013 +0900

    Refactor unit tests for NEC Plugin
    
    blueprint nec-plugin-test-coverage
    
    This commit refactors the base class of unit tests for NEC Plugin to
    make writing new tests easier.
    
    Add fake OFC Manager and change unit tests which use OFC Manager mock
    to using this fake.  With this fake, we don't need to set return_value
    and side_effect to the mock instance of OFC Manager in each test case.
    This fake keeps all resources on OFC, and returns existence of
    resources properly.  This fake is attached to OFC Manager mock instance
    by setting all side_effects.  We can also set it to raise an exception.
    
    Make NEC Plugin configurable in each test case.  Now we can configure
    NEC Plugin by setting string in class value "_nec_ini" which will be
    written into a temporal file and loaded by NEC plugin.
    
    Move setup for callbacks into NecPluginV2TestCase() so that other unit
    tests can use callbacks.
    
    Change-Id: I3a52423bb5813547345677dc49abfea6563dd6cd

commit debf76943e2a4c8313bc9b9f38c59578820b831f
Merge: a29b8a9 7d25889
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 05:31:28 2013 +0000

    Merge "Fix issue with pip installing oslo.config-1.2.0"

commit a29b8a92ed5dd4e3d837198df97139770c2f39fe
Merge: 25bfbd6 79e4c3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 12 04:40:37 2013 +0000

    Merge "Quiet down a large log file heavy hitter."

commit 25bfbd6766c99a520e2d2f7a6ce20124d2e93c7b
Merge: f569c75 f8e3a5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 23:30:50 2013 +0000

    Merge "Be compatible with oslo.config 1.2.0a3+"

commit 5b4ef2a513bc7c8d2a2eecb57f656bf42bb0dd52
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Wed Jul 10 16:49:31 2013 -0700

    Add option to ignore backend HTTP error in BigSwitch plugin
    
    This patch fixes the way the BigSwitch plugin ignores 404
    errors from the backend controller by allowing HTTP codes
    to be selectively ignored on REST calls. This prevents
    unnecessary exception handling and failover logic in calls
    where 404 codes are acceptable.
    
    Change-Id: Ia1118c039af3b45d96fb3f8a5fb5d3febdf50f4f
    Fixes: bug #1200023

commit f569c75ed9261d26793ce5180a2f264d7a62f870
Merge: 3c7ad23 b51738b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 21:08:09 2013 +0000

    Merge "Validate dscp value less that 64"

commit 7d2588935086e7afce6969ff1f44239473af9953
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jul 2 12:25:58 2013 +0100

    Fix issue with pip installing oslo.config-1.2.0
    
    Fixes bug #1194807
    
    Firstly, we update the oslo.config dep to 1.2.0a3 because of the issue
    with namespace packages (bug #1194742).
    
    But the main issue here is that if you currently do:
    
      $> pip install -r quantum/requirements.txt
    
    then you end up with the oslo.config 1.1.1 code installed. This is
    because oslo.config>=1.1.0 gets pulled in as a transitive dep and pip
    gets confused. You can reproduce with e.g.
    
      $> pip install \
           http://.../oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3 \
           python-keystoneclient
      $> pip freeze | grep oslo.config
      oslo.config-1.2.0a3
      $> python -c 'from oslo.config.cfg import DeprecatedOpt'
      Traceback (most recent call last):
        File "<string>", line 1, in <module>
      ImportError: cannot import name DeprecatedOpt
    
    This is because of a bug with pip where it sees oslo.config-1.2.0a3 and
    oslo.config as two unrelated things. It should strip the version part of
    the egg= fragment before using it as a package name, but it doesn't.
    
    However, we can simply use the -f/--find-links pip option in our
    requirements.txt to add the tarball URL to the list of URLs considered
    and also add the oslo.config>=1.2.0a3 dependency:
    
      $> pip install \
           -f http://.../oslo.config-1.2.0a3.tar.gz#egg=oslo.config-1.2.0a3 \
           'oslo.config>=1.2.0a3' \
           python-keystoneclient
      $> pip freeze | grep oslo.config
      oslo.config-1.2.0a3
      $> python -c 'from oslo.config.cfg import DeprecatedOpt'
    
    This is actually exactly the semantics we want and we go to great
    lengths in pbr to get these semantics while using a single tarball URL.
    The only downside to this --find-links strategy is that we gain an extra
    line in our requirements.txt ... but it does work around the pip bug.
    
    Change-Id: I6f3eb5fd2c75615d9a1cae172aed859b36b27d4c

commit 79e4c3e7584d131e51236f438aaa15350847f9d8
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Thu Jul 11 18:17:40 2013 +0000

    Quiet down a large log file heavy hitter.
    
    This line of code serialized the python structure for the device and throws it
    at the log file.  The string is about 90K characters, isn't very useful and we
    found that it takes a very large amount of space in the log file causing them
    to grow very quickly and fill our log disk.  This change extracts the device
    name (e.g.  "tapcdc07af9-8a") and uses that in the log message.
    
    Change-Id: I240eb811445752407583f0fb322ce061acb293b9
    Fixes: Bug #1200321

commit 3c7ad231b687e91ed41ab75f286aaf6f59e7db79
Merge: 58424dd 34798f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 11 12:35:27 2013 +0000

    Merge "Initial Modular L2 Mechanism Driver implementation."

commit f8e3a5e5877f6099acaa9b8a734df5cb78f3b4ec
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Jun 24 20:56:32 2013 +0200

    Be compatible with oslo.config 1.2.0a3+
    
    The private API of oslo.config changed, and the Cisco
    options parsing code was using it.
    Use an explicit MultiConfigParser instance for parsing
    the config files.
    
    Fixes LP Bug #1196084
    
    Change-Id: I7ffcac3c295491fe9ba8abc7e98f33157a48c51b

commit 1353b995b31f3d8e8aa2a24a70f034b91c9e17d1
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Fri Jul 5 23:39:19 2013 +0900

    Ensure a name of packet filter is stored in NEC plugin
    
    This patch fixes NEC Plugin to handle a name of packet filter and added
    "name" column into PacketFilter table.
    
    Fixes: bug #1198223
    Change-Id: Ic191b2793653b41496922f2fa4be4f410d71dc64

commit 34798f3a1e3a910eac553c4eb87e5ffedd74fac1
Author: Andre Pech <apech@aristanetworks.com>
Date:   Sun Jul 7 13:00:54 2013 -0700

    Initial Modular L2 Mechanism Driver implementation.
    
    Define the Mechanism Driver interface for create/update/delete
    operations on networks and ports. For each of these event, the
    Mechanism Driver provides one method that is called within the
    database transaction of the ml2 plugin method, and one that is called
    after the transaction is completed.
    
    Support for mechanism drivers is still a work-in-progress, and the
    interface is subject to change in future versions before the release
    of Havana. However this initial version should be sufficient to enable
    others to start defining their own mechanism drivers.
    
    Change-Id: Ife30215589792ee27df9897d3b2bc04392638266
    Implements: blueprint ml2-mechanism-drivers
    Fixes: bug #1199977
    Fixes: bug #1199978
    DocImpact

commit b51738b3102e4954fce7c470145e430609ac2e31
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jul 10 16:55:29 2013 -0700

    Validate dscp value less that 64
    
    Previously neutron would raise a 500 error if the dscp value was greater
    than 63. This patch adds validation to neutron so that a clear error
    message is returned if the value is greater than 63.
    
    Fixes bug 1200026
    
    Change-Id: I41a93661952669d112463608be907eede1901490

commit 58424dd6166f08c4d246aad1157a20b348d3af45
Merge: 0795d30 db91897
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 10 15:15:40 2013 +0000

    Merge "Add cover/ to .gitignore"

commit 32e5b054d20083edc5e6bd255505757d5793d376
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Jun 24 16:50:19 2013 +0400

    Add status description field for lbaas objects
    
    Fixes bug 1166925
    
    Change-Id: I44d936afd8cd531a786c09c38bbc4702737ce99c

commit 0795d308b44b2889d572677bbedb4721a136e341
Merge: 40a5853 f475f55
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jul 10 11:05:21 2013 +0000

    Merge "Imported Translations from Transifex"

commit b9900c2334abf5e4b1ad09ee24ed88184c085349
Author: zhhuabj <zhhuabj@cn.ibm.com>
Date:   Wed Jul 10 17:49:01 2013 +0800

    port-update fails when using SELECT FOR UPDATE lock
    
    In Postgresql, it will throw the bellow exception when
    using SELECT FOR UPDATE lock combined with outer join.
    "SELECT FOR UPDATE/SHARE cannot be applied to the
     nullable side of an outer join"
    
    The reason can refer http://www.postgresql.org/ \
    message-id/21634.1160151923@sss.pgh.pa.us
    
    for this issue, I don't think outer join is necessary，
    so I change it to use inner join.
    
    Fixes bug #1191653
    
    Change-Id: Ifc9ecad91324ce28399431ea77fe0865b6d8e523

commit db91897560fb4c536fa1892117954c3f8022aec1
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Wed Jul 10 13:36:09 2013 +0900

    Add cover/ to .gitignore
    
    When we run "tox -e cover" to generate coverage report, testr will make
    "cover" directory which contains the same html in "covhtml" made by
    "./run_test.sh --coverage".  So, make git ignore this directory.
    
    Change-Id: I829667a1ceb55418a5695545ad543a53f63821ba

commit 9d5c540b47b5c5611914f1765a196ad44f868751
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun May 12 14:53:18 2013 -0700

    Improve DHCP agent performance
    
    Previously when starting the dhcp agent the sync_state() process would
    be extremely expensive as it would query quantum server for each network.
    In order to improve performance a get_active_networks_info() was added
    so this information could be retrieved in one query rather than doing a
    query for each active network.
    
    The second part of this patch optimizes the logic to avoid calling
    get_dhcp_port(). Previously, this method was called once for each network
    which makes a call to get_subnets() and get_ports() unnecessarily as
    the dhcp agent can determine itself if it needs to update a port or create a
    port for dhcp.
    
    This patch also threads the inital sync process and maintains backwards
    compatibility with the previous rpc api.
    
    There was also a trivial change to the nvp_plugin where filters are assumed to
    be a dict.
    
    implements blueprint improve-dhcp-agent-performance
    
    Change-Id: I3b631057f595250dad76516faa9b421789f60953

commit 40a5853970cdd1555dfb5ebce81c6babf2e445da
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jul 9 19:08:49 2013 -0700

    Allow gateway address to be unset for an existing subnet
    
    Validation of the gateway IP address was taken place even
    if the gateway IP was set to None; this was causing an
    AddrFormatError exception to be raised by method
    '_validate_gw_out_of_pools'. With this change we skip
    the validation in case the gateway is set to None.
    
    Fixes bug #1178273
    
    Change-Id: Ib84378a4fd2cefdbbcacce695abbfaf82c647dd3

commit d80048eefc4c076c241d747ea63cb885382f04f0
Merge: 28bcd6a 34b8ee5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 21:03:07 2013 +0000

    Merge "Ensure that the neutron server is properly monkey patched"

commit 28bcd6a5321300c097351856d49c97c12a5a80a9
Merge: aa64633 e094041
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 20:24:47 2013 +0000

    Merge "git remove old non-working packaging files"

commit f475f55115b946ff89930fd2f65c46f109b764e5
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 9 19:55:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6f29f21c031370a64c8ae75652936762170406f9

commit aa6463375935977579661a1624c3edc8b296a1e3
Merge: c4d423e 758666d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 19:30:43 2013 +0000

    Merge "Allow router route update in XML."

commit 34b8ee5d5985d05b8e7cfa3f4500c11030814b7d
Author: Jason Dillaman <dillaman@redhat.com>
Date:   Tue Jul 9 10:22:05 2013 -0400

    Ensure that the neutron server is properly monkey patched
    
    The legacy 'quantum-server' script will apply the eventlet
    monkey patch whereas the new 'neutron-server' entry point
    does not.  This prevents the server from properly handling
    the REST interface.
    
    Fixes bug #1199383
    
    Change-Id: I498d2b02e6018425fc4538eff6803df8971f8e82

commit c4d423ef6132609d27752ce03f0a68182f31716d
Author: Arvind Somya <asomya@cisco.com>
Date:   Mon Jul 8 17:38:02 2013 -0400

    Fix for Cisco plugin sample config.
    
    This commit fixes the Cisco plugin's sample config included with Neutron to change all instances
    of quantum within the config to neutron.
    
    Change-Id: I80a8b69816ad964ee9761a214aaa5e81e596d501
    Fixes: Bug #1199160

commit a3d0a4450aa868187b71ecd7bdd39f7dad0034de
Merge: 5434abb 53a66b2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 13:01:38 2013 +0000

    Merge "validate and recommend the cidr"

commit 1761fce9ea94243abae0c1287312ca7ae3dd3f86
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Jul 8 16:00:10 2013 +0400

    Register agent schedulers options in one place
    
    Currently agent schedulers options are defined in neutron.scheduler and
    every plugin that supports scheduling should register them individually.
    It is reasonable to define and register options in one place - agentschedulers_db.
    
    Fixes NeutronManagerTestCase when running separately by importing missing config option
    
    Fixes bug 1198904
    
    Change-Id: Ia9c1ad3fb4b71796401ef5507f741f3cc024a4da

commit 5434abbd4cafce18d1fc075d928800200937053c
Merge: 77add2c 361f52a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 9 07:30:04 2013 +0000

    Merge "Imported Translations from Transifex"

commit 77add2cf3a60119c211f5a251cd09012f805ed6d
Merge: 0aa5bec 0471248
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 9 07:26:52 2013 +0000

    Merge "Divide dhcp and l3 agent scheduling into separate extensions"

commit 758666d89ce675e503aebda671f54961b6f2b489
Author: Bob Melander <bob.melander@gmail.com>
Date:   Fri Jul 5 15:53:49 2013 +0200

    Allow router route update in XML.
    
    Fixes: bug 1198188
    
    Router updates of routes in XML format fails.
    This patch fixes that problem. It also executes
    unit tests for XML-based requests to update
    router routes.
    
    Change-Id: Ie65e889a29a3ca9242593d51587de60c8d97e055

commit 361f52a8d50214d20927011c99eb259e19870abb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jul 8 19:56:06 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifee47c987534e0649b6c6b44f2f5f7228291fed3

commit 0aa5becc005166ecdfeacc288f124c8806d8b2f8
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Jul 8 13:01:57 2013 -0400

    add notification_driver to compatibilty clean-up
    
    fixes bug: 1198917
    
    Change-Id: Iab9bce87aee4d70204702533b1ff23e80ccdb53e

commit 62d872e4cf0186f59c7902a396e2ee7a3154cbf4
Author: Brian Haley <brian.haley@hp.com>
Date:   Thu Mar 14 10:35:49 2013 -0400

    Preserve packet:byte counts in iptables_manager.
    
    Ported the nova iptables manager code to neutron, so that we
    use iptables-save/restore with the -c flag to save/restore
    the chains and rules with their packet:byte counts.  All other
    changes were ported as well to keep the code as similar as
    possible between the two, although they will be different as
    I had to fix other bugs found during testing.
    
    Updated tests accordingly to account for new calls and
    input/output changes in formatting.
    
    Changed iptables_firewall code to add iptables rules in the same
    order that iptables-save will print them: source/dest, protocol,
    sport, dport, target; else iptables_manager won't be able
    to find them to preserve their [packet:byte] counts.
    Tweaked other rules accordingly as necessary.
    
    Fixed a bug introduced in an earlier version of this patch where
    _modify_rules() sometimes wouldn't match an existing rule correctly
    if not top=true.
    
    Fixes bug 1125393
    
    Change-Id: I858c552d8a7ae24f52f8e8daa05ac37026705773

commit 042d15a314de2406a5a34b83c8cee14e3238944a
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Jun 27 15:19:05 2013 +0200

    Import Oslo's common rootwrap to Neutron
    
    Use the common oslo-incubator rootwrap rather than maintain a
    specific fork within Neutron.
    
    - Migrated DnsmasqFilter use in dhcp.filters to the new EnvFilter
    - Changed environment passing in ip_lib's netns.execute so that
      it can be properly matched using IpNetNsExecFilter + EnvFilter.
      It now calls "ip netns exec ns env A=B C=D command" instead of
      "A=B C=D ip netns exec ns command". Adjusted tests accordingly.
    
    All the other changes are coming directly from the Oslo "rootwrap"
    module sync.
    
    Notes:
    - Neutron locates its rootwrap.conf in etc/ rather than in etc/neutron
    - Neutron maintains a specific bin/quantum-rootwrap-xen-dom0 which
      requires additional config in rootwrap.conf
    
    Both behaviors were preserved in this commit, but this may need to be
    addressed in the future to simplify future oslo-rootwrap updates.
    
    Implements bp: quantum-common-rootwrap
    
    Change-Id: I02879942a9d1169a71aa4d684c1b9ec109a6de32

commit 24e6ef332d11de4dc0d08ecf824ad216b2b6500c
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Jul 5 01:27:18 2013 +0900

    Limit min<=max port check to TCP/UDP in secgroup rule
    
    icmp_type and icmp_code are mapped to port_min_range and port_max_range
    respectively. For ICMP there is no constraint between type and code.
    Thus port range min<=max check should be enforced only for TCP and UDP.
    
    Also makes sure that ICMP type/code are 0 to 255 (both inclusive).
    Previously a value with 0 to 65535 were accepted for ICMP type/code.
    
    Fixes bug 1197760
    Fixes bug 1197769
    
    Change-Id: I70aaf6e02fee461fa97dc254db906d9efa173669

commit 93efc1dd78c4e97bb7c8e191115be98f9383b40c
Merge: 62fb7ad ceccf49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 8 12:54:16 2013 +0000

    Merge "fix some missing change from quantum to neutron"

commit 8417fe12e6adfd82bcc8e9721fa19c500e4e51ef
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Jul 1 17:30:52 2013 +0400

    Improve lbaas haproxy plugin_driver test coverage
    
     - also removes unnecessary delete_health_monitor() from haproxy plugin_driver
    
    Fixes bug 1191007
    
    Change-Id: Ic9ec1f705a94a2e246d1a4985e72e9c58d48191d

commit 0471248b97cd2b743d80701038e43aed9ab8b35d
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Jul 2 12:08:52 2013 +0400

    Divide dhcp and l3 agent scheduling into separate extensions
    
    Rationale behind this is that some plugins may support only dhcp or l3 agent scheduling.
    The patch is nothing more than refactoring. Functionality was not changed.
    
    Fixes bug 1196806
    
    Change-Id: Ie174059adfaed3028bbf65de7bde3497dd9bc664

commit ceccf496f2ef7f23a8315b0703da4b6016cc1de4
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Sun Jul 7 20:12:17 2013 +0800

    fix some missing change from quantum to neutron
    
    Change-Id: Iadad11f364e8200f8e4a92b191e834bdf0220179
    bp: remove-use-of-quantum

commit 62fb7ade327b1e1bdb300ec8d8ee2772a7e1ecd0
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Jul 7 22:23:15 2013 -0400

    clean-up missing rename
    
    implements blueprint: remove-use-of-quantum
    
    Change-Id: Ic21d8c8f6c68f9f31f76ed0bd50b86312ec6f6b4

commit e094041d1537d91353d636a00fbfd210077484c6
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Jul 7 22:15:30 2013 -0400

    git remove old non-working packaging files
    
    implements bug: 1198774
    
    Change-Id: Iebd3eb22dd7e3b93131c298e01ac4bcf1fea004e

commit 1f4e8a3ccfc4db56823ae756b707b94e19236233
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sat Apr 20 16:49:23 2013 +0800

    Apply Oslo ModelBase to NeutronBase
    
    Oslo.db has ModelBase which implements most of NeutronBase's code.
    Therefore NeutronBase should inherit from ModelBase to keep things DRY.
    
    Fixes bug #1171055
    
    Change-Id: I1a08636a6aa225da8b5d43a0bbcb9b59c057df42

commit 5be773909974f958b7591d2be00b968e70f0b600
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jul 7 19:55:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2b07b67cc0afbc7aef69e26d64874775e0faf612

commit 53a66b299f18a7184972502b43441a5ad7b050fd
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Sun Jul 7 21:20:36 2013 +0800

    validate and recommend the cidr
    
    Bug #1195974
    
    It is hard to validate the CIDR typed in by user,
    the simple way is to recognize only one and recommend it
    if user's input is not the one.
    
    Change-Id: Ic8defe30a43a5ae69c3f737094f866b36bb68f59

commit 31c7bdac68e7ebf1c2e7d91efa155b7212c20388
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sun Jul 7 13:44:48 2013 +0200

    Complete rename to Neutron
    
    implements blueprint: remove-use-of-quantum
    
    Change-Id: Ide08774b00ad74e4c2b88baa9e48ac65fbe19360

commit 75f03f3ae06b146e34c4ba4fb2d4b9cfdfffc07d
Merge: ee3fe4e e4e92cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 7 04:11:31 2013 +0000

    Merge "Sync install_venv_common from oslo"

commit ee3fe4e836ca1c81e50a8324a9b5f982de4fa97f
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Jul 3 19:39:46 2013 -0400

    Rename Quantum to Neutron
    
    This change renames everything to Neutron while providing backwards
    compatible adjustments for Grizzly configuration files.
    
    implements blueprint: remove-use-of-quantum
    
    Change-Id: Ie7d07ba7c89857e13d4ddc8f0e9b68de020a3d19

commit fc52854c1f9f58421839115cbf1204c9e8ec4034
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Jul 6 12:24:50 2013 -0400

    Rename quantum to neutron in .gitreview.
    
    Change-Id: Icd72d32898fe57f12eed19968cf19018f8fc89ad

commit e4e92cd4b9b2fa59f4add1e928ea09b757cb4212
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jul 5 22:18:02 2013 -0400

    Sync install_venv_common from oslo
    
    Change-Id: I4c14c9907d6195ab4f50ab9351ab14e4d93c4ec2

commit cecfe074869d857cef7570e1dea352cc7a85ca6e
Merge: 05fbc15 875b7bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 4 12:53:22 2013 +0000

    Merge "Fix unit test for ryu-agent"

commit 05fbc151b8c49b290887ee4c92072e782148f394
Merge: 8ceac10 af91fe1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 4 12:29:41 2013 +0000

    Merge "Allow non-root ip in subnet CIDR"

commit 875b7bbcbe093283bfdf6573f1c7d15ef3d60130
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Thu Jul 4 16:47:38 2013 +0900

    Fix unit test for ryu-agent
    
    Fixes bug #1197670
    
    This patch fixes programming error in the unit test for ryu-agent.
    - Change the way of patch to cfg of ryu-agent
    - Fix typo
     s/assert_calls/assert_has_calls/
    
    Change-Id: I9a5a17f314eb9c786338463e077cadc32d846dba

commit 8ceac10c1eae01f42926b5a82fcb023f0d8f627d
Merge: 5d56e6b c0dfe91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 4 07:53:50 2013 +0000

    Merge "Remove unused database table from Cisco plugin"

commit c0dfe919251ea759f88faf4376741a98132bf8a1
Author: HenryGessau <gessau@cisco.com>
Date:   Wed Jul 3 17:05:35 2013 -0400

    Remove unused database table from Cisco plugin
    
    Fixes: bug #1197053
    Change-Id: If0a9198046498cb559353dc9f1b3820b5e01cb7c

commit 5d56e6bee70498f4410b498116f21618cb03ad86
Merge: 01ef895 6ab8dd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 3 14:56:53 2013 +0000

    Merge "Do not mask NotImplementedError exceptions"

commit 01ef895f402f93b2d40d95ee4069a7e2d1c7282f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jul 3 12:11:52 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic473f0a8aae5786fa5fdf21eccc9653422d04177

commit 6ab8dd80f6c11e1e2def99bdba62b5cf706bf47e
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jul 2 17:52:39 2013 -0700

    Do not mask NotImplementedError exceptions
    
    With this patch we  avoid masking NotImplementedError(s).
    Previously, a catch-all clause returned 500, and it makes
    sense to distinguish between genuine 500 errors (i.e. a bug),
    versus 501 ones.
    
    This opens up the issue of keeping the server behavior
    consistent from one release to another, but one might argue
    that this was bad design decision in the first place.
    
    Fixes bug 1197200
    
    Change-Id: I2d81cba5ee9e5fbe8e865378381790b5b467d255

commit 0fc66059afe7c1a07b078d279b7f7df15aab35ec
Merge: 7936669 cfaec70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 2 16:05:47 2013 +0000

    Merge "Jointly load ExternalNetwork with Network"

commit 7936669bcc68ab416c8a8c707c9c88359972871e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jul 2 12:11:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ibc186825cb89a78fcfcb7124c203f1ec63fcf63c

commit af91fe1e179effcbb89fee0b9fa037290585a444
Author: Jay S. Bryant <jsbryant@us.ibm.com>
Date:   Sun Jun 9 08:43:55 2013 -0500

    Allow non-root ip in subnet CIDR
    
    If a subnet is created using an IP that isn't a root IP
    (doesn't end with .0) the code that handles IP checking
    for fixed IPs fails.  This fix changes the check for a
    valid IP to use the net.network IP address to
    avoid problems in subnets created with the non-root CIDR.
    
    (fixes bug 1188845)
    
    Change-Id: I89df64261d0f2741668576e45dc8f026857f20b0

commit 9c18ac14ca4dec316ae3469dce9218b359fa1b7d
Merge: 6426a7e 3762764
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 19:38:06 2013 +0000

    Merge "Move NVP DB extensions under dbexts module."

commit cfaec705c866cf99397612d417e70a8d0412bc0d
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed May 8 00:07:17 2013 +0200

    Jointly load ExternalNetwork with Network
    
    Bug 1177572
    
    This patch leverages the same approach as bug 1174111 for avoiding
    loading ExternalNetwork element from db for each network element.
    make_network_dict, _extend_network_dict_l3 are refactored accordingly.
    
    Also, this patch sligthly alters the logic of process_l3_network_create
    and process_l3_network_update as these methods assumed
    _extend_network_dict_l3 was always executed before retuerning.
    
    Finally, calls to get_network and get_networks in plugins which only
    extended the response with l3 attributes have been completely removed.
    
    Change-Id: I3b4c28ec0c78f731a534c2b66150d529fd797e72

commit 37627645e47d35643454a84ae4a8c682ee0b18eb
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed Jun 12 15:24:21 2013 -0700

    Move NVP DB extensions under dbexts module.
    
    Small clean-up to the plugin directory. This is also
    more in line with how API extensions have their own
    module.
    
    Change-Id: Idae52e30128f4ed9f8f7f5164991952bc3189f53

commit 6426a7e445013526a0bd2908d657493776e97888
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jul 1 12:11:59 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2a21a217a7cd00067ca4aed2ae385b387e5a9731

commit 22399c20039273bcd2109f3cf2c5874ab1d6d671
Merge: 84982e7 f03d91b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 1 11:31:26 2013 +0000

    Merge "Add support for moving ip/addresss/default gateway"

commit 84982e7477f672ae8eafe01b6e5a7c19963ac6ce
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 30 12:11:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia1a1fd6e7536281e7b238b419c02991a1e4dc523

commit 81c3a1706ff1e380602cb72b26a9ac726287e122
Merge: bdd5290 5adf507
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 18:41:01 2013 +0000

    Merge "Improve Nicira plugin test coverage"

commit bdd52903d33c77cebdb8d85f2a97d4e497a3fe71
Merge: 9b0c3e8 8e10c8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 16:57:01 2013 +0000

    Merge "Fix logic for handling SNAT rules"

commit 9b0c3e80abd27539a5c99ceb508ae4a1bb3fafb5
Merge: cac82c4 26425cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 16:19:31 2013 +0000

    Merge "Remove duplicate _check_provider_update from plugins"

commit cac82c4ba6a5f765dc1041c01f4dc9bffa1c4b0d
Merge: 4c9ea16 21fd100
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 16:18:35 2013 +0000

    Merge "Update code to properly use dict returned from get_gateway."

commit 4c9ea16ba1605af3b3fc97be9d08647b3b3a19f8
Merge: a87a7c2 0d5dccf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 16:16:50 2013 +0000

    Merge "Nicira plugin: Do not expect a minimum number of SNAT rules"

commit 5adf507d12e8d8291f6e928da4bcaa64f20973e7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Sat May 18 20:19:50 2013 +0200

    Improve Nicira plugin test coverage
    
    Blueprint nvp-test-coverage
    
    This patch improves the Nicira plugin test coverage by:
    - adding a suite of test cases for nvplib
    - removing unused exception handling code
    - removing 'vestigial' code in nvp plugin modules
    
    This patches also fixes a few minor glitches with the plugin
    and the fake api client.
    
    Change-Id: Ia319f556a815e5061b867a97d834123786218fec

commit a87a7c2ad0909c28f3d9d62a13cec59ee4d2e0e6
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Fri Jun 28 14:40:11 2013 -0700

    Fix case with no host_id in BigSwitch plugin
    
    This correctly checks for the case where nova does not
    provide the host_id in port creation/updates.
    
    Fixes: bug #1195903
    Change-Id: Ic0d714a3977810c6b1144c1e25488f75cc95d0f0

commit 8e6def1f2917b2161f3dff9ca70e5bda9ca6d8ce
Merge: b89e454 364e97b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 06:08:01 2013 +0000

    Merge "faster quantum-openvswitch-agent periodic reports"

commit b89e4541817a7970a21c3c20a240207f8ee6273b
Merge: d3fefbb 8d0f8e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 06:06:52 2013 +0000

    Merge "dom0 rootwrap - case insensitive xenapi section"

commit d3fefbbcb3f282b054c118e72a03386f6f77884d
Merge: 6ef206d bc4c382
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 06:06:44 2013 +0000

    Merge "Support a timeout argument when instantiating a bigswitch plugin"

commit 26425cbf5f10045ec288a63e048c7677edba4002
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jun 19 13:46:06 2013 -0700

    Remove duplicate _check_provider_update from plugins
    
    This patch removes the duplicated method _check_provider_update
    and adds a check for it in the NVP plugin that was missing so that an error
    is raised if someone tries to update a provider network.
    
    Fixes bug: 1192702
    
    Change-Id: I84e6767f351122f9e5af0cd4ef24d8eaaeb4ccd5

commit 21fd100a98c152086193607cd311c2ee03b82643
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Fri Jun 28 03:07:00 2013 +0000

    Update code to properly use dict returned from get_gateway.
    
    Calling get_gateway was a late addition to my code to add a default
    route in the DHCP namespace.  The code did not properly handle the
    dict returned from that method.  This changes it to properly extract
    the 'gateway' attribute from the dict.
    
    Change-Id: I9823a31feee7ab333c277fc6e78f366408393155
    Fixes: Bug #1195543

commit 6ef206d25d7b31988f5b1f6ab08c9b0fdcf7fe81
Merge: d6a4c49 c292db3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 29 02:29:09 2013 +0000

    Merge "Deprecate enable_tunneling in the OVS agent"

commit d6a4c4913b33a557cb17b200d7257700fab99150
Merge: 67548e1 d2dc433
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 28 23:36:38 2013 +0000

    Merge "Imported Translations from Transifex"

commit bc4c382f115c50fae1e00a64ec12869a29e34460
Author: Kanzhe Jiang <kanzhe@gmail.com>
Date:   Fri Jun 28 14:23:46 2013 -0700

    Support a timeout argument when instantiating a bigswitch plugin
    
    The timeout argument overwrites the timeout value set in the config file.
    The change permits any standalone script to interact with the bigswitch controller
    through the quantum plugin with customized timeout value without changing the plugin
    behavior.
    
    Fixes: bug #1195923
    Change-Id: I17954e70d661e7e7d5156c34c08b7c96bb3203ce

commit 364e97b44158976dca923bcf9ff5dff926da5dc4
Author: Peter Feiner <peter@gridcentric.ca>
Date:   Tue Jun 18 20:48:30 2013 +0000

    faster quantum-openvswitch-agent periodic reports
    
    One of two patches that fixes bug #1194438.
    
    Instead of spawning ovs-vsctl for every port on br-int, we just dump the
    required columns from the Interfaces table and grab the rows that we need. This
    is a big win because the time it takes for ovs-vsctl to connect to the
    openvswitch controller is orders of magnitude greater than the time it takes to
    parse the rows. In practice, instead of taking roughly 1s per interface, the
    agent's periodic task only takes 1s in total.
    
    Change-Id: Idbf32c38e0c4a9c9634c1e4f0e79bd556b720493

commit 8d0f8e1b992f41a3914030ed75d77bbecde5f924
Author: Mate Lakat <mate.lakat@citrix.com>
Date:   Fri Jun 28 16:22:04 2013 +0100

    dom0 rootwrap - case insensitive xenapi section
    
    As per change https://review.openstack.org/33429 the config sections
    became lowercase. This patch makes the quantum-rootwrap-xen-dom0
    rootwrap to be case insensitive for the xenapi section.
    
    This patch also changes the default config file to use a lowercase
    xenapi section.
    
    Fixes bug 1195781
    
    Change-Id: Ic24feb1a9ad6f8823745b1febd4a0edd54e73498

commit 67548e10f05a702dcaa8f05528ee1b4286094094
Merge: f61c247 7920bd9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 16:49:25 2013 +0000

    Merge "Improve readability for nvplib error messages."

commit d2dc4332b0987963d9238f82dbccb3f76c52858c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 28 12:11:54 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id0d866b54429c147e7b0aef9b3d43e1265086ac7

commit f61c2477bff86ccee9142e7cbf62cabf810ee773
Merge: 81382be 0407b59
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 12:07:03 2013 +0000

    Merge "Ensure that the report state is not a blocking call"

commit 81382be9cac78d38c6bb7f28d066c678b2e543f1
Merge: 74419fa d3dd33b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 28 11:01:42 2013 +0000

    Merge "Port location tracking for BigSwitch Plugin"

commit c292db34e96903925fe3bf835eb731869a4da599
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Thu Jun 27 11:28:51 2013 +0000

    Deprecate enable_tunneling in the OVS agent
    
    This patch properly deprecates the 'enable_tunneling' option in the OVS agent.
    It does this be ignoring it if 'tunnel_types' is set, and if 'enable_tunneling'
    is set, it defaults 'tunnel_types' to only GRE.
    
    Fixes bug 1195374
    
    Change-Id: I27fe6b930541a514fc51d3a6669347e52db8cb46

commit 74419faacf93a5e22ff6bd3f033a7fbd1c99a223
Author: Yong Sheng Gong <gongysh@unitedstack.com>
Date:   Wed Jun 26 16:46:39 2013 +0800

    move database config items into quantum.conf
    
    Bug #1194784
    
    This patch syncs all the DB configuration items into
    quantum.conf and removes the related items of plugins' config
    file to avoid duplication.
    
    sqlite related sqlite_db and sqlite_synchronous are defined
    in 'default' section, which I think is a defect. And it seems
    quantum does not use sqlite_db item.
    
    Change-Id: Ia47102ced0e4169f45f10b85311f298d8c026d31

commit 5634c34f2d4e6a482e42395f6b0fc24a35ecfa61
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jun 27 12:00:24 2013 -0700

    Remove reference to quantum cli in provider network extension
    
    We don't need this info in the doc string as it is already in the admin
    guide. If the CLI changes then we'll also have to update the doc string.
    
    Fixes bug 1195429
    
    Change-Id: If27788477c886f6faedbc5fca7856b683a6953f1

commit bb2661e831055530f78b9772bd768dde678a3769
Merge: d047150 86088a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 27 16:59:33 2013 +0000

    Merge "Use 0.0.0.0/0 host route as router option"

commit 8e10c8a5a8e6f64b5a21755eb0553a12ab59c44a
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jun 25 03:59:26 2013 +0200

    Fix logic for handling SNAT rules
    
    Bug 1192610
    
    Fixes and simplifies the logic for managing SNAT rules, based
    on the assumption that a chain contains SNAT rules for a single
    router.
    It also fixes another small glitch with SNAT rules not being
    removed when a gateway port is destroyed (the glitch did not
    affect operations)
    
    Change-Id: Ia95e375459a1f32e93bbe912a268a8ed13859c69

commit d047150c4b73cf712a018c3a7fdef4f000c5f511
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jun 27 12:11:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I5f7ebc55923e7d9f5132a93af9d4dfa18ccaa725

commit 0407b59c259b2861b4541e31379e994ea8350b83
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jun 17 11:37:11 2013 +0000

    Ensure that the report state is not a blocking call
    
    Fixes bug 1191768
    
    For the dhcp and l3 agents the first state report will be done
    via a call. If this succeeds then subsequent calls will be done via
    the cast method.
    
    Change-Id: I82a1d92fc84983b7bb46758db0aee3e3eca1d3be

commit 49d7f872792ac4d238e9f98126a0580b75216cf5
Merge: f39d004 fd4fae9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 19:46:09 2013 +0000

    Merge "Require greenlet 0.3.2 (or later)"

commit 86088a2241e6caaa31974b38f8024795c3d032f0
Author: Vishvananda Ishaya <vishvananda@gmail.com>
Date:   Mon Jun 10 14:37:26 2013 -0700

    Use 0.0.0.0/0 host route as router option
    
    There is a currently a hacky way to get the dhcp-agent to hand out a
    gateway route using a host route on the subnet. If you pass a route
    that has 0.0.0.0/0 as its destination, dnsmasq will pass it as a static
    route. Unfortunately it will also pass the router option if the subnet
    has a gateway set. This is inconsistent and precludes users from options
    that are available in nova-network like using an external gateway.
    
    This patch fixes things by allowing a 0.0.0.0/0 host route to override
    the router setting passed by dnsmasq. This prevents the situation
    where dnsmasq hands out two default routes.
    
    Change-Id: Ia70223070bfd437f1c2eb48fde94491d7ee61fcb

commit f03d91b850b1ef5976c110e5b14cdd0a9ef21e19
Author: Tomasz Paszkowski <tpaszkowski@suse.com>
Date:   Wed Jun 26 08:40:46 2013 -0400

    Add support for moving ip/addresss/default gateway
    
    Add support from moving ip/addresss/default gateway from physical interface
    which is going to be attached to bridge to bridge device itself.
    
    Fixes: bug #1192122
    
    Change-Id: I8a8bf5edc17a87dcb747626dd1d6817ac48cb20d

commit f39d004f9f208170cbb58192945cb74f846df22d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 26 12:11:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6e296370ed88d24ed249d34e43b475e42c1574fa

commit 090432c130426248204451340933454d072dc3ab
Merge: 23284e7 9f0c245
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 26 07:36:21 2013 +0000

    Merge "Update to use OSLO db"

commit d3dd33bc30656532a1860929ead5ee601a71099b
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Mon Jun 24 14:44:10 2013 -0700

    Port location tracking for BigSwitch Plugin
    
    Adds a new table to the Big Switch plugin to keep track of
    the nova compute node host IDs that ports reside on.
    This table is then used to allow users to override
    the VIF type for a compute node based on the host ID.
    This allows quantum to control an environment with multiple
    VIF types.
    
    Change-Id: I63eb66d970650237aed2d5dc6676a6d097988f8d
    Implements: blueprint hostid-vif-override

commit 23284e7c57f58ccd4d5d98faba9a13b7318e67a8
Merge: 2775a8a 3ecd1cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 15:54:13 2013 +0000

    Merge "Do not raise NEW exceptions"

commit 2775a8a5677485d44d3b7a00bb90af469d6f110c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jun 25 12:11:50 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I336530a54ca7154d0de43eccb87bc5b1c2202097

commit 9f0c2453c6054c73eab0448c14d9753afb0fd2f0
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Apr 20 12:18:02 2013 +0000

    Update to use OSLO db
    
    This code implements the blueprint oslo-db-support
    
    NOTES:
    1. The new section is database (this is backward compatible
       with DATABASE)
    2. The sql_* are deprecated. They are also backward compatible.
    3. Eventlets DB pool is no longer supported
    
    Change-Id: I6fa7c3817f6a5d8bef48382e0e754b88521f2289

commit 3ecd1cbbc95f5dacfd6503818e2c00f394f2c82d
Author: Sergey Vilgelm <svilgelm@mirantis.com>
Date:   Mon Jun 24 15:26:50 2013 +0400

    Do not raise NEW exceptions
    
    Raising NEW exception is bad practice, because we lose TraceBack.
    So all places like:
    
    except SomeException as e:
        raise e
    
    should be replaced by
    
    except SomeException:
        raise
    
    If we are doing some other actions before reraising we should
    store information about exception then do all actions and then
    reraise it. This is caused by eventlet bug. It lost information
    about exception if it switch threads.
    
    fixes bug 1191730
    
    Change-Id: Id4aaadde7e69f0bc087cf6d96bb041d53feb131d

commit 39e9f2ad4bcec9f59c451ee8e3a86c886b5c38aa
Merge: c86d8fc 95dbd03
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 25 01:41:22 2013 +0000

    Merge "replace use of dhcp_lease_time with dhcp_lease_duration"

commit c86d8fcf6b823f6c6bfdfa44017af5a0e584a12e
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Mon Jun 24 15:06:35 2013 -0700

    Converts 'router' section to lowercase in bigswitch config
    
    The restproxy.ini file contained an uppercase section
    which is converted to lowercase by this patch to match
    existing naming conventions.
    
    Change-Id: Ib8eb69406cae3898c4c9f3fd106f8c7ffef06f01
    Fixes: bug #1194296

commit 34c4d9c6faa1d8e2c8ebdc10c47cb1140846b12a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jun 24 12:11:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9b95e89cfaf76537d98ada38fb795fbaf439c996

commit fd4fae99178a65cb8c7c0f97891d8d27c49f9344
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Thu Jun 13 09:57:53 2013 +0200

    Require greenlet 0.3.2 (or later)
    
    Version 0.3.2 resolves a bug that allowed generic "except
    Exception:" clauses to catch GreenletExit exceptions.
    
    bug 1097203
    
    Change-Id: Ifc5a40dd1da8d115ccbe7fa4a948d12ff1c89099

commit f287194b9513a6c7851e9fa44c70c94b1067867b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 23 12:11:49 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I49837fb8f8771c532c2fd09d67598ad839a2f7a3

commit b4d933e2a5efaba068a803fffe8bd04017f92302
Merge: 4c48e48 398be8c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 23 06:03:32 2013 +0000

    Merge "Remove single-version-externally-managed in setup.cfg"

commit 398be8cb7a6b4017015742b426bc1108ccbf5d34
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Fri Jun 21 13:10:09 2013 -0700

    Remove single-version-externally-managed in setup.cfg
    
    The single-version-externally-managed flag is no longer
    a config option in pbr, it is now the default behaviour
    in normal setuptools.
    
    Change-Id: I5173d78680afca534b28cefa155636d9d695b1d9

commit 4c48e48d65959c6a1a5ea1a1093828c9bf852417
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Thu Jun 6 14:40:45 2013 -0700

    Adds support for router rules to Big Switch plugin
    
    Implements: blueprint bsn-router-rules
    
    Adds bigswitch plugin extension which adds 'rules' dictionary to router objects.
    Adds validation code and database components to store router rules
    Adds configuration option to plugin to set default router rules and max router rules
    Adds unit tests to test all router rule functionality
    Adds database migration for router rules tables
    
    The Big Switch controller's Virtual Router implementation supports "routing rules"
    which are of the form:
    <source, destination, next-hop, action>
    This extension aims to expose this abstraction via the Big Switch Quantum plugin.
    
    These rules are applied at the router level, allowing tenants to control
    communication between networks at a high level without requiring security policies.
    (e.g. prevent servers in a publicly accessible subnet from communicating with
    database servers).
    
    Change-Id: I37a2740dca93b0a8b5111764458d39f1c2b885ce

commit dffb130a4d23aa8e584f6a16707d30c6693e3736
Merge: 69c6e44 f392263
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 21 15:38:12 2013 +0000

    Merge "Always include tenant_id in port delete request"

commit 69c6e44c79e37dc3b0d5a37d6ea3df8a67fc4422
Merge: a1b8a10 72496ad
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 21 15:34:32 2013 +0000

    Merge "Imported Translations from Transifex"

commit 72496ad75d71470759674571f66ca6d8509d97ba
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 21 12:11:54 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: If16f987872d2ccc00d7efe486b721d4702864220

commit a1b8a10c569ae460a3abd86019d86c759ab6ab20
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Jun 13 16:28:38 2013 +0400

    Fix haproxy plugin_driver.update_health_monitor() signature
    
    - add old_health_monitor parameter to the method
    - the method signature in abstract lbaas driver was also changed
      to accept pool_id rather than an assoc object as driver only needs pool_id
    
    Fixes bug 1190577
    
    Change-Id: Ie199f46e089a16214ed649a3169e985a726e5d99

commit cc260d5d64f112d2e8d183e4cd16cbd872f76dda
Merge: b1858b4 5dd0cf1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 23:39:54 2013 +0000

    Merge "Adds default route to DHCP namespace for upstream name resolution."

commit b1858b4e8c85b277aa9395a010c3138f3f9fc3d5
Merge: 96588a7 34f8b35
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 20:01:11 2013 +0000

    Merge "Fix single-version-externally-mananged typo in setup.cfg"

commit 96588a762c654e6c592d58667934da03de3f50a7
Merge: 9a884ce c7cdf05
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jun 20 16:34:47 2013 +0000

    Merge "Imported Translations from Transifex"

commit 34f8b35d9d5eba2a75e4f4ffd2abe2a646fdb768
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Thu Jun 20 08:33:06 2013 -0700

    Fix single-version-externally-mananged typo in setup.cfg
    
    Corrects the typo in setup.cfg to use single-version-externally-managed
    for pbr.
    
    Fixes bug 1192987
    
    Change-Id: I039b51897ec180148e5095349e4567759f2711a5

commit 9a884cebe0b4f2594699b553f72145cf759c777f
Merge: 8eea1ae 531ff2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 20 12:59:15 2013 +0000

    Merge "Fix IP spoofing filter blocking all packets."

commit c7cdf05a8517ca018e6d6d946420c03f5a06fde0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jun 20 12:11:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I5981d9309ebfec257a82b579828af96c359fb85d

commit 95dbd03a0bc4867bf8520539ed08f4068adf2f33
Author: Darren Birkett <darren.birkett@gmail.com>
Date:   Wed Jun 19 12:37:02 2013 +0000

    replace use of dhcp_lease_time with dhcp_lease_duration
    
    Having 2 separate dhcp lease period flags (dhcp_lease_duration
    used by the quantum db plugin, and dhcp_lease_time used by the
    dnsmasq dhcp agent) means that you could potentially have different
    lease periods being set, and used by different parts of the codebase.
    
    It seems to me there is no real need to have 2 separate flags, so this
    commit basically replaces references to dhcp_lease_time (which is used
    by the dnsmasq dhcpagent) with dhcp_lease_duration. This way, there
    is only one flag to set, and both the quantum db plugin and dnsmasq
    dhcp agent will use the same lease period.
    
    Change-Id: Ia99dfa9284b6e737144f61a80c59cd898c0949bb
    Fixes: bug #1192550

commit 0d5dccfd3223da59c446e4a8c2e34d8f250a28af
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Jun 20 00:51:29 2013 +0200

    Nicira plugin: Do not expect a minimum number of SNAT rules
    
    Bug 1192392
    
    The code was assuming a SNAT rule for each subnet was always present
    when clearing a gateway. If the SNAT rule was removed for some other
    reason from the NVP backend, this would have led to the failure of
    the whole operation; however, a failure won't have been necessary
    in this case, as the final effect of the operation is to remove
    the rules anyway.
    
    Also, this patch ensures a quantum router is put in ERROR state if
    it is not found on the NVP backend.
    
    Change-Id: Iac1a61342b490d0d971b884e1aa8d9567b15cac0

commit 8eea1ae574671a157ae2d215f18635a3c8985a06
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Mon Jun 17 13:33:46 2013 -0700

    Make sure exceptions during policy checks are logged.
    
    If the invocation of f bombs out, the policy check fails (i.e. returns
    False), however it does not log the root cause, which makes very
    difficult to understand why this is happening.
    
    Fixes bug #1191948
    
    Change-Id: Ic40053f3965b71199baf9fe3902e8ffc9745076f

commit 5dd0cf15463e181b92c8809c2dcc7603bb156a0e
Author: Carl Baldwin <carl.baldwin@hp.com>
Date:   Fri May 31 20:44:14 2013 +0000

    Adds default route to DHCP namespace for upstream name resolution.
    
    Any time the DHCP server is updated this code will maintain a default
    route in the DHCP namespace using the gateway_ip attribute of the
    first DHCP-enabled IPV4 subnet in the list of subnets where gateway_ip
    is not None.  This strategy uses the same gateway ip that the DHCP
    server hands to the VMs on the network.
    
    Change-Id: I0807550a848e1b610c7775d215643ad9c83629ed
    Fixes: Bug #1181378

commit 248375ed0b9c7a30110cba8e232680d7223c571e
Merge: ee5519d 381cb1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 14:25:33 2013 +0000

    Merge "Fix TestNecAgentMain not to call sys.exit()"

commit ee5519d5459bfc0de53e23a55b11b4d52a5f6c35
Merge: eb63d74 8a6143e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 13:36:26 2013 +0000

    Merge "Reference default_servicetype group in lowercase"

commit eb63d74f5518e62e8829a21b9463cc5db989cfc1
Merge: e20506c fd7223b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 19 13:35:29 2013 +0000

    Merge "Allow use of lowercase section names in conf files"

commit e20506c0303bdca1e56ce0f591d7972c2c551029
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 19 12:11:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic05603ef37a6be3f5482f5b268958eedf4a6eaa1

commit 381cb1c4e4b5122a8afae67ad4cbeebcb39cbf83
Author: Roman Bogorodskiy <rbogorodskiy@mirantis.com>
Date:   Tue Jun 18 13:12:27 2013 -0400

    Fix TestNecAgentMain not to call sys.exit()
    
    test_main() was calling sys.exit() killing test running
    and not allowing tests to complete in a proper way.
    
    Drop explicit sys.exit() call from net agent's main() and
    fix outdated mocks in test_main().
    
    Fixes bug #1192270
    
    Change-Id: Iea8d5508f73eb9144e452de3305f2dec4c2a319c

commit f392263ae8c89412ec8be6a13b3dd56abd129a8c
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Jun 18 12:10:07 2013 -0700

    Always include tenant_id in port delete request
    
    Quantum does not include the tenant_id in port objects for floating IP addresses.
    However, the Big Switch backend requires the tenant_id in the port removal requests.
    This looks up the correct tenant_id whenever it is missing in the port removal.
    
    Change-Id: I7580ed2f545ad2d92b831b65dfbb34541bf465aa
    Fixes: bug #1190020

commit 8a6143e145f3ed46ef3d723e83c9f4f4a5447729
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jun 18 11:44:06 2013 +0100

    Reference default_servicetype group in lowercase
    
    Now that we require oslo-config-1.2.0, we can start referencing group
    names as lowercase. Let's start with the default_servicetype group.
    
    We do this simply by changing the case of the group name passed to
    register_opt():
    
      -cfg.CONF.register_opts(..., 'DEFAULT_SERVICETYPE')
      +cfg.CONF.register_opts(..., 'default_servicetype')
    
    and this means that all options in the group now need to be referenced
    using the lowercase group name i.e.
    
      -svc_defs = cfg.CONF.DEFAULT_SERVICETYPE.service_definition
      +svc_defs = cfg.CONF.default_servicetype.service_definition
    
    Note however, users can still use the uppercase section name for
    backwards compatibility.
    
    When we last attempted to do this, oslo.config-1.2.0 wasn't actually
    being installed correctly so add a unit test which verifies that both
    uppercase and lowercase section names work.
    
    Change-Id: I9357397f39d8f7d0d4f445b78aae5665c7ece3d4

commit fd7223bcd4709fcaaf103fb5f0f14e90ca3f00d7
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Jun 18 11:44:06 2013 +0100

    Allow use of lowercase section names in conf files
    
    Fixes bug #1189889
    
    oslo.config-1.2.0 normalizes section names in config files to lowercase.
    This means that simply by upgrading to oslo.config-1.2.0, users will now
    be able to do e.g.
    
      [default_servicetype]
      description = ...
      service_definition = ...
    
    Change the default config files to make it clear we recommend the use of
    lowercase section names.
    
    Note, the use of an alpha tarball of oslo.config requires pbr>=0.5.15
    but we already require >=0.5.16.
    
    DocImpact
    
    Change-Id: Ia47fb3d168da71d3221b25979f8c9257d70dd64d

commit 97a103b04e93a9b16908dbc4e7dfbbfdea70c4c8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jun 18 12:11:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7566406d89c2eda65be77306033f3034e3cb9abd

commit a0f8d5a35454a54766af3494fcd16233434364e7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jun 17 12:11:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2574deaf76efd729c53b7a68632bbd62d629155d

commit 531ff2fb34df9e6b0f84ada811c29240f0f1cd48
Author: Anton Frolov <anfrolov@mirantis.com>
Date:   Fri Jun 14 21:01:50 2013 +0400

    Fix IP spoofing filter blocking all packets.
    
    Implement IP spoofing filter by adding yet another chain to iptables
    with RETURN rule for each of IP addresses assigned to port and DROP
    rule at the end of the chain.
    
    Fixes: bug #1190613
    Change-Id: I2e7a0f8dd4c3519c57d28e87a44735a3482624b1

commit 0b2d1ac2356b250054f993a7eab30107a08bb3ea
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sun Jun 16 16:45:56 2013 +0900

    Correct log message in l3_rpc_agent_api
    
    Fixes bug #1191623
    
    Change-Id: Ib692a62d6f557ab9a50da1d888e291e3e24871fb

commit 55dbdb7226d9e3ed902371053aa9bb44f140bc75
Merge: 43e1968 df48843
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 17 02:26:52 2013 +0000

    Merge "Require pbr 0.5.16 or newer"

commit df48843863467236fda4b569aa31010c8cfc4647
Author: Jordan Tardif <jordan@dreamhost.com>
Date:   Sun Jun 16 15:01:19 2013 -0700

    Require pbr 0.5.16 or newer
    
    Use a version of pbr greater then 0.5.15. Earlier versions have problems
    when alpha tarballs are used as dependencies.
    
    Fixes bug 1191155
    
    Change-Id: I889358ae746761b282c5933c53bce10017be4c57

commit 43e1968c0cb41519ffaae176b5058fc88d8b3ecd
Merge: 7f81c46 f698bbf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 16 14:01:11 2013 +0000

    Merge "Update to the latest stevedore"

commit f698bbf1ae1227ca7750d6cb63a137f3789435ca
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jun 16 13:03:56 2013 +0000

    Update to the latest stevedore
    
    Use a version of stevedore that does not try to
    install distribute.
    
    The requirements change is in https://review.openstack.org/#/c/32738/
    
    Change-Id: If39d886cb68044871617600650ef8546635143bc

commit 7f81c46a86086b3770c85fc62a4e28160a87c598
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 16 12:11:51 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia89635fa01778f8d4ae8695fce2e6dbd264ebd37

commit f87f0bd7c21f808ae58af77df54e18c1f4c39841
Merge: 7e79dd1 8761cf1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 16 10:18:48 2013 +0000

    Merge "set default for gw conn info in nvp_networkgw extension"

commit 7e79dd1acea8a382c16915fc767b488d0cafd503
Merge: af91f1b a9098d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 16 06:55:31 2013 +0000

    Merge "Enable attribute-based policy on router:external_gateway_info"

commit af91f1b41abdb48f2eab16622f87a0b7bc94fa79
Merge: 68626ea 95c7240
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 16 06:11:47 2013 +0000

    Merge "Remove code duplication from loadbalancer db plugin"

commit 68626eabd72fd8a2ae5d0bd6a3d282fe49233ce4
Merge: 68bca13 0cc220a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 16 04:11:53 2013 +0000

    Merge "Imported Translations from Transifex"

commit 68bca138a33506d60c48b2e617c65299e0ed1a83
Merge: b7fb6b0 78a9354
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 15 22:54:42 2013 +0000

    Merge "Fix branch in db migration scripts"

commit b7fb6b0fe6f28b01044b3cb596bcb2504fb28463
Merge: 489f5b5 3589752
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 15 21:07:28 2013 +0000

    Merge "Rename agent_loadbalancer directory to loadbalancer"

commit 95c72405c3afd7ca11d3736e43e30af136a65017
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sat Jun 15 22:40:55 2013 +0400

    Remove code duplication from loadbalancer db plugin
    
    Use _get_resource instead of duplicating code that fetches pools
    
    fixes bug 1191406
    
    Change-Id: I380c97a2ece0536b49891ac797ec7170e44a6a20

commit 0cc220a58e2cb2f32ab14e174cc075cde1c21b3c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Jun 15 12:11:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iacf83194136e2d01945e5ef080d0458b942751f1

commit 489f5b59b6add53f8f23cc92c9ef4d6236106f96
Merge: a36f237 27bdfca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 15 01:44:42 2013 +0000

    Merge "Reduce plugin accesses from policy engine"

commit 358975281f7d9ef43f16febaf27f8f5d1d568426
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Jun 13 22:54:59 2013 +0400

    Rename agent_loadbalancer directory to loadbalancer
    
    Fix missing path changes
    
    Fixes bug 1179276
    
    Change-Id: I889eeac8013de67fccbac9bfa745a56e7f859756

commit a9098d218836aa82dc07ba94156f0d553f2f87a7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri May 31 17:28:35 2013 +0200

    Enable attribute-based policy on router:external_gateway_info
    
    Bug 1186081
    
    This patch also removes a check on is_write in policy.py since
    the code block where that check is placed assumed already that
    is_write == True
    
    Change-Id: I21c54f63e1948675f67afb088c262dc5316c230d

commit 8761cf1e74cd0f4d7f01e19a9e225c932e6dd61e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu May 23 16:31:36 2013 +0200

    set default for gw conn info in nvp_networkgw extension
    
    Bug 1183285
    
    This patch simply guarantees default segmentation type and
    id in gateway connection info for the 'connect' and 'disconnect'
    actions are correctly set respectively to 'flat' and 0.
    
    Change-Id: I1b4e8274651e05f4681878ab70daef990ece901b

commit a36f2373d2d99e5e861704b4e2154b86758fffcd
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 14 12:11:12 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I00bce7b7069d0ff8f2d62633b502103bd5e62abd

commit 78a93547b8a7fd14050abe4d1e4bdef2051d9037
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Fri Jun 14 14:14:04 2013 +0400

    Fix branch in db migration scripts
    
    Fixes bug 1190942
    
    Change-Id: I9eea3988518694922130992b547dc19768e0d005

commit 7dc384959288025c2b7e88090b6fb9082af305be
Merge: 0630d9d 5586fc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 14 03:15:03 2013 +0000

    Merge "Remove unit tests that are no longer run."

commit 0630d9d817f8868b0cdcde89ac237f0411da3dff
Merge: a78207e 648d3b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jun 14 01:25:17 2013 +0000

    Merge "xenapi: fix rootwrap"

commit 5586fc3973367bc2f702441bf368a6fc2b785670
Author: HenryVIII <gessau@cisco.com>
Date:   Thu Jun 13 20:03:20 2013 -0400

    Remove unit tests that are no longer run.
    
    A long time ago, quantum/tests/unit became the home for all unit
    tests, but these ones in the Cisco plugin directory got left
    behind. They have suffered bit-rot and need to be removed.
    
    Also:
    - Move the fake Nexus driver to new home.
    - Filed new bugs to track the task of improving unit test coverage of
      Cisco plugin code.
    
    Fixes: bug #1174311
    Change-Id: I372e24aebbe1804e5b6ce62984bfd76b030a44b1

commit a78207e574f569ed1f3bf9c5eeb4ab523f2d5916
Merge: 5e86523 fa4974f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 20:38:11 2013 +0000

    Merge "Remove wrong reference to object attribute in nvplib"

commit 5e86523930105c193544258f1a72aa33e905302f
Merge: 873040f 1d98137
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 20:38:01 2013 +0000

    Merge "Rename agent_loadbalancer directory to loadbalancer"

commit 873040f61541861fed4cf65b64a4399a6dffccb8
Merge: 828d83a 6261364
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 13 18:35:21 2013 +0000

    Merge "Update with latest OSLO code"

commit 828d83a09570a7f22aa849816f69590f85b6a1e8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jun 13 12:11:13 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id74e6964c4e8ca6b47b0ad43cde17beac162e2de

commit 1d9813765d9d8b159bff73e4117806fa5b1e43be
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Jun 13 13:40:05 2013 +0400

    Rename agent_loadbalancer directory to loadbalancer
    
    Rename agent_loadbalancer directory to loadbalancer. and move
    plugings/services directory one level up.
    Fix tests and imports accordingly
    
    fixes bug 1179276
    
    Change-Id: If9e027b00824d612dfdd03e47efa9c08e419f205

commit 7176de17bd52d21016a7ffb2488a1bef644c84db
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sun May 5 06:34:44 2013 +0400

    Make reference lbaas implementation as a pluggable driver
    
    implements blueprint multi-vendor-support-for-lbaas-step1
    
    This patch implements the following changes:
     * merge lbaas_plugin.py and plugin.py into 'plugin.py'
       After that the default 'reference' implementation is available again.
     * move all code related to reference implementation from plugin.py to
       drivers/haproxy/plugin_driver.py
     * Inherit HaproxyOnHostPluginDriver from abstract driver and implement
       its interface.
     * modify tests accordingly
    
    Change-Id: Ib4bfe286826acdedeadbeeff4713448c073378d2

commit fa4974fb6710e262e31b0b810923a312b15f991f
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jun 11 00:05:13 2013 -0700

    Remove wrong reference to object attribute in nvplib
    
    Plus, added negative tests that were not covering the
    exception handling bits.
    
    Fixes bug #1189730
    
    Change-Id: I5df914c6b748a03816217336431c2b0b597481b5

commit 72936dc5ce91a4985c019c12916e400e77bd3e55
Merge: 1d05037 06bf3f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 19:42:56 2013 +0000

    Merge "Remove explicit distribute depend."

commit 1d05037582b854be8082c0455695cece8c15cbe5
Merge: c66f422 07b5636
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 12 16:05:39 2013 +0000

    Merge "Imported Translations from Transifex"

commit c66f422f58673486de187f224104a4c5e834cc9d
Merge: bae4439 a98884e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 15:47:57 2013 +0000

    Merge "Add support for VXLAN to the Open vSwitch plugin."

commit bae4439084a5c3dfd21bc5e1f001b0957ae1c65b
Merge: bcb9ea7 da6816c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 15:12:23 2013 +0000

    Merge "Ensure to remove auto delete ports from OFC in NEC plugin"

commit 6261364651966fe767b592fc32c6e263ffec1d7f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jun 12 13:20:46 2013 +0000

    Update with latest OSLO code
    
    Change-Id: I54c0f6fa0489f0ef20187adf87f720e48ce1626c

commit 07b56360b352229a8b9338429bcc1236c6824f74
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 12 12:11:13 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia5f18e90d6df17c1b4d758fa949259d8af489e5d

commit da6816c6c703be68f5a0ce537364bc096ec2bd9d
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Jun 12 17:18:55 2013 +0900

    Ensure to remove auto delete ports from OFC in NEC plugin
    
    When deleting a network, dhcp ports are removed automatically
    in db_plugin. This causes a failure network deletion since the
    corresponding port exists on OFC and the network on OFC cannot
    be deleted unless a subnet on the network is deleted explicitly.
    This commit gets auto-delete ports and delete the corresponding
    ports on the controller before deleting the network.
    
    Fixes bug #1190163
    
    Change-Id: Ifffaa1a28b5fac0b0a98036a926550255cc25c9d

commit bcb9ea7ba4b4b1651f5ed430a2fb533dd2fdce6c
Author: Arvind Somya <asomya@cisco.com>
Date:   Wed May 22 10:27:48 2013 -0700

    Adding SVI support to the Cisco Nexus plugin
    
    Adding support to create vlan SVI gateways on Cisco Nexus hardware switches.
    
    blueprint cisco-plugin-svi
    
    Change-Id: I88516f3e67d51d213fa60f6ec9aee23f9ca4be97

commit 08561f35aca96505ea7536ca3c8d2a4cd759d03c
Merge: 8c45d04 a409d5f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 07:54:33 2013 +0000

    Merge "Improve detection of config errors in nvp.ini file"

commit 8c45d040b9e993704feff964c6f65b93c83d615f
Merge: 67b36b7 5324e2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 12 01:18:14 2013 +0000

    Merge "Use Python 3.x compatible octal literals"

commit a409d5f943d8e3f59c03f46a0d096b8e3e439b4c
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jun 11 12:47:48 2013 -0700

    Improve detection of config errors in nvp.ini file
    
    Detect if default params specified in the config file match
    what it is returned by NVP.
    
    Fixes bug #1190032
    
    Change-Id: I8084dc938726e050ba82410cbc02a161cc0aa17f

commit 06bf3f60c1220366497e595193593360de2422b0
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jun 11 11:38:57 2013 -0700

    Remove explicit distribute depend.
    
    Causes issues with the recent re-merge with setuptools. Advice from
    upstream is to stop doing explicit depends.
    
    Change-Id: Idb465068d25433582b8579a3ea96293f23368708

commit 67b36b77618c6313be9a5841205686bd02cc6f16
Merge: 13349a1 135d202
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 11 15:19:50 2013 +0000

    Merge "Protect PoolStats table from negative values."

commit 13349a1f4df97e3576d7a6f48591f149c7191fda
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jun 11 12:11:32 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8df971702d0709ed90db12b3f1ffff75b4931c5a

commit 135d20218ac8f67153c106d373d3a1c1a00f55d6
Author: Avishay Balderman <avishayb@radware.com>
Date:   Tue Jun 11 01:52:20 2013 -0700

    Protect PoolStats table from negative values.
    
    Fixes: bug #1188959
    
    Change-Id: I67038734dae5dc29e5c0666fdc98827dfd50b678

commit 7920bd9f882d99d12379a47d6c5569fdf15f7074
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Mon Jun 10 18:23:29 2013 -0700

    Improve readability for nvplib error messages.
    
    Fixes bug #1189683
    
    Change-Id: Idaf8e072291af2f08df6a502f1d87ee350aab0af

commit 1bfd162fc29b6f498cdc176d90a73580f2ee6085
Merge: c4d8525 725d636
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 16:42:11 2013 +0000

    Merge "Expose most common QueuePoll parameters from SQLAlchemy"

commit c4d8525ad3abd2ee4d3bb1a83c76a2afb5edcb78
Merge: d8b40a0 ae779e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 16:17:37 2013 +0000

    Merge "Hide lock_prefix argument using synchronized_with_prefix()"

commit d8b40a0b638594667e0d951d50562f1cd7701075
Merge: 5579690 e89f7da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 16:16:51 2013 +0000

    Merge "Fix and enable H90x tests"

commit 5579690ddd8d590cacfc3ab0569d577b036674ce
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jun 10 12:11:28 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I076ac10aa31a43369a100acfe72b6737a53c26ee

commit a98884efd966fdd69ba88585b7a154ba87d1d061
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Fri May 17 15:04:19 2013 -0500

    Add support for VXLAN to the Open vSwitch plugin.
    
    This commit adds support for utilizing the VXLAN tunneling protocol in versions
    of Open vSwitch >= 1.10. This is configurable and will default to GRE if not
    configured. As part of this commit, it is possible to configure the UDP port
    VXLAN will utilize as well. VXLAN and GRE cannot be configured at the same
    time with this patch. 2 new configuration file options are added to the AGENT
    section of the config to support this: 'tunnel_type' and 'vxlan_udp_port'.
    In addition, the agent no longer makes use of enable_tunneling, as this can
    be determined if tunnel_type is set.
    
    Note: The VXLAN functionality utilized here is what is implemented in Open
    vSwitch itself, and is different than the VXLAN functionality in the
    upstream Linux kernel. The code validates both the userspace and kernel
    pieces of OVS to verify if VXLAN functionality can be supported on the
    running system
    
    Implements blueprint ovs-vxlan-lisp-tunnel
    
    Change-Id: I45d49d5d6463e574922c7f50d6499c6bdb6c862c

commit ae779e4bf761d2fd1df85d71c412c3d963be021b
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue May 14 17:17:46 2013 +0800

    Hide lock_prefix argument using synchronized_with_prefix()
    
    The lockfile module has a new convenience API which sets the lockfile prefix.
    Using this API, the prefix is not required everytime synchronized is used.
    This enables for projects to have consistant prefixes on their lockfiles
    
    Change-Id: I4bc3f28a9ed2a6e2438a90f163bbde081211062c

commit ff5026642704d383764eafdeeb0fc70c76d50171
Merge: 30aa21a 8708bc5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 10 06:30:23 2013 +0000

    Merge "Add support for protocol numbers"

commit 30aa21ace2c392995d31f60673fc62dba4d94c40
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 9 12:11:27 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ied5f298513ecf312e0cb6dcd5bc0740e869f44d9

commit e89f7da8c86ff2840904894bf428da2e0ae240d4
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sun Jun 9 13:50:49 2013 +0200

    Fix and enable H90x tests
    
    Only triggering in few places that are easy
    to fix. Start gating on those checks.
    
    Change-Id: Ib4ff23159bd83fd3455b5357d5338fe37ca23fa2

commit 91f850207de229c167fc1683053875b76299990f
Merge: 481b162 6c510bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 9 09:09:08 2013 +0000

    Merge "Change lazy='dynamic' to 'joined' in models_v2"

commit 481b162f34743007384c818f2e4cc36faaa794b7
Merge: 11787f9 68a5a38
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 9 07:54:31 2013 +0000

    Merge "Sync Qpid RPC fix from Oslo"

commit 11787f975e90ea35487bcbc75b67f1ab44a3fd26
Merge: 78c3f89 881b629
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 9 07:54:22 2013 +0000

    Merge "Remove generic Exception when using assertRaises"

commit 6c510bce812900af1b69f346d8f46a2cc5a8fe8c
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jun 4 17:19:07 2013 -0700

    Change lazy='dynamic' to 'joined' in models_v2
    
    Previously several models were defined with lazy='dynamic'. This would
    then cause Ports.fixed_ips (or w/e was specified as dynamic) to be defined
    as a AppenderQuery object and when accessed would query for the result.
    Therefore in get_ports() for example, when fixed_ips was accessed
    in _make_port_dict() we would be issuing an addition query to the database
    to lookup the fixed_ips information.
    
    This patch changes update_port/subnet() so that it keeps track of what
    changed so it does not have to query the db for values it should already
    know about.
    
    This patch also adds a unit test for update_subnet() adding host routes
    where there was missing code coverage.
    
    Implements blueprint improve-db-performance
    
    Change-Id: I0b2214604042a1fd362cbbf3fd70e31adf0ce279

commit 5324e2be69f477a67cb28795f9ff5b02fb3d23fe
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sat Jun 8 13:17:03 2013 +0200

    Use Python 3.x compatible octal literals
    
    Python 3.x deprecated octal literals in the form 0755.
    Use the Python 2.x compatible version 0o755 instead.
    
    Change-Id: I90ea601847752ae04d4e403ffa16a537efe442e2

commit 78c3f890c98baa32c34aad213fbc6b231c9d142a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Jun 8 12:11:34 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2ea142c1e98123806ed3f15e1ab01e1cfd7c64b8

commit 28fa212b0dca67d441c0cb0e065cb07e90c16d70
Merge: 98ef8d1 d3781d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 8 10:14:55 2013 +0000

    Merge "Handle portinfo msg after port deletion in NEC plugin"

commit 98ef8d119c7783a999335a00bcf91ccdc766e36f
Merge: 9846b19 d671bad
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 8 06:37:44 2013 +0000

    Merge "nicira plugin: load subnet once when adding router interface"

commit 9846b19d9fcb4b15ad364a4733488bf97f68ba7d
Merge: 7e0f9d2 8305495
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 8 06:33:54 2013 +0000

    Merge "Nicira plugin: always fetch lports from correct lswitch"

commit 7e0f9d2b1bdd71ca78e68bd7c780eb9a95ecd08b
Merge: a8c7ab6 81ce989
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 8 06:30:58 2013 +0000

    Merge "Improve test coverage in NEC plugin"

commit a8c7ab6a3c6b353a6461915148d9f9f0fda6aa60
Merge: 02a573a e02c746
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 8 00:35:42 2013 +0000

    Merge "Adds support for the Indigo Virtual Switch (IVS)"

commit 881b629f656961692103c49b6b8601373910d58e
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Jun 6 20:00:06 2013 -0400

    Remove generic Exception when using assertRaises
    
    This change fixes errors associated with H202 checks and enables H202
    checks.
    
    Change-Id: I28a48d1b58f2f1f6824ee4b45782a0c961fe9fb5

commit 68a5a387020cdb0c5d664b7add2d897134877d19
Author: Ben Nemec <bnemec@us.ibm.com>
Date:   Fri Jun 7 16:35:14 2013 +0000

    Sync Qpid RPC fix from Oslo
    
    Qpid cannot serialize dicts containing strings longer than 65535
    characters.  This change syncs the fix from Oslo to Quantum.
    
    Fixes bug 1175808
    
    Change-Id: I48071abffa86e71727deed05aca08ac475cbaf05

commit 8305495f161a485263807bc4c663d4578a96d559
Author: Salvatore <salv.orlando@gmail.com>
Date:   Fri Jun 7 17:08:47 2013 +0200

    Nicira plugin: always fetch lports from correct lswitch
    
    Bug 1188652
    
    Remove get_logical_port_status which required a lswitch uuid, and
    replace it with a call to query_lswitch_ports, which does not
    require it.
    
    Change-Id: I6c7d0403f37b2c9fb4332a8d34dcaa9050ced3fc

commit 81ce9890ce4299b98713a641f36e8e099db178c1
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue May 21 05:07:05 2013 +0900

    Improve test coverage in NEC plugin
    
    blueprint nec-plugin-test-coverage
    
    This commit adds the following changes in unit tests.
    - Unit tests to check communications with the controller in NEC plugin
    - Unit tests for nec plugin agent
    - Improve coverage of OFC drivers
    - Mock the client to talk with the external controller in db.
    
    Change-Id: I2b9ab0480da312ea5e804ca04b543cc144b7e545

commit 02a573acaa5ee692845d5aa39f914eaaf2dbd671
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Jun 7 12:11:13 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I05ca2810f548379c4a2201c8d761904b8bec0ff5

commit d671bada20e7f0a1a7bf587f40489a12551c717c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Jun 7 12:33:44 2013 +0200

    nicira plugin: load subnet once when adding router interface
    
    Bug 1188562
    
    This patch ensure subnet is loaded only once from the database.
    Also, the port is now loaded from the database only if the
    corresponding NVP logical port is found.
    
    Change-Id: I1626c7b61ddc8e785d8ce2e39619da78b20ae61e

commit f83931af80d8166c53622ce5e6248205a4d7afaa
Merge: b87981d 82ccdf8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 23:16:46 2013 +0000

    Merge "Add API mac learning extension for NVP"

commit e02c746a94c3024678dd6b3458573667b1cb9d73
Author: Kevin Benton <kevin.benton@bigswitch.com>
Date:   Tue Jun 4 16:18:58 2013 -0700

    Adds support for the Indigo Virtual Switch (IVS)
    
    Implements: blueprint ivs-interface-driver
    
    Adds the IVS VIF type to portbindings.py.
    Adds the VIF interface class to allow agents to bind to VIF switches.
    Adds support to the BigSwitch plugin to request the IVS VIF type on nova compute nodes.
    Adds unit tests for new interface class and changes to BigSwitch plugin.
    
    Change-Id: I2fe104000523c60097c22946b0a80dc404dfe273

commit b87981d556d0b21400f140aba1012dc67b0791c1
Merge: 9105172 08cf094
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 6 22:20:50 2013 +0000

    Merge "Fix typo in l3_agent"

commit 8708bc538e2515899cf874e1e5e2275360fb5ef6
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jun 6 15:06:24 2013 -0700

    Add support for protocol numbers
    
    This patch adds support for passing in protocol numbers into the API.
    For example, 1 instead of ICMP. This allows all protocols besides
    just TCP/UDP/ICMP to be used. This patch includes changes to support
    this for the NVP Plugin. Existing plugins using securitygroups_rpc_base
    and OVSHybridIptablesFirewallDriver require no change to leverage this.
    
    Implements blueprint security-group-rules-protocol-numbers
    
    Change-Id: I7d3b6986d9d0dadbefac0ea7798475a573dac046

commit 82ccdf893e7abc51924f6429123e3d22d6212c57
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Wed May 22 22:43:17 2013 -0700

    Add API mac learning extension for NVP
    
    This commit adds an API extension for NVP where the
    NVP supported mac learning feature can be switched
    on/off for a specific port. The attribute can be
    True or False or omitted altogether.
    
    Implements blueprint nvp-mac-learning-extension
    
    Change-Id: I9173c7dfe0cf4a9ee7b0605722ce7fa01708f5ba

commit 725d636da5959aee1954a8e8d5ff383d2a8b7bb9
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jun 4 15:14:39 2013 +0000

    Expose most common QueuePoll parameters from SQLAlchemy
    
    Fixes bug 1160442
    
    The defualt parameters are used unless otherwise configured. This
    is applicable for:
     - pool_size
     - max_overflow
     - pool_timeout
    
    By increasing the pool_size and the max_overflow and lowering the timeout
    the issue reported in the bug is resolved.
    
    NOTE: the configuration values enable the user to make use of the default
    QueuePool tuning values.
    
    Change-Id: Ic258442531a2caf2db4f05c4ddd6fbfb0c180f17

commit 9105172d46c17bb13996fcf659c4d34242c0ce0c
Merge: 298ce32 2b65a86
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Jun 6 09:36:48 2013 +0000

    Merge "Imported Translations from Transifex"

commit 08cf09420b5af4d191908996abed74b45993ffcb
Author: Nikolay Sobolevskiy <nsobolevsky@mirantis.com>
Date:   Thu Jun 6 12:44:19 2013 +0400

    Fix typo in l3_agent
    
    Fix incorrect typo in the option description.
    
    Change-Id: I80b829328cce89c12ce98976d106cf02a82592ab

commit 298ce321c37eeb9f3eef4ec3ecd808cbd31a9e25
Merge: 56b1a56 dd3a40d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 22:47:40 2013 +0000

    Merge "multi-vendor-support-for-lbaas"

commit 56b1a56c7049ca3b9a767d8df94f0160b3b023c3
Merge: d83caf9 0b7f272
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 20:12:29 2013 +0000

    Merge "Sort NVP supported extensions alphabetically"

commit 2b65a86e3060e311b4e0b3275345dd1342dc0fbc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 5 12:12:02 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ied11f335e84c91f87a4344200d12ddff51128ba1

commit dd3a40d92b61a3ad94ee8c52b0affce96b141ac7
Author: Avishay Balderman <avishayb@radware.com>
Date:   Sun May 5 02:22:17 2013 -0700

    multi-vendor-support-for-lbaas
    
    BluePrint: multi-vendor-support-for-lbaas-step0
    
    This is the first stage in a 3 stages BP
    
    Change-Id: Ic5b2c46c5a74338c3fa14cc991f4420cabd7798e

commit d3781d5aa12f6c512a455e59ecc6fe10ca908ca9
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Jun 4 12:37:59 2013 +0900

    Handle portinfo msg after port deletion in NEC plugin
    
    Fixes bug 1187701
    
    Change-Id: I9c5ef3320ad6e9438dca9ccccf27f4cedfe4ceec

commit d83caf9c1ed680e8c6d5728fe92f7db71cb53a17
Merge: 6e5bf48 119c099
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jun 5 07:46:56 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6e5bf4836b12674efee5907145c2649bebdd23de
Merge: 43a2812 d2195a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 07:46:53 2013 +0000

    Merge "Fix branch in db migration scripts"

commit 43a2812f260c3d09a723ef06f8e97709f24b880b
Merge: 446d146 554e26b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 5 07:46:43 2013 +0000

    Merge "Add extra details in BigSwitch config"

commit 446d146980d026112077e0656be25f5ac0f7cd8a
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jun 4 17:59:56 2013 -0700

    Add *.swo/swp to .gitignore
    
    I noticed these files weren't being ignored when I accidentally uploaded
    one here: https://review.openstack.org/#/c/30648/3
    
    Fixes bug: 1187600
    
    Change-Id: I8570f797e2cc7420dc8a578a9cf68741631cd9f6

commit 0b7f272ab58d64693c3630aa0204dda7850163e6
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Jun 4 15:52:29 2013 -0700

    Sort NVP supported extensions alphabetically
    
    It is easier to read, and makes diff's smaller
    
    Change-Id: I90b6ab566fbc720c4656b70ccbe10c6cc6338d82

commit 554e26bb6f776f0b1bdbb0207882c69be8ee52d7
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Tue Jun 4 09:42:00 2013 -0400

    Add extra details in BigSwitch config
    
    Add some details to some of the BigSwitch configuration options.
    
    The doc team will soon be generating documentation for configuration
    options by extracting it directly from the source code help strings,
    which is one of the motivations for adding this detail.
    
    Change-Id: I7c694212bee29ac78135a4436633a202a6bba4a2

commit 119c099c027dd848c4ee00a3c0d3026a6513ddf7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jun 4 12:12:04 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I61bfcf2c69002b8504bbc0f9684ced94fde16dce

commit d98f8141a17b9d118e9e4c6b1a82dc3d83211c1f
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Jun 4 12:45:23 2013 +0900

    NEC plugin: Ensure to delete portinfo when port_removed RPC.
    
    Fixes bug #1187249
    
    Change-Id: Iaccfd1d4918df5dc4ba1c0478689fd4c833da7b3

commit 7d18755b5161469789fcefa373b2655da019b221
Merge: cd47272 9d3907e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 20:31:07 2013 +0000

    Merge "Add execute file mode bits to quantum-mlnx-agent"

commit cd4727258faa2d3dbec8a1bd58d5e0acff8c6aa7
Merge: 1810929 d735cca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 20:31:04 2013 +0000

    Merge "Add InvalidExternalNetwork exception to display correct error"

commit 18109293c5bda55b3263be7db7664b08e5dc78ba
Merge: 0594b65 9e7933d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 17:57:32 2013 +0000

    Merge "DbQuotaDriver allows negative quotas to be set."

commit 0594b6530dc8230b13b297c78c39bb9ff149f1e9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Jun 3 12:12:05 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie69e21dda6d8d0f365e08a04a78226f07f2feb24

commit 648d3b76bec723b24a5cbf1309e06117bdd1a980
Author: Mate Lakat <mate.lakat@citrix.com>
Date:   Mon Jun 3 10:39:13 2013 +0100

    xenapi: fix rootwrap
    
    The xenapi root wrapper did not parse the "exec_dirs" parameter, so it
    failed to execute the commands. This patch works around this problem by
    parsing the "exec_dirs".
    
    Fixes bug 1185872
    
    Change-Id: I10175c7df5d34e47eb6044711ffbe4fe4cee3ce2

commit 9d3907e2d699ac25385a02cb7fc0fe7b2da80717
Author: Jian Wen <jian.wen@canonical.com>
Date:   Mon Jun 3 11:17:36 2013 +0800

    Add execute file mode bits to quantum-mlnx-agent
    
    chmod a+x bin/quantum-mlnx-agent
    
    Change-Id: I363e4e1ab43925964b5da866ec8843317c43dbcb

commit ef95f7ffba44cbd0f36183d7517739c5a9a61ab4
Merge: cd4768d 537ff09
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 02:30:53 2013 +0000

    Merge "Rename README to README.rst"

commit cd4768d73c529e3d66484abae1e5a6f85ae7c477
Merge: 2883738 c551e4a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 02:03:45 2013 +0000

    Merge "Port profile should not mark vlan as native-vlan"

commit 28837386a392609b010c0d0d9d88f09f2d58cb27
Merge: f21d52c 87b2548
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 3 02:03:42 2013 +0000

    Merge "Add rollback for Cisco plugin update_port failure"

commit f21d52c15e8681a1b82466d014b23e518d7fb2b4
Merge: 5f11769 b2b0681
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 2 15:17:50 2013 +0000

    Merge "python3: Introduce py33 to tox.ini"

commit 5f11769b9a8883c5accef76f0a21df99f9a4baaf
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Jun 2 12:12:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I26ef92286c40267918e3990a4c2970731bf3bc17

commit d2195a50809580ec4fa318d1774e5e3f3c0fca07
Author: Jian Wen <jian.wen@canonical.com>
Date:   Sun Jun 2 09:13:22 2013 +0800

    Fix branch in db migration scripts
    
    Fixes bug 1186113
    
    Change-Id: I1ab661a8767004489226c8107b84fef05a3e34cc

commit b2b06811ba8e75b24c1b9858830c34a529604db7
Author: Chuck Short <chuck.short@canonical.com>
Date:   Sat Jun 1 19:34:17 2013 -0500

    python3: Introduce py33 to tox.ini
    
    Introduce py33 to tox.ini to make testing with
    python3 easier.
    
    Change-Id: I6cf924921e3595baac94ae1567cb2bd68457377e
    Signed-off-by: Chuck Short <chuck.short@canonical.com>

commit c551e4a41878d28addf307ac23efb4f040fafaa2
Author: Shiv Haris <sharis@brocade.com>
Date:   Sat Jun 1 10:54:30 2013 -0700

    Port profile should not mark vlan as native-vlan
    
    Change-Id: I0b117ad8a3761e8f8ae59ae21fb68bbc3303b35b
    Fixes: bug 1186461

commit c675e0ba168b5786a0fc31327804354b312440f6
Merge: fa42c08 b0d49b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jun 1 16:30:41 2013 +0000

    Merge "Enable router extension in Brocade Plugin"

commit 537ff09fc27a6cfb24b6b2d7ace179e95153af18
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Fri May 31 12:00:26 2013 +0200

    Rename README to README.rst
    
    README.rst seems to be more standard accross OpenStack
    modules. Also add it to the manifest. Fix a typo
    in the manifest.
    
    Fixes: LP Bug #1186518
    
    Change-Id: Ib04f44a1186d3793f5fca39c0c29d74a78a52faf

commit 87b2548e8845fa9710a1b89a642d06fd28148572
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Fri May 17 11:42:59 2013 -0400

    Add rollback for Cisco plugin update_port failure
    
    Fixes bug 1174433
    
    This fix adds a rollback of the OVS plugin update_port operation
    following a failure to update the port in the Cisco Nexus sub-plugin.
    
    Also, this fix removes an unneccessary call to the Nexus sub-plugin's
    update_network method within the Cisco plugin model layer's
    update_network method (as well as the associated argument setup).
    The Nexus sub-plugin's update_network is a no-op, so there's no
    need to call it.
    
    Change-Id: I10cba0d7f1d632c7f77eb6c4a94ea82b958bc6a2

commit fa42c082bac9af4cfbce2826fbed9c978340a868
Merge: 9c14b49 28884ff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 19:53:30 2013 +0000

    Merge "Sphinx-ify QuantumPluginBaseV2 docstrings"

commit b0d49b646c58cdd0831eeba97aef55c19382ef5b
Author: Shiv Haris <sharis@brocade.com>
Date:   Thu May 30 16:43:06 2013 -0700

    Enable router extension in Brocade Plugin
    
    Fixes: bug 1166516
    
    Change-Id: Ia3be25b9cdc21b217200997d1a447dccf8549d64

commit 9c14b49ebf1ba9a07194a117df1494be1767f9e4
Merge: a555cef 6f9fdcb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 14:51:15 2013 +0000

    Merge "Add L3 resources to policy.json"

commit a555cefd07bb98eaac7e1052cba76e153308c1f1
Merge: 599d73c efdcf95
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 31 14:29:03 2013 +0000

    Merge "Imported Translations from Transifex"

commit 599d73cea88d1112a193b9defc849994afaae41e
Merge: 0baf72d 23aec9a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 14:28:59 2013 +0000

    Merge "Make MidoNet plugin code more testable"

commit 0baf72d3ebfac3ea68923445b7215d4af91e1b69
Merge: 5513fee 6ae0c41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 14:28:55 2013 +0000

    Merge "Fix typo"

commit 28884ffaa49cb6ff7f0c18a646c55b0387d6282f
Author: Lorin Hochstein <lorin@nimbisservices.com>
Date:   Sun May 26 16:42:21 2013 -0400

    Sphinx-ify QuantumPluginBaseV2 docstrings
    
    The quantum.quantum_plugin_base_v2 module had some good docstrings,
    but there was no corresponding sphinx code that would generate
    docs from them. There were also some syntax issues with the
    sphinx markup in the docstrings.
    
    This change adds sphinx directives so these docs will be auto-
    generated. It also modifies the docstrings in the QuantumPluginBaseV2
    methods so they are parsed by the Sphinx documentation generator
    without any errors.
    
    If this patch is accepted, a "Plugin API" link to these docs
    will appear at
    
    http://docs.openstack.org/developer/quantum/
    
    Fixes bug 1186255
    
    Change-Id: I96eddcc516d109766d7f4c52edd595748696b595

commit efdcf958d5fd9816da4f7a63d1947c617cfb7bc1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 31 12:12:09 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9ad53953b1902c2538fe6888773ea0d7811371d3

commit 5513fee1d5debae9dc066d64885aca339482dec7
Merge: 0dbb0e9 d557c28
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 08:08:37 2013 +0000

    Merge "Control resource extension process defining required extensions"

commit 0dbb0e9d54309e3a349f0cea0f5a617801b6406f
Merge: 930cf15 92ef293
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 08:03:53 2013 +0000

    Merge "Fix Cisco nexus plugin failure for first VLAN on phy interface"

commit 930cf15d1bd926ca9cf8470f7ec26649bac3a024
Merge: 751983e 3786f3a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 08:03:49 2013 +0000

    Merge "Fix pool update error in lbaas"

commit 751983e205f6232a84517b4346c482902f9fb88c
Merge: b5e76a8 47846a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 31 04:59:50 2013 +0000

    Merge "Rename requires files to standard names."

commit 6f9fdcb3a152da3f2954589a1bd20064f2d7faea
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu May 30 19:33:55 2013 -0700

    Add L3 resources to policy.json
    
    This patch adds the l3 resources to policy.json. I tested changing the
    rule to rule:admin_only for all the resources added and they were
    enforced as expected.
    
    Fixes bug 1186077
    
    Change-Id: Ib5e2879165d9dc6416be4c96c62d6e49452d3be5

commit b5e76a866a8a6c4efffffe80b3158a1d96066c93
Merge: 82f7d1a 12f1f39
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 30 23:09:10 2013 +0000

    Merge "Imported Translations from Transifex"

commit 47846a7a6320b424a50571e4d35595644d9ce133
Author: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date:   Thu May 30 13:36:22 2013 +0800

    Rename requires files to standard names.
    
    Rename tools/pip-requires to requirements.txt and tools/test-requires
    to test-requirements.txt. These are standard files, and tools in the
    general world are growing intelligence about them.
    
    Fixes: bug #1179008
    Change-Id: I6f8a11988982133249d443403f63b4f8724e156e

commit 92ef293d02a7499850bc3becda413d6be22ae06c
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Fri May 10 17:54:04 2013 -0400

    Fix Cisco nexus plugin failure for first VLAN on phy interface
    
    Fixes bug 1174852
    
    This fix changes the command being sent to the Nexus switch for
    enabling a VLAN on an interface such that the 'add' keyword is
    included only when there are prior VLANs already enabled on that
    interface.
    
    Change-Id: I466bcb839912b164b84be0e6721d87206c0e53eb

commit 82f7d1a6dc498dd2476ef2802311920033babd48
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu May 30 08:07:38 2013 +0000

    Align default value notation in configuration files
    
    Fixes bug 1185712
    
    Change-Id: Id17779f8f464fcaf36bbab9f84c29e35d86214b7

commit 12f1f397daf9d67c4587671f6e81bc8be659b361
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 30 12:12:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I1927741396e5f4ab237267fd2cc72d19acc0481e

commit 3786f3ab2028b18e427569ee0824cdbb85e91c55
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu May 30 12:25:16 2013 +0400

    Fix pool update error in lbaas
    
    fixes bug 1185687
    
    Do not notify namespace agent of modified pool
    if pool doesn't have vip
    
    Change-Id: Ibe3399aaa145d19fc758f08adb51c7ffefa5bb3a

commit 726aca58d70016a12f44eb7c07742fb6a54bb366
Merge: cf7bd0a b345dbb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 30 07:00:03 2013 +0000

    Merge "Fix ml2 stack trace when logging."

commit cf7bd0a2db26356ebc80de9aa417ffa353b1178b
Merge: 7f37486 e2e2c62
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 30 01:19:14 2013 +0000

    Merge "Refactor db_base_plugin_v2 and to remove code duplication"

commit b345dbb8676ad2ff57bfa9daa6f7dec3753b75cd
Author: Bob Kukura <rkukura@redhat.com>
Date:   Wed May 29 18:18:41 2013 -0400

    Fix ml2 stack trace when logging.
    
    Change-Id: I8bbf6edd3e526483e7f04e3eeeea571a660235fa

commit 7f37486cf323f58417857e2a34541e199c9e06f6
Merge: 59089e5 f572a5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 17:21:04 2013 +0000

    Merge "Initial Modular L2 plugin implementation."

commit 6ae0c414ad6f71105404d3a0fd1f7d6754a9cff6
Author: Sean M. Collins <sean@coreitpro.com>
Date:   Tue May 28 13:57:09 2013 -0400

    Fix typo
    
    Change-Id: I83bdbd5d58a217d616bb2bb68f82ef6586d7b715

commit 9e7933dc55ea086b3a2977d9c25ab503174ba7af
Author: Stephen Ma <stephen.ma@hp.com>
Date:   Fri May 10 20:24:55 2013 -0700

    DbQuotaDriver allows negative quotas to be set.
    
    Bug 1178886
    
    Change-Id: I06ece65c2d77b8258bb871bb396edc5c145c383a

commit 59089e56f674f5f94f67c5986e9a616bb669d846
Merge: 0bac5c1 9f1d2e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 14:40:59 2013 +0000

    Merge "Configurable external gateway modes"

commit 0bac5c1e5cb784880027289e265850e46ed38628
Merge: 010bfa6 3d0e0c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 13:31:28 2013 +0000

    Merge "Remove unnecessary checks for MultipleResultsFound"

commit f572a5eb93bff8b57b8a8a4aa92df86750c0843a
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Oct 5 11:50:39 2012 -0400

    Initial Modular L2 plugin implementation.
    
    The Modular L2 Plugin uses drivers to support separately extensible
    sets of network types and of mechanisms for accessing networks of
    those types. This is an initial implementation that has been tested
    with the openvswitch and linuxbridge agents, and should also work with
    the hyperv agent. See quantum/plugins/ml2/README for details.
    
    Implements: blueprint modular-l2
    Change-Id: Ia8cae480180f0990af7d5e5e56f29eaeac205e0e

commit 010bfa6234679b0ba1771f561b128a6957b1c240
Merge: c44d7f2 3102bd7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 11:00:38 2013 +0000

    Merge "Revert dependency on oslo.config 1.2.0"

commit 3d0e0c554f22cc122c32d8dfa99509c9b432a62d
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Wed May 29 12:38:29 2013 +0400

    Remove unnecessary checks for MultipleResultsFound
    
    fixes bug 1185080
    
    MultipleResultsFound exception is never thrown because model
    queries are filtered by their primary key.
    
    Change-Id: Id4a4ff84e134d3f1d177509193c4a14f830dfcc9

commit c44d7f21d4d174a2019096a0b84506e8c803164a
Merge: 1c3bf21 67ad85d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 08:12:30 2013 +0000

    Merge "Add sqlalchemy_pool_size option to default config files"

commit 1c3bf211f527bba9c9e23f4fab1ff62cf83190ef
Merge: c554de0 d1a623b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 08:12:27 2013 +0000

    Merge "Use exec_dirs for rootwrap commands"

commit 3102bd700a787e1020b69b71340de53cd648b3d4
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue May 28 21:51:09 2013 +0100

    Revert dependency on oslo.config 1.2.0
    
    Fixes bug #1185174
    
    This reverts commit b8b2c4e, 2f13345, 362bd7f, 8da2fb7 and 956b873.
    
    We don't yet have the infrastructure in place to use latest oslo.config
    in the gate or even get the correct metadata for it in our packaging.
    
    The gory details are here:
    
      http://lists.openstack.org/pipermail/openstack-dev/2013-May/009586.html
    
    Change-Id: Idf89ca418df158e6f94279c9c5fa44f23073a9d7

commit 67ad85db59987632620e38cfdef7569160339d7d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue May 28 20:38:31 2013 -0700

    Add sqlalchemy_pool_size option to default config files
    
    This patch exposes the sqlalchemy_pool_size option to config files of
    plugins that already expose sql_ options besides sql_connection.
    
    Fixes bug 1185260
    
    Change-Id: Ifaff02fae5e5349efb992c071adc0b02f10d61a7

commit c554de0c3516e63807f9a41996f39ff49d150dcb
Merge: 2871d32 3ab6ad3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 29 00:11:09 2013 +0000

    Merge "metadata proxy will use syslog as default log"

commit 27bdfcab29d8e2c28e4aad31df6a56363cf2c6c5
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu May 16 11:01:49 2013 +0200

    Reduce plugin accesses from policy engine
    
    Bug 1179745
    
    This patch introduces a new type of check whose aim is to fetch
    the parent resource's owner only when a rule that explicitly needs
    it needs to be checked.
    
    Change-Id: I1ff429eb3f92b35bcb9b4c4e01b65f8c0a595f48

commit 2871d329eb66b2da7eade94285d6fc39325e467f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue May 28 12:49:20 2013 -0700

    Fix update_port() so that it's done within the transaction
    
    Fixes bug 1185152
    
    Change-Id: I192991650a3562c73af550ec2288d1285412825c

commit c3e24c87fc987f17954a2c48e964ead958dfd0a9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue May 28 12:12:04 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie111c1f365640b62dbc21700c082a0a77ff91cc2

commit d1a623bc97d26b55dde5431d6445a556b5a27c21
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Sat May 18 17:06:30 2013 +0200

    Use exec_dirs for rootwrap commands
    
    Avoid depending on platform specific paths for rootwrap
    by using exec_dirs in rootwrap. Fixes rootwrap configuration
    for SUSE.
    
    Fixes bug #1156044
    
    Change-Id: I54d082c543fd84b40db0caa3571300ac0bb07b57

commit e2e2c62133a0c56a8e5929aa56113451adcb17b5
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Tue May 28 11:45:25 2013 +0400

    Refactor db_base_plugin_v2 and to remove code duplication
    
    fixes bug 1104379
    
    Introduce CommonDbMixin which includes utility methods
    to manipulate model queries.
    
    Change-Id: Ib3602321328cbf945358e0581ecc649e3f69d196

commit bf5deb5c65f6e54bb6db89f65f5a5dcaead78452
Merge: c65a39d 7ff0c53
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 28 03:44:29 2013 +0000

    Merge "Add support for OVS l2 agent in XS/XCP domU."

commit d557c285fd7dfeff09c9f03600e861c752179eef
Author: Salvatore <salv.orlando@gmail.com>
Date:   Wed May 15 15:05:30 2013 +0200

    Control resource extension process defining required extensions
    
    Blueprint l3-ext-gw-modes
    
    The resource extension process is slightly altered so that an
    API extension can specify which extensions should be processed before
    its attributes can be processed. This is needed to ensure the
    l3-ext-gw-mode API extension sets up correctly validators and other
    attributes for the external_gateway_info attribute
    
    Change-Id: I7c05746e67b1324a73082dde8b5c862d631c083c

commit 9f1d2e0c51ba47610f30d56de356f301c22e0dcd
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Feb 18 10:57:39 2013 +0100

    Configurable external gateway modes
    
    Blueprint l3-ext-gw-modes
    
    This patch introduces an API extension for enabling or disabling
    source/destination NAT on the router gateway interface, and implements
    support for this extension in the l3 agent, which has also been
    refactored in order to ensure SNAT rules are applied (or removed)
    in a single place in the process_router routine.
    The patch therefore enables the extension on all plugins which
    leverage this agent.
    In this patch the validate_boolean function is re-introduced, as it
    used for validating a field of the external_gateway_info dict.
    The resource extension process is also slightly changed so that an
    API extension can specify which extension should be processed before
    its attributes can be processed. This is needed to ensure the
    proper validator for external_gateway_info is installed.
    
    Change-Id: Ia80cb56135229366b1706dd3c6d366e40cde1500

commit 23aec9a5bb02c98f02497669910e43d1b543c745
Author: Ryu Ishimoto <ryu@midokura.com>
Date:   Tue Feb 26 01:34:46 2013 +0900

    Make MidoNet plugin code more testable
    
    Refactor plugin.py and midonet_lib.py to improve unit testing of
    the MidoNet plugin.  Make all the tests pass in the plugin except
    those that test features that are not currently supported by the
    plugin, which are IPv6 and multiple subnets per network.
    Consolidate the mocking code in mock_lib.py to be shared by
    plugin.py and midonet_lib.py.
    
    Change-Id: Idcdfc3d90d5ec9e0be29bb6833d336af596fe363
    Fixes: bug #1133215
    Signed-off-by: Ryu Ishimoto <ryu@midokura.com>
    Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>

commit c65a39deaf8907d50dfae44e7fc14fae451005ab
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon May 27 12:12:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib68cbb1f513ced852c91f19d3cad1976bd8ea28d

commit ff36751e1e45d24fe94f4aaca117bb55e61e62b8
Merge: dfcb339 95d7c50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 27 00:12:26 2013 +0000

    Merge "Ensure API extensions for NVP are loaded by default"

commit dfcb3395e56eea7c7d8357bd1f28d642d09811a6
Merge: b8960ea 900debb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 26 23:07:18 2013 +0000

    Merge "Imported Translations from Transifex"

commit b8960ea39378a2fa5ea96e2a25a20cb794f5dde6
Merge: e2d7862 1c1ef91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 12:31:16 2013 +0000

    Merge "Added conversion specifier for proper log"

commit e2d78625ca6a3df08ec6000c7aa34ddd3ae9b0be
Merge: 26fb273 422d4bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 12:31:13 2013 +0000

    Merge "Nicira plugin: List ports on network gateways"

commit 26fb273534558de6de2c1450b00ca9138e3e0630
Merge: a87e51c b5bf227
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 26 12:31:09 2013 +0000

    Merge "Perform a sync with oslo-incubator."

commit 900debbbe468db139f311054b18e2c400d3af997
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 26 12:12:07 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic91b2aafdb2bc1e844ea04d0f87ae272475080d0

commit 1c1ef911c13be19c33e3de662618a8eccd61af86
Author: Mukul <mukul18@gmail.com>
Date:   Fri May 24 23:32:12 2013 +0530

    Added conversion specifier for proper log
    
    In function create_for_sg_rule conversion specifier after string varaible
    "rule_id" was missed. It was causing an error during translation of debug
    message due to unavailability of conversion specifier. Included proper
    conversion specifier for getting proper debug log.
    
    Fixes: bug #1183734
    
    Change-Id: I0342a091fb8199273c1bb9af59c42c0e09c39349

commit d735ccaf2c99c66ed050cd7cfa44c3e73bc7d8ab
Author: Robert Pothier <rpothier@cisco.com>
Date:   Thu Mar 7 16:43:54 2013 -0500

    Add InvalidExternalNetwork exception to display correct error
    
    Fixes bug 1075089
    
    The message in the BadRequest exception raised in file
    quantum/tests/unit/test_l3_plugin.py is
    being muted in the logfile  since the BadRequest is
    catched and writes its own log message.
    
    Change-Id: Ia0140620205a80dd4b3637b2d41562adb7992b5c

commit 3ab6ad34ec0e498945f7031e86e45686b2df6ea5
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri May 24 09:49:33 2013 +0800

    metadata proxy will use syslog as default log
    
    Bug #1183614
    
    Change-Id: I39f07fc7d232148c50cf85fbc4ca6ca7cde8fdfa

commit 95d7c5052a0192c894f75de0f630f541d2b7326f
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue May 21 22:10:13 2013 -0700

    Ensure API extensions for NVP are loaded by default
    
    Fixes bug #1182736
    
    Change-Id: I286f5b69d58a4cd3a0e25a984559fdf37068a75c

commit a87e51cebba9f88ea2c9e947a06ae29ba55f3478
Merge: cf1569c 7e3cef2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 24 01:07:32 2013 +0000

    Merge "avoid auto scheduling one dhcp agent twice."

commit cf1569cbfae5f1e0c797d93c375becc14a374e45
Merge: b03240b f0e38f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 24 00:12:07 2013 +0000

    Merge "Fix typo in option group shortcut 'aGENT' in NEC plugin"

commit b5bf227db493c4b4db0fb6985b5e0bd9fe9d3ff4
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Wed May 22 14:44:48 2013 -0700

    Perform a sync with oslo-incubator.
    
    This oslo-incubator sync pulls in a new log.py which will make quantum's
    default log output format the same as nova, glance and cinder (once
    cinder's corresponding oslo sync merges). This common log format
    simplifies log indexing as part of CI and makes lives easier for
    deployers.
    
    This sync does add a requirement on six as jsonutils depends on it. It
    updates install_venv_common.py to be python26 compatible. It also brings
    in a bunch of recent python3 compatibility that was added to oslo.
    
    Fixes bug 1183144
    
    Change-Id: Id0f196d7b5680e5950e4a27d66042bf00ccd49e6

commit b03240b9bf045a427543da27f8abc80f0ddf4db5
Merge: ee4b047 8da2fb7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 21:33:42 2013 +0000

    Merge "Require oslo.config 1.2.0a2"

commit f0e38f4c754f049a05fa9ffa5204524701ed21f6
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri May 24 06:23:45 2013 +0900

    Fix typo in option group shortcut 'aGENT' in NEC plugin
    
    Also adds a test to check if option group shortcuts work.
    
    Fix bug #1183576
    
    Change-Id: Ib2843f2b2b4e35964fb4bb5280fda8f5c9e2ba0c

commit ee4b047940d82c347d347cea35bd8fe24c2ca4e8
Merge: 80d8fd6 40fae82
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 23 20:12:12 2013 +0000

    Merge "Imported Translations from Transifex"

commit 8da2fb7c562323e16a574b09a0a3a77ea8a94fa3
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Wed May 22 12:35:57 2013 +0100

    Require oslo.config 1.2.0a2
    
    Fixes bug #1182662
    
    Commit 362bd7f switched us from using 'QUOTA' as a config file section
    name to using 'quota'.
    
    This broke backwards compatibility support for 'QUOTA' because the
    version of oslo.config that has that compat support had not yet been
    released. The gory details are summarized here:
    
      http://lists.openstack.org/pipermail/openstack-dev/2013-May/009448.html
    
    Change-Id: I7826087147e0713edaaea85a72283998295e2281

commit 80d8fd62229ded835b80d9d137dae4147f6b7cf7
Merge: 1e57943 3ce8ba5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 19:45:39 2013 +0000

    Merge "update mailmap"

commit 422d4bbee75c85a192f3e6edcf6bf4ae300430d9
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu May 23 11:09:19 2013 +0200

    Nicira plugin: List ports on network gateways
    
    Bug 1183277
    
    This patch adds a read-only attribute to the network gateway API
    extension. This attribute will return the list of ports connected to
    a gateway, including their segmentation types and ids.
    This patch now adds joined load for a gateway's connections, thus
    avoiding extra queries to the db.
    
    Change-Id: I2b22c94eed5bc02be16771660008d31c74a8628e

commit 7e3cef2d7b6bb839c399ce8730153b6fa7076d96
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Thu May 23 11:45:49 2013 +0800

    avoid auto scheduling one dhcp agent twice.
    
    Bug #1183173
    
    Change-Id: Iff7b23faae50e6736b253ca5a2b1280451127200

commit 40fae82490feff9ac5453449f11057c2feb4353d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 23 12:12:03 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I25044718d1a8018994aed3fa5c0b18663dde663d

commit 1e579438407c88433b7f3f4eeba1b6c2810c05e0
Merge: cb50def c4fe222
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 23 09:24:43 2013 +0000

    Merge "remove unused db model for openvswitch plugin"

commit 3ce8ba5e9d5acbf2e8a7dc30040972859967821d
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu May 23 08:47:08 2013 +0000

    update mailmap
    
    Reflect new email address that I will be committing under.
    
    Change-Id: I91d763f6020f6aa7a007417c341f952d1efd20c2

commit cb50defbfee1378d1d29d3e8dc98f3d684a2b023
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu May 23 06:22:52 2013 +0000

    Fix quantum.conf comment
    
    Fixes bug 1183209
    
    Change-Id: I87b47e5d5793fde0996712e05b4ddf12be07d3da

commit c4fe222b272ce298b11b9739de101f13f3dad794
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu May 23 06:55:51 2013 +0000

    remove unused db model for openvswitch plugin
    
    remove unused TunnelIP db model.
    
    fixes bug 1182759
    
    Change-Id: I68c271019761e82a554c0d6c719b1689ef76eb98

commit ac4de037ee9c5a6ae821ed98de91879e114b07da
Merge: f700f26 7732e57
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 22 23:56:08 2013 +0000

    Merge "Imported Translations from Transifex"

commit f700f26da5ff480b19420565298ec4c13cd9c284
Merge: 653a408 8b3445e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 14:46:00 2013 +0000

    Merge "Recycle IPs used by 'gateway' ports"

commit 653a40839ef1c861412408c3d9146986c9cfb71d
Merge: 956b873 a506231
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 14:45:57 2013 +0000

    Merge "Revert "Fix ./run_tests.sh --pep8""

commit 7732e570ab885fdb4ac296313dbc728e2c37a4aa
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 22 12:12:12 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifad0cce53e9102e2fc2cd5abd4a14d59b5920c12

commit 956b8739aea1a0aba4227e15a449fd5d0dffa96b
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Wed May 22 07:28:39 2013 +0000

    reference quota options in lowercase
    
    QUOTAS section have been renamed to quotas so reference quota options in
    lowercase.
    
    fixes bug 1182772
    
    Change-Id: Ia08cb51deacc26620e512020b6a3c3b67185ec34

commit b28ae84068bf7b90574aa3ca91d379fae4c530a1
Merge: b353fcb fc914f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 06:51:44 2013 +0000

    Merge "Fix Cisco Nexus plugin failures for vlan IDs 1006-4094"

commit a5062315f5313f511fc079d263dfbe1dd3f897a1
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri May 17 02:18:56 2013 +0000

    Revert "Fix ./run_tests.sh --pep8"
    
    We are explicitly trying to get rid of scripts like this and flake8 makes
    this one non-necessary.
    Fix run_tests.sh to run flake8 properly.
    
    This reverts commit 42243d6eb221d52bf6f62f835726cbe026e43447
    
    Change-Id: I435e34b6acde7931a75f456ccc88da6476581643

commit b353fcbd5e0e922559bce9b98be9c8552f1b8943
Merge: f1c2183 64a5237
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 04:10:25 2013 +0000

    Merge "Restore correct alias for network-gateway extension"

commit f1c2183306ca0edeac5a428380ba607df2153310
Merge: b8b2c4e c95e58b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 22 04:10:22 2013 +0000

    Merge "Enable network to be scheduled to N DHCP agents"

commit 64a523714d306783fdeb0e5eb2fb3be386bba54e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed May 22 00:24:13 2013 +0100

    Restore correct alias for network-gateway extension
    
    Bug 1182682
    
    Change-Id: I85a93e6ccac32515c7ebb2dfe41ba67cf11c9d9f

commit 8b3445eaa5008d3f8c9932ab95a03d0115b6ea32
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue May 21 20:05:00 2013 +0200

    Recycle IPs used by 'gateway' ports
    
    Bug 1182602
    
    Previous code simply removed IP allocation for these ports which
    should never have an IP. This patch triggers IP recycling so the
    IP addresses can be reused by other ports.
    
    Change-Id: I594e02d5bbc78b219eab07e595cde713d6450ffe

commit b8b2c4ebec7f8687215b5fd17a6f0fde84aee043
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed May 22 00:37:00 2013 +0800

    Reference OVS OptGoup names in lowercase
    
    To have consistent option group name format across projects,
    oslo.config now normalizes all non lowercase group names to lowercase
    when loading conf files.
    Thus conf files are backwards compatible but option group references
    in the code must now use lowercase before we update oslo.config.
    
    This patch replaces all 'OVS' references to 'ovs'
    
    Change-Id: Id8697138d822e331a6776f847915c61b40f8dd6a

commit 08c49053c1fb38560b1b243f5219570305444d2c
Merge: 058d156 2b24643
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 16:13:53 2013 +0000

    Merge "Add update method of security group name and description"

commit c95e58b70796eae6bbc8bac283f81df9aa1d1894
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed May 1 12:54:11 2013 +0000

    Enable network to be scheduled to N DHCP agents
    
    Fixes bug 1174132
    
    Change-Id: Iabe96fd8a98f3539eb21268fb5ef58df8dbd8782

commit 058d1563953339b16348a59978f5561cccd8f605
Merge: abb25da a7441a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 14:06:22 2013 +0000

    Merge "Make endpoint_type configurable for the metadata agent"

commit a7441a4f0e9d620743523bf28c9a6370ed57afda
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue May 14 16:32:21 2013 +0400

    Make endpoint_type configurable for the metadata agent
    
    Fixes bug 1176227
    
    Change-Id: Ib4efe29a08efb7ec391d6b16779b27aeb9178324

commit abb25dad094cf4f4fd6f8a00b10878d7635bb56d
Merge: 58f8869 2f13345
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 09:47:15 2013 +0000

    Merge "Reference DEFAULT_SERVICETYPE OptGoup names in lowercase"

commit 58f886971811a162293244045c4f6a236c0419be
Merge: 8b6fcd1 7c82107
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 09:39:51 2013 +0000

    Merge "Enable quantum-netns-cleanup to receive force as cli parameter"

commit 8b6fcd171dc791449ba3096c2e4c13774b5c5a03
Merge: dbdb876 362bd7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 09:35:46 2013 +0000

    Merge "Reference QUOTA OptGoup names in lowercase"

commit dbdb876a4977356cbaf16e860022ab44aa15a508
Merge: 9523672 a9560a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 09:34:52 2013 +0000

    Merge "Make logging level in unit tests configurable."

commit 7c82107f0aaee3e8624e3b3baddfe09b96b9d804
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu May 16 11:44:06 2013 +0000

    Enable quantum-netns-cleanup to receive force as cli parameter
    
    Fixes bug 1180767
    
    Change-Id: Icd58fbe995129806426b70ea54d98f213988dbe5

commit 9523672ce1d2a8461160df71fae19efa4740d513
Merge: f0eecfb 0532030
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue May 21 07:00:41 2013 +0000

    Merge "Imported Translations from Transifex"

commit a9560a9cc03c2d00ba5db4f28eb9405aa854b5a6
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Mon May 20 14:36:39 2013 +0900

    Make logging level in unit tests configurable.
    
    Added a debug option to unittest(BaseTestCase) which sets logging level of
    fixtures.FakeLogger to DEBUG. To enable this option, set OS_DEBUG=True or
    OS_DEBUG=1 in environment variables.
    
    Fixes: bug #1181925
    Change-Id: Id09008ddabb837290edf12e1cbd014dc74760113

commit f0eecfb0bd57911551c77c22a29d1ba2ae9cfcc9
Merge: 7f82194 60d478e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 21 00:32:56 2013 +0000

    Merge "Fix logic in api.v2.base.Controller._is_visible"

commit 7f82194565376c337d5322ba71b00acacfe62c95
Merge: f8f537b b38c56f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 20 18:55:51 2013 +0000

    Merge "Check network vlan ranges for correctness."

commit 053203022a4406512dd576a5f6b6b9156f06553a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon May 20 12:12:02 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id056834e767bc29e5bca4421677e6d8da122bba9

commit 60d478e518d63290f110177a31e8f5ffc1c54681
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sun May 19 18:01:33 2013 +0400

    Fix logic in api.v2.base.Controller._is_visible
    
    Fix accessing yet unassigned local variable in case
    exception is thrown.
    
    fixes bug 1181718
    
    Change-Id: Iea8f0cc252c1d2105cc696d917a347aa10b206a8

commit f8f537be06e70733d0c284cc1fd906d9c97fdfde
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 19 12:12:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I381510446f6990c4126ae4246138f578e4997433

commit b4770f476db47370d6d2730319ea968b4194fb8f
Merge: 7f42336 eb6182f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat May 18 18:54:13 2013 +0000

    Merge "Add l3 attribute to network"

commit 7f4233649ddad8caf22d8710d0d71b550b071874
Merge: 59d6ad2 839cd5d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat May 18 17:33:56 2013 +0000

    Merge "Deprecate "extension:xxx" policies but preserve bw compatibility"

commit b38c56f5b6b0f0b03ff8f2799ccdde2cabfba5a7
Author: gessau <gessau@cisco.com>
Date:   Tue May 14 21:57:47 2013 -0400

    Check network vlan ranges for correctness.
    
    Check that the range beginning and end tags are valid values 1-4094.
    Supply two global constants for min/max vlan tags and update all
    local usage of these values to use the global constants.
    
    Fixes: Bug #1169266
    Change-Id: I054a8bebd16d95ea40414e3cecb6d24a970c730f

commit 2f13345b861e2873abbbeaa69b9620ce431a3baf
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sat May 18 21:52:15 2013 +0800

    Reference DEFAULT_SERVICETYPE OptGoup names in lowercase
    
    To have consistent option group name format across projects,
    oslo.config now normalizes all non lowercase group names to lowercase
    when loading conf files.
    Thus conf files are backwards compatible but option group references
    in the code must now use lowercase before we update oslo.config.
    
    This patch replaces all 'DEFAULT_SERVICETYPE' references to
    'default_servicetype'
    
    Change-Id: Iccab055c4664e11c9618706e594416194065048b

commit 2b2464331629ea6f50655f8c059e1a275ac8a8d2
Author: Zhenguo Niu <Niu.ZGlinux@gmail.com>
Date:   Tue May 14 10:44:08 2013 +0800

    Add update method of security group name and description
    
    make it possible to edit the name and description of
    common security groups, we can not rename the default
    security group.
    
    Fixes: bug #918393
    
    Change-Id: I7003c47e054f032572adbb901be4dbc61839b695

commit eb6182fa6192b1ae4268ac02583622978d449a09
Author: Kanzhe Jiang <kanzhe@gmail.com>
Date:   Fri May 17 14:35:29 2013 -0700

    Add l3 attribute to network
    
    The fix is to add l3 attribute(s) to the returned objects in get_network() and get_networks()
    
    Fixes: bug #1180971
    Change-Id: I4b9c932fae90a169ad1c0119f45e90a2ee260acd

commit 59d6ad203575055f71846dd2811e5ca5110971ca
Merge: bdba865 933259f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 17:44:57 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit bdba865d77de610972e6a599033dba9f705d43f8
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sun Apr 28 21:41:09 2013 -0700

    Move to pbr.
    
    Closes bug 1179007
    
    Change-Id: I3666e373389da6ad9a21a195a42918d4dec50cb5

commit 933259f67520d092d4a29d5287d823f3b08e44c3
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Fri May 17 18:18:35 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    Removed H404 from PEP8 ignore list.
    
    Change-Id: Iabc75281c5d92c5b399c24c9b65aca139f204b0a

commit 99a28085b7f7081a37149add1d13755fc9b9e48c
Merge: c4fc91a ecc0e7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 14:10:37 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit ecc0e7a9de9b0384c485b2dff60ef3acfa371fdc
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Wed May 15 10:48:33 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/*
    
    Change-Id: I771e0f0d6121b7c03cecd82583e9a6c1915f891d

commit c4fc91a33ff2a980d1abef2200d4f643de205bf6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 17 12:11:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I85fd554f5181991c77b415764ebc6e032ef83fac

commit a713ff77d636dd2349db1028da7cd6611054803a
Merge: 25e5e04 6012b7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 09:00:57 2013 +0000

    Merge "Add support for dnsmasq version 2.48"

commit 25e5e0489af3106261d2a5e24d32a530f5875182
Merge: 240ba2d 84f65f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 17 07:18:26 2013 +0000

    Merge "fix reference to tenant id."

commit 362bd7fd09a5c6ff67e751ae5927f5b45deeac11
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed May 15 08:36:11 2013 +0800

    Reference QUOTA OptGoup names in lowercase
    
    To have consistent option group name format across projects,
    oslo.config now normalizes all non lowercase group names to lowercase
    when loading conf files.
    Thus conf files are backwards compatible but option group references
    in the code must now use lowercase before we update oslo.config.
    
    This patch replaces all 'QUOTA' references to 'quota'
    
    Change-Id: I74c2a35aea7a52f9586eb598fe52d2cecb1851ef

commit 839cd5da5c013b77330acbe7ad9ad98c8f12c03a
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed May 15 01:46:13 2013 +0200

    Deprecate "extension:xxx" policies but preserve bw compatibility
    
    Blueprint make-authz-orthogonal
    
    Patch #4 for this blueprint.
    With this change, if policies starting with 'extension' are still
    present in policy.json, a deprecation warning will be emitted, and
    the policy will be translated in the corresponding, new-style,
    policy(ies).
    
    Change-Id: Iccf0f36cc2547c35c66854b8a3fdb7185b5214bd

commit 240ba2d007fe0d3e47641098479bc9070da9d429
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 16 12:12:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia41af63051b2a8cc7aa898a44d5fb44905e2e448

commit 84f65f387c873d7d342a56f081f7bf8025500bf9
Author: fujioka yuuichi <fujioka-yuuichi@zx.mxh.nes.nec.co.jp>
Date:   Tue May 14 09:01:17 2013 +0900

    fix reference to tenant id.
    
    Administrator can create resource, even if the tenant of resource is
    different from the one of authentication. For example, administrator
    can operate 'quantum net-create' command with different tenant
    between the authentication tenant(--os-tenant-name) and --tenant-id.
    
    In this case, quota cannot be restricted with the resource tenant,
    because it is restricted with --os-tenant-name.
    
    This patch fixes this problem.
    
    Fixes: bug #1179729
    
    Change-Id: I8ce893bb583d52f81c661082372d725bebf9c1be

commit 6e0f9c1b9f5ebd0d1eb44b9d42961e3cc22fe1e6
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Mar 21 18:18:09 2013 +0400

    Improve ovs and linuxbridge agents rpc exception handling
    
    Fixes bug 1053497
    
    Change-Id: Id946542b204cf75586224f3749b0007cc2d6b3a7

commit cf9a0c758500e2f01edf9ec44006641cb825a5d0
Merge: 23e4c0c c2a672f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 06:50:13 2013 +0000

    Merge "Add negative UT cases for subnet/GW create/update"

commit 23e4c0c6a3eae11746cf4ab25804444aface7d56
Merge: 93230b8 3a50a70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 06:49:27 2013 +0000

    Merge "relax amqplib and kombu version requirements"

commit 93230b839a1c3ca8c314304e37d099c80366b0d8
Merge: 97ea776 2648314
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 06:11:28 2013 +0000

    Merge "Fix logic in test_db_loadbalancer"

commit 97ea776f29fa4600c8b693422180b84b71e12a93
Merge: fc9d8e2 56cac98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 06:06:39 2013 +0000

    Merge "Fix linuxbridge RPC message format"

commit fc9d8e2ceba32bab56970e76a11318ce3d43e1a8
Merge: 129a473 13f9e02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 16 02:09:26 2013 +0000

    Merge "Remove calls to policy.check from plugin logic"

commit 56cac98626f1b25fd375b9c8d00294d6fb84496b
Author: Bob Kukura <rkukura@redhat.com>
Date:   Tue May 14 17:35:08 2013 -0400

    Fix linuxbridge RPC message format
    
    The linuxbridge, openvswitch, and hyperv plugins all use the same
    basic RPC interface between their plugins and L2 agents. But the
    attributes describing a virtual network passed from the plugin to the
    agent over this interface differed for historical reasons. The
    openvswitch and hyperv plugins each pass network_type,
    physical_network, and segmentation_id attributes, whereas the
    linuxbridge plugin previously passed vlan_id and physical_network
    attributes, using special vlan_id values to indicate flat or local
    network types.
    
    This patch changes the linuxbridge plugin to pass network_type and
    segmentation_id attributes instead of the vlan_id attribute, bringing
    its message formats into sync with the other plugins. RPC
    compatibility is required for blueprint modular-l2 so that the ml2
    plugin can work with all three existing types of L2 agent. This RPC
    message format change is also required for blueprint
    vxlan-linuxbridge.
    
    Unlike the vxlan-linuxbridge patch on which it is based (see
    https://review.openstack.org/#/c/26516/), this patch does not bump the
    linuxbridge RPC version number, as the ml2 plugin will require all
    three L2 agents to use the same RPC version. Instead, the updated
    linuxbridge agent maintains compatibility with old linuxbridge plugins
    by accepting either the old or new attributes. There is also a
    configuration option, currently turned on by default, to enable the
    updated linuxbridge plugin to pass the vlan_id attribute expected by
    old linuxbridge agents along with the new attributes. These message
    format compatibility mechanisms are intended to aid during upgrades,
    and can eventually be removed.
    
    Change-Id: I7cc1c9f96b09db6bab2c7d9f2b30b79fa4dab919

commit fc914f66502ee066f41780e10b0e659334ffd060
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Mon Apr 29 23:43:14 2013 -0400

    Fix Cisco Nexus plugin failures for vlan IDs 1006-4094
    
    Fixes bug 1174593
    
    VLAN IDs in the range 1006-4094 are considered to be in the extended
    range by the Cisco Nexus 3K switch. As such, the 3K rejects any
    state change configuration commands for VLANs in this range, including
    "state active" and "no shutdown". The errors returned by the 3K for
    these commands can be ignored, since the default states for these commands
    are acceptable for the 3K.
    
    For the 5K and 7K versions of the Nexus switch, on the other hand, the
    "state active" and "no shutdown" commands are required for proper VLAN
    configuration, regardless of VLAN ID.
    
    This fix splits the configuration commands which are used to create a
    VLAN on the Nexus switch into three separate configurations:
      - VLAN creation
      - state active
      - no shutdown
    For the "state active" and "no shutdown" configurations, the Cisco Nexus
    plugin will tolerate (ignore) errors involving invalid setting of state
    for VLANs in the extended VLAN range. These specific errors can be
    identified by looking for the appearance of certain signature strings
    in the associated exception's message string, i.e. "Can't modify
    state for extended" or "Command is allowed on VLAN".
    
    This approach will yield a very small hit in performance, but the solution
    is much less error prone than requiring customers to configure the
    Cisco plugin for 3K vs. 5K vs. 7K, or perhaps even specific software
    versions of the 3K, in order to inform the Cisco plugin whether
    VLAN state configuration commands should be used or not.
    
    Change-Id: I1be4966ddc6f462bca38428c4f904f8c982f318f

commit 3a50a702f94344ef9903d1c7342d7d516e44a254
Author: YAMAMOTO Takashi <yamamoto@valinux.co.jp>
Date:   Wed May 8 09:48:07 2013 +0900

    relax amqplib and kombu version requirements
    
    as nova did while ago.
    
    this particular version of kombu doesn't work if newer msgpack happens
    to be installed on the system.
    
    bug 1178512
    
    Change-Id: I2749623036723b5a772b1c4c01dc07437e421925

commit 129a473e52f5f179749df43b3c8f29b4bc2d9f1a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 15 12:12:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0ac9882823e4e0d5bc8b2427715389d4fa847ced

commit 2648314b4cb884fe317e246fd418d2674fc0192e
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Wed May 15 01:14:30 2013 +0400

    Fix logic in test_db_loadbalancer
    
    Fix code to check HTTP error code before attempt to deserialize body
    
    fixes bug 1180113
    
    Change-Id: I1d75e0fe739dfa70ef415602e669319797af026f

commit c2a672fe2186be7d19f3c0eea5e60f8cfc29381d
Author: Paul Michali <pcm@cisco.com>
Date:   Fri May 10 06:17:24 2013 -0700

    Add negative UT cases for subnet/GW create/update
    
    When force_gateway_on_subnet is configured, ensure
    that a GW with IP same as subnet, and BCAST GW IP
    are rejected during subnet create. For subnet update,
    ensure GW outside of subnet is rejected.
    
    bug 1178675
    
    Change-Id: Ice58f7e1be7966b247c165e52807405401e5a4ea

commit 13f9e02a64eb578547ede95ce7849b264d511619
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu May 2 19:39:30 2013 +0200

    Remove calls to policy.check from plugin logic
    
    Blueprint make-authz-orthogonal
    
    This patch implements part #3 of this blueprint, according to its
    specification.
    It does so by allowing the view generator in the API layer to strip
    off fields which do not satify authorization policies.
    Also, some checks in unit tests for plugins relied on the
    capability of the plugin to invoke directly the policy engine.
    This checks have been removed and replaced by equivalent unit tests.
    Finally, this patch required changes to most test cases for API
    extensions in order to ensure the resource attribute map was
    updated with the extension's attributes
    
    Change-Id: I1ef94a8a628d34697254b68d7a539bd1c636876e

commit 391108a014b3e640525f3c76da248ccd555cddb1
Merge: 63fcb98 dbee58e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 18:48:28 2013 +0000

    Merge "Allow ports to be created on networks that do not exist in NVP"

commit 63fcb98f2b715d8d47f33abb9976b8eba6f43c5f
Merge: 2b45767 acf44db
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 18:43:24 2013 +0000

    Merge "get_security_groups now creates default security group"

commit 2b45767ee9c454a75fe480bb69b3ae87bcda9f12
Merge: a7f41f3 42243d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 18:25:29 2013 +0000

    Merge "Fix ./run_tests.sh --pep8"

commit 6012b7e97c361a90d88a573d3c6a9f33e03f4281
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 14 13:20:44 2013 +0000

    Add support for dnsmasq version 2.48
    
    Following the bug fix for bug 1170793 we are able to add
    in support for dnsmasq versions that do not support tags.
    
    2.48 is the version shipped in RHEL 6.4
    
    Change-Id: Ia7d2b1c0adb477159ce146bcd4323d4b2795bff5

commit a7f41f3bce7b6f7a593f7b65a601e588cc1e3096
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue May 14 12:12:05 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie5ff2a1f033c57b690b3a71be9f93b32d8db0b73

commit df6109ae70f72d170e64ad7ebdbfe2d72e097377
Merge: 0fb323e 738aa41
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 14 08:12:13 2013 +0000

    Merge "Add ability for core plugin to implement advanced services"

commit 0fb323e20cfd8662c1bdd84b0ab4d928cd6d35fc
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon May 13 21:02:00 2013 -0700

    Add missing unit test for NVP metadata_mode option
    
    Note: I didn't squash this change in my patch that made the default
    transport type configurable because this change was not in grizzly
    and we do not want to backport it.
    
    Change-Id: Ie71e5e56d1bed219caba74799cc2310ace987b8f

commit 531f8d880df60fa5cac1a8cd3e7694485a2637d4
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon May 13 19:48:27 2013 -0700

    make default transport type configurable nvp
    
    Fixes bug 1179759
    
    Change-Id: I8f644f2bc0d5d144f52e5ed0bd2e991503581ad2

commit 42243d6eb221d52bf6f62f835726cbe026e43447
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue May 14 11:27:04 2013 +0900

    Fix ./run_tests.sh --pep8
    
    Create a common script to call flake8 to share flake8 options and
    make tox and run_tests.sh use this script.
    
    Fixes bug: 1179331
    
    Change-Id: I92dc54fa3f4bb22aa39bde226b6d769088f9a2e3

commit dbee58e7bb2ed1df6bb513247ec7ac07387ff5d1
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun May 12 17:25:04 2013 -0700

    Allow ports to be created on networks that do not exist in NVP
    
    If a network exists in the quantum database but not in NVP we should allow
    someone to create a port on this network and set the status to ERROR. The
    reason for this is if one deletes a network from NVP and when the dhcp agent
    goes to create it's dhcp port on this network an error will be raised to the
    agent and it will enter a constant state of resyncing.
    
    This patch also adds a unit test for update_port() for the same situation.
    
    Fixes bug 1179327
    
    Change-Id: Ie77fc48d11644b820c0cc3b3fa341856e36f8511

commit 2a0e7f2fa788c6aea73a9a0305355f5450e5b471
Merge: b100c59 76bc87f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon May 13 14:42:01 2013 +0000

    Merge "Imported Translations from Transifex"

commit b100c598c0f3b42ce225c505d62a1765b8e4af99
Merge: 9449276 73900fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 13:50:09 2013 +0000

    Merge "add db to save host for port"

commit 73900fd0f4c1a343c880d8529aff4f51dd071d4b
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Thu Mar 21 14:34:19 2013 +0800

    add db to save host for port
    
    blueprint portbinding-ex-db
    
    related patch in nova:
    https://review.openstack.org/#/c/21141/
    
    Only OVS and linux bridge plugins now support this feature.
    
    Change-Id: I42d9bc59130e2758dd6a221d8953d63ec10e1f3c

commit 94492767e009fee24b8fcb5b588943ad159c7254
Author: Irena Berezovsky <irenab@mellanox.com>
Date:   Mon Mar 11 12:10:15 2013 +0200

    blueprint mellanox-quantum-plugin
    
    Implements Mellanox Quantum plugin.
    This plugin implements Quantum v2 APIs with support for Mellanox embedded
    switch functionality as part of the VPI (Ethernet/InfiniBand) HCA.
    
    Change-Id: I22907dfec5b6cb8f6ad8c3b6e390abc4f8e0ac10

commit 8581676fea236686c36aae689dfe2b217ff4440c
Merge: 84fc2cf 8aaf0bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 12:30:12 2013 +0000

    Merge "Fix testcase 'test_create_subnet_with_two_host_routes' failed"

commit 76bc87f81fd32ca56817225f1eaf4c246641b337
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon May 13 12:12:13 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: If88aa74ce88cbcf89f60174206907bfb5c2b16f3

commit 8aaf0bd736839a1c562d60a0a1fdd825e6c553b0
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon May 13 10:43:38 2013 +0800

    Fix testcase 'test_create_subnet_with_two_host_routes' failed
    
    Fix bug 1179348
    
    Change-Id: I0cd5d303da0f394cec173aeee52efcd337282c94

commit 738aa4133c740163c2ca3e44827e3b317f3ffd5d
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri May 3 18:57:00 2013 +0400

    Add ability for core plugin to implement advanced services
    
    implements blueprint api-core-for-services
    
    Add check for supported_extension_aliases in QuantumManager.
    If core plugin supports certain service extension, then core plugin is
    stored in service_plugins for the service type of this extension
    so corresponding extension could set it as a controller for REST calls.
    
    Change-Id: I9c883491f6f13770371e3444e7c17bd2164a7c07

commit 84fc2cf4560f7a34da9d1e40ad865a81fde47d1c
Merge: 950684d 4184d30
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 07:48:17 2013 +0000

    Merge "Fix invalid status code assertion after handle expected exception"

commit 950684d739470621f98062e786b80b1de2f87189
Merge: 4e1837c 74bb8d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 07:48:14 2013 +0000

    Merge "Fix testcase 'TestPortsV2.test_range_allocation' failed randomly"

commit 4e1837cd84bb0e1ab3a66f6ac23d2cd6bb900605
Merge: 47c399b a299091
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 13 06:01:16 2013 +0000

    Merge "Add a configuration item to disable metadata proxy"

commit 74bb8d1ca4c5a41a71388ff368c6b45475eb41a5
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon May 13 13:00:15 2013 +0800

    Fix testcase 'TestPortsV2.test_range_allocation' failed randomly
    
    Fix bug 1179370
    
    Change-Id: Id5645546c98549c9d7cf68359e0f6fa128ad84b7

commit 4184d30458a2eae46c2ec4db6fca26e57a8a2353
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon May 13 10:26:09 2013 +0800

    Fix invalid status code assertion after handle expected exception
    
    Fix bug 1179350
    
    Change-Id: I88b511206d97f2ad607a7889c61df69a8638ced3

commit 47c399b135b51db4069fcdbbcc205af720d468ae
Merge: babd65e 061efc3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 12 18:18:12 2013 +0000

    Merge "Update flake8 pinned versions."

commit babd65e20ae1d02f699e57c0826aa04584fbba4a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 12 12:12:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic35873cb4e370a1ab5a1cc880752e261afe93621

commit 061efc3eccb972fc080630161eb9f357b90f7e40
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 10:33:59 2013 -0400

    Update flake8 pinned versions.
    
    We've learned this lesson the hard way in the past...
    
    Change-Id: I02c75853234c16f3666185998202431cc7a4f2eb

commit 7c4eed216db63d1a4dfaabdfdedf3c857af6c2bc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat May 11 12:11:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I04fdf1c00edf8a0ac9bc1c91223cc5caef105b51

commit 91b56e41eecf2cd8b4c848b4e773a1be307b40c3
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Fri May 10 13:10:02 2013 -0700

    Do not require sudo/rootwrap to check for dnsmasq version
    
    The dnsmasq version check does not need root privileges
    to run as with low privs it works just fine. As a side
    effect, the use of the rootwrapper was causing unit tests
    to hung because the execute call in check_version was not
    being stubbed out. Weirdly enough this wasn't caught in
    a previous Gerrit run; there must be a passwordless sudo
    lurking around somewhere in the Gerrit infrastructure.
    
    Fixes bug #1178800
    
    Change-Id: I4d0bd218768eec2439d3907587682ff35884a262

commit 21575de9d3134feb84e6da83edba966c90145c45
Merge: 3278b88 6db5b0b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 10 19:19:03 2013 +0000

    Merge "Change Daemon class to better match process command lines."

commit 3278b882365847b850f44ffb6d68c5f66196e828
Merge: 4100193 6d26dd5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 10 19:19:00 2013 +0000

    Merge "Fix usage of SQLAlchemy Query.first() method"

commit 41001930abe7ef7b8a2583a60621421571351327
Merge: 3887547 f8f2a7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 10 19:08:27 2013 +0000

    Merge "Fix usage of NexusPortBindingNotFound exception"

commit 388754739084dde54436d9f1ca190dca8095b37e
Merge: 00b26f6 cc8e822
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 10 15:03:57 2013 +0000

    Merge "Imported Translations from Transifex"

commit 00b26f6c5c6b7aa63607d93d667411d6ed525219
Merge: c544ebd 3640328
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 10 12:40:37 2013 +0000

    Merge "Log a warning if dnsmasq version is below the minimum required"

commit cc8e82204ccaffdd91b0af3f6f0f5e94d51fe8c1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 10 12:11:59 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iabc0688a9d195eb85bbc7d134b72084839bd7d49

commit c544ebdc898bfcd8fb0a4a1166c68bf315da4e9e
Author: Maru Newby <marun@redhat.com>
Date:   Thu May 9 21:04:44 2013 +0000

    Add kill-metadata rootwrap filter to support RHEL.
    
     * Fixes bug 1178419
    
    Change-Id: I9c1cf0d19d1134ec3b85c905c6c8bb7145847ce7

commit bdc8feec84ca82633bace4c2b03d4305f25d9bfa
Merge: a710dcc 6a5edbc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 9 19:38:30 2013 +0000

    Merge "Create a common function for method _parse_network_vlan_ranges used by plugins."

commit a710dcc523a260bdd9e3cdcb9d484e82bd0a585d
Merge: 3a7f29b 0fee496
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 9 19:08:56 2013 +0000

    Merge "Fetch routers ports for metadata access from DB"

commit 3a7f29b57aafed17bb31a9f1b2958e334ed97ec6
Merge: 88fbfa8 fa69228
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 9 19:08:53 2013 +0000

    Merge "Improve checking of return values for functions in linuxbridge agent plugin"

commit 88fbfa834702d985745e174d33f0f42e7996c978
Merge: 791e220 8a9e7ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 9 16:45:05 2013 +0000

    Merge "in dhcp_agent, always use quantum.conf root_helper"

commit 6a5edbc3c916fa854963fe648d16761129165f4f
Author: Henry Gessau <gessau@cisco.com>
Date:   Thu May 9 00:28:39 2013 -0400

    Create a common function for method _parse_network_vlan_ranges used
    by plugins.
    
    The _parse_network_vlan_ranges method does the same thing for the
    linuxbridge, ovs, and hyperv plugins. Create a common function for
    the plugins to use instead. This paves the way for improving vlan
    range verification (see #1169266) in one place.
    
    Fixes Bug #1177428
    
    Change-Id: Ie8c20807e9146dd9c8bc011dd3a4dc10ec871e0b

commit 791e22022196d3cc7b7522cc88ec7b574a7c18b7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 9 12:11:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7149051e67d4a9e2932b04b066b7e06983a1dde0

commit a397df38c748d482ece18e164084a589d7f2d362
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Tue Apr 9 09:11:32 2013 +0800

    Don't run metadata proxy when it is not needed
    
    Bug #1159015
    
    Change-Id: I6063e75525a2a727d063bb1745c897ac8c4ba3e8

commit a299091d00d0fcb4d43cf09aba1aefd9c43eb22c
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Tue Apr 9 10:33:43 2013 +0800

    Add a configuration item to disable metadata proxy
    
    Bug #1166543
    
    Change-Id: If7aee8d79b7ca275f89cf9299eac1f76d5500fcc

commit 8a9e7ac7f2e3901d33c8a6a91dffec1e16b13f0d
Author: Peter Feiner <peter@gridcentric.ca>
Date:   Wed May 8 17:53:21 2013 -0400

    in dhcp_agent, always use quantum.conf root_helper
    
    Fixes bug #1178003.
    
    For the most part, the dhcp agent uses the root_helper setting from the [AGENT]
    section of /etc/quantum/quantum.conf. However, in a couple of spots, the
    root_helper setting from the [DEFAULT] section of /etc/quantum/dhcp_agent.ini
    was being used.
    
    Change-Id: Id2f3140374a705cf7a0d2a784e4f321cc54f602e

commit 6d26dd57680ddcdfc3c31fbe2d7190e0f6d28d0d
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Wed May 8 18:34:51 2013 +0300

    Fix usage of SQLAlchemy Query.first() method
    
    Query.first() doesn't raise the NoResultFound exception
    if no result is found but rather returns None, so wrapping
    of Query.first() call into a try/except NoResultFound block
    is useless.
    
    Fixes bug 1177842.
    
    Change-Id: I0bd0e6d8299734b485dd1a1ac36bf6c295fd8932

commit f8f2a7f39ce6067e737ee6c47dfee8500d27d57d
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Tue May 7 21:57:53 2013 +0300

    Fix usage of NexusPortBindingNotFound exception
    
    Currently the required keyword argument (port_id)
    is not passed when the exception is raised. In fact
    this exception has never been raised before due to
    another bug (1173131) so this change also has to
    ensure it doesn't break any existing code using
    functions which can possibly raise this exception.
    
    Fixes bug 1174323.
    
    Change-Id: I81f0b0def7db163fb0fbb5e03be511113c8d0be5

commit 916d54d010ce93d3d0f1d8b3a6bb2fba9ce7938c
Merge: 6a6c7c1 9581e5b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 19:03:30 2013 +0000

    Merge " Copy the RHEL6 eventlet workaround from Oslo"

commit 6a6c7c1c7773f15935323bd85f554f16f4225aee
Merge: 9751562 0e49ad3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 8 19:03:27 2013 +0000

    Merge "Imported Translations from Transifex"

commit 0e49ad3dd23033abc03d7bad7bdc15df3a26bac8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 8 12:11:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia061d1b4580b4363a734b571f25755e50feab119

commit 9751562cd0966b5d911a6c147ae23b0577aa0fa3
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Mon May 6 15:28:09 2013 +0400

    Avoid extra queries when retrieving routers
    
    fixes bug 1160333
    
    Instead of making N additional sql requests,
    use relationship and joined query.
    
    Change-Id: I8f650691916a252bf2a525343bfa0521ff6fbe43

commit 659038890176d722021138f22c307eb111ad3d6c
Merge: f941267 4056e8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 8 15:18:26 2013 +0000

    Merge "Import recent rootwrap features in local rootwrap"

commit 364032897293256436647cb89c61a3dffb408946
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue May 7 17:10:22 2013 -0700

    Log a warning if dnsmasq version is below the minimum required
    
    It has been noted that older versions of dnsmasq may have unexpected
    behavior, so this patch introduces a check on dnsmasq version; if
    the minimum version is not met, a warning is logged. This is less
    invasive than raising an Exception and abort the dhcp agent, even
    though this also seems like a perfectly acceptable behavior.
    
    Fixes bug 1170793
    
    Change-Id: Idd91c3753fb05f223ed0e3c53ad692ee65ea4905

commit 6db5b0b77d0dd8b0f5010a71c769a821881797c5
Author: Brian Haley <brian.haley@hp.com>
Date:   Tue May 7 11:06:29 2013 -0400

    Change Daemon class to better match process command lines.
    
    Add additional uuid argument Daemon class to help it better
    match output from /proc/$id/cmdline to the correct daemon.
    If there is a stale pid in the pidfile, and that process has
    the same name, then it could match accidentally and not
    start the daemon up properly.
    
    Fixes bug 1177416
    
    Change-Id: I1109ca73c539c5e96cbe3dbb55ce68c92013ee10

commit fa69228606ff42233a3f241a455157e675d398df
Author: sadasu <sadasu@cisco.com>
Date:   Thu Apr 25 16:05:22 2013 -0400

    Improve checking of return values for functions in linuxbridge agent plugin
    
    Fixes bug 1167780
    
    Changed return values for some ensure_* functions to make them more consistent.
    Now all ensure_* functions return None on failure and return the entity that was
    created within the function when successful. Made changes to the unit tests to
    reflect the changed return values.
    
    Change-Id: Ib015ee7cee50bae5d91a4e109e7381519c1e14f7

commit f94126739a48993efaf1d1439dcd3dadb0c69742
Merge: 083af57 ea29aeb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:29:00 2013 +0000

    Merge "Log msg for load policy file only if the file is actually loaded"

commit 083af572a84eb92f5425effd7ef993524d5757c8
Merge: 8821caf 6acbc05
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:25:12 2013 +0000

    Merge "Calculate nicira plugin NAT rules order according to CIDR prefix"

commit 8821caf69a149ae410344a63b406fe6e0b4953c8
Merge: f607221 3ba9b98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:25:09 2013 +0000

    Merge "blueprint cisco-plugin-exception-handling"

commit f607221231ce6f68615968d1ca58dd810260fdce
Merge: 4f88c58 09dd1ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:25:06 2013 +0000

    Merge "Validate that netaddr does not receive a string with whitespace"

commit 4f88c58d1301e77ab10bb8ad0ec7ae1b82e1019a
Merge: b1826cb 9b2fb56
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:25:03 2013 +0000

    Merge "Update import of oslo's processutils."

commit b1826cb36f1628b4df382bc0d773babd81431599
Merge: e44bc3b 31946eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 7 15:25:00 2013 +0000

    Merge "update-port error if port does not exist in nvp"

commit e44bc3bbb917d3d5c0a55b1345936ace35484b32
Merge: 17336b9 3bf88f4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue May 7 15:24:58 2013 +0000

    Merge "Imported Translations from Transifex"

commit 3bf88f465329f93cd1b1a1c6193426aeb506218e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue May 7 12:11:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ieed02d3f78c8073d659d5ed3c085f9b5582415c1

commit 09dd1ec82cce7ebf2989d17f4e4fd9f7a2eea7e0
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 7 09:58:31 2013 +0000

    Validate that netaddr does not receive a string with whitespace
    
    Fixes bug 1177277
    
    Change-Id: Ibecaeed3e5918b06e74d8fa68cbe443bcbada7fc

commit 4056e8e605bb5f24db1816eafd84d30719264ebe
Author: Thierry Carrez <thierry@openstack.org>
Date:   Mon May 6 17:02:39 2013 +0200

    Import recent rootwrap features in local rootwrap
    
    Import features developed in oslo-rootwrap during the Grizzly cycle (and
    recently in havana) into quantum-rootwrap. This is the first step toward
    using the common oslo-rootwrap into Quantum: the goal being to make both
    implementations converge, we should avoid making local changes (and push
    any required change into oslo-rootwrap instead from now on).
    
    New features include:
    - Optional logging (use_syslog)
    - Searching for executables in a specified binary path (exec_dirs)
    - New path-based PathFilter
    
    Those features required a refactoring in the way executables are matched
    and in configuration loading.
    
    Implements bp quantum-rootwrap-new-features
    
    Change-Id: Ia6a2e91c297ade471448dae0964adfd001a46086

commit 17336b9cb64048652bb6853fe0429699b4762a40
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon May 6 20:21:57 2013 -0700

    Fix 500 raised on disassociate_floatingips when out of sync
    
    If one deletes NAT rules directly from NVP and not through quantum,
    an error will be raised when deleting a port that is associated with
    the floating ip. This patch catches the NotFound exception and logs
    it so that the port can successfully be deleted.
    
    Fixes bug: 1177176
    
    Change-Id: Ia7d0b94957d0c6b014d242439245b0e4fa9de40d

commit acf44dba26ca8dca47bfb5fb2916807f9f4e2060
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Apr 29 19:49:36 2013 -0700

    get_security_groups now creates default security group
    
    If one called get_security_groups() previously the default security
    group would not be created until the tenant created a network. This
    exposed a bug when an admin creates a shared network and a tenant tried
    to boot a vm on it without having any networks.
    
    Fixes bug 1171997
    
    Change-Id: I899203424c03353a1ee6567c9ddbaecd7dc25001

commit 9b2fb5602a65a31196f0cba9e1627a409eb1bc51
Author: Michael Still <mikal@stillhq.com>
Date:   Tue May 7 13:06:09 2013 +1000

    Update import of oslo's processutils.
    
    Brings processutils inline with the current state of oslo.
    
    Change-Id: I9f34a2d2acc527c438ecb3466d77b2f2775f2e00

commit 6acbc0520422ab08e87caf7e7ac0f1ebe7683823
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon May 6 17:13:15 2013 +0200

    Calculate nicira plugin NAT rules order according to CIDR prefix
    
    Bug 1176947
    
    Change-Id: Ibe81b9905cacea51d954416588f5c50d6337bbb0

commit ea29aebf7ca7f3843579d5d860d31723bd04af57
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Sun May 5 17:29:37 2013 +0200

    Log msg for load policy file only if the file is actually loaded
    
    The Load entry was previousy in init(), whereas it should have
    been in _set_rules() which is invoked only when policies are
    (re)loaded from the json file.
    
    Change-Id: Ib4ce66569a64fc4be8f5f77d7f503cc93ac0006e

commit 0fee496538a36e7db5b7e2c7e5bbd5cff2aedd53
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon May 6 17:33:44 2013 +0200

    Fetch routers ports for metadata access from DB
    
    Bug 1176963
    
    There is no need to retrieve the ports from the NVP backend, so
    a DB query will be enough.
    
    Change-Id: If3529cc5694434e8cdc9d21a4043f94212146d2d

commit 31946ebb5d7748fada269bd867f0e6d6e02ef736
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Apr 23 13:23:17 2013 -0700

    update-port error if port does not exist in nvp
    
    Previously the NVP plugin would query NVP for the quantum port id that was
    stored in the port as a tag in NVP. Later, a look up table was added in order
    to directly look up the ID without having to go to NVP. The problem that can
    arise is that if a port was created in folsom before this lookup table was
    added and then deleted from NVP directly an error will be raised when calling
    update_port(). This patch fixes this potential problem.
    
    Fixes bug 1172006
    
    Change-Id: I08c74e305449f7fe32897abf43ceb430c959b02d

commit 9ad0ba1ae37918587480394e940ad256bd6e06a5
Merge: 2db451d 87d0f81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 6 16:03:13 2013 +0000

    Merge "Duplicate line in Brocade plugin"

commit 3ba9b9873cec0571c4657af48fed9365050c49cc
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Wed Apr 10 18:23:37 2013 -0400

    blueprint cisco-plugin-exception-handling
    
    Improvements to exception handling in the Cisco plugins. Changes
    include:
    
    - Added mapping of Cisco exceptions to HTTP codes
      (extension to FAULT_MAP).
    - Removed several unused Cisco exception definitions.
    - Added several new Cisco exceptions for fault conditions.
    - Added several rollbacks for various sequential operations, e.g.:
      * Create port: Nexus sub-plugin fails after OVS sub-plugin success
      * Create port: Nexus switch conig fails after adding binding to
                     Nexus binding database
      * Delete port: OVS sub-plugin fails after Nexus sub-plugin success
    - Delete Port: Reversed order of OVS/Nexus sub-plugin calls so that
      it is done in the reverse order as is done for create port.
    - Removed several empty except/raise blocks
    - Delete network: Removed call to Nexus sub-plugin delete_network,
      since that is a no-op.
    - Removed a block of unused code in model's create_network method.
    - Added several unit testcases, including patching of OVS, Cisco
      and Nexus config.
    - Remove CISCO_TEST configuration from cisco plugin
      config .ini file.
    
    Change-Id: Iabdf4842aa2f0b090a90e2c565848290832b5197

commit 2db451dd914bfeb8abfc11b8be94a67665a29a60
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon May 6 12:12:01 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie9afcb1e31d15a1e39d9a66b5abc4248c1e2af15

commit 2f3e340df08634a398b1338b75f83a07b8578dcc
Merge: 91a9330 6f01194
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 6 08:02:32 2013 +0000

    Merge "Perform a joined query for ports and security group associations"

commit 91a9330fb3eb9838c9955c9cb27fd23c8078812f
Merge: ffa04d3 9051f68
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 5 19:14:14 2013 +0000

    Merge "Imported Translations from Transifex"

commit 87d0f819d32175fdfeedc9e35db1481ed93bf65b
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Sun May 5 17:40:38 2013 +0200

    Duplicate line in Brocade plugin
    
    Bug 1176570
    
    Change-Id: Ic79913ae313d299f274db6f0d3f6d0eb21c9f4ce
    binding:vif_type was being set twice

commit 9051f68515fd58a13a3aa38ed77a933ff8d51d8b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun May 5 12:11:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ief49f9846a5fad46a4a8c5f95881ef62948b233b

commit c22b181756f11b56f4d4710b99e0154cb68e9ea1
Merge: 3c3be46 418fc6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 5 07:06:23 2013 +0000

    Merge "Let the cover venv run individual tests."

commit 3c3be4652f6d82f14d741b9c38bad279e1cfe2d4
Merge: 12f04a1 86cf8b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun May 5 07:05:43 2013 +0000

    Merge "Adds POST method support in the metadata service"

commit ffa04d3e83ad83a51b366f1a3579ed47328c1b43
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu May 2 18:49:41 2013 +0400

    Remove unnecessary code from create_pool_health_monitor method
    
    fixes bug 1175481
    
    Remove incorrect database object fetch and update.
    Get rid of unnecessary query for pool object.
    Make code that creates monitor list more pythonic
    
    Change-Id: I6d2e9dfafe9ce9f0c089408b2e6e719a46285ba6

commit 12f04a100fef991e00272f7f2f5a8d14131c9334
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat May 4 12:11:56 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2e5b3a00ff52af624620ea0cc625b66faf83d76b

commit 6f01194e9c30afc2656cef9b15fea5ae688e93d7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Apr 29 01:40:47 2013 +0200

    Perform a joined query for ports and security group associations
    
    bug 1174111
    
    Instead of loading security group associations with a separate query
    each time a port is loaded from the database, perform the load operation
    with a join using a joined sqlalchemy relationship.
    Also, this patch removes the need for invoking the mixin method
    'extend_port_dict_security_group' from the plugin code.
    
    Change-Id: I40b22281d45ff4f4bf8149211883799a9051c1a0

commit 3ee00b19e5e87b271735e6ac9429269d0b04310d
Merge: e1207e0 b5c1329
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 19:13:56 2013 +0000

    Merge "Treat unbound port"

commit e1207e0d60b13b0f447605c91525cdd8dfbbbed0
Merge: 072372f daaf2b6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 19:13:54 2013 +0000

    Merge "Fix usage of Query.all() and NoResultFound"

commit 072372f5a452817da796a74bc9fe8852211b5122
Merge: f146ab5 d620ddc
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 3 14:48:39 2013 +0000

    Merge "Imported Translations from Transifex"

commit daaf2b6d6502da4f185ed65a21a75ab2aab2d1b7
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Fri Apr 26 18:27:39 2013 +0300

    Fix usage of Query.all() and NoResultFound
    
    SQLAlchemy Query.all() method doesn't raise NoResultFound
    exception in case if no result is found but rather returns
    an empty list. So this pattern which is common for our code
    doesn't make sense and should be fixed:
    
        try:
            dns_qry = context.session.query(models_v2.DNSNameServer)
            return dns_qry.filter_by(subnet_id=subnet_id).all()
        except exc.NoResultFound:
            return []
    
    Fixes bug 1173131.
    
    Change-Id: I19b64eecd6edac0dba7dd0bf2ab32690c46e4f8b

commit f146ab58320f9dc5cfe86ede6f60823660a29fa5
Merge: 8322d81 a2bdb16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri May 3 12:40:52 2013 +0000

    Merge "Only map nicira_nvp_plugin module if installed"

commit d620ddcf2882367b08d3c8a698f1503ac48b01a0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri May 3 12:11:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8ae51f7838cbc35fdb92c004b76a1d256625df5c

commit a2bdb161a59c19b8c1a3ea3f5171219e62b214e0
Author: Matt Riedemann <mriedem@us.ibm.com>
Date:   Wed May 1 04:05:07 2013 -0700

    Only map nicira_nvp_plugin module if installed
    
    When starting any quantum plugin agent service, only map the
    nicira_nvp_plugin module if nicira is installed and configured for
    quantum.
    
    fixes bug 1175750
    
    Change-Id: I7f2c40011363e2579d4c35716f5a7d413663a698

commit 8322d81661d5921a7ebc0611de68728ffb982748
Merge: 740d718 9274095
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 23:35:57 2013 +0000

    Merge "Do not attempt to kill already-dead dnsmasq"

commit 740d7185f4b133a74c4d1a9ba33613ea98be468b
Merge: 1867cd2 b8dee03
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 2 19:21:45 2013 +0000

    Merge "Imported Translations from Transifex"

commit 418fc6b9b5e6899bca939f2dbf9ab945f4af4792
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu May 2 09:37:09 2013 -0400

    Let the cover venv run individual tests.
    
    Also, delete cruft from tox.ini while we're in there.
    
    Change-Id: I8fe43695bb25b9c5eec10711b12d2002f1237e52

commit 9274095b4af63de7224b524e482872a78e027a7b
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu May 2 11:35:58 2013 +0000

    Do not attempt to kill already-dead dnsmasq
    
    Fixes bug 1080846
    
    The fix is following comments by Thiery Carrez (ttx) on the bug.
    
    Change-Id: If4f6baad4212c23845c46703140e15f1ffcfe558

commit 1867cd2ee0809bd9ac2ff6b3dfdd018214b1881b
Merge: 4f00ec4 b925396
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 09:33:08 2013 +0000

    Merge "Allow admin to delete default security groups"

commit 9581e5b71b6c7807a8897ddd0a4dc3556462d96b
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Thu May 2 10:31:16 2013 +0100

     Copy the RHEL6 eventlet workaround from Oslo
    
    Tests in oslo-incubator now need the horrendous hack to workaround an
    issue with eventlet on RHEL6. We've moved the patch_tox_venv tool
    and redhat-eventlet.patch into oslo-incubator, so add them to
    openstack-common.conf.
    
    Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7

commit 4f00ec4543fff0942e09c4235bd4016f1dd66aa8
Merge: 6e7b272 2c62e14
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 09:06:01 2013 +0000

    Merge "Set network_device_mtu as integer"

commit 6e7b2720cee1ed0fc715a1c77647ac34b23fc392
Merge: d4f3179 f78174a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 2 08:25:58 2013 +0000

    Merge "Avoid initialization of policy engine before extensions are loaded"

commit b92539646f1ab6f4d480b683778b622f587f0eb2
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed May 1 17:12:11 2013 -0700

    Allow admin to delete default security groups
    
    Previously there was no way to delete a default security groups which
    isn't ideal if you want to clean up after deleting a tenant. This patch
    allows default security groups to be deleted by the admin.
    
    Fixes bug 1175393
    
    Change-Id: I2214c7dabf0f2ec960ce10ebbbcdc513bc73664c

commit b8dee03ab46aa6e1bf2e92e05248faa4f89cd3c4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu May 2 00:06:38 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie643ae6a5d064d9dc97472b68c8d757c013a1f8f

commit 7ff0c53564f46bdd6f47cb1ed9e6d2460d088b1e
Author: Maru Newby <mnewby@internap.com>
Date:   Thu Oct 25 18:03:26 2012 +0000

    Add support for OVS l2 agent in XS/XCP domU.
    
     * Config doc: http://wiki.openstack.org/QuantumDevstackOvsXcp
    
     * The Open vSwitch agent needs to be deployed on domU but
       interact with a dom0 bridge.
     * Add a root wrapper and associated XenAPI plugin to allow the
       agent to execute networking commands against dom0 from domU.
     * Update ovs_lib mac address discovery to use ip_lib to
       ensure that discovery works even for bridges not local to
       the agent (i.e. dom0 bridges).  A bridge configured with
       a dom0 root wrapper will execute ip link on dom0.
     * Update ip_lib to use a root helper by default to ensure that
       the 'ip' command will execute on dom0.
     * Remove obselete rpm spec and installer for dom0 agent.
     * Credit where credit is due - the XenAPI plugin and its
       packaging were largely copied from nova.
     * Supports blueprint xenapi-ovs
    
    Change-Id: I7795446ee1267712c896f5cb3401f84fb1763ce7

commit 86cf8b53ee0f59fe213d18949c00cfb6c7287c86
Author: Alessandro Pilotti <ap@pilotti.it>
Date:   Wed May 1 07:14:59 2013 +0300

    Adds POST method support in the metadata service
    
    Fixes bug: #1092311
    
    The password generation feature introduced in Grizzly requires POST
    support in the metadata service.
    
    Support has been added to both the metadata agent and namespace proxy.
    Tests have been added and updated accordingly.
    
    Change-Id: If7ef6bede1775ad682822cb868518ec732b90805

commit d4f31791c0c0eede7f6a488803daef67c68be06f
Merge: a7ad343 72e2a25
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 20:13:50 2013 +0000

    Merge "Update RPC code from OSLO"

commit a7ad343909966cd75d46ab61fa45ea4c7b0a5c12
Merge: 5d52674 f639788
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 19:22:31 2013 +0000

    Merge "Fix port_id filter not honored"

commit 5d52674ffb593ed8e6a3091be439efc6054abe3e
Merge: b1b89da 2516c13
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 19:19:25 2013 +0000

    Merge "Fix 'null' response on router-interface-remove operation"

commit 2c62e14a0e89cacc865936d0f7f418b172ea07e9
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed May 1 07:04:45 2013 +0000

    Set network_device_mtu as integer
    
    Fixes bug 1175060
    
    Change-Id: Ibce28db0575dd6d6f1f998a7b8d6603f3d6dba63

commit f78174aa3cb0f88c995b2b1f61d10a0761b7bfe7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed May 1 12:32:17 2013 +0200

    Avoid initialization of policy engine before extensions are loaded
    
    Bug 1174877
    
    For a particular NVP extension, a database entry was being populated
    in the plugin's __init__ method. The entry was added with an admin
    context. Grabbing the context caused the policy engine to load before
    all the extension were loaded, so rule on extended attribute
    were not being parsed correctly.
    This cause checks on external networks to fail always.
    
    Change-Id: Icbc759773acab2a7687883d8d2844272c8ea55a3

commit f639788c59c8bbb5c6a08c7f193fd1d23c7ce956
Author: openstack <sylvain.afchain@enovance.com>
Date:   Fri Apr 26 14:31:06 2013 +0200

    Fix port_id filter not honored
    
    Add dict. to map API params to DB columns
    
    Change-Id: I5f10eea77533e91afeb690e39301d7282e1b1620
    Fixes: bug #1169706

commit 72e2a2515b241d8abfaa7d8394b611224027f7dd
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed May 1 13:47:59 2013 +0000

    Update RPC code from OSLO
    
    Fixes bug 1172922
    
    Change-Id: Ieb5f58fe3d2c879bc71f4241288e48e35ab54366

commit b1b89da57fc1d3fbf22b948359a8260bdcd84c39
Merge: cac680d bde296d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 06:43:53 2013 +0000

    Merge "Use sql alchemy to fetch a scalar for the max tunnel id"

commit cac680dc6e9290035c92717d5e564f0e2717e39b
Merge: f97bfc7 a64baa9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 1 06:42:40 2013 +0000

    Merge "Imported Translations from Transifex"

commit b5c13293b3c587221d33df832ee8376bd971cbcd
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Apr 30 15:23:10 2013 +0000

    Treat unbound port
    
    Following a nice suggestion by S Orlando regarding the fix for
    bug 1173463
    
    Change-Id: I2fa2a2fa7852025f0c18ff27c5fffc5667ce8378

commit f97bfc7e6ec2b28c9f2609fb19593f4defa8a1a6
Merge: 39c1a87 1e166f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 05:29:29 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit 39c1a8713495e2a161f6cc7290e9caf3898a8415
Merge: dbae68c ad3b606
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 1 05:28:18 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit bde296d1040a6c1397faebf80f0ba164bed2c937
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed May 1 02:57:55 2013 +0200

    Use sql alchemy to fetch a scalar for the max tunnel id
    
    Bug 1174998
    
    Change-Id: I77203c81c2c910a1a601416efc4567f1320a2eef

commit a64baa9e54ed128b4193de0a62ebc1ee31ff82e7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed May 1 00:09:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifad1de1eb9891cc0639470a19058135c21753db7

commit 2516c136549195a92a20aa6570e27af5dfbef28a
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Tue Apr 30 16:19:04 2013 -0700

    Fix 'null' response on router-interface-remove operation
    
    To avoid a 'null' response body, the delete operation returns a response
    that is consistent with its add counterpart, i.e. we return the router
    id with details about the interface being affected by the operation, as
    well as the tenant id.
    
    A unit test is added to ensure that the right body is returned and minor
    adjustments have been made to the plugins affected by the change.
    
    Long-term, a delete operation should really return 204 w/o a body, but
    this requires some major rework of the WSGI handling within Quantum.
    This is an interim solution that deals with an 'ugly' response body,
    whilst keeping backward compatibility.
    
    Fixes bug 1173284
    
    Change-Id: Icaab87ad0c8561c0690c8f0a14db815d8886bc71

commit dbae68c3604c3b16ef8be001131fd6f4cbb278b0
Merge: 13fbf22 ee3bb94
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 23:46:47 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit ee3bb94b247e79bcf0b735acb9341a89e289943c
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Tue Apr 30 10:47:43 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/plugins/cisco/*
    
    Change-Id: Ibb6a865a17de0ea4f1865972624e4c5da0e96b34

commit 13fbf22ff43512936eff8733457b69546fd4c70d
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Tue Apr 30 16:52:33 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/tests/*
    
    Change-Id: I5c31a70e80c7fd448b92b43d34341301533b59ba

commit ad3b6064dff135dd34d997167ec2ef628828d95e
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Tue Apr 30 13:35:37 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/plugins/hyperv/*
    quantum/plugins/linuxbridge/*
    quantum/plugins/nec/*
    quantum/plugins/nicira/*
    quantum/plugins/plumgrid/*
    quantum/plugins/ryu/*
    quantum/plugins/services/*
    
    Change-Id: I3525aa57235935d90ec7b70c65ba15012ce575a3

commit 58d13eb3517c0e0c9f30fe811aac70edb00f2468
Merge: b2e1afc c7afeda
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 13:06:12 2013 +0000

    Merge "Use Query instances as iterables when possible"

commit b2e1afc0c90d881ea604f9b5bf45f72de775c02e
Merge: d9c4623 3adbca8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 30 06:54:46 2013 +0000

    Merge "Imported Translations from Transifex"

commit 1e166f3efd72459fabe83e2141461329c67c811a
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Mon Apr 29 16:46:51 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/plugins/bigswitch/*
    quantum/plugins/brocade/*
    
    Change-Id: I9bf4381738319551a5993d4b279a5cec3425b7ef

commit d9c462387040d407bc5009144ca4b4e5a086eb8d
Merge: aa6ba83 ba90d52
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 30 06:18:07 2013 +0000

    Merge "Improve Python 3.x compatibility"

commit 3adbca85aa5e97b6ad08b7f1bbacb472a0579954
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 30 00:09:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7f8f822413f4e11310700882540c6e276016b75f

commit aa6ba83c2046e35ccfdafa3641d17a3b26859cf7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Apr 29 20:20:12 2013 +0200

    Stub out get_networks_count properly for pnet unit tests
    
    Bug 1174457
    
    Change-Id: I30a5c549d5d236124a7798a757601e970067b284

commit 3aa3ba76a6fa46bb7c21c23b615acd0792c88def
Merge: 1957375 b28dc10
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 29 11:59:07 2013 +0000

    Merge "Docstrings formatted according to pep257"

commit 195737580031f147faced88a6219a3bc45b18ae7
Merge: 05ac57e 4d6f024
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 29 11:57:58 2013 +0000

    Merge "Remove calls to policy.enforce from plugin and db logic"

commit 05ac57e770952cc87cccf6aa03e5ff52b3c31f25
Merge: 85ffc01 d9c95e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 29 11:10:45 2013 +0000

    Merge "Add tests for LinuxBridge and OVS agents"

commit 4d6f02440b7d337b7aac6ba313ee7e60ecc53214
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 14 18:47:51 2013 +0100

    Remove calls to policy.enforce from plugin and db logic
    
    Blueprint make-authz-orthogonal
    
    This patch implementes item #2 of the blueprint
    Remove calls to policy.enforce when the policy check can be performed
    safely at the API level, and modify policy.json to this aim.
    This patch does not address enforce calls in the agent scheduler
    extension, as that extension is currently not defined as a quantum.v2.api
    resource class.
    This patch also adds an API-level test case for the provider networks
    extension, which was missing in Quantum and was necessary to validate
    the API behaviour with the default policy settings.
    
    Change-Id: I1c20a5870279bc5fce4470c90a210eae59675b0c

commit ba90d5276184afb06106e57f5da1224277e497b5
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Mon Apr 29 11:41:46 2013 +0200

    Improve Python 3.x compatibility
    
    Replace the deprecated except x,y: construct with
    except x as y:, as that one works with all Python
    versions starting with 2.6.x
    
    Change-Id: I13080cfdad32eaef21aa2707fe5d2818bda68535

commit b28dc107a90afc5d718473e9b289847cab6e809b
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Fri Apr 26 12:03:12 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/common/*
    quantum/db/*
    quantum/debug/*
    quantum/extensions/*
    
    Change-Id: I8fdf72ae1702ef2a2652a1db683d8b31e09e6f84

commit 85ffc01eee00dab0a076ee367dbe04b131653423
Author: Sergey Skripnick <sskripnick@mirantis.com>
Date:   Fri Apr 26 11:41:38 2013 +0300

    Docstrings formatted according to pep257
    
    Bug #1020184
    
    quantum/agent/*
    quantum/api/*
    
    Change-Id: I206206b66b4adf5cda73a6bb709a0935d7efa821

commit c7afedad00ea8a44770643c95714637ee8671000
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Thu Apr 25 16:15:59 2013 +0300

    Use Query instances as iterables when possible
    
    A Query.all() call creates a list of a DB query results.
    We can actually use a Query instance as an iterable and
    thus avoid creation of a list if we just need to iterate
    over those values only once.
    
    Fixes bug 1173133
    
    Change-Id: I06d8eaa9eaba4c71aa0c98000735cb9d83ea19a3

commit 07299e34d028476b2e69b5d7905bdcde478ce988
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Apr 29 00:05:28 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ief9e62e02c2105f4f0a3f5308afd77e670785b4c

commit 0dfd5c69034af689ecf1374b1d28237f059c9700
Merge: 7dddca7 b15570f
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 28 21:38:24 2013 +0000

    Merge "Imported Translations from Transifex"

commit d9c95e48becd7af36f71a821601389b8c97abe4b
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Apr 25 08:19:58 2013 +0400

    Add tests for LinuxBridge and OVS agents
    
    Fixes bug 988067
    
    Patch introduces some more unit tests for LinuxBridge
    and OVS agents.
    
    Change-Id: I95b8856e75b303520af654b08854c6bd0bc5d7ea

commit b15570f24076cd030ba1d8567aa7fb81dbde8b3a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 28 00:06:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I019cb6c0a7314f4b1af5b3cdfe875ce8f5facb6a

commit 7dddca7ebd04d400436c3124220c0602a9a13482
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sat Apr 27 20:43:13 2013 +0400

    Fix logic issue in OVSQuantumAgent.port_unbound method
    
    Fixes bug 1173463
    
    Change-Id: If2978fc4c38304667f6910085cb220491d236a11

commit fb927db0da14a9e54f4c5faa4f2601a9c48a498d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Apr 27 00:08:22 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I59376d539d7f294e237602fc1eb63e85f7b25618

commit 667276902618c93ad3a6ba69743d6425f4d9052e
Merge: 8f04c47 15a1445
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 05:47:04 2013 +0000

    Merge "Update latest OSLO code"

commit 8f04c47d08228e75d0dc949442e9ad45c3514aa2
Merge: a52638e ee50162
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 04:35:37 2013 +0000

    Merge "Simplify delete_health_monitor() using cascades"

commit a52638eb1c730ec754a57979cf1c61e959f291a1
Merge: 8681601 f83c785
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Apr 26 04:13:21 2013 +0000

    Merge "Imported Translations from Transifex"

commit 86816012ef0898c3cecaf8c081fe1a8decbeb49e
Merge: ea9aeb6 152f3cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 26 03:27:30 2013 +0000

    Merge "Create veth peer in namespace."

commit f83c785fa79955e3f3b9ca8437c1827d3a207f20
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Apr 26 00:09:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9d2a1a68d17f4b11e338f84d40f7ae3d0b7ffa04

commit ea9aeb6de075f391f6a73d6ea2b76d6e452c28bc
Author: armando-migliaccio <amigliaccio@nicira.com>
Date:   Mon Apr 8 17:40:21 2013 -0700

    Simplify NVP plugin configuration
    
    Fixes bug #1121605
    
    This patch replacest the nvp_controller_connection configuration option
    with a set of options more intutitive to user which also avoid
    repetitions in ini files.
    
    In order to simplify the configuration of the plugin, this patch also
    removes named clusters. As the plugin supports a single cluster at
    the moment, this can be simply specified in the [DEFAULT] configuration
    section.
    
    Also, this patch restrucures nvp_cluster.NvpCluster so that per-cluster
    configuration options are not store anymore multiple times.
    
    Change-Id: Id5f84220122d7c5f3239e3333cb772247d1ed05e

commit 152f3cf112df09faf79e932da948c5045802b15d
Author: Maru Newby <marun@redhat.com>
Date:   Tue Apr 2 22:43:37 2013 +0000

    Create veth peer in namespace.
    
     * Update veth pair creation to set the namespace of the peer
       device on creation rather than subsequently adding it to the
       namespace.
     * This change supports kernels with limited namespace support
       (e.g. RHEL 6.5) so long as ovs_use_veth is set to True.
     * Addresses bug 1171727
    
    Change-Id: I1885acc9934e7627bb9872703df7f5edf2980722

commit 43d904ba935d4d6fe9e650853dfbf1f180933a17
Merge: 9c21592 01a977b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 25 03:04:40 2013 +0000

    Merge "Send 400 error if device specification contains unexpected attributes"

commit 9c2159261ca6d90878de90ba7c0cc4a08127eeee
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Apr 25 00:07:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ica3123c46290d48cc344e0f99a71be7307aed8e5

commit 01a977b66958ec1d03964bbe3aaf218ff044232b
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Apr 24 02:11:07 2013 +0200

    Send 400 error if device specification contains unexpected attributes
    
    Bug #1171926
    
    This patch simply enhances the validator for the 'devices' attribute
    by verifying each element in the device list does not contain
    unexpected attributes.
    
    Change-Id: Id3fd182a7f711b482ad371752983264ad73b100f

commit 941bb2122b966210597033d314af290a39428dda
Merge: c1e13d2 62017cd
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Apr 24 01:05:01 2013 +0000

    Merge "Imported Translations from Transifex"

commit c1e13d2f600e9a5b4ad3a1b725b1973c2934ec0c
Merge: 9c5f9cb 35988f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 24 00:43:49 2013 +0000

    Merge "Make the 'admin' role configurable"

commit 62017cd3fd5aed73297c3dcd6e52cbaa2c11041c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Apr 24 00:05:32 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I80e45f91d74c197d81a561379c0740a6d9aa4d68

commit 9c5f9cb0d9be628b1baeab2ee7e1644fe0a0837a
Merge: 241e638 26b98b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 20:04:03 2013 +0000

    Merge "lbaas: check object state before update for pools, members, health monitors"

commit 241e6388c3acaa9d92ffcbad9b2f7340f42c3be7
Merge: e895bb5 49c1c98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 16:43:18 2013 +0000

    Merge "Metadata agent: reuse authentication info across eventlet threads"

commit e895bb5894763db029b052fb98fda2a74dc91ede
Merge: 11639a2 e001a8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 23 16:43:14 2013 +0000

    Merge "Add string 'quantum'/ version to scope/tag in NVP"

commit 26b98b7b51bb21b96cdc2c77443096f4b015b8e5
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Apr 11 16:56:08 2013 +0400

    lbaas: check object state before update for pools, members, health monitors
    
    Fixes bug 1166365
    
    Change-Id: I027bb1465ab08a643a02bddea30db82652be55ed

commit 49c1c981b5850c21ebcef5667a1198e79a8a3da4
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Mar 18 19:36:27 2013 +0400

    Metadata agent: reuse authentication info across eventlet threads
    
    Fixes bug 1152429
    
    Change-Id: Ib65f08a46feb14abc97c0c83e57d076abd372a2c

commit 11639a264224c5307b61b7674749fc21e9190408
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 23 00:08:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I74583df2967e7c60a69072edd75877ccb64df5fd

commit 35988f13931115658cf20d323da2f549073bcd52
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Apr 22 09:44:14 2013 +0200

    Make the 'admin' role configurable
    
    Bug 1158434
    
    This patch adds a new policy named 'context_is_admin' which defines
    an admin user as a collection of roles or else. The quantum context
    has been updated to check for this policy when setting the is_admin
    flag.
    This patch also adds a method for gathering 'admin' roles from policy
    rules as current logic requires the context to be always populate with
    the correct roles for admin rules, even when the context is implicitly
    generated with get_admin_context or context.elevated.
    Backward compatibility is ensuring by preserving the old behavior if
    the 'context_is_admin' policy is not found in policy.json
    
    Change-Id: I9acea75cca0c47e083a9149e358328ea3ca12d68

commit ee50162b27a3e0bf310f8e4f273b69cd0660cf69
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Mon Apr 15 18:10:07 2013 +0300

    Simplify delete_health_monitor() using cascades
    
    Currently delete_health_monitor() emulates behaviour of
    cascade deletion: when a HealthMonitor instance is deleted,
    all corresponding PoolMonitorAssociations are queried and
    deleted one by one. This can be done automatically by means
    of SQLAlchemy if we set proper cascade flags on the relationship
    between HealthMonitor and PoolMonitorAssociations models.
    
    Fixes bug 1169107.
    
    Change-Id: I674c381192719a56433f67be53a32203c36ebe2b

commit 765baf8532473473ce6a022ca2d1120a60e44fe4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Apr 22 00:08:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I5ceeb67e2053d40d527859da22cc8853438eb654

commit be4fdfa547d019dfd9beb36516a2746aba64f8c8
Merge: 343ca18 c117074
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 21 18:52:06 2013 +0000

    Merge "Remove locals() from strings substitutions"

commit 15a144558388e9a620c8e6751d8b067daee29c3f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Apr 20 12:19:26 2013 +0000

    Update latest OSLO code
    
    Change-Id: I804d1eae92e89740339546f0d0f490a3e4f21204

commit 343ca18b942efd286972b0b032bce18f023e02fb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 21 00:07:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: If69359e85c521da70870fbc19d6326e79001cbef

commit c117074a4b0d615f8350c8159fb180167a7dbabf
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Apr 16 07:20:31 2013 +0000

    Remove locals() from strings substitutions
    
    Fixes bug 1168988
    
    Change-Id: Ifd1e7a027f16062ff35e777cf2d953f652a806a7

commit d04b3deafaa5b7ab9d54cc5fef86d0d1df37b046
Merge: afedf59 fb66e24
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Apr 20 02:21:31 2013 +0000

    Merge "Imported Translations from Transifex"

commit afedf597cde8a23da0d049fb066d0f5a98f62751
Merge: 80ffdde 5896322
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 20 00:53:05 2013 +0000

    Merge "Changed DHCPV6_PORT from 467 to 547, the correct port for DHCPv6."

commit fb66e24a6d90447d35e2e5d70c6b0f29cbcbc65e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Apr 20 00:05:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia6d5ab319da40342b72e9202c70239d7ba756f8b

commit e001a8dac7c557a786528924e4992b5b9875a271
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Feb 21 15:31:31 2013 -0800

    Add string 'quantum'/ version to scope/tag in NVP
    
    This patch adds scope='quantum', tag=QUANTUM_VERSION to each element
    created in NVP via quantum. This patch also removes the function
    set_tenant_id_tag() as it was only used in one place and wasn't very useful.
    
    Fixes bug 1128674
    
    Change-Id: I9f1f8e9b49154012a82d24e31cc9fb7f2df9c604

commit 58963226f4b1215f820e1eafd683f2e74d4c2378
Author: John Jason Brzozowski <jjmb@jjmb.com>
Date:   Wed Apr 17 16:38:27 2013 -0700

    Changed DHCPV6_PORT from 467 to 547, the correct port for DHCPv6.
    
    Fixes bug 1170160.
    
    Change-Id: Ic5a4c0cc0ed016d83bde311a38924aa98bb45e11

commit 80ffdde9b5c3f1d6ab375d3c8e89f525417659ac
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Apr 19 00:07:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I45916b14ecb7b0f613332128dcfd64ad727503f8

commit 929cbab0d347bf871828f914c130e26c4bc4ca4a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Apr 18 00:09:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I80b2c702354f39b969109789b1c9ebdef619af25

commit 2a24058747d04a8647b103ea446c6a28b43a48bf
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Apr 17 00:08:25 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9a7548f64384ab4f3e29f7313e7481df89ca5901

commit b6f0f6855a3a6cd2b37431990c7777b4a798a581
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 16 00:08:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7aadfd763ee1904ad11fb5c4f82101f5a4e6dc5e

commit 1e1c5136b83cdedeadf83ea4500273a927d21251
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 14 00:07:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I9ce7385c4134a5d81164b989d033e3fce8f158a4

commit 6bbcc3848f01abbf1a68f65a09e1d2e6c7df7dc3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Apr 13 00:08:23 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia14f9917bece2fc7add0d389ef91f6611de7023a

commit 40e0d33c8fffe8bd930e2853171698684ad59082
Merge: 0e3fa2c a13295b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 12 15:10:32 2013 +0000

    Merge "Enable automatic validation of many HACKING rules."

commit 0e3fa2c36c25aff08989723cb0ed9569da28dc10
Merge: bd702cb 0446eac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 12 04:08:58 2013 +0000

    Merge "Shorten the path of the nicira nvp plugin."

commit bd702cbae0448aba56afe4ebdbf06753523457f9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Apr 12 00:07:23 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib2ba93e3c9754de63f030b9572a108343bae9c74

commit c6dbf8152964e51a4e650096918439d9722f6fc4
Merge: 8354133 91bed75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 11 23:56:22 2013 +0000

    Merge "Ensure unit tests work with all interface types"

commit a13295b9a8c76c01b2f6dfa013110b2e24a6e4da
Author: Maru Newby <marun@redhat.com>
Date:   Fri Apr 5 23:08:40 2013 +0000

    Enable automatic validation of many HACKING rules.
    
     * Add hacking to the tox build - a set of flake8 plugins that
       perform automatic validation of many HACKING.rst rules.
     * This patch configures hacking in the tox build and performs
       the mechanical cleanup required to allow the checks to pass.
     * See https://pypi.python.org/pypi/hacking
    
    Change-Id: Ie9b3eb5627a9b6dd181f79225abae422e6cf3777

commit 91bed75c6aecf4d1be375e3bbe74553be08074a6
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Apr 10 19:15:12 2013 +0000

    Ensure unit tests work with all interface types
    
    Fixes bug 1167520
    
    Change-Id: I42ed3a5718d771924caffba3f58340e7f1d2e2ad

commit 0446eaccbf898c85b87810231bffb0651639f262
Author: Maru Newby <marun@redhat.com>
Date:   Fri Apr 5 16:59:58 2013 +0000

    Shorten the path of the nicira nvp plugin.
    
     * s+[/.]nicira_nvp_plugin++
     * Backwards compatibility is maintained by importing the
       nicira package as nicira_nvp_plugin in the plugins package.
     * It may be necessary to remove stale .pyc/.pyo files under the
       nicira path after applying this patch.
     * DocImpact
     * Addresses bug 1166307
    
    Change-Id: I241a2a75106398506b01bcb7a6ddbaafa1b7bd30

commit 83541334327d24afc22a802f5a5df3bca8452077
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Thu Apr 11 13:12:14 2013 +0300

    Implement LB plugin delete_pool_health_monitor().
    
    Fixes bug 1166400.
    
    Change-Id: I58145366bab3798232d616c98ed9532f71834089

commit 4eab424be34840e5c2c16027f796c958cf3c35c3
Merge: de5c1e4 147038a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 10 21:38:13 2013 +0000

    Merge "Parallelize quantum unit testing:"

commit de5c1e4f281f59d550b476919b27ac4e2aae14ac
Author: zhhuabj <zhhuabj@cn.ibm.com>
Date:   Mon Apr 1 13:30:00 2013 +0800

    Make "shared" filter more compatible with diff DBs
    
    For the type BOOLEAN, in sqlalchemy,
    it's mapped to BOOLEAN type if the backend database supports it,
    otherwise, it's mapped to one of the Integer types, like SMALLINT,
    and restrict the values to 1(True) and 0(False).
    
    query_filter = (... | model.shared))
    The above filter will generate a SQL where clause like:
    where ... OR xxx.shared
    
    This is not supported in databases which don't support BOOLEAN type.
    Change it as below to make it more compatible:
    query_filter = (... | model.shared == True))
    
    It will generate a SQL where clause as below:
    where ... OR xxx.shared = ?
    
    In Python, True == 1, so this change is compatible
    with both databases supporting BOOLEAN and those not supporting it.
    
    Fix bug 1161195
    
    Change-Id: Ic0ce0816d63b576a3469de0ed92cae4b19a3690e

commit 8ad5612317b906022c8d99efb5ed25dd9967866d
Merge: 1731ee0 91bd4bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 10 06:28:53 2013 +0000

    Merge "Allow pdb debugging in manually-invoked tests."

commit 1731ee0acae570e82626cb3d281604a4f3543bc6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Apr 10 00:14:04 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia4090ae2421dc2df9e97f18cdc6830aebafdba1a

commit e9547131eb3ccc7e7301a91714abafa9f5799e48
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Apr 9 19:15:46 2013 +0900

    Improve the deprecated message about DEFAULT.root_helper
    
    bug #1166706
    
    Change-Id: Ic90fefefc0c3339cbc876e4402b6d6c5aa841c47

commit 23a99acc066aa18781521636991d6e5346fa8476
Author: Michael Still <mikal@stillhq.com>
Date:   Tue Apr 9 13:42:47 2013 +1000

    Update to the latest oslo loopingcall.
    
    This renames a class from loopingcall.LoopingCall to
    loopingcall.FixedIntervalLoopingCall.
    
    Change-Id: If51d3f4cc2a393f730cd168b16d444725151dbf4

commit 91bd4bbaeac37d12e61c9c7b033f55ec9f1ab562
Author: Maru Newby <marun@redhat.com>
Date:   Tue Apr 9 02:33:03 2013 +0000

    Allow pdb debugging in manually-invoked tests.
    
     * The old behavior required setting environment variables to
       disable capture of stdout and stderr to allow debugging via pdb.
       The new behavior requires enabling capture of stdout/stderr
       instead. This is already the case in nova.
     * testr behavior is unmodified.
     * Tip 'o the hat to Robert Collins (lifeless)
    
    Change-Id: Ica021eeab07d5a540ce42436c9cc8000c3fd239a

commit 779607bd15f105e2c72688e9aab016117602c7eb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 9 00:14:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I39ef28abfa51c6f41eace1b116b5d444d0c04207

commit d23f0e7d286a85e65369645aaa8ec6c8f9a74fd1
Merge: 533384f 6bc72e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 8 09:02:03 2013 +0000

    Merge "refactor _get_sync_routers to use get_routers."

commit 533384f4867d7b578111f4323710beb443617091
Merge: 716e4c3 4571b2f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 8 07:40:58 2013 +0000

    Merge "Sync with oslo-incubator copy of setup.py"

commit 6bc72e683862741192ab480133f2a1d88020e179
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Wed Mar 20 09:22:52 2013 +0800

    refactor _get_sync_routers to use get_routers.
    
    By using get_routers, get_sync_data() can get all attributes
    including attributes provided by extensions which extend router ext.
    
    Change-Id: I4be761dadd18eed19f4e54676e77d99bcc4a4745

commit 716e4c3977a1a851c5f043464dd5589e75cde132
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Sun Apr 7 22:05:48 2013 +0200

    L3NatExtensionTestCase: super.setup should be invoked once
    
    Bug 1165989
    
    Change-Id: If05342701162982035f6f857557df219ce65f240

commit 4571b2f244ea91af508f3af6e407ef3100c574a2
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Sun Apr 7 20:44:21 2013 -0400

    Sync with oslo-incubator copy of setup.py
    
    Keep up with the changes to the master copy
    
    Change-Id: I5c8f9053b95a1eb0e903365ba12247458d3fb8de

commit e27539980188672edc6bbe24de55d35f52694ead
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Apr 8 00:03:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie45e8014df4e416f96657cc7bd89930bd953228a

commit 4c3b626094d0ccb6f161b3be4254ed077b61bb6c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Apr 7 00:03:52 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I46c5a94d3e495fe2c64642a1d4e5d4af34203aec

commit 1c7f3c9076900867ef47488f91d65cb0f65da01c
Merge: 6361c90 6d211d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Apr 6 20:43:00 2013 +0000

    Merge "Reformat openstack-common.conf"

commit 6d211d4da4f28814bd7f191aa9fa04e2d2c14604
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sat Apr 6 11:06:41 2013 +0800

    Reformat openstack-common.conf
    
    Use the new 'module' option in openstack-common.conf which is a
    multi-string option, allowing each module name to be placed on a
    separate line.
    
    This makes it much easier to review changes to the modules list.
    
    Change-Id: I64dff89639f9d136ded3d25aab9f8f85a2d7112b

commit 6361c90d5d2331675bac6b9703e779c893d4b708
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Apr 6 00:06:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I264a93786f74aaed378c89ee19dab8a5a289d731

commit 4881ac949b07f0363f086ea10022a7190630043b
Merge: 243a196 a9e7639
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 5 01:44:53 2013 +0000

    Merge "Switch to flake8 from pep8."

commit 243a19659046689edfd83972b1695988916c8e76
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Apr 5 00:06:32 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie9108ffeaa267ad932105b0e6d1f770f35896d17

commit 3ecda924489f9229c0713f68320764557665f21a
Merge: f6f253a 1daf927
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Apr 4 20:08:57 2013 +0000

    Merge "Add expected IDs to router.interface.* notifications"

commit 1daf927c9df046c17a8c3f07350f60cf488a4215
Author: Eoghan Glynn <eglynn@redhat.com>
Date:   Tue Mar 26 16:27:05 2013 +0000

    Add expected IDs to router.interface.* notifications
    
    Fixes bug 1160431
    
    The router.interface.{create|delete} notifications are intended to be
    consumed by ceilometer, but did not include the router or tenant IDs
    in the RPC message payload. Ceilometer requires both these data for
    metering purposes.
    
    The missing UUIDs are now provided in the notifications.
    
    Change-Id: I1ca6e1d5377100a0549293e0bdff0182711c750f

commit a9e763914d0c160ec54dfec8d0958331153daa23
Author: Maru Newby <marun@redhat.com>
Date:   Thu Apr 4 04:10:23 2013 +0000

    Switch to flake8 from pep8.
    
     * flake8 supports more checks than pep8 (e.g. detection of
       unused imports and variables), and has an extension mechanism.
       A plugin to support automatic HACKING validation is planned.
     * See: http://flake8.readthedocs.org/
    
    Change-Id: I8c9314c606802109a4d01908dbc74ecb792ad0ac

commit f6f253a6cf981f41a6e725abada22ebc51b1aa4e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Apr 4 00:06:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I664f6de7988fc4987601df5a693347b131544e2f

commit 55f2bc05a0029888a1de1b79838d1e3a7aaac34f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Apr 3 15:13:20 2013 -0700

    Revert "Use wrappers instead of direct calls to ip route."
    
    This commit somehow broken floating ips with the l3 agent so we should revert
    it till we figure out why.
    
    This reverts commit f80f06a71de6e235c71e0333448cf59e44745c45.
    
    Change-Id: Ic93eec0d95ad20baf53cc97476fcdff1b308ae91

commit 147038a61386fb2c94459499637341978032cc30
Author: Tim Miller <tim.miller.0@gmail.com>
Date:   Sun Mar 10 15:23:46 2013 -0700

    Parallelize quantum unit testing:
    
    This change switches run_tests.sh to use testr
    in parallel mode, instead of nosetests, in order
    to enable unit tests to run in parallel.
    
    By default, the number of parallel test processes
    is set to the number of cores on the test machine.
    
    A similar change was recently merged to nova:
      https://review.openstack.org/#/c/15078/
    
    Some tests required updating to remove inter-testcase
    dependencies.
    
    bug #1099694
    
    Change-Id: Idfb923d424342a07dcba88d70b971683f549f763

commit a6bb8f2916dfd79bc5ad1daee851ce0c3b42dca7
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Apr 3 14:15:24 2013 -0700

    Add missing security group quota settings to quantum.conf
    
    Fixes bug 1164154
    
    Change-Id: I32d1952fcc11559cc01c0dbde11de558b2a0b1fb

commit bea61bf94ea441bcaf0ace9e2ba7ef61e1282357
Merge: 4da1dcd f80f06a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 3 16:50:19 2013 +0000

    Merge "Use wrappers instead of direct calls to ip route."

commit f80f06a71de6e235c71e0333448cf59e44745c45
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Wed Mar 20 18:50:50 2013 +0200

    Use wrappers instead of direct calls to ip route.
    
     - extract the logic of ip route wrapper into a separate
       class to drop dependency on a specific network device
     - add route wrapper to IPWrapper class
     - use IPWrapper instead of direct calls to ip route in l3 agent
     - update tests
    
    Fixes bug 1133133.
    
    Change-Id: Ic7174b0676d1a565909bb5f6f950376cf8fae8d2

commit 2ac053e9cfbb30fe4e077f9d802325dfbe48b671
Merge: ae6ade8 d452ece
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Apr 3 07:25:11 2013 +0000

    Merge "Add RabbitMQ and QPID HA support flags to quantum.conf"

commit ae6ade8514aa39297d675627cc03eb364e98deea
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Apr 3 00:06:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8b0c8543dc7c88f017814ba1401512aabe418964

commit 03268945ef564965d7ab640c0822bb1c61b54c4c
Merge: f164a60 37b4183
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 2 19:42:54 2013 +0000

    Merge "Fix lb-vip does not get route to default gw"

commit d452ecee207de435554ae994872c18932fedcbd5
Author: EmilienM <emilien.macchi@enovance.com>
Date:   Tue Mar 26 14:43:12 2013 +0100

    Add RabbitMQ and QPID HA support flags to quantum.conf
    
    Since Quantum supports HA queues with RabbitMQ (https://review.openstack.org/#/c/13760/),
    quantum.conf should provide new flags for explain how to configure multiple RabbitMQ servers and enable HA.
    
    New flags :
    rabbit_hosts=$rabbit_host:$rabbit_port
    rabbit_ha_queues=false
    qpid_hosts = localhost:5672
    
    Fix Bug #1160369
    
    Change-Id: I35903b1b7b66fde8d70ac7e8076e0def2a1f2d04

commit f164a60f15ea042b04b250ffc2001beda4f3e4bc
Author: Rich Curran <rcurran@cisco.com>
Date:   Tue Feb 5 15:55:28 2013 -0500

    blueprint cisco-single-config
    
    Scope: Unification of all the various plugin files for the Cisco plugin into a single file.
    
    Use Cases: Quantum with the Cisco plugin.
    
    Implementation Overview: All the config values contained in the various files in
    etc/quantum/plugins/cisco will be unified into a single file
    etc/quantum/plugins/cisco/cisco_plugin.ini. The plugins needs to be modified to
    read from a single file instead of multiple.
    Added quantum.openstack.common.cfg support.
    
    Change-Id: I9ef356eccfe330c3733f441b96400d03c3d7d1df

commit 4da1dcddc30a508cc0c5dc4aaeea3372a8067aa9
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Apr 2 15:52:37 2013 +0000

    Fix unit tests for RHEL
    
    Fixes bug 1158609
    Fixes bug 1158612
    
    Change-Id: I5ee6214a935cfa663c96b1ba6893f265890c4202

commit 0deaadd145ed75ca531d5cc48e74b1ab85764903
Merge: 54f1e75 26dca9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 2 15:50:19 2013 +0000

    Merge "Return unicode for object in json and xml serializer"

commit 54f1e757f287617371c0732209ab0a9b8db1c7d3
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Tue Apr 2 17:51:44 2013 +0900

    Update Ryu plugin README
    
    Fixes bug #1163181
    
    Update Ryu plugin README file to refer to the new URL that describe
    how to configure the plugin.
    
    Change-Id: I84486f022bddd28a534e971e1132c70f10ad7c04

commit 1b6c0f2a0594ffdd72fc35eae0a10cc02ceddd2b
Merge: f15b281 dc110b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 2 07:14:06 2013 +0000

    Merge "Enable authZ checks for member actions"

commit 37b41833bf4f9500ee6be53d15298d0f4b964ea3
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Apr 1 15:26:12 2013 -0700

    Fix lb-vip does not get route to default gw
    
    Previously when creating a lb-vip it would be created without
    a default gw. This patch fixes that and adds unit tests to check
    that route add is called if the subnet has a gateway_ip.
    
    Fixes bug 1162626
    
    Change-Id: I155749fa6d9c843fca87a73f3cf85720aac26cfa

commit f15b281a822595eef0a02cda13d2148c2b68343c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Apr 2 00:06:16 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7db9bfb2a9fee9b03d396f5dac4cf4b13a18a51c

commit 34cf35a037115976e7e75df8ea8d258ecc5452ae
Merge: 3f85bd9 a12046c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 1 11:42:46 2013 +0000

    Merge "Fix for Cisco plugin physical device config error"

commit 3f85bd974871edb8a0fb22cc79cfd8b8cb46b357
Merge: 0c3e8c3 a4e2442
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Apr 1 10:31:18 2013 +0000

    Merge "Prevents a portinfo deletion in vm migration with NEC plugin."

commit 26dca9ff02dc9eb9b431ea66ec60fb828b4ae0a5
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Wed Mar 27 07:42:20 2013 +0800

    Return unicode for object in json and xml serializer
    
    Fix bug 1160644
    Fix bug 1119790
    
    When try to serialize an exception object as json, it failed
    with 'ValueError: Circular reference detected' that is same error
    as bug 119790. So this patch fixes bug 119790 too.
    
    Change-Id: I0da2616f4ec59da31be054b8be2f7a140f59d63a

commit 0c3e8c391c2e72c0750c87aa0b9307410b2532cb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Apr 1 00:06:20 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iafc49bb95a4eb8cf5a0afebfb8c4ab5de68ff46f

commit 9ac82eebbb42ef11b4800cd48187c533f76e944d
Merge: 379f9a0 f1c04c4
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 31 19:30:53 2013 +0000

    Merge "Imported Translations from Transifex"

commit 379f9a05fc090a4dcdd55fd42ae0fb848e02602c
Merge: acd33c1 e1b3e16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 31 11:53:11 2013 +0000

    Merge "Pass metadata port to metadata proxy"

commit f1c04c4a91f8d08ffd0e785721e1ad614ed9d65c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 31 00:03:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2a97391674edce23e5c98dceae8c7cc6a2bbe5d0

commit e1b3e1678d37756692796b2099e75a872a8b35ea
Author: mouad benchchaoui <m.benchchaoui@cloudbau.de>
Date:   Sat Mar 30 11:56:44 2013 +0100

    Pass metadata port to metadata proxy
    
    Make the l3 agent pass the port used by the metadata service to the router namespace proxy when
    creating it and add also new tests for this.
    
    Fixes LP# 1160955
    Change-Id: Iec8a5238345b26e70b0aa1dc96a896e26af34722

commit dc110b71c115dc9d1ac708ae62aad7d1a7218dcf
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Mar 19 19:54:58 2013 +0100

    Enable authZ checks for member actions
    
    Blueprint make-authz-orthogonal
    
    This implements work item #1 of the blueprint.
    This patch enables authZ checks for 'member actions' in the base
    controller and removes explicit checks from l3_db.
    This patch also addresses a small glitch in the policy engine which
    was assuming the request always had a body.
    
    Change-Id: I7e0f386eedcfff24ea1fee7294bbadd6c5ec781c

commit acd33c1bf86bd47b097905065609c956a84a2561
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 30 00:06:12 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I483efcd9ae8a7e6950a036693462a20216360567

commit a12046cd21618fc1a9bc12983e96cd8607012141
Author: Arvind Somya <asomya@cisco.com>
Date:   Fri Mar 29 13:06:17 2013 -0400

    Fix for Cisco plugin physical device config error
    
    This patch fixes a bug with the Cisco plugin where subsequent vlan id's
    would overwrite the existing trunking config on a switch interface.
    
    Change-Id: I5e97c00062f687838e60e5dc9470f4a62289676b
    Fixes: Bug #1161946

commit a4e2442f25b63c976490882b21979a1a44963618
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Thu Mar 28 15:38:13 2013 +0900

    Prevents a portinfo deletion in vm migration with NEC plugin.
    
    Fixes: Bug 1160193
    
    This patch prevents a portinfo deletion at the end of the migration sequence
    by ignoring port_removed message from the source host.
    
    Change-Id: I96932587b9d660aa01f8fcae0b0426c849d6c483

commit 4bd386f281264bc004f3c16820e51633f6b31308
Merge: 64948f6 2be7e91
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 29 06:14:20 2013 +0000

    Merge "Imported Translations from Transifex"

commit 64948f66834110d2cfa3445de2b92525e3c7a909
Merge: 0c385ee f221ada
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 29 06:11:54 2013 +0000

    Merge "Add lbaas_agent files to setup.py"

commit 2be7e91225ca56e108daafc094f8bff2e8460124
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 29 00:06:20 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I6cab2a9e472620a01a5e1ca13f9a88abcb316a52

commit f221adab55da1dfb9514b3b602e5496d986c9047
Author: Terry Wilson <twilson@redhat.com>
Date:   Thu Mar 28 14:33:00 2013 -0500

    Add lbaas_agent files to setup.py
    
    Fixes bug 1161572
    Change-Id: I2399c6621cabe9ef89a0a1805b7c3a6b1d89ed5b

commit 0c385ee1661b5734a61e0f47fcb8b806c2322f32
Merge: a4faa98 d863a8f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 28 23:47:59 2013 +0000

    Merge "Add VIRTUAL_ENV key to enviroment passed to patch_tox_env"

commit d863a8f2d75f424a6df99b0fefadf9269b49fca3
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 28 15:17:21 2013 +0100

    Add VIRTUAL_ENV key to enviroment passed to patch_tox_env
    
    Bug 1161413
    
    Change-Id: I873d90c148c2adf15319faeb6290743eda2d52aa

commit a4faa98b99c9ab50e8fdb299cc3f404d8144b3a9
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Fri Mar 22 10:31:35 2013 -0400

    Support for SSL in wsgi.Server
    
    SSL are entirely optional. Support for SSL as well using code from glance. We
    have some new options for configuring the SSL support. There are tests for
    accessing a sample app w/o ipv6 or ssl, one with just ssl and one with
    ipv6 and ssl
    
    Fixes LP# 1101342
    
    DocImpact
    
    Change-Id: I824acef4130d27828dcf199736b3ca668d6202d7

commit a30e7c10da39cfaacddef0cf074793567abb0cde
Merge: d160d22 43c7eca
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 28 08:24:46 2013 +0000

    Merge "Enable exception format checking when testing."

commit d160d22f9c2e4c823d83296cc36362f5abec6ba1
Merge: 0e3a2e7 7df07b8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 28 07:28:42 2013 +0000

    Merge "Change the quantum-ns-metadata-proxy log file name."

commit 7df07b88b44294b6b1194a3d3765188e1691f3f5
Author: Brian Haley <brian.haley@hp.com>
Date:   Wed Mar 27 17:44:34 2013 -0400

    Change the quantum-ns-metadata-proxy log file name.
    
    Add a '-' before the router_id/network_id for easier parsing
    when starting the ns metadata proxy.
    
    Fixes bug 1161124
    
    Change-Id: I408111d1343ecac297f6277e8067d3fa34bb8cb7

commit 0e3a2e71881586eab50e40a208117b4f68a230b1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 28 00:06:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I54fa9f8450b48ae19090b3241f081b499439548e

commit 3ec32a1c7328540cf824fc9beaca2caed78f1b8b
Merge: be94763 c76576d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 27 17:52:16 2013 +0000

    Merge "Imported Translations from Transifex"

commit be9476301d0a1a543eb78c48a7ac6c1065bd978c
Merge: edae36c b5e6c2c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 27 17:52:13 2013 +0000

    Merge "Mark 'sql_connection' config option as secret"

commit edae36cf1ef9afcf0266a072687d909d1c1895f3
Merge: 7b95039 1cb1449
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 27 17:46:27 2013 +0000

    Merge "Create a fake netconf client for Cisco nexus unit tests"

commit b5e6c2c8556927efb6de9de1e7c19e0aab450b10
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Wed Mar 27 07:59:39 2013 +0200

    Mark 'sql_connection' config option as secret
    
    Fixes bug 1160680.
    
    Change-Id: I42b16d006f162cb41090fa34677d6ad054b6a55a

commit c76576d3d5a6a273189cd4d500a9a39ddae2f00b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 27 00:06:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I07f9138424a97ee6ca8a6f758e567ace2df0e65e

commit 7b95039ab48ef5b05bbc8774b200f5ad2fa0ea95
Merge: 5457b3b 4721b5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 26 19:22:58 2013 +0000

    Merge "Fix kwargs for NECDBException."

commit 5457b3b65e29cfb591d82ad1917db85715b6d496
Merge: bcfb622 6f752c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 26 19:20:59 2013 +0000

    Merge "Fix kwargs for FloatingIPPortAlreadyAssociated."

commit 1cb1449eb6561b9ec879e1779d591421b5e44424
Author: Dane LeBlanc <leblancd@cisco.com>
Date:   Mon Mar 25 18:43:52 2013 -0400

    Create a fake netconf client for Cisco nexus unit tests
    
    Fixes bug 1159560
    
    Change-Id: Idb0578a16d3944052a0302415c6c0d96e87cc485

commit bcfb622672fce10824112279b9fd79b199485250
Merge: bcfb22b 891a860
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 26 10:34:17 2013 +0000

    Merge "Add metadata support for nvp plugin without namespaces"

commit 891a860d58e651812bb4aa978946159fac3b709a
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Mar 15 14:45:42 2013 -0700

    Add metadata support for nvp plugin without namespaces
    
    If using a host that does not support namespaces the nvp plugin did not have
    a way to leverage metadata unless using enable_isolated_metadata which
    requires a subnet to not have a gateway. This patch changes the metadata
    configuration for the NVP plugin by adding a flag metadata which can be
    set to access_network (which was previously enable_metadata_access_network)
    or dhcp_host_route. When set to dhcp_host_route when the dhcp agent creates
    it's port a host_route is added towards the dhcp server's ip for the
    destination 169.254.169.254/32 only if the subnet has as gatway_ip.
    In order for a host to leverage metadata via dhcp_route_route it requires
    the host's dhcp client to support host routes (code 121).
    
    Fixes bug 1155786
    
    Change-Id: I2ff52adc3dfebcdd6d9c05d5dc79aa65ae100c74

commit bcfb22b60bad6c2d0cf28fbac6d56bd0ed1281f7
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 26 00:06:34 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iffc293cf3e061eb6edf9d32fc792bb47ddb9ac22

commit 9143a83dc83f40d39f941bbc685f6f9338d5a1cd
Merge: c47ead7 7942cc8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 25 20:30:58 2013 +0000

    Merge "Ensure DB pooling code works with newer eventlet versions"

commit 43c7eca89968a6648914be05401a55f979aa763b
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 25 13:47:50 2013 -0400

    Enable exception format checking when testing.
    
    Updates our new exception base class to enable exception
    format checking. This should help enforce that we pass
    the correct kwargs to exceptions when testing.
    
    Change-Id: I9ac62e289c0de3931861473912bb6c98b57d4126

commit 4721b5a81c43461626896ea3fc3b0ee82abe8f5d
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 25 13:46:15 2013 -0400

    Fix kwargs for NECDBException.
    
    Updates the NEC plugin to use the correct kwargs when raising
    NECDBException.
    
    Fixes LP Bug #1159925.
    
    Change-Id: I1e96d4ec65c1bc98d90d2eb9867fe39bbd505cdc

commit 6f752c0125ab1c6a5422c7ddb9c0061eda6fae17
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Mar 25 13:43:14 2013 -0400

    Fix kwargs for FloatingIPPortAlreadyAssociated.
    
    Updates the NVP plugin to use the correct kwargs when raising
    l3.FloatingIPPortAlreadyAssociated.
    
    Fixes LP Bug #1159922.
    
    Change-Id: If89feea5e40976ccb4286f96f5348c54f84950ce

commit c47ead700d6c01cb5e6ee3740272deee0fee9633
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Mar 25 16:51:24 2013 +0100

    Adjust exception message in l3 agent
    
    Bug 1159856
    
    Change-Id: I8d30fd50d46677fc112fe4d8406b849cbb8ef225

commit 44eb90ef36f3cb60148f4d80c8e402c0f14a5dc7
Merge: 5308111 6891a4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 25 15:44:17 2013 +0000

    Merge "Update latest OSLO"

commit 530811190961c6759dfc72aacd99fc1a4deb93ee
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon Mar 25 16:18:21 2013 +0800

    Fixes report state failed with qpid rpc backend
    
    Fixes bug 1159616
    
    Change-Id: Ie63dd41169fdb2f7a1814aed38ab126b69b46fe9

commit 7ef4d88805498c585b93cd452a7f229bb137c4e1
Merge: d216180 4d72093
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 25 07:54:29 2013 +0000

    Merge "netns: ip netns exec <name> kill doesn't make sense"

commit 4d72093de571c2a12dc12c3761e3bcec11ccf20e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Mar 19 06:56:15 2013 +0900

    netns: ip netns exec <name> kill doesn't make sense
    
    It seems confusing netns with pidns.
    Although 'ip netns exec' doesn't make sense,
    'ip netns exec <netns> kill <pid>' itself success as expected.
    But as side effects, dentry of /proc/<pid>/ns/net becomes young,
    which increases the possibility to fail to delete netns. That's not good.
    
    Fixes: Bug #1158589
    Change-Id: I9aa717ccb86d8bf00bb1e707d39bfb65d043532b
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit 6891a4d976eeef094d1e4cb3f9552a31e843ba61
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Mar 25 05:59:32 2013 +0000

    Update latest OSLO
    
    Includes fix for bug 1158179
    
    Change-Id: Ifd8cde2903dcd013903e95a30c2ed422e89bcd0f

commit d21618019e0f1efe5b21ddf32ffbc936786b4b65
Merge: 9e78057 4a96b16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 25 05:04:18 2013 +0000

    Merge "Raise VipExists exception in case Vip is created or updated for a pool that already has a Vip"

commit 9e78057efa972cdd0523829f32861bd6e337d170
Merge: 1586cab cda60cb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 25 03:45:15 2013 +0000

    Merge "Imported Translations from Transifex"

commit 1586cab03175060ce6c9e5f444ce67a4d9e50eea
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Mar 22 15:40:38 2013 +0000

    Revert back to 'call' for agent reports
    
    Fixes bug 1159581
    
    The logic of the agents is based on RPC call()
    since the agent needs to catch an exception over RPC.
    
    Change-Id: I6d408216ebdfd130bab2555e61febd02b521985d

commit cda60cbbe0b15ebdd2310539ef6d091bd295571b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 25 00:06:02 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifd232d5588da1882e4d0a6e946e8d55738153bff

commit a23ad1cfc10529c7f4b1447371aa60c22e9fc182
Merge: f5241b6 48bae6b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 24 22:48:26 2013 +0000

    Merge "Imported Translations from Transifex"

commit f5241b63a67594b69e67de9f3bd227be820da27a
Merge: 3cf9c8c b1067c9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 24 22:43:07 2013 +0000

    Merge "use the fact that empty sequences are false"

commit 48bae6bc5c69092fb5ea72c4735506c43223406e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 23 00:06:17 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id29411bf2856fccc27a9c208dc9cd0d5ce2318ae

commit 3cf9c8c97aa49d87b2e7d9419ae0d3c78d3c3aed
Author: Arvind Somya <asomya@cisco.com>
Date:   Thu Mar 21 12:18:20 2013 -0700

    Fixing the syntax error in the XML Serializer
    
    This commit fixes the syntax error in the XML Serializer.
    Modified wsgi test to exercise this bit of code as well
    
    Fixes: Bug #1158468
    Change-Id: I1bff589a46ff4884e131d7cf60551e2f400acb67

commit 4a96b16dcb837c8085b0fb895ee6052cdde054ca
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Mar 21 17:19:30 2013 +0400

    Raise VipExists exception in case Vip is created or updated
    for a pool that already has a Vip
    
    fixes bug 1158049
    
    Change-Id: I258a31f5d54c040ed478ab241b0e90f2bd0f69b3

commit 1eab8cb6f5d44000f5d30926ab3296cff8eb7866
Merge: 339ecb8 7f21283
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 22 05:42:04 2013 +0000

    Merge "Fix issues with db pooling"

commit 339ecb8f6938c9d2718613742a552db6db4fe65e
Merge: 1d6456c 55f2e16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 22 03:53:04 2013 +0000

    Merge "adding parameter to configure QueuePool in SQLAlchemy"

commit 1d6456c80470fe781d8356edb4e26031f127aa29
Merge: 7f81463 ec2dec3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 22 01:02:04 2013 +0000

    Merge "Imported Translations from Transifex"

commit ec2dec37a0eb0bd80dff4b3f1f5c23d9ca328f91
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 22 00:06:24 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib20d6e551d180d84c4246a9e9684f09d5a018312

commit 7f814639eff66cf82fff466cec766987dcd4b51e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 14 11:25:52 2013 +0100

    NVP metadata access - create elevated context once
    
    Bug 1155051
    
    This is a follow-up patch which fixes a problem with elevated
    context not being passed to subroutines.
    
    Change-Id: Ic270d8e48075b6b58117970ab870c3fb3962d93b

commit 885cc41ff033a24191e93d40cd39d858e108f1d8
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Mar 20 18:19:04 2013 -0700

    Fix race condition in dhcp agent
    
    This patch fixes a race condition that can happen in the dhcp agent when
    a subnet is created and then a host route is then immediately added to that
    subnet following a subnet.update.end notification. The race condition occurs
    in refresh_dhcp_helper() where self.enable_dhcp_helper() gets called twice
    since the first call had not completed self.cache.put(network). This same race
    condition can also occur in the other events so lockutils.synchronized() is
    added to synchronize those code segments as well.
    
    Fixes bug 1155748
    
    Change-Id: I2ff52adc3dfebddd6d9c15d5dc79aa65be107179

commit 55f2e16178e55bb5a7e3a379f28a020305462005
Author: Christian Berendt <berendt@b1-systems.de>
Date:   Thu Mar 21 12:06:33 2013 +0100

    adding parameter to configure QueuePool in SQLAlchemy
    
    This patch introduces the parameter sqlalchemy_pool_size.
    The parameter is used to configure the QueuePool, created
    in configure_db(). At the moment the configuration of the
    pool is only possible when using eventlet's db_pool for
    MySQL (sql_dbpool_enable = True).
    
    Change-Id: I64dec2863c1ee88215ef9b28054ba3bfaafa3b32
    fixes: bug #1158235

commit 7f21283ef36eadd5e600f08e5572580f11d06a7c
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Mar 21 17:01:31 2013 +0000

    Fix issues with db pooling
    
    Fixes bug 1157045
    
    In addition to this a cast is used instead of a call for the
    report update.
    
    Change-Id: I1b0ea5b18b3d75dc3d047975b234275420af189c

commit b1067c94c53e22cc9f8400cf7b2049e35d06877b
Author: shu,xinxin <xinxin.shu@intel.com>
Date:   Thu Mar 21 18:48:00 2013 +0800

    use the fact that empty sequences are false
    
    fixed bug #1156473
    
    Change-Id: I43470eb884107111cbea958868f4cf8241c8d6e6

commit c6bf10d86c2b2d8f66fc07183b9300fb99a89ba5
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Mar 21 04:19:05 2013 +0000

    Ensure that lockfile are defined in a common place
    
    Fixes bug 1158146
    
    Change-Id: I0e986eb16a7ec5b9972a37af583f697ba3624a80

commit 9683664ff35b1dd0f4cbbbdf6fc386cbcb7c7ad5
Merge: 15aa9b4 75cd2e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 21 04:21:03 2013 +0000

    Merge "NVP metadata access - create elevated context once"

commit 15aa9b4e8d3001198433242f8cd3556ceb777dba
Merge: 95f677d 8ec71a9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 21 01:14:26 2013 +0000

    Merge "Imported Translations from Transifex"

commit 8ec71a9999e51c2d961ee98acf0d6eeb48bb570e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 21 00:06:08 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I7e5b222e5b8609631f955dc552412ff0023dff46

commit 95f677d7f3d134896b8c216b7f2a5d71cc64cd2f
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Mar 15 01:31:31 2013 +0100

    Fix typo in policy.json and checks in nicira plugin
    
    Bug 1155379
    
    This patch removes extra colons from policy.json.
    Also, it fixes some checks in the nicira plugin which were not
    passing correctly the target resource for the policy engine.
    
    Change-Id: I89a1d170818173eaa90b50158289a06455febadc

commit 3630d2f46b8a0ebd550d6eda9a86e83476472cae
Merge: 66348fa 0096ce1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 20 18:46:49 2013 +0000

    Merge "Fix DB query returning ready devices in LoadBalancerCallbacks"

commit 0096ce10390af7a6a2fa3501c55cfbe447eb9ba8
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Tue Mar 19 13:13:37 2013 +0400

    Fix DB query returning ready devices in LoadBalancerCallbacks
    
    fixes bug 1156782
    
    Change-Id: I6efdb32955c1b1f8f3dec7b3b1581e97ea0af4d8

commit 66348fa2a888e660e5531777b292e0490518b4e0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 20 00:05:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I27566fdd84cb400628a4aa2a95fd1026e8606072

commit 863f1fe6ea1c38d1de25428dc2d738eaa8478530
Merge: 4bd651a 03bde1e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 20 00:00:17 2013 +0000

    Merge "Add bulking support for Cisco plugin"

commit 4bd651a802feeda464715c7abdce3af0fab0a0a1
Author: Baodong (Robert) Li <baoli@cisco.com>
Date:   Tue Mar 19 10:06:03 2013 -0700

    Load all the necessary database tables when running cisco plugin
    
    In Cisco plugin, Remove redundant/unnecessary calls to configure_db().
    Make sure that all the database models are loaded before calling
    configure_db()
    
    fixes bug #1155121
    
    Change-Id: I27d5dda512140f0553b311b35678c82f729fa854

commit 5acb6ba0ad455cfab2a7d124f1bbce0072b73d6f
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Mar 19 15:07:04 2013 +0400

    Fix haproxy cfg unit test
    
    Check if an option was already registered by one of the previous tests
    
    Fixes bug 1157094
    
    Change-Id: Ieaa6e4b3647fb64ce1928b8564e4a41e68c97e74

commit f2ac738e8293aa0b0c8f81f656ebe5e0aefa1342
Merge: c1cb69e b7f56f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 19 08:25:50 2013 +0000

    Merge "Set fake rpc implementation in test_lb_quantum_agent"

commit c1cb69e86f5f012a9901a9db054af5dfefa95e62
Merge: 86db826 59a9877
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 19 07:40:25 2013 +0000

    Merge "fix mis-placed paren in log statement for l3-scheduler"

commit 86db826cf94d69d8c46847ea8a5bc99a0e5eb152
Merge: db1f86b a828346
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 19 05:08:41 2013 +0000

    Merge "Add scheduling support for the Brocade plugin"

commit 59a98775e7c9bcef81be2a8190755322d20eb1e4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Mar 18 21:09:55 2013 -0700

    fix mis-placed paren in log statement for l3-scheduler
    
    bug 1156978
    
    Change-Id: I47c843616e86a92de2bc20683b865f881517a98d

commit db1f86b23692d79dcb5f44deba45770b080e5236
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 19 00:06:37 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ib0d65ee70c2fd4a0ee822ffb6a61eff9b36ae7b9

commit d92ace38d188fc33393104538c83542f2a5ea248
Merge: bc62f1d 9a15b11
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 18 21:21:57 2013 +0000

    Merge "Validate protocol when creating VIP."

commit bc62f1d55c2a03c29aafb2ac72428e41a1d483c3
Merge: 37ad346 8499d50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 18 20:15:54 2013 +0000

    Merge "Improve test coverage for quantum wsgi module"

commit 03bde1e6171cb1e36846b4499ba908371b9f943d
Author: Paul Michali <pcm@cisco.com>
Date:   Mon Feb 18 08:57:14 2013 -0500

    Add bulking support for Cisco plugin
    
    For each bulk request, the Cisco plugin will handle the call,
    and, through the base class method, convert them into a series of
    non-bulking calls wrapped in a transaction (emulated bulking).
    
    Those non-bulking requests will all be forwarded to the Cisco
    model (VirtualPhysicalSwitchModelV2), which will either handle
    the request locally (as in create_port), or delegate the request
    to the OVS plugin (OVSQuantumPluginV2).
    
    As a result, the model should not receive any bulking calls.
    However, the model was set up to delegate any bulk calls to the
    OVS plugin (which would act like the existing code, in case we
    decide later to pass along any bulk calls). An alternative would
    be to raise an exception, if a bulk call was made to the model.
    
    Prior to this change, all bulking calls were forwarded from the
    Cisco plugin to the model plugin, which would would delegate
    (directly or indirectly) to the OVS plugin. The OVS plugin would
    turn the request into a transction of non-bulking calls.
    
    The effective difference proposed is that the create_port will now
    create the port in OVS and then create the network in the Nexus
    plugin.
    
    The Nexus plugin does not currently handle bulking so this commit
    is implementing emulated (versus native) bulking.
    
    This patch has been updated with latest from upstream (Havana).
    
    blueprint bulk-api-cisco-plugin
    Change-Id: I874295b32ea20c2ca393228b0893a9dd6c77baf2

commit 9a15b11794dbf945f0e9b9705ae510d3b378287d
Author: Ryan O'Hara <rohara@redhat.com>
Date:   Tue Mar 12 13:01:23 2013 -0500

    Validate protocol when creating VIP.
    
    Fixes: bug #1123114
    
    When creating a VIP, check that the protocol matches the protocol
    for the associated pool. If not, raise an exception.
    
    Change-Id: Iba318eda935ccc89dbe8244e00f36ebdfcce65e0

commit 37ad346a7da82575e5d6cdd3b90317fc50700957
Author: Alessio Ababilov <aababilo@yahoo-inc.com>
Date:   Mon Mar 18 18:48:30 2013 +0200

    Allow tests in TestDhcpAgentEventHandler run independently
    
    Tests in TestDhcpAgentEventHandler depend on dhcp_confs
    option that is defined in quantum.agent.linux.dhcp. We have
    to register the option in order to allow independent testing.
    
    This problem is similar to bug #1125951.
    
    Fixes: bug #1156696
    
    Change-Id: I323908c6f70697e056294b1817ff32ce5d32b32c

commit 6e38c964df73b63d378aac5e734826f9e42f63eb
Merge: 711f949 d41a6b1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 18 15:09:33 2013 +0000

    Merge "Synchronize QuantumManager.get_instance() method"

commit a8283463c57f108f03d59c5477eef7e8dceeaa6a
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Mar 5 16:12:44 2013 +0000

    Add scheduling support for the Brocade plugin
    
    Fixes bug 1147190
    
    Change-Id: I7b19b899317cd6f165bbea1415b6aaa3e0ec095c

commit 711f9498cf698486968497d21a4d111af14f359f
Merge: a3721d6 377f78f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 18 06:30:20 2013 +0000

    Merge "Adds delete-orphan to database deletion."

commit a3721d6b2423d985fd477a2b523395af3563147d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 18 00:06:07 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2dd89260a302227b422c87261298632035576af8

commit d41a6b1d3591eb4c366f1543aab9bed866599aa6
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Sat Mar 16 17:53:39 2013 +0400

    Synchronize QuantumManager.get_instance() method
    
    fixes bug 1155667
    
    Change-Id: Ib6316b332fbd08c5b39e9820e5dc45f1846817cd

commit 276fa580927c9ad5d1eacf662f91652e19dcb096
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 17 00:04:23 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifd288e967c4d23010336823765e6c6b95d43f732

commit c9f62b9e6ae00d73b1e39d04ef3409324e23afcb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 16 00:05:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I45176c72238699536fe8cab84ca5f74cd0be65ec

commit c7b3db89c4f14ad1a2902a6a8a98608a40286d48
Merge: 3c4726e 2f2aaf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 19:27:01 2013 +0000

    Merge "Pin SQLAlchemy to 0.7.x"

commit 3c4726e7a042011f88dd79f497c2daab7e1fc7fb
Merge: b25d586 c20c04d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 14:25:34 2013 +0000

    Merge "Set fake rpc backend impl for TestLinuxBridgeAgent"

commit b25d5864979e4eefcfe8cc52055064c22b6005be
Merge: e560098 39e3bff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 14:17:16 2013 +0000

    Merge "Registers root_helper option for test_iptables_firewall"

commit 2f2aaf2a89445590e01a7c288de9f5c93b20e87f
Author: Dirk Mueller <dirk@dmllr.de>
Date:   Tue Mar 12 23:08:27 2013 +0100

    Pin SQLAlchemy to 0.7.x
    
    0.7.10 has been released and is compatible with 0.7.x. Instead
    of pinning to 0.7.9, simply pin to 0.7.x to avoid SQLAlchemy 0.8
    
    Unfortuantely '<0.8' matches '0.8.0b2', which is what we don't want.
    Therefore pinning it to '<=0.7.99' instead.
    
    This matches a corresponding change in openstack/requirements
    
    Fixes: Bug #1153983
    
    Change-Id: Icf680a933c6092cce52706fd9616a0d208164d1e

commit 8499d50259d7f7c01de6dad08b660afa5544af4d
Author: Tatyana Leontovich <tleontov@yahoo-inc.com>
Date:   Tue Jan 29 16:29:13 2013 +0200

    Improve test coverage for quantum wsgi module
    
    OpenStack quantum.wsgi package includes a lot of classes not covered
    with unit tests. This change adds such unit tests.
    
    Fixes: bug #1136027
    Change-Id: I16dd35389bf82f2818b74d1fb4cf7f7a6bebce28

commit 377f78fa55988a92674bd940130ff8d15f3ec521
Author: Senhua Huang <senhuang@cisco.com>
Date:   Thu Mar 14 19:05:38 2013 -0700

    Adds delete-orphan to database deletion.
    
    Change-Id: I3570c812c042365e68eef3b5463899afa85eb9fd
    Fixes: bug #1096549

commit e560098bc8844b5bcc49414b166bd19c6ce4005a
Merge: 8550f51 6e73cd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 15 01:11:34 2013 +0000

    Merge "Do not disable propagate on root logger"

commit 8550f5140230f8773ebd3f3c8935bacc7e839168
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 15 00:06:36 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0d2ce31853d49efa61c271f3c1f4cdc51a0d0283

commit 6e73cd32a05c3edd09891d849ad1e9166698b226
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 14 02:48:46 2013 +0100

    Do not disable propagate on root logger
    
    Bug 1154895
    
    Change-Id: I7aedb82d11b6b0094f0d874e87b7c35209981e25

commit 75cd2e669f1e61c7b206476d772586b6ff23b48a
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 14 11:25:52 2013 +0100

    NVP metadata access - create elevated context once
    
    Bug 1155051
    
    Create elevated context in handle_metadata_access_network and then
    pass it to the create or remove function.
    
    Change-Id: Id8f81419fbbc3616e216e4da0c16898757905933

commit 39e3bff18ab9a83ef8b2dd531604f3e424b98b65
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Mar 5 17:44:23 2013 +0800

    Registers root_helper option for test_iptables_firewall
    
    Fixes bug #1146478
    
    Change-Id: I908a142d9463719e7b3c94aa1d699d329c9259de

commit e95e508ff6c2b6d6a1f88f42dfeac3125a117453
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Mar 7 16:11:31 2013 +0800

    Resolves ryu plugin unittest errors
    
    Removed obsolete DATABASE value tests in ryu/test_defaults.py
    Added fake_ryu client in test_ryu_security_group.py
    Imported quantum.plugins.ryu.db.models_v2 in test_ryu_plugin.py
    
    Fixes bug #1151642
    
    Change-Id: I60e5aee90da9fa32bd285e6f6bbd95cd7ee1ce2c

commit b7f56f96dbf10309d396df65d7dd5e4a2f4423c8
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Mar 7 17:36:04 2013 +0800

    Set fake rpc implementation in test_lb_quantum_agent
    
    Fixes bug #1151806
    
    Change-Id: I1a57f8b926960ecfa5ee832e7af8d9f9a2ad177e

commit 7942cc876d7646896d942544eccd173b0c50c1ab
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 14 01:05:45 2013 +0100

    Ensure DB pooling code works with newer eventlet versions
    
    Bug 1097992
    
    Change-Id: Id14697a0a4815d0aacbae769bf538a96d6846567

commit ace7eb6272b1d87df26411122d5eb101467bc847
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 14 00:06:50 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ie5b1b38bd3d38b9795d25e1193f20181e933a70d

commit c231e28c0216296f0081a26c646c251e7148f7f1
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Mar 13 18:27:31 2013 -0400

    Sync latest Oslo components for updated copyright.
    
    fixes bug 1154837
    
    This resolves the issue by updating with the latest Oslo changes. These
    changes correct the copyright attribution missing from an earlier Oslo
    change.
    
    Change-Id: Ic04197bf4bf026b1b48920a5a99397e6183f5ff3

commit 2d45f49ef4dc72b6a3d62bdf97ade8f5ff3f917b
Merge: e4b44c2 2b72c85
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 22:01:03 2013 +0000

    Merge "drop rfc.sh"

commit 2b72c85a68a0621f838fdb39669bb010b74ba50a
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Mar 13 16:01:55 2013 -0400

    drop rfc.sh
    
    fixes bug 1154763
    
    git-review has long replaced rfc.sh, so this can be removed.
    
    Change-Id: Icccbaa1ab393834370790ffb93f431b3435586be

commit e4b44c285685b7bfd2b4bef89d6a661958f44a20
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Mar 13 15:26:12 2013 +0000

    Replace "OpenStack LLC" with "OpenStack Foundation"
    
    fixes bug 1154702
    
    Change-Id: I78b1d2c9975a1a4f32b0785cce45f1e471783d8c

commit 870f9c3f0249b072b2aba908d8e91e6082de16e7
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Mar 13 11:07:10 2013 -0400

    sync Oslo Grizzly stable branch with Quantum
    
    fixes bug 1154393
    
    Change-Id: I3442ff3da05447926b3e5882299ec7a92b9e38e3

commit 805ebce2400475bf25fa23af493528436f37f6ce
Merge: cd1cbed 7588c58
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 12:45:34 2013 +0000

    Merge "Switch to final 1.1.0 oslo.config release"

commit cd1cbed02035ff00ba3379e5e162084a5fb07b49
Merge: 7bb01b5 d9b1377
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 07:03:38 2013 +0000

    Merge "First havana commit."

commit 7bb01b58d2737d465080c571b166308478519aae
Merge: dd449a6 9f55912
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 13 06:16:43 2013 +0000

    Merge "Imported Translations from Transifex"

commit d9b13775d14d618ad2b459cbd4d8cfa6e3b4a351
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Mar 12 22:36:35 2013 -0700

    First havana commit.
    
    This commit indicates that the master branch has moved on to
    representing the "havana" release.  The previous commit will be use to
    start the milestone-proposed branch for grizzly.
    
    All future changes for grizzly must first be merged
    into master, and then back-ported to a grizzly milestone-proposed branch
    (or once grizzly is released, the stable/grizzly branch).
    
    Change-Id: Ic2fadf815fd13d8c3d0afbc6493f8cd3ea6545d2

commit dd449a60ab7c4c5dbc2a649dfd4e006bdbc686ad
Merge: 7d3ace0 40df793
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 05:22:04 2013 +0000

    Merge "Ensure port get works when NVP mapping not stored in Quantum DB"

commit 7d3ace027c9005088545c96ed0301fc0aa55a9a0
Merge: afd33e0 2bc6c63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 04:44:10 2013 +0000

    Merge "port_security migration does not migrate data"

commit afd33e093173174a2d446f486651523cd68eff63
Merge: 6015bb2 c38a769
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 04:05:17 2013 +0000

    Merge "remove references to netstack in setup.py"

commit 40df793e9f9740bf2b53fc6f1fdcb820d7ad8b35
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Mar 11 13:55:51 2013 +0100

    Ensure port get works when NVP mapping not stored in Quantum DB
    
    Bug 1153616
    
    If the entry for the mapping between a quantum and a NVP port identifier
    is not found in the Quantum DB, search the port on NVP, and, if found,
    add the mapping entry.
    This ensures upgraded folsom databases keep working with Grizzly code.
    
    Change-Id: I74943e8271f522dcd21c1c34b0159dd61bb66e76

commit c38a769d4ec0a99c7dad8547e4256c109b88f0e3
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Mar 12 18:08:35 2013 -0700

    remove references to netstack in setup.py
    
    bug 1154388
    
    Change-Id: I1265b93edaa997405909e6e3dc408f365f2043e9

commit 6015bb22e7b4eae68445c7c086348abdcaeae93d
Merge: d20a1f3 90abfc6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 13 00:08:27 2013 +0000

    Merge "Add l3 db migration for plugins which did not support in folsom"

commit 9f5591299056c1092953bc55e26c2643005758b9
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 13 00:04:44 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifaa2da10298d2022dc4639e44be1cc6815c4661a

commit 2bc6c63a1a6ab9827480a6538e35e6f2b1b93259
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun Mar 10 14:09:28 2013 -0700

    port_security migration does not migrate data
    
    The port security migration previously created the correct table structure but
    it did not migrate the old data into this table. This patch adds code that
    copies the id fields from networks and ports into portsecuritybindings
    and networksecuritybindings tables.
    
    One thing to note is that in grizzly when a port is created on a network that
    has port_security_enabled=True, the port will also be created with
    port_security_enabled=True. But since ports in NVP were not previously
    created with the mac/ip security address pairs we have to set existing ports
    and networks port_security_enabled value to be False. One could easily
    write a script to set these values to True after applying this migration.
    
    Fixes bug 1153366
    
    Change-Id: I8a1ccab3e432c23c475816111d388df7f81b8e4a

commit d20a1f3749d762ef4459127da9e377f5bbe0bbe7
Merge: d0d539b bb43a07
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 23:13:15 2013 +0000

    Merge "Fix detection of deleted networks in DHCP agent."

commit d0d539bbd3ba177f687a8bbf4af4f9a785e79981
Merge: 8f18270 4b258aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 20:59:38 2013 +0000

    Merge "Adds Grizzly migration revision"

commit 4b258aa4ac12e69d3cb8dafb0d4548a2304ad948
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Mar 12 14:49:03 2013 -0400

    Adds Grizzly migration revision
    
    fixes bug 1154255
    
    This change adds a no-op migration called grizzly.  Deployers can reference
    the symbolic name when updating their databases from Folsom.
    
    Change-Id: I442586f1efdb52b7ec8b318077ace52f570b3ae4

commit 8f1827058b357e99a2c5d7b301c98f76275ce3d5
Merge: 1f2b33f 19027e8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 17:47:46 2013 +0000

    Merge "Updates latest OSLO changes"

commit 7588c58ff8371cae75c5e8f23cdf609be883ba74
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Mar 12 16:35:47 2013 +0000

    Switch to final 1.1.0 oslo.config release
    
    Fixes bug #1128256
    
    oslo.config has now been released to PyPI in time for Grizzly RC1 so
    we can switch to using it directly.
    
    Change-Id: I655f831718ae5f4e25e941ee206fe195214a9a91

commit 1f2b33fa2e955d12e9ea5fa8cf232a23a7a47e30
Merge: cf00be0 1e6e6d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 12 14:29:04 2013 +0000

    Merge "Update oslo rpc libraries"

commit bb43a075f79fde8e57019671aab62e14d0bb2741
Author: Roman Podolyaka <rpodolyaka@mirantis.com>
Date:   Tue Mar 5 18:53:51 2013 +0200

    Fix detection of deleted networks in DHCP agent.
    
    The DHCP-agent uses an in-memory networks cache to find out which networks must
    be deleted and which ones must be updated. In a case of agent restart the networks
    cache is empty and it's not possible to cleanup DHCP-processes serving networks
    which were deleted while the DHCP-agent was down. The proposed fix fills the networks
    cache when the agent starts using a list of networks which have existing config files.
    
    Fixes: bug #1135948
    Change-Id: I27758389755cd19bca9fdbeda9cc1a123370f527

commit 90abfc6b04f1acf61e8a8b3413a90d2a12de68b8
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Mar 11 19:33:01 2013 +0100

    Add l3 db migration for plugins which did not support in folsom
    
    Bug 1153585
    
    Several plugins added l3 support in the grizzly release. This means that
    when upgrading from the folsom data model, the relevant data model changes
    should be applied.
    In order to do so this patch refactors the initial migration in order
    to be able to reuse the upgrade_l3 and downgrade_l3 routines.
    
    Change-Id: I876f6d637665e10fb09d2084bb8a545ce469fbf3

commit 19027e872dd5bd4bcac6971ea83324661939f850
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Mar 11 06:45:02 2013 +0000

    Updates latest OSLO changes
    
    Change-Id: Ief4a24a620b798bf8ece393e90c292c8121ae280

commit c20c04d3fad44ca0c5bf72c253dba26b8aa3cd88
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Tue Mar 12 10:59:45 2013 +0400

    Set fake rpc backend impl for TestLinuxBridgeAgent
    
    Fixes bug 1153845
    
    Change-Id: I692bfc16dbd52dacd2a9418f0bd63c3143a25025

commit cf00be07a699525f95fc039899e1b0d470a7c5d5
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 12 00:06:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ibd8c4ae41892acf2dba87869ac0ab28f4515ba60

commit 1e6e6d5968da8b9dce294060b3934699d2ddc04b
Author: Michael J Fork <mjfork@us.ibm.com>
Date:   Mon Mar 11 13:26:59 2013 +0000

    Update oslo rpc libraries
    
    Update oslo rpc libraries to capture changes, primarly motivated
    by secret=True flag on password config options.
    
    Added bin/quantum-rpc-zmq-receiver
    
    Change-Id: I40d3ef1a85901e5b9eab803cc67cdad3cbb0719a

commit 6b9ce709fc05e5c734094cea5196bcdbea43e0dc
Merge: 4c023f8 5c62a1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 20:29:23 2013 +0000

    Merge "Solve branch in migration path"

commit 4c023f8889586ed5d24953b0d34a57abba258996
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Mar 11 13:46:41 2013 +0000

    Sets default MySql engine to InnoDB
    
    Fixes bug 1153594
    
    Change-Id: I4a3de87a99ca2d49b6a74d7104daf47f8f421a80

commit 5c62a1c15246d1bc9095fdeaf4cce7e1f240eac6
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Mar 11 14:03:01 2013 +0100

    Solve branch in migration path
    
    Bug #1153578
    
    Also, change a comment line in another migration where the 'revises' line
    was incosistent with the id of the actual down_revision
    
    Change-Id: I8effd70ba553330f9023605a2bfa92bd3d73bd4e

commit 6e9fe5d287a466a8d9ca866bcf0fd83c6557d6ab
Merge: 7e55816 33c3cc5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 08:22:17 2013 +0000

    Merge "Update tox.ini to support RHEL 6.x."

commit 7e55816f9216ab0f548dee38a6f648c2d8f73d3a
Merge: a9b98f3 d742c38
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 02:52:37 2013 +0000

    Merge "missing - in --config-file"

commit a9b98f3f230e77e7bf349e19f3101db02bc1b3e0
Merge: c48737d e6b5148
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 11 02:27:46 2013 +0000

    Merge "Imported Translations from Transifex"

commit c48737de43b877c8c1d7bd09f843fa890e76ad3a
Merge: dac439e fe1c502
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 11 01:41:23 2013 +0000

    Merge "Fixes Hyper-V agent issue with mixed network types"

commit fe1c50217732c6cbac4831d47a0b888ea40b7f45
Author: Alessandro Pilotti <ap@pilotti.it>
Date:   Sun Mar 10 17:53:36 2013 +0200

    Fixes Hyper-V agent issue with mixed network types
    
    Fixes bug: 1153274
    
    Due to a bug in setting up external ports the Hyper-V agent fails to work in
    scenarios with VLAN and flat networks.
    
    Furthermore, a warning message on Hyper-V 2012 indicates that external
    port settings are ignored. As a result the agent can be simplified by
    avoiding vswitch external ports configurations.
    
    Change-Id: I860d22f427cb10dbeac422c1db2b3bcf9e84150f

commit e6b51483801acf33e1dc55333d506115a321a967
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 11 00:06:07 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I4ab820d1465af7b33a1e68217ad66f1594de39fa

commit d742c381ad3ba3e4654652f66f3401b8021c547e
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun Mar 10 14:44:59 2013 -0700

    missing - in --config-file
    
    Fixes bug 1153374
    
    Change-Id: I6ec9ee3e074a37fb550f8527b44db906136d78f9

commit dac439e130e977b85c2fd381124e63fe128cf046
Merge: 0109231 cad2caf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 10 18:58:47 2013 +0000

    Merge "Fix typo"

commit cad2caf1d56059d4a7d2605e26ddc1c055e43328
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Mar 10 07:35:29 2013 +0000

    Fix typo
    
    Fixes bug 1153132
    
    Change-Id: I66d8bb16cbecc5072d20d2a9b8db8ebf598bf291

commit 0109231fcdb3c9e850afef82ba27090a4a0178af
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Mon Mar 4 21:21:04 2013 +0800

    Log the configuration options for metadata-proxy and agent.
    
    Bug #1144370
    
    Change-Id: I35ac570dd55006d0133736588f0302d6f70294de

commit 1001685a9f69200d64dadfdd7f9cf12b458561cd
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 10 00:05:53 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id200d6035d1716b5c81aee27d3290e2240259224

commit e3af9a5c6f386df1bce4a1acdae2985323fb35bb
Merge: 01912cb 4cf7deb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 15:31:09 2013 +0000

    Merge "NVP plugin: return 409 if wrong router interface info on remove"

commit 01912cb27a9833fce564ce6c304a1e7f2f1bbb45
Merge: 4d25895 2c90bf5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 15:27:27 2013 +0000

    Merge "Ensure metadata access network does not prevent router deletion"

commit 4d25895c5935b858cc54c6ef24965447866c403c
Merge: 0fcc8cb 2d8e56b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 08:34:21 2013 +0000

    Merge "Disable secgroup extension when Noop Firewall driver is used"

commit 0fcc8cb8c689aa96aa942c11b96d30db10cf4ab7
Merge: 3cb5940 b50e66f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 08:30:12 2013 +0000

    Merge "Do not delete subnets with IPs on router interfaces"

commit 3cb59409a63884dba2daaff8d43ed1ef1a50a14e
Merge: c8665f9 25d14da
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 04:47:10 2013 +0000

    Merge "Filter out router ports without IPs when gathering router sync data"

commit c8665f9cfa0f93f634703eaa1900a561c3618e57
Merge: 7b60092 ebd2445
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 9 03:49:04 2013 +0000

    Merge "Imported Translations from Transifex"

commit 7b6009256361cd7884e80fb7fc473742407d22cd
Merge: 6bb31ed 57fae4f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 9 00:47:01 2013 +0000

    Merge "Update to Quantum Client 2.2.0"

commit 4cf7deb940ea02042e6d95ca48cb250230969e4c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Sat Mar 9 01:30:39 2013 +0100

    NVP plugin: return 409 if wrong router interface info on remove
    
    Bug 1152167
    
    Raise an exception causing a 409 error to be returned if port_id or
    subnet_id specified in request body do not exist before further
    processing the operation (which will cause a 500 error to be
    returned to the user)
    
    Change-Id: I347dd86da87ce5b1e57e139e4c21d4533a456cbc

commit ebd2445a06b3cef037fc6efb4ceb5f80e2172fb6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 9 00:06:09 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I04aea4ba6c5ac4c3324d0642f19e7279c340c7f6

commit 2c90bf558825034a998750f8029defcebc4bb45c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 7 13:51:15 2013 +0100

    Ensure metadata access network does not prevent router deletion
    
    Bug 1152136
    
    This patch checks if a metadata access network is still present when
    removing a router in the NVP plugin. If yes, the network is detached
    from the router and then destroyed, thus ensuring a safe completion of
    the operation as well as removal of metadata access network resources.
    
    Change-Id: Id8be6ec50ab4536f4ae9916dadaed56644597c7c

commit 25d14dae7090c17f1e753c0f27f0d0673cbcdcaf
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 7 12:32:32 2013 +0100

    Filter out router ports without IPs when gathering router sync data
    
    Bug 1152050
    
    Change-Id: Idd11d5f953129471c09f44b4f7c75dc9899d6783

commit b50e66f1863416c5c65d05f294f7b8a519dfb78c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Mar 8 18:10:38 2013 +0100

    Do not delete subnets with IPs on router interfaces
    
    Bug 1152171
    
    This patch simply causes a 409 to be returned when attempting to
    delete a subnet which has IPs on ports whose device_owner is
    network:router_interface
    
    This does not address a similar problem that arises when the ips for
    a port owned by a router_interface are updated. This problem is hidden
    when updating a port which has been assigned the gateway_ip by an
    exception in the IP recycling process. However, it will hit when the
    port was explicitly added to the router, since it will have an ip
    different from the subnet's gateway ip.
    
    Change-Id: I38dfd2639acd03db8d3f1f933495a456a4a8724f

commit 57fae4ff696fec813af9f3ab710451c5f437b406
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Mar 8 10:02:31 2013 -0800

    Update to Quantum Client 2.2.0
    
    This patch updates tools/pip-requires to use the python-quantumclient 2.2
    It also limits the version to <3.0.0 to prevent breaking something accidently
    when 3.0.0 is released.
    
    Fixes bug 1152695
    
    Change-Id: Iec52ffe91793567c7707843a80a282bd51eb0c76

commit 6bb31ed9f1a9291b9940473ebafb338f96ab3b84
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Mar 6 12:21:08 2013 -0800

    Add explicit egress rules to nvp security profile
    
    The following commit  7e26074b changed the previous behavior of quantum
    security groups by explicitly adding egress rules to the security profile.
    When these rules are removed the vm is no longer able to send traffic out.
    
    This patch adds these rules for NVP. One thing to note in the patch
    is that now a bunk rule of IPv4 127.0.0.1/32 is added to each security
    profile. The reason for this is by default NVP security profiles allow
    all egress traffic until a rule is added and then it just lets traffic
    matching those rules out. Adding this bunk rule achieves this behavior
    that quantum now uses.
    
    Fixes bug 1150378
    
    Change-Id: I005880fcf39d539ae99be428d75c43cc0b39a7b6

commit 33c3cc559cddc9a4f1c5be502e0f83de140cad44
Author: Dan Prince <dprince@redhat.com>
Date:   Thu Mar 7 12:41:30 2013 -0500

    Update tox.ini to support RHEL 6.x.
    
    In order to support running unit tests on RHEL 6.x we need to patch
    eventlet with contrib/redhat-eventlet.patch. We already
    have support for this in the tools/install_venv_common.py but we
    need to make a couple changes to allow tox to consume this:
    
    1) Sync in the latest intall_venv_common.py from oslo. This changes
     patch to use the -N option (ignore already applied patches) and
     makes it safe to call the patching function more than once.
    
    2) Add a new patch_tox_venv.py script in tools.
    
    3) Update tox.ini to call patch_tox_venv.py before it runs tests and
     coverage.
    
    NOTE: This will hopefully go away eventually once this patch lands:
    
     https://bitbucket.org/eventlet/eventlet/issue/89/add-a-timeout-argument-to-subprocesspopen#comment-3342969
    
    Change-Id: I3e2b07c3f718e4aede5c5f231ff0cdb7721ec885

commit 0f38e10810afff71261be3dab5a501d680d6b72d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Mar 8 09:51:41 2013 +0000

    Fix exception typo
    
    Fixes bug 1152525
    
    Change-Id: I24b5340b791a7408fbd2c7a371971445a24333b7

commit ea36f51853693479213210d831cff2e798b4d79f
Merge: a7403fe 987b1a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 09:45:03 2013 +0000

    Merge "Wrap quota controller with resource.Resource"

commit a7403fe31d8b7b6f270fe07465da09dc961854ae
Merge: e0f567f 4ee4e75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 09:32:24 2013 +0000

    Merge "Enable handling the report_state RPC call in Brocade Plugin"

commit 2d8e56ba64e328c71ef541da9c327d5bf23ced44
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Feb 13 22:42:29 2013 +0900

    Disable secgroup extension when Noop Firewall driver is used
    
    When Noop Firewall driver is used, Quantum security group actually does
    nothing in OVS and Linux Bridge plugin. It would be better to disable
    security group extension for such case to avoid confusion.
    By this we can determine whether quantum security group is enabled
    by checking the extension list.
    This commit changes OVS/LB/NEC/Ryu plugins with agent firewall_driver
    based security group implementation.
    
    Fixes bug #1124117
    
    Change-Id: I2182289c1e27987b686f1adb7d6e2ad4e154caa2

commit 987b1a35cdb3631ab759b5ee6b63ad6ecb8e1753
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Tue Feb 5 19:05:53 2013 +0800

    Wrap quota controller with resource.Resource
    
    Fixes bug 1116137
    
    Currently the format of error message returned by quota extension was
    different with quantum other resource. Other resource will return as
    json(eg, '{"QuantumError": "error message"}'). But quota extension only
    return messages without any format.
    'quantum.api.v2.resource.Resource' provider error messages processing.
    So wrap quota controller with it.
    
    By the way, fix some small stuff:
    * Use specific exception 'QuotaTenantNotFound' instead of generic exception.
    * Correct error message.
    * Use attribute mapping checking the request body.
    
    Change-Id: I71261198aa79e9ed8e0ae672de32552abdbf45c1

commit e0f567f99e36a31179d28b6d32d278716faf0db5
Merge: cb410c5 1d206cc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 07:31:58 2013 +0000

    Merge "Allow probe-create to specify device_owner."

commit 1d206cc309a3fb51c50c77ab31b886b890f0bd1f
Author: Zhesen <zhesen@nttmcl.com>
Date:   Wed Jan 16 17:57:57 2013 -0800

    Allow probe-create to specify device_owner.
    
    The device owner of the probe port can be
    specified by the --device-owner option.
    
    There are two values for device-owner option,
    network or compute.
    
    The probe port will be created with the network
    as the device owner by default.
    
    Fixes: bug #1102726
    
    Change-Id: I72d62e2fe7b8f7a5eb4411bc9052efa82fb4fdf5

commit cb410c5fa2aa030a9b31cee40dcc954b262cbe35
Merge: 6f5e8c5 84ed107
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 02:59:16 2013 +0000

    Merge "Create quantum client for each api request in metadata agent"

commit 6f5e8c5ef21fc5628fbea2a1b35c828fd1f18ee6
Merge: 36d5755 48e7848
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 8 01:59:15 2013 +0000

    Merge "add ns-metadata-proxy rootwrap filters to dhcp.filters"

commit 4ee4e75321cc163c9f5a9e0d3e159211357ca3a0
Author: Shiv Haris <sharis@brocade.com>
Date:   Wed Mar 6 15:25:49 2013 -0800

    Enable handling the report_state RPC call in Brocade Plugin
    
    Fixes: bug #1150294
    
    Change-Id: I4f641af48140a108e7c707446cda52509d567c8d

commit 36d57554e9755e2624ff371798451030182726bd
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 8 00:06:29 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I434136d9dab5344b72eec2e7e319b756c88bc80e

commit 84ed1079c87717ddd279597fb7b41f5ea29599c8
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Tue Mar 5 20:52:22 2013 -0800

    Create quantum client for each api request in metadata agent
    
    Fixes bug 1148017
    
    Change-Id: I6f9263f01d17dcc44a4deb42cdaa348164ac4819

commit b6722af476eb7b4b54f7b29e626568c3ac1c7ede
Author: Ante Karamatic <ante.karamatic@canonical.com>
Date:   Thu Feb 7 12:33:49 2013 +0100

    Lock tables for update on allocation/deletion
    
    Allocating, creating and deleting port might happen
    in parallel and we need to make sure we don't
    assign same IP to multiple different requests.
    
    Added treatment for vlan tags and tunnel ID's
    
    Fixes: bug #1110807
    
    Change-Id: Idbb04d3ce6eacd308b05536f1942a35a0792199e

commit 9951582d33f57ed53e0a3ece9f1f81623faba032
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Mar 7 14:19:16 2013 +0100

    NVP plugin: configure metadata network only if overlapping IPs are enabled
    
    Bug 1152144
    
    This patch also add a warning emitted in the logs at startup if the
    configuration is not correct.
    
    Change-Id: Idbf10c64f068a71ef1ed9c29a6a0c4e736bb975d

commit bbbfdfe653fc5aaa201ab2da30b02f4245d9bbeb
Merge: 8b82d7f 0285379
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 09:34:12 2013 +0000

    Merge "isolated network metadata does not work with nvp plugin"

commit 8b82d7f56aad421bc96efdc9b03391521675222c
Merge: 74c32a0 603e3b7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 09:29:17 2013 +0000

    Merge "Show default configuration Quotas"

commit 74c32a0b5c8e6eb37a7cea132d926376068746a4
Merge: 9a23e10 705dde4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 7 07:23:41 2013 +0000

    Merge "Notify creation or deletion of dhcp port for security group"

commit 603e3b78fe840fd486692c691d4032ce9472b499
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Mar 4 10:21:28 2013 +0000

    Show default configuration Quotas
    
    Fixes bug 1144076
    
    The patch set shows the defualt quotas that exist in
    the configuration file. This is if the DB_QUOTA_DRIVER
    is not configured. In this case the user is required
    to update the configuration file and restart the service.
    
    Change-Id: I5517c0215e8cfa71453ee38c34d8249e74346fdf

commit 48e7848a2e4fb3c96d44bf7519bd7984851ac9bb
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Mar 6 17:40:52 2013 -0800

    add ns-metadata-proxy rootwrap filters to dhcp.filters
    
    bug 1150628
    
    now that dhcp-agent also uses ns-metadata-proxy, we need to make sure
    those rootwrap filters are installed in scenarios where dhcp-agent is
    installed by l3-agent is not.
    
    Change-Id: I141b2291aceb93d650258ff1df1ef0122ce8da90

commit 0285379aece40e6650480cffc8a757f21a5aa52d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Mar 6 15:02:12 2013 -0800

    isolated network metadata does not work with nvp plugin
    
    This patch removes the not self.conf.enable_metadata_network
    check before adding METADATA_DEFAULT_IP to ip_cidrs. This result
    of this is that the dhcp agent interface will have
    169.254.169.254/16 on it even if the network is
    enable_metadata_network=True which doesn't matter and happens anyway if one
    sets enable_meta_network=False. This change only effects the nvp plugin
    as this is the only one that uses the enable_metadata_network flag.
    
    Change-Id: Ifb3b28daed9e3bfc61bb0d8a48c40d027d0e2a51

commit 9a23e10a796fcba57a3de819c0d652d029e395d0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Mar 7 00:07:02 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iadf0974ffdada18d175698d73bf69ab16e4682da

commit 08ee0f9cbba4ad6af918a15a7f35732c2a549ca7
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Mar 6 11:48:40 2013 +0000

    Load quota resources dynamically
    
    Fixes bug 1149287
    
    Change-Id: Ie02c7091f326c39f92e6a906c19e937e50227658

commit 705dde46dd17caa03617b17609b6e935dc875948
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Feb 28 16:46:52 2013 -0800

    Notify creation or deletion of dhcp port for security group
    
    fixes bug 1103840
    
    Change-Id: I8031bc607a874871a8081575bce1526b3453aff6

commit 4673c9376ede249a9354cdc2fe187c28415198a4
Merge: 1c0d543 e91818b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 16:25:25 2013 +0000

    Merge "Moved the configuration variables."

commit 1c0d543552c38a5eac6dd08580b73725c5757876
Merge: d346668 5584835
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 15:47:29 2013 +0000

    Merge "fix mis-matched kwargs for a few calls to NvpPluginException"

commit d3466689e380ce53eb45d37cad48607b13feb98b
Merge: 07716f8 7e26074
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 09:20:03 2013 +0000

    Merge "Populate default explicit allow rules for egress"

commit 5584835f886302e434f9959f0f82f9694d09b5d3
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Mar 6 00:59:54 2013 -0800

    fix mis-matched kwargs for a few calls to NvpPluginException
    
    bug 1148839
    
    Change-Id: I7d08719c0ac9a7445f4863c91854e4dcd8c81be6

commit 07716f896723b56ed9bb79c27840004e4ac35e59
Merge: e0a769e c56c0fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 07:48:08 2013 +0000

    Merge "Fix syntax error in credential.py and missing __init__.py"

commit 7e26074be5dbe1a9b629b035da46e7122c4c34c9
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Fri Mar 1 20:19:13 2013 +0900

    Populate default explicit allow rules for egress
    
    This way, the default behavior becomes clear and
    symmetric to ingress processing.
    
    Fixes bug 1143283
    
    Change-Id: Id6496819aaceda50def597739f7872653d5b2e00

commit e0a769e0b25a79db1b5682bb14406e144f0c3e75
Merge: 5860e38 3abf094
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 04:57:09 2013 +0000

    Merge "Make run_tests.sh pep8 conf match tox."

commit 5860e38b12949ef6983dca29575cb7ac2d97cbd6
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 5 22:31:54 2013 -0500

    Switch to oslo.config.
    
    The oslo-config package has been renamed. Switch to the new version.
    
    Change-Id: I24d44bac42a1478550e4c16b2a41b1b57e87fb4a

commit 101784e65477fa4624ee1ad6bf9347fd604cc485
Merge: 99761bc cea9e39
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 03:15:50 2013 +0000

    Merge "Add common test base class to hold common things."

commit e91818b37829611ad515c183c0811f65a4cd5133
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Mon Mar 4 11:45:22 2013 -0800

    Moved the configuration variables.
    
    Moved the configuration variables from dhcp agent
    to linux interface so l3-agent works with
    Metadriver.
    
    Also removed the unnecessary configuration variables
    from quantum debug agent because of the above
    modification.
    
    Fixes: bug #1138757
    
    Change-Id: Ib23fee18a08ef1c531feb05d98c9a76f5385a4ff

commit 3abf094150d540eeb4ba3e02f080b3440d82a13b
Author: Dan Prince <dprince@redhat.com>
Date:   Tue Mar 5 21:01:02 2013 -0500

    Make run_tests.sh pep8 conf match tox.
    
    Updates our run_tests.sh pep8 excludes so that match what we do
    in tox.ini (Adds E711,E712 to the exclude list)
    
    Change-Id: Iaf2cee898a957847d444aa7c48db1d4ad088ab6e

commit 99761bca317f8bc1b9477730d930954e2a3b0c18
Merge: 612f2e4 810334e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 6 01:59:26 2013 +0000

    Merge "Imported Translations from Transifex"

commit c56c0fab09bfff67a703e5777d18f71721c96f07
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Mar 5 17:48:35 2013 -0800

    Fix syntax error in credential.py and missing __init__.py
    
    This patch fixes a syntax error in credential.py and resolves
    the following import error:
    
    In [1]: from quantum.plugins.cisco.extensions import _credential_view as a
    ---------------------------------------------------------------------------
    ImportError                               Traceback (most recent call last)
    /opt/stack/quantum/<ipython-input-1-ef3f11a361d0> in <module>()
    ----> 1 from quantum.plugins.cisco.extensions import _credential_view as a
    
    Fixes bug 1148133
    
    Change-Id: I22bc7152fcfec6fdc9f2638bc92d2fb1db99a484

commit 612f2e427c2f3f80b2c1ca78e01ab0c4bcdb195a
Merge: a624c18 a4d41a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 01:47:36 2013 +0000

    Merge "fix incorrect pathname"

commit a624c18799b7af67f8e2b45450601c152cd041ba
Merge: b9204c2 1f716e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 01:42:28 2013 +0000

    Merge "Prevent DoS through XML entity expansion"

commit b9204c27d3b05271ce2e142a01289ab8c6754006
Merge: aca76b0 0b0c683
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 6 01:00:18 2013 +0000

    Merge "Delete DATABASE option checkup testcases"

commit 810334ec3390f039bae0086e8e47657c895f7124
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Mar 6 00:06:47 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id5447fc9fb0c2dfa35523fe878337e56b48b6e46

commit cea9e39dd70e6b5c5f0e5aac5e9b7fc477ab990c
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Feb 23 10:35:28 2013 +0000

    Add common test base class to hold common things.
    
    There are several common fixtures that every test case wants. Following
    the pattern in Nova, add a common base test case class to hold these things.
    
    Change-Id: I2d2cd91e5051d9cbf230e6f48985d6eddcb7b58a

commit aca76b008b25b5e2272b68320e30c807a4034a13
Merge: e69dec3 c3d789d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 22:53:18 2013 +0000

    Merge "Setup device alias by device flavor information."

commit e69dec3cadcd8f7dd574310680cf4ee4ef4d8f69
Merge: 4a1a37c 375535e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 22:04:35 2013 +0000

    Merge "Rename source_(group_id/ip_prefix) to remote_(group_id/ip_prefix)"

commit a4d41a38ccb39a7d218fc46d84e7a9753af067f5
Author: Baodong (Robert) Li <baoli@cisco.com>
Date:   Fri Mar 1 10:02:12 2013 -0800

    fix incorrect pathname
    
    return of call to os.path.abspath('../../..') depends on the setup of
    nose working directory. Change to return the directory where
    test_config.py resides
    
    fixes: bug #1138216
    Change-Id: I1d3f1e3c88bd30871a018a195cee46a91d35c8a8

commit 1f716e3effe1ad6eeb042a11f06a5c89498a34b8
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Tue Feb 26 15:43:50 2013 -0500

    Prevent DoS through XML entity expansion
    
    Add a ProtectedXMLParser that overrides the
    doctype declaration handler. The handler simply
    throws an exception and prevents any further
    parsing of the incoming xml.
    
    Fixes LP Bug #1100282
    
    Change-Id: I6488e1a6a52326006e7e7927ece5b5939b72e83e

commit 0b0c6834f34467d075543ef925dce0362d02f914
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Feb 1 11:22:34 2013 +0800

    Delete DATABASE option checkup testcases
    
    Fixes bug #1146441
    
    Change-Id: I2c8dc2bc3e3055e529bdaf38529d804f5e75e036

commit 4a1a37ce9f8baf2078a1a44380895d144203a876
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Tue Mar 5 09:52:01 2013 +0800

    Fixes linuxbridge agent downs with tap device deletion timing issue
    
    Fixes bug 1136264
    
    Add try/except in deamon loop for preventing agent broken down by
    unhandled exception.
    
    Change-Id: I99a4f2b485f134b240630a895378d0f61d6382d8

commit 375535e20cddefd751aea608d4f18ff7bb8e0c50
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Mar 4 11:04:41 2013 -0800

    Rename source_(group_id/ip_prefix) to remote_(group_id/ip_prefix)
    
    Fixes bug 1144426
    
    Change-Id: I8b62044b6e679d923fffef69a49f4fd55751f116

commit d408e7298c4b48517783f22f383da3b7db1d264c
Merge: 24a6e70 921f203
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 07:03:29 2013 +0000

    Merge "L3 port delete prevention: do not raise if no IP on port"

commit 24a6e70ca657840e810af423a2c687553c1f368d
Merge: 6f696b2 5865916
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 5 02:57:39 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6f696b2a12421148d76e8b5088dfc1f37a9edfee
Merge: 47d4b3f 044169b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 5 01:07:18 2013 +0000

    Merge "move cisco-specific extensions to Cisco extensions directory"

commit 58659163f8c9b48a520af7c512feaa8559c6ee58
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Mar 5 00:06:30 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Id338050311494e6951bf678658bd07faafeb348a

commit c3d789d659840a3e0ddf78a5523d535866a98657
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Thu Dec 6 11:39:34 2012 -0800

    Setup device alias by device flavor information.
    
    The router interface cannot be deleted since the MetaPlugin
    cannot get the flavor information from the port which has
    been deleted.
    The solution is setting up the alias for each device based
    on the flavor information, so the MetaPlugin still can get
    the flavor information from the device itself even the
    port has been deleted.
    
    Also the router interface cannot be deleted since the
    l3_port_check flag is not passed by MetaPlugin.
    
    Fixes: bug #1085276
    
    Change-Id: I670aa45c804e660ee4afb5359e0ab1347f369986

commit 47d4b3f532d969b13b81faeedfb3507c8355f6fb
Merge: b7b7cc8 73eedf5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 4 22:06:27 2013 +0000

    Merge "Pin pep8 to 1.3.3"

commit 921f203f4906a3b566f5a58471a55a4eedfc939c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Mar 4 18:19:47 2013 +0100

    L3 port delete prevention: do not raise if no IP on port
    
    Bug #1104337
    
    This patch alters the prevent_l3_port_deletion logic.
    PortInUse is raised only if the port has a device owner in
    (router_interface, router_gateway, floatingip) and an IP
    address.
    If no IP address is found on the port the port itself can
    be considered stale and therefore deleted as any association
    with l3 entities would be void.
    
    Change-Id: I9d711b2a9d2cbcc8be481f1751f51fe5b9f01327

commit 73eedf5c794668bafe5e42f6ec75af563ce2ee68
Author: Chuck Short <chuck.short@canonical.com>
Date:   Fri Mar 1 08:21:31 2013 -0600

    Pin pep8 to 1.3.3
    
    Part of making pep8 version standard across all openstack
    projects.
    
    Fixes LP: #1143569
    
    Change-Id: Iefc923123243df161ed72888c1651a622afbda04
    Signed-off-by: Chuck Short <chuck.short@canonical.com>

commit b7b7cc8f67073dabe2d6c97e87b49b9ea346692a
Author: Salvatore Orlando <sorlando@nicira.com>
Date:   Thu Jan 31 08:42:13 2013 -0800

    Avoid sending names longer than 40 character to NVP
    
    Bug 1130192
    
    NVP limits for name lenghts are much shorter than Quantum's.
    The quantum name is truncated before dispatching the NVP API operation.
    
    Change-Id: Idee568756a0df991003f59d498846ac9ff7fe095

commit 044169b5255b3b7b317a4ca6b63683851a70d79b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Mar 4 09:21:02 2013 -0800

    move cisco-specific extensions to Cisco extensions directory
    
    bug 1126661
    
    Change-Id: I2581203e90c95dad3ffbe64888e71fc3a59f8f53

commit ccb847e1fba2f08d5e445251eee2623fd168ffd0
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Mar 4 18:25:11 2013 +0400

    Add UT for LBaaS HAProxy driver
    
    fixes bug 1137386
    
    Change-Id: I791d09fc472fd8555f4030cfd1964e70ab9f2771

commit 1d50124d9d4465a42beb2ca37cde390d088c8c78
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Mon Mar 4 18:17:17 2013 +0400

    Include health monitors expected codes upper bound into HAProxy config
    
    fixes bug 1144424
    
    Change-Id: I017b8fbb8bcf29af158b87c9718e92ae5824794e

commit 4a8aed7d4b9d4628cd167eff82b3aa25e1f4966b
Merge: a59aac9 32a029b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 4 12:29:35 2013 +0000

    Merge "Allow DHCP and L3 agents to choose if they should report state"

commit a59aac9773110b35e025eb5dca3bc1229d65ca60
Merge: ed665dc 50e0596
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 4 10:43:13 2013 +0000

    Merge "Incorrect argument in calling post_json"

commit 32a029bc5efcf10a0510331215e42154749ba76f
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Mon Mar 4 09:18:44 2013 +0800

    Allow DHCP and L3 agents to choose if they should report state
    
    Bug #1143195
    blueprint quantum-scheduler
    
    Change-Id: Iba7bf82d7130462be4dda6c1c5f9a0fc5633707d

commit ed665dc9ba814829df601f555b8a5b0900259c1c
Merge: c1d3b29 9c0c158
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 4 02:26:01 2013 +0000

    Merge "Enable HA proxy to work with fedora"

commit c1d3b29cf276356d9ce0638f600909f87f936834
Merge: 9ebf2bc c300aad
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 4 02:25:53 2013 +0000

    Merge "Imported Translations from Transifex"

commit 9ebf2bcb9d7872099346afdb61e7ca62ed2785bc
Merge: f854d27 646c918
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 4 00:39:59 2013 +0000

    Merge "Add initial testr support."

commit c300aad915541040997714ce2f61f2469127e411
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Mar 4 00:06:18 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I569a5b68dcf78793353762a50a954bb9df7d6c5a

commit f854d27a1bb11086a8c64d63d5b3256174ea1ce8
Merge: a0485e4 71331cd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 22:59:22 2013 +0000

    Merge "Prevent exception with VIP deletion"

commit a0485e44ca0b5a54bd98ec11cfbffe3336be567e
Merge: c7cf9df aeec6f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 19:40:16 2013 +0000

    Merge "Change the default l3_agent_manager to L3NATAgent"

commit 9c0c158cbcdcf12f75ebb97941b14f0e329043b5
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Mar 3 13:39:12 2013 +0000

    Enable HA proxy to work with fedora
    
    Fixes bug 1142133
    
    Change-Id: I0dc02c96efa8d5f8ab693480e510dbbefcc6a674

commit 71331cd2e609ed0d5ef6d277c7aeaa8a9d11ba32
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Mar 3 14:47:31 2013 +0000

    Prevent exception with VIP deletion
    
    Fixes bug 1137697
    
    Change-Id: I6de55c674da1202eb9c1e2e11eda2e6de554750c

commit c7cf9df6e6d885c0b04a0fbb84643baad241b2c2
Merge: ede141d ac18215
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 10:22:08 2013 +0000

    Merge "NEC plugin support for dhcp network and router scheduling"

commit ede141db17b18fca05687b5b042bac0e64cd0a25
Merge: 1bf551b fdad941
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 10:18:04 2013 +0000

    Merge "enable linuxbridge for agent scheduler"

commit aeec6f12833c1edb5d302aae56f7eb9445d8d8bd
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sat Mar 2 19:45:16 2013 +0900

    Change the default l3_agent_manager to L3NATAgent
    
    This is a l3-agent version of 349aa3ef3563c019f4d0a98fc30117ae0a6cade3.
    
    The combination of the plugin without agent extension support
    and L3NATAgentWithStateReport results in an error:
    "AttributeError: No such RPC function 'report_state'".
    
    This patch changes l3_agent_manager to be L3NATAgent instead of
    L3NATAgentWithStateReport since all plugins do not support
    L3NATAgentWithStateReport and having this as the default breaks
    all current deployments that upgrade source without changing
    their config files.
    
    Fixes bug 1139726
    
    Change-Id: Ibb5c04c89bfad741ec43a372cbf97445f7b3d76c

commit 1bf551bbc336494daf202261adcdd663ba2bc5a8
Merge: d59c0aa cea8542
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Mar 3 06:25:03 2013 +0000

    Merge "Set fake rpc implementation in metaplugin test configuration."

commit d59c0aaa2ef1633183c92a0229766a7ae42bf04d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Mar 3 00:06:28 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ied72f9530ceb7d5d45228b864466845963b2fd36

commit ac18215ce50d9e209e471c3b4028cce555724d4b
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Feb 28 14:58:20 2013 +0900

    NEC plugin support for dhcp network and router scheduling
    
    blueprint quantum-scheduler
    
    Change-Id: Icc1e4213cb6109ec82f4d438e277bd870c02729e

commit fdad941d3e01688b043bb7e780ae97b5fa0141d5
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri Mar 1 17:06:23 2013 +0800

    enable linuxbridge for agent scheduler
    
    Bug #1135793
    blueprint quantum-scheduler
    
    In addition, we refactor agent scheduler so that we will make
    it easier to enable plugin to support agent scheduler.
    
    Change-Id: I0d5cc8bcea644720a3c5cbe92486ce8d8ecd248c

commit 3bb157628c05cc7c3fb21645a49d1de81f816cb3
Merge: 53ffca1 f1efd89
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 08:18:12 2013 +0000

    Merge "Host route to metadata server with Bigswitch/Floodlight Plugin"

commit 53ffca155a3ba989a267444920d62606fe24fc01
Merge: 5ea25f6 262c4fb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 07:55:45 2013 +0000

    Merge "Move network schedule to first port creation."

commit 5ea25f65a344412961f7a27a17f40a0ab0a2e951
Merge: c419c24 1eb6894
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 2 05:21:01 2013 +0000

    Merge "Imported Translations from Transifex"

commit c419c24686fac2eec5b08a0e73e69ba1a8b8f857
Merge: c6f06fc 8314655
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 05:18:09 2013 +0000

    Merge "Unpin PasteDeploy dependency version"

commit c6f06fcb933d902729b5653fd25e79ef8e2be4f3
Merge: 67e96b3 c334c3d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 05:17:59 2013 +0000

    Merge "Replace direct tempfile usage with a fixture."

commit 67e96b3e2886b43ddf614ffce6515bb7a1d790ff
Merge: c53f949 8d05d88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 05:12:07 2013 +0000

    Merge "fix update_port to get tenant_id from db rather than request"

commit 262c4fb432b834f97b7ab401dba1e2f6107b2a4d
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri Mar 1 16:23:32 2013 +0800

    Move network schedule to first port creation.
    
    blueprint quantum-scheduler
    
    we remove scheduling network
    to dhcp agent when creating network so that we can give admin
    the chance to allocate the given network to a given dhcp agent after
    network creation.
    
    Change-Id: I228870669825405277de0505a3f2ece074918524

commit c53f9495883536406f9da93ce022076b3705acbc
Merge: e3cca46 8c95b08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 00:38:49 2013 +0000

    Merge "Cisco plugin support for creating ports without instances"

commit e3cca462abfa617943df468645d40725acd49fac
Merge: 8d44479 0b3f9f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Mar 2 00:38:39 2013 +0000

    Merge "Ensure max length of iptables chain name w/o prefix is up to 11 chars."

commit 1eb6894abcb9c9c25a1b065679765bde76090dfa
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Mar 2 00:06:42 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Idd36a4cc84ae936c9ece3370210f23ef8eaf1cf9

commit f1efd89131f4773514089ab48424c91b795eac83
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Thu Feb 28 22:00:32 2013 -0800

    Host route to metadata server with Bigswitch/Floodlight Plugin
    
    Host route to metadata server was not getting propagated
    to VM when using the Big Switch/Floodlight plugin. The
    reason being the update to the subnet (with the host
    route information) was not being picked up by the dhcp
    agent. This is being fixed here by sending a notification
    to the dhcp agent when the host route is added to the subnet.
    
    Fixes: Bug #1134043
    
    Change-Id: If040f51946bcb734da319249df17d03e68aa5588

commit 50e05960d60928085f8cd35910ac619e9126e213
Author: Baodong (Robert) Li <baoli@cisco.com>
Date:   Fri Mar 1 10:56:02 2013 -0800

    Incorrect argument in calling post_json
    
    The error is due to change in webtest in which post_json is redefined.
    Fix to work with its new definition.
    
    Fixes bug #1138233
    
    Change-Id: I08c131bf50886456f0501d5fa8493e05543c5816

commit 8d05d88923984d68fff49e39259a54d4a0f3343f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Feb 27 15:00:41 2013 -0800

    fix update_port to get tenant_id from db rather than request
    
    This patch changes the behavor of nvp's update_port() to how it previously
    worked by retrieving the value from the db and not the request.
    
    Fixes bug 1138330
    
    Change-Id: I49682db392954b3cfaeb4ad4b8acf95113dcae7e

commit 0b3f9f61b070b86ad0335d905a57357035ce2e59
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Mar 1 07:19:20 2013 +0900

    Ensure max length of iptables chain name w/o prefix is up to 11 chars.
    
    The maximum length of Linux iptables chain name must be less than or
    equal to 28 characters. In iptables_manager binary_name up to 16 chars
    is used as a prefix and a '-' follows it, so a chain name passed to
    iptables_manager must be less than 12 character long. Accordingky
    MAX_CHAIN_LEN should be changed from 28 to 12. Also this commit
    introduces a method to get a chain name with valid length.
    
    Since iptables_firewall module constructs a rule by directly using
    a chain name, iptable_firewall also must take care of the length.
    
    Fixes bug #1133833
    
    Change-Id: I6157d519f3cb91ec32dc6a92eae45439b8717b2d

commit 8c95b089651c1d74a1e5bd3c006fa96a7c0c347b
Author: Arvind Somya <asomya@cisco.com>
Date:   Tue Feb 26 13:44:49 2013 -0500

    Cisco plugin support for creating ports without instances
    
    Adding support to the Cisco plugin for creating ports without
    an instance id.
    
    Fixes: Bug #1130749
    Change-Id: I84407455585be8088fa3591b7e5c39f4ce23e7e4

commit 8d44479717986790c530c445026b79d6f75dadc3
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri Mar 1 15:36:19 2013 +0800

    mock quantum.agent.common.config.setup_logging
    
    Bug #1137249
    
    Change-Id: I7eb7ec3c0247c1ceeefc8e3f88d9cd7753c38c0c

commit cf449ddabde9832694423b2d0688ed1228634312
Merge: 642b7e2 0156ec1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 1 06:55:32 2013 +0000

    Merge "Use db model hook to filter external network"

commit 642b7e27464083850cba0db40adfbe6cc046810e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Mar 1 00:06:35 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I54314eaec2161d2d79c7417aaabc609335aea7f8

commit 646c918732ea5764f54c2d7a99aedd498ac54a9a
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Feb 19 14:09:37 2013 -0800

    Add initial testr support.
    
    This doesn't really do much other that add the needed bits to the repo to
    start hacking on testr support in small chunks.
    
    Change-Id: I34fc57fdc7c9ebda8ffa2357a2ef962c7ab41bfa

commit c334c3dd5a9fa6b4f5660f7915b0e90e07544947
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Feb 19 14:00:12 2013 -0800

    Replace direct tempfile usage with a fixture.
    
    tempfiles should always be created in fixtures to ensure that they actually
    get cleaned up when we're done.
    
    Change-Id: If4eee03b2e9ec6bd5333b8d5022ec9809343584e

commit cea8542d6e496360db1b9a3e271e33bf1c6ac294
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Fri Mar 1 00:13:31 2013 +0400

    Set fake rpc implementation in metaplugin test configuration.
    
    fixes bug 1112051
    
    Change-Id: Ie38c930429bc328512a629c61e4e06480549e630

commit 06e98c99339f2bd90a76533c4a865283859065f7
Merge: 174c85a b760c07
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 18:49:00 2013 +0000

    Merge "Add stats reporting to HAProxy namespace driver"

commit 174c85a3a288404cf9f0cecfa530121c50425bb3
Merge: eadbf2f 7d96109
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 18:48:54 2013 +0000

    Merge "Add session persistence support to LBaaS HAProxy driver"

commit eadbf2fe37593b4232f908b83d7c280b34de1012
Merge: 063b7ee 50b74d2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 18:45:05 2013 +0000

    Merge "Remove compat cfg wrapper"

commit 063b7ee3a35a266eaf6548c30c697e3d55748288
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Feb 24 10:30:08 2013 +0000

    Enabled add gateway to refrain from checking exit code
    
    Fixes bug 1129741
    
    Change-Id: Ibb9a0e1c0f0e5ad610c4f45ae65eb82e25a57b94

commit b760c07d6af9a6dc47e3b45359c280b4a4d7e995
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Feb 28 17:31:03 2013 +0400

    Add stats reporting to HAProxy namespace driver
    
    fixes bug 1135327
    
    Change-Id: Ib5bc1b66ba57a8d93a5ee181c7cde64893c6b651

commit 7d961093ee95cf0d0d2effae2b3ceccdd2fb7ecc
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Thu Feb 28 13:35:01 2013 +0400

    Add session persistence support to LBaaS HAProxy driver
    
    fixes bug 1135324
    
    Change-Id: I5bcd6c84d6b402adecfb5a4cf81925ddbefccbb0

commit c5072518ca69e772836105f7c677dd62ca8150e6
Author: Monty Taylor <mordred@inaugust.com>
Date:   Sat Feb 16 23:04:14 2013 -0800

    Remove deprecated assertEquals alias.
    
    We have code in the tree that uses both assertEquals and assertEqual. The
    former is deprecated:
    
    http://docs.python.org/2/library/unittest.html#deprecated-aliases
    
    As it's a REALLY simple thing to fix, I went ahead and made it all happy.
    
    Change-Id: Ibbd9461e2bda591693a6775b9ede1e87b8c008f2

commit 8c1afc7058b474aa1e98a874eda39f5e31a8c8ea
Merge: 1e035b3 f8de8c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 04:26:14 2013 +0000

    Merge "LBaaS Agent Reference Implementation"

commit 1e035b330850883c6610c5000868bfc597e55fcd
Merge: 549afdb 3bffa86
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 28 03:22:42 2013 +0000

    Merge "Bump python-quantumclient version to 2.1.2"

commit f8de8c4450ab0d8483ccfcfcca48e21fea71c637
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Feb 24 07:55:06 2013 -0500

    LBaaS Agent Reference Implementation
    
    implements blueprint lbaas-namespace-agent
    
    This a reference implemention of the Quantum load balancing service
    using HAProxy.  The implemention is designed for vendors, developers,
    and deployers to become familiar with the API and service workflow.
    
    This change also adds some constraint checks for data integrity.
    
    Change-Id: I10a67da11840477ccf063b98149f4f77248802a1

commit 549afdb166e8fecfda117da6351453082d95b952
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 28 00:06:36 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Icf2e957ec8a89c7d572411c5d05e819f900bdbc6

commit 6f833c83284fc50ee62e729a8102badcfa5974d8
Merge: 74a3d4c 0dc5e2a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 23:49:44 2013 +0000

    Merge "create a Quantum port to reserve VIP address"

commit 74a3d4c4c5c7e88baf566a62def59e83934d6918
Merge: 2d1b74a 0cd7032
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 23:38:17 2013 +0000

    Merge "NVP plugin support for dhcp network scheduling"

commit 0dc5e2a0022238ad1e1957bebbf14e459c3699c6
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Feb 17 23:31:02 2013 -0500

    create a Quantum port to reserve VIP address
    
    fixes bug 1129672
    
    The API previously allowed a VIP to be created without verifying that
    the tenant had access to the subnet and that the address was valid and
    available.  This change modifies VIP creation behavior to create a
    Quantum port with the requested address.  If an address is not provided, an
    address is allocated using the normal allocation process for the subnet.
    
    This change also renames the port attribute to protocol_port to remove the
    ambiguity about which type of port it represents.
    
    Additional tests were added to validate the change in behavior.
    
    Change-Id: Ib19ef653887da568364b4faa0d2c0fac30970b5f

commit 0cd703292dbfe23942d1d10db7d40b0eedbeb2f6
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Feb 27 13:47:14 2013 -0800

    NVP plugin support for dhcp network scheduling
    
    blueprint quantum-scheduler
    
    Note: since NVP already support scale-out + high availability for L3
    this only implements scheduling for dhcp.
    
    Also, we do not expose the API extension, just use the internal
    auto-scheduling.
    
    Change-Id: Ifd29439fd463972ae085e5d28ed1893f94f2a2d8

commit 2d1b74a110f79170f2749729c378483f36c0aa9a
Merge: 5cba05c 8fbf544
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 21:32:47 2013 +0000

    Merge "Fix retrieval of shared networks"

commit 5cba05cad8a46f0a9c76ae4f08cb4059d635eb3f
Merge: bc06ef2 ffad9bf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 21:30:14 2013 +0000

    Merge "NVP Router: Do no perfom SNAT on E-W traffic"

commit 3bffa8687746b5ef3171ec7f33d1995e9cc0827c
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Feb 26 13:16:02 2013 -0800

    Bump python-quantumclient version to 2.1.2
    
    Fixes bug 1133381
    
    Change-Id: I21cbf386c884fce0b30344120676e348d4e3aa91

commit bc06ef22cc79cb5d38e6e9a5b0a1cd1fe57ec362
Merge: d4d7765 0070b45
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 17:43:19 2013 +0000

    Merge "Add scheduling feature basing on agent management extension"

commit d4d7765b42135f384ed524c3b989b0ce7faf9ea7
Merge: 598483f ee2b6ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 17:37:14 2013 +0000

    Merge "Port update with existing ip_address only causes exception"

commit 0070b452f1c00817dd4a47deb57bfbe6b79c4152
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri Feb 22 23:34:57 2013 +0800

    Add scheduling feature basing on agent management extension
    
    3rd part of blueprint quantum-scheduler
    
    1. Allow networks to be hosted by certain dhcp agents.
    Network to dhcp agent is a
    many to many relationship. Provide a simple
    scheduler to schedule a network randomly
    to an active dhcp agent when a network or port is created.
    2. Allow admin user to (de)schedule network to a
    certain dhcp agent manually.
    3. Allow routers to be hosted by a certain l3 agent.
    Router to l3 agent is a many to one relationship.
    Provide a simple scheduler to
    schedule a router to l3 agent if the router is not
    scheduled when the router is  updated.
    4. Auto schedule networks and routers to agents when agents
    start.
    5. Only support ovs plugin at this point
    
    Change-Id: Iddec3ea9d4c0fe2d51a59f7db47145722fc5a1cd

commit 50b74d2ddd0bd4613777b03b99960d96f15b47d5
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Fri Feb 22 17:29:56 2013 +0000

    Remove compat cfg wrapper
    
    This wrapper was there to allow oslo-config changes through the gate
    while keystoneclient hadn't been updated.
    
    Also update to 2013.1b4.
    
    Change-Id: I3d48673af58ae379e8e4d2c7fb4b4d81f3ed67dd

commit 598483f0fbbc1f86fcff9f89dc0a4781831438c8
Merge: 5553650 785cbcc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 06:42:55 2013 +0000

    Merge "Limit amount of fixed ips per port"

commit 5553650bf8280ab416ef113a07474dcada200ff6
Merge: 7d73686 2975e29
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Feb 27 06:04:03 2013 +0000

    Merge "Imported Translations from Transifex"

commit ffad9bf71fd2076f8259d0a7b0527e4ce98c4100
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Feb 27 02:28:25 2013 +0100

    NVP Router: Do no perfom SNAT on E-W traffic
    
    Bug 1130053
    
    This patch ensures 'No Snat' rules are enforced in order to avoid source
    natting on east-west traffic.
    
    Change-Id: I967e72e7b6bc8e2763c0fbdf6deeafb43ff27f54

commit 7d736867a34f6db592dc67813dececf6e94294d0
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Feb 25 15:41:06 2013 +0100

    Enable multiple L3 GW services on NVP plugin
    
    Bug 1130211
    
    This patch allows for using multiple layer-3 gateways leveraging the
    provider networks extension.
    
    Change-Id: I293920c2565f4670e9be9b22dc1b60431b62f7e7

commit 8fbf5441cdc9c119b6bbe7c0cd49391886ba405e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jan 22 08:30:02 2013 -0800

    Fix retrieval of shared networks
    
    Bug 1130171
    
    This patch adds a new tag_scope, 'shared', in order to allow
    the NVP plugin to retrieve also shared networks from NVP when
    listing networks. This way it won't appear as Quantum has a
    network without a corresponding lswitch in NVP
    
    Change-Id: I24f950d54c0b9e582c92e8008e75ebd00f6c9fe3

commit bbbcfdd69c51254493ac56c75644b010e0731293
Merge: 64f2216 3a2529c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 00:18:15 2013 +0000

    Merge "Fetch all pages when listing NVP Nat Rules"

commit 64f22161c504ca6f0941b9d38a8bcb78f9597c65
Merge: c2653d5 d111682
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 27 00:17:52 2013 +0000

    Merge "Fix NVP plugin not notifying metadata access network to DHCP agent"

commit 2975e2967402ee7d6e7576a7886e55c40b1c3076
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Feb 27 00:07:55 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic0f16a8108abb85b50355b837ae889b22c703886

commit c2653d519ddeb5dc85fb6e7d11f8983c3d850dfa
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Feb 25 11:37:34 2013 +0100

    Remove network type validation from provider networks extension
    
    Bug 1133064
    
    As the set of valid network types for the provider networks extension
    depends on the particular plugin, validation should be performed there.
    
    Change-Id: I3ce5762458bc553625a458ace80072bd804e31f0

commit d111682f0f8e9015722615d729afe56024f1fed7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Feb 26 17:57:55 2013 +0100

    Fix NVP plugin not notifying metadata access network to DHCP agent
    
    Bug 1133395
    
    Due to recent changes in notification logic between Quantum and the DHCP
    agent, the notifier the NVP plugin previously used for metadata access
    network was not working anymore and needed to be replaced
    
    Change-Id: Ifa0ea55116cf5ef6d546d28ca52e643987b3e5a0

commit 785cbcca4f02cbe6dfa2c9b4bd91ec7af0ae895e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Feb 24 13:20:14 2013 +0000

    Limit amount of fixed ips per port
    
    Fixes bug 1100476
    
    The patch also updates the quantum configuration file to
    contain the following:
     - max number of host routes
     - max number of dns servers
    
    Change-Id: Ic5d90034b0231687dfbde8fc65780ab52222c0fd

commit 3a2529cfa45c79984d342fe5b42c47e515e024bf
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Feb 26 15:19:40 2013 +0100

    Fetch all pages when listing NVP Nat Rules
    
    Bug 1133318
    
    Change-Id: I24e9943b4771c4f2b941c229ba1c300dfbf7e331

commit 8314655fc7f7e2f69c11704c8eb9fc46aa56f9aa
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Tue Feb 26 12:14:15 2013 +0000

    Unpin PasteDeploy dependency version
    
    Fixes bug #1133262
    
    There are no newer releases of PasteDeploy than 1.5.0 and we have no
    reason to believe newer versions will break us. Indeed, if an
    incompatible version is released, we will want to know about it quickly.
    
    Change-Id: I331b33b16ea50202886b19bf5c4060d9fa46d5ec

commit 9f6adb4b26e5b79a214cf3a29a4ccab4510df6d9
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Feb 26 16:43:03 2013 +0900

    Make sure all db accesses use subtransaction
    
    Fixes bug 1133253
    
    Change-Id: If952eaa919cdc7536023525a397e7a8ce4b425aa

commit 511ac76cf25109164ec39a562f0602c40987bd6f
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Feb 6 17:01:30 2013 +1100

    Use testtools instead of unittest or unittest2.
    
    As part of the move towards testr and parallel test running, we
    start to use testtools and fixtures to make the test suite
    resilient and more pedantic.
    
    Part of blueprint grizzly-testtools
    
    Change-Id: I90250de9fe21237db34f6a50b89b15863e270aa5

commit ee2b6eeff0fc431f5c263b2a55f72d966fb39942
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 16:04:13 2013 +0000

    Port update with existing ip_address only causes exception
    
    Fixes bug 1132852
    
    Change-Id: Iedb0dce3ece270eb0a58af6aa8800e2047dc920d

commit 2ba9554bf4c2b81f6700966e51b693ba3e05c978
Merge: 89dfc17 c85c9c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 07:27:31 2013 +0000

    Merge "Set default api_extensions_path for NEC plugin"

commit 89dfc17e5698440f12256318d394fd4bcd45c715
Merge: b32d83b 6fc9ce4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 07:25:52 2013 +0000

    Merge "Enables packetfilter ext in NEC plugin based on its driver config"

commit b32d83b01f38123622727cd455db97197a5ae818
Merge: 0f4050d e3bc93f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 05:14:24 2013 +0000

    Merge "Fixes import reorder nits"

commit 6fc9ce4179098d588c3f14b04c0956f83ea4f1e6
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Feb 26 13:14:26 2013 +0900

    Enables packetfilter ext in NEC plugin based on its driver config
    
    packet filter extension in NEC plugin should be determined based on
    a return value of filter_supported method in the backend driver.
    Previously filter_supported was not called actually and packetfilter
    extension was always enabled.
    
    Fixes bug #1133100
    
    Change-Id: I1334c7695e64bc942c0ecce2bd85e5a92e75b388

commit c85c9c43336313711b78efdcd0123b20cd3c5899
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Feb 26 12:37:37 2013 +0900

    Set default api_extensions_path for NEC plugin
    
    NEC plugin has a plugin specific extension in its plugin directory.
    api_extension_path must be set in quantum.conf to enable quantum-server
    to load the extension, but users sometimes forget to set it. It provides
    better usability if api_extensions_path is set appropriately by default.
    
    Fixes bug 1133099
    
    Change-Id: Ifa6d8a4f6bd30be5c6641c127ffcfaab5ff20b47

commit e3bc93fe2be842858a59220f7e3857e8845b1f61
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Feb 25 17:40:53 2013 +0800

    Fixes import reorder nits
    
    Fixes bug #1133080
    
    Change-Id: I31e56cea9b7310cfd16c0340ba270c4a777c200c

commit 0f4050df804ade8f5ce390ef9b27e7c660d11be6
Merge: 919976a 5483199
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 26 01:47:29 2013 +0000

    Merge "Add default state_path to quantum.conf"

commit 919976ab48c563c7e868acf9c6499386b79e88df
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Feb 26 00:06:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I33e913489de8ea413ded3584f60e2d987232e197

commit 7634287b10ad928f5aafc5cbfc1484a3856540a0
Merge: 9acc988 56e6378
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 20:34:40 2013 +0000

    Merge "Latest common updates"

commit 9acc988725ac202724c15c2ed3adaf9520ce9a6e
Merge: b9602c7 e669f73
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 20:34:37 2013 +0000

    Merge "Limit chain name to 28 characters"

commit b9602c75018075bbf12b333cc087d34b2f3a68fb
Merge: 2379669 5161199
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 19:47:07 2013 +0000

    Merge "Add password secret to brocade plugin"

commit 56e63782197d8b2512456e5a9ec6e96c7b6033dc
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 17:55:58 2013 +0000

    Latest common updates
    
    Fixes bug 1132908
    
    Change-Id: I726bc5b3199d2fa606832418db9b6e20ffbc3879

commit e669f739a5810c41fa79b7eb82772b4e6337b0c0
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 16:57:17 2013 +0000

    Limit chain name to 28 characters
    
    Fixes bug 1103838
    
    Change-Id: I90c0690433bac3ebe2de5b4cbbad3c358a889283

commit 2379669383d08e128bbc18bbe082c6e2eadd710a
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 17:10:15 2013 +0000

    Add midonet to setup.py
    
    Fixes bug 1132889
    
    Change-Id: I3334f515d85ea165b07b3ef576a043243c3c1bc0

commit 51611994885de719189bcf76996d3a084c46b68b
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 16:19:56 2013 +0000

    Add password secret to brocade plugin
    
    Fixes bug 1123368
    
    All other password's are marked as secret.
    
    Change-Id: I2451b1040bffa524602690a7686d9718f60ccfe7

commit 0156ec175cc047826b211727d43d5d14a3e1f2d2
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon Feb 25 21:50:54 2013 +0800

    Use db model hook to filter external network
    
    Fixes bug 1132849
    
    Change-Id: I47e01a11afaf6e6bcf06da7bd713fd39b05600ff

commit 5483199b2ad669575552c3a85790327a7edb2e78
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Feb 25 13:31:38 2013 +0000

    Add default state_path to quantum.conf
    
    Fixes bug 1132793
    
    Change-Id: I7af0b773105443672ede30b352d3b207f1ae7c5d

commit bec2549657c8485999692ab449fabb583b4c39c2
Merge: 5655d53 ce5abf2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 25 08:22:16 2013 +0000

    Merge "Add pagination parameters for extension extraroute"

commit 5655d53f145df5254dc69a7a667ad9c326f568f6
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 25 00:08:46 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ic694b58924d4214349ab9a901e3206cf5de38bef

commit 94352039f83a1721afc79464d825dfdef409e146
Merge: 6909f37 884fccc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 24 18:11:39 2013 +0000

    Merge "Remove external_id and security group proxy code"

commit 6909f37223efca5f6bf3235073b5b0a48b759497
Merge: bf0dfb7 e096581
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 24 08:08:56 2013 +0000

    Merge "Imported Translations from Transifex"

commit bf0dfb797adca0264f9e19db2230bd5fae480f8d
Merge: 0d98202 2bfc052
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 24 00:15:10 2013 +0000

    Merge "refactor LoadBalancerPluginDbTestCase setUp()"

commit e096581a71433173b886f066d5a43a0aaa16a3d3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 24 00:06:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ia9f01dd7f13f8c6e6c11858b63202a7bdfb7b5e5

commit 0d982026c1ec08f205973c3659a8ce18e3d937cf
Merge: acb2686 349aa3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 23 20:49:50 2013 +0000

    Merge "AttributeError: No such RPC function 'report_state'"

commit 2bfc052cbbad712ff55b456930534acfe5c6469b
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Feb 18 14:45:28 2013 -0500

    refactor LoadBalancerPluginDbTestCase setUp()
    
    fixes bug: 1129417
    
    This fixes the bug by changing LoadBalancerPluginDbTestCase to inherit
    from test_db_plugin.QuantumDbPluginV2TestCase.  This allows for the
    plugin to access context managers for core resources.  Additionally,
    this change adds subresource and service_plugin support to
    QuantumDbPluginV2TestCase.
    
    Change-Id: I5e838a3df6d4c7192d4a738d3860f3a162cb5a8c

commit acb268672188621f7a1759ea5610ffd68b3ae112
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 23 00:06:39 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I173f8292754279e8b4e9cc5a029bac4f71d37fa7

commit 884fccc479522c65427f80a5f822b492f34c81ca
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Feb 13 15:47:27 2013 -0800

    Remove external_id and security group proxy code
    
    This code is no longer needed since nova can now proxy these calls to
    quantum directly.
    
    Fixes bug 1130927
    
    Change-Id: I62f8d7d4161f8a1308ae80029effaa46b6d661a3

commit ce5abf2577e218d24b7aa44e0b45a6eea90c17c6
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Fri Feb 22 15:22:36 2013 +0800

    Add pagination parameters for extension extraroute
    
    Fixes bug 1131560
    
    Change-Id: Ice84aa90ef8a39efdd9c287cca9b90c4ee355b7f

commit b590f9dd560978ab8cee2da7bee96f29e2f307f7
Merge: dca47b1 539ca3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 22 06:16:42 2013 +0000

    Merge "Provide a default api_extensions_path for nvp_plugin"

commit dca47b10074c2d71f55924fa984186dd9f87fd43
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 22 00:06:46 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ibffe336d9b980f57ede79c83e950be851b5eea84

commit 539ca3cb1071d3565205e0d50df8d3b2a96beb21
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Feb 21 15:50:21 2013 -0800

    Provide a default api_extensions_path for nvp_plugin
    
    The NVP plugin has several extensions within it's plugin directory. In order
    to tell quantum-server to load this, api_extensions_path must be set in
    quantum.conf. This is sort of painful because one needs to set this value.
    
    Fixes bug 1131469
    
    Change-Id: I8d124aa93f79dbeb8b2abac1c27765d5ebf449c2

commit 349aa3ef3563c019f4d0a98fc30117ae0a6cade3
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Feb 21 14:44:16 2013 -0800

    AttributeError: No such RPC function 'report_state'
    
    This patch changes dhcp_agent_manager to be DhcpAgent instead of
    DhcpAgentWithStateReport since not all plugins support DhcpAgentWithStateReport
    and having this as the default breaks all current deployments that upgrade
    source without changing their config files.
    
    Fixes bug 1131446
    
    Change-Id: I6415f85714b03e9bf59d597e8ec2397fedc92b02

commit 2852a4b09e9cd30a726093abb61b6dadbc2faf20
Merge: e3ae636 2842653
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 21 18:35:17 2013 +0000

    Merge "Imported Translations from Transifex"

commit e3ae63624b16226eca710e8bebc052e4ffcaf5de
Merge: 712adc4 20e517d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 18:31:48 2013 +0000

    Merge "Close file descriptors when executing sub-processes"

commit 712adc4973c642d7b5629b586f45e07989fb5388
Merge: 961eb4f edfb6fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 18:17:10 2013 +0000

    Merge "Correct permissions on quantum-hyperv-agent"

commit 961eb4f6fb6df7e878a65874558da8c41ebef10d
Merge: c3bf47c 74f7ef6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 10:53:18 2013 +0000

    Merge "Add pagination support for xml"

commit c3bf47c884212c056052413306b2a2081d152a80
Merge: 2aed847 8501e9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 21 07:34:23 2013 +0000

    Merge "Sync latest install_venv_common.py with olso"

commit 74f7ef65a9fda328717ad29c3e22ab4fc431840f
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Feb 7 15:10:29 2013 +0800

    Add pagination support for xml
    
    Fixes bug 1130622
    
    Change-Id: Id9f39daf634906ee222315586fc9a93916160c3f

commit 8501e9d48dd29e0b0ddc5e5297365922e4946171
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Feb 21 11:57:59 2013 +0900

    Sync latest install_venv_common.py with olso
    
    This patch syncs with oslo change set of
    > c78b2ab Avoid using cfg in install_venv_common
    
    So that oslo-config isn't needed to run install_venv
    
    Change-Id: Ia7ee923a53e09c0c6a525294ec4a5dc9d31c3bed
    Fixes: bug #1131009
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit 2842653e76d232ff2624786e8d4d229a423f7505
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 21 00:06:21 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0ac62f86d1f1b8203f5c1126872c47162f8a0c4f

commit 2aed847c5e29ad907dd599ac1922a37e3e829397
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Feb 19 00:49:32 2013 -0800

    Add check-nvp-config utility
    
    Fixes bug 1130657
    
    Change-Id: I514b92d53132d85144b5ed95450398bcfbf130f8

commit 20e517dd2dd550a39c0f842c3e12c34a279d5962
Author: Bob Kukura <rkukura@redhat.com>
Date:   Wed Feb 20 16:12:24 2013 -0500

    Close file descriptors when executing sub-processes
    
    Pass close_fds=True to subprocess.Popen(), as is currently done in
    nova.utils.execute().
    
    Fixes bug #1130735
    
    Change-Id: Iec21873d7ef3957847f3b7365fadd613ccf1349d

commit 50bfc9a7bd4e8a4e581e7d14ef69bb7724618984
Merge: e55b10a 5719974
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 10:10:12 2013 +0000

    Merge "Resolve branches in db migration scripts to G-3 release"

commit e55b10ab395aa7a463cb572e680d9ceca86ef14a
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Thu Feb 14 21:04:12 2013 +0900

    Add support Quantum Security Groups for Ryu plugin
    
    fix bug #1124965
    
    This patch add support security-groups extension to Ryu plugin.
    
    Change-Id: I569ab1e48517f28a5103175fd04e848f82eb2a3c

commit 5719974e59a7c6559842dd4b9069948aa7120754
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Feb 20 16:00:44 2013 +0900

    Resolve branches in db migration scripts to G-3 release
    
    Fixes bug #1129260
    
    Change-Id: I5c70ee6d464f8fc0b2e4cdb4fc07464e150e10ff

commit f64c40b47d6b70d6880baa9c085344af8426cefc
Merge: f89d3c3 30c3054
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 07:55:20 2013 +0000

    Merge "Implement MidoNet Quantum Plugin"

commit f89d3c3fcea71f65b59cf73a8980d3daa9f88138
Merge: 50b061c 7a7675c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 07:55:17 2013 +0000

    Merge "plugin/nec: Make sure resources on OFC is globally unique."

commit 50b061cc141b8fc42b93241df987e14827006ae0
Merge: 0589f44 7ffc2a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 07:55:10 2013 +0000

    Merge "Routing table configuration support on L3"

commit 0589f44122ed6f734bcc0858267aa520eac68758
Merge: 4ec58b3 61bdda6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 20 07:55:06 2013 +0000

    Merge "Raising error if invalid attribute passed in."

commit 4ec58b3da489ff2a60043427f43b9f154f4019ae
Author: Salvatore Orlando <sorlando@nicira.com>
Date:   Sun Nov 25 17:11:42 2012 -0800

    Add Quantum support for NVP Layer-2 gateways
    
    Blueprint nvp-nwgw-api
    
    This patch adds an API extension, the relevant DB logic, and the NVP
    plugin logic for managing a NVP-specific feature, Layer-2 Network
    Gateway, through the Quantum API.
    The proposed extension is meant to be used with the NVP plugin only.
    
    Change-Id: I73a8f1782c345ca7f6dec2db36ba6f9299b30d04

commit 30c3054e6da7c00ce8da7e269fb98e5ebc264677
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Wed Feb 13 16:29:05 2013 +0900

    Implement MidoNet Quantum Plugin
    
    blueprint midonet-quantum-plugin
    
    Change-Id: I4e22bdfed961cd10856d075a1e58cff3a216ce89
    Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>
    Signed-off-by: Ryu Ishimoto <ryu@midokura.com>
    Signed-off-by: Rossella Sblendido <rossella@midokura.com>

commit cf21d738d7687ae7763eb441d32cfadd1233eb2c
Merge: e75ae7f 4522a80
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 23:06:01 2013 +0000

    Merge "Supporting pagination in api v2.0"

commit 7ffc2a2b6fbf3938e92e75374dbf7fdced5be4ea
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Jan 16 17:52:47 2013 -0800

    Routing table configuration support on L3
    
    Implements bp quantum-l3-routes
    
      -- Adding the extraroute extension
      -- Updating the routing table based on routes attribute on route
      -- Updated OVS plugin, linuxbridge plugin, metaplugin
         NEC plugin, Ryu plugin
    
      User can configure the routes through quantum client API by
      using the extension feature.
      sample
      quantum router-update <router_id> \
            --routes type=dict list=true destination=40.0.1.0/24,nexthop=10.1.0.10
    
    Change-Id: I2a11486709e55d3143373858254febaabb93cfe8

commit edfb6fc252d6fa9e200a46e2776c7ecdbd09d464
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Feb 19 14:23:46 2013 -0800

    Correct permissions on quantum-hyperv-agent
    
    Change-Id: I92bd869ed97f480a7f47069a90eece9b3ab0ad54

commit e75ae7f6b636e11c6a78309d1dcba8753053d063
Merge: 23f95d5 4deaa53
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 22:21:34 2013 +0000

    Merge "Update latest OSLO files"

commit 23f95d5ad2208ef2b18ea6dc6e9a15ad420af563
Merge: 5355e5b d0c5bef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 21:50:15 2013 +0000

    Merge "Support Port Binding Extension in BigSwitch plugin"

commit 5355e5b794efe2cea137ad4e577a0e6ce73b5c18
Merge: 61b2cf8 f9aba49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 21:08:53 2013 +0000

    Merge "Improve error handling when nvp and quantum are out of sync"

commit 61bdda62e8950a9747073e2be7b81cdea0af2f25
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Tue Feb 12 18:40:12 2013 -0800

    Raising error if invalid attribute passed in.
    
    400 will be returned when invalid attributes
    are passed into Quantum API.
    
    Fixed the some test cases failed since the
    enforcement of invalid attribute checking
    
    Fixes: bug #1076179
    
    Change-Id: I4e9e2891c444f9dcd051f7b325d3c9403b28db86

commit d0c5befd00f142b2f4a046655246e047cfdc819c
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Mon Feb 18 12:58:04 2013 -0800

    Support Port Binding Extension in BigSwitch plugin
    
    Bug #1100395
    
    Change-Id: I7097c9f0df8742f947860098d4928d9fd328e14b

commit 61b2cf8e6e7cf520876443d1d64c100645746ae4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Feb 19 11:34:00 2013 +0000

    Exit if DHCP agent interface_driver is not defined
    
    Fixes bug 1130052
    
    In addition to this:
    Uses "raise  SystemExit()" instaed of the exit for the L3
    agent.
    
    Change-Id: I8130745c9de62619189e158944fa9e4ed25be774

commit 4522a80b6ea5dac11b829695b4fe5962ae60631c
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 1 16:05:44 2012 +0800

    Supporting pagination in api v2.0
    
    Implements bp support-pagination-in-api-v2.0
    
    Add sort and pagination feature for api v2.0.
    *Add sort_key, sort_dir for sorting feature.
    *Add limit, marker, page_reverse for pagination feature.
    *Add emulated sorting and pagination
    
    Native pagination and native sorting implemented for:
    *plugins: ovs, linuxbridge
    *extensions: l3 securitygroup
    
    Emulated pagination and sorting enabled for:
    extensions: lbaas
    
    Change-Id: I28ec6ab7bcae9839cb42c6d60bbfff7250de13ed

commit 9cb412eb88158c9c01cd66f07d889fb834630073
Merge: 014db16 8869725
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 14:47:34 2013 +0000

    Merge "Modify dhcp agent for agent management extension"

commit 4deaa53bafae2210e0789d6617c5e6e8b8079fa1
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Feb 19 13:48:03 2013 +0000

    Update latest OSLO files
    
    Change-Id: I17844d2bc5f8255833e8a5b3dc9412041de12826

commit 014db1684c3cbf583d00cf767f755b9ddefc3632
Merge: c5d169f c45e61c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 13:15:23 2013 +0000

    Merge "Add unit test for ryu-agent"

commit 8869725c655a9f656486b86d29b494b1b6184ef1
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Mon Feb 18 16:42:34 2013 +0800

    Modify dhcp agent for agent management extension
    
    2nd part of blueprint quantum-scheduler
    
    Remove openstack openstack listener on DHCP agent side.
    Add DHCPagent notifier on quantum server side.
    
    Change-Id: I196691650a99ba865bf06081a1fc4546f9fac7bd

commit c5d169f36c3aa1248dd9796a5f1348fee0a1cf81
Merge: 267d3c1 24c7796
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 19 11:12:14 2013 +0000

    Merge "Metadata support for NVP plugin"

commit 267d3c1d5725af44deb9257bb4879663bfd7240a
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Feb 19 00:06:18 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I61fc6f9782cfe5315034db0072c2fd3617d1e2b1

commit aaa80ea649697192bc022d831da9ddc4d6559344
Merge: f8ccfc5 0f60b08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 23:34:00 2013 +0000

    Merge "Add routed-service-insertion"

commit 24c77966b6449257c2bfa87419aafc3bb5f3c287
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Feb 13 16:46:43 2013 -0800

    Metadata support for NVP plugin
    
    Bug #1121119
    
    Allows the NVP plugin to leverage the metadata proxy, by creating an
    ad-hoc topology for allowing access to a metadata proxy from a NVP
    router leveraging existing agents.
    
    This patch also removes previous code for metadata support in the
    NVP plugin, which was based on DHCP Option 121. This is now provided
    by the dhcp agent as well.
    
    Change-Id: If37ef388e063f40bb06908ee2f72c431f29dac31

commit f8ccfc5434c95531921bc9f764264ace4ddc6e91
Merge: 4298be0 30e0b12
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 17:52:13 2013 +0000

    Merge "Add an update option to run_tests.sh"

commit 0f60b08483ccc24520030c23b92459776af8503d
Author: Kaiwei Fan <fank@vmware.com>
Date:   Sun Feb 3 19:22:21 2013 -0800

    Add routed-service-insertion
    
    Extend L3 router to add "service_type_id" attribute, and extend LB vip, pool,
    and health_monitor to add "router_id" attribute.
    
    Implements: API and DB model for blueprint routed-service-insertion
    Change-Id: I12f053e0b0e6cf0813ea88dd568aae49b09b8215

commit 7a7675c748a0bd5b7e554f0ad61cb979fa4e9513
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Jan 31 13:51:28 2013 +0900

    plugin/nec: Make sure resources on OFC is globally unique.
    
    Fixes bug 1127664
    
    Network cannot be created in NEC plugin when OFC network ID is
    unique inside a tenant. Some OFC implmenetations generate a network
    ID unique inside a tenant. In this case generated network IDs on can
    be duplicated in system-wide. To fix it, this changes resource ID on
    OFC to REST URI to make sure IDs on OFC globally unique.
    
    Fixes bug 1120962
    
    Make sure NEC plugin creates shared networks
    
    In Quantum resource relationship is not limited inside a tenant.
    E.g., a non-owner tenant can create a port on a shared network.
    To deal with it the provider layer should not be aware of tenants
    each resource belongs to even when it has a kind of tenant concept.
    
    This commit changes ofc_manager to pass a parent resource for resource
    creation and identify a resouce by REST URI used to access OFC resources.
    It decouples Quantum resource access model from OFC resource models.
    OFC IDs created before this commit are also looked up.
    
    Primary keys of OFC ID mapping tables are changed to quantum_id because
    most of all accesses to these mapping tables are done by quantum_id.
    However the current version of alembic does not support changing primary
    keys, so new OFC ID mapping tables for tenant, network, port and packet
    filter are created. Dropping the previous mapping tables will be done
    along with the data migration logic.
    
    This commit also changes the following minor issues.
    - Make sure ID on ProgrammableFlow OpenFlow controller (PFC) is less than
      32 chars. The current PFC accepts only 31 chars max as ID and 127 chars
      as a description string.
    - Some database accesses created their own session and did not support
      subtransactions. Make sure to use context.session passed from the API layer.
    - Removes Unused methods (update_network, update_port) in trema/pfc drivers.
    
    Change-Id: Ib4bb830e5f537c789974fa7b77f06eaeacb65333

commit 4298be01bf4611bbcd9de12cfe1134b9da5247a3
Merge: 27c52d7 4345346
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 07:55:03 2013 +0000

    Merge "Fix SG interface to reflect the reality"

commit 27c52d7c8d7178507adc10658b86a935b8afca87
Merge: 5d44f7a 8818848
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 07:54:59 2013 +0000

    Merge "Agent management extension"

commit 434534652d8f350cd3419605b8d8d22b078727b1
Author: Tomoe Sugihara <tomoe@midokura.com>
Date:   Mon Feb 18 15:24:55 2013 +0900

    Fix SG interface to reflect the reality
    
    The signitures of abstract methods in SecurityGroupPluginBase
    has diverged from db mixin implementation.
    This patch updates the methods to fix the divergence, mainly
    by removing update method from the base. Note that there's an
    issue for missing update(bug #1124865).
    
    Fixes: bug #1119080
    
    Change-Id: I6631b86ab2fdf4b81ad575e9a8f92dfe041ffe9a
    Signed-off-by: Tomoe Sugihara <tomoe@midokura.com>

commit 5d44f7ad2d9f7e8c91311196892937036f512051
Merge: 21ce1ab 244339d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 18 04:58:28 2013 +0000

    Merge "Need to pass port['port'] to _get_tenant_id_for_create()"

commit c45e61c2578289f2e1be92c448261723fb710412
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Thu Feb 7 18:47:07 2013 +0900

    Add unit test for ryu-agent
    
    fixes bug #1118197
    
    This patch adds unit test for ryu-agent.
    Also, add the lacking test for the default configuration value.
    
    Change-Id: I742b2a9dfc0706c0307365a3fe9496c3541fcf04

commit 881884844d9e4a6abea600a723c8b521eb201d7c
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Fri Feb 1 20:30:12 2013 +0800

    Agent management extension
    
    1/3 part of blueprint quantum-scheduler
    
    This patch adds agent management support
    to l3-agent and plugin-agent (ovs and linuxbridge).
    
    Change-Id: Iebc272f45c7530c995f32ef3729b11cd76779385

commit 244339d8a961d2360417c5c319d87d6c75d78357
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun Feb 17 18:49:40 2013 -0800

    Need to pass port['port'] to _get_tenant_id_for_create()
    
    This change set I9ac44a8e moved this logic out of the transaction
    which caused this bug. Unit tests did not catch this because
    this error is caused on NVP since the tenant_id is passed in as a tag
    and this change resulted in the tenant_id becoming None which is not
    an allowed tag value. Will improve error handling and edge cases like
    this to fake_nvpapiclient in different commit.
    
    Change-Id: Ib0eaab1f389de98b335f58e9215981adbbf9e2ef

commit f9aba49e05af6f69a6fca8b61c2e7a14d9b78e11
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sat Feb 16 16:26:14 2013 -0800

    Improve error handling when nvp and quantum are out of sync
    
    Previouly when nvp and quantum were out of sync an exception would
    be raised notifying the user of this. This patch changes the behavior so that
    now when  elements are found in the quantum db but not in NVP they are
    put into error state. In addition there error state elements are now able
    to be deleted if not found in nvp.
    
    This patch also removes outdated doc strings that seem to keep being adding.
    
    Fixes bug 1127643
    
    Change-Id: I3e79ab7a284e61623cd63fefc3755746b8e4dfd7

commit 21ce1ab17f1c2f3b1017b75a8d3f8f8a3f9e939f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun Feb 17 15:45:24 2013 -0800

    Decouple helper functions from L3NatDBTestCase
    
    In order to use the helper functions i.e _create_router in L3NatDBTestCase as
    a mixin one needs to also run all the unit tests within L3NatDBTestCase.
    These helper functions should be decoupled in the same way that
    QuantumDbPluginV2TestCase() is done.
    
    This patch also removes any unused variables within test_l3_plugin.py
    
    Fixes bug 1128505
    
    Change-Id: I2efe8547aeb31d5d9eb7eab6daeb75d9c37e8713

commit cc72d0ad113daf2120c3686ca89f114256fce023
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 18 00:05:57 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Idbce7514b924223d4c7ce682cf1dc2a494881236

commit 1f373428c318248e36783f926cec367306dbc707
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sun Feb 17 13:36:27 2013 -0800

    Add Migration for nvp-qos extension
    
    Fixes bug 1128427
    
    Change-Id: I0e3b62aee5842e86e5a776b54d015f889697efe4

commit 40296e32f94b8e658e6b83e8e2af187ca5a405bc
Merge: cc78724 cfda6bc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 17 18:51:37 2013 +0000

    Merge "Use oslo-config-2013.1b3"

commit cfda6bc4fb4307fce51e9ec2e049242737dc9c33
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Sun Feb 10 19:00:19 2013 -0500

    Use oslo-config-2013.1b3
    
    The cfg API is now available via the oslo-config library, so switch to
    it and remove the copied-and-pasted version.
    
    Add the 2013.1b3 tarball to tools/pip-requires - this will be changed
    to 'oslo-config>=2013.1' when oslo-config is published to pypi. This
    will happen in time for grizzly final.
    
    Remove the 'deps = pep8' from tox.ini as it means all the other deps
    get installed with easy_install which can't install oslo-config from
    the URL.
    
    Retain dummy cfg.py file until keystoneclient middleware has been
    updated (I18c450174277c8e2d15ed93879da6cd92074c27a).
    
    Change-Id: I4815aeb8a9341a31a250e920157f15ee15cfc5bc

commit cc78724a1e92887883149f5e3aee827283636733
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Feb 17 15:46:14 2013 +0000

    Shorten the DHCP default resync_interval
    
    Fixes bug 1128180
    
    Change-Id: Ie63ef674b5e05fab659e675774a1b25cd57d4c41

commit 2d1762ced08883467f4106ccfe26fc21c0350315
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Feb 13 14:49:29 2013 -0800

    Add nvp qos extension
    
    Implements blueprint nvp-qos-extension
    
    Change-Id: I8ad980128407c6ddb57e5f928663e0df15cc0065

commit f3b64bc98599886fcb8ac4eef0803d4d5571b73d
Merge: 6d92efe b17bd08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 17 02:32:07 2013 +0000

    Merge "Allow nicira plugin to handle multiple NVP API versions"

commit 6d92efe61accff6e9400641137c2fb972a7f14ee
Merge: 2305b90 cbb3a53
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 17 01:01:44 2013 +0000

    Merge "Unable to update port as non-admin nvp plugin"

commit 2305b9058d5de473ff6fc5d3f8cef7545b958c2f
Merge: 38379bf 7ecf6eb
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 17 00:56:50 2013 +0000

    Merge "Imported Translations from Transifex"

commit 38379bf3c5594848fdf5cd4ad3580b399ba04dc9
Merge: da3ac33 6c20e11
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 17 00:52:21 2013 +0000

    Merge "Add unit tests for Open vSwitch Quantum plugin"

commit 7ecf6eb9a856b21ffd4d80a673b527d3c6ab7dcf
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 17 00:05:43 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I64b95ea422402e01c25521dc72817bd9ca8c1491

commit cbb3a5366b4f720eee8f17218035efd349348d8d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sat Feb 16 13:01:29 2013 -0800

    Unable to update port as non-admin nvp plugin
    
    The port security patch to the nvp plugin broken the ability to update a port
    as a non admin user. This patch fixes that and adds a unit test for updating
    a port as a non-admin user since there was not one before.
    
    Fixes bug 1127514
    
    Change-Id: I9ac44a8eef14e5beeee020a901615e067ed50fbe

commit da3ac33808dd79f5e7e833a51cc6852e1eafc2ae
Author: Serge Maskalik <serge_maskalik@yahoo.com>
Date:   Thu Feb 14 09:08:30 2013 -0800

    Update nvplib to use HTTP constants
    
    Change-Id: I5afe0796de2387566705d6669834d6bfac87ee8d

commit 0cc537cd3824e389cba4237a811eef9de799ee5d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Feb 15 22:08:10 2013 -0800

    Rename admin_status_up to admin_state_up
    
    This patch renames all instances of admin_status_up to admin_state_up since
    that is the correct name. There was also one instances of this for NVP which
    was renamed to admin_status_enabled since that is what the name is in NVP.
    
    Fixes bug 1126966
    
    Change-Id: Ie74bc411082cb2de4d83b947df1f248facbd0d16

commit 8760818bd35a67a4d9bde61d664ada2174bf5872
Merge: 9270239 e7da9d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 16 16:38:12 2013 +0000

    Merge "Fixed the typo of loadbalancer test case."

commit 92702391344b0a57363d7f62e2ee29fc43797f6e
Merge: 6020c89 c19b4f3
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 16 16:38:00 2013 +0000

    Merge "Imported Translations from Transifex"

commit e7da9d73bc39a7a9bfd63af75aa1d584885b1ab8
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Fri Feb 15 17:12:45 2013 -0800

    Fixed the typo of loadbalancer test case.
    
    Fixes: bug #1123658
    
    Change-Id: I6d7d4c724200c67cb6d8955d1eb6809b8083040c

commit b17bd081a16513307e5b8dd8a2d738173050ff93
Author: Salvatore Orlando <sorlando@nicira.com>
Date:   Mon Jan 28 16:41:53 2013 -0800

    Allow nicira plugin to handle multiple NVP API versions
    
    Bug #1126352
    
    This patch introduces a simple framework for enabling
    nvlib to call the appropriate routine according to the
    current version. To this aim, we leverage the 'server' header
    which is returned by every NVP API calls (except login/logout).
    The patch also accounts for the changes introduced in NVP 3.0
    
    Change-Id: Ief3a6f2b5b99ea33548353ce3bee3fa23e42752f

commit c19b4f3422d0e4614833e3a045ca067182638f06
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 16 00:05:46 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Ifbbea4d7ead429f74940c154db56d7a1146c23be

commit 6020c897aba06b8701210a2473e19c609cee0e57
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Tue Feb 5 20:25:46 2013 -0800

    L3 API support for BigSwitch-FloodLight Plugin
    
    In keeping with the philosophy  of the RESTProxy plugin, L3 extension calls
    are processed (CRUD of logical resources) and the state changes are proxied
    to a backend controller.
    
    A configuration variable specific to the RESTProxy plugin is being added
    to identify that particular Quantum server's ID.
    
    blueprint quantum-floodlight-bigswitch-l3
    
    Change-Id: I24be02cd836352497fe5b1e7622d138e0c816377

commit 30e0b120e93e7b149fb3eea05e8895b69c6ae930
Author: Matthew Treinish <treinish@linux.vnet.ibm.com>
Date:   Fri Feb 15 15:28:04 2013 -0500

    Add an update option to run_tests.sh
    
    This commit adds an update option to run_tests.sh. This option
    is used to rerun install_venv.py on an already installed venv.
    This will then just update out of date packages with pip.
    
    Change-Id: I49a1cbcb62e7f429eca3efe949b8aa90507723c4

commit a7837e5f90ff2ee2d8d28ffd59754965d86f65f8
Merge: 50cee94 73e43ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 15 19:17:40 2013 +0000

    Merge "Allow tests from test_dhcp_agent run independently"

commit 50cee94a808c0eb4d9af36a8da0026ba4f362d6d
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Feb 13 10:07:24 2013 -0800

    Avoid extra query when overlapping IPs are disabled
    
    Bug 1124363
    
    Change-Id: I431d19a987e18ec2648d9cb0aad185e5ba68f830

commit 73e43ac7f8c55691772470756ccaf86e7f087243
Author: Alessio Ababilov <aababilo@yahoo-inc.com>
Date:   Fri Feb 15 09:52:24 2013 +0200

    Allow tests from test_dhcp_agent run independently
    
    Some tests from test_dhcp_agent depend on each other
    and cannot be run in arbitrary order. TestDhcpAgent
    and TestDhcpAgentEventHandler need config options that
    are initialized in other tests. This patch eliminates
    such dependencies.
    
    Fixes: bug #1125951
    Change-Id: I10bc46a5e1244ea0f7a05a20bb162c50303f282e

commit 55fd44654f474d8cdbc91f765f799c61fb7c2d8f
Merge: 605a37f f23a8a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 15 06:13:51 2013 +0000

    Merge "PLUMgrid quantum plugin"

commit 605a37f3825df15f2dd129c6189f0eafb687f265
Merge: 4bb6ea4 b70e2c0
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 15 05:01:40 2013 +0000

    Merge "Imported Translations from Transifex"

commit 4bb6ea46464b80cbe5485f733addd99866edd6d2
Merge: 8794e23 664869d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 15 03:41:18 2013 +0000

    Merge "Mark password config options with secret"

commit b70e2c08f95459ecd09a4c191ae2976428847516
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 15 00:06:00 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I207276c5598bcf01cc2775727b5290f4fd52c5f9

commit 8794e23fba4bda583e9f1823d2248c30fbd957d0
Merge: 469f4d0 2c93d73
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 14 23:04:00 2013 +0000

    Merge "Add support for extended attributes for extension resources"

commit 469f4d016c1c2d5ef193327bea14ea53b4a9da52
Merge: 5205ea1 db44e8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 14 23:03:18 2013 +0000

    Merge "Adds Brocade Plugin implementation"

commit 664869d8431255e0dbda75365da7a7b0d791988a
Author: Michael J Fork <mjfork@us.ibm.com>
Date:   Mon Feb 4 15:27:37 2013 +0000

    Mark password config options with secret
    
    Config object supports masking values when writing out if the secret
    flag is set on the option definition.  This change flags all quantum
    options containing a password.
    
    Change-Id: I68d9bf80c673acc72db22dc2c6907ee180dcc605

commit db44e8e0bf1005d946de86be7542aa1bf7d122f1
Author: Shiv Haris <sharis@brocade.com>
Date:   Wed Jan 23 03:33:55 2013 +0000

    Adds Brocade Plugin implementation
    
    blueprint brocade-quantum-plugin
    
    This plugin is meant to orchestrate Brocade VCS switches
    running NOS, examples of these are:
       1. VDX 67xx series of switches
       2. VDX 87xx series of switches
    
    Change-Id: Ia8c91ba0e70d3dc7fa79e7f0e09f869542846954

commit 2c93d73e8f051bf0e07257e6ba42d85c2eded652
Author: Kaiwei Fan <fank@vmware.com>
Date:   Tue Feb 5 13:26:08 2013 -0800

    Add support for extended attributes for extension resources
    
    Removed unsed import from quantum/tests/unit/test_extension_extended_attribute.py
    Address comments.
    Change update_attributes_map definition/behavior
    
    Fixes: bug #1116664
    Change-Id: Idc360f5b3b35fb1d40237e1bbce39684508175cf

commit 5205ea1a1e840852e36c12da7a5f764c73b1d85a
Merge: c4dfcc1 687a949
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 14 10:01:51 2013 +0000

    Merge "Support iptables-based security group in NEC plugin"

commit c4dfcc1eb02c77158e0ba05f4f1b2ee0b4b975d5
Merge: d19056c 202fb6e
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 14 09:41:07 2013 +0000

    Merge "Imported Translations from Transifex"

commit d19056cc4b3d0fa886b3f69e03d2520a2eb93f3a
Merge: 70a12fd bfa9d88
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 14 06:03:42 2013 +0000

    Merge "Persist updated expiration time"

commit 70a12fd22e29666309248d449777448ea0bd9e68
Merge: a5c101d 8789704
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 14 02:29:11 2013 +0000

    Merge "Synchronize code from oslo"

commit 202fb6e32e929efc5385847cad1a50486ca4084b
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 14 00:06:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I004aa8b4c8c2b822ec5a729a75460de7b1227c31

commit 687a949f28a40aab62691b1812a5e2c297f16c69
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Feb 8 22:18:33 2013 +0900

    Support iptables-based security group in NEC plugin
    
    blueprint nec-security-group
    
    This commit also refactors RPC API and callbacks in the plugin and agent
    to support security group RPC.
    
    Change-Id: I09d69ca3aff43e0468bbd5df6367de767af27acc

commit bfa9d88f432f20cf4a4d85a4050e4f94dc874457
Author: Stephen Gran <stephen.gran@guardian.co.uk>
Date:   Wed Feb 6 14:57:57 2013 +0000

    Persist updated expiration time
    
    Without creating a subtransaction, the database query wasn't actually
    being run and the data was being lost.  This resulted in the case that
    on termination of long running VMs, the VM IP address was immediately
    available for reuse instead of being held as it should have been.
    
    Fixes: bug #1116500
    
    Change-Id: I7774273b8e799d945c27329e9da2dba34e39fdb8
    Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>

commit a5c101da4bd6371fdc116690ef0c354868a571b0
Author: Roman Prykhodchenko <rprikhodchenko@mirantis.com>
Date:   Fri Jan 25 17:44:21 2013 +0200

    Support advanced validation of dictionaries in the API.
    
    This change allows to specify constraints for individual keys in
    dictionaries in the specification of the API resources.
    
    Introduces type:dict_or_none validator that allows to skip
    validation of a dictionary if a None value was supplied.
    
    Adds constraints for session persistance parameters to the API.
    
    Disables specifying cookie_name for session persistence, if
    the type is set to HTTP_COOKIE or SOURCE_IP.
    
    Fixes: bug #1104110
    
    Change-Id: I62068deed449967949eaba9259028c88dd6974f8

commit 9031585eefec897a8888964382f5518613effe36
Merge: 4160f24 41b6ac4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 16:17:47 2013 +0000

    Merge "Add check for subnet update with conflict gateway and allocation_pools"

commit 8789704221d23b4a713727cad79939f69d2ab02a
Author: Alessio Ababilov <aababilo@yahoo-inc.com>
Date:   Tue Feb 5 16:01:36 2013 +0200

    Synchronize code from oslo
    
    Use commit eaab5fae2502198e9fa57d0d90a7204a2bd83b16:
    Merge "sort options to make --help output prettier"
    (Wed Feb 13 12:52:14 2013 +0000)
    
    Add processutils to quantum since impl_zmq depends on them.
    
    Drop notifier.list_notifier that is not present in oslo.
    
    Change-Id: I91d9ec05481b8c24da9fbee1ad4706ff56a3b7aa
    Fixes: bug #1116290

commit 41b6ac4b1b02ce5390f0eac72771f3333a0c5dff
Author: mathieu-rohon <mathieu.rohon@gmail.com>
Date:   Thu Feb 7 16:05:22 2013 +0100

    Add check for subnet update with conflict gateway and allocation_pools
    
    Fixes: bug 1062061
    
    The patch will raise exception 'GatewayConflictWithAllocationPools' when
    subnet update with conflict gateway and allocation_pools.
    
    Because before validate gateway ip with conflict allocation pools, we need
    validate allocation pools first. Move the validation of allocation pools
    into _validate_subnet. Then_allocate_pools_for_subnet is only responsible
    for pools allocation, and_validate_subnet is responsible for most validate
    for subnet.
    
    Change-Id: I8dffe45ce5c02e8e6c317bad470054564538bcf2

commit 4160f2428d18ffe012b3fa7a33b871f053933777
Author: Roman Prykhodchenko <rprikhodchenko@mirantis.com>
Date:   Mon Feb 11 17:49:10 2013 +0200

    Alembic migration script for Loadbalancing service
    
    Creates tables for:
     * VIPs
     * LB pools
     * Health monitors
     * Members
     * Pool statistics
     * Session persistences
     * Pool-monitor Associations
    
    Change-Id: I96c497a319129eb8a3ce6a1420a38e8efb666b6b
    Fixes: bug #1122117

commit a2ea5ee7e62ac39dcc8af53f4e0ce48f5d99e7ff
Merge: 17df36d 6f2b189
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 08:27:43 2013 +0000

    Merge "Unused methods in quantum.wsgi clean up"

commit 17df36dc5fb0648340d002e7e0561d94808ae712
Merge: 5dc7d3b 60c7607
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 08:16:50 2013 +0000

    Merge "Remove cfg option default value and check if missing"

commit 5dc7d3b0639a551d64a636020cf237b94dafc673
Merge: bec0e5f 22728b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 08:16:46 2013 +0000

    Merge "Fix NVP L3 gateway ports admin_state_down on creation"

commit bec0e5fba2d0c05f5e6e8bca8abc736c7369d69f
Merge: c16876b aae63b3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 13 01:14:13 2013 +0000

    Merge "Remove duplicated option state_path from netns cleanup"

commit 22728b56fd5a3288aacd1a3aabc8e99f95182db9
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Feb 11 16:17:22 2013 -0800

    Fix NVP L3 gateway ports admin_state_down on creation
    
    Some of the transaction code that was added was removed in the L3 patch
    for nvp. This reintroduced the logic where ports would be created in the
    quantum db with admin_state_up=False. This caused L3 gateway patch ports
    to be created with admin_state_up=False.
    
    Fixes bug 1122563
    
    Change-Id: Ifc52eab8665e41d64975856e4693b6ed91bc5b45

commit 60c7607a91547efdd076d454d3a699bce2a0aab2
Author: Paul Michali <pcm@cisco.com>
Date:   Mon Feb 11 09:58:41 2013 -0500

    Remove cfg option default value and check if missing
    
    Currently, several plugins already check config options at __init__()
    for validity and will exit, if the settings are incorrect. However,
    most (all?) config option definitions have default values, so if the
    option is missing, a valid, but maybe unexpected value will be used.
    This is what occurred in the bug.
    
    The proposed fix is to take a config option, sql_connection, which is
    used by many plugins, and remove the default value. Then, at init
    time, when the config option is used in configure_db(), a check is
    made for the value. If the value is not set, a warning is logged and
    the value is set to the default, for db/api.py. It is expected that
    this will be the only module to consume this config option.
    
    Added UT to check that log warning is issued. Also, changed the timing
    so that the test takes 0.25 secs vs 12 secs. Removed UTs in two plugin
    tests that checked the default value for sql_connection.
    
    Other alternatives explored in previous patches, were to either
    raise an exception, or mark this config option as "required". This
    resulted in a large number of changes to tests, and required config
    overrides in plugins that imported quantum.db.api, but did not use
    sql_connection.
    
    In order to keep this solution (of this log-hanging fruit) fix, the
    proposed, simpler change is being made.
    
    Some cleanup to the Cisco plugin test case was also made, so that
    the mock was more in line with what production code does.
    
    bug 1059923
    
    Change-Id: I8c2a4e05231ac4e172d0dccece067e6fdb354341

commit c16876b5795c97ba572519521b32c04b9ab2d430
Merge: 7c708df 23b47c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 10:40:23 2013 +0000

    Merge "only destroy single namespace if router_id is set"

commit 7c708df08594891592f465d191a0b2a00ebd060f
Merge: 92a044e 39e4653
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 12 09:24:37 2013 +0000

    Merge "Use AssertEqual instead of AssertTrue"

commit aae63b33f1152cf5e8e9e75ca053a0746135b773
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Feb 12 17:01:09 2013 +0900

    Remove duplicated option state_path from netns cleanup
    
    state_path is already declared in quantum/common/config.py,
    so we need to remove state_path option from netns_cleanup_util.
    
    Fixes bug 1122822
    
    Change-Id: Ifc1c0290c00c1fe5e2fc1833144da05615a782ef

commit 23b47c832a9ae0c1890ad0d467c28f81914d4b57
Author: Christoph Thiel <c.thiel@telekom.de>
Date:   Mon Feb 11 17:46:59 2013 +0100

    only destroy single namespace if router_id is set
    
    Fixes bug 1122206
    
    If multiple instances of l3_agent are running on the same host, all qrouter-
    namespaces will be destroyed as new l3_agents are started.  This fix allows
    for multiple l3_agents to be running on the same host when router_id is set
    for each agent.
    
    Change-Id: I879cdc6faba94900f831232232d67e471c70d778

commit 39e465386e352121e3205130e56ab70798192991
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Feb 12 06:55:18 2013 +0000

    Use AssertEqual instead of AssertTrue
    
    Fixes bug 1122765
    
    Change-Id: I1df7fffc1a038d2a7321edc4fac150bcbd19f65c

commit 92a044e51ae8b204cd96a62e250c6cbc8828dd04
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Feb 12 00:03:11 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I8f92999576786c8a6b335c08beeff05562fc5ffd

commit bbef9ab0acb52b51b311adedbbb4d8b056550915
Merge: 51e5fc8 859bf95
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 20:02:22 2013 +0000

    Merge "Move auth_token configurations to quantum.conf"

commit 51e5fc8c63751a783c41d73348ed9b46cdf94a05
Merge: cb61a57 ed39d8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 17:33:31 2013 +0000

    Merge "Adds API parameters to quantum.api.extension.ResourceExtension"

commit cb61a574ec36dd40f7bedf977f3fcb796b4a0d18
Merge: be71c82 ebc3062
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 17:33:23 2013 +0000

    Merge "L3 API support for nicira plugin"

commit 859bf958201d49761b5d88eea2f3925f095c5d56
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Feb 11 22:31:19 2013 +0900

    Move auth_token configurations to quantum.conf
    
    keystone auth_token middleware now allows quantum to have auth_token
    configuration in quantum.conf. This commit moves the example of
    auth_token configuration from api-paste.ini to quantum.conf.
    This simplifies user configuations and users is no longer required
    to edit api-paste.ini.
    
    This change does not break backward compatibility. auth_token first
    tries the configurations in /etc/quantum/api-paste.ini and then the
    above configurations. Thus a user who already use api-paste.ini
    does not need to change it.
    
    DocImpact
    
    Change-Id: I5a4c48b14428e29ea2a331880e1de0afd69c97b5

commit ebc3062cb6b626445b66f9b8889256f3070fcc43
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Feb 1 17:04:37 2013 -0800

    L3 API support for nicira plugin
    
    blueprint nvp-l3-api
    
    This patch adds supports the Quantum L3 API extension to the nicira NVP
    Quantum Plugin.
    
    The patch includes code for managing Quantum routers, router interfaces,
    external gateways, and floating IPs, and for applying the relevant
    configurations on the NVP controller using the NVP API.
    
    The patch also includes NVP-specific support for access to the nova
    metadata server via injection of a host route in VM instances.
    
    Change-Id: I20b45190f1eaca0229d30871b25484b90298a18b

commit 6f2b1899610d58c401a64776f936fbd300b662bd
Author: Tatyana Leontovich <tleontov@yahoo-inc.com>
Date:   Mon Feb 11 12:17:12 2013 +0200

    Unused methods in quantum.wsgi clean up
    
    Remove broken unused methods:
    * wsgi.XMLDeserializer.extract_text,
    * wsgi.XMLDeserializer.find_first_child_named,
    * wsgi.XMLDeserializer.find_first_child_named,
    * wsgi.XMLDictSerializer._create_link_nodes.
    
    Change-Id: If00af68683571285adb0516d8fc36790bd83ffa5
    Fixes: bug #1119262

commit be71c828fb3f896958bc66b825a608d4f7a2aac9
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Feb 11 18:26:40 2013 +0900

    Add firewall_driver option to linuxbridge_conf.ini
    
    Fixes bug 1121855
    
    firewall_driver configuration option has been introduced in the patch
    of OVS security group support and it affects Linux Bridge plugin.
    The default value of firewall_driver is NoopDriver.
    Thus firewall_driver configuration is required in Linux Bridge plugin.
    
    Change-Id: I403be91b01eb6fa679dab28cd4995c85d12100b9

commit b6cf408e319b1e60ff2b23aa56cd77782cf640bc
Merge: ca1e82c 5e1f7ad
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 11 08:07:50 2013 +0000

    Merge "Imported Translations from Transifex"

commit ca1e82cbd67955000d351650af6aad95d54a4f97
Merge: 4538eeb 98ad762
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 11 05:04:48 2013 +0000

    Merge "Sync latest cfg from oslo-incubator"

commit ed39d8a71b1926c88bb4e7ea117dce58b43b6ce8
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Jan 25 16:48:21 2013 +0800

    Adds API parameters to quantum.api.extension.ResourceExtension
    
    Part of blueprint quantum-api-wadl
    
    Fixes bug #1104882
    
    Change-Id: I0d30864d3176ab001b10948f1deb37b3c062987c

commit 4538eebf44a16ce5da5367798a83ed5048e28831
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Feb 10 16:28:05 2013 -0800

    fix grammar in NetworkInUse exception
    
    bug 1121555
    
    Change-Id: Ie06ef45d066505b0ec1cd31e73c43ae6985afcde

commit 5e1f7ad95bddb48b0a2d55408b2ef50ca8893786
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 11 00:05:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I3a619c2e95c417169a281986e3d28044383075ca

commit 198ccafc06f7161ef4c103f7bc7b482f88b1f76a
Merge: 06d0376 be77455
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 10 18:21:45 2013 +0000

    Merge "Improvements to API validation logic."

commit f23a8a74b0c5d540d9b96678d53ef8c557630876
Author: Edgar Magana <emagana@gmail.com>
Date:   Fri Feb 8 09:01:34 2013 -0800

    PLUMgrid quantum plugin
    
    PLUMgrid plugin supports Quantum Core V2 APIs over an infrastructure running
    PLUMgrid Network Virtualization Platform.
    The plugin will interact directly with the Hypervisor layer to provide all the
    networking functionality requested by Quantum APIs.
    It will be based on a controller-mode implementation were all resources state
    will be controlled and handled by the plugin.
    
    Implements: blueprint plumgrid-quantum-plugin
    Change-Id: I6bc8d32b83982e10f661913e85494468cf10e0e2

commit 06d03765d8f8f3ea1e20a5f9284a7d3131f1ee84
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Jan 10 16:24:54 2013 -0800

    Implements quantum security groups support on OVS plugin
    
    implements bp quantum-security-groups-iptables-ovs
    - Adding [SECURITYGROUP] firewall_driver to the conf
    - Adding NoopFirewallDriver
    - Adding OVSHybridIptablesFirewallDriver
    - Refactoring security group code to support OVS plugin
    
    Change-Id: I7aabc296265afc47d938121543ace57cce6cc521

commit 98ad762327b234d910685712413bf5079a36f079
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sun Feb 10 07:08:24 2013 +0900

    Sync latest cfg from oslo-incubator
    
    Main cfg change is:
    
      e3e5e0e Fixes "is not", "not in" syntax usage
      d156150 Implements import_group
    
    Change-Id: Ie6c0fe0d9d35ef6178a121e4f566207576c8d1e6

commit be77455856fcc88300b0ad5a36211ebd37f0e453
Author: Henry Gessau <gessau@cisco.com>
Date:   Thu Feb 7 16:01:28 2013 -0500

    Improvements to API validation logic.
    
    Do not automatically map generic exceptions like AttributeError to
    http errors (instead they should be handled closer to where they occur
    so that they can be "intelligently" converted to the appropriate
    error).
    
    Fix up some expected error codes in the unit tests.
    Improve some of the validation messages.
    Remove all use of locals() in attributes.py
    
    Fixes: bug #1076813
    Change-Id: Iabf8808a840e927307bbcae4cd41790af3d79a9e

commit 39bee347e4e53bd967a5ac2f7a74bf002933f6ea
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 9 00:05:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iba8087a9aba3b75907f19c8ffbf2939a90ea0e61

commit 41e56e800ee70a5f181df6e7a08b5b7e631bfff9
Merge: ab7e653 f330771
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 8 22:39:32 2013 +0000

    Merge "add non-routed subnet metadata support"

commit ab7e6539b75535a164c15f64420ff87eaf4dd8e0
Merge: 25878ca 82c9ef2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 8 06:20:02 2013 +0000

    Merge "Enable OVS and NETNS utilities to perform logging"

commit f3307718c4a12ea446cf695f46090b740d1d9f07
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Feb 4 23:59:59 2013 -0500

    add non-routed subnet metadata support
    
    implements blueprint metadata-non-routed
    
    This patchset completes Quantum metadata support by adding metadata
    proxy support for isolated network segments.  The support requires that
    the guest instance request host routes, so that the DHCP port can be
    used to proxy metadata requests. NOTE: The cirros image does not support
    host router, so the UEC or equivalent required for testing and usage.
    
    Change-Id: I962deef7c164ecb2a93b7af326ef8dca6e2b183a

commit 25878ca349cd10e55975a0dd5a001710d67521c8
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 8 00:06:27 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I2b516e56252c7973bbdf0583f2756dceccb5be2e

commit 02b829c743106f2e7948c1a09771b9a2aff86e1c
Merge: 311437f 724f4d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 21:04:46 2013 +0000

    Merge "Add NVP Security group support"

commit 82c9ef22cff0469d220404c2e3b47e140089eca1
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Feb 7 16:22:20 2013 +0000

    Enable OVS and NETNS utilities to perform logging
    
    Fixes bug 1118517
    
    Change-Id: I623c39b7d05accc49f88922d5d2c7ecfb8562a52

commit 311437f0437d1408e23e25c1a4864575dc3cacf9
Merge: 30823c6 f3b17e1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 14:53:14 2013 +0000

    Merge "Fix import error in ryu-agent"

commit 30823c6a9ee98d3398179c92fb301aec83a311cb
Merge: 3c778b3 1586b24
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 7 14:21:38 2013 +0000

    Merge "Imported Translations from Transifex"

commit 6c20e11491d91610cd1f6301f9c29cbb4dba5ac9
Author: Vasiliy Khomenko <vasiliyk@yahoo-inc.com>
Date:   Mon Jan 14 22:22:00 2013 -0200

    Add unit tests for Open vSwitch Quantum plugin
    
    OVSQuantumAgent missed unit tests for tunneling
    functionality. This change add these tests and couple
    of other minor tests.
    
    Implements: blueprint quantum-unittests
    
    Change-Id: I809711de8292ff7610b3fdb496c6bd043e7b6031

commit 3c778b3bf7687a66d7341e10bbc808ce4b6602da
Merge: 80e7451 686d55a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 7 13:13:16 2013 +0000

    Merge "Update .coveragerc"

commit 724f4d63c8e686fcf1d2eb91b40bcbf43b5a705f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jan 16 10:06:52 2013 -0800

    Add NVP Security group support
    
    Implements blueprint security-groups-nvp
    
    Change-Id: Idfa7a756c7a2845e9aa9e7de4c7bceeec94b036f

commit f3b17e1d41ebb9c81edd02c5ead860e03305bc5e
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Mon Feb 4 22:17:54 2013 +0900

    Fix import error in ryu-agent
    
    Fixes bug #1114183
    
    Change-Id: I7f8c3507840f0eb6190b509ae2b7b35bd03c74e1

commit 1586b247fff61d65a6cc8770fbc36276bee6052c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Thu Feb 7 00:07:38 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I95fb1c34482b68c44fe5afc083221116b68ddf51

commit 80e7451e412e555e9a9d5c8604ef0d4bbbe66581
Author: Salvatore Orlando <sorlando@nicira.com>
Date:   Wed Dec 12 04:22:50 2012 -0800

    Bad translation from network types to nvp transport types
    
    Bug 1117769
    
    'Flat' and 'Vlan' where not being converted into 'bridge'
    This change cannot have unit tests because the fake nvp api
    client does not validate such constraints at the moment
    
    Change-Id: I2b918265cb8becf6f023abc7937b92b3058d9446

commit 8286b28ea1fcecd23f2cdc0922d941362921d8b2
Merge: b2dc9e6 9c8f37e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 18:58:41 2013 +0000

    Merge "Updated to latest oslo-version code."

commit 686d55ac63e561bcf82a8d2790734f3eb146bcbc
Author: Alessio Ababilov <aababilov@griddynamics.com>
Date:   Wed Feb 6 16:47:06 2013 +0200

    Update .coveragerc
    
    Set up proper source and omit options.
    
    Change-Id: I13cc4bf4b3b349d1c868a4ff93ef33fd5ef292b8
    Implements: blueprint update-coveragerc

commit b2dc9e6bf996a3e607bfbcaf133968798210a54d
Author: Alessio Ababilov <aababilov@griddynamics.com>
Date:   Wed Feb 6 13:22:53 2013 +0200

    Register root_helper in test_debug_commands and test_dhcp_agent
    
    root_helper variable currently must be introduced with a call
    to register_root_helper, not with a simple assignment.
    
    Change-Id: I3e72379925a994acfb6defb24820ab63eab43957
    Fixes: bug #1117240

commit 5ec1bd70b74de2918f99ccfe9c8d89be5eade468
Merge: 04b4225 3f013e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 04:15:21 2013 +0000

    Merge "Adds xml support for quantum v2 API."

commit 04b42259b3b657966899285fdd1438fc66d8bd3c
Merge: 0eb1c77 a4c1076
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 02:39:51 2013 +0000

    Merge "Use policy_file parameter in quantum.policy"

commit 0eb1c7702d7c6ec39de80df907e1daedba2266f5
Merge: 0c9b820 7beec04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Feb 6 02:39:47 2013 +0000

    Merge "Allow tools/install_venv_common.py to be run from within the source directory."

commit 3f013e370d79b28752be67d7125674885381d13b
Author: gongysh <gongysh@linux.vnet.ibm.com>
Date:   Sun Aug 5 20:04:24 2012 -0300

    Adds xml support for quantum v2 API.
    
    Fixes bug 1007998.
    blueprint quantum-v2-api-xml
    
    Author: gongysh <gongysh@linux.vnet.ibm.com>
    
    Change-Id: I5f5407e767f8203f980b77075109845bc1553ed9

commit 7beec04415b96626534ee17cff7a130b1881b6ea
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Tue Feb 5 18:08:45 2013 -0500

    Allow tools/install_venv_common.py to be run from within the source directory.
    
    (Copy latest update from oslo)
    
    Not doing this raised exceptions when it tried importing modules
    that didn't exist in the path.
    
    Fixes LP# 1116269
    
    Change-Id: I3e2ed3ac96b51ec89def911054720d11bbcd9407

commit 0c9b8205db18c6407f3e95d9a9c29236bc0ba0b4
Author: Arvind Somya <asomya@cisco.com>
Date:   Tue Feb 5 17:22:50 2013 -0500

    Cisco plugin cleanup follow up commit
    
    A commit was made by Alex Xu (https://review.openstack.org/#/c/20073) a day before the Cisco plugin
    cleanup that led to some deleted files creeping back into the Cisco plugin. This commit backs out
    the deleted files again.
    
    Blueprint cisco-plugin-cleanup
    
    Change-Id: Ibad452dc0497dad452a33d6f41c1785231cd5d5b

commit 5840627a4838d4b81e4cf535a11363bc703b1ffe
Merge: 989f060 962aca5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 5 18:58:19 2013 +0000

    Merge "Be smarter when figuring out broadcast address"

commit 989f060bc97eec69d046b88dcc280e9ce1fc6912
Merge: 1b7565b 7caf323
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Feb 5 18:58:15 2013 +0000

    Merge "Imported Translations from Transifex"

commit 962aca526c0acdec249e84fe972f059098e1196f
Author: Ante Karamatic <ante.karamatic@canonical.com>
Date:   Mon Feb 4 14:02:25 2013 +0100

    Be smarter when figuring out broadcast address
    
    In most cases, broadcast is set when IP is set, but sometimes
    it can be ommitted. In those cases we should figure it out based
    on CIDR, and not assume it.
    
    Change-Id: Ia8c07898ddf0eb19f5d552a304d8f38915fc3560
    Fixes: bug #1090621

commit a4c107684a9a7769f226e7520f64511b0cfe2b75
Author: Alessio Ababilov <aababilo@yahoo-inc.com>
Date:   Tue Feb 5 15:53:38 2013 +0200

    Use policy_file parameter in quantum.policy
    
    quantum.policy depends on configuration parameter `policy_file'
    that is defined in quantum.common.context.
    
    Tests from tests/unit/test_policy.py fail without this import.
    
    Fixes: bug #1116263
    Change-Id: Iba4792acb0fb6b34b4ebc99fec7bc729cdb306da

commit 7caf3234a8d6dae034d246f5109b5242919315b1
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Feb 5 00:06:58 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I0ebe0d71a5891c8bb53833ddc0ba7a9deca0c175

commit 1b7565b83ca8ef9761cdfb1eed1e9eb9498ea340
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jan 28 13:37:47 2013 +0000

    Define root_helper variable under the [AGENT] section
    
    Fixes bug 1105523
    
    The patch set adds 2 new functions:
    1. register_root_helper - this enables all wanting to use
    the root_helper variable. This is under the section AGENT.
    2. get_root_helper - this is a helper function that returns the
    root_helper. This should be used when the application used to
    have the root_helper defined under the section DEFAULT. This
    ensures backward compatability.
    
    Change-Id: Iba72c4fc89ba5329ea045483287012f82b306250

commit f4b1c5fb7c99c49ec5a9e205189af05b2786a1a2
Merge: dc1c36f d411308
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Feb 4 08:29:13 2013 +0000

    Merge "Fixes rest of "not in" usage"

commit d411308f7e5e18133653fc656281a56fe635bb9b
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Feb 4 11:00:50 2013 +0800

    Fixes rest of "not in" usage
    
    find quantum -type f -name "*py" -exec grep -HE " not [^ ]+ in " {} \;
    
    Change-Id: Ief9560e515c05f05c0b5346609b87a8fdde569d7

commit 9c8f37e6c4b28a2f5be836b43147e6dfb8518255
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Nov 1 14:23:58 2012 +0100

    Updated to latest oslo-version code.
    
    In support of tag-based versioning, update to latest oslo-version.
    This changes from using versioninfo files to using PKG_INFO.
    
    Change-Id: Ia7d212d531305997153204dfffa44beed4bad0d3

commit dc1c36fac93a63651e78aa80a84d5320f853c793
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Mon Feb 4 00:03:10 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I342facc85297be2a90d735233e4099a16a97a124

commit 6de7ed273c9db22646c3d3000b4b1845a99bfc63
Merge: 411acee 5c1c23d
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 3 16:18:33 2013 +0000

    Merge "Imported Translations from Transifex"

commit 411aceec92c984bf2fdbee17ed7c19bc7cfdf78d
Merge: 5da83e5 40e7635
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Feb 3 02:19:00 2013 +0000

    Merge "Improve data access method of ryu-agent"

commit 5c1c23d24dfaed87735afdfc85c8965a1610cb52
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sun Feb 3 00:04:18 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I303cc1f1e73ad708acfd2886c9d53ba4e1e65cfc

commit 5da83e5a14b74159f0f5fd1a3989ebc04f7faa24
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Sat Feb 2 00:07:19 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I88b832c790f88bd6a0d92e26974d561279d3f6c3

commit 8db82533e1f04dc0cc570bab1b873d33985bf7ed
Merge: 5a99045 35cb218
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 1 22:38:15 2013 +0000

    Merge "Resetting session persisnence for a VIP."

commit 5a99045e9d3f08c3124b329714bb62f9e4650761
Merge: 4ab676f 2caed82
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 1 19:31:39 2013 +0000

    Merge "Imported Translations from Transifex"

commit 35cb218adb9a370fa1013b6ef2593e9ef081461e
Author: Roman Prykhodchenko <rprikhodchenko@mirantis.com>
Date:   Tue Jan 29 20:33:17 2013 +0200

    Resetting session persisnence for a VIP.
    
    This change allows to reset session persistence, if it
    was configured for a VIP. It's possible by passing None
    value for session persistence through the REST API.
    
    Change-Id: I8690850d0589065502a8eb774d51fe40851624f8
    Fixes: bug #1109101

commit 40e76356dd50113936826833eddb3ce57fee8214
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Wed Jan 30 15:50:41 2013 +0900

    Improve data access method of ryu-agent
    
    fixes bug #1110174
    
    This patch implement rpc in ryu-agent, instead of accessing a
    database directly.
    Because it was not necessary to transmit information via database,
    therefore the table is eliminated.
    
    Also, I remove openflow controller stuff from a configuration file
    of the Ryu plugin because it was not used anymore.
    
    Change-Id: I5e261297c3f92c6a1ac5df229084176e84694e87

commit 4ab676fc4f98f2b67e7b1ae7dbed657d602a95a1
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jan 31 16:08:26 2013 +0800

    Fixes 'not in' operator usage
    
    Fixes bug #1110058
    
    Change-Id: I45c10097abfb929918925e7befb8ed6c36b1de1c

commit 03d264751a1a6103615a40270b068bdee5e9d600
Merge: 642fe55 a01a8d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Feb 1 01:04:19 2013 +0000

    Merge "Sync latest cfg from oslo-incubator"

commit 2caed822cfe41c3a524447cde538ef3181fad6de
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Fri Feb 1 00:06:48 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: Iecbd60ab707a91b5ba54431a7f74c479e48950d9

commit 642fe5505fd55543d24ff47ba493f7b37a7288ce
Author: Roman Prykhodchenko <rprikhodchenko@mirantis.com>
Date:   Fri Jan 18 12:56:19 2013 +0200

    Adds support of TCP protocol for LBaaS VIPs.
    
    Adds validation of supplied protocols for VIPs and Pools at API and DB levels.
    Modifies the schema of the database to allow storing TCP VIPs.
    
    Change-Id: Idab3139f280b5f0a16633974c05f88d70fb8d683
    Fixes: bug #1100724

commit ae5c73a6cbe7889d256deb0d2ef0bfdbd38714d9
Merge: 46e5c83 07a0af5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 31 08:25:05 2013 +0000

    Merge "Remove redunant key list generation in Cisco plugin"

commit a01a8d88dbaf1b669f2b72d1ef7a7c4194da3ec1
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jan 21 16:53:51 2013 +0000

    Sync latest cfg from oslo-incubator
    
    Main cfg change is:
    
      c5984ba Move logging config options into the log module
    
    Change-Id: I3913ea54465658d93dc56e014dfe5d911b0541d6

commit 07a0af5c97c09ff96e10f3e457d653a6bcfa09da
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Jan 30 16:57:20 2013 +0800

    Remove redunant key list generation in Cisco plugin
    
    Evaluates existance of key directly on dictionary.
    
    Fixes bug #1110957
    
    Change-Id: I9b46a991ab9c764d7451cc122d208e06778c1ee1

commit 46e5c83c8820dbc552d8aff3396565e4e0cf501c
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Jan 30 16:07:46 2013 +0800

    Fixes if statement inefficiency in quantum.agent.linux.interface
    
    Changed logic of checking the existance of a port value
    
    Change-Id: Id06447a753fd0201ef44a047657bd747ce18d546

commit abdb32c377c3e309ec5da754d84fa592cd3ea86a
Merge: 79da6fe c63e046
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 30 07:59:09 2013 +0000

    Merge "Disable dhcp_domain distribution when dhcp_domain is empty"

commit 79da6feee8d5b67e09b579fd7f44aff17cfb8b81
Merge: d99c2a0 1056245
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jan 30 01:58:43 2013 +0000

    Merge "Imported Translations from Transifex"

commit d99c2a0cb756b944815552ee38f4459ba2b04716
Merge: 12d2168 55121e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 30 01:32:39 2013 +0000

    Merge "correct spelling of Notify in classname"

commit 10562457f208f5f851f68c8c991b4d4875f4fd93
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Wed Jan 30 00:07:31 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I04b8dddcb3f6c3c566e3b383d22989ee454f6146

commit 12d2168ac2e31857e73c2f1f12b648d30f0a09e1
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jan 29 15:36:58 2013 -0800

    Postgresql ENUM type requires a name exceptions NVP Plugin
    
    Fixes bug 1109824
    
    Change-Id: I62beceaa14773de94e79d7017658f9f6e6212bb6

commit 7f6ad1e21cafe894d398cf2749107db3ebc6f8f1
Merge: ecd603e 8211346
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 23:19:47 2013 +0000

    Merge "Fix OVSQuantumAgent.port_update if not admin_state_up"

commit 55121e63d6e73569045a208d21424d937b8b4bf5
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 29 16:25:54 2013 -0500

    correct spelling of Notify in classname
    
    fixes bug 1109310
    
    Change-Id: Ida94b51d069f44bcc3e1e24f868dbe46bf136ee1

commit c63e0465d047413b71dd616249bbbe2efddbf0f9
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Tue Jan 15 09:54:59 2013 -0800

    Disable dhcp_domain distribution when dhcp_domain is empty
    
    fixes bug 1099625
    
    Change-Id: Ib86770345c46a0dd8bb38a4c3e435420170828af

commit ecd603e2efd19ecd4b8461a482bbbd1cf2031db3
Merge: 709a163 a357586
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 20:02:58 2013 +0000

    Merge "Make protocol and ethertype case insensitive for security groups"

commit 709a1631e8faaaaf4bb9dec90554ca2c43042e31
Merge: 70a9f38 4510c3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 16:56:20 2013 +0000

    Merge "Fix branch in db migration scripts"

commit 70a9f38c95e27fc5bec214ded44c6d36763e2e64
Merge: 3c33485 041e2f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 16:56:11 2013 +0000

    Merge "Finish adding help strings to all config options in Quantum code."

commit a3575860eab694051a58a1f0dfbff82e0a3e5056
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jan 24 15:45:04 2013 -0800

    Make protocol and ethertype case insensitive for security groups
    
    Fixes bug 1104495
    
    Change-Id: I0d93f5e849ebe0be72fff8c1d82f5825540df338

commit 3c334853edfc74fac73fa66d29a0cd7617f2597a
Merge: ce11b62 dab2838
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 14:49:58 2013 +0000

    Merge "Add NVP port security implementation"

commit 4510c3fb0742a4a00d1e15b0429a36d6fa476a85
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Jan 29 22:50:15 2013 +0900

    Fix branch in db migration scripts
    
    Fixes bug #1108781
    
    Change-Id: Ia6cfcc4a1cc39136bad99be26f40aac9fa3e3e70

commit 041e2f75e7f82b0841e38baded9628aa44d81f87
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Mon Jan 28 10:18:32 2013 +0000

    Finish adding help strings to all config options in Quantum code.
    
    This adds reasonable help strings to all remaining config options
    in Quantum code. This includes all the plugins as well.
    
    Fixes bug 1101356
    
    Change-Id: I1cbe8303ad6d86756b992ae302707a0365625f52

commit ce11b62046a0501e9fcd8442524d3c151d315dfb
Merge: 3e868e8 672549d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 06:45:43 2013 +0000

    Merge "Use install_venv_common.py from oslo."

commit 3e868e8fc5658f5b5691fcaf144d27b9a4e5652b
Merge: 3fca8f6 6f44340
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 06:35:31 2013 +0000

    Merge "Clean up test_extensions.py imports"

commit 3fca8f609965114787194fcfe1390c04556402ef
Merge: 8db9baf 1b5730b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 03:03:20 2013 +0000

    Merge "OVS cleanup utility removes veth pairs"

commit 8db9bafc79c27c2954e28c1abbb323fcda597547
Merge: 02fbf7d d5bfd91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 29 02:47:26 2013 +0000

    Merge "Set default lock_path in state_path"

commit dab2838daebf8faa3582051f75912b8a1bb6bad4
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Jan 14 22:45:41 2013 -0800

    Add NVP port security implementation
    
    Implements blueprint nvp-port-security-extension
    
    Change-Id: I9f09424b963acb4f4847d11e9a98432094f8c164

commit 02fbf7d05f28d9a42f6d4b54983c4d124a10a29c
Author: OpenStack Jenkins <jenkins@openstack.org>
Date:   Tue Jan 29 00:06:59 2013 +0000

    Imported Translations from Transifex
    
    Change-Id: I5a2b3949886393b5926bc98793fe00561ab049e6

commit d5bfd9106148eec91f1109ea7f88b6fb41cd69d5
Author: Jason Kölker <jason@koelker.net>
Date:   Mon Jan 28 17:06:11 2013 -0600

    Set default lock_path in state_path
    
    * Set the default lock_path to be within quantum's state_path
    * Fixes bug 1107950
    
    Change-Id: I346d6088d773b508b4a7ba925fdc91fd4f5bf160

commit 672549dd4bc42288edfdd66ba1ef8eab5239a179
Author: Matthew Treinish <treinish@linux.vnet.ibm.com>
Date:   Mon Jan 28 14:47:11 2013 -0500

    Use install_venv_common.py from oslo.
    
    This syncs install_venv_common.py from oslo and reworks the
    tools/install_venv.py script to use the new library.
    
    Change-Id: I46bbf7d656e6cb9660e37af2d3ce96150e18e7fe

commit dc3e446aeccdd784c480b094b9285a5618e1b607
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Jan 25 11:30:18 2013 -0800

    Make get_security_groups() return security group rules
    
    In nova, get_security_groups() returns the security groups and their
    security group rules. In order to implement the security group proxy
    it needs to return this data to nova. This can be done using multiple
    requests from nova-api to quantum i.e: get_security_groups(), then
    get_security_group() for each group to obtain the rules. If one has a lot
    of security groups this will generate a lot of requests. Adding this change
    allows all the security groups and their rules to be returned in one shot.
    
    Fix bug 1105399
    
    Change-Id: Ib685960311221ac4e5fe0913c7e00e15ab74accb

commit 82113467f8872e14306e8ef49a672fccb99f6a37
Author: Alessio Ababilov <aababilo@yahoo-inc.com>
Date:   Mon Jan 28 17:23:38 2013 +0200

    Fix OVSQuantumAgent.port_update if not admin_state_up
    
    self.agent does not exist. Use self.plugin_rpc, not
    self.agent.plugin_rpc.
    
    Change-Id: Id472c07f5a16891c040cc1afdcb457e1ef81beed

commit 6f443403868c84b8a1be8d3cb8271cad24206fdf
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sun Jan 27 22:48:08 2013 +0800

    Clean up test_extensions.py imports
    
    Remove unnessesary imports
    Import only modules
    
    Change-Id: I4988714e3ae31ce77f3a2c1e27e81dd6258c7546

commit 5db8a2235251a18f4fdeff31d30d3b95c4e1cb36
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Jan 21 08:50:58 2013 +0800

    Fixes import order errors
    
    Change-Id: I3df7bfb2e0812b006fa41bd76fb6156ebcd74362

commit 1b5730b42c6306e26ec5e803f3e349b203756ba8
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sun Dec 30 05:37:13 2012 +0900

    OVS cleanup utility removes veth pairs
    
    Fixes bug 1094185
    
    OVSInterfaceDriver plug() creates a veth pair and add it to an OVS
    bridge when ovs_use_veth=True. It is useful that OVS cleanup utility
    removes such veth paris in addition to removing OVS ports.
    
    Veth pairs to be removed are veth devices corresponding to ports
    removed when all_ovs_port==False. Veth pairs created to connect
    the integration bridge and physical bridges are not removed.
    
    Change-Id: Ia87f0464e69a45dd0bdfd907ac71a003df9fc23f

commit 32daf52381f08b890360f87d9f82deb9825ea85d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jan 27 23:58:30 2013 -0800

    Revert "Reqd. core_plugin for plugin agents & show cfg opts loaded."
    
    This reverts commit 06ce1329a044b8e7be9db59811d4f4316d0d0743.
    
    bug 1059923
    
    patch was found to not be a valid fix.
    
    Change-Id: I465974f60fd65b4d2c9449267ab108fac13d70c8

commit 85c0d94fdf3ad85684a67ff8155fd2b3ee16e2e5
Merge: 040677c 06ce132
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 28 07:30:13 2013 +0000

    Merge "Reqd. core_plugin for plugin agents & show cfg opts loaded."

commit 040677c1a052c7e4240e446fba6af3426fcb0391
Merge: 3cb47af 9dd553e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 27 06:38:22 2013 +0000

    Merge "OVS: update status according to admin_state_up"

commit 3cb47af399f7a008f8dc7cccadfa44440a85e0d3
Merge: 56fa94f 76eef02
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 23:35:34 2013 +0000

    Merge "Ensure that correct root helper is used"

commit 06ce1329a044b8e7be9db59811d4f4316d0d0743
Author: Paul Michali <pcm@cisco.com>
Date:   Thu Jan 24 08:13:18 2013 -0500

    Reqd. core_plugin for plugin agents & show cfg opts loaded.
    
    For the linuxbridge, openvswitch, nec, and ryu plugin agents,
    require the core_plugin configuration option, and throw an
    exception, if not present. Note: cannot make this a required
    option for all agents, as there are agent that include the
    core config options, but do not require core_plugin.
    
    In addition, log (as debug) the configuration options that
    have been loaded at start-up for these four agents. This will
    help with diagnosing start-up issues related to the
    configuraiton settings (or lack of).
    
    Tested that exception thrown, when missing core_plugin
    value in config file(s) included, for these four agents.
    
    bug 1059923
    Change-Id: I813f0c2a3d0ec01be74a34e56ab085979197a16a

commit 56fa94f40bba981bd986ec9f876a839c3aadf440
Merge: 8627cb4 cb7dae0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 25 15:58:30 2013 +0000

    Merge "Fix InvalidContentType can't be raised because of error in constructor"

commit 76eef0200a7c9ff357ca48c2a1e172a2ffd2f728
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Jan 25 15:30:26 2013 +0000

    Ensure that correct root helper is used
    
    Fixes bug 1105193
    
    Change-Id: Iaaf0b3687c410f5dbfa152d601ae3b2492a610dd

commit cb7dae08aee84d49537477d25a5798f515ff2321
Author: Tatyana Leontovich <tleontov@yahoo-inc.com>
Date:   Thu Jan 24 17:33:57 2013 +0200

    Fix InvalidContentType can't be raised because of error in constructor
    
    InvalidContentType exception class is defined two times:
    in quantum.openstack.common.exception and quantum.common.exceptions
    with two different signatures.
    A lot of code like wsgi.Serializer.serialize() imports one of them but
    attempts to use it with the signature of another one, which ends with
    TypeError exception.
    
    This change fixes the bug by removing the second definition of
    InvalidContentType class and leaving only one which works correctly
    with all code. Also adds unit tests for exceptions to prevent this and similar bugs.
    
    Change-Id: I5d932d75ad184a0a6c6419190f2940bd47b7504e
    Fixes: bug #1104090

commit 9dd553e12a07a6f5a8616f188f543be3d788cd01
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jan 13 12:10:23 2013 +0000

    OVS: update status according to admin_state_up
    
    Fixes bug 1099099
    
    In addition to this the code does the following:
    1. validates if the port exists on the OVS when a port update event takes
       place
    2. when a port is created the initial state is set as 'DOWN'. this is
       later updated by the agent when it is detected as up
    
    Change-Id: I917d4b5aa8df7395fcaa841d77083546478739d2

commit 8627cb46c15ceb40b25aadbc701e4d80ba0ca269
Merge: 6a8ecc0 66b7fae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 20:53:14 2013 +0000

    Merge "Improving code reuse with loadbalancer entity deletion"

commit 6a8ecc083b84cff3088686fd425d71e076a885e6
Merge: bceba37 86eef04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 19:32:42 2013 +0000

    Merge "Cisco plugin cleanup"

commit bceba37f7a5e947b4b0139d4e52405ec07444390
Merge: bf3a9d7 c740986
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 19:10:03 2013 +0000

    Merge "Use babel to generate translation file"

commit 86eef047df8ac616dd58492ad41dc2f77ef5452c
Author: Arvind Somya <asomya@cisco.com>
Date:   Wed Jan 16 13:40:12 2013 -0500

    Cisco plugin cleanup
    
    Removing unused plugins and code from the Cisco plugin framework.
    
    Change-Id: Ib22d173a088ad50b410a51a1d92685259d0af473
    Implements: blueprint cisco-plugin-cleanup

commit 66b7faeb7e6d5d2d1c4f767541796067c0bb60c7
Author: Avishay Balderman <avishayb@radware.com>
Date:   Thu Jan 24 04:31:49 2013 -0800

    Improving code reuse with loadbalancer entity deletion
    
    Fixes bug #1103988
    
    Change-Id: I55df965a1592ecc5a76bf9f02d43e3aaa26c1980

commit bf3a9d79a1c3c27331fbc0c80aa2cf09b3712ece
Merge: 220ba72 854d7d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 11:12:04 2013 +0000

    Merge "Fix all extension contract classes inherit from extensions.ExtensionDescriptor"

commit 220ba72d30e34604d0da25207e5f0a61bc3df3c5
Merge: ac3b922 29835c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 11:10:01 2013 +0000

    Merge "get_security_group() now returns rules"

commit ac3b92253e85976ca8cca651fa0eeb6860ad86e6
Merge: 895e460 e1006d9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 10:51:05 2013 +0000

    Merge "Fixes per tenant quota doesn't work"

commit 895e46032d7fc846416dcb38e32e698015f78c1e
Merge: 2a3e25e 579aa72
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 24 10:34:28 2013 +0000

    Merge "Fix database reconnection"

commit 579aa723489c31e6f8a027cda400c811084cd701
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jan 24 09:15:32 2013 +0000

    Fix database reconnection
    
    Fixes bug 1103904
    
    Change-Id: I2f3bc450d5d7ea04c20b3be2afed3c0c5a00435a

commit e1006d921628e84d9263cb27b24f6c7e44468e44
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Jan 24 15:26:55 2013 +0800

    Fixes per tenant quota doesn't work
    
    Fixes bug 1101331
    
    Change-Id: I9c4e88b437506ed5818ee56ff6fd70588cb0f965

commit 2a3e25e383621590375b37cd1303d6fb3464abae
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jan 8 22:53:02 2013 -0800

    Adds port security api extension and base class
    
    Implements blueprint port-security-api-base-class
    This patch also updates the _create_network/port in the unit tests
    so that it does not remove false values from arg_list.
    Fixes bug 1097527
    
    Change-Id: I22b55b0ed56c830995ffb491176c801c697abe6f

commit 200f9d53be496dcb331d24f721cb63f66f653bbd
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jan 23 07:39:18 2013 +0000

    LinuxBridge: set port status as 'DOWN' on creation
    
    When a port is created the initial status will be 'DOWN'. The agent
    in turn will update the plugin of the actual port status.
    
    Change-Id: I66b51501304f7cb3f0157a4adaec4b82c62b30a3

commit 8f28b588618fc1ac24a84a86d8d485f8875d3709
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jan 13 09:16:29 2013 +0000

    LinuxBridge: update status according to admin_state_up
    
    Fixes bug 1099065
    
    In addition to this the agent will only treat ports that exist on the agent.
    
    Change-Id: I927649a45a860421ef0d825015516000475ad08d

commit c740986599c0185067697656d9aedcd73c496e81
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Jan 24 00:07:18 2013 +0800

    Use babel to generate translation file
    
    Fixes bug 1103519
    
    Following http://wiki.openstack.org/Translations to integrate transifex
    translation into quantum
    
    We added the empty file quantum/locale/quantum.pot to avoid the
    failure of the Jenkin's translation-jobs because git doesn't allow empty
    directory to be added into the repository.
    
    After this patch accepted, we need to do as below:
    1. Make the transifex quantum project
    (https://www.transifex.com/projects/p/quantum/) as part of the
    openstack transifex project hub and give access to the transifex
    openstack Jenkins account.
    
    2. Add the translation-jobs into openstack/openstack-ci-puppet for
    ceilometer.
    
    Change-Id: I329a8bdc51ed8a0e75399c592d3991b1ec06a855

commit 6f6499700a8ce682f9d0963180cbc389ac4acc85
Author: Avishay Balderman <avishayb@radware.com>
Date:   Wed Jan 23 01:49:32 2013 -0800

    LBaaS plugin returns unnecessary information for PING and TCP health monitors
    
    Fixes Bug #1100749
    
    Change-Id: Id1e22621b398786f3d6b670f53b6e23e7fb89786

commit 854d7d04e300bd12cd8bc8de10e53a9e5b951199
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Jan 22 18:52:41 2013 +0800

    Fix all extension contract classes inherit from extensions.ExtensionDescriptor
    
    Part of blueprint quantum-api-wadl
    Fixes bug #1102927
    
    Fixed classes to inherit from ExtensionDescriptor
    Reordered methods in sync with parent
    
    Change-Id: I40b3814a490d7da49d0ef075c3482cc104eb7a7c

commit f45a0153b8b2191af05e3dd986263410e5a4de9f
Merge: a693a84 2daeeba
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 08:02:08 2013 +0000

    Merge "Enable test_agent_ovs_cleanup to be run alone"

commit 29835c0ffb3562a56fe823862e00406efcaa7356
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jan 22 19:24:25 2013 -0800

    get_security_group() now returns rules
    
    get_security_group() previously only returned a security_group's id,
    name, tenant_id, and description. This patch changes get_security_group()
    to also return the security_group_rules associated with the security group.
    Fixed bug 1103278
    
    Change-Id: Iebc0022faa5c7072380d52b81c13783add0f4d46

commit a693a840a41952a7f09a2076247699d4af810347
Merge: 93d9eff cbbb11e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 05:59:53 2013 +0000

    Merge "set allocation_pool_id nullable=False"

commit 93d9eff81581d15b1f5f62355a5f64c9f94659bc
Merge: 53cad8f 369fbea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 04:03:48 2013 +0000

    Merge "Fix i18n messages for cisco plugin"

commit 53cad8f6e30133f561f02508a820357f15ef45f1
Merge: 8f665c4 5019749
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 03:52:23 2013 +0000

    Merge "Fix i18n messages"

commit 8f665c47b4f15e3690abace18bb74c513f34b16a
Merge: 73be592 4b43058
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 03:42:57 2013 +0000

    Merge "Provide atomic database access for ports in linuxbridge plugin"

commit 73be5923bd9b22afd64d7065b357b27cde88c8d3
Merge: c72bae2 8b978d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 23 00:03:13 2013 +0000

    Merge "Support Port Binding Extension in NEC plugin"

commit cbbb11ef6e9dff745720ffc45e10ee589af553b6
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 22 17:48:09 2013 -0500

    set allocation_pool_id nullable=False
    
    fixes bug 1103216
    
    SQL Primary Keys cannot be null, so this patch fixes an
    inconsistency between the models and SQL.  The databases were
    correcting this automatically, so a migration is not required.
    
    Change-Id: I724294580de9b86a2edfd4fdc6907e9469b6c552

commit c72bae2b2e73fe418449b4fb49acab3bd0e1aecd
Merge: 818af09 0bc4588
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 20:05:38 2013 +0000

    Merge "make IPv6 unit test work on systems with eth0"

commit 0bc4588692314d2c1cbba22590ec0e2737ef1e4c
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 22 12:16:09 2013 -0500

    make IPv6 unit test work on systems with eth0
    
    fixes bug 1103074
    
    The link local unit test was failing because it depended on eth0 to
    exists.  This mocks getaddrinfo() to ensure a consistent return value
    across testing environments.
    
    Change-Id: Ie1a4d837efcacac8c8d2217c164ad751922e1a5f

commit 818af09594ca63f1e77ac30ec381336bec7626d5
Merge: b18a321 a8da14c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 17:12:23 2013 +0000

    Merge "Removes redundant code in quantum.api.api_common"

commit 8b978d02f70ba36871900b62ca160e2ad6dc08ef
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Jan 16 11:59:02 2013 +0900

    Support Port Binding Extension in NEC plugin
    
    Fixes bug 1099894
    nova/network/quantumv2/api fill the bridge name according to
    binding:vif_type attribute passed from Quantum. Otherwise the bridge
    is set to None and launching an instance will fail.
    
    blueprint vif-plugging-improvements
    
    Note that binding:capabilities is under discussion and it may be
    changed in the future. This commit just adds NEC plugin support
    same as OVS and Linux bridge plugin.
    
    Change-Id: Ifd43c3c53615246187621613f72490b62a09b2d6

commit b18a3217cdccaa3f27e228dda4fdf60e7c3cac1a
Merge: 66dfcc0 528a27a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 13:11:09 2013 +0000

    Merge "Update Oslo rpc"

commit 66dfcc08fe4f863eec02331e416ebdfeb619f902
Merge: 983051b 20314e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 09:36:07 2013 +0000

    Merge "Enhance wsgi to listen on ipv6 address"

commit 983051b713ddf958d7f62efb12c3b328d9b25696
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sat Jan 19 02:53:25 2013 +0900

    Enable NEC OpenFlow plugin to use per-tenant quota
    
    Fixes bug 1099889
    
    Change-Id: I0b778371d0775e594c3217ceb329a7f4e58609f6

commit 20314e0ba06588d3ac7855d1b4ae7f3c75cab1a1
Author: Davanum Srinivas <dims@linux.vnet.ibm.com>
Date:   Thu Jan 10 11:26:25 2013 -0500

    Enhance wsgi to listen on ipv6 address
    
    Check if the hostname is ipv6 and set the family appropriately.
    Picked up the code snippet from glance to determine the address_family
    per markmclain's comment
    Picked up some code from nova as well to get the test case running
    properly
    
    Fixes LP# 1101341
    
    Change-Id: I67166dc030e4ea0dd82888abfbc9db555747de27

commit 61a4bd71248d9c1b16304d800fc1e869c0be8aa8
Merge: 5462907 17567f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 22 03:48:56 2013 +0000

    Merge "Fix i18n messages in quantum.api.api_common"

commit 5019749dc8d967c62591dc2776a004d887d10619
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Sat Jan 19 19:58:47 2013 +0800

    Fix i18n messages
    
    Fix the last scraps of messages
    
    Change-Id: I0494ab43fa95b7040de2b5a596fa08b9c73aab8d

commit 528a27a0b6c551ba05c0fdeb240075521ec84fa7
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Jan 22 10:28:03 2013 +0800

    Update Oslo rpc
    
    Updated the rpc module for import order fix
    
    Change-Id: I09332425827778672dc232b15ebefd9f9a6dd34a

commit 5462907d77facbc4d2967094c6ac9f434314a8f2
Merge: 38b31aa fbca0ac
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 23:06:53 2013 +0000

    Merge "Completes unittest coverage of quantum.api.api_common"

commit 38b31aaf29da6e3ed78847d37c0aeb56ec0059e8
Merge: 3b7ac30 9baf9f0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 21 18:57:59 2013 +0000

    Merge "Enforces generic sqlalchemy types in migrations."

commit 9baf9f037a6d0a14afb5244e06b5efc0deebe0e4
Author: Matt Dietz <matt.dietz@rackspace.com>
Date:   Mon Jan 21 17:40:50 2013 +0000

    Enforces generic sqlalchemy types in migrations.
    
    Fixes bug 1102491
    
    Modifies the service_type migration to use sqlalchemy types instead of
    mysql types. Also removes the import of mysql from several of the
    migrations.
    
    Change-Id: I0495a711cd14f64ced4d32857e30586a42b83839

commit 3b7ac3046cfe032f6acad736aeb98052a199954b
Author: Avishay Balderman <avishayb@radware.com>
Date:   Mon Jan 21 07:14:31 2013 -0800

    Remove redudant code
    
    Fixes bug 1102402
    
    Change-Id: Ib4a226cdc18506c1aa08707cc06fa76d4090287f

commit a8da14c0fd3edb941b0dd4a2fa44c00a68a89798
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Jan 21 16:57:46 2013 +0800

    Removes redundant code in quantum.api.api_common
    
    Fixes bug #1102313
    
    Change-Id: Ie321c48ae6d38f013e1ef8471df4d86b63b28931

commit 17567f19dc5734e9be4db0f1d2d21881554970f9
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Jan 21 09:56:13 2013 +0800

    Fix i18n messages in quantum.api.api_common
    
    Change-Id: I30dc9ad76dbfb6cc038c283d81e449cf64d7ffec

commit fbca0acf9c457f00196e209c87ff7d42b5267f45
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Jan 21 16:31:08 2013 +0800

    Completes unittest coverage of quantum.api.api_common
    
    Fixes bug #1102245
    
    Change-Id: I01c8a563440f56db19d33a743549d2d50f5b48ee

commit 2daeeba8ab805c11c33e07690eca1204a88f914f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jan 21 07:47:28 2013 +0000

    Enable test_agent_ovs_cleanup to be run alone
    
    Fixed bug 1102243
    
    Change-Id: I0d3df32301903a0ce8547fe50fd03222e1548a72

commit 369fbeac7016a7cff63326e01a956cef19220923
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Sat Jan 19 12:23:04 2013 +0800

    Fix i18n messages for cisco plugin
    
    fix bug 1101676
    
    Change-Id: I671092b4c47b77bc42474b5bf2f6b8d9791acce6

commit 4b430582c84c865f848129329705a70357c5fb45
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Wed Jan 9 09:24:04 2013 +0800

    Provide atomic database access for ports in linuxbridge plugin
    
    Fixes bug 1097541
    
    Change-Id: I3b16b4504b7b61cebe44df5c169f4877969c8628

commit e2891257b7c96af210fd7752621cbf37ed2c1aba
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Thu Jan 17 11:46:59 2013 +0000

    Add help strings to config file options in Quantum code.
    
    Fixes bug 1094989
    
    Change-Id: Ic8f875b41871c79be6a26b829a5af6d3e95b6052

commit 9822732287ddbe5898a426b3b33849ecd5574a8b
Merge: ab5a681 1a76d75
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 18 13:04:12 2013 +0000

    Merge "Add a common test case for Port Binding Extension"

commit ab5a6818d0bcbe0a3bf08970ad04e1b0bea67c27
Author: Robert Collins <robertc@robertcollins.net>
Date:   Fri Jan 18 16:27:46 2013 +1300

    Document that code is on github now in README.
    
    Change-Id: I1c50fabdee9fc3f6cffc24025e75d48ed1f65dc2

commit c13eff55be51ea34f2f6ac96dfd620a728575865
Merge: 10901ca e38e058
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 19:45:41 2013 +0000

    Merge "Config lockutils to use a temp path for tests."

commit 10901cac775632db0f522238ece048789410bb68
Merge: f35ee59 3964475
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 18:57:56 2013 +0000

    Merge "Update Oslo rpc module"

commit f35ee596c219b3384ab99d8ed7fbe77ae6b8d9d4
Merge: 6af8816 e3ddd34
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 18:50:04 2013 +0000

    Merge "More unittests for quantum.api.v2.base"

commit 6af8816b5d6122ca03419478fd33e58e5218af87
Merge: 42633d2 8adb519
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 18:48:46 2013 +0000

    Merge "Provide atomic database access nvp plugin"

commit 42633d272bb15d01f7b9276106c07e2b73feb983
Merge: c4004b6 b450b33
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 18:47:47 2013 +0000

    Merge "Fix downgrade revision to make db migration linear"

commit e38e0580ed91cbb41683ca5386bc65ccbc1999c2
Author: Maru Newby <mnewby@internap.com>
Date:   Thu Jan 17 18:42:37 2013 +0000

    Config lockutils to use a temp path for tests.
    
     * Tests for iptables_manager were leaving lockfiles in the source
       tree due to the default lock path being in the openstack common
       tree.  This patch sets the lock_path option to an empty string
       for unit tests to ensure that a temporary location is used
       instead.
    
    Change-Id: I5d36dca8cfeba991dfe0803e536d3d74dd2ffe7f

commit b450b3372c9793196d83301412d1fb90ee78900e
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Jan 17 22:19:45 2013 +0900

    Fix downgrade revision to make db migration linear
    
    Fixes bug 1100767
    
    The recent commit 7999282 creates db migration branches.
    The migration timeline should be linear and this commit fixes it.
    
    Change-Id: I94e1088352112e8c6ec989a54df83e61797b38c5

commit c4004b6d97e995a8375affbb70cc5884da5214bc
Author: Julien Danjou <julien@danjou.info>
Date:   Fri Jan 4 16:29:20 2013 +0100

    Send notification on router interface create/delete
    
    This fixes bug #1060985 for Quantum
    
    Change-Id: I39d2d15340913dd0fad753c3e95fb74d329481a9
    Signed-off-by: Julien Danjou <julien@danjou.info>

commit 7fa80862571060e27ab5aedf34dcedaa46c21a7e
Merge: 688cb1d 26332dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 09:40:21 2013 +0000

    Merge "_validate_security_groups_on_port was not validating external_ids"

commit 688cb1d514e9f19a12f892200fa1f60ef76fa056
Merge: e2b9b0d c58bdd3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 07:44:30 2013 +0000

    Merge "Refactor hyperv plugin and agent."

commit e3ddd3452113331772c436430aa986d1940a0b7f
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Dec 12 14:50:59 2012 +0800

    More unittests for quantum.api.v2.base
    
    Added unittests for the below methods
    * quantum.api.v2.base._fields()
    * quantum.api.v2.base._filters()
    * quantum.api.v2.base.create_resource()
    
    Fixes bug #1092399
    
    Change-Id: Icdddb3a201b4bc577378e78c7a7cd48486a2d57a

commit e2b9b0df3838cbd7cefcb3a714e285510238769a
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Sat Dec 22 06:26:05 2012 +0800

    Fixes inefficiency in quantum.api.v2.base._filters
    
    Use iteritems() instead of getall() on request.GET
    
    Fixes bug #1092995
    
    Change-Id: Ic0b5e3d7c7b1ddd072d9fe918ea22a8e9aef9ee4

commit c58bdd3c40b6e0d6819338d11e5f371ae01c4f47
Author: gongysh <gongysh@cn.ibm.com>
Date:   Wed Jan 16 11:26:32 2013 +0800

    Refactor hyperv plugin and agent.
    
    Remove unused imports.
    Add an empty tunnel_sync method so that we can run ovs-quantum-agent
    with the hyper-v plugin when we are using vlan networks.
    
    Change-Id: I94b1d0cf188d0a1e03e0948708975594f2615fbf

commit 3964475a0b5968eeaba6bd15f6f948b0e0ffebad
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jan 17 13:00:46 2013 +0800

    Update Oslo rpc module
    
    Updates rpc/impl_qpid and rpc/impl_zmq
    
    Change-Id: Ie1b2a9d9dc3228528c501ef92d3db2133c3fe127

commit 8adb519ad6a460d75f7221115f67f1609fd89b73
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jan 10 13:36:35 2013 -0800

    Provide atomic database access nvp plugin
    
    * This patch ensures that if multiple queries are done against the
      database they are atomic.
    * Removes outdated doc string comments.
    * Changes update_network so that it doesn't update the network name in nvp
      since the name is retreved from the database.
    * Fixes get_network to return the correct status from nvp. Previously,
      it was always returning ACTIVE.
    Fixes bug 1097990
    
    Change-Id: Ie3eb67c98dcb36b18cbef2e0905b59eba48ca81d

commit 26332dcbd8c25fb581c27ced1eb175bcd209c1fa
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jan 9 15:08:02 2013 -0800

    _validate_security_groups_on_port was not validating external_ids
    
    The function _validate_security_groups_on_port was not validating a ports
    security group id if the id was an external id. The unit tests now use
    set_override() rather than setting cfg values directly. Lastly, quantum.conf
    now has the proxy_mode option exposed.
    Fixes bug 1095864
    
    Change-Id: I0ec7f9ed36f1a46156c47a115be936bb41ef75d9

commit ec720bafcb926575e21bf1db12f7e6ebd0f3c376
Merge: cb3384f dfebeb7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 17 01:20:52 2013 +0000

    Merge "Ensure that agents also set control_exchange"

commit cb3384fd673295ad83c3dbfad0de6e325827e4ae
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Wed Jan 16 15:56:40 2013 -0500

    Update WebOb version to >=1.2
    
    The other projects have merged changes to accept
    WebOb>=1.2 now, so update Quantum to use the same
    version.
    
    See bug #1092227 for details.
    
    Change-Id: I0969752910b92209408d956f633ad2ccacc7fa46
    Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>

commit 22aed094f08cc44ac1c5722597e91d966a0cd366
Merge: 7999282 4970636
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 16 20:44:27 2013 +0000

    Merge "Fix ATTR_NOT_SPECIFIED comparison errors"

commit 7999282ea0d857cb0683ae2c3a9c32e87a79898c
Merge: d8b0f10 2d4431d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 16 20:41:45 2013 +0000

    Merge "Add migration for network bindings in NVP plugin"

commit dfebeb7fe8b5e70b2ec2f38950d8a1cb0f97363d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jan 16 16:28:44 2013 +0000

    Ensure that agents also set control_exchange
    
    Fixes bug 1100357
    
    Change-Id: I6302edecf851588762d39c99d2f7b2e18ba04bc7

commit 1a76d75d07cfcb59f1437cb25db793acdb6148f6
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Jan 16 11:13:15 2013 +0900

    Add a common test case for Port Binding Extension
    
    This commit merges the test cases for Port Binding Extension in
    Linux Bridge plugin and Open vSwitch plugin into a common one.
    It makes it easier for each plugin to support the port binding extension.
    
    This commit also adds binding:capabilities attribute to OVS plugin.
    Note that binding:capabilities is under discussion and it may be changed
    in the future. This change is done just to make OVS plugin support
    same as Linux Bridge plugin and pass the common unit test for the extension.
    
    blueprint vif-plugging-improvements
    
    Change-Id: Idc38ea65fe2059e23814d94cd0a0f11a09d1f43e

commit d8b0f10ec7a5e0726d1b09e84e6cc388d957ba03
Author: David Ripton <dripton@redhat.com>
Date:   Wed Jan 16 09:14:19 2013 -0500

    Fix line endings from CRLF to LF.
    
    Fixes bug #1100234
    
    Change-Id: Idb28558547b69ed4ad64334651405dc70fa9ddb3

commit 20894c305c129e0fc7f8f21cdc339eb301024361
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Jan 16 11:36:22 2013 +0800

    Fixes import order nits
    
    Change-Id: Ide6dff579a126c9af5b593f9ce541873a7643415

commit 0327c222c6ecdf3f48b64f1b253a8f605cf6b3c0
Merge: 1013c9a 2f7a55b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 16 04:58:19 2013 +0000

    Merge "NEC OpenFlow plugin supports L3 agent RPC"

commit 1013c9a24f1a3eab5795203502f05f9dc6d83123
Merge: 2bd3712 53a787d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 16 04:47:09 2013 +0000

    Merge "Catch up RPC context fixes on NEC OpenFlow plugin"

commit 4970636e210dd3a7088a8f729df6fdff92c02fb7
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jan 3 10:40:16 2013 +0800

    Fix ATTR_NOT_SPECIFIED comparison errors
    
    Fixes bug #1099663
    
    Replaced equality operators used with ATTR_NOT_SPECIFIED to 'is' or 'is not'.
    Used is_attr_set() where comparsion is done to None and ATTR_NOT_SPECIFIED.
    
    Change-Id: I67c87051b46ca0518fa777cbb1c3e6141a533b61

commit 2bd37127bd863ebf48d997ba14eb18c4d82d0af5
Merge: 9420851 0748f92
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 15 21:05:47 2013 +0000

    Merge "Update latest OSLO."

commit 94208514cf9384a3bc622c54edd80ddbcef70a7e
Merge: 98b05bc 8308201
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 15 17:59:45 2013 +0000

    Merge "Adding multi switch support to the Cisco Nexus plugin"

commit 2d4431d7bc6b7ab362ce2cf084b901be45c51c2f
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jan 15 07:49:04 2013 -0800

    Add migration for network bindings in NVP plugin
    
    Bug 1099895
    
    Ensures the table nvp_network_bindings is created when upgrading
    database to head, by adding an appropriate alembic migration
    
    Change-Id: I4a794ed0ec6866d657cb2470d5aa67828e81aa75

commit 2f7a55b33927dbf9200f5e043b44b7e4e28d9988
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Dec 31 05:25:06 2012 +0900

    NEC OpenFlow plugin supports L3 agent RPC
    
    Fixes bug 1099879
    
    Change-Id: Icbe1d686fea2f821e55c4a25916361dbfe9ad380

commit 0748f92e44461ef3b3c46a89426692d2643f85fe
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jan 15 13:00:03 2013 +0000

    Update latest OSLO.
    
    Changes include:
    1. Removing the 'extras' in the pip-requires
    2. Fixes for fake implementations for RPC calls
    3. Version updates due to common version update
    
    Change-Id: Iefd32b3f7d529943b078e6d927d06043286ff94e

commit 53a787d258fe26cfd24578f6c84d28eb4b90648f
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Dec 31 05:58:36 2012 +0900

    Catch up RPC context fixes on NEC OpenFlow plugin
    
    Fixes bug 1099179
    
    Change-Id: Ib61081c3aaed8770906dd57874c45358b0418c3f

commit 98b05bc5d8b42e6ddc12b363f38cb9d37e94add6
Merge: 00f4943 d77376e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 15 03:00:48 2013 +0000

    Merge "ensure all enums in loadbalancer models have names"

commit 00f49433220782b4b6741eaf53d80d2f1fc2ac59
Merge: fc0a9ed 9db6917
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 15 02:36:52 2013 +0000

    Merge "Optimize if/else logic in quantum.api.v2.base.prepare_request_body()"

commit fc0a9ed634c9969bd54fd4dbfb5bec3d989d23c5
Merge: 699112a ba12d3e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 15 01:03:38 2013 +0000

    Merge "Adds support for deploying Quantum on Windows"

commit 699112a35f9f46c64402dd76fabab9bf1f06627e
Merge: 3a1973e 2d9e479
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 14 22:47:26 2013 +0000

    Merge "Adds a Hyper-V Quantum plugin"

commit 3a1973e4b146da8539db2e9fc8b0b336b05aa994
Merge: bc5e987 d60f6ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 14 22:27:29 2013 +0000

    Merge "Name the securitygrouprules.direction enum."

commit d77376e315127aa62ee2e80f4f0815358856bbd1
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Jan 14 15:31:37 2013 -0500

    ensure all enums in loadbalancer models have names
    
    fixes bug 1099565
    
    Postgres requires that enums types have names.  This fix adds the name
    parameter to the Enum declaration.
    
    Change-Id: Ica67c6cf0b8959761f3022552c1c6a807a4ced82

commit 830820184ae761597b743dd596a4e40dff8796ef
Author: Arvind Somya <asomya@cisco.com>
Date:   Mon Jan 7 18:40:59 2013 -0500

    Adding multi switch support to the Cisco Nexus plugin
    
    This commit adds intelligent multiple nexus physical switch support for the Cisco plugin.
    The plugin also has been modified to scan for the host when an instance is created and
    selectively trunk VLAN's for the port for that host only. It also deletes VLANs from nexus
    switches when no longer required.
    
    Implements: blueprint cisco-plugin-enhancements
    
    Change-Id: I6275eb1815310d0d5a8123ca2edbc0a0937718e9

commit bc5e98710ffbab2848d54bb7aae16ef18f7a043d
Merge: ca7c783 d5526d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 14 17:56:46 2013 +0000

    Merge "Add exception validation for subnet used."

commit ca7c783ea97ff5fec8782a32bff373157daa06dc
Merge: 90747ff 6cd4789
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 14 17:56:42 2013 +0000

    Merge "Remove accessing cfg.CONF.DATABASE in nec-agent"

commit d60f6efd7f70efba1ccd007d55b1fa740fb98c76
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Jan 14 12:26:36 2013 -0500

    Name the securitygrouprules.direction enum.
    
    Updates to the SecurityGroupRule model and migration so that we
    explicitly name the securitygrouprules.direction enum. This fixes
    'Postgresql ENUM type requires a name.' errors.
    
    Fixes LP Bug #1099267.
    
    Change-Id: Ia46fe8d4b0793caaabbfc71b7fa5f0cbb8c6d24b

commit ba12d3eb9372e0aee2830c73a0554cf3d6588ba0
Author: Alessandro Pilotti <ap@pilotti.it>
Date:   Sun Jan 6 17:27:07 2013 +0200

    Adds support for deploying Quantum on Windows
    
    Some changes in setup.py are required to properly handle dependencies
    and data files on WIndows (including Hyper-V server).
    
    A console script called "quantum-hyperv-agent" has also been added to
    start the Hyper-V agent
    
    Change-Id: Ifac2d33afabac242d9dab87b0bc1764421efc16f

commit 2d9e479eb3d5dd3d957fdbccf6d7fd3f5d82ad34
Author: Alessandro Pilotti <ap@pilotti.it>
Date:   Fri Jan 4 20:32:09 2013 +0200

    Adds a Hyper-V Quantum plugin
    
    Blueprint quantum-plugin-hyper-v
    
    Initial Hyper-V Quantum plugin including VLAN support.
    Support for NVGRE networking will be added in a subsequent patch.
    The plugin architecture relies heavily on the OVS plugin, with some
    design differences to handle different network types via polymorphism.
    
    The plugin contains two main components:
    
    The plugin itself, to be executed on Linux or Windows
    The L2 agent, to be executed on each Hyper-V node
    
    L3 networking is currently handled on Linux with the existing agents.
    
    A Nova Quantum Vif plugin is included in the Nova project.
    
    Change-Id: Ie64bff448e3fb1129c5e24baaf148cdcc0aed8b9

commit d5526d6cc5f0ad6c724a21468661d5d6d9654cd2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jan 14 10:01:20 2013 +0000

    Add exception validation for subnet used.
    
    As a result of bug 1093754 there was no validation of the actual
    exception returned.
    
    Change-Id: Ia3104ca523d30ea40c354afa62ed5ce2b88d5b7e

commit 90747ff03781e239da4a80099c6ea8b5e83bac49
Merge: 01f3b1f 35a90fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 14 09:08:15 2013 +0000

    Merge "Remove unsused imports in the plugins package"

commit 6cd4789008af6f148814b948980262e4d8fab0ed
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Jan 14 02:57:33 2013 +0900

    Remove accessing cfg.CONF.DATABASE in nec-agent
    
    Fixes bug 1099162
    
    The database configuration was moved to the common DB module.
    There no longer needs to access database configuration in the
    plugin specific code.
    
    Change-Id: I4b80ea1e84ffa06d0fffa7f8ccdee08a5b77e239

commit 01f3b1f438a5a52fbc812a2c83e8d19e5fbbc928
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sat Jan 12 21:42:32 2013 +0900

    Inform a client if Quantum provides port filtering feature
    
    Part of blueprint vif-plugging-improvements
    
    Quantum and Nova have duplicated functionality of packet filtering
    such as security groups and anti spoofing filters.
    By passing information whether Quantum supports the port filtering feature,
    Nova VIF driver can skip its own packet filtering setup.
    
    It is based on Daniel's advise in https://review.openstack.org/#/c/19436/
    
    Change-Id: Ifd260cb61aa3990251510a4a3fe15454d8d584df

commit 8a2b9989afab77d0757b5cf2bb926c8259c5d400
Merge: ed96277 b44314f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 13 12:26:01 2013 +0000

    Merge "DHCP agent unable to access port when restarting"

commit 35a90fc13ad2dd80f5600e249c7dec77b4b2c4cc
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Sat Jan 12 18:20:52 2013 +0200

    Remove unsused imports in the plugins package
    
    Config imports are needed for correct init
    quota_db is required to make sure quota database model at the proper timing
    
    Change-Id: I885ed1f673cfc4c6331818ad68e2a505f7d69188

commit ed9627741a16ddc75fd1bf9090dc482fe0ec6b86
Merge: b07504f 9247776
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 13 11:07:39 2013 +0000

    Merge "Remove unused imports in unit tests"

commit b07504f8874d78606ef42056af33348531ce801d
Merge: 5fd16af 2b75d6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 13 10:55:54 2013 +0000

    Merge "Fixes quantum.api.v2.base._filters to be more intuitive"

commit b44314fdedabb1f3afc3af614e38a9438bef468a
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jan 13 09:58:55 2013 +0000

    DHCP agent unable to access port when restarting
    
    Fixes bug 1099072
    
    The security groups would return an exception for invalid port ownership.
    
    Change-Id: I8c48adce30b160bd776b5e68bc321e3a2e8cbce2

commit 5fd16af68850aaf49200a39adff855c6a0947448
Merge: de99585 faa1733
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jan 13 02:16:42 2013 +0000

    Merge "Use default_notification_level when notification"

commit 924777645a189dfdd4510d578941ae408d5e1a41
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Jan 2 22:40:36 2013 +0200

    Remove unused imports in unit tests
    
    Change-Id: I10401bc240b2a7aebe6317067dafe8bfe35264f8

commit faa1733ef0adfdfb3e625d60d96b08ce764ca824
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Jan 8 16:57:23 2013 +0900

    Use default_notification_level when notification
    
    Fix bug 1089773
    
    Notifications in quantum api do not honor default_notification_level
    in quantum.conf and always use INFO level. On the other hand
    dhcp-agent refers to default_notification_level.
    If default_notification_level is set to a value other than INFO,
    dhcp-agent cannot receive notification from quantum server.
    
    Change-Id: Ie3ae576d62e91651aa59b2324ec114716181107f

commit de99585d4feef9c73020a8b1c53fb719f604556a
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jan 7 13:52:21 2013 +0000

    Latest OSLO updates
    
    Change-Id: Ibf223203c8b34f614357fa4539d0dfa953765d6b

commit 939200d35de50b221c0c5a986cf29dfa30db1e1f
Merge: 3575190 cfcbc7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 12 00:40:04 2013 +0000

    Merge "Port to argparse based cfg"

commit 3575190ca17eb83b504401fb15dfb73679cdba55
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jan 10 14:40:33 2013 -0800

    NvpPluginException mixes err_msg and err_desc
    
    In a few places err_msg was passed to NvpPluginException though that
    expected err_desc. This patch makes NvpPluginException take err_msg
    instead and updates err_desc to err_msg when calling NvpPluginException
    
    Fixes bug 1098351
    Change-Id: I10eca5f2b98ce8faa81ad7c7687902b6f08752c1

commit 7de5d67c07d85b37b8935efc62a0944f1c0bacfe
Merge: f3716e7 d97cf0a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 11 09:51:11 2013 +0000

    Merge "Fixes i18n messages in nvp plugin"

commit f3716e7f957850ae5de639076f0a48ecfe03f372
Merge: ee7d1cb 3558d44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 11 02:54:51 2013 +0000

    Merge "Fix for loadbalancer vips list"

commit d97cf0a1a024526207ae4ba1c9cc68bea40e30cc
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Jan 4 12:53:32 2013 -0800

    Fixes i18n messages in nvp plugin
    
    Fixes bug 1096205
    Change-Id: Icb34b567a8630bb7247b2bb2d6efaf53269bf84b

commit 9db691728e751a5605907617f570cbf0ffad7e99
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Jan 2 19:46:17 2013 +0800

    Optimize if/else logic in quantum.api.v2.base.prepare_request_body()
    
    Removed redundant checkups of variables
    
    Fixes bug #1096932
    
    Change-Id: Icdee0e946a77865928b942d3248e39e771af0656

commit 2b75d6be2cc3bdd0621a198619ee6e1c7a2ff90f
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Dec 19 11:31:25 2012 +0800

    Fixes quantum.api.v2.base._filters to be more intuitive
    
    Converts values in one place and sets dictonary according to the return value
    
    Fixes bug #1092977
    
    Change-Id: I05dd9b24a8ab20f8c302c22f5bdda2a80ec90e19

commit ee7d1cbdaae8faa307f497b4e1bf10bffc90af0c
Merge: 20ea05f 2e4ec7a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 10 16:25:37 2013 +0000

    Merge "rename port attribute variable to SECURITYGROUPS from SECURITYGROUP"

commit 3558d4445974bd5fd29562254893f9c24d8ccc56
Author: Ilya Shakhat <ishakhat@mirantis.com>
Date:   Thu Jan 10 19:51:40 2013 +0400

    Fix for loadbalancer vips list
    
    Fixes bug 1098165
    
    Change-Id: I86106d39afc9d5d8c6d2d0bbdcd829baf2c1b66b

commit 2e4ec7a8e81f49bdf38ad06498ec9caf8292a859
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Jan 9 14:24:47 2013 -0800

    rename port attribute variable to SECURITYGROUPS from SECURITYGROUP
    
    This patch renames the port attribute variable to the plural form since
    multiple security groups can be associated with a port. This patch does
    not change the security groups api and also does not change the
    configuration section name to be SECURITYGROUPS.
    Fixes bug 1095885
    
    Change-Id: I1a4df337b48da0ef9c94d74b04c0b86333ce2f0c

commit 20ea05f5d230d1bf9e70c9cc79a1089c2e4595df
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jan 3 16:52:42 2013 -0800

    Remove relative imports from NVP plugin
    
    The majority of relative imports in the nvp plugin will be fixed in
    blueprint nvp-api-client-loadbalance-request. This patch removes the
    rest of them in and moves the vim tabstop line to the top of the
    header file to be consistent with the rest of the files in quantum.
    Fixes bug 1091596
    
    Change-Id: I6c8299ca73ae5df75c87f302680908f863f81f02

commit cfcbc7a66fd136fc4cf910c213d43c65b3900691
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jan 7 13:25:26 2013 +0000

    Port to argparse based cfg
    
    Implements blueprint argparse-based-cfg
    
    Sync the following changes from oslo-incubator:
    
    479f19c Add deprecated --logdir common opt
    27b2ff4 Add deprecated --logfile common opt.
    9b81289 Allow nova and others to override some logging defaults
    3557d84 Fix ListOpt to trim whitespace
    01ab910 Fix set_default() with boolean CLI options
    af18eaa Improve cfg's argparse sub-parsers support
    f21e1d9 Fix regression with cfg CLI arguments
    ceb4aa7 Fix broken --help with CommonConfigOpts
    5e9503b Hide the GroupAttr conf and group attributes
    b6d24bb updating sphinx documentation
    403509e Don't reference argparse._StoreAction
    e17deb8 Fix minor coding style issue
    0c29e1d Remove ConfigCliParser class
    5b9cb41 Add support for positional arguments
    dbc72a6 Use stock argparse behaviour for optional args
    768a147 Use stock argparse --usage behaviour
    ac180b9 Use stock argparse --version behaviour
    0787e38 Remove add_option() method
    5afead0 Completely remove cfg's disable_interspersed_args()
    5f564b2 argparse support for cfg
    d7b6397 Add a missing comma in a docstring.
    aca1805 cfg: fix required if option has a dash
    
    Note: various utilities/services with command line parameters needed to be
    updated due to the changes mentioned above. The downside is that these are
    not backward compatible. Unknown arguments are no ignored. Only bound
    arguments will be treated.
    
    Thanks to Mark McLoughlin for migration cli code changes.
    
    Change-Id: Ia776e78cc55f4ed33ace5efa8d726b70e3fa4131

commit 2a43694b5311372a0c67b2887f96926450693aad
Merge: 233fa85 76b8722
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 9 16:22:00 2013 +0000

    Merge "Allow nvp_api to load balance requests"

commit 233fa8524e5381fe58eb2b0ec4b361842d7d6f72
Merge: 5b6c251 fab8026
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 9 15:47:12 2013 +0000

    Merge "Fix database configuration of ryu-agent"

commit 5b6c2511a1f510c2c8b8e4288efd1a936387ed41
Merge: 9b27735 3aecb35
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 9 07:02:19 2013 +0000

    Merge "Pass X-Forwarded-For header to Nova"

commit 9b277354f5ee18227eed20b9b4763f28b3b6f2c8
Merge: 666c5df b7a08c5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 9 07:02:13 2013 +0000

    Merge "add migration support for lb security groups"

commit fab80263fa64fe0ce35a5bc183478f3f0e73b0fb
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Tue Jan 8 17:49:47 2013 +0900

    Fix database configuration of ryu-agent
    
    Fixes bug #1097156
    
    The database configuration was moved to the DB module.
    This patch makes ryu-agent follow it.
    
    Change-Id: Ib843132eb1a01769725dd89b1e1799c9d10790d3

commit 3aecb35d6859f17553b0241e71c137bc933aca37
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 8 19:18:58 2013 -0500

    Pass X-Forwarded-For header to Nova
    
    fixes bug 1097524
    
    Add X-Forwarded-For header to the proxied Nova metadata request. Nova
    needs this value to properly answer /latest/meta-data/local-ipv4
    requests.
    
    Change-Id: Icaec38b2ca7e06b50960deb7ab24ff1944a81f45

commit 666c5df3cad07eebe156f7eae59c1ea439226c6e
Merge: f14af5d 220b3f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 22:27:29 2013 +0000

    Merge "The change implemented Lbaas CRUD Sqlalchemy operations."

commit 220b3f265681891c2dfd7cc1d2548457a5a44ad2
Author: Leon Cui <lcui@vmware.com>
Date:   Wed Dec 12 16:04:24 2012 -0800

    The change implemented Lbaas CRUD Sqlalchemy operations.
    
     - This change only contains the database access implementation
     of LBaaS API. There is no real configuration down to device
     side.
     - This change implements a loadbalancer plugin which doesn't
     do much thing but only db access. The object status needs to
     be updated when integrate with the lbaas agent.
     - This change follows the new LBaaS API 1.0 model. Please see
     the spec on wiki.
    
    Implements: blueprint lbaas-plugin-api-crud
    Change-Id: I1bccec8c29e3e9486506a5b52ce69af0480b2300

commit f14af5dc755706c7297a96fa504acdfe15ac1957
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Nov 7 11:00:53 2012 -0800

    Iptables security group implementation for LinuxBridge
    
    Implements bp quantum-security-groups-iptables-lb
    - Added firewall driver
    - Added iptables based firewall driver
    - Implemented security groups for rpc support mixin classes
    
    Change-Id: I974d2f1cae75ce4a55c2b5d820a0b42ff5661309

commit 7bbc9942d6c6131a5538b2df373f3a554b9fb4be
Merge: 33a355a 83c12eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 17:54:01 2013 +0000

    Merge "Update the migration template's default kwargs"

commit 83c12eb749fffade68c1fc28d3a829f36f3cdd0c
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 8 11:16:17 2013 -0500

    Update the migration template's default kwargs
    
    fixes bug 1097327
    
    The default template should accept options as a keyword instead of
    specific quota parameter.
    
    Change-Id: I65ceaccea9e764941a1d3f6ba243a2107379e42e

commit b7a08c5c88f484fbdfaa5c3abe980f053d1d3606
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Jan 8 00:15:58 2013 -0500

    add migration support for lb security groups
    
    This is a companion change for the security group models.
    
    Change-Id: If8a75004ddb4e20fb8491529ac7098828edb5c7d

commit 33a355a9332d819d7106317b2816f37b0652c096
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jan 8 11:15:17 2013 +0000

    Fix import for quantum-db-manage
    
    Fixes bug 1097235
    
    Change-Id: I4d44edcfa8efe910f0237fb6248b2f14e734141b

commit 5f74f5063511054f0de929c84d651de826970994
Merge: ad693c8 3eb2cfc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 07:49:20 2013 +0000

    Merge "API extension and DB support for service types"

commit ad693c80f8e9c0446b4be0bbb786fb5352fb60b3
Merge: ae27cf9 c0b3a31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 07:49:14 2013 +0000

    Merge "Remove some unused imports"

commit 76b872266665b070663e8eef9b4778ff8b523cb5
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Oct 30 21:35:42 2012 -0700

    Allow nvp_api to load balance requests
    
    The current version of the nvp_api client does not load balance
    requests across multiple controllers. Instead, it just sends all the requests
    to one controller and if there is a controller failure it will failover
    to use another controller. This blueprint implements the ablility to
    utilize all controllers at once.
    
    blueprint nvp-api-client-loadbalance-request
    
    Change-Id: I331be2a23ae360a95786152d5f116359f690d9f3

commit ae27cf9b5ec1c9928aefd8994d520eb72a8ff418
Merge: e0ae6aa dbf0b22
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 04:10:36 2013 +0000

    Merge "Add migration support to Quantum"

commit e0ae6aa5981cc9aecfb206861b6e02e0d2cbf063
Merge: 005251c 31f09ab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 8 03:47:00 2013 +0000

    Merge "refactor QuotaV2 import to match to other exts"

commit 3eb2cfc011a7be4060c9232bc804869dd4673ca7
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Dec 7 06:33:48 2012 -0800

    API extension and DB support for service types
    
    Blueprint quantum-service-type
    
    This patch allows for managing service types through the API.
    The default service type is specified in the configuration file.
    The patch also provides a 'dummy' API extension, which uses the
    'dummy' service plugin, as a PoC for usage of service type.
    The dummy API extension is used in unit tests only.
    
    Change-Id: I97d400b941fa7925b0efa0fd0d35c07419ff6bfa

commit dbf0b22abb5a55e3bab5eb335eb47cd843a7a43d
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Dec 18 13:27:39 2012 -0500

    Add migration support to Quantum
    
    implements blueprint quantum-db-upgrades
    
    This changeset provide database migration capabilities to Quantum by
    wrapping the Alembic library.
    
    Change-Id: I8ba3a07f5a65e0fda9c0e85ed9c07c5978c53bc7

commit c0b3a318d4bec861e381f22b72b86fa6e2cf3d5d
Author: Mark McLoughlin <markmc@redhat.com>
Date:   Mon Jan 7 21:23:41 2013 +0000

    Remove some unused imports
    
    optparse is unused since 0c0d8f0 and os is unused since f6bc5d0.
    
    Change-Id: I32357293712d30774108041b039410b68a5eb7e0

commit 005251c3b88606013bc9526c0ef32b01e52b08c9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jan 7 12:17:09 2013 -0800

    Undo change to require WebOb 1.2.3, instead, require only >=1.0.8
    
    This allows ceilometer to use 1.2.3, without breaking devstack for
    quantum in the mean time.
    
    See bug #1092227
    
    Change-Id: I1d1b4c0b6dbb917ddf785bdf7ce90be9beb6540c

commit 56b5d21ca65fddd4f7b24770494d6bb34ac5e65c
Merge: be3b5dc 65c9894
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 17:57:21 2013 +0000

    Merge "Ensure that exception prints UUID and not pointer."

commit be3b5dcd6ddaae809ef1b1e18bf47703deaf74a8
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jan 6 07:22:45 2013 +0000

    Add common support for database configuration
    
    Fixes bug 1096537
    
    Change-Id: I9b7dbc08ae709af81ca968857f7028c150d2c7e5

commit 43e2a72f213a0b56dff2b4b9ed4d25f80a47bd8a
Merge: 0a9f96c 412a5c8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 13:11:50 2013 +0000

    Merge "Cleans up bulk_body generation in quantum.api.v2.base.prepare_request_body()"

commit 0a9f96c41ad1f47548b67ef5611ae7619b68c1f5
Author: Kiall Mac Innes <kiall@managedit.ie>
Date:   Mon Jan 7 11:22:31 2013 +0000

    Fixup import syntax error in unit test
    
    Change-Id: I12f4d94474a31d25819fe24b70676f81c52bd022

commit c3706fa2909bee2060dbbcc5045d64691fe6fdef
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jan 6 06:49:57 2013 +0000

    Enable the user to enforce validity of the gateway IP
    
    Fixes bug 1096532
    
    A new configuration variable is added to enable the user to indicate
    if the gateway should be validated on the subnet. For backward
    compatibility this is set as False by default.
    
    Change-Id: Ieadd60a945d34703bfee7576aa3b2ff7da3143d4

commit c2447acb060fb483c1b2dec8d26395cd13b5d678
Merge: 3027661 5f0aead
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 06:55:53 2013 +0000

    Merge "Fix the replacement placeholder in string"

commit 3027661d38404180c92c84f87ce265a7e63612ce
Merge: e0e5101 972918a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 7 06:55:45 2013 +0000

    Merge "Add comment to indicate bridge names' length"

commit 972918a6438870c4d1578237688f26c12f2f659b
Author: gongysh <gongysh@cn.ibm.com>
Date:   Mon Jan 7 10:48:46 2013 +0800

    Add comment to indicate bridge names' length
    
    Bug #1096652
    
    Change-Id: Ic814b59da131fba488b728eb3b67864712cde141

commit 31f09ab2ec394f98c6d2d37f9588a37a0d9eaf92
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sat Jan 5 19:28:35 2013 -0500

    refactor QuotaV2 import to match to other exts
    
    fixes bug 1096486
    
    The previous code used a special extension loading mechanism to
    selectively load the Quota model is the plugin matched and object path.
    This was intended to load models required by plugins, but this loading
    actually occurred after the db schema was created, so the model was not
    always loaded.  This fix refactors the code to make the QuotaV2 ext
    behave similarly to the other extensions ensuring the models are loaded
    prior to database schema creation.
    
    Change-Id: Id7d1f7ddee69bfc4419df375366319dedc3dc439

commit e0e5101b876f7754e13d7bd8e045438f0c966af2
Author: gongysh <gongysh@cn.ibm.com>
Date:   Mon Jan 7 10:12:00 2013 +0800

    change xxx_metadata_agent() into xxx_metadata_proxy()
    
    Bug #1092047
    
    Change-Id: Ic59da98105a7301697ecb5a6477f3c7fc3f8e86a

commit 5f0aead4e4c42f16b0f32870bd7fa952d219945b
Author: gongysh <gongysh@cn.ibm.com>
Date:   Mon Jan 7 09:52:29 2013 +0800

    Fix the replacement placeholder in string
    
    Bug #1096721
    
    Change-Id: Ief6f410e4532772af3f9775b48ce92ac901f812d

commit 65c989433b8d81c7e070e1e5977536956cb7175c
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jan 3 13:51:42 2013 +0000

    Ensure that exception prints UUID and not pointer.
    
    Fixes bug 1095648
    
    Change-Id: I3effbc2e93d143ba7a5c3b047c1618f165c1b0b6

commit 2a10cd2b6c46ccff6bcfacfd3cebfb3b92fdb6f8
Merge: f179999 d9671f7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 5 03:43:00 2013 +0000

    Merge "Fixes i18n message for nec plugin"

commit f1799999bce36a69c5a7925d56c28d4c71ac18ab
Merge: ff66907 3bce16a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 5 02:28:04 2013 +0000

    Merge "Fixes i18n message for ryu plugin"

commit ff66907481dcfb787ad81b26fd31abbf6af991c5
Merge: acf49b0 bc20ec5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Jan 5 02:17:09 2013 +0000

    Merge ".gitignore cleanup"

commit bc20ec5849cf463741c663735137ef6a43c6cd3f
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Jan 4 13:17:13 2013 +0800

    .gitignore cleanup
    
    Removed obsolete files/dirs
    Added .coverage and covhtml
    Ordered alphabetically
    
    Change-Id: Iac10b075f318c264549ee017688eccd52deae07d

commit acf49b034d3aa884ff6d3f520ab54fdb6668a25e
Merge: f77ed34 891cbe3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 4 10:05:48 2013 +0000

    Merge "sql_dbpool_enabled not passed to configured_db nvp_plugin"

commit d9671f7c73faf7a829a99d0d7dc16cc067313b77
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Fri Jan 4 17:07:12 2013 +0800

    Fixes i18n message for nec plugin
    
    Fixes bug 1095974
    
    Change-Id: I48394d2f791589552e6f21c56268fed7654e4bbc

commit 3bce16abeef451539b2164a0695857f4037a5af8
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Fri Jan 4 17:13:27 2013 +0800

    Fixes i18n message for ryu plugin
    
    Fixes bug 1095975
    
    Change-Id: I72bbeeb80117f4d5fcf6af9910dc881fd1b1a82e

commit f77ed34d097ffaa98b44fad2a39b12c938122596
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Jan 2 22:28:01 2013 +0200

    Remove unused imports in debug package
    
    Change-Id: I1fa599e38be86025d69649f8653f4ee28c6f3198

commit 891cbe3f48ca226ed670d1abbbf0b46af00dd46d
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jan 3 15:18:51 2013 -0800

    sql_dbpool_enabled not passed to configured_db nvp_plugin
    
    Introduced in 7b5f6fd6. Fixes bug 1095856
    
    Change-Id: I34cca7cb489013b033a7426b37bbf9989f87e7ec

commit 5d3b861b7e2e62ff5abbf21d22fc87b773cea4b6
Merge: 5dce41b d3b1f91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jan 4 01:07:29 2013 +0000

    Merge "Enable tenants to set non-owned ext network as router gateway"

commit 5dce41b7c4bf0a8ed6de072df2fe50c327d2e9b7
Merge: 01e3e1b 30a54fe
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 23:53:13 2013 +0000

    Merge "Upgrade WebOb to 1.2.3"

commit d3b1f91a43cf712c3c971de3d41f3286b3d4bdc9
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jan 2 15:04:09 2013 -0800

    Enable tenants to set non-owned ext network as router gateway
    
    Bug 1087243
    
    Avoid loading external networks subnets in tenant's context, as this
    might lead to the subnet not being found because it's owned by a
    different tenant
    
    Change-Id: Ic4c429c9e667da939ede0aa07a12c0f5a17e212c

commit 01e3e1b3a82c094e6cb5e8602e0ede7fe4b153f9
Merge: f78b0f9 3a4c7d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 16:52:56 2013 +0000

    Merge "Remove unused imports in db package"

commit 30a54fe169485fdd0dbf1b7f011f9b2d4d9c8355
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Jan 4 00:28:20 2013 +0800

    Upgrade WebOb to 1.2.3
    
    The version of WebOb being used in OpenStack was more than
    1 year old. This change updates to the latest stable release.
    
    Upgrading WebOb resolves a version conflict between OpenStack
    and Pecan, the web framework used by the Ceilometer team for
    version 2 of the ceilometer API.
    
    Refer to http://docs.webob.org/en/latest/news.html
    for the list of changes between 1.0.8 and 1.2.3.
    
    Fixes Bug #1092227
    
    Change-Id: I07707607ae2067a567e11c347cddda9c7e6bcef7

commit f78b0f9b054ef4af992613c718df65e4aeb8ebea
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jan 3 14:31:49 2013 +0800

    Logging module cleanup
    
    Replaced logging with openstack.common.log
    Removed imports where logging is not used
    
    Fixes bug #1095541
    
    Change-Id: I5b03d9697dde3ef3520f67d1d8166f7af7689551

commit b5138f28a510e797bdda67c9b2d3a6b63ba7b572
Merge: dfa8afe 03b45f8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 03:54:11 2013 +0000

    Merge "Remove unused imports in rootwrap package"

commit dfa8afec015587e86ec195c21e32d7a82dd5d360
Merge: 08955a4 cea5918
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 03:53:47 2013 +0000

    Merge "Remove unused imports in api package"

commit 08955a43d0b75a9d5bb46c5163a6a91d3bf962f6
Merge: c29a71b f40c3e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 3 03:53:25 2013 +0000

    Merge "Remove unused imports in common package"

commit c29a71bfce3211ff351033aa6132649029f63944
Merge: ca7f4fd 4ab0121
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 23:16:33 2013 +0000

    Merge "Provider network implementation for NVP plugin."

commit f40c3e5b8527c84d56b87d784d945caead62e361
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Jan 2 22:51:27 2013 +0200

    Remove unused imports in common package
    
    Change-Id: I51b5ef2e7e9d1877fc2d6e439b76eae05b048436

commit 03b45f8bc40744697e1078a41940cdf3564ac82a
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Jan 2 22:38:46 2013 +0200

    Remove unused imports in rootwrap package
    
    Change-Id: Ia52452f94236613f590bcd81bad51c9b007b3ff6

commit 3a4c7d4f76eee2d66c0718dcb2889484c24a5508
Author: Ivan Kolodyazhny <e0ne@e0ne.info>
Date:   Wed Jan 2 22:24:27 2013 +0200

    Remove unused imports in db package
    
    Change-Id: I55b2d113ad667745652e00d11b0dabac4a42324f

commit cea5918295db95ec25f256b08e91f4183e73a233
Author: e0ne <e0ne@e0ne.info>
Date:   Wed Jan 2 20:11:31 2013 +0200

    Remove unused imports in api package
    
    Change-Id: I7bb20d2b04a733f9ed5fa3792e6be7dbab325a59

commit ca7f4fdb7477b0d77d9f244bd7c568369701cad7
Merge: 7a3bdc3 e4b3874
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 20:16:55 2013 +0000

    Merge "Remove unused imports in agent package"

commit 7a3bdc3268767a5db4e60b24c36a20c94c1aabec
Merge: e3089d3 b5ea602
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 20:02:54 2013 +0000

    Merge "Set default core_plugin to None"

commit e3089d3e7d22dcd9547d03f9c96d89abd971e2da
Merge: f96531a 2d8bd42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 20:02:28 2013 +0000

    Merge "Ensure that exception prints correct text."

commit 4ab0121a59c761b12804c5583d357bc471f9e292
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Dec 18 07:44:44 2012 -0800

    Provider network implementation for NVP plugin.
    
    blueprint nvp-provider-net
    
    Implements the provider network extension support. The list of valid network
    types has been updated to reflect the types supported by the nvp plugin.
    This was necessary otherwise validation would have always failed.
    Multiple logical switches might be associated with a quantum network; the
    first logical switch will always have the same id as the quantum network.
    Also now raises exception when port limit on overlay network is reached.
    
    This patch also adds a check for the maximum number of ports on 'standard'
    overlay networks, and performs some code refactoring for improving
    maintanability. For instance the NVPCluster class has been moved into its own
    module.
    
    Change-Id: Ib26d327daf748cfcba9ca74e8dc2e8e89c676c2e

commit e4b3874ff15b491ad02627afc00c0fc92f2eccc3
Author: e0ne <e0ne@e0ne.info>
Date:   Sun Dec 30 22:21:34 2012 +0200

    Remove unused imports in agent package
    
    Change-Id: Id0286e5e866512eb0c939515949e21a71089e542

commit f96531a05653216e68f005127e3ec952fdc348f8
Merge: a924d6f 5d41c5c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 17:46:34 2013 +0000

    Merge "Implementing string representation for model classes"

commit a924d6f92639a7779c250c59dd1749a091807c0a
Merge: 8061a78 a40781b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 17:46:25 2013 +0000

    Merge "Ensures that the dnsmasq configuration file flag is always set"

commit b5ea60252f3421beb1bf1d82ca95757d383058f5
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Dec 31 16:03:21 2012 +0000

    Set default core_plugin to None
    
    Fixes bug 1093989
    
    Change-Id: Ib0b77994b813e6b2ec0621949371c66d66472896

commit 2d8bd42c1e9570f5fa7c3cfaa0c4bc613d7748c3
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jan 2 15:31:25 2013 +0000

    Ensure that exception prints correct text.
    
    Fixes bug 1095333
    
    Change-Id: I5077108de8dacaab4bcf0d7236123f960676d591

commit 8061a78a96ecf0e82265844bec36f9beab865caa
Merge: e2a2cf6 7de8e37
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 14:03:12 2013 +0000

    Merge "Ensure allocation pools are deleted from database"

commit e2a2cf602a7cea8f8ccf3e27a7b0d35e18216e6b
Merge: 56c9f8f 201a71a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 13:26:11 2013 +0000

    Merge "Correct exception output for subnet deletion when port is used"

commit 56c9f8f2ff7ab3d3ca4bbd460fe71caaff6ad535
Merge: 012e47f 922aefc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 2 13:25:46 2013 +0000

    Merge "Exceptions cleanup"

commit 412a5c8b03523bf35eaa07d4616f1b823273ea80
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Dec 24 15:16:04 2012 +0800

    Cleans up bulk_body generation in quantum.api.v2.base.prepare_request_body()
    
    Defined a lambda function for code readability
    
    Change-Id: Ic538b16d4643e064b222b76af80478161fd3e318

commit 922aefc0bbdccabb89cd932270c53bdd379061d1
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Dec 30 13:50:10 2012 +0000

    Exceptions cleanup
    
    Ensure that the quantum exceptions in FAULT_MAP are grouped
    together (this will save endless bug fixes when the server
    will return 500 instead of 4xx)
    
    Change-Id: I89581e1b6b4af3eb1803d6226686adf0b576d1e7

commit 012e47f820f1e213297c687f17159794e371823e
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Dec 24 14:15:21 2012 +0800

    Readjust try/catch block in quantum.api.v2.base.create()
    
    Removed the outer try/catch block to handle all exceptions in one block.
    Moved irrelevant statements out of the block
    
    Change-Id: I5c248403b8419f664ef6f17e70a016e7c0cd4ae6

commit f28eee8f51bca1e50f382da832ada9df787c3a77
Merge: 24baea5 c536aab
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 30 13:26:08 2012 +0000

    Merge "Raise InvalidInput directly instead of catch it"

commit a40781b54838f4968046211bd2a0d49a6362a03d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Dec 30 08:33:35 2012 +0000

    Ensures that the dnsmasq configuration file flag is always set
    
    Fixes bug 1094183
    
    If the flag is not set then the default configuration file may
    be used. This may be problematic in certain setups.
    
    Change-Id: Ibd0be960779f391a198454510dd6edcbc69c149c

commit 7de8e37d83db20360ea950dba8c6c0d827aee94e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Dec 27 14:16:46 2012 +0000

    Ensure allocation pools are deleted from database
    
    Fixes bug 1091946
    
    Change-Id: I4330f7a81e4745d5885d58fe7c8a010d18a8e004

commit c536aab7e2bd5af4dafa37b22b4a9972d7e7b2bc
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Dec 27 21:31:34 2012 +0800

    Raise InvalidInput directly instead of catch it
    
    Fixes bug 1094023
    
    Change-Id: I960b01996e33da0da5e9cd181479ebcf70d38997

commit 24baea50675cd30758478b8f2e93460399ec786d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Dec 26 07:24:37 2012 +0000

    Ensure bulk creations have quota validations
    
    Fixes bug 1093749
    
    The patch set also returns a proper error instead of a internal server
    error when the quotas are reached.
    
    Change-Id: Ifc74ffa8b54faa70f5558bf5263830f5e71f58ae

commit 201a71aa2a1a77bd333e0601c3d356fb1cbdd4ff
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Dec 26 08:36:02 2012 +0000

    Correct exception output for subnet deletion when port is used
    
    Fixes bug 1093754
    
    Change-Id: I2deaced0cfc2524234ff79e39e6e7c2f757ff19f

commit 38751c0d706b9f8b9d2e4ae962cde686c8285b91
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Dec 26 13:01:58 2012 +0000

    Update the configuration help for the OVS cleanup utility
    
    Fixes the details of the deletion parameter.
    
    Change-Id: Ia732e6012bc3eaf293697325d507ae8dfc007683

commit 5d41c5c817765bdea83eeff6656572504c7c1e84
Author: Avishay Balderman <avishayb@radware.com>
Date:   Tue Dec 25 11:18:21 2012 +0200

    Implementing string representation for model classes
    
    We want to have meaningfull representation. This is
    useful when we debug and want to see the actual
    attributes of the object. The current __repr__
    of those classes is the default python implementation
     and does not provide
    information about the object attributes.
    Solve Bug #1084231
    
    Change-Id: I1ea5d741d2fd2da13712e0d51d2c73dfba4991cf
    Solve the conflict below:
    Conflicts:
    	quantum/tests/unit/test_db_plugin.py

commit 19d65cdfd526d7ed5325f40f8dad31b1a04b4c47
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Dec 25 15:11:35 2012 +0000

    Provide "atomic" database access for networks
    
    Fixes bug 1093637
    
    In the OVS and LB plugins there are cases when accessing the network
    has an additional database query. The patch enables this to occur
    without accessing an invalid database entry.
    
    Change-Id: I7d4944cf3240819f23dd7b4993d6ae3cefab9dc2

commit f9b0eccfda2e747fcfdad7e6c8b26efefe29346a
Merge: 461417b 1ad3714
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 25 11:38:07 2012 +0000

    Merge "Removes redundant code in quantum.api.v2.base.create()"

commit 461417b6400bf6bfd0f5e96783ecf4c4c7ae3add
Merge: 767859d 7b5f6fd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 24 17:58:02 2012 +0000

    Merge "Add eventlet db_pool use for mysql"

commit 767859ddb947f281c4ada930ccc21cc6f0ba6806
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Dec 18 12:20:50 2012 +0000

    Add OVS cleanup utility
    
    Fixes bug 1091605
    
    The utility should be called after rebooting an appliance. This
    will purge the openvswicth of configured tap devices.
    
    A configuration variable quantum_ports has been added. This is
    by default True which indicates that only Quantum ports will be
    deleted from the OVS. If this is set as False then all ports on the
    bridge will be deleted.
    
    Change-Id: I442f64cf82f95bfa99d7765eb09db1ce2ecf602e

commit 1ad371422f35e238b4b40ed4ec744f9ac75f209d
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Dec 24 11:49:46 2012 +0800

    Removes redundant code in quantum.api.v2.base.create()
    
    Handles collections and one item in one routine by creating a items list
    
    Fixes bug #1093390
    
    Change-Id: I24b892ebff52889f17ed9ea8d17e8964e3de25f6

commit 7b5f6fd6ae0722f49b563f2f3f293a34d8f632d9
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Dec 10 12:39:22 2012 +0000

    Add eventlet db_pool use for mysql
    
    This adds the use of eventlet's db_pool module so that we can make mysql
    calls without blocking the whole process.
    New config options are introduced:
    
    sql_dbpool_enable -- Enables the use of eventlet's db_pool
    sql_min_pool_size -- Set the minimum number of SQL connections
    sql_max_pool_size -- Set the maximum number of SQL connections
    sql_idle_timeout  -- Timeout before idle sql connections are reaped
    
    The default for sql_dbpool_enable is False for now, so there is
    no forced behavior changes for those using mysql. sql_min_pool_size
    is defaulted to 1 to match behavior if not using db_pool.
    
    Fixes bug 1086173
    
    Change-Id: Ied0aae33211585743fe955028a75c4e192a15d2f

commit ca8ed5eee602831297dcd6b2561f82b11711f470
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Dec 13 15:29:04 2012 +0800

    Clean up executable modules
    
    Added execution string and changed file bitmode to 755 of executable modules
    
    Change-Id: I61b887fe6e1fa6159b7d53066b58b88d2c72644c

commit 7e180b1c7725e771f2bfd599e8b0552513fd5e6f
Merge: 97880b9 71a7472
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 21 11:56:28 2012 +0000

    Merge "Fix log message for unreferenced variable"

commit 97880b914b673a7ce0d02ad6e4f7c8456cd87143
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Dec 20 12:06:48 2012 +0800

    Fixes import order nits
    
    Change-Id: Ie74297946761dffc08313f4a8d6065bd340bd9f8

commit 71a747251a08df1f322ba0c8d34f588a9ec188c8
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Dec 18 13:40:38 2012 +0000

    Fix log message for unreferenced variable
    
    Fixed bug 1091664
    
    Change-Id: I83110fd8d05d8a5168cbc21ce78c3c44d01c7ae1

commit e0fae858b37fd7a2c3498a8fe675e505f8d7100f
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Dec 11 17:40:05 2012 +0400

    The patch introduces an API extension for LBaaS service
    
    - API extension
    - abstract base class for plugin
    - some new validators were added to quantum/api/v2/attributes.py
    
    Implements: blueprint lbaas-restapi-tenant
    Change-Id: Ic2fd4debc4969389b395ce7352ab208c6854018b

commit 9b6297dc01e101c38bf3102bd9993deeb9b8badf
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Dec 19 06:57:36 2012 +0000

    Fix pep8 issues
    
    Change-Id: I62674220028274619a9b180542eea716f2660917

commit deacec41af5cd8450eab8f1e8f4139ca0f71a7bb
Merge: ada3a5d f4e1fa0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 18 14:51:08 2012 +0000

    Merge "add parent/sub-resource support into Quantum API framework"

commit ada3a5de9935ef2136ff2c392432b39135dfbe3e
Merge: 659d70b dd5c7ea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 18 07:38:02 2012 +0000

    Merge "Correct i18n messages for bigswitch plugin"

commit 659d70bfedce6ddfed54382e6ed66284ea755c8c
Author: Maru Newby <mnewby@internap.com>
Date:   Mon Dec 17 18:10:05 2012 +0000

    Add tox artifacts to .gitignore
    
     * A tox build creates quantum/versioninfo and setuptools-*.egg,
       and git formerly marked them as untracked rather than ignored.
    
    Change-Id: I50556717a05b2488cff5d9693d46637df608da70

commit dd5c7eaedc2c0ac32ad1c6ecf3e72aac793c025e
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Tue Dec 18 00:16:13 2012 +0800

    Correct i18n messages for bigswitch plugin
    
    Part of bp make-string-localizable
    
    Change-Id: I6286aea5e85cf974e1d0fcdceb871411f0f10747

commit 5d0646e981d7a9517a97f73a74626ebb1e01b1d7
Merge: 5b2f47c 9917275
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 17 10:47:16 2012 +0000

    Merge "dhcp_agent.ini, l3_agent.ini: update dhcp/l3_agent.ini"

commit 9917275360b87c9be809983b75a887fa6fb969f1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Dec 12 12:41:06 2012 +0900

    dhcp_agent.ini, l3_agent.ini: update dhcp/l3_agent.ini
    
    Bug 1089223
    RyuInterfaceDriver is eliminated, so update the example of
    dhcp_agent.ini, l3_agent.ini for Ryu plugin and other OVS
    based plugins.
    
    Change-Id: Icc95c213ecd96946bd5a90d5d60df88c94cc1454

commit 5b2f47c3463f520609490b616d68ddab40d74570
Author: gongysh <gongysh@cn.ibm.com>
Date:   Thu Dec 13 15:45:58 2012 +0800

    Make patch-tun and patch-int configurable
    
    Bug #1089777
    
    Change-Id: Ib72d352374fb59029b6b0719a2d1254597f193ff

commit f5f21d40d4feffd8c3a6a5c07680358c67192ae4
Merge: 0e68484 9a442af
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 17 07:27:42 2012 +0000

    Merge "Update test_router_list to validate the router returned."

commit 0e68484c2055e7fce2306f4b7ced2e5e6e7541a7
Merge: 391d104 9ca602e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 17 05:43:58 2012 +0000

    Merge "Fixed the security group port binding should be automatically deleted when delete_port"

commit 9a442afbfa409a67b619d0f5d59036143407ab4a
Author: Kyle Mestery <kmestery@cisco.com>
Date:   Fri Dec 14 15:00:08 2012 +0000

    Update test_router_list to validate the router returned.
    
    For unit test test_l3_plugin.L3NatExtensionTestCase.test_router_list,
    correctly validate the value returned from listing the routers.
    
    Fixes bug 1078150
    
    Change-Id: I5ae559c37f43c1b977065a3508b6efb4375a2c1a

commit 391d104aba97e5061a2903948744aa13f425685d
Merge: 4ce92a4 8057d31
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 16 06:25:21 2012 +0000

    Merge "Correct i18n message for nicira plugin"

commit 4ce92a488f45a7be83d7f48928c96db8daefaf40
Merge: 24b8967 6cb4b04
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 15 08:30:58 2012 +0000

    Merge "Update evenlet monkey patch flags."

commit 9ca602edc465bbef57957a153044f1acfef84682
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Tue Dec 11 12:34:05 2012 -0800

    Fixed the security group port binding should be automatically
    deleted when delete_port
    
    Added the CASCADE setting for the security group port
    binding database model.
    
    Also removed unused variables and imports
    
    Fixes: bug #1080887
    
    Change-Id: Id1af121b6ee57b794cb515a0b0c26b9a6310fbc4

commit 24b8967098c6e31810aad4ebd7245c06bd047852
Merge: 21b4138 7ae7011
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 15 00:24:39 2012 +0000

    Merge "Add script for checking i18n message"

commit 21b41383a49fbd465eae1f1e69ceca48b7cab9ea
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Dec 14 11:11:34 2012 -0500

    Add restproxy.ini to config_path in setup.py.
    
    Fixes LP Bug #1090450
    
    Change-Id: I4969cafba9f5650fa556d39885b58b2a52a85fe0

commit dbb8ea79b518dffe7189b32a0c99e56009c5ff84
Merge: 4e80147 babe698
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 04:12:03 2012 +0000

    Merge "Fixed the unit tests using SQLite do not check foreign keys."

commit 4e80147f936c20fde9bb20f4f9b935dad3df4087
Merge: e36ff0f bdcf00c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Dec 14 04:09:28 2012 +0000

    Merge "Completes coverage of quantum.api.v2.resource"

commit e36ff0f569cc04db46fbf51095f3cc9688a25eec
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Dec 14 09:32:24 2012 +0800

    Replaces assertEquals to assertEqual
    
    assertEquals() has been deprecated in 2.7
    Replaced assertEquals to assertEqual in all test scripts
    
    Change-Id: I04b4ac873e151837ade9127f8c1eba32f4707dd4

commit bdcf00cfb1bc89c8475c0dc1f1c981d9ee78bcd1
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Dec 11 15:22:26 2012 +0800

    Completes coverage of quantum.api.v2.resource
    
    Moved current resource testcases to new test script
    Created test cases
    
    Fixes bug #1085456
    
    Change-Id: I9ff5ba6a44c32ba4cf04b6a75ea7fd30fc769d2c

commit babe698caf195be6c0f8d4a61dc967007aaedac7
Author: Jason Zhang <zhesen@nttmcl.com>
Date:   Mon Dec 10 18:04:18 2012 -0800

    Fixed the unit tests using SQLite do not check foreign keys.
    
    The foreign key constraints will be enabled for each SQLite
    database connection.
    
    By default the foreign key constraints are disabled in SQLite,
    so some test cases failed after enabling the foreign key
    constraints for unit tests. This fixings also fixed the failed
    test cases because of the foreign key enforcement.
    
    Fixes: bug #1021023
    Change-Id: I89f0cbbd75bb685b50dfe6628116fa971c5e78cb

commit bc1a0d4912ad4d541bef90d512a04eab5b540b47
Merge: f85776d a8d9594
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 19:54:12 2012 +0000

    Merge "dhcp.filters needs ovs_vsctl permission"

commit f85776dd636cdb4004aaff5acaca45b02ef18bf4
Merge: 84d6be4 548d522
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 13 19:03:45 2012 +0000

    Merge "Correct i18n message for metaplugin"

commit a8d959490785b1f01340add5ee1537b1eaa15dca
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Dec 13 10:53:07 2012 -0800

    dhcp.filters needs ovs_vsctl permission
    
    The dhcp agent calls ovs_vsctl so it will fail if using rootwrap
    and these aren't specified. The reason why this was working using
    rootwrap before is because there are other filters in
    etc/quantum/rootwrap.d that specifiy ovs_vsctl which
    allows the agent to make those calls. Fixes bug 1090072
    
    Change-Id: I509c191c97e7187361a09788e841ebb5a9f934c7

commit 8057d318cc84982c26513c8b28f4f5db630b1e9b
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Dec 13 22:24:33 2012 +0800

    Correct i18n message for nicira plugin
    
    Part of bp make-string-localizable
    
    Change-Id: I945151218580cecf467f7b37f91b0f97a6c3d336

commit 548d5228e5503d733b66d11d29e42739d2de4813
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Dec 13 22:00:02 2012 +0800

    Correct i18n message for metaplugin
    
    Part of bp make-string-localizable
    
    Change-Id: Idf7158a7888a764efd5755be04f71595a0f55b7a

commit f4e1fa0ea7225da7eb3387f87538d47dfc03161c
Author: Oleg Bondarev <obondarev@mirantis.com>
Date:   Tue Dec 4 19:15:09 2012 +0400

    add parent/sub-resource support into Quantum API framework
    
    - quantum.api.v2.base.Controller class now able to handle sub-resources
    - quantum.api.v2.router.APIRouter now able to specify sub-resources
    
    Fixes bug 1085968
    
    Change-Id: I07f2c1f3d974f7f17d4947804bde064dd8004a84

commit 84d6be4253398dd9516c71788f526806cb217845
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Dec 12 12:18:27 2012 +0900

    plugins/ryu: l3 agent rpc for Ryu plugin is broken
    
    Bug 1089221
    This is the Ryu counter part of
    https://review.openstack.org/#/c/15619/
    Change id of I60f3081975fc7164b22f9e9fa941e702a3f4c663
    Change set of 36e71eb1d2136795817ead27e1d9fa0ce65f6e
    
    Change-Id: I43878517a79bf47d42d0e71e8af59d11a4278280

commit a8c0c00069305092570e93ab85ccc2340d0be828
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Wed Dec 12 12:02:53 2012 +0900

    pluins/ryu: Fixes context exception in Ryu plugin
    
    Bug 1089220
    This is the Ryu counter part of
    https://review.openstack.org/#/c/15726
    Change-ID of I913b48dcd84d275cd7de30ca990be00c243e63ea,
    changeset of 05383d1340aecd7192609a9197c249886d844a46
    
    Ryu plugin also needs to be taught the update.
    
    Change-Id: I52fbf36df6e0769a032a7602637cabd93796fe1c

commit 8e7fe17cafa70c3346e2a5d70da2d6e2637c338e
Merge: c62652c d5aae13
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 11 15:37:43 2012 +0000

    Merge "Adds validity checks for ethertype and protocol"

commit c62652cec718b57b298fab2a784340c23f6aa550
Merge: eb0ba36 59921b9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 11 15:37:36 2012 +0000

    Merge "DRY for network() and subnet() in test_db_plugin.py"

commit eb0ba3680a0f5cd5361fe5dcfb44697f4da62c7b
Merge: 1e425ee 23cc758
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 11 07:43:15 2012 +0000

    Merge "Remove unnecessary port deletion"

commit 1e425ee46b72f6966f98aa0a4eca085b1a199fa5
Merge: 2e043a5 4a6ae51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 10 20:55:30 2012 +0000

    Merge "Support to reset dnsname_servers and host_routes to empty"

commit 59921b929709d1f0e34af38d223126c7fbffcc38
Author: Iryoung Jeong <iryoung@gmail.com>
Date:   Fri Nov 30 17:21:44 2012 +0900

    DRY for network() and subnet() in test_db_plugin.py
    
    This update avoids the repetition of code for using contextmanager
    by introducing dummy contextmanager function.
    
    Change-Id: I84d785b4b50ea447cb7f6a8807d9caad75088f32

commit d5aae134ac6dee10c68c9bedcab1c2a52145a5c2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Dec 10 16:27:11 2012 +0000

    Adds validity checks for ethertype and protocol
    
    Fixes bug 1080461
    
    Change-Id: Ifa014c985fcfa598b707c3c1e052aa8ae1baef0f

commit 7ae701120a8940997bc4f04ea513f2b3c7e65f09
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Fri Nov 30 16:03:41 2012 +0800

    Add script for checking i18n message
    
    Part of bp make-string-localizable
    
    usage: tox -e i18n
    
    tools/check_i18n.py: used check i18n message for one file.
    
    tools/check_i18n_test_case.txt: test case of check_i18n.py.
    run test case with cmd:
    $ ./tools/check_i18n.py ./tools/check_i18n_test_case.txt -d
    
    Change-Id: I2c383b7bb11ab3bdb8e3bb3b887342b1225840ac

commit 6cb4b04406d5122519e38c282c7c6dd13b54010e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Dec 10 08:10:20 2012 +0000

    Update evenlet monkey patch flags.
    
    Fixes bug 1088385
    
    Change-Id: I1da88b1c225ac73f45aef08b3ddbf6cd98a50568

commit 23cc758acbaf763b3a2d8b1d00104f04dc376897
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Dec 10 06:59:30 2012 +0000

    Remove unnecessary port deletion
    
    Fixes bug 1088368
    
    Change-Id: I41b816a8d72d09740ea7d063172a75cedffb8d6d

commit 4a6ae51eab09c1c38a52404fe816baad1c67376d
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Dec 4 14:46:25 2012 +0800

    Support to reset dnsname_servers and host_routes to empty
    
    Bug #1086232
    
    Change-Id: Ia27170b206f755577c8607c5b27dc5cf57d19633

commit 2e043a5a785b452f8f7fcb104b12c0746ca4a513
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Dec 9 06:33:13 2012 +0000

    Prevent unnecessary database read by l3 agent
    
    Fixes bug 1088129
    
    Change-Id: I887facf321f3267c16c101a1448827f6c046bb2c

commit a607f0a232d0f1567e6e12b4aa52515e60b9c329
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Fri Dec 7 22:58:50 2012 +0800

    Correct i18n message for linuxbridge plugin
    
    part of bp make-string-localizable
    
    Change-Id: Ie5c42e71084d376eca1edc750467b8498a4d8dc4

commit 2f8ccfa879623fe78144d41b55fc80adc45ad155
Merge: 81bdebb 7011f7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 15:52:36 2012 +0000

    Merge "Releasing resources of context manager functions if exceptions occur"

commit 81bdebb52082235781485dd1a5b66626e3ffd016
Merge: fbf50ad 73161b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 6 14:22:37 2012 +0000

    Merge "Drop duplicated port_id check in remove_router_interface()"

commit fbf50ad8cba857b62ecb24fccf778175db5b5534
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 22 15:57:57 2012 +0800

    Add router testcases that missing in L3NatDBTestCase
    
    Fixes bug 1083504
    Add router testcases in L3NatDBTestCase
    Correct router testcases name. Use the same naming rule as test_db_plugin
    
    Change-Id: Icfbef5ec7861aee07df3d451c09f06265fbafe21

commit 7011f7f2a0495286f2180bae75608d800f5b0b38
Author: Iryoung Jeong <iryoung@gmail.com>
Date:   Thu Nov 22 12:58:47 2012 +0900

    Releasing resources of context manager functions if exceptions occur
    
    The functions using decorator @contextlib.contextmanager in files below
    has potential resorce leaks when exceptions occur.
     - quantum/tests/unit/test_policy.py
     - quantum/tests/unit/test_db_plugin.py
     - quantum/tests/unit/test_l3_plugin.py
     - quantum/tests/unit/test_extension_security_group.py
    
    This patch let them releasing resources correctly.
    
    Fixes bug #1083045
    
    Change-Id: I66266b7afa4977537caabafc82d8c294730188ba

commit 73161b06b038293dc680e8af5a37d059b67e8a82
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Dec 3 06:17:20 2012 +0900

    Drop duplicated port_id check in remove_router_interface()
    
    Fixes bug 1075157
    
    In addition exceptions used in remove_router_intreface are defined
    and gettextized.
    
    Change-Id: I30b1561f3d4be12e485c506e5c3828b41ab226ef

commit b939b0749a1a37400702286d19951d1682abccc7
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Dec 4 14:41:41 2012 +0000

    Returns more appropriate error when address pool is exhausted
    
    Fixes bug 1086226
    
    Change-Id: I97a73151a1ed42877116238a6a741c68c75e199a

commit 64f2a38bc9a0551bb761c32058ab9c7929c7c0de
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 10 05:56:07 2012 +0000

    Add VIF binding extensions
    
    The is part of the blueprint vif-plugging-improvements.
    
    The patch adds an extension to Quantum that enables the plugin to
    return VIF details.
    
    At the moment it supports openvswitch and linuxbridge.
    
    Change-Id: Ib9b4d34e668e2ddc61c152c2c4cd4a01f2d0de40

commit 4aaf0fe474245451a0a06fca97e426f8c6e6a7d1
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 22 15:43:13 2012 +0800

    Sort router testcases as group for L3NatDBTestCase
    
    Sort order of testcases as group for readability.
    
    Change-Id: I5f74145b8a84cf837b97a03aa38583111ff80fab

commit ca95ae883d307828dc9d6001c5b5f8e61fdac80a
Merge: 1241dbf b836e71
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 4 21:27:11 2012 +0000

    Merge "l3 agent rpc"

commit 1241dbf3bccab2b4b9cb6ca2f6b6ad9fabd79351
Merge: 37c8627 06b2b2b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 4 18:01:42 2012 +0000

    Merge "plugin/ryu: make live-migration work with Ryu plugin"

commit 37c86277c511b82b21780663ff4666348ed7b7f9
Merge: 0dea610 797036f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 4 16:19:29 2012 +0000

    Merge "Remove __init__.py from bin/ and tools/."

commit 0dea610cbb57ad8d72f3b12840678531ffe95569
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon Nov 19 22:29:43 2012 +0800

    Refactor resources listing testcase for test_db_plugin.py
    
    Fixes bug 1083502
    Add common function '_test_list_resources' for resource listing.
    
    Change-Id: I5b144ff3924cbc623174172f3f74b2d33d24229b

commit b836e71eb1d2136795817ead27e1d9fa0ce65f6e
Author: gongysh <gongysh@cn.ibm.com>
Date:   Mon Nov 12 20:28:16 2012 +0800

    l3 agent rpc
    
    On one hand, we sync router data (including routers,
    their gw ports, interfaces and floatingips) from l3_agent
    to quantum server periodically if needed.
    
    On the other hand, we notify l3 agent from quantum server when
    we delete or update a router's stuff, such as floating IP,
    interface and gwport and router itself.
    
    blueprint rpc-for-l3-agent
    bug #1080286
    
    Change-Id: I60f3081975fc7164b22f9e9fa941e702a3f4c663

commit 4ec139ef12373eb2b150860594727c26dd201ff5
Author: Maru Newby <mnewby@internap.com>
Date:   Tue Dec 4 00:27:53 2012 +0000

    Fix rootwrap cfg for src installed metadata proxy.
    
     * The metadata proxy script will be installed to /usr/local/bin
       if installed from source, rather than the default /usr/bin.
       The filter config needs to be updated to reflect this or
       invacation of the proxy by the l3 agent will fail.
    
    Change-Id: Iccb4133b1ac33a1b9b232c1d68979fe646e1b977

commit 9f41c679e3488ad252d7b4bf83cf33d4c3416f15
Merge: 643a36b e56f174
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 19:49:15 2012 +0000

    Merge "add state_path sample back to l3_agent.ini file"

commit 643a36b0d935bb11ea3e9d661b8da4525700b878
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Dec 3 10:36:08 2012 -0500

    Add metadata_agent.ini to config_path in setup.py.
    
    Change-Id: Ia2795a22165a30684c17e23bdf73f8c6e0c01825

commit e56f17466c2dae8fc41a0f14a2f8792e68e25182
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Dec 3 10:32:30 2012 -0500

    add state_path sample back to l3_agent.ini file
    
    fixes bug 1086012
    
    A prior change incorrectly removed the sample state_path from the
    l3_agent config file.  This change adds the correct sample value to the
    file.
    
    Change-Id: I10455706442c004e5d0337834b5baa3b794af5e7

commit 06b2b2b22a3f0a90a7ad60c09f360a1cec1f2b94
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Nov 20 14:41:04 2012 +0900

    plugin/ryu: make live-migration work with Ryu plugin
    
    Fixes bug 1085861
    
    Live-migration with Ryu plugin doesn't work because the unique constraint of
    PortBinding table is violated as follows.
    Now Ryu can handle those informations itself, so remove the table itself and
    simplify Ryu plugin.
    
    > ERROR [quantum.api.v2.resource] update failed
    > Traceback (most recent call last):
    >   File "/quantum/api/v2/resource.py", line 95, in resource
    >     result = method(request=request, **args)
    >   File "/quantum/api/v2/base.py", line 397, in update
    >     obj = obj_updater(request.context, id, **kwargs)
    >   File "/quantum/plugins/ryu/ryu_quantum_plugin.py", line 226, in update_port
    >     port_binding.dpid, port_binding.port_no))
    > InvalidInput: Invalid input for operation: invalid (datapath_id, port_no) requested (00002eab88ec5140, 4), but (0000c2f19014c74a, 1).
    
    Change-Id: I7d993fd01125a27f6bf8e1b3fcac79ddcb8cb361

commit 797036fe621bc8ea12c56b5da99d0a20108b6568
Author: Sascha Peilicke <saschpe@suse.de>
Date:   Mon Dec 3 11:00:59 2012 +0100

    Remove __init__.py from bin/ and tools/.
    
    To avoid installation into .../site-packages/quantum via
    packages=setuptools.find_packages('.') in setup.py. Both directories
    are not Python modules.
    
    Change-Id: I794ad047a5ed52cb040490eb1be54c513c9d1e7c

commit 779093f3c25348083050e0d6a36ffca7f649dad0
Merge: d06b511 e4ee84f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Dec 3 09:37:56 2012 +0000

    Merge "Removes unused code in quantum.common"

commit e4ee84f008405c85ed2700f275e4538ada099b69
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Dec 3 15:45:51 2012 +0800

    Removes unused code in quantum.common
    
    Removed boolize() in quantum.common.utils
    
    Fixes bug #877120
    
    Change-Id: Icb30b4200baf8743bbee6b4dd035c8b316c38533

commit d06b51175ca9652ed1023bb6b447e0f8234ab65a
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Dec 3 10:06:23 2012 +0800

    Fixes import order nits
    
    Change-Id: I8bcfbcbc0d97a96a9c05d29510d3017b8a054cec

commit 1316aa3f52878bc4d869d44e439ac82c91b0c972
Merge: 8affc36 dc107a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 2 01:45:24 2012 +0000

    Merge "update state_path default to be the same value"

commit 8affc361c32d2afcc37cae6c55f901fb26e2d829
Merge: 8ab907f 58cb6ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 1 15:31:22 2012 +0000

    Merge "Completes coverage of quantum.agent.linux.utils"

commit 8ab907f01e99c498f287a197fcbc466686559e5b
Merge: 87e9b62 681d7d3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Dec 1 03:01:25 2012 +0000

    Merge "prevent deletion of router interface if it is needed by a floating ip"

commit dc107a5ba5673abed344723c174ee168280111c5
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Nov 30 18:03:52 2012 -0500

    update state_path default to be the same value
    
    fixes bug 1085249
    
    This patch sets the default state_path to match a reasonable deployment
    value instead of the devstack default.
    
    Change-Id: Ib0c10621d91760588a68a62df8a60682d780e015

commit 87e9b62fff53a12e6ca9ea349c3de8a80112affd
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Nov 30 16:13:51 2012 -0500

    Use /usr/bin/ for the metadata proxy in l3.filters
    
    Updates the l3.filters proxy to use /usr/bin/ instead
    of /usr/local/bin.  This should be a more distro friendly
    default and follows the pattern used by other OpenStack
    services as well.
    
    Change-Id: I8fbaa49f97f5367c112dc399db838d204af7b4c8

commit 3a63313345b06dc9af5d3a7b187283a7cd1f97be
Merge: 59e0cdc ac81d9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 30 18:35:23 2012 +0000

    Merge "Fixes Rpc related exception in NVP plugin"

commit 681d7d3be4d68868814846f70f46cfa7c7b6e675
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Nov 30 09:01:15 2012 -0800

    prevent deletion of router interface if it is needed by a floating ip
    
    bug 1081325
    
    Change-Id: I33495fd7ee812eded015b2d3783d1cf6a3bf14bc

commit 59e0cdce22f1d0054bc167760cfc5825a08f3a15
Merge: d0a284d 0c3dd5a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 30 16:50:34 2012 +0000

    Merge "add metadata proxy support for Quantum Networks"

commit 58cb6ce04fd2a1935cf210ee2152dd18911e0f65
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 29 15:50:12 2012 +0800

    Completes coverage of quantum.agent.linux.utils
    
    Renamed test_agent_utils to test_agent_linux_utils
    Added test cases
    
    Fixes bug #1084817
    
    Change-Id: If0269a003bd8e1fc6f6ef3c622d7a015dadf50aa

commit ac81d9d345b233b6bf84e5b7ae48004cce153510
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Nov 29 16:24:55 2012 -0800

    Fixes Rpc related exception in NVP plugin
    
    The rpc changes from commit 05383d13 were not also made against
    the nvp_plugin. Bug #1084803
    
    Change-Id: Iac95065bda2f6b83e07c27045f374ab8690865ca

commit d0a284de2ff272ae65a62bc2722c0274ff1be7d2
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Nov 29 12:26:29 2012 -0500

    make the DHCP agent use a unique queue name
    
    fixes bug: 1084621
    
    This generates a unique name, so that multiple agents can be active
    within a deployment.
    
    Change-Id: Ia2bdc27866e6aa4aebd0bd28d1dfd25c3167dd03

commit bc3ff9787064676603f99fff1b5c690b7f6e06c4
Merge: a2b7222 52da6ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 13:38:17 2012 +0000

    Merge "Fixes Context exception in BigSwitch/FloodLight Plugin"

commit a2b722249268cb2f2685a5d9b8d98ca62bf099bb
Merge: d2ba190 2374688
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 12:14:49 2012 +0000

    Merge "Completes coverage of quantum.agent.rpc.py"

commit 52da6ef6333fa9685c1859afdcc3e4e1145a8fe5
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Thu Nov 29 02:17:59 2012 -0800

    Fixes Context exception in BigSwitch/FloodLight Plugin
    
    Bug #1083389
    
    Aligning with the changes in the patch: https://review.openstack.org/#/c/15726
    to only use Quantum API context.
    
    Change-Id: I5644ad59c34430a9d558c39bbc07f594609ebfbc

commit d2ba190173cfbec5d72cd18743d8da55ff02824b
Merge: 9fdb15d 099885f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 29 08:25:58 2012 +0000

    Merge "Completes coverage of quantum.agent.netns_cleanup.py"

commit 9fdb15dfcee6b88f9fedfeebb2276f4cfdf1e698
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Nov 28 22:10:41 2012 -0800

    fix remap of floating-ip within l3-agent polling interval
    
    bug 1083990
    
    Change-Id: I1bb365fe6accc24a223acd2b31d4eacdb6809410

commit 2374688d5b43c0e5b373d2618ff16c6e1f144ad8
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 29 11:29:07 2012 +0800

    Completes coverage of quantum.agent.rpc.py
    
    Added test cases
    
    Fixes bug #1084381
    
    Change-Id: I9179aac206befa6b0449814646639ed96a1eadbc

commit 099885fbb8d439d23774dbca1c84cecb55ceb9ec
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 29 09:37:24 2012 +0800

    Completes coverage of quantum.agent.netns_cleanup.py
    
    Added test cases
    Fixed typos
    
    Fixes bug #1084332
    
    Change-Id: I86c2321dfe5f3f1ac4b8b570a6c76dbb1928bfb0

commit 0c3dd5af4c65dcafbd29e4bd50a1942f73aa60a9
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Nov 15 23:08:52 2012 -0500

    add metadata proxy support for Quantum Networks
    
    blueprint metadata-overlapping-networks
    
    Adds Metadata for guest VMs running on Qunatum networks.  This requires
    a companion patchset for Nova to test.
    
    Change-Id: I524c6fdcd6a44e46da08395fd84c1288052a69ea

commit f19d4bada175ec40b93fb38f7a05c4f4c432dcff
Merge: 3d7c15b 2f10485
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 28 22:44:38 2012 +0000

    Merge "Use openstack.common.logging in NEC OpenFlow plugin"

commit 3d7c15b03b34e86be589fa9bbda41580ef31fcec
Merge: e60fb44 764add8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 28 22:44:31 2012 +0000

    Merge "Correct i18n message for api and db module"

commit e60fb443e3d5ac22c43f0be30ef610dc38bce3dc
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Nov 28 14:01:36 2012 -0500

    Make signing dir a subdir in /var/lib/quantum.
    
    Moves the keystone_signing directory into a subdirectory
    of /var/lib/quantum which is use for lots of other things
    as well.
    
    Change-Id: I451d2bca17dcdb5b7050bc412e709285f87cb788

commit 2f1048542e714974dacb8b91cf6ba28af4a16b4c
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Nov 28 22:13:42 2012 +0900

    Use openstack.common.logging in NEC OpenFlow plugin
    
    Fixes bug 1084129
    
    Also fixes non-i18n raise messages.
    
    Change-Id: I077662329d17427fa3efa7269244248613a6ab85

commit 764add8bb11e2605802911bc51e3aa744787e719
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Wed Nov 28 14:52:43 2012 +0800

    Correct i18n message for api and db module
    
    Part of bp make-string-localizable
    
    Change-Id: I68af562af9438a6cff0628a98ace8aeb291dfeaa

commit 1a44190cb42ae3c40a15005dc22df55305322678
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Mon Nov 26 15:23:15 2012 +0800

    Fixes update router gateway successful with existed floatingip association
    
    Fixes bug 1081877
    
    Change-Id: I77e6034a39dc9db85de691a9ba596b2c8ca9d124

commit 30d6c8e7d4cde542942719f0ca46fe05ac262791
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Nov 26 17:07:12 2012 +0000

    Fixes order of route entries.
    
    Fixes bug 1083238
    
    This patch makes sure that a route entry for dnsmasq is placed first
    before any others (for example the l3-agent one). This makes DHCP work
    when network namespaces are disabled.
    
    Change-Id: I241a8e30127d614f7582e10d999521f6486e5255

commit 78eb1a0d53f099e42e1ffb370da8561a0c5d35bb
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Nov 27 09:53:28 2012 -0800

    fix so cisco plugin db model to not override count methods
    
    bug 1083696
    
    also fixes bug 1083180, which has L3 plugin base class implement
    get_*_count methods and raise
    NotImplemented, which is the "right" thing to do from a
    code-as-documentation perspective.
    
    Change-Id: I0367953bcea930b1ca70e416d3de22eeea1aa99d

commit 4a4626282b6177e10beb11a1ff5d33db173dac95
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Tue Nov 27 16:55:32 2012 +0800

    Use auth_token middleware in keystoneclient.
    
    The auth_token middleware moved into keystoneclient so a full
    keystone install is not required to use the middleware.Also
    add missing signing_dir to api-paste.ini.
    
    Change-Id: If6c339045b70b3d4d70f0297ec32ed3cfdf431de

commit e3d6299b4236ed8c1859409383405202c9662170
Merge: 815011f 4dceb53
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 10:22:33 2012 +0000

    Merge "Make sure we can update when there is no gateway port linked to it"

commit 815011fee6bf848c9ddc5a2d314418af0eab5727
Merge: 70abcb9 94ea191
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 09:05:13 2012 +0000

    Merge "Fixes pep8 nit"

commit 70abcb9d3f58e922ef477b6fd29b7716cf3bcc96
Merge: 627014c 7f90000
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 09:05:03 2012 +0000

    Merge "Fix syntax error in nvplib"

commit 627014cf471a765389e62a73efd514899beb14ee
Merge: 266eeca 5c64eb1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 07:55:16 2012 +0000

    Merge "Removes quantum.tests.test_api_v2._uuid()"

commit 94ea1919109397453a5e486b0d7250282f8caa4a
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Nov 27 10:29:29 2012 +0800

    Fixes pep8 nit
    
    Removes a space
    
    Change-Id: I8bd949cff4e18cb7707a4bccb3546f82a8354a68

commit 4dceb53a242a82b49df2777eeb8396395ada6761
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Nov 27 09:59:40 2012 +0800

    Make sure we can update when there is no gateway port linked to it
    
    Bug #1083387
    
    Change-Id: I7e56d072a6e430ddde816781fe480c6028577c5f

commit 266eeca70bb9f4e9b26921f8fe95b5f72744c75a
Merge: 38e2c6e 2c11676
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 02:03:14 2012 +0000

    Merge "Removes _validate_boolean()"

commit 38e2c6e0bfc021bbd37fee20a717968cc35ec96f
Merge: cca84fd 9988602
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 27 01:58:14 2012 +0000

    Merge "Refactors quantum.api.v2.attributes.py"

commit 7f900006fe4a67c0f650ffacdc7178606145dfc1
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Nov 26 16:53:30 2012 -0800

    Fix syntax error in nvplib
    
    Bug 1083379
    
    Change-Id: I906be569b72506df5729e547407a204739c36305

commit 5c64eb14db6d76d7ac7bf41c0c7c03aa90eea15d
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 23 12:56:01 2012 +0800

    Removes quantum.tests.test_api_v2._uuid()
    
    Removed _uuid function
    Defined an _uuid alias of openstack.common.uuidutils.generate_uuid
    
    Fixes bug #1082255
    
    Change-Id: I7d10ce3ade27eb4cdd533b5a77b9c405ad1dc174

commit cca84fdc02cfeea525ef34e8ac59618c2f0e4dc5
Merge: 3f4bb80 1aa64ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 22:27:25 2012 +0000

    Merge "Correct i18n message for ovs plugin"

commit 3f4bb80206f5f02d7948d29b894a22217344545b
Merge: cbfb06d a37b927
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 22:24:02 2012 +0000

    Merge "Add filters for quantum-debug"

commit a37b9276de85742276c0d8f6fa5264daa549702c
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Tue Nov 20 14:54:53 2012 -0800

    Add filters for quantum-debug
    
    only allows ping command here.
    Fixes bug 1071110
    
    Change-Id: I38f24e40de048845f01dbc07c79bb02acf92da31

commit cbfb06dbb972c313fd7577ee2836c200067f9694
Merge: eb47488 3a3e6c1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 18:01:09 2012 +0000

    Merge "Removing unnecessary setUp()/tearDown() in SecurityGroupsTestCase"

commit 3a3e6c10ad436b0453af92163b4ec643e24690f3
Author: Iryoung Jeong <iryoung@gmail.com>
Date:   Mon Nov 26 13:56:36 2012 +0900

    Removing unnecessary setUp()/tearDown() in SecurityGroupsTestCase
    
    This patch removes not required setUp()/tearDown() functions in
    SecurityGroupsTestCase. The functions are almost identical in
    test_db_plugin.QuantumDbPluginV2TestCase. Only difference is initializing
    ext_mgr which is done by SecurityGroupDBTestCase.setUp().
    
    And redundant inheritance of unittest2.TestCase for SecurityGroupsTestCase
    is fixed.
    
    Change-Id: I50d8efd047e23d02d76b8f38b75c730b75bb96ce

commit eb474882d29c3266adf91dd00f02ce3c00c21271
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Nov 25 15:43:21 2012 +0000

    Fix exception when security group rule already exists
    
    Fixes bug 1082842
    
    Change-Id: I5f51c3637903ff817fb47af82419c453094eb5be

commit 11cdc7a146a37265a6d046e7a4c23975332ca1aa
Merge: 991619e e597cbc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 26 04:52:41 2012 +0000

    Merge "Replaces uuid.uuid4 with uuidutils.generate_uuid()"

commit 991619e64aa2b0c7310469c946123ee2ff0d93e6
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Nov 25 22:01:27 2012 -0500

    Don't force run_tests.sh pep8 only to use -N.
    
    Previously running run_tests.sh -p would *always* run
    outside of the virtual environment. This commit makes -p
    work equally well with -N (no-virtual-env) and -V (virtual-env).
    
    Change-Id: I214404e85af2122b2ea7330e6496848a1e0d7ddf

commit 1aa64efc7e16cd0514db42b8afb5de1a6070e74b
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 22 22:23:28 2012 +0800

    Correct i18n message for ovs plugin
    
    Part of bp make-string-localizable
    
    Change-Id: I891d0128fd9e24805cef2c1db99cf8e716c7b4a0

commit e597cbc7cac411ba8a3a9249e5fc5fc1f9f15040
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 23 11:54:37 2012 +0800

    Replaces uuid.uuid4 with uuidutils.generate_uuid()
    
    Fixes bug #1082248
    
    Change-Id: I1be4ae129382585cecc4346e1e712ee0ab03bab5

commit a14a03f4c50e808950f99b634e8934d108ffbabc
Merge: 1711961 7e3b764
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 25 21:26:05 2012 +0000

    Merge "Correct i18n message"

commit 171196161c2dfe15531fd1ae1df017a3b03b23c1
Merge: 7b6bc0d 081424c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 25 20:33:49 2012 +0000

    Merge "Removes quantum.common.utils.str_uuid()"

commit 7b6bc0d3c6581a8aba912258b5d6d82642bf6b79
Merge: 8e94da4 080394a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 25 20:02:03 2012 +0000

    Merge "pass static to argv to quantum-debug config parser"

commit 7e3b764a84137a7ec4e89a40a6cc96bf9c025778
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 22 22:05:28 2012 +0800

    Correct i18n message
    
    Part of bp make-string-localizable
    
    Change-Id: I9020d7ef426602656fc198018c176eec813cd74b

commit 2c116766994f4c97b4b9e04f8abcbd8cd1732859
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Nov 14 09:00:03 2012 +0800

    Removes _validate_boolean()
    
    Removed _validate_boolean function
    Removed all type:boolean verifications
    
    Fixes bug #1082256
    
    Change-Id: I68883ff4dd727fa034d57876b46519d637156af6

commit 081424cb3d8118993344a04b77a21d4fefef00db
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 15 09:02:20 2012 +0800

    Removes quantum.common.utils.str_uuid()
    
    Replaced str_uuid() with openstack.common.uuidutils.generate_uuid()
    
    Fixes bug #1082236
    
    Change-Id: Ib09b070bfa1de4435c831d1d3c0fb0b0d12011bd

commit 99886025986b92aa3beb7666f5d9fc4851e6a591
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 15 22:47:49 2012 +0900

    Refactors quantum.api.v2.attributes.py
    
    Logic changes were done for consistency across methods,
    removal of redundant code and lower memory consumption.
    
    Fixes bug #1082224
    
    Change-Id: Ie09773d35325bec69ea82b3b59f812af5fa1c4d6

commit 8e94da49675310dae2e94a860e515ce5ac16f33f
Author: Iryoung Jeong <iryoung@gmail.com>
Date:   Thu Nov 22 12:58:47 2012 +0900

    Updates tearDown() to release instance objects
    
    This change fixes the bug by releasing the objects of the instance
    of class QuantumDbPluginV2TestCase. Removing unnecessary objects
    explicitly reduces the memory required by unit tests.
    
    Fixes bug 1065276
    
    Change-Id: Ia003a7718e1aedc4e4c8fb02b723f4a511ebc319

commit 080394ae5347d0e60475511d17550e3115890185
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Nov 21 13:16:37 2012 -0500

    pass static to argv to quantum-debug config parser
    
    fixes bug 1079609
    
    The quantum-debug tests were using the test runners sys.argv instead of
    creating a known value.  This fix passes a fake argv to parse.
    
    Change-Id: Iaae7292057b839f64e172504a55034a0d9272918

commit 56b810fc769f1672b55f740c524a60999b823f33
Merge: 4bc07a5 90dc469
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 20 16:05:41 2012 +0000

    Merge "Improve openvswitch and linuxbridge agents' parsing of mappings"

commit 90dc4691c888944d3d1691d06a739e8dc54857d6
Author: Bob Kukura <rkukura@redhat.com>
Date:   Tue Nov 13 13:50:53 2012 -0500

    Improve openvswitch and linuxbridge agents' parsing of mappings
    
    Created generic quantum.utils.parse_mappings function that detects
    duplicate key or value strings, and changed openvswitch and
    linuxbridge agents to use this to parse their mappings from physical
    networks to bridges or interfaces. Fixes bug 1067669.
    
    Also fixed some typos in comments.
    
    Change-Id: I342eaeeb6ff4c6e25d57d631f250faac082011b8

commit 4bc07a55ff686deb3a3747150a8068ce161d3011
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Nov 5 11:57:53 2012 -0500

    Move extension.py into quantum/api.
    
    This change moves extensions.py out of the extensions module
    and into the api module. This resolves an issue where the
    following log WARNING message would occur each time the Quantum
    API starts:
    
    Did not find expected name "Extensions" in
    /usr/lib/python2.7/site-packages/quantum/extensions/extensions.py
    
    Fixes LP Bug #1074895.
    
    Change-Id: Ia5ed206870551f9b33b74dcdc9d0503e447f298d

commit be77fd3f47edcb83a44340ae8c1d033cb5dd6817
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 17 05:51:47 2012 +0000

    Ensure that the expiration time for leased IP is updated correctly
    
    Fixes bug 1081664
    
    Change-Id: I77596ef65be817a874fad41b49e7ddbc0663c237

commit 6ea6ebe635b08a28ae9b05de5326323b1c82d147
Merge: 05383d1 86436a6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 21 05:37:58 2012 +0000

    Merge "bug 1057844: improve floating-ip association checks"

commit 05383d1340aecd7192609a9197c249886d844a46
Author: gongysh <gongysh@cn.ibm.com>
Date:   Fri Nov 9 22:45:58 2012 +0800

    Fix context problem
    
    On plugin side, we use normal API context if any to call RPC methods.
    We use our plugin dispatcher to convert RPC context into quantum admin
    context. After that the callback's functions have the first argument context
    as normal quantum context.
    
    On agent side, we use admin context without session property as its
    RPC calling context. Call back context is default RPCCommonContext in
    Openstack common modules.
    
    This patch also fixes the problem in the following bug:
    
    Bug #1077012
    
    Change-Id: I913b48dcd84d275cd7de30ca990be00c243e63ea

commit 1ebba20cd42551085a44539dc469dabf6dc2af0e
Merge: 16929d6 43e76ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 20 22:54:08 2012 +0000

    Merge "fix broken logic of only using hasattr to check for get_x_counts"

commit 86436a661b4cdb2aedc3c55ce37ba38c03f37e3f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Nov 20 14:09:19 2012 -0800

    bug 1057844: improve floating-ip association checks
    
    allow multiple floating ips to be associated with the same internal port
    as long as they map to different external nets (not yet supported in
    Folsom) or different internal fixed IPs.  With Quantum, there is no
    need to disallow either scenario.
    
    Also improve check for a valid external network to router to internal
    subnet path when a floating IP is bound.
    
    Change-Id: Iced675e1f064172ee8a5bb6b9e37032e83af5711

commit 43e76efcc5f86de7ec43c4524ff45f6986ed0680
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Nov 20 12:59:20 2012 -0800

    fix broken logic of only using hasattr to check for get_x_counts
    
    bug 1081259
    
    Change-Id: I1dad596830685968ae47394e0e85afe1b72ab544

commit 16929d65bee061d942c2d3bfac860e052e284a7a
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Nov 16 00:20:33 2012 +0000

    Prevent router being deleted if it is used by a floating IP
    
    Fixes bug 1080638
    
    Change-Id: I10768044aac3fe0ce994e42e798df754478d98d1

commit bf0e73f30018a423a9acc3d8e94cfa8ff299ed10
Author: Iryoung Jeong <iryoung@gmail.com>
Date:   Thu Nov 15 15:23:12 2012 +0900

    Updates clear_db() to unregister models and close session.
    
    fixes bug 1080988
    
    This change fixes the bug by ensuring the metadata and session objects
    are properly cleaned up by clear_db(). Using the proper calls reduces
    the memory required by unit tests.
    
    Change-Id: I1d1802b642eff83b7f96211608195afaf68e855a

commit 925b4185f5857621926cb56b1422b1efdb13e7a6
Author: Eugene Nikanorov <enikanorov@mirantis.com>
Date:   Thu Nov 8 18:44:02 2012 +0400

    The change allows loading several service plugins along with core plugin.
    
    The following functionality changes were made:
    1. Multiple plugins are loaded one per type
    2. QuantumManager now holds dictionary {plugin_type: plugin_instance}
       Core plugin is stored there as well
    3. Extensions are checked against all loaded plugins
    4. Service plugins are specified by service_plugins option in quantum.conf file
    5. Provide basic interface for service plugins
    6. Introduce dummy service plugin as example and PoC
    7. Service plugin's REST calls get corresponding plugin's common prefix
    8. Add UTs for new extension framework functionality and for QuantumManager
    
    Implements: blueprint quantum-service-framework
    Change-Id: I1d00d6f848937410bccd91c852ff0871a86d7bb8

commit a06fd815bfeaf0ff2ac07e70e6aae1a2e58d799c
Merge: 3866a8c f6da0e4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 20 07:19:45 2012 +0000

    Merge "Fix unitest test_router_list with wrong fake return value"

commit 3866a8c8523a116b828cfd499d1a4d37142d51d4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Nov 19 09:29:52 2012 -0800

    fix incorrect kwarg param name for region with l3-agent
    
    bug 1080793
    
    Change-Id: Iec600e98406b0210ab3a472c97f3b4d8f0f96d44

commit 495909de281f6749262fcfad00d110351c1f3f02
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Nov 14 14:52:06 2012 -0800

    All egress traffic allowed by default should be implied
    
    This commit removes the egress rules that were created by default
    to align with the way security groups work in amazon VPC.
    "By default, all egress is allowed from the security
    group until you add outbound rules to the group (then only the egress you
    specified is allowed)."
    
    Change-Id: I63936fbf76ea9a2828c8923be6ec14aac46b21bd

commit b7dd0331314d865f61d2bf4b0b59a0d06b4fd606
Merge: 51935c1 52bcd19
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 09:46:20 2012 +0000

    Merge "Ensure that deleted gateway IP address is recycled correctly"

commit 51935c19f51f813c9eb26a33a96dec064353003c
Merge: ce538eb 4f17c95
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 19 07:29:24 2012 +0000

    Merge "Completes unittest coverage of quantum.api.v2.attributes.py"

commit f6da0e4edae7420c614e06f29fb088b90be338b5
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Thu Nov 8 12:43:22 2012 +0800

    Fix unitest test_router_list with wrong fake return value
    
    Fixes bug 1077879
    
    The object of return list shouldn't wrap in 'router'
    
    Change-Id: I26862088f55a8d674bf22d66c7aeda1ca8fb1f98

commit ce538eb8bcc732b19589739cf2d4cf7da2e277dc
Author: gongysh <gongysh@cn.ibm.com>
Date:   Mon Nov 19 10:00:01 2012 +0800

    Delete floating port and floatingip in the same transaction
    
    Bug #1080516
    
    Change-Id: Icb5b71e29af582cb0e381e22909f46b325063d71

commit 4f17c95897d057649b202f74f6e430dc31cf6658
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Nov 13 10:05:51 2012 +0800

    Completes unittest coverage of quantum.api.v2.attributes.py
    
    Tests were added to cover all cases of each function
    
    Change-Id: Ic856bc6efb84360a8f5eaffde09dd68055bbe9c9

commit 513307fa916c5461bb9a144b74b562b9d34a1c65
Author: Juergen Brendel <jbrendel@cisco.com>
Date:   Thu Nov 8 15:00:11 2012 +1300

    Use DB count to get resource counts.
    
    Fixes bug 1075369.
    
    During quota check we used to simply retrieve the entire collection
    of resources from the database, then counting them in Python. This
    patch introduces a specialized _get_collection_count() method, which
    instead take advantage of the DB's built-in count capabilities.
    
    In order to take advantage of this, plugins can now implement
    get_*_count() methods for their resources. This is used (if present)
    by the quota checking function.
    
    Patch incorporates review feedback from Dan W, Alex Xu, Zhongyue Luo,
    Edgar Magana, Akihiro Motoki and gongysh.
    
    Change-Id: I87e2d0294e116e8147fed2ee90c9eb0cf1a54362

commit ddeeee817229ba2e3b6e1abd8fb2bb8566e63177
Merge: a63bd65 2c4321f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 16 10:48:02 2012 +0000

    Merge "Remove qpid configuration variables no longer supported"

commit a63bd6572999a8ef3f3d8bec09a504ba30369529
Merge: 63569fc df54e34
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 16 05:53:56 2012 +0000

    Merge "plugin/ryu, linux/interface: remove ryu specific interface driver"

commit 63569fc9c713526e53230130eb0d4fdbbe56fe69
Merge: 704c524 7a07690
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 15 22:40:29 2012 +0000

    Merge "Allow NVP plugin to use per-tenant quota extension"

commit df54e34c6e1c3f0186c01a16b17541666a3f952d
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Nov 16 04:20:57 2012 +0900

    plugin/ryu, linux/interface: remove ryu specific interface driver
    
    Implements blueprint ryu-remove-ryu-specific-interface-driver
    Since Ryu specific interface driver is not needed any more,
    delete it.
    
    Change-Id: Ic3336e8aac3076ddc949044d7ff25608bb7d297f
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit 704c52490d8b06ebe5e4a8ea04b0f4a7a987ead6
Merge: 8e4b7bc b4a0f65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 15 17:51:49 2012 +0000

    Merge "Revert "Put gw_port into router dict result.""

commit 7a07690feb7dc5ce1337befbd5b46f1bce02727e
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Nov 15 09:40:53 2012 -0800

    Allow NVP plugin to use per-tenant quota extension
    
    Change-Id: I704b52471e44b2d4e75dcf4435d55d6c6974a870

commit 8e4b7bc6e5784387aa3bbed4f7d510535e61d9ab
Merge: c8375cf f9c1e08
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 15 16:36:57 2012 +0000

    Merge "Part of the patch set that enables VM's to use libvirts bridge type."

commit b4a0f659f678d80d562de9f57b2112a018fd4d45
Author: gongysh <gongysh@cn.ibm.com>
Date:   Thu Nov 15 23:50:22 2012 +0800

    Revert "Put gw_port into router dict result."
    
    This reverts commit c1c19b11792e8e220b11466051739ea5b4279a7a.
    
    Bug #1079206
    
    Change-Id: Ia5fd84470779846749c00bb7dae7198055388347

commit 52bcd19e0b6de3f7c765c2d101bef8a498f1483b
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Nov 13 00:12:45 2012 +0000

    Ensure that deleted gateway IP address is recycled correctly
    
    Fixes bug 1079980
    
    Change-Id: I6819899cae6f366423ade70613c85fd84d1a270d

commit c8375cfad251176edfd44956a1d44e56126908b3
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Nov 7 00:44:35 2012 +0000

    Ensure that fixed port IP address is in valid allocation range.
    
    Fixes bug 1077292
    
    Change-Id: I587655bece83d0f6aa665e522efbc0ecd5ef1734

commit 6830ff4d946af39f39cfdaf4c94db1d344ffc80c
Merge: 144cc3f 4f824cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 14 07:24:55 2012 +0000

    Merge "RESTProxy Plugin for Floodlight and BigSwitch"

commit 144cc3f819f8b6995381154d1890de6243bdc53c
Merge: dd2c772 cf755b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 14 06:18:58 2012 +0000

    Merge "plugin/ryu: update for ryu update"

commit 4f824cf4fb9b824a6cd2d037f52717ec8bc307b8
Author: Sumit Naiksatam <sumitnaiksatam@gmail.com>
Date:   Tue Oct 23 01:37:28 2012 -0700

    RESTProxy Plugin for Floodlight and BigSwitch
    
    blueprint restproxy-plugin
    
    Implements blueprint restproxy-plugin.
    
    This Quantum plugin translates Quantum function calls to authenticated
    REST requests to a set of redundant external network controllers.
    
    Change-Id: Idbde6a7403c459503e8e0ee8b25ddaa8af5be36e

commit dd2c77281d942e8ee1ce2a3a3c3f0885bbb61829
Merge: b98068c e09051b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 14 01:05:25 2012 +0000

    Merge "Ensure that mac address is set to namespace side veth end."

commit b98068c3977ad41ffc66f4ef4d829b5e882345c8
Merge: 8eb8327 1a85476
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 13 12:20:17 2012 +0000

    Merge "plugin/ryu: add tunnel support"

commit e09051b31fb33707bebf88e4577dcda06f6eeffb
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Nov 13 20:36:09 2012 +0900

    Ensure that mac address is set to namespace side veth end.
    
    Fixes bug 1073350
    
    Change-Id: I4c0e85b500ac966a4250e2b6df634aab812f67e9

commit cf755b4dba509a9698d45ffb8c87ab6e6bd4ee1e
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Tue Jul 24 13:01:07 2012 +0000

    plugin/ryu: update for ryu update
    
    blueprint ryu-plugin-update-for-ryu
    Now ryu has GRE tunnel support, so update ryu plugin to support it.
    This implements/simplifies GRE tunneling support for ryu plugin
    
    Change-Id: I158affcb60c9016753dbbbf5f1ad50286af49c23
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit 1a85476b6a77ce448ef86bfb95e362cc21d2701c
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Aug 10 14:53:08 2012 +0900

    plugin/ryu: add tunnel support
    
    blueprint ryu-tunnel-support
    This patch adds tunneling support to Ryu plugin.
    Ryu supports gre tunneling which requires quantum ryu plugin to manage
    key assignment.
    
    Change-Id: I9f8db0913941c3da13045170e1557d333f0c68e2
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit d64a8469dd5dbb0318f043a3c81a48f14c17389f
Merge: 437ca88 ade8d96
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 12 18:35:18 2012 +0000

    Merge "Adds tests for attribute._validate_uuid"

commit 437ca887b52be81bba71ee67ed059e4a947659ed
Merge: 3604bf6 09f70dc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 12 18:15:05 2012 +0000

    Merge "Adds test scripts for _validate_range"

commit 3604bf675c772b52fb8cdfd5073dfb256669a84a
Merge: b0e30ed 372314c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 12 17:59:55 2012 +0000

    Merge "Adds test scripts for _validate_string"

commit b0e30edf73ad66cffa42fe8a380fe41721af4a05
Merge: 2299cdd 4df4f7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 12 16:57:43 2012 +0000

    Merge "Adds tests for attributes.is_attr_set"

commit ade8d96cd61f42b8684b64b2f5bfc4ad923cde30
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 12 16:18:21 2012 +0800

    Adds tests for attribute._validate_uuid
    
    Removed redundant condition in _validate_uuid logic
    Wrote test cases accordingly
    
    Change-Id: I6ee83bda90cdfeaeaa17da6241f2673d0959baa2

commit 2299cddcbd5a8fc2d3e44f816fb60a8aaff3b853
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 12 16:07:18 2012 +0800

    Adds tests to attribute.convert_to_int
    
    Change-Id: I1a8ec7b1710f1b1165a9fc125335523ae18f29a4

commit 4df4f7eec84eff7bdaebc651640eb7e95a3b1b77
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 12 11:49:42 2012 +0800

    Adds tests for attributes.is_attr_set
    
    ATTR_NOT_SPECIFIED and None are singleton objects
    
    When conducting "is in" against a list of objects, they are compared using
    unequal unless they are the same object.
    http://docs.python.org/2/reference/expressions.html#in
    
    According to PEP8, they should be compared by their id not value
    Therefore the is_attr_set logic has changed to:
        return not (attribute is None or attribute is ATTR_NOT_SPECIFIED)
    
    Wrote unittests for is_attr_set
    
    Change-Id: I2ebdd29564e5627b9e33b13a744948e8c9c0b9ce

commit 372314c7660b93bb27859c4b300ca24a6bf4e51a
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 8 17:40:59 2012 +0800

    Adds test scripts for _validate_string
    
    Cleanup _validate_string method
    Added tests covering all cases
    
    Change-Id: I48ed989ad69df19f32e7266fc77724f492441d17

commit 09f70dc8d240f81324352c4887e44e67427b049b
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 9 12:48:19 2012 +0800

    Adds test scripts for _validate_range
    
    Shortened _validate_range logic
    Wrote unittests for _validate_range
    
    Change-Id: I9fc69dd6c37f9c08c3112c1a14cdcdb26194f17a

commit f9c1e087ddd3760e0d860215c1af9f016475c08f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Oct 25 03:22:03 2012 +0000

    Part of the patch set that enables VM's to use libvirts bridge type.
    
    Fixes bug 1078210
    
    The bridge will be created by Nova and not by the agent. This is the first
    part for the blueprint vif-plugin-improvements
    
    This patch supports Nova managing bridges too.
    
    In addition to this it cleans gateway code no longer used.
    
    Change-Id: Ia621ba5edd12d8eb7ea412a2993fea43189bd511

commit 2c4321f40b443d49bb2eb54e8778bf2b524b9174
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 10 22:29:35 2012 +0000

    Remove qpid configuration variables no longer supported
    
    Change-Id: I25396654fdd03ae54d7d7470a9d2952689836c50

commit 30b64f0b901cdf0f3121f4ddb5b96e236f4155b1
Merge: 12674de 6fbc89a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Nov 10 12:37:46 2012 +0000

    Merge "Removing unsed code for Cisco Quantum Plugin V1"

commit 6fbc89a2cf88f30a3e92880818da98258c7112ee
Author: Edgar Magana <emagana@gmail.com>
Date:   Thu Nov 8 23:16:19 2012 -0800

    Removing unsed code for Cisco Quantum Plugin V1
    
    Implements BP remove-v1-code-cisco-plugin all code used here
    has been moved to Quantum V2 API.
    
    Change-Id: I0c3f0b0c490e6741065b1a6109fd9cac980b1047

commit 12674de39673975ec9a9bf9eaee3bd7956bf9bcb
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Fri Nov 9 13:36:44 2012 -0800

    Add QUANTUM_ prefix for env used by quantum-debug
    
    Fixes bug 1077204
    from TEST_CONFIG_FILE to QUANTUM_TEST_CONFIG_FILE
    also fixes openstack-common style
    
    Change-Id: I03d386dd5fc28d91ef496aecb1b93ddb4f4a810d

commit 2cf66d2585b64b624167b8d3443f667500d3aa19
Merge: 85367ed aafba4d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 19:48:44 2012 +0000

    Merge "Make tox.ini run pep8 checks on bin."

commit 85367ed0c373df3f5dfb23b7be9ea2be3b4ae62c
Merge: fb4e54f ab6de7f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 19:22:09 2012 +0000

    Merge "Import lockutils and fileutils from openstack-common"

commit fb4e54ffe00f01bfa711179b66da75c8c1caf3cc
Merge: 4ec3918 8781765
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 19:12:14 2012 +0000

    Merge "Adds test scripts for _validate_values"

commit aafba4da8b197d890d2004d41dd08dae2f7dd6f1
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Nov 9 13:20:50 2012 -0500

    Make tox.ini run pep8 checks on bin.
    
    This updates the pep8 checks in our tox.ini file so that we are
    also scanning the bin directory.
    
    Change-Id: Ia3465a4bbc6a5fef7da4de45b736d8950c920963

commit 4ec3918ea6d825d79e1421072d0b91f5b8f5e255
Merge: 014e0b4 13a3486
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 17:20:30 2012 +0000

    Merge "Add indication when quantum server started."

commit 014e0b4f901c93cd4d4a671c09edc16a7d4994c1
Author: Dan Prince <dprince@redhat.com>
Date:   Fri Nov 9 10:33:59 2012 -0500

    Explicitly include versioninfo in tarball.
    
    The most recent sync of openstack-common setup.py/version.py code
    seems to have cause quantum/versioninfo to disappear from the tarball.
    (see git commit d65bca8)
    
    This updates MANIFEST.in to explicitly include that file and seems
    to resolve the issue.
    
    Fixes LP Bug #1077035.
    
    Change-Id: I5fb395c15ea998da00b11e66947d1b1ea3665ea0

commit 878176565c540cb987eaf73b760f6840adc0ff2f
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 9 10:26:53 2012 +0800

    Adds test scripts for _validate_values
    
    Shortened _validate_values logic
    Wrote unittests for _validate_values
    
    Change-Id: I0f947d20b73aa96524121257784f9ba42489e477

commit c89d71f14a45c63dbc9df259d7e39a85898d40f8
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 9 11:49:04 2012 +0800

    Clean up quantum.api.v2.validators
    
    Remove redundant declarations
    Sort validators by lexographical order
    
    Change-Id: I9a55a55a28702bba38615bad192f6f80706eec7c

commit f0d5209c396449f0dde2ce837bebf9863465eefa
Merge: b6d9abd 24af9d6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 07:29:05 2012 +0000

    Merge "Ensure that the anyjson version is correct."

commit b6d9abd92212fdde9c14776913c51587a79779ed
Merge: db0846d f9cadb9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 9 07:28:05 2012 +0000

    Merge "Clean up executable modules"

commit 13a3486cda2d17b64ff90440d4acc305d7c6443e
Author: gongysh <gongysh@cn.ibm.com>
Date:   Fri Nov 9 10:16:18 2012 +0800

    Add indication when quantum server started.
    
    Bug #1076834
    
    Option values are printed in two phases due to our
    system's starting way. Last print will print out all
    option values included in all config files.
    
    In the end when quantum server started, we have an
    indication for it.
    
    Change-Id: I4ed9952c94fe74ea946733dc3a94cb2bb2aba37c

commit ab6de7f51ad50cb80fbeb93b44916f6bf2ad87f5
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Nov 8 14:31:44 2012 -0800

    Import lockutils and fileutils from openstack-common
    
    File lock function is needed to support iptables-based security group
    implementation.
    
    This is used by bp quantum-security-groups-iptables
    Change-Id: Id9c116a1e10e5c240913fae7a127110b806eff0f

commit 8eb832715117b9f79d6d20d2dd17b6ff7efe4473
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Nov 8 21:16:01 2012 +0000

    Update latest openstack-common code
    
    This fixes bug 1073999 (quantum/openstack/common/rpc/impl_qpid.py)
    
    In addition to this the common code is updated.
    
    Change-Id: I41223963baf34772edcd0d6d7ef5686a5fad1035

commit 9fb4563e7d03acc3fcb0c13451ee4d22c3e12402
Merge: 5e12592 2b23c6c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 13 06:46:13 2012 +0000

    Merge "Validate L3 inputs."

commit 5e125925af0d9bdae6c5ccef207555dbfc1fe8f0
Merge: d64a846 b1c35c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 12 21:05:58 2012 +0000

    Merge "Treat case when pid is None"

commit 282b5ff49381cf8f6640dfa2fe89d4c45e70e413
Merge: 37ad4d3 d65bca8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 8 15:54:15 2012 +0000

    Merge "Updated openstack-common setup and version code."

commit 37ad4d31c58bff988232486f6f8fe32f90f88a2b
Merge: 8c280ea a5e6ebd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 8 12:53:09 2012 +0000

    Merge "Remove nova code from Quantum Cisco Plugin"

commit 8c280ea022e1acb84b1534d806f14ffd0fbd8798
Merge: 3d07b33 52c3aeb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 8 12:42:48 2012 +0000

    Merge "Fixes convert_to_boolean logic"

commit f9cadb9478a01ee8b5b1d3cf5489c6fa8db47250
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Nov 8 09:55:15 2012 +0800

    Clean up executable modules
    
    Disabled execution of modules loaded by execution files in bin
    Changed file bit mode of modules which are executable
    
    Change-Id: If8a3378c79bb5bfcde1b93066c6b2c0a3d1107ad

commit a5e6ebd280a13c087596fffc14a01467a67afaec
Author: Edgar Magana <emagana@gmail.com>
Date:   Wed Nov 7 22:57:35 2012 -0800

    Remove nova code from Quantum Cisco Plugin
    
    Fixes bug 1073311
    
    Change-Id: Ifd408d7fdbbaec1fd70e8d114dc2cdc38505b2c2

commit 3d07b3380debbd98055aeea80c182c940469f3e0
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Nov 6 11:01:00 2012 +0800

    Use isinstance for _validate_boolean
    
    Makes _validate_boolean's validation condition more strict
    
    Change-Id: I286934cab3ccbb3f6d965a37dd2ade6b5dcdfb0a

commit 52c3aebe79502a3d6f5aa15154fd5820619ac845
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Nov 6 11:54:34 2012 +0800

    Fixes convert_to_boolean logic
    
    Clean-up to make code more intuitive.
    
    Change-Id: If97ed089c0dfcc45b05cc7066180e6d8d32ce257

commit d65bca867ced29f9632c923101464d5b37146b45
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Nov 1 14:23:58 2012 +0100

    Updated openstack-common setup and version code.
    
    Updating setup and version require code changes in the code base. This is done
    here to support Id9c116a1e10e5c240913fae7a127110b806eff0f
    
    Change-Id: I60b6dd6d684982e33de8fbf051a3dcaf98cb9b87

commit 2b23c6c0e6223adcd5df4af6477523afbb8dbbc2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Nov 7 22:57:59 2012 +0000

    Validate L3 inputs.
    
    Fixes bug 1064765
    
    Change-Id: Idb8d078f3c640d450bcb738cddf875b5e49f1b60

commit b23940c3196e58d0d161953aff2c0397d4f6415b
Merge: 4fdd180 5dbb404
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 7 18:59:47 2012 +0000

    Merge "Ensure that HTTP 400 codes are returned for invalid input"

commit b1c35c2a4619b9b0f6ffac84caa8954c6c9953e0
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Nov 7 05:46:08 2012 +0000

    Treat case when pid is None
    
    Fixes bug 1077651
    
    Change-Id: Id80d923d36a0339eee860e8cf37aacc6866fc6bc

commit db0846d5000762038db1a4244679d495e5dcc712
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Nov 4 07:03:48 2012 +0000

    Fix openssl zombies
    
    Fixes bug 1074257
    
    Change-Id: I6a6673ad12dfbd24dc1d02623e2e70068999fe45

commit 24af9d620eb1190007a6425ff8477b83ba797a59
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 3 04:54:03 2012 +0000

    Ensure that the anyjson version is correct.
    
    Fixes bug 1075977
    
    Change-Id: Ieb5a8b3f3eefb8e0faea8bd5dcd8a0f3f7c4ec07

commit 4fdd180b5ad0447d729236104014949dd44649d4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 3 03:18:06 2012 +0000

    Add eventlet_backdoor and threadgroup from openstack-common
    
    In addition to this the list of imports is now in an alphabetical order.
    
    Change-Id: I34517ce3f740f63094d21b3cbebb542cc40661a2

commit 944d9287f4cef407076d2a6fd8644b1ef1ec0d17
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 3 02:43:03 2012 +0000

    Add loopingcall from openstack-common
    
    Change-Id: I65a1eb1676f0efb4decb75aa3dfd3af35012bd77

commit 1e5a61065a2c1f32777eb774d642de13ef54880d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Nov 3 00:13:11 2012 +0000

    Added service from openstack-common
    
    Change-Id: Ie9892508820f81d487f41d5e3839d125c887681b

commit f6b377b2381fcb351c078ac71cd6354f86013e33
Merge: ad86ce9 5b00256
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 18:42:14 2012 +0000

    Merge "Sync latest notifier changes from openstack-common"

commit ad86ce93ef266266844f1915879978734814f46b
Merge: 119d55e e4deff5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 15:41:26 2012 +0000

    Merge "Pep8 fixes for quantum master."

commit 119d55e44282e10ecfa06bc53d653c50f5d69730
Merge: 6bce3ed 94a068b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 08:26:54 2012 +0000

    Merge "Testcase of listing collection shouldn't depend on default order of db query"

commit 6bce3ed9b742eba0b70537d2c8b2756c7e5a61fe
Merge: 2712054 f446b1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 08:25:08 2012 +0000

    Merge "Removes regex validation of UUIDs in dhcp_agent"

commit 2712054cc537d4fc351d9cbdf31e84750ffcc607
Merge: 5ac0597 f4c0289
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 08:24:58 2012 +0000

    Merge "Update KillFilter to handle 'deleted' exe's."

commit 5ac0597b7b81c8e2c965394ef165ddb11d0b7d72
Merge: b049b95 8f71e18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 08:05:28 2012 +0000

    Merge "Use _validate_uuid in quantum.plugins.nec.extensions.packetfilter.py"

commit b049b951a2f7168df54c7ab58483cc2f76f7b82b
Merge: f043d5c d168279
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 08:05:11 2012 +0000

    Merge "Use is_uuid_like in quantum.extensions.securitygroup.py"

commit f043d5cd3520b1b34c0d77abf2f7b3e9768e748d
Merge: 98d8787 d59c394
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Nov 6 02:35:42 2012 +0000

    Merge "Fix unnecessary logging messages during tests"

commit 5b00256b989f0a2a6d4d3de75b1f152faf87f7d4
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Nov 5 16:41:41 2012 -0500

    Sync latest notifier changes from openstack-common
    
    Updates Quantum with the latest changes from openstack-commons
    notifier package:
    
        Rename rabbit_notifier to rpc_notifier.
    
        The previous rabbit_notifier module is generic and can be used
        for all RPC notifications.
    
        This commit moves the rabbit_notifier module to rpc_notifier and
        adds a new deprecated rabbit_notifier module which can be used for
        Grizzly so that users can have a chance to easily upgrade this
        config setting.
    
    Also updates the agent code and config file to reflect this change
    (and get unit tests to pass)
    
    Fixes LP Bug #1075330.
    
    Change-Id: If9a4f5fa27638b25a29b66dbfed757554358ff7c

commit f4c02899a1ea8ccd69278d7314be0b1409c8fa66
Author: Dan Prince <dprince@redhat.com>
Date:   Wed Oct 31 22:11:42 2012 -0400

    Update KillFilter to handle 'deleted' exe's.
    
    Updates KillFilter so that it handles the case where the executable
    linked to by /proc/PID/exe is updated or deleted.
    
    Includes new test case with coverage for this fix as well.
    
    Fixes LP Bug #1073768
    
    Change-Id: If568693e0b491f8806ff0156701766929ca0b3e0

commit e4deff56fb9d083f9d8081944256d7a3ac1c3af3
Author: Dan Prince <dprince@redhat.com>
Date:   Mon Nov 5 13:14:19 2012 -0500

    Pep8 fixes for quantum master.
    
    This patch addresses some pep8 issues I found when running
    run_tests.sh -p on Fedora 17.
    
    Change-Id: I24896c43bd303c29f85a35814231e970223c132e

commit 98d878779398be9ae24af3bb5d86365fa432338f
Merge: aa886ac 7de7b16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 5 16:41:45 2012 +0000

    Merge "Log loaded extension messages as INFO not WARNING."

commit aa886ac40fd3831a87660a6bb629829f1de5195b
Merge: 96f1c56 4123c0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 5 16:34:36 2012 +0000

    Merge "Use uuidutils.is_uuid_like in quantum.extentions.l3"

commit 96f1c565a6e2e4662abb4068aaf8decf187dc2b6
Merge: 3f7f526 9343c44
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 5 16:34:27 2012 +0000

    Merge "Add check for cidr overrapping for adding external gateway"

commit 8f71e18aeb02ac0aa95bcebe2eed04a84ab168ff
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 5 22:24:57 2012 +0800

    Use _validate_uuid in quantum.plugins.nec.extensions.packetfilter.py
    
    Change-Id: I3564e492c41c5400e0935d364d536ca69b413c24

commit d168279def40546cca56c03280580bb92a77c7a7
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Nov 6 00:19:46 2012 +0800

    Use is_uuid_like in quantum.extensions.securitygroup.py
    
    Change-Id: If86cea62a918ed9bc826b9c9b22130b5d7c967f1

commit f446b1c4137e17894c7b1917b14e39a46e116631
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 5 23:16:03 2012 +0800

    Removes regex validation of UUIDs in dhcp_agent
    
    Removed re and quantum.api.v2 imports
    Removed _validate_field method
    Use uuidutils.is_uuid_like for uuid validation
    
    Change-Id: I35e751969cf1f9ff7850fc01b8e4a3f6d788918e

commit 4123c0cb9259f98273c20ff16d9115dfe9ecdbda
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 5 23:27:49 2012 +0800

    Use uuidutils.is_uuid_like in quantum.extentions.l3
    
    Change-Id: I82e42aebd45d743ed890190e478294531f7db4e6

commit 3f7f526deca38c22f6c216cae7b6620841b3afd7
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 5 22:40:50 2012 +0800

    Implements _validate_uuid
    
    Validates uuids with uuidutils.is_uuid_like
    Reordered validation funtions alphabetically
    
    Change-Id: I4c138d471c420ed520e6c881e07d36478119d12b

commit e3244c285f58edf38252aeaf2362fb45f96650a1
Merge: 1437715 66f7abb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 5 11:59:32 2012 +0000

    Merge "Use uuidutils for uuid validation"

commit 14377158a1fb20d86342c34d7b049c5a85d8c0ee
Merge: d6f84ff 3df3281
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Nov 5 10:51:56 2012 +0000

    Merge "Drop lxml dependency"

commit 66f7abbee759b0305f32de0a43ff8cfaa4b699b7
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Wed Oct 31 11:01:33 2012 +0800

    Use uuidutils for uuid validation
    
    Removed api.v2.attributes import
    Removed re import
    Fixed if-else statement to enhance readability
    
    Change-Id: Id4c107f3bc8c6eb94ae155814538b8f6081cb93b

commit 3df328144e9a15797ab0dd8c45cf713c32f86d31
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Nov 5 13:35:39 2012 +0800

    Drop lxml dependency
    
    Fixes bug #1068290
    
    Removed lxml from tools/pip-requires
    Removed usused method _to_xml() in quantum.wsgi.XMLDictSerializer
    
    Change-Id: I3410fd8645739abfd853f71efcbb354b58677b18

commit 94a068b424dcbbf754a3c56134abd77a60d49777
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Sun Nov 4 16:21:36 2012 +0800

    Testcase of listing collection shouldn't depend on default order of db query
    
    When adding sort feature for quantum, found some testcase of listing
    collection depend on default order of db query. Fix those testcase for
    ports, networks, and subnets.
    
    Change-Id: Ifefb80dc4a20e27b861c693226b967947bac1a5a

commit d6f84ff74af297877e65ca395856477cf6eb5ad6
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Oct 29 11:25:54 2012 +0800

    Add uuidutils module
    
    Added uuidutils to openstack-common.conf file and
    updated quantum/openstack/common
    
    Change-Id: If3d3908f666115b3c461e8820c5bafcf1cc69e97

commit 7de7b166382a4634ec5b0842cfb982ee83e94df3
Author: Dan Prince <dprince@redhat.com>
Date:   Sun Nov 4 10:02:44 2012 -0500

    Log loaded extension messages as INFO not WARNING.
    
    Updates the log statement we use when an extension is loaded
    to log as info instead of warn.
    
    Fixes LP Bug #1074889.
    
    Change-Id: Ibf5a8a38a1f37c55ca99e0e2209a48ba04d609ae

commit 4b98f0f9367ca21151365e8abcd0e06d78adea29
Merge: 91d7e15 decb42d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Nov 4 07:07:52 2012 +0000

    Merge "let metaplugin work with plugin which has not l3 extension support"

commit 91d7e15650e5f1e7d4f31b7068171f736349f647
Merge: 8077782 4c64c17
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 21:08:58 2012 +0000

    Merge "Clean-up comments in quantum/db/l3_db.py"

commit 8077782471539081b3fc5391d36b1b99e71dd93b
Merge: 92b25fa a1e3053
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 2 20:41:45 2012 +0000

    Merge "db_base_plugin_v2.QuantumDbPluginV2.create_port clean-up"

commit a1e305364a5a6c20125ffb2f184ce2f4aaa23991
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 2 09:38:21 2012 +0800

    db_base_plugin_v2.QuantumDbPluginV2.create_port clean-up
    
    Removed redundant dictionary lookups
    
    Change-Id: Iac0e05d81cb26e262501a54576483c821fa55003

commit 4c64c174c47dfa74d66632956ac8d06e030c842b
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 2 11:17:25 2012 +0800

    Clean-up comments in quantum/db/l3_db.py
    
    Change-Id: I85eaedca8b428ac7ba31f7aa088acb3c21129381

commit 92b25faf91c6a8b6df221d40cc6a52c2cab35665
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Nov 2 09:42:42 2012 +0800

    Import order clean-up
    
    Reorder imports by full module path
    
    Change-Id: I50bc2a5ff6cea939049fed8066471b15e84adbe6

commit decb42d7d5231990de180a00f41c6e7ee14eb98c
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Nov 1 23:58:25 2012 +0000

    let metaplugin work with plugin which has not l3 extension support
    
    Fixes bug 1074183
    Also Fixes bug 1074184 ( fix get_nework call with fields)
    
    Change-Id: I3bfdb22dd3be8a58cd884629dc5e3385730bb1bc

commit 5dbb4046637462bdcb04acc8f4cbebf8db480f35
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Oct 8 05:58:00 2012 +0000

    Ensure that HTTP 400 codes are returned for invalid input
    
    Fixes bug 1062046
    
    A number of additional validation functions were added. They
    do basic validations.
    
    Change-Id: I0fc207e996f11b50fdaa4d80075ae5704cba7003

commit 6b9784a6066589f67df01b8df72f539964e745f8
Merge: 8308234 e1130a9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 1 16:07:26 2012 +0000

    Merge "support 'send_arp_for_ha' option in l3_agent"

commit 830823439bcebb2bc3480f067de7f4ed15a4a831
Merge: c1c19b1 fa2a5c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Nov 1 15:05:41 2012 +0000

    Merge "Use openstack common log to do logging."

commit fa2a5c09c57f84cfc4e424c733c920f2004bcca8
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Oct 30 23:21:46 2012 +0800

    Use openstack common log to do logging.
    
    Bug #1073194
    
    We use openstack common log to do logging. At the same time, we will use
    quantum logger as our top logger, so that all sub loggers will be set
    according to quantum.conf
    
    Change-Id: I5adf72e6031ad437e05c3521864a83757b3e7887

commit c1c19b11792e8e220b11466051739ea5b4279a7a
Author: gongysh <gongysh@cn.ibm.com>
Date:   Wed Oct 31 22:01:35 2012 +0800

    Put gw_port into router dict result.
    
    Bug #1069782
    
    We put gw_port into router dict result so that client can get more
    information for the result router.
    
    Change-Id: I54cec8a71441a9370c7ba95767a92190bf1c9c21

commit 9343c44818ba8b472903973bfd190e478062ef83
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Fri Sep 21 20:52:16 2012 +0000

    Add check for cidr overrapping for adding external gateway
    
    Fixes bug 1053633
    Also add check for cidr overrapping between external gateway and
    interfaces
    
    Change-Id: I5bfb2fd96ea467b63e940893979a912caf550deb

commit d59c3946b4b9094d8e26b5b591a6d1d1946f4376
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Oct 30 23:17:13 2012 +0000

    Fix unnecessary logging messages during tests
    
    Fixes bug 1074431
    
    Change-Id: I70d40760e1fcb5a4755836dd582fb8e163ee13bd

commit e1130a96740e1d3180b2aa5a2874d5598ea9320b
Author: justin ljj <jiajun@unitedstack.com>
Date:   Mon Aug 27 16:27:23 2012 +0800

    support 'send_arp_for_ha' option in l3_agent
    
    Fixes bug 1042046
    
    Sending gratuitous ARPs when a external router or a floating
    IP was added in order to facilitate HA.
    
    I am using iputils-arping package to send ARP packets. You will need
    to install iputils-arping on Ubuntu and iputils on Fedora/RHEL/CentOS.
    Arping locates in /usr/bin/arping on Ubuntu and locates in /sbin/arping
    on Fedora/RHEL/CentOS.
    
    Change-Id: I125dbc57b90027dc5e99ff0a5d6877843a0b02a5

commit cf54850d15b5ead0de2ffd536a2ecdbfed5f33ca
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Oct 27 03:05:35 2012 +0000

    pin sqlalchemy to 0.7
    
    The sqlalchemy package 0.8.0b1 released on October 30, 2012
    removed SQLSoup
    
    (http://docs.sqlalchemy.org/en/latest/changelog/migration_08.html#sqlsoup)
    
    Ensure that the SqlSoup import is still supported. A number of quantum agents
    make use of this code to access the database.
    
    Fixes bug 1073555
    
    Change-Id: I78b27716c6e3eb05d874314f0bc544a917fd5853

commit f98c531e2de24246583e363fac2f350e677120eb
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Tue Oct 30 22:30:21 2012 +0000

    Remove unused metaplugin agents
    
    Fixes bug 1038840
    
    Change-Id: I891247ebd4e58b950c9254d267a06aadc4602d18

commit d8c54cb4b63f78b27c6141ec66e50c6b52076f9b
Merge: 804822b 9514614
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 30 08:42:10 2012 +0000

    Merge "Support external network in probe-create."

commit 804822b92132c1257e53b73ca554eebd57a29b37
Merge: 661fb82 121a793
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 30 04:44:41 2012 +0000

    Merge "Get subnets of router interfaces with an elevated context."

commit 661fb825026bbe3137ca7637087b5131f9414129
Merge: b1c445d e87992a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 30 03:07:51 2012 +0000

    Merge "Chmod agent/linux/iptables_manager.py"

commit b1c445d8abc1afe52bab89be5e13022d2a1307ec
Merge: 49283a6 b389ace
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 30 03:07:09 2012 +0000

    Merge "Fix exception when port status is updated with linux bridge plugin"

commit 121a79317cbeec83025c1fafdf472982c8de035d
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Oct 29 22:37:37 2012 +0900

    Get subnets of router interfaces with an elevated context.
    
    Fixes bug 1057558
    
    A router may have interfaces owned by other tenants (by admin operations).
    An elevated context is required to get subnet information for such interfaces.
    
    Change-Id: Iaf24c842c2c1e3c52573e7f9831d5f6d8fc01885

commit 951461412d42838d31c2029d2494dbf3e7e93f50
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Mon Oct 29 13:05:48 2012 -0700

    Support external network in probe-create.
    
    Fixes bug #1070960
    
    Change-Id: Ic0d3c56a26fe44359a772f40a7c7d92086a49a28

commit 49283a6a50628860edb7bb54a88419d51e3bb8b7
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Mon Oct 29 18:26:43 2012 +0800

    remove unused modules for linuxbridge/ovs plugin agent
    
    fixes bug 1072635.
    
    Since linuxbridge/ovs plugin agent can not access database any more.
    remove unused sqlsouq module.
    
    Change-Id: I0bf02798e2b6e63e1f3690bf0920132ba5dd7e65

commit e87992ade6b6f56ea7aae63b0a6b8fe433f2fc66
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Oct 29 13:52:43 2012 +0800

    Chmod agent/linux/iptables_manager.py
    
    Change file mode bits of iptables_manager.py to 644
    
    Change-Id: I63ab56c44f2e142a80830141e7fe12189a33d49f

commit 9431f7811b7ad86af959ec2d86f68acd4443a8f1
Merge: 079a742 33b45e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 28 20:09:15 2012 +0000

    Merge "Make create_floatingip support transaction"

commit 079a742b8c561631a27efad2783dd7c791dc1e40
Merge: f4c5dda e943df7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 28 10:36:05 2012 +0000

    Merge "Update policies"

commit f4c5dda834397e42387d3066092c7797ee8d5eb9
Merge: a272392 6a6c2e3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Oct 27 01:18:26 2012 +0000

    Merge "Quantum Security Groups API"

commit a272392e327c92edb291e07de6e81b51b9dedf7a
Merge: f843263 e77879b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 26 22:18:25 2012 +0000

    Merge "Remove database access from agents"

commit 6a6c2e3cd531ce9b6f69e75263f38c451e6c4f36
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Oct 9 17:10:27 2012 -0700

    Quantum Security Groups API
    
    Implements blueprint quantum-security-groups API
    
    In addition the the convention that if a URI has a '-' in it, it's
    replaced with a '_'. For example: POST security-groups will convert
    the body to {'security_group':  ..}
    
    Change-Id: I2c5219ed1d44a43ce1bf03d49df9f5c1af23352b

commit f843263da3b1e6202bd192a80d18d49ed2682f3e
Merge: 84f74d1 66e99de
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 26 13:18:26 2012 +0000

    Merge "use object directly instead of the foreigh key to update master db object."

commit 33b45e7dd43d4a94ef3a20a96c157e3b14616cc2
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Oct 25 21:14:48 2012 +0000

    Make create_floatingip support transaction
    
    Fixes bug #1064748
    Also added unit test
    
    Change-Id: I82b2031af0a87a92ace9a8b86f89772beaca5e8f

commit 84f74d1bff3b9d7c4f69c184aba54dceec02e9d6
Merge: 853a547 ded7f93
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 25 17:48:25 2012 +0000

    Merge "Fix database clear when table does not exist"

commit e943df7003ab71179ffa8472d853a6f7262b5acf
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Fri Oct 12 14:35:42 2012 -0500

    Update policies
    
    Merge in update openstack-common policy code.
    
    Updates Quantum-specific policy glue code to eliminate deprecated
    openstack-common policy interfaces.  Also cleans up policy code
    to allow for returning fine-grained policy values.
    
    Change-Id: I2951a0de3751bd2ec868e7a661070fed624e4af2

commit 853a547331f874533a1096699814bed2f627bb5f
Author: Julien Danjou <julien@danjou.info>
Date:   Wed Oct 24 15:11:24 2012 +0200

    Notify about router and floating IP usages
    
    This fixes the Quantum side of bug #1070009
    
    Change-Id: I07c41814a3acfb2749d503fe1bc64ab7707535ee
    Signed-off-by: Julien Danjou <julien@danjou.info>

commit b389aceda93366b2486b4c4884476b060ffa38cb
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Oct 25 03:30:24 2012 +0000

    Fix exception when port status is updated with linux bridge plugin
    
    Fixes bug 1072713
    
    Change-Id: I3466e747764fc379d413d9493cf80ea35552179f

commit 70f5a25af849723e15b743b13bc2ab3091bec592
Merge: f14bd71 84d60f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Oct 25 01:31:01 2012 +0000

    Merge "Call iptables without absolute path."

commit f14bd71cf621700ba2b183a954e684d10a9c66b2
Merge: 937099b 3316ee0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 24 20:53:29 2012 +0000

    Merge "Add MTU support to Linux bridge."

commit 937099b500e1960d2c8753c8d858b2152ea6e8c7
Merge: 90f6006 a2f3f47
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Oct 24 19:52:22 2012 +0000

    Merge "Add unit tests for the ovs quantum agent."

commit 84d60f5fd477237bd856b97b9970dd796b10647e
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Wed Oct 24 22:14:06 2012 +0900

    Call iptables without absolute path.
    
    Fixes bug 1069966
    
    rootwrap expects the command name is not absolute. We need to call
    the command without path to make rootwrap work well.
    
    Change-Id: I6120103908d10ca257d177a320294de06a89c646

commit 90f60060ee3d8559a3ab3f50f49a9dcda7399d68
Author: gongysh <gongysh@cn.ibm.com>
Date:   Wed Oct 24 16:13:09 2012 +0800

    Delete the child object via setting the parent's attribute to None.
    
    Bug #1070335
    
    We should not operate the foreigh key attribute of parent attribute
    directly.
    
    Change-Id: I98dc8eae78fdf67f0e7189e73afba77c6affcc0e

commit a2f3f47bdea6b7ba2a75603ded44fb6a2c556b69
Author: Maru Newby <mnewby@internap.com>
Date:   Tue Oct 23 22:25:54 2012 +0000

    Add unit tests for the ovs quantum agent.
    
     * Supporting the quantum dhcp agent on XenServer/XCP requires
       modifying the ovs agent.  As no unit tests exist at present for
       the ovs agent, this change adds enough test coverage to help
       ensure that the modifications to support xen will not break
       existing functionality.
     * Supports blueprint xenapi-ovs
    
    Change-Id: Ib99414ec02e8910cbb0ce377b1a1e73acd057794

commit a5c1c89aa1cc9bbc69beae6cb37ea76faec708d3
Merge: 9775fb9 9caf56c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 23 20:18:48 2012 +0000

    Merge "Update default base database to be V2"

commit 3316ee028efc6eb2a2ef6a7140ea945c9c39d1f3
Author: Jonathan LaCour <jonathan@cleverdevil.org>
Date:   Tue Oct 23 19:22:19 2012 +0000

    Add MTU support to Linux bridge.
    
    Fixes bug 1030932
    
    Added MTU parity to Linux bridge interface driver.
    
    Change-Id: I020b009a32f9317d3bb1224ad03dda291c715e96

commit 9775fb9d744d2b45f0699f7c2a944719a4cb8936
Author: justin Lund <justin.lund@dreamhost.com>
Date:   Tue Oct 23 15:16:09 2012 -0400

    Correct Intended Audience
    
    Correcting the Initial Audience from Developers to
    System Administrators.
    
    Change-Id: I96fd07d657b9049e035ec33ecddcab8bb09552e3

commit cf7d7967f1dbc2a66aa3a3005ea11a78f7038c3c
Author: justin Lund <justin.lund@dreamhost.com>
Date:   Tue Oct 23 14:29:29 2012 -0400

    Add OpenStack trove classifier for PyPI
    
    Add trove classifier to have the client listed among the
    other OpenStack-related projets on PyPI.
    
    Change-Id: Ic07fa4b3717a41fdd74c7447d65037dee7ea7fb7

commit fe6175656082a2b1ed8c7f5e5485b389e93dedfc
Merge: 4a997a8 bcb30fc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 23 16:35:15 2012 +0000

    Merge "add test for create subnet with default gateway and conflict allocation pool"

commit 4a997a8f87111ebed84618bbf493be44ccba6ca4
Merge: 12aa05c 47f05fa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 23 15:27:03 2012 +0000

    Merge "IP subnet validation fixes"

commit 66e99dea67c16614da79bb2aef2235dac7949276
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Oct 23 22:40:26 2012 +0800

    use object directly instead of the foreigh key to update master db object.
    
    Bug #1064235
    
    Change-Id: I74fe3e758681c40590de87c82fd093224d329f51

commit 12aa05c7df849af1793bb6b39cc5d77a8f9a793e
Merge: 3e0afd8 95c4d0e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 23 14:21:22 2012 +0000

    Merge "Merge OVSVethInterfaceDriver into OVSInterfaceDriver"

commit e77879b79d636a069bc0e85da56c5be934e6b1eb
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Oct 15 07:05:38 2012 +0000

    Remove database access from agents
    
    A flag on the agent and plugin would indicate that the agent could access
    the database directly instead of using the RPC interface. This has been
    removed.
    
    Change-Id: I2f596a020f971e850f2c92b6597412523d006154

commit ded7f9354b2069dad65766fd24cc032a6631beb0
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Oct 20 01:41:29 2012 +0000

    Fix database clear when table does not exist
    
    Problem occurs when running individual tests.
    
    Change-Id: I5223cf0d66aa5bffeb304dda19c784e31a54a7c0

commit 47f05facefb02cdd604bb8e0ebd7d00fc739cdd1
Author: Jeremy Hanmer <jeremy@dreamhost.com>
Date:   Thu Oct 18 16:26:41 2012 -0700

    IP subnet validation fixes
    
    Fixes bug #1067959
    
    Assure prefix length is included in CIDR definition.
    
    Change-Id: I32bb3dd1e5bffb409b3adee03015e21cce71caea

commit 9caf56c37aff9999b9ffdb3c880178f252ba3237
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Oct 19 04:16:23 2012 +0000

    Update default base database to be V2
    
    Fixes bug 1070353
    
    Change-Id: Ie9271dd1ef2597ba74a0fea51ecf151ae2e8f7dd

commit 3e0afd8d118d8c73a13495c3a431952e2a541d91
Author: Michael Still <mikal@stillhq.com>
Date:   Thu Oct 18 11:43:37 2012 -0700

    Update common.
    
    policy.py and setup.py are not updated as they cause test failures.
    I will investigate them separately.
    
    Change-Id: Ie46626e67ce5c32baf0eda9f63afb33611d5015a

commit bcb30fcc6675473a08c0e97eaec5fd8f15e0fb72
Author: He Jie Xu <xuhj@linux.vnet.ibm.com>
Date:   Sat Oct 13 18:00:20 2012 +0800

    add test for create subnet with default gateway and conflict allocation pool
    
    Create subnet with default gateway and conflict allocation pool should return
    status code 409:
    $ quantum subnet-create net1 --allocation-pool start=10.0.0.1,end=10.0.0.5 \
    10.0.0.0/24
    Found overlapping allocation pools:{u'start': u'10.0.0.1',
    u'end': u'10.0.0.5'} 10.0.0.1 for subnet 10.0.0.0/24.
    
    Change-Id: I8608314ad7899a752eea239dbe224e25c00a375b

commit 12ed618200cd265df24a6c0512e59c9e426a3c33
Merge: 15604ab d6aa31b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 12 17:10:09 2012 +0000

    Merge "correct nvplib to update device_id"

commit 95c4d0e82f92fdf6d2a4e93453df3b831193f54a
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Sep 28 22:05:50 2012 +0900

    Merge OVSVethInterfaceDriver into OVSInterfaceDriver
    
    Fixes bug 1049385
    
    Due to some issues using OVS internal interfaces across namespaces
    with OpenFlow controllers (bug 1048681), a patch introduced the
    OVSVethInterfaceDriver in addition to the base OVSInterfaceDriver.
    However, OVSVethInterfaceDriver is just a variation of OVSInterfaceDriver
    and the difference is how to create an interface (OVS internal vs veth).
    This patch merge OVSVethInterfaceDriver into OVSInterfaceDriver
    by introducing a new flag 'ovs_use_veth' (which defaults to False).
    
    Change-Id: Ie8b01e6776bf703f72a9e2a471b24e126f6e2322

commit 15604abab694cb1edb1df61e2f20b20adf415206
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Oct 8 02:44:50 2012 +0000

    Logging indicates when service starts and terminates
    
    Fixes bug 1064070
    
    The patch adds a log entry indication that the service has started. In
    addition to this if there is an "exit" statement in the code, then the
    log message will indicate that the service has been terminated.
    
    Change-Id: Idb6cff4b85d26331df2c6e14aa0680e82b4e2cd7

commit 94e486168e383600d9c5234c7b0c3874884aad1e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Oct 8 04:18:11 2012 +0000

    Ensures port is not created when database exception occurs
    
    Fixes bug 1064261
    
    The port creation code did not correctly treat a database error. That is,
    if there was an exception the port would be created and an error returned
    to the client.
    
    Change-Id: I6cf36d1c641b46716afb16f228b8daa631099a5d

commit cd89dfac80a983dc00587f08401514210d73d47a
Merge: 284fb8a 9aac057
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 07:31:54 2012 +0000

    Merge "Improve unit test times"

commit 284fb8a556db4e5aa908024e5af7eda1e888d520
Merge: 473aac7 074369c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 01:25:19 2012 +0000

    Merge "Update vif driver of Ryu plugin"

commit 473aac7be1bfb60ceb7194b85b8440e6d2b10120
Merge: 3deb54a 86c36e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 00:50:46 2012 +0000

    Merge "Add control_exchange option to common/config.py"

commit 3deb54a34da4333e2f4a1066da7f821889b9d575
Merge: 5131db4 a11f6ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Oct 8 00:27:33 2012 +0000

    Merge "tests/unit/ryu/test_ryu_db: db failure"

commit 5131db4956662ec568eb69bb3f8f1cbd95febd35
Merge: 8eb7ca5 98b270a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Oct 7 22:33:47 2012 +0000

    Merge "get_network in nvp plugin didn't return subnet information"

commit 9aac057efd9728dc1e4134e72ffa106445d2fc97
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Oct 6 02:56:11 2012 +0000

    Improve unit test times
    
    Revert the change using a temporary file for the database.
    The sqlalchemy version is updated to >=0.7.8 (this includes
    fixes for memory leaks).
    
    Change-Id: Ib5d128edfef0f8e0afebaf408f7834fa3de2481a

commit 86c36e073dd31cfee4b9c8e6cddacf8b1c7d19dc
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Oct 5 15:51:19 2012 -0400

    Add control_exchange option to common/config.py
    
    fixes bug 1062517
    
    Follows the instructions in the openstack/common/rpc/__init__.py and
    defines a control_exchange option.
    
    Change-Id: I92c50e1aea44954b2c9d62db1df536b9044b6951

commit 8eb7ca51c0bfda334eda8a25d599aa1d9cd21c22
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Oct 5 06:07:13 2012 -0400

    Treat invalid namespace call
    
    Fixes bug 1060559
    
    Change-Id: I29250100416b87f55781fb7e97339f6d3761513f

commit 98b270a789d53145bf5a33e8e1819d6531ebc543
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Oct 4 16:18:58 2012 -0700

    get_network in nvp plugin didn't return subnet information
    
    Adds unit test for show network which checks for subnet.
    
    Fixes bug 1061781
    
    Change-Id: I459a1f11a9e4294c31d002c8dbcfde873e43c800

commit a11f6cec92c9a93d37cdd94b7363681addabfe9e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Tue Sep 18 23:55:14 2012 +0900

    tests/unit/ryu/test_ryu_db: db failure
    
    Fixes bug 1061408
    
    The unit test of test_ryu_db fails when it is specified to run as follows.
    
    $ ./run_tests.sh quantum.tests.unit.ryu.test_ryu_db
    RyuDBTest
        test_ofp_server (quantum.tests.unit.ryu.test_ryu_db.RyuDBTest)ERROR
    
    ======================================================================
    ERROR: test_ofp_server (quantum.tests.unit.ryu.test_ryu_db.RyuDBTest)
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/quantum/tests/unit/ryu/test_ryu_db.py", line 30, in setUp
        options = {"sql_connection": cfg.CONF.DATABASE.sql_connection}
      File "/quantum/openstack/common/cfg.py", line 1039, in __getattr__
        return self._get(name)
      File "/quantum/openstack/common/cfg.py", line 1361, in _get
        value = self._substitute(self._do_get(name, group))
      File "/quantum/openstack/common/cfg.py", line 1377, in _do_get
        info = self._get_opt_info(name, group)
      File "/quantum/openstack/common/cfg.py", line 1470, in _get_opt_info
        raise NoSuchOptError(opt_name, group)
    NoSuchOptError: no such option: DATABASE
    
    ----------------------------------------------------------------------
    Ran 1 test in 0.001s
    
    Change-Id: Ie639914c64e6fba10112a58efa7f363615d0c9fd

commit d6aa31b1c8dce7e628af7365fe0b070d306fca52
Author: Aaron Rosen <arosen@nicira.com>
Date:   Wed Oct 3 21:52:43 2012 -0700

    correct nvplib to update device_id
    
    Fixes bug 1061391
    
    Change-Id: Ide8efdfb12dd0f403d7e4f468b1c9f3cc024f9a9

commit 5ec843b59204a044b1b13605eba138021ca02b52
Merge: 3399a0c 60eceb5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 2 18:54:11 2012 +0000

    Merge "Add quantum-usage-audit"

commit 3399a0c821017501bdac8d775b4fb7fffda1cfec
Author: Doug Hellmann <doug.hellmann@dreamhost.com>
Date:   Tue Oct 2 12:34:30 2012 -0400

    Update rpc and notifier libs from openstack.common
    
    Bring in the latest versions of the rpc and notifications
    libraries to fix broken imports in the current version
    of master.
    
    Change-Id: I6f545df4622eabdf2f7bf4e9cf155db20bd2c4c1
    Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>

commit 60eceb53f5c54268ac500dbe500aefc2a80f4d69
Author: Julien Danjou <julien@danjou.info>
Date:   Tue Oct 2 13:21:41 2012 +0200

    Add quantum-usage-audit
    
    This adds a program aiming to send "$resource.exists" notifications regularly
    via a cronjob. We will use this in Ceilometer to meter resources usage.
    
    Change-Id: I718c67bfb54b74afb3af262bb08cbfd71531188a
    Signed-off-by: Julien Danjou <julien@danjou.info>

commit f723e1a359ff8079356b05a945c7b82252f2cb42
Author: Julien Danjou <julien@danjou.info>
Date:   Tue Oct 2 15:37:49 2012 +0200

    Fix filters default value in get_networks
    
    With that change, if get_networks() is called without fields set to
    something, _filter_nets_l3 fails because it tries to call "filters.get()"
    where filters is None.
    
    This fixes bug #1060047
    
    Change-Id: Ia0787e7a278a3562af5409861762f067d71f2cf6
    Signed-off-by: Julien Danjou <julien@danjou.info>

commit 903e95f9752e05f13645a6dffca4dc33f3cb6e35
Merge: 7ea7db0 9463f6f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 2 13:25:07 2012 +0000

    Merge "Support for several HA RabbitMQ servers."

commit 7ea7db0125945741ef44ef9bea331304680a62bc
Author: Somik Behera <somikbehera@gmail.com>
Date:   Mon Oct 1 22:33:12 2012 -0700

    l3_nat_agent was renamed to l3_agent
    and this was missed.
    
    This broke quantum-l3-agent when setup.py was
    used to install but  did not affect package installs.
    
    This change fixes the issue.
    
    Change-Id: I820d26fba5d2774262577ed4fbae81dc7362e93e

commit 074369c3f7f1ad61317a85fe45f68a3017e0a6d4
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Mon Oct 1 15:56:50 2012 +0900

    Update vif driver of Ryu plugin
    
    Fixes bug 1059393
    
    This patch allows Ryu plugin to be compatible with Nova Security Groups.
    
    Change-Id: Ief1039f4b73af2e815fed429cd717e64888565c9

commit 9463f6f1a59d2b47edefbf9710b31cde85c9983d
Author: Emilien Macchi <emilien.macchi@stackops.com>
Date:   Thu Sep 27 16:20:29 2012 +0200

    Support for several HA RabbitMQ servers.
    
    Change-Id: I37f73867ff469133c39bf5f1a7fd48f48b0704d4

commit a385229da8c16586674162e606f159fb9f32c11d
Author: ivan-zhu <bozhu@linux.vnet.ibm.com>
Date:   Fri Sep 28 22:36:23 2012 +0800

    Correct the error message in the Class NoNetworkAvailable
    
    Bug #1052294
    
    Change "No virtual network is available." to "No tenant
    network is available for allocation."
    
    Change-Id: I8e2b40df1afa46522666d51218b82a4deef2ff64

commit 81b68879b17160131e9032d6fcf490c1ab1de27e
Merge: 90aff02 4e5d904
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 27 07:46:11 2012 +0000

    Merge "clean notification options in quantum.conf."

commit 90aff020d682b471785a37cbabd2d50874ccb069
Merge: 28eb0bf 70e684f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 27 07:39:42 2012 +0000

    Merge "Fix flag name for l3 agent external network id"

commit 70e684fd90567cb257fc951942b3b04c5ce34702
Author: Takaaki Suzuki <suzuki@midokura.com>
Date:   Tue Sep 25 15:32:33 2012 +0900

    Fix flag name for l3 agent external network id
    
    Bug #1056720
    
    Change-Id: I744da7e1584d5230a23c4fc8b6fc258814babfa9

commit 4e5d904d2e9dc51971348fccb698d295affec96a
Author: gongysh <gongysh@cn.ibm.com>
Date:   Wed Sep 26 16:48:18 2012 +0800

    clean notification options in quantum.conf.
    
    Bug #1056637
    
    Change-Id: I9d9002d3dfbbfa94224bc6ed9dc1a7f5207fb563

commit 28eb0bf5b3ca7f3e849c5781e82b5cf03ed7d95e
Author: gongysh <gongysh@cn.ibm.com>
Date:   Wed Sep 26 12:17:09 2012 +0800

    Add log setting options into quantum.conf.
    
    Bug #1056584
    
    This will improve the user experiences.
    
    Change-Id: Iaafd4eeb4fc23c5473276b3cf0e5ccffe2150ec2

commit 4c679f618889d277c33964e510dc5b714956fcf4
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Sep 25 10:51:59 2012 -0700

    Warn about use of overlapping ips in config file
    
    Fix bug 1055822
    
    Add an explicity user in the configuration file regarding consequences of
    enabling overlapping IPs when Quantum is used with nova security groups
    and/or metadata.
    
    Change-Id: Ifa67216fc7479a7858c0653422bf5baab58fb350

commit 95153e4e3eaa2738d532463a244ff923c73ec9ff
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 24 16:20:35 2012 -0700

    Do global CIDR check if overlapping IPs disabled.
    
    Fix bug 1055822
    
    This patch adds a global configuration option for enabling or disabling
    overlapping IPs for subnets in different networks.
    If they are disabled, the validation of the CIDR against overlapping
    ones should be performed globally and not just among subnets defined for
    the current network.
    
    Change-Id: If6a562324f0a5c3982591be8030c4628ec9007b6

commit 6194ab2becbd255e6b795c828844db2f3ab85659
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Sep 24 12:31:27 2012 +0000

    Fix rootwrap filter for dnsmasq when no namespace is used
    
    Fixes bug 1055384
    
    Change-Id: I98381299f28da0e4c443efd4c22ba551022e0288

commit 6ae8f0ac8035b688e043b97bd67355d30a671463
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Sep 24 05:11:20 2012 +0000

    Add common popen support to the cisco plugin
    
    Fixes bug 1055290
    
    Change-Id: I5c90b3f23288101c34ac94470476676d5d9c141e

commit b404f586f9f3c9fa286f66dc4c76ff6ce96bcf0f
Merge: b6185c4 9cb3652
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 23 22:16:51 2012 +0000

    Merge "Uses a common subprocess popen function"

commit b6185c43385b8cf2d8890671dba3aaa5d3dd2139
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Sep 21 17:06:47 2012 -0700

    Use sqlite db on file for unit tests
    
    bug 1054387
    
    So far unit tests were executed using an in-memory database.
    Memory was not being freed thus causing oom frequently due to
    the increased number of unit tests.
    Since sqlite in memory db do not work very well anyway with nose,
    we are moving to file-based databases; slower, but safer.
    
    Also, this patch removes a bunch of unit tests which do not add
    anything to code coverage or number or test cases exercised.
    
    Change-Id: Ib853727a5268643fbe8a99f6ebd0fc10aca6a43a

commit 9cb3652f979a7d7a7614aa55286d0099834d604f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Sep 23 08:34:33 2012 +0000

    Uses a common subprocess popen function
    
    Fixes bug 1053381
    
    Change-Id: I8a89ba8d4f03094fcc581981044582c95d1300bb

commit 20aab796759c2ce56082d000db3f46445a34fa9f
Merge: 314fa62 a4a195b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 22 19:07:35 2012 +0000

    Merge "Remove a function that is not used"

commit 314fa62ac1989382decdb5372626e0630b8c5e19
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Sep 17 17:28:00 2012 -0400

    remove default value of local_ip in OVS agent
    
    fixes bug 1051744
    
    Remove the default value for local_ip in the OVS agent config.
    
    Change-Id: Ie23ba8510c0cf5c17443c805e0befce6eccb253c

commit dce563bd214b3957c86b7df1ffdca20ce49c4ddd
Merge: 0f6af09 6bae24d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 14:13:50 2012 +0000

    Merge "Fix OVS and LB plugins' VLAN allocation table synchronization"

commit a4a195b499f0a7a50292f2a1576341e633bd40da
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Sep 20 13:09:45 2012 +0000

    Remove a function that is not used
    
    Fixes bug 1053393
    
    Change-Id: I7b7ae48d9e7bf34ce280a3aec53f1ec11fcd1158

commit 0f6af09b7ec9abf975220b1bef293f26cde2f788
Merge: 00b1c2d da1cf7c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 09:56:49 2012 +0000

    Merge "l3-agent: move check if ext-net bridge exists within daemon loop"

commit 00b1c2dcb80e0eda335d9654eeba5ca9536d48a8
Merge: f308b4b 79b7b63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 09:50:04 2012 +0000

    Merge "all rootwrap filter for 'route', used by l3-agent"

commit f308b4bc80d5d7e50535d2e7168dee4d0ab3d4f7
Merge: b41eb94 cea201a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 09:49:57 2012 +0000

    Merge "ZMQ fixes for Quantum from openstack-common"

commit 79b7b63e9697d9eaab30c2ea76976f9dbb32e684
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 21 01:49:04 2012 -0700

    all rootwrap filter for 'route', used by l3-agent
    
    bug 1053889
    
    Change-Id: If35f1f48464cd0bb795af4e9e82f5d7a9867b0aa

commit b41eb94b1efed7fe39ed54eb89c37ecfa224a8ee
Merge: 84a9dae a13a573
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 08:10:12 2012 +0000

    Merge "Add catch-call try/catch within rpc_loop in ovs plugin agent"

commit da1cf7c27014182033b86a156e829d096459d9f0
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 20 23:52:52 2012 -0700

    l3-agent: move check if ext-net bridge exists within daemon loop
    
    bug 1052522
    
    the l3 agent checked if the external network bridge exists in its
    constructor, raising an uncaught exception if it did not.  this does not
    make much sense when running the l3-agent as a deamon, especially since
    it can be the case that the l3-agent starts before open vswitch.
    
    Change-Id: Ie1717b2c02c9f0bc0caf34a6fdb0dc3a930123c0

commit 84a9dae777771ad1b4ea12ffd28d706ec71bcaa2
Merge: 3fecbfe ce85ecc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 21 05:29:38 2012 +0000

    Merge "Fix deadlock of Metaplugin"

commit a13a5737cde4f81e51a2f939f77fdd35d8ab483e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 20 21:49:51 2012 -0700

    Add catch-call try/catch within rpc_loop in ovs plugin agent
    
    related to bug 1050512
    
    when running in db-mode, the ovs plugin agent will catch any unexpected
    exceptions generated during processing.  However, in rpc-mode, this
    does not happen, meaning a small error, even a transient one, causes the
    agent to exit completely.  Thic change adds a try-catch block to the
    rcp_loop(), causing the agent to log any unexpected exception, wait for
    the polling period, then retry the loop after resetting all state.
    
    Change-Id: I76eae1800831e59c5078c4be8fa5ca22298bfb0a

commit 6bae24df4e6d5a339dc4259b8c996bf452d7be28
Author: Bob Kukura <rkukura@redhat.com>
Date:   Thu Sep 20 16:03:14 2012 -0400

    Fix OVS and LB plugins' VLAN allocation table synchronization
    
    In both the openvswitch and linuxbridge plugins, if previous entries
    for a physical network have been completely removed from the
    network_vlan_ranges configuration variable, allocation table records
    for unallocated VLANs on that physical network are now removed from
    the DB at startup. The test_ovs_db and test_lb_db unit tests have also
    been extended to cover this case. Fixes bug 1052289.
    
    Test assertions that were added to the test_ovs_db unit test in
    https://review.openstack.org/#/c/11388 have been added to the
    test_lb_db unit test. Fixes bug 1045596.
    
    Change-Id: I04e924603eaf0df717414c2aaa83fd203b791308

commit cea201ad17ac8bde73c18e876ef9c01b3e5c7918
Author: Eric Windisch <eric@cloudscaling.com>
Date:   Thu Sep 20 18:50:32 2012 -0400

    ZMQ fixes for Quantum from openstack-common
    
    Change Ifdeff8ae: Support declare_topic_consumer in impl_zmq
    Change Ifc132519: fanout subscriptions in impl_zmq
    
    Change-Id: Ic51fd09c302e767316d72fb38892e3761ef36de9

commit 3fecbfe002304a96637ea8e81d8eaf881a651245
Merge: 30fe8a4 abc1297
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 20 16:57:26 2012 +0000

    Merge "Fix for flat network creation in Cisco plugin"

commit 30fe8a4e3c53438bbfb24ba882b3a37c65440e72
Author: Thierry Carrez <thierry@openstack.org>
Date:   Thu Sep 20 14:42:53 2012 +0200

    Restore SIGPIPE default action for subprocesses
    
    Python ignores SIGPIPE on startup, because it prefers to check every
    write and raise an IOError exception rather than taking the signal. Most
    Unix subprocesses don't expect to work this way. This patch (adapted
    from Colin Watson's post at http://tinyurl.com/2a7mzh5) sets SIGPIPE
    back to the default action for quantum.agent.linux.utils.execute,
    quantum.common.utils.execute and quantum-rootwrap created subprocesses.
    
    Fixes bug 1053364
    
    Change-Id: Ib805f1f8846c245b75a5ea64278c840b823c1fb2

commit abc129701d0271e7838285403a662ce872479c63
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Sep 19 13:20:12 2012 -0700

    Fix for flat network creation in Cisco plugin
    
    Bug #1053154
    
    Checks for the validity of the VLAN ID needed to be performed. In cases where
    segmentation ID is not greater than zero, the Nexus sub-plugin does not
    need to be invoked for that network.
    
    Change-Id: I813d569c0c3d26c08554bf3599633b700a98c739

commit 3c3de4356aca19f8f47d1dd08e363accb857662b
Merge: 5b9f7a9 74e3112
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 18:01:47 2012 +0000

    Merge "Removes test desription that is no longer valid"

commit 74e311261b80ebddead0ec66cb4aff6bdf45b266
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Sep 19 13:32:04 2012 +0000

    Removes test desription that is no longer valid
    
    Fixes bug 1052727
    
    Change-Id: I01b81febfcc3e38a198bed55e55451746f321ab1

commit 5b9f7a9ad0281cb1596defb792fd426497590aa7
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 22:56:17 2012 +0800

    Modified code Pyflakes warning.
    
    File model_base.py:
    W402 'sa' imported but unused
    
    Change-Id: I167fbb81f88ddf6d2c6405832d0fe1c445509402

commit dec99295056e237e3fd02db0b3151e56ed6eb256
Merge: 30e7980 c874bd8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 05:27:25 2012 +0000

    Merge "remove unittest section for nec plugin README file"

commit 30e798020aa02e91b08a7dca97005cb316e1b5a6
Merge: 7834a39 fb9fa2c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 05:27:07 2012 +0000

    Merge "remove unittest section for ryu plugin README file"

commit 7834a39dc798b6ad56f2736af038b053db3ded7a
Merge: fd8c2ef 2e4d541
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 05:22:55 2012 +0000

    Merge "NVP plugin missing dhcp rpc callbacks"

commit fd8c2efcf372b673d88fa7c94688b45bb4198b8a
Merge: a6fbe83 f6e9158
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 19 05:04:00 2012 +0000

    Merge "always push down metadata rules for router, not just if gateway exists"

commit ce85ecc40ae722f5d90e8c4bf0790c2710caa08d
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Sep 19 03:26:07 2012 +0000

    Fix deadlock of Metaplugin
    
    Fixes bug 1049981
    Fix deadlock on network creation
    Fix attribute filtering function
    
    Change-Id: I6b75ea9c22b7844f84de16416d9610ad8c628800

commit c874bd8c4cdc9f958d369e2554f4b82b97e54be3
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Wed Sep 19 10:47:39 2012 +0800

    remove unittest section for nec plugin README file
    
    Fixes bug 1052731.
    
    Change-Id: Ie69ab4a8ae805dc2a12aac92e817420c675142a6

commit fb9fa2c96500155239f984f9b6e3f62f014d24a4
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Wed Sep 19 10:30:57 2012 +0800

    remove unittest section for ryu plugin README file
    
    Fixes bug 1052729.
    
    Change-Id: I396512678ddb98e2a572a94633fbf8633fd6d930

commit 393ee84625f7d0b8d66e45bfb3eceb77c76db1d4
Merge: 7725acb 643afef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 18 17:01:47 2012 +0000

    Merge "Fix for DB error in the Cisco plugin"

commit 643afefa0f3b2b5c5f1f7af2e0cb7f5e04daf790
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Sep 17 23:16:15 2012 -0700

    Fix for DB error in the Cisco plugin
    
    Bug #1052295
    
    When the Cisco plugin is configured to support the L3 extension, the L3
    DB model is not getting loaded correctly. Adding this import fixes that
    issue.
    
    Change-Id: I736bd2e767595088de8ebee929258a88f5cbd238

commit 7725acb0f32be0a482ea1cd5d52b360e9c512bce
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Sep 18 10:36:12 2012 +0800

    modify the wrong phy_brs into phys_brs.
    
    Bug #1052281
    
    Change-Id: I569e60aa1f8ab8313e5427bd16798cc6b4079a09

commit 2e4d541fa82e7c1294059ad7d3db1c044d1789ce
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Sep 17 17:44:11 2012 -0400

    NVP plugin missing dhcp rpc callbacks
    
    Fixes bug 1052202
    
    Change-Id: I6a906bd77cce85c7488d901bb2461fb970d1d5d0

commit d768cf1d2f5e63afd462a52a5cf5368d7ac438cd
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Sep 17 15:24:38 2012 -0700

    make README point to real v2 API spec
    
    bug 1052222
    
    Change-Id: I0ecbcd71b25e6c7f514cc2f7e8cb071b75d53059

commit f8850fb5e5cc17a4dc9cf3330d2b0d8284ff443d
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Sep 17 10:53:01 2012 -0700

    README file changes for Cisco plugin
    
    Bug #1052109
    
    Moving the contents to wiki.
    
    Change-Id: I4aef2d710a7a4c1567d8701954ae04ba33095686

commit 39f87f6a12313a20fd0dfebd10bba87c0f7b5ec4
Merge: 6d19a96 a80d8b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 18:24:53 2012 +0000

    Merge "fix for nested rootwrap checks with 'ip netns exec'"

commit a80d8b03421f0d920eaa336f3389ad2cad4f032b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Sep 17 10:35:51 2012 -0700

    fix for nested rootwrap checks with 'ip netns exec'
    
    bug 1051525
    
    Change-Id: Ia52060afec1c573c8f11d658af88cea7e000d774

commit f6e9158d6ff5afeae2712cf4d8c2e0de4dc500b0
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Sep 17 09:29:35 2012 -0700

    always push down metadata rules for router, not just if gateway exists
    
    bug 1051842
    
    the l3-agent only pushes down some of the DNAT rules for metadata mapping
    if there is a gateway set on a router. However, the nova-api server could
    itself be running in the local router namespace (or on the same box as
    the quantum-l3-agent in the case were namespaces are disabled. In fact,
    with namespaces disabled, this is the likely setup for a simple
    environment). Thus, we should simply always push down the metadata nat
    rules for a router, router than waiting until a gateway is added.
    
    This patch also refactors the actions taken by the l3-agent when a router
    is added or removed into a separate function for improved readability,
    as add/removing the nat rules made these code segments even longer.
    
    Change-Id: I3c6eb35b51df3babf747dbcff7f943b850e69838

commit a6fbe838954ebc9432da58322ddece3ae47178c0
Author: Maru Newby <mnewby@internap.com>
Date:   Mon Sep 17 18:46:38 2012 -0700

    Removed eval of unchecked strings.
    
     * eval() was previously used to marshall unchecked strings as
       filter parameters for QuantumDbPluginV2.get_ports() via
       the --fixed_ips flag.
     * This change removes the use of eval and cleans up the filtering
       implementation for get_ports().
     * The new filtering implementation does not support arbitrary
       OR'ing or AND'ing.  Instead, multiple values for a given filter
       key are logically OR'ed, and filters across keys are AND'ed.
     * Example usage - filter for .2 or .3 in the given subnet:
    
         quantum port-list -- --fixed_ips ip_address=10.0.0.3 \
             ip_address=10.0.0.2 subnet_id=nOtaRealId
    
     * Addresses bug 1052179
    
    Change-Id: I451f33ae53e623f86015b3fc2e6a7ca2f51ee836

commit 6d19a96a696a9748df204995432c8133b9fbf5f6
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 17 02:25:01 2012 -0700

    Update NVP plugin to Quantum v2.
    
    Fix bug 1051870
    
    Change-Id: Ie3885f0bf370f2423ed3dc891736d0bb21014605

commit 652dafc9127e9209bce63c209028a173344560c5
Merge: 2d20ad3 8ba098a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 17 07:25:42 2012 +0000

    Merge "ovs-lib: make db_get_map return empty dict on error"

commit 8ba098a65acafe4ffde1b51f97f7b6a1b45e6d99
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Sep 16 23:48:19 2012 -0700

    ovs-lib: make db_get_map return empty dict on error
    
    bug 1050504
    
    this fixes a crash caused when we try to iterate over the return value
    of db_get_map
    
    Change-Id: I56640035c3e166ddcc3d23e76be9118604dbeadc

commit 2d20ad3588e2cb2d585699d51ee8167025e3d736
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Sep 16 09:39:57 2012 +0000

    Update l3-agent.ini with missing configuration flags
    
    Fixes bug 1051349
    
    Change-Id: I7f977c21dbe6bf6fbb8665648a50cd8954c737be

commit 5ba0f9c4e461c8d86073d3e6371f80a358a6cb3d
Merge: b2a4bfc aa5ef1d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 16 04:52:52 2012 +0000

    Merge "Fix for failing network operations in Cisco plugin"

commit b2a4bfc30d1f7cba6fc751095e5a7e093b0abae4
Merge: e3459fa c307e5e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 16 04:46:26 2012 +0000

    Merge "Sync a change to rpc from openstack-common."

commit c307e5e26f72e7567e4c6c916a04e281f65fe2a2
Author: Russell Bryant <rbryant@redhat.com>
Date:   Fri Sep 14 14:00:45 2012 -0400

    Sync a change to rpc from openstack-common.
    
    This commit pulls in the following change from openstack-common:
    
        ee44222 Change the qpid_heartbeat default to 60 seconds.
    
    Fix bug 1050661.
    
    Change-Id: I2cb63d091f3d8a9a35d0e35ef18b70409c1f09ae

commit e3459fa01cfd020f3d36288466b64eec39fc2cfc
Merge: d405b4c 39cce9b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 15 02:29:00 2012 +0000

    Merge "add missing files from setup.py"

commit aa5ef1d44f9b5438f0b5b15814c2644690635ee0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Sep 14 17:50:54 2012 -0700

    Fix for failing network operations in Cisco plugin
    
    Bug #1050545
    
    This fixes the exceptions occurring in the virtual switch mode of the
    Cisco plugin for create/delete/update network operations. The exceptions
    were occurring on account of the recent changes in the OVS module to the
    get_vlan and get_vlans methods, which were still being invoked here.
    Test configuration has been changed to increase the code coverage to
    catch such issues in the future. All changes are limited to the Cisco
    plugin and related tests.
    
    Change-Id: Id18473f7a9a2a22217a59b4f8b1541b4918e07e7

commit 39cce9beddc6d3ed78c8c55bd972465a7af69420
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu Sep 13 11:43:54 2012 +0800

    add missing files from setup.py
    
    Fixes bug 1050045.
    
    Currently, setup.py will not copy l3_agent.ini and rootwrap filters
    into directory /etc/quantum. Add copy operation in setup.py for those
    config files so that those files will be copied into proper directory.
    
    Change-Id: I7052d6c07ffd4d03cafa93187d8072053ee0a832

commit d405b4caaebdfc765afbe8914f4d17a9af93babf
Merge: 7e2db08 12e2afc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 13 15:04:48 2012 +0000

    Merge "remove not need shebang line in quantum debug"

commit 7e2db08e6f4ed5f0d640b4c07189a8edd0b28b28
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Sep 13 13:36:09 2012 +0900

    Add quantum-nec-agent to bin directory.
    
    Fixes bug 1050047
    
    Change-Id: I8b946b08b0dc58881a9f149d17623462e058debc

commit 12e2afc113add0150f3f6f5d2975929367854880
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu Sep 13 12:17:49 2012 +0800

    remove not need shebang line in quantum debug
    
    Fixes bug 1050053.
    
    Change-Id: Ia1d8e665d330698d246bddb57330cb376244a1f9

commit 713d92e7b1397386be8fbca3a29eaa492e28f2b6
Author: Jiajun Liu <jiajun@unitedstack.com>
Date:   Thu Sep 13 10:09:30 2012 +0800

    make rootwrap filters path consistent with other openstack project
    
    Fixes bug 1050062.
    
    Change-Id: I0c3fc84af8ed9bca2e0bd2f11cbc3b737b6a4001

commit 68ae41ffbd9d0034024b2fc3d24c105ca9a7a5ef
Author: Thierry Carrez <thierry@openstack.org>
Date:   Wed Sep 12 10:18:12 2012 +0200

    Bump version to 2013.1, open Grizzly
    
    Bump version number to 2013.1 to open Grizzly development on master
    branch.
    
    Change-Id: I653f52bdfdf09b86efab86f69bc4b9dde02827c4

commit ba0258f1206ad20f21401586d07c472635038e8c
Merge: f84339f aa5a7aa
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 22:27:26 2012 +0000

    Merge "Add a new interface driver OVSVethInterfaceDriver."

commit f84339f5c1ea3938b0bacd4137ef5f065f15ad12
Merge: 089ad60 a49c0a8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 21:40:33 2012 +0000

    Merge "Create .mailmap file"

commit 089ad604cdce1f8944024f032a018e04e90d32f8
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Sep 11 22:24:57 2012 +0900

    Fix lack of L3 support of NEC OpenFlow plugin
    
    VMs cannot access the external network without l3 support.
    
    Fixes bug 1042109
    
    Change-Id: I19de7c348a62040bb07f431afe287751faf27c32

commit aa5a7aaf47b6cf97a6f35934f68570ecfc16bd4e
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Sep 10 22:21:35 2012 +0900

    Add a new interface driver OVSVethInterfaceDriver.
    
    Fixes bug 1048681
    
    This commit fixes a bug that quantum agent using a namespace does not
    work with NEC plugin. NEC plugin uses an Open vSwitch as an OpenFlow switch,
    but an OVS port created by ovs-vsctl add-port becomes down when the port is
    moved to some network namespace. Usual OpenFlow controllers respect the
    OpenFlow port status. Since DHCP server (dnsmasq) is connected to the down
    port, DHCP server disappears from the virtual network.
    
    This behavior can be avoided if we use a similar approach used in
    BridgeInterfaceDriver, i.e., we first create a veth pair, add one veth device
    to OVS and move the other veth device to a network namespace. To accomplish it
    this patch introduces a new interface driver OVSVethInterfaceDriver.
    
    In addition, this patch adds a 'prefix' paramter to unplug(). When deleting
    a veth pair, a veth device added to OVS bridge is not removed automatically.
    Thus we need a mean to know the veth device name from a device_name to be
    removed. It is the reason to add 'prefix' parameter to unplug().
    
    Change-Id: I3f4eae371a27a3171a6a8c9e38ddc9354ed1b6b0

commit b8ecd0aa22eb2a32a0cf7f20c06f4e046b9f62de
Merge: feee2f2 9b5871c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 16:51:08 2012 +0000

    Merge "Ensure that l3 agent does not crash on restart"

commit feee2f2976d565e545ecde339ce6876a58f54561
Merge: 9597aa0 1fafffb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 15:23:35 2012 +0000

    Merge "Exclude openstack-common from pep8 test"

commit 9b5871c658e1ec77bc29da507a2471a8b81b3702
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Sep 10 04:19:09 2012 -0400

    Ensure that l3 agent does not crash on restart
    
    Fixes bug 1048108
    
    The changeset also removed the namespace garbage collection from the port unplug. This
    attempts to delete the namespace. This is problematic as there may be additional attributes
    to the namespace that need to be dealt with.
    
    Change-Id: I418a1ec4e9b65e5bea67ae84414019c3d6b54214

commit 9597aa04bff9427661901a2724f4f87014cf2f5c
Merge: 16a943c d5e49cb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 09:06:28 2012 +0000

    Merge "make subnets attribute of a network read-only"

commit 16a943c063fd49eb759883c88275d14a1227bbb9
Merge: ba8ab71 93c7147
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 08:46:09 2012 +0000

    Merge "Ensures that the Linux Bridge Plugin runs with L3 agent"

commit d5e49cb8579e65a2ab6711c8942d8a65d6baf75a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Sep 11 01:26:57 2012 -0700

    make subnets attribute of a network read-only
    
    bug 1046173
    
    writing to the subnets attribute is not supported, so rather than
    making it looks like we accept it but ignoring it, we should explicitly
    reject requests to specify it on network create/update.
    
    Change-Id: I5b6f0f35794c9d5606befb97a89c6c6c97ee3dbf

commit ba8ab71235c645eafa235cde6d4ae89db89a5234
Merge: c0473e1 3caafd9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 08:09:46 2012 +0000

    Merge "Update default policy for add/remove router interface to admin_or_owner"

commit 1fafffb8c261a739b9b07dff16f479db06bba03c
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Sep 11 14:50:13 2012 +0800

    Exclude openstack-common from pep8 test
    
    Fixes bug #1048962
    
    Added "openstack" to PEP8_EXCLUDE in run_tests.sh
    
    Change-Id: I5919c97681b1f037e231df7ddb449c2a16366128

commit 93c7147bdb677e30a5564088c18c4b763fd588c4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Sep 11 06:32:12 2012 +0000

    Ensures that the Linux Bridge Plugin runs with L3 agent
    
    Fixes bug 1048968
    
    1. The external interface for the linux bridge will be created at run time.
    The configuration parameter external_network_bridge should be set as empty.
    That is, "external_network_bridge = ". The link between the network and
    the physical interface should be done via the provider network parameters.
    2. The plug operation for the linux bridge replaces the interface name
    prefix with tap. We need to ensure that the prefix length is 3 characters.
    
    Change-Id: Ib8e26bc1f603a1aff9560b4a40110a6824db5921

commit c0473e19858da0ddb17757e175522fb40ada9626
Merge: 76bb3e2 00dd97c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 06:27:13 2012 +0000

    Merge "Add enable_tunneling openvswitch configuration variable"

commit 76bb3e253ca2ed82793ede6c1b497bf21e8116d1
Merge: aa100f9 01aa0f2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 05:48:29 2012 +0000

    Merge "Update metaplugin with l3 extension update"

commit aa100f9f661a91f88f9ebc24a5b91a368032a81d
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Sep 11 13:44:57 2012 +0900

    Remove an external port when an error occurs during FIP creation.
    
    Fixes bug 1048140
    
    To remove an external port, we need to use the same context used
    when it is created.
    
    Change-Id: Ia89b086b420741e7e0e92625b62e46fcfe9dbbba

commit 6f8939ee96cd02d730f984c35468b1979d18b6fd
Merge: 07e7795 24c6e81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 04:49:15 2012 +0000

    Merge "Remove the exeception handler since it makes no sense."

commit 07e779590783e5d681617d649328876c8d94436c
Merge: 39b74e4 9890aa7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 03:41:23 2012 +0000

    Merge "Add periodic check resync check to DHCP agent"

commit 24c6e813203c74a1c5c42d4e0923ae1e37198033
Author: gongysh <gongysh@cn.ibm.com>
Date:   Tue Sep 11 11:03:58 2012 +0800

    Remove the exeception handler since it makes no sense.
    
    Bug #1048906
    
    Change-Id: Idd4d20bb066a73b790155a8886bceea94f19805c

commit 00dd97c7e9a852f4abd6e8460a0d094c01d3d0ba
Author: Bob Kukura <rkukura@redhat.com>
Date:   Sun Sep 9 11:49:25 2012 -0400

    Add enable_tunneling openvswitch configuration variable
    
    Not all systems that support Open vSwitch support its GRE tunneling
    feature that is not in the Linux kernel source tree. Therefore, a new
    configuration variable, enable_tunneling, applies to both the server
    and agent. Its default value is False, so it must be set to True to
    enable tunneling for tenant and/or provider networks. If
    enable_tunneling is False, the server will not allow creation of GRE
    networks, and the agent will not initialize the tunnel bridge and will
    log an error if there is an attempt to provision a GRE network. If it
    is True, the agent now logs an error and exits if it fails to
    initialize the patch ports used for the tunnel bridge. Fixes bug
    1045610.
    
    When there is an attempt to provision a flat or VLAN network and the
    agent has no bridge mapping configured for a the specified physical
    network, the agent will now log an error rather than crash.
    
    An undefined variable in a logging statement has been corrected.
    
    Logging levels for openvswitch have been checked and updated where
    necessary, and logging statements now avoid the % string substitution
    syntax. Fixes bug 1045592.
    
    The corresponding devstack update has already been merged.
    
    Change-Id: I149db182dd132cc05802dcb20c6b552e293664a5

commit a49c0a8e45fa56aaf989793a95c2390456238030
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Sep 11 10:34:14 2012 +0800

    Create .mailmap file
    
    Fixes bug #1048903
    
    Use .mailmap file to coalesce commits
    by the same person using multiple names and/or email addresses
    
    Change-Id: Ib702114da944ec9d117ab969cde0b29a89999467

commit 3caafd9e011cb62580a2297af1ff7c1bb40eb210
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Tue Sep 11 02:01:46 2012 +0000

    Update default policy for add/remove router interface to admin_or_owner
    
    Fixes bug 1048891
    default policy for add/remove router interface
    should be admin_or_owner
    
    Change-Id: Idc797d8a2e7dc17b517fed4668b256344438a257

commit 9890aa7c8d71a6fd6f4d7e4efc0e6b6c14d273a7
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Sep 10 15:28:56 2012 -0400

    Add periodic check resync check to DHCP agent
    
    fixes bug 1047605
    
    This patch adds a periodic resync check to the DHCP agent that will
    resync state with the Quantum server if any notification or rpc errors
    have occurred since the last check.
    
    Change-Id: I879662ff44f2991cd2ff07062bb4e770a2981528

commit 39b74e42ecdc0ea6aaeaed88c33f6be9070b35ab
Merge: ba684d7 cb38773
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 11 01:12:11 2012 +0000

    Merge "Remove an external interface when router-gateway is removed."

commit 01aa0f25d8d30050c3216d85011e166bb0358b6d
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Sat Sep 8 01:34:44 2012 +0000

    Update metaplugin with l3 extension update
    
    Fixes bug 1047587
    Added l3 handling for api call
    Add l3 test for metaplugin
    
    Change-Id: I4cc189f68630ee2b5428b1aae45840934786be81

commit ba684d7ac2dd1fbcb4a51aa7950e2599659d2acd
Merge: 1614c5d 81937f4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 10 15:58:54 2012 +0000

    Merge "openvswitch plugin does not remove inbound unicast flow in br-tun"

commit 1614c5d1891440587cc96d180292ecf1cc2af6c8
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Sep 10 21:45:33 2012 +0900

    Add DHCP RPC API support to NEC OpenFlow plugin
    
    It is necessary to use DHCP with NEC OpenFlow plugin.
    
    Fixes bug 1048622
    
    Change-Id: Ia33e1157644232504c1d4683bbc83d678fb58409

commit cb38773cc70e7977be7dd9fc44815f2c13defa9d
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Sep 10 21:35:29 2012 +0900

    Remove an external interface when router-gateway is removed.
    
    Fixes bug 1048617
    
    Change-Id: Ib7e80fcd6b7e2ffd974067a8039dd74f25005856

commit 0a2d8ebba4f32b025eab26858693cc3cdd4ff5de
Merge: a42e407 c01e54b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 10 00:21:07 2012 +0000

    Merge "Added policy checks for add interface and remove interface"

commit 81937f4a2049461a821878b32db088147fbb6a78
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Sep 6 00:32:04 2012 -0400

    openvswitch plugin does not remove inbound unicast flow in br-tun
    
    Fixes bug 1044565 In addition to adding port_unbound call when using rpc
    
    Change-Id: Ie924f94bcedebbe24f3aa0a52d1682bc944a0aec

commit a42e40706667a0bb8c7a9b6740f853feacad9623
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Sep 9 15:19:46 2012 -0400

    Remove default name for DHCP port.
    
    fixes bug 1048357
    
    This patch removes the code that set the port name for the DHCP agent.
    
    Change-Id: Icd769486c5f335d533349ac5e94ac9771c8ca450

commit b773a0dcabe5e0c6b78130309dcc3f3ec42d9f1e
Merge: 7d52eb2 6606c6b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 17:16:05 2012 +0000

    Merge "allow multiple l3-agents to run, each with one external gateway net"

commit c01e54bde27382bc803ef14c0a57a3fd070b1559
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Sep 5 20:29:27 2012 +0000

    Added policy checks for add interface and remove interface
    
    Fixes bug 1042037
    admin_only policy didn't works, so policy checks
    for add interface and remove interface needed.
    Also updated policy.json
    
    Change-Id: Ifec281250ccbe1680a3e634f4efdb7ba7ef3ec94

commit 7d52eb29b850007dc52e4a9296e2a6dd6fe49eac
Merge: 2bfb396 99f8912
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 15:35:48 2012 +0000

    Merge "Prevent floating-ip and ex-gateway ports should prevent net deletion"

commit 2bfb396054a148af33eb4896338dea720645ba7c
Merge: 59b9b25 11fb7b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 15:04:36 2012 +0000

    Merge "Fix broken L3 support of Ryu plugin"

commit 6606c6b288f6f92a9b8c865fcec01b841f9df7af
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Sep 9 07:55:52 2012 -0700

    allow multiple l3-agents to run, each with one external gateway net
    
    bug #1042028
    
    Allows user to invoke L3-agent in a way that limits the agent to
    implementing only routers associated with a particular external network.
    Thus, it is possible to have a deployment with multiple external networks,
    since you can run one agent per external network.
    
    Also makes l3-agent pay attention to router admin_state_up field.
    
    Change-Id: Ia79d29301530718bc381c8e5a9d197de9452bce2

commit 99f8912283332f76bc20d8094e6dd1187932adc1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Sep 9 07:53:37 2012 -0700

    Prevent floating-ip and ex-gateway ports should prevent net deletion
    
    bug 1044331
    
    Old behavior meant that any port with device owner starting with
    "network:" would be auto-deleted when a network was deleted.  We don't
    want that behavior for floating IPs or external network gateways.
    This provides a model where we explicitly list the set of owners that
    should be auto-deleted.
    
    - Also clean up NetworkInUse message to no longer mention 'attachment',
    since that is API v1 terminology.
    
    Change-Id: Icb727ae86d490456ec1ebc55cec1bf98ae6490c9

commit 59b9b2577a587a4d01ff7ec31bfee1cb7305f739
Merge: 5f65586 88cd4f8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 12:07:13 2012 +0000

    Merge "add local network type and use by default for tenant networks"

commit 5f65586e9d774ac8ddbe610c4fb2762b60adfd3d
Merge: 32d0f9c 255552c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 09:52:22 2012 +0000

    Merge "Change 422 error to 400 error"

commit 32d0f9c717772055923672b360e4b8c080c7ade7
Merge: bcd4306 1820686
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 07:09:16 2012 +0000

    Merge "fix generation of exception for mismatched floating ip tenant-ids"

commit bcd430660a34b3db0dcd0a74ab1cf7cfb3042bf0
Merge: 62a5243 fde632f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 05:46:57 2012 +0000

    Merge "Give better error to client on server 500 error"

commit 62a5243569237559bd4fa9d6f82993d2082be75a
Merge: 9b8d9a0 7a5b3f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 05:35:54 2012 +0000

    Merge "Modified code Pyflakes warning."

commit 9b8d9a08daafcef627ca4eaac475f206925237f7
Merge: fb8e6df 1dbf086
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 05:35:14 2012 +0000

    Merge "Modified code Pyflakes warning."

commit fb8e6df4fe67fac6d01c6df57a8f0d5a5f9bc1d0
Merge: a34b41c 79553f3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 05:34:10 2012 +0000

    Merge "Modified code Pyflakes warning."

commit 1820686852fe5742547f106a4696bf4530fa970c
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Sep 8 22:25:19 2012 -0700

    fix generation of exception for mismatched floating ip tenant-ids
    
    bug 1048104
    
    There was a KeyError in the case where we tried to throw an exception
    to inform the user that a newly created floating ip could not be
    associated with the requested port because they belonged to different
    tenants.
    
    Change-Id: I387e5f166761da78b941b62a9a396809491b8f09

commit fde632fc5cc95d5abceb0493d2cbdcf274c11043
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Sep 8 22:18:39 2012 -0700

    Give better error to client on server 500 error
    
    bug 1048109
    
    Change-Id: Iaaa187a7868ee6227315b9c3354b424fe7c42508

commit a34b41c75b9852451f69b1a2f079e0ca27f73764
Merge: a7326a9 3d1608d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Sep 9 05:08:48 2012 +0000

    Merge "Add IP version check for IP address fields."

commit 255552cb7bf4dd5849791a7c88cda709f6ce829d
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Sun Sep 9 04:58:07 2012 +0000

    Change 422 error to 400 error
    
    Fixes bug 1046956
    For error code consistency, change 422 error to 400 error
    
    Change-Id: I1d150c883e204af8a32de61f91392a46d8397ae1

commit 3d1608de0da3e194735edf058d524d31b507b2a6
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Sep 7 19:31:10 2012 +0900

    Add IP version check for IP address fields.
    
    Fixes bug 1046952
    
    In create/update_subnet(), IP address fields (cidr, gateway_ip, host_routes,
    dns_nameserver) should be checked whether they are consistent with IP version
    specified. IP version check for allocation_pools is already implemented,
    so this commit adds IP version checks for other IP fields.
    
    Change-Id: Ic02f5a1fd8ec4c1c363599c906ba0c818dd22268

commit a7326a947bc0b30778e06acd772dd38bcb28d96d
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 3 14:17:20 2012 -0700

    Policies for external networks
    
    Bug #1042030 , part 2
    
    Also reworks model queries in order to allow plugins and extensions
    to augment them as required through hooks.
    
    Change-Id: Ice72fc6d3b1c613d596c037818ed66d7e9ed841d

commit 4ce397d02c479026cb9d5d56477983c5dd6ea02a
Merge: 4ac8081 82d38c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 8 20:37:19 2012 +0000

    Merge "remove incorrect mock assert_called in unit tests"

commit 4ac8081de387ac2b42875161f5f669ed4a691c72
Merge: cd9dffc 7548d3c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 8 19:58:09 2012 +0000

    Merge "Add IP commands to rootwrap fileter for OVS agent"

commit 7548d3c1fbabac6ede98c73fdd1867dfee124cbc
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Sep 8 13:02:29 2012 -0400

    Add IP commands to rootwrap fileter for OVS agent
    
    Fixes bug 1045598
    
    Change-Id: I97151030e5f3a71202b583dea6797ca16bd34f7c

commit 7a5b3f36621212230e5f51d1076123c915c0346c
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 22:06:54 2012 +0800

    Modified code Pyflakes warning.
    
    File dhcp_rpc_base.py:
    W402 'db' imported but unused
    
    Change-Id: Ie376f3b9bf4745b33d57a47f520ea8a4cb58be10

commit 1dbf086aa9b7ecb6c757ab3124b5d9e0c953de79
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 22:01:07 2012 +0800

    Modified code Pyflakes warning.
    
    File api.py:
    W402 'q_exc' imported but unused
    
    Change-Id: Ibe8fa9c3b3607165bcd30867ef0df71aea04806b

commit 79553f339bff5ce49458bfdd1b4905f0907216eb
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 21:54:05 2012 +0800

    Modified code Pyflakes warning.
    
    File utils.py:
    W402 'datetime' imported but unused
    W402 'inspect' imported but unused
    W402 'exception' imported but unused
    
    Change-Id: I07ad88653e1b0a98ea80a6206890428de3f24865

commit cd9dffca418f19b12034b83132f91c341dca9a41
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 21:49:17 2012 +0800

    Modified code Pyflakes warning.
    
    File api_common.py:
    W402 'wsgi' imported but unused
    
    Change-Id: If475bae879d2f0412d48fed5eb5c819c7d941f14

commit e6fdd41cda7f98131f700c9c832d2ceb3716842f
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 21:42:27 2012 +0800

    Modified code Pyflakes warning.
    
    File netns_cleanup_util.py:
    W402 'os' imported but unused
    W402 'traceback' imported but unused
    
    Change-Id: I439341d82198895412b1610cab607396c559ccb0

commit 680a90764c9bf843c20999246b261677d0a76e1e
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 21:35:26 2012 +0800

    Modified code Pyflakes warning.
    
    File l3_agent.py:
    W402 'linux_utils' imported but unused
    
    Change-Id: I774cb00c2d55ffdd1184694810bb7a7f6e3de724

commit eed599ddd275dcb89275bf831550730d927e2b03
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 21:24:51 2012 +0800

    Modified code Pyflakes warning.
    
    File ovs_lib.py:
    W402 'shlex' imported but unused
    W402 'signal' imported but unused
    W402 'subprocess' imported but unused
    
    Change-Id: I10132c42390f1ea4b1a6171146d7bee0e1b0d8fa

commit 29e1d3a84f2198e7706acb38d82c67080b7f1f30
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 19:45:17 2012 +0800

    Modified code Pyflakes warning.
    
    File iptables_manager.py:
    W402 'ConfigParse' imported but unused
    W402 'subprocess' imported but unused
    
    Change-Id: Ib364835518c0517dbe9e95d1ac6445bfbd704860

commit ff5bff89d42c8f4bf486625167c4f215eea18453
Author: siyingchun <siyingchun@sina.com>
Date:   Sat Sep 8 19:37:03 2012 +0800

    Modified code Pyflakes warning.
    
    File config.py:
    W402 'os' imported but unused
    
    Change-Id: Ie6e728183638312ccfa09e62626e05a49289009b

commit 1f6165b6eae8b45d0b64a932d4078324b3ce3b50
Merge: 6c98c6f 64cd776
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 8 14:35:29 2012 +0000

    Merge "Fix dhcp agent rpc exception handling"

commit 11fb7b4c910e499a396bb37627a5337990f1c015
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Sat Sep 8 18:15:04 2012 +0900

    Fix broken L3 support of Ryu plugin
    
    Fixes bug 1047230
    
    This patch adds support for the router:external attribute of a network
    to Ryu plugin.
    
    Change-Id: I135fe0a4e90fe049cabbaa1b87e9294ec0613530

commit 6c98c6f8d112b3c5a360a1c82a42f1f442404dd9
Merge: 650d676 5c5aadd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 8 07:49:08 2012 +0000

    Merge "check subnet overlapping when adding interface to router"

commit 5c5aadd2a1cc404acf1240f5273cce3c6d7d575a
Author: Hisaharu Ishii <ishii@nttmcl.com>
Date:   Thu Sep 6 17:32:56 2012 -0700

    check subnet overlapping when adding interface to router
    
    Fixes bug 1046061
    
    Add logic in _check_for_dup_router_subnet to check subnets are not overlapped.
    Add testcase test_router_add_interface_overlapped_cidr.
    
    Change-Id: I71b6cce07273686cc5e4636ce640b7201ce00b32

commit 88cd4f85047cb8844fd192f3c8d4b087b4085a1a
Author: Bob Kukura <rkukura@redhat.com>
Date:   Tue Sep 4 12:30:34 2012 -0400

    add local network type and use by default for tenant networks
    
    Fixes bug 1045142.
    
    This patch adds 'local' as a new value for provider:network_type,
    supported by the openvswitch and linuxbridge plugins. Networks of this
    type provide connectivity through a bridge for VMs and agents local to
    the host, but no external connectivity. They do not require
    provider:physical_network or provider:segmentation_id values. These
    local networks are intended mainly to support single-box
    zero-configuration testing (including quantum gating), but may have
    other uses as well.
    
    For openvswitch, the new OVS.tenant_network_type configuration
    variable selects what type of networks are allocated as tenant
    (i.e. non-provider) networks. It defaults to 'local', but must be
    changed to 'vlan' or 'gre' for openvswitch tenant networks to have
    external connectivity. The default value is intended to support
    single-box zero-configuration testing without any need to allocate
    physical network resources or configure bridges, and without requiring
    the operating system to support OVS GRE tunneling. It can also be set
    to 'none' to completely disable creation of tenant networks.
    
    For linuxbridge, the new VLANS.tenant_network_type configuration
    variable works similarly, with a value of 'vlan' supporting tenant
    networks with external connectivity.
    
    With either plugin, administrators can create provider local networks
    by specifying "--provider:network_type local". Additionally, with
    openvswitch, provider GRE networks can now be created by specifying
    "--provider:network_type gre --provider:segmentation_id <tunnel-id>".
    
    A corresponding devstack patch is available at
    https://review.openstack.org/#/c/12456/. With this patch, the
    openvswitch and linuxbridge plugins are by default configured to
    support only local networks. A set of shell variables, documented in
    stack.sh, can be set in localrc to configure remote connectivity,
    including bridges/interfaces available for provider networks.
    
    Change-Id: I2812548326141d2212d04f34d5448fb974d298e0

commit 650d676765f5927cd073bb8ff95c0085c71d50e2
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Sep 7 16:45:48 2012 -0700

    Fix data passed to policy engine on update
    
    fix bug 1044218
    
    The original resource status fetched to the db was not being
    properly updated with the request body before feeding it to the
    policy engine
    
    Change-Id: I9f71e40edf44136a40fad1ef272696d6b3ea352d

commit 82d38c0ecd915bd7c4f5d4790253e6cc18858753
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Sep 7 14:52:12 2012 -0400

    remove incorrect mock assert_called in unit tests
    
    fixes bug 1047569
    
    The unit tests were calling a nonexistent assert_called() on the
    mocks.  This patch fixes the problem by using the correct assert for
    checking that the mocked method was invoked.
    
    Note: This patch does not fix the error in test_call_driver() because a
    separate bug fix revises the test.
    
    Change-Id: Ie62e2e64f314f9ba34761e63cd5d0d6e44c5d094

commit 64cd776da0c26f9324d3dc2918c321d4b6465d5e
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Sep 7 12:39:39 2012 -0400

    Fix dhcp agent rpc exception handling
    
    fixes bug 1046904
    
    This patch adds exception handling to log rpc exceptions.  Previously,
    the agent would terminate due to uncaught errors during initialization.
    
    Change-Id: I4835c1616e2ccfc9c42c591e8c7446db50721d01

commit 363a0579dbc56a597e28a8adea5dc4b2ae6d9d7f
Merge: 5bc0070 c02139a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 7 12:14:25 2012 +0000

    Merge "Add missing include for logging when log_config is used"

commit 5bc0070188f17e794e0d28a209906bb8806128d6
Merge: 665ded8 e0e56dd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 7 10:39:24 2012 +0000

    Merge "Modified code Pyflakes warning."

commit c02139a01beb02679202a7d2cc4afe43bd3e1482
Author: Gary Kotton <gkotton@redhat.com>
Date:   Fri Sep 7 06:37:06 2012 -0400

    Add missing include for logging when log_config is used
    
    Fixes bug 1047273
    
    Change-Id: I7fb8a504acf8fa910100d9798e2a35274aa5a103

commit 665ded86b0d59b6f2ad9314f8898804cf105a5ba
Merge: 84dcf11 c4d3c1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Sep 7 10:23:38 2012 +0000

    Merge "Improve error message when flat network already exists"

commit e0e56ddd067744098a5746028a3b25b1a9714435
Author: siyingchun <siyingchun@sina.com>
Date:   Fri Sep 7 17:46:32 2012 +0800

    Modified code Pyflakes warning.
    
    File dhcp.py:
    W402 'textwrap' imported but unused
    W402 'importutils' imported but unused
    
    Change-Id: I5b3cee932ad224486ba3fbf4bbd44005b1200bfb

commit 84dcf114056f570632cefb17eda5949243418ef0
Author: siyingchun <siyingchun@sina.com>
Date:   Fri Sep 7 17:30:31 2012 +0800

    Modified code pyflakes warning.
    
    W402 'version_string' imported but unused
    
    Change-Id: I6dad8661c2dc0358821f76b911b13b21e788d738

commit c4d3c1c0349392cb5032d0fb870515f6c9e8385d
Author: Bob Kukura <rkukura@redhat.com>
Date:   Thu Sep 6 21:42:54 2012 -0400

    Improve error message when flat network already exists
    
    Fixes bug 1045601.
    
    When attempting to create a flat network on a physical_network on
    which a flat network is already allocated, the openvswitch and
    linuxbridge plugins return a FlatNetworkInUse exception rather than a
    VlanIdInUse exception referencing VLAN -1.
    
    Change-Id: Id79e917e1376ebbb199efc3f14d9f378c6a04050

commit ad18a473ec8c5f8eb40c7749decea39e44a9fea4
Merge: bbdbdd5 1ead125
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 18:58:17 2012 +0000

    Merge "Lower webob dep from v1.2.0 to v1.0.8"

commit 1ead125c9e28350175923390bb9058bba2aaf726
Author: Brian Waldon <bcwaldon@gmail.com>
Date:   Thu Sep 6 10:43:05 2012 -0700

    Lower webob dep from v1.2.0 to v1.0.8
    
    All other OpenStack projects expect webob v1.0.8 yet Quantum expects
    v1.2.0. This discrepancy causes problems for certain projects that
    can't actually support v1.2.0 yet. This patch aligns the required
    version with that which the other OpenStack projects expect.
    
    Change-Id: I21b4c6c79a0382f241131f22edbeba22388a688d

commit bbdbdd5592b80347745c6842cfece797de86e083
Merge: 75e2dff f25b4f1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 12:53:49 2012 +0000

    Merge "Allocation pool creation should check if gateway is in subnet"

commit f25b4f17fbd56fb0b78943d0e828fac80a5aa7fe
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Sep 5 04:19:40 2012 -0400

    Allocation pool creation should check if gateway is in subnet
    
    Fixes bug 1046192
    
    If the configured gateway is not in the subnet then it should not be
    used for the allocation pool creation.
    
    Change-Id: Ifba766a13d860b58d21034db278c6b24d4c126e7

commit 75e2dfffaf02dd8f1b85b510e58d2f3719d97f19
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Sep 5 22:43:22 2012 -0700

    Make sure floating IPs  + gateways must be on external nets
    
    bug #1042030
    
    - adds admin-writable, world-readable router:external attribute to
    the network object if L3 extension is loaded.
    - prevents floating ips from being created unless network is external
    - shortens L3 extensions alias from 'os-quantum-router' to 'router' to
    make attribute extensions more readable.
    
    WIP:
    - Need to add policy logic so non-admin users can always see external
    networks without requiring that these networks are shared (since VMs can
    always create ports on shared networks, but provider may want to have
    externals networks that VMs cannot directly plug into.
    
    Random clean-up:
    - prevent delete_network in plugins from implying it returns something
    - modify extensions.py so that exceptions during calls to
    get_extended_resources() will actually be logged if unexpected.
    - unset executable bit on test_iptables_manager.py to make sure tox
    actually runs it.
    
    Change-Id: I5bbf063927b93458da7cb467d9ad5c92ebabbbf7

commit 0f4b24a2bf1dddaa892e6b749a6a305e53446757
Merge: 0cccfc2 28df8f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Sep 6 01:41:38 2012 +0000

    Merge "add rootwrap filters to wrap ip netns exec"

commit 0cccfc22586e3ce57535f68b1bd12c15ee800085
Merge: bb68d9c 6fa761f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 5 22:45:37 2012 +0000

    Merge "restart dnsmasq when subnet cidr set changes"

commit 6fa761fd14f634d4194eaa8cd64dbfc1821aac30
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Sep 5 00:52:21 2012 -0400

    restart dnsmasq when subnet cidr set changes
    
    fixes bug 1045828
    
    The original bug occurred because the set of subnet cidrs changed
    without a restart of dnsmasq.  As a result, dnsmasq would not respond
    with offers for fixed_ips assigned in the unknown cidr ranges even when
    the underlying host file had properly updated.
    
    This patch addresses the bug by restarting dnsmasq when the set of
    subnet cidrs changes.  When the set does not change, it will reload the
    options and allocations.
    
    Change-Id: I0e257208750703f4a32c51d1323786e76e676bb6

commit bb68d9c93ef391e68e3752a4b7af1f06dffc4418
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Sep 5 00:27:27 2012 -0400

    supress dhcp router opt for subnets with null gw
    
    fixes bug 1045617
    
    This patch supresses the default gateway for subnets without gateway
    defined.
    
    Change-Id: I29d84863e51f613d8529153870eb7542d992be0e

commit 28df8f6d8f2fddf5fb5751eb5100d40a9b4745fa
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Sep 4 19:50:00 2012 -0400

    add rootwrap filters to wrap ip netns exec
    
    fixes bug 1044083
    
    This patch adds specific filters for the ip command. The first filter
    matches ip with any subcomand except netns exec.  The second filter
    matches "ip netns exec" and then relies on the caller (match_filter) to
    verify the sub-command against the other filters. Matching the
    subcommand separately allows for a single set of filter definitions that
    work with and without namespaces.
    
    Change-Id: Ifd0378dc3461f84867efb3cb60396d9cfa9e582d

commit aaec26c7db1541764f6d7b53ed40262f124652a5
Merge: 264f46f 8e34320
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 5 00:27:24 2012 +0000

    Merge "Create utility to clean-up netns."

commit 264f46f313f9c22f4e6923b57a6d49102c13b01c
Merge: aae6483 5f24917
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 21:19:06 2012 +0000

    Merge "Fix lack of L3 support of Ryu plugin"

commit aae648318c75833359c4c7a142faedbde4f5ae99
Merge: 605f400 762cc5d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 17:55:13 2012 +0000

    Merge "Implements agent for Quantum Networking testing"

commit 605f400ba457ca4591c621f745aba2c8d0baa43d
Merge: 7139cdd 3d089c4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 17:52:40 2012 +0000

    Merge "Quantum dhcp crashes if no networks exist"

commit 7139cdd3aa0d92808cbec6a61e9991bf8d017d05
Merge: fce952e 2374d51
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 17:23:49 2012 +0000

    Merge "Update with latest code from openstack-common (stable/folsom)"

commit 762cc5d830d0eb46a59673ce13a94435035af5dc
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Fri Aug 10 22:15:32 2012 +0000

    Implements agent for Quantum Networking testing
    
    This agent client plugs itself into each network.
    Then tries to ping each fixed_ips.
    Implements blueprint test-agent
    
    Change-Id: I3908e37401272e9e091ceae66e72cfcdd13b7898

commit 3d089c43c460f89f564a4c0c69d468b27a2a6074
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Aug 31 15:34:49 2012 -0700

    Quantum dhcp crashes if no networks exist
    
    Fixes bug 1043583
    
    Change-Id: Ibdfeb98c094b80ea63e79b23f14811e00525d96b

commit 2374d51d0bd6423d5f6b228f1abfd63aa2ce3af7
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Sep 4 07:04:26 2012 -0400

    Update with latest code from openstack-common (stable/folsom)
    
    Fixes bug 1039777
    
    Due to changes in quantum/openstack/common/cfg.py,
    quantum/plugins/nicira/nicira_nvp_plugin/common/config.py
    also needed to be updated.
    
    Change-Id: Id240f8b5e2d80dde168b6d7c0eebeb9c5c398e42

commit fce952e8fac921ef952941dcbcfebd6fe82077d1
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Tue Sep 4 20:13:18 2012 +0900

    Fixes undefined variable 'network_type' in OVS agent
    
    bug 1045749
    
    Change-Id: Icd2e79722cfcb816bfdfa85bd8b8ab5198908474

commit 8e34320bbc844c42066b9499e6afff8feda1fa56
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Aug 20 10:18:01 2012 -0400

    Create utility to clean-up netns.
    
    Fixes bug 1035366
    
    Adds namespace clean up utility called quantum-netns-cleanup which can be used
    to remove old namespaces.
    
    The --force option can be used to remove all Quantum namespaces and any
    remaining devices.  The force option is should not be run on a live Quantum
    systems.  It is intended for cleaning up devstack a after running
    unstack.sh (ideally this will be added to unstack.sh in the future).
    
    Example cmd line when cleaning up a devstack install:
    quantum-netns-cleanup --config-file /etc/quantum/quantum.conf \
    --config-file /etc/quantum/dhcp_agent.ini --force
    
    Change-Id: I6cf153df21e83bff2cde816db12b22102d1ba698

commit d8160e02bbccdf9ab89d644924203e4ae504c3bf
Merge: c67f120 22e4bdc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 05:34:01 2012 +0000

    Merge "ovs_lib unable to parse return when port == -1"

commit 5f24917c31a81ebd9e2eb4cf9e99e6b763a2a473
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Thu Aug 30 23:50:06 2012 +0900

    Fix lack of L3 support of Ryu plugin
    
    VMs cannot access the external network without l3 support.
    
    Fixes bug 1043746
    
    Change-Id: I6bd2cb69ba80ce3c799f346ca67c17ff77244ba4

commit c67f120132c548e599f1d44bb372f709c35a2916
Merge: 79ec9b2 3c8b8ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Sep 4 00:07:27 2012 +0000

    Merge "L3: make use of namespaces by agent configurable"

commit 79ec9b2295a0496584653779ddfb6f64f39bb854
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Sep 1 01:53:59 2012 -0400

    Ensure that port update set correct tag in OVS
    
    Fixes bug 1044556.
    
    This patch also ensures that the local vlan mapping is updated correctly.
    This was problematic in the event that the OVS agent would start and a port
    was in administrative state down.
    
    Change-Id: I4e5145547e73a58fee3f08a129fda6bc0ec42b72

commit 22e4bdccf11ba3bd64b7291c3eb21de273b7eab1
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Sep 3 15:00:48 2012 -0700

    ovs_lib unable to parse return when port == -1
    
    Fixes bug 1045536
    
    Change-Id: I463dd31d67dff74caae1a0230df5d78c21beaf04

commit 3c8b8ce1013c739f8ed34053dc36ab0705f05884
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Aug 27 07:30:22 2012 -0400

    L3: make use of namespaces by agent configurable
    
    Fixes bug 1042104
    
    The fix follows the patch that was done on the DHCP agent to enable
    the user to configure the usage of namespaces. In the event that
    namspaces are disabled the agent is limited to running only one
    router. The agent needs to define the router_id that is supported.
    The process in this case is:
    1. create router
    2. start agent with router id
    
    Change-Id: I2a71dc009c5aea285ff9f903b3faa99b0c9f820f

commit d03b79feaf9775be92d72a7fd9a705e6fffc352c
Merge: 6beb9e0 d296a1f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 3 19:59:12 2012 +0000

    Merge "Fix programming error of ryu-plugin"

commit 6beb9e079b00b010c2ba756882c619d3c5159e24
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Sep 3 05:43:29 2012 -0700

    Fix error in rule for metadata server dnat
    
    Fixes bug 1045312
    
    Change-Id: Ie0e2aa7e638a7cd50c87ae6d4fa807cb7733c3d1

commit cfc3129f203f2c55f32358eb47f863504a2e146a
Merge: b9bcc05 0ff1867
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 3 12:41:43 2012 +0000

    Merge "Ensure network delete is handled by OVS agent"

commit b9bcc0541459c25b78c55141b309020d7689c2af
Merge: c7fb95e 34d3e21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 3 12:41:38 2012 +0000

    Merge "Implement L3 support in Metaplugin"

commit d296a1f0aad5bb5596b0676d5ac7742c557995e1
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Mon Sep 3 20:07:25 2012 +0900

    Fix programming error of ryu-plugin
    
    Fixes bug 1045275
    
    This patch fixes a programming error of the ryu-plugin.
    
    Change-Id: I4226e3bdf9611ce25298b37b7ba9e6be8a9e3cba

commit c7fb95e1624b5644121741815940cf2c6efe4188
Merge: efa4316 7dcaeec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Sep 3 09:53:12 2012 +0000

    Merge "netns commands should always run in the root ns"

commit 0ff186758d6cbc4ead3e91ff361b56b5f4ab9575
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Sep 1 03:27:14 2012 -0400

    Ensure network delete is handled by OVS agent
    
    Fixes bug 1044574
    
    The class OVSRpcCallbacks was deleted and the treatment of the RPC
    callbacks moved into OVSQuantumAgent.
    
    Change-Id: I1c5f5185e3f7e0f27aba6d254f2bb3b6edf6a385

commit 34d3e21a408c96632ec94742ad0e30796b0b4968
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Mon Aug 20 05:00:14 2012 +0000

    Implement L3 support in Metaplugin
    
    Added flavor:route property for router
    Rename flavor:id to flavor:network
    Fixes bug 1038778
    
    Change-Id: Ia358b4f03c1b96ade2d1b7323298b117b2cbe52a

commit efa4316f648201c35c2175d6065b57abb8c8a7dc
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Sep 2 11:15:32 2012 -0400

    Fixes agent problem with RPC
    
    Fixed bug 1044135
    
    When quantum-openvswitch-agent or quantum-linuxbridge-agent were
    called the eventlet monkey patch was not invoked.
    
    Change-Id: Iafb7fd02d37415c3466213d28280bcb4573de4a8

commit 7dcaeecfd51065cda93d2c88a24ba330efac6f73
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Aug 31 15:48:27 2012 -0400

    netns commands should always run in the root ns
    
    fixes bug 1044542
    
    Previously, some netns commands were executed in the context of the
    namespace defined in the wrapper. These commands should be be executed in
    the root namespace for the most reliable results.
    
    Change-Id: I4915aa6f75af3f65ce2adb40360bcd841f549239

commit b17176f11029df079628a3305dcdc4d03104f299
Merge: f49eebb 19e553e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 1 17:50:06 2012 +0000

    Merge "Plugin aware extensions should also be reset at each test setup"

commit f49eebb2ed4394333c435ce17582dd9538f27290
Merge: b9e8e8d cbae58c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 1 14:19:20 2012 +0000

    Merge "misc L3 fixes."

commit b9e8e8d8a602d85458e5a20a6992fd38d1c9d9a0
Merge: dde6922 493903c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Sep 1 14:08:27 2012 +0000

    Merge "expose openvswitch GRE tunnel_id via provider API"

commit dde6922b98c993ce4de355b9856d54b47197cd5d
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Aug 29 13:56:50 2012 -0400

    Add lease expiration management to ip recycling
    
    Fixes bug 1022804
    
    This is the 3rd and final patch for this bug.  This patch alters ip allocation
    recycling to honor lease expiration. Allocations that are in the
    expiration wait state have null port_ids.
    
    Change-Id: Ib7960b142eb15733c6418b01973d02a827634cb6

commit cbae58cfc8e4cb96b9eb985aab81f3cfe33290ef
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 31 11:23:13 2012 -0700

    misc L3 fixes.
    
    - fix iptables rules for handling inter-subnet traffic so that this
    traffic is not SNATed when a gateway exists.
    
    - handle remapping of floating ip from one internal ip to another
    
    - enable ip forwarding on a per-network namespace basis.
    
    - make metadata_ip optional. specifying it when no gateway is configured
    results in a very log timeout.
    
    Change-Id: I738094aeafe42cbf2c64eda3bb038ef1e58a6550

commit 493903c0d03e53fd8192dff2177698d332935087
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Aug 31 00:12:41 2012 -0400

    expose openvswitch GRE tunnel_id via provider API
    
    The provider:vlan_id extended attribute is renamed to
    provider:segmentation_id, and the openvswitch plugin returns the
    tunnel_id of GRE networks as this attribute.
    
    Fixes bug 1044375. Final patch in series that fixes bug 1037341 and
    bug 1035492.
    
    Detailed changes:
    
    - Rename provider:vlan_id to provider:segmentation_id.
    - Use consts for providernet extension's attribute names
    - Remove validation clause from provider:segmentation_id resource attribute map data.
    - Validate provider:segmentation_id in linuxbridge and openvswitch plugins.
    - Rename physical_id to segmentation_id in the openvswitch schema, plugin, and agent.
    
    Change-Id: Ic023b30b6e3275955bcb8a09c7936035dacf3f87

commit d1dce679f1dcd5bed44efa1576e446b02b2a4371
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 31 07:30:54 2012 -0700

    Do not transfer ips if there isn't any
    
    Fixes bug 1044403
    
    Check if the interface being attached to the bridge has ips
    before iterating over them
    
    Change-Id: I54315831f240c6810707e7247e7a76c1bfa8742e

commit 8fb4e6efe8dcf1987d41917f71da8db345647321
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 31 04:29:12 2012 -0700

    prevent invalid deletion of ports using by L3 devices
    
    bug 1039947
    
    The bug noticed that an admin user could delete a port that stored
    the underlying IP allocation for a floating IP.  This patch prevents
    the direction deletion of ports via the API for ports that are used as
    router interfaces, router gateways, of for floating IPs.
    
    Add a unit test to check such an invalid delete, and also updates
    unit tests to avoid them tripping over the new checks.
    
    Change-Id: Ief28e3181583428d55259275a7c21151a4a4fa9b

commit 4c9f9fe4525568d50d9bc5c7fc7897d5ed5ff463
Merge: c099e06 276f26a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 31 05:25:13 2012 +0000

    Merge "Modified code PEP8 warning."

commit 276f26a45d0c2a1b9826f7f7e7d9b7ae9de2c507
Author: siyingchun <siyingchun@sina.com>
Date:   Wed Aug 29 09:22:26 2012 +0800

    Modified code PEP8 warning.
    
    *Find more than one space after keywords, then eat one.
    *Make sure every continuation line is aligned with the first character after
    the top parenthesis in the top line.
    
    Change-Id: Id3eb1ec728bc3329a859d0817d61b639019ffe8b

commit c099e06a9a0b1aea900d65d8df23305f32e3d7cc
Author: Bob Kukura <rkukura@redhat.com>
Date:   Wed Aug 15 02:43:17 2012 -0400

    Implementation of 2nd phase of provider extension for openswitch
    
    Enhances openvswitch plugin to support flat networks and VLANs on
    multiple physical networks via the provider extension. Implements
    blueprint provider-networks.
    
    See http://wiki.openstack.org/ConfigureOpenvswitch for
    configuration and usage details.
    
    A devstack patch to support the updated openvswitch configuration
    variables is at https://review.openstack.org/#/c/11418/.
    
    Change-Id: Ic86b6f3b2e354c7d60bc2c330b334c23d349bc29

commit 7632e6775075c8597a1df23f38fd1e2b8cb384ea
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Aug 30 19:18:41 2012 -0400

    Mangle network namespace name used by dhcp_agent
    
    fixes bug 1044113
    
    This fix managles the network namespace by prefixing the network id with
    qdhcp.
    
    Change-Id: I41f48f805efd83bd3e12049007067200cc384ffe

commit 193d6997276d3efcfaf99e5fcca1354c8c8c4670
Author: John Dunning <jrd@jrd.org>
Date:   Tue Aug 14 14:31:47 2012 -0400

    Update rootwrap; track changes in nova/cinder
    
    Fix bug 1037815
    
    Summary: Copy/paste the essential parts of the rootwrap
      mechanism from nova/cinder into quantum.  This includes
      the core changes to filter.py and wrapper.py which deal
      with loading filters from files pointed to by
      rootwrap.conf
    Detailed changes:
      Transliterate the old rootwrap/*-agent.py files to
      new format, and put the results in etc/quantum/rootwrap.d
      Delete the *-agent.py files.
      Add conf to point to etc/quantum/rootwrap.d
      Add a unit test cribbed from nova to exercise the filter
      mechanism
      Add a unit test to exercise the actual filtered execution
    Note that as written, this patch does not set the default
      execute mechanism (in the agent .ini files) to rootwrap,
      leaves it as sudo.  That can be done in a followon
      change, or in distro specific packaging.
    Note also that there is still work to do around finishing
      and testing the filter specs themselves.  We've decided
      that that is out of scope for this patch.
    
    Change-Id: I9aba6adc5ba40b6145be5fa38c5ece3b666ae5ca

commit 9198ca803a3fddc91a1d45d3cd9a37b7aeca2215
Merge: f216121 8d75212
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 11:49:48 2012 +0000

    Merge "remove policy check for host_routes in update_port"

commit f2161219674735ab8077a2e0ca55a8a73324f4ce
Merge: 398e176 dbeb795
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 30 06:20:51 2012 +0000

    Merge "Ensure network connectivity for linuxbridge flat network."

commit 8d752124606cc42fed71476f8efc3eae2e4d8475
Author: justin ljj <jiajun@unitedstack.com>
Date:   Thu Aug 30 13:12:15 2012 +0800

    remove policy check for host_routes in update_port
    
    Fixes bug 1043630
    
    Port has no 'host_routes' attribute according to the latest V2 API
    specification. So, policy check for 'host_routes' is not need any
    more, just remove it in this patch.
    
    Change-Id: I925e83d9825f89265843c15e71ee5ed4c33bad5f

commit 398e176cf0969a035208f19988f6680836a45182
Merge: b1ff467 f75256f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 29 20:37:21 2012 +0000

    Merge "Cisco nexus sub-plugin update_network fix"

commit b1ff4678df86c3b7f77584d8db77c0188b17b98e
Merge: e33c2ca 4b5a850
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 29 18:56:08 2012 +0000

    Merge "Fix dhcp option distribution by dnsmasq"

commit e33c2caa45e2acfdaeaaa04edd482035c0905f65
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 29 11:16:42 2012 -0700

    Ensure proper validation for l3 API attributes
    
    Fixes bug1042042
    
    This patch introduces validation for uuid and ip fields in l3 api
    data structures.
    
    Change-Id: Ibc4913e0bcf5b33cb5e4bd42c89b82ec374f5437

commit f75256f9574955c65b4e64a6701128044fc64278
Author: Rohit Agarwalla <roagarwa@cisco.com>
Date:   Wed Aug 29 01:20:06 2012 -0700

    Cisco nexus sub-plugin update_network fix
    
    Fixes bug 1043147
    
    Currently, the cisco nexus sub-plugin doesn’t handle the network admin state parameter
    when it’s updated. The fix would enable the sub-plugin to handle an update of the admin
    state of the network. In update_network of the nexus sub-plugin, vlan corresponding to that network
    is added/removed from the nexus interfaces based on the network state. Unit tests are added as well.
    
    Change-Id: Ia3b5400c2896c1b0160968a2c75c21247ca0c3f4

commit 4b5a850a51ee1a8451a9c5e819fb5247bf4d46d0
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Aug 29 00:02:49 2012 +0000

    Fix dhcp option distribution by dnsmasq
    
    Fixes bug 1022737 host route per subnet distribution
    Fixes bug 1028647 --no-gateway support on dhcp agent
    Fixes bug 1043022 dns distribution
    
    Change-Id: I567f1f8d1f5d386a253be1965d29f2533f7e88c8

commit 88e2551c69739d76a1802838adaae0d244aa5333
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Aug 27 12:04:21 2012 -0400

    fix bug where network owned resources block delete
    
    bug 1028174
    
    This patch fixes a bug in delete_network and delete_subnet where the InUse
    exception was being thrown for resources owned by the network and not
    the tenant.  This patch force deletes network resources if they are the
    only blocker to deleting the parent resource.
    
    Change-Id: I822cc4a92cb05cdef88679bb628fad4e5063cddd

commit 19e553e1deeb8939decd1ed9554a3c6eb6770386
Author: Yusuke Muraoka <yusuke@nttmcl.com>
Date:   Tue Aug 28 09:59:42 2012 +0000

    Plugin aware extensions should also be reset at each test setup
    
    PluginAwareExtensionManager caches extension according plugin.
    At each db plugin test setup, testing plugin and router are newly
    created.
    However, the extension manager held the extensions for first time
    loaded plugin. Because of their cache.
    
    So if a plugin conditional extension exists, it could not be loaded by
    testing order.
    
    Fixes bug 1043381.
    
    Change-Id: Ic994aab61c3d67aa9d422594484049f41ff8b321

commit 11f2a64b477b3ad63bb85d89fb5f500403918cbb
Merge: f513bab da2816a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 28 08:44:58 2012 +0000

    Merge "clear db._ENGINE for each plugin init in Metaplugin"

commit f513babce1a3525c48a22aceeef256c2e0ff5b04
Merge: 693c288 bff5dce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 23:17:48 2012 +0000

    Merge "Fix Metainterface driver with namespace"

commit 693c28867dcdaae05996a419c43a177e71d51781
Merge: f99a82e ac789d8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 23:13:17 2012 +0000

    Merge "Add DHCP RPC API support to Ryu plugin"

commit f99a82efcb0baf01aebc6bc751511b72f6dc91c9
Merge: 0b4cecf ed263e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 23:10:40 2012 +0000

    Merge "Add lease expiration script support for dnsmasq"

commit dbeb79504c8b706ba5fa18144f4e7a0d23586d5d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Aug 23 04:57:26 2012 -0400

    Ensure network connectivity for linuxbridge flat network.
    
    Fixes bug 1040447
    
    In the event that an IP address and gateway are defined on an interface that is
    used in a flat network, then the interface details will be copied to the
    bridge when it is created.
    If the network is deleted then the IP addresses are returned to the interface.
    
    Change-Id: Ic860d7635c137f49e5aaaa25dc9727ac60227f1a

commit 0b4cecf68296a1f5acdde933c16c7bccfabceb34
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 26 11:02:31 2012 -0700

    Execute unit tests for Cisco plugin with Quantum tests
    
    Bug #1041917
    
    On account of the new requirement to run plugin-specific tests also
    along with the Quantum tests, changes are being made to
    incorporate the Cisco plugin unit tests into the Quantum unit test
    suite. Earlier unit tests have been moved and modified.
    
    Change-Id: I099bcaf0b2ca2f7ed7d25176dfaa75966b90dd71

commit dee4e232af2400c2afd9e4dcf54bcc5e20188b6f
Merge: 89942ed f1d022c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 27 14:28:56 2012 +0000

    Merge "Allow tox to run plugin specific unit tests"

commit 89942ed31568199f08ffa60982001f814eaa5b5e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 25 14:59:33 2012 -0700

    prevent OVS + LB plugins from clearing device_id and device_owner
    
    bug 1041669
    
    the fact that these plugins ever cleared this field is probably just a
    misunderstanding of how the field is supposed to be used, as I don't think
    it ever makes sense for the L2 plugin logic to change this field.
    
    Change-Id: Ie9579e2f88d322cfdce51a2ca126f4dfab680022

commit d884506a0d5499279b7f0a0807b22cf34e05685d
Merge: 4b4eb05 8a9db76
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 09:13:20 2012 +0000

    Merge "updated outdated comments in base v2 plugin class"

commit 4b4eb05ce584c7879d9e2c4518d69f709bf01d89
Merge: e1bb560 7b00b98
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 05:19:30 2012 +0000

    Merge "Enable tox to run OVS plugin unit tests"

commit e1bb5603c1add3852b2e372d284ecf159be21f1e
Merge: 06aae64 d572233
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 25 04:13:02 2012 +0000

    Merge "Remove 'verbose' API capability"

commit 8a9db76dee1bac5da0e3d3e5b208cd2ac3bc0507
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 24 17:55:54 2012 -0700

    updated outdated comments in base v2 plugin class
    
    bug 1011841
    
    Change-Id: Iddcb1cb365391b3c3e8b8f06cbf714baa3e64a02

commit da2816a0b1f08989ff7aa9b94e9de70c1e94ad15
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Aug 15 08:10:47 2012 +0000

    clear db._ENGINE for each plugin init in Metaplugin
    
    Fixes bug 1036996
    
    Change-Id: I7f289b4ccda281a66666ec1dbf7fc01156b0512c

commit 06aae64123a56055bcb36a026f8a48ce773cdb5a
Merge: 734213b e1c91f5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 24 23:11:47 2012 +0000

    Merge "Move metaplugin test for common test directory"

commit 7b00b98bf9cd081769e690a1e9cbf01c555c475c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 24 06:38:06 2012 -0700

    Enable tox to run OVS plugin unit tests
    
    Fix bug 1029142
    
    Unit tests have been moved into /quantum/tests/unit
    
    Change-Id: I5d0fa84826f62a86e4ab04c3e1958869f24a1fcf

commit f1d022cf15e4f77754af3b68fb121f2fadbf6d3b
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 24 10:51:19 2012 -0700

    Allow tox to run plugin specific unit tests
    
    Fixes bug 1041316
    
    This patch covers linuxbridge, nec, nicira, and ryu plugins.
    
    Change-Id: I024a46bc9b49ffe60cdbe9fa275f30ac9d829a9a

commit 734213b8e8177f505cd7d906a40402308c3bc205
Author: Rohit Agarwalla <roagarwa@cisco.com>
Date:   Fri Aug 24 03:48:22 2012 -0700

    fixes cisco nexus plugin delete network issue
    
    Fixes bug 1039687
    
    Removes the vlan from the nexus interface corresponding to the network that has been deleted.
    unit tests added.
    
    Change-Id: Ib58a01c7b5bbdd7aac8591b4fb4db123cbe8f55b

commit bff5dce7244a5e793e48988fa35042c50b2787aa
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Aug 15 18:50:39 2012 +0000

    Fix Metainterface driver with namespace
    
    Fixes bug 1037239
    
    Change-Id: I4b812c850fd31333ebbafc28c4a621f15188eb1c

commit ed263e68e2236f5136df01373c4d66a433769e5f
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Aug 16 17:34:44 2012 -0400

    Add lease expiration script support for dnsmasq
    
    Fixes bug 1022804
    
    This is phase 2 of the bug fix.  This changeset adds support for dnsmasq
     --dhcp-script to notify Quantum of lease renewals.  Communication between
    dnsmasq and the Quantum DHCP agent occurs via UNIX domain socket since dnsmasq
    may run in a network namespace.  The DHCP agent is responsible for
    relaying the updated lease expiration back the Quantum server.
    
    Change-Id: If42b76bbb9ec7543e681e26b9add8eb1d7054eeb

commit d572233045ce1cfacc45e5eba83ef44bfc9a631e
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 24 06:06:06 2012 -0700

    Remove 'verbose' API capability
    
    Fixes bug 1040568
    
    Remove parsing of "verbose" query param from API layer
    Remove "verbose" fetching from db in db_base_plugin
    Remove "verbose" parameter from plugin methods
    
    Change-Id: I5826fd64c7d8c48f4da605f32d21d96280c4c9f2

commit b6266559a7da6b8f5e57fb18f34d6c54faf1c629
Author: Ray Chen <oldsharp@163.com>
Date:   Fri Aug 24 19:21:55 2012 +0800

    PEP8 issues fixed
    
    Fix some pep8 problems in doc/source/conf.py and make the code
    more pretty.
    
    Change-Id: Iff1333441b67addb38533ba061aa89f59533fdb2

commit 9aacc68fa9dceb21bc7b7bdd255365eac38ee052
Merge: 52684f0 3dbaa35
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 24 06:33:38 2012 +0000

    Merge "Enable users to list subnets on shared networks"

commit 52684f0bfee2c2a5e5d02d73d59d25a51f0ffb69
Merge: fb9667c 1b090e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 23 15:33:02 2012 +0000

    Merge "Update TESTING file"

commit fb9667c6948f7db2ea946e5d15f664c8432898b4
Merge: e4fccd1 9548def
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Aug 23 15:30:21 2012 +0000

    Merge "Run core unit tests for each plugin"

commit e4fccd1b9c8c60d1fbdea9f6e3fd3af0f8fc020b
Author: justin ljj <jiajun@unitedstack.com>
Date:   Thu Aug 16 15:13:27 2012 +0800

    removed some unused global variable
    
    Fixes bug 1037082.
    
    Change-Id: Id8e5df04cc0183cd4b2a9ab23cd403a83a2db637

commit 1b090e5365952fdc63ddd185dfdf5a21f4f48b12
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 22 22:17:54 2012 -0700

    Update TESTING file
    
    Fixes bug 1040566
    
    Change-Id: Iff7a97532e1a6012d9d5cafb82ad7babfb9fd080

commit faf1a1817519898d704db418a2da7252ca00b8bd
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Thu Aug 23 11:50:25 2012 +0800

    Typo fix in quantum: existant => existent
    
    Impact:
    * Test function names
    * Variables in test function
    
    Change-Id: Idb7ba131dabb8cc7e483cb06fa52feb9a9c7c676

commit ac789d8c1a3bc20c94144f7347cafc00e4181b07
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Wed Aug 22 04:19:58 2012 +0000

    Add DHCP RPC API support to Ryu plugin
    
    It is necessary to add DHCP RPC API support to Ryu plugin to use
    DHCP with Ryu plugin.
    
    Fixes bug 1040398
    
    Change-Id: I00caf6f36025a21d10b8a96c5f7272d12393c277
    Signed-off-by: Yoshihiro Kaneko <ykaneko0929@gmail.com>

commit 9548defc4f56ed40f2bea3a04b1a74cc8b7e89b2
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 22 16:29:24 2012 -0700

    Run core unit tests for each plugin
    
    Fixes bug 1040277
    
    Execute the test cases in test_db_plugin.py for each plugin.
    Each plugin now get its own test_<plugin_name>_plugin test module.
    This commit excludes cisco and metaplugin plugins, which do not run
    the "core" unit tests at all.
    
    Change-Id: I137411f47d8cfcc753aa3a88359f5b1590ca8237

commit d2b58ba48641139e3aa9b9e51bcd5396aca09510
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jul 5 19:31:51 2012 -0400

    OVS plugin tunnel bridges never learn
    
    This patch installs a flow_mod to handle each vm
    with the normal action which allows OVS to do mac learning.
    Fixes bug 1011467
    
    Change-Id: Ib6500813d4111ae42675459fac64dfb2e9c40d91

commit 9c915b0d7f58a5da8f63ebf09b13853d52e520e6
Merge: 06cdcba 9ed18eb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 17:07:01 2012 +0000

    Merge "Linuxbridge support for L3 agent"

commit 06cdcbacbcbedb4a96fe32e36ffb4928cc9ff470
Merge: 1f114a8 b9af0a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 15:06:30 2012 +0000

    Merge "Ensure that LB agent does not terminate if interface already exists in bridge"

commit 1f114a83a3179264981cccd5d791fc5bb0a72ffc
Merge: de50aaa 1798c82
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 14:59:59 2012 +0000

    Merge "Treat exceptions when invoking ovs-vsctl"

commit de50aaa504f96e378cfa6cf311482605c8ef5030
Merge: 50091d1 961adae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 11:14:38 2012 +0000

    Merge "enable router deletion logic in l3-agent"

commit 50091d190e7e388c8d011262b9c8a4312e398c3e
Merge: 947ff09 f4968d4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 08:06:53 2012 +0000

    Merge "Add nosehtmloutput as a test dependency."

commit 947ff097a08cd0611c2fe73ccb0fe18aa7afd07e
Merge: fac1f0b b7f5f8e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 22 05:48:41 2012 +0000

    Merge "Fix IP allocation on shared networks ports."

commit f4968d433c1739785653b494d07033461d0c3f86
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Tue Aug 21 14:41:29 2012 -0700

    Add nosehtmloutput as a test dependency.
    
    Adding nosehtmloutput as a test dependency allows nose to output its
    results to an html file. This will be used by Jenkins to save logs on
    a different server.
    
    Change-Id: If88ca04bf7e45aa25aaea3cc01bb0f457224c117

commit fac1f0b6c4e1fbcef6a7958ad8031d3d1973513b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 21 13:56:19 2012 -0700

    fix typo in OVS plugin from recent bugfix
    
    bug 1039393
    
    this demonstrates why we need plugin unit tests merged into the main set
    of unit tests.
    
    Change-Id: I132c706a7c69c8c779727835be4319c5ed649385

commit 2e80af5dd7b854f5a7237f1220c25c1fba6f5566
Merge: d15151d e439693
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 21 18:44:01 2012 +0000

    Merge "Remove v1.0 and v1.1 API from version info."

commit 961adae44fc5b752bd10945e1f0ed5488a929df2
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 21 10:26:18 2012 -0700

    enable router deletion logic in l3-agent
    
    bug 1039387
    
    related to bp quantum-l3-fwd-nat
    
    previous diff logic did not attempt to detect that a router was deleted.
    
    Also, enabled actual deletion of namespace, since 066e48be08f155c29887f5846902fbf5e41b8c89 fixed the issue that was causing that to break.
    
    Also, make router loop pay attention to admin_state_up on router ports.
    
    Change-Id: Id76736dd3207472dfc282097e5b27740e05aaa3a

commit d15151d42a17f68786a823fb15fe56ce3f8d77bc
Merge: 4cb85bf c8a7ece
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 21 17:26:13 2012 +0000

    Merge "Enable DHCP agent to work with plugin when L2 agents use DB polling"

commit 3dbaa356b9d0af75f5a4102d3e881ca803c895e2
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Aug 21 08:26:24 2012 -0700

    Enable users to list subnets on shared networks
    
    Fixes bug 1039591
    
    This patch will enable regular users to list subnets on a shared
    network by exposing the subnet's "shared" attribute to the policy
    engine, and letting it applying different rules if the subnet is
    shared or private.
    
    Change-Id: If204f1e352c114e16251586c743f5b7fe2d1ad7d

commit b7f5f8e2fadb787a7de270790b347f1563d190f0
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Aug 21 03:53:31 2012 -0700

    Fix IP allocation on shared networks ports.
    
    Fixes bug 1037589
    
    Ensure non-owner ports on shared networks get an IP address for
    each subnet configured on the shared network.
    
    Change-Id: Ib687444b7ad75f3c773b0cb41c25ac3f700fbf0f

commit e1c91f5da079740a55480eb6f1e9e450d2710a78
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Aug 15 21:27:54 2012 +0000

    Move metaplugin test for common test directory
    
    Fixes bug 1037284
    
    Change-Id: Id26dfe5d01088790c046ce10b787c3d37100da8a

commit c8a7ece1e3af84b845bbdbb913ff0f31dd242269
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Aug 21 03:07:39 2012 -0400

    Enable DHCP agent to work with plugin when L2 agents use DB polling
    
    Fixes bug 1039393
    
    By default the plugins will enable the RPC support. If and only if
    the agent RPC is enabled will RPC notification messages be sent to the
    agents
    
    Change-Id: I4fb003a2b477e5e647c3ee408b449e71b3f5a883

commit 4cb85bf3fdb5f86f909bc81a538453724d64a733
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 20 22:42:23 2012 -0700

    fix associating a floating IP during floating IP creation.
    
    bug 1038962
    
    also add check to make sure that floating IP's are only associated if
    the upstream router has a external network gateway to the appropriate
    external network.
    
    Change-Id: Ie4cb632296ce4a1cb989242eb894d73a7488cdb3

commit 6d173e15d2d61d5846e321720d64dd8f41a7ad26
Merge: 4f73558 044ece2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 20 20:21:32 2012 +0000

    Merge "Get OVS port details from port ID"

commit 4f735583c55a00f15161d3087bcbeeddea12578b
Merge: 066e48b 8e2812e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 20 16:17:11 2012 +0000

    Merge "Fixing unit test failures in Cisco plugin"

commit 066e48be08f155c29887f5846902fbf5e41b8c89
Merge: 477cdc4 0788698
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 20 11:37:02 2012 +0000

    Merge "fix netns delete so that it works when a ns is set"

commit b9af0a397325677a2a2b9ec5f0051de31832722e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Aug 20 04:32:10 2012 -0400

    Ensure that LB agent does not terminate if interface already exists in bridge
    
    Fixes bug 1038783
    
    Change-Id: Iaa4778562b4efc13919341832f5281b1516f8f8c

commit 1798c82dfa7de36de2502bb44e8b646d93574290
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Aug 19 04:11:06 2012 -0400

    Treat exceptions when invoking ovs-vsctl
    
    Fixes bug 1037902
    
    Change-Id: I3f5bbac2f0c390fd7eaae4eb6338e5ac600c9aba

commit e4396938425bc27fc730d580a6cd4ee6e3fd09e9
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Mon Aug 20 16:56:19 2012 +0900

    Remove v1.0 and v1.1 API from version info.
    
    Fixes bug 1038905.
    
    Change-Id: Ifbb991eef528808ecb3543c3db862f4ca3c29f32

commit 044ece27b79c810e6c15131b6a553b649e666678
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Aug 16 06:06:55 2012 -0400

    Get OVS port details from port ID
    
    Fixes bug 1037443
    
    This address the issue when a Quantum interface does not start with the
    prefix "tap" (for example interfaces created by the l3 agent)
    
    Change-Id: Ie2c98940d921606906015914ce6b23d3095e91f2

commit 477cdc48cf264643c10f75184e870940ec929dc7
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Sun Aug 19 17:00:50 2012 +0900

    Fix undefined variables.
    
    Fixes bug 1038585
    
    Change-Id: Ie38d2fd9408a3efaf876ff100d1576a170ff9f8d

commit 8e2812eeaafb9f3a7e4142f1febe8ab855a9e596
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 18 20:50:38 2012 -0700

    Fixing unit test failures in Cisco plugin
    
    Bug #1038565
    
    The tests for bulk resource creation failure were failing since the bulk
    API calls were not getting relayed correctly to the virt_phy_sw.py, that
    has been fixed
    There tests for the network_multi_blade_v2.py were failing since DB
    initialization order was incorrect.
    The tests in test_api_v2.py were failing since the plugin instance was
    not being reset for each test.
    
    Change-Id: I449bd8a61c1f61f98a97acf489574624fe309caa

commit 078869814c576cd2560d71e619e8a938b30a796f
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sun Aug 19 16:10:00 2012 -0400

    fix netns delete so that it works when a ns is set
    
    bug 1038759
    
    This fixes the bug by ensuring that the netns deletion always runs in the root
    namespace.  Tests were updated to reflect the change in execute
    invocation.
    
    Change-Id: I008e8ecbc4bae86129af7f4a7b5d33c6ae423e5c

commit 9ed18eb0e1aeb87a43ab44f8b5f6979f084f2845
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Aug 19 10:20:49 2012 -0400

    Linuxbridge support for L3 agent
    
    Fixes bug 1037245
    
    For the linux bridge this changes the generic interface name prefix
    from "dhc" to "ns-".
    
    Change-Id: I37078dadcbffa7e0b45d1523e7a03bb7c0d36919

commit 7afb37af76efc2978c442cbf80ac46c3ef1b661f
Merge: de10fba 3005d16
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Aug 19 14:10:29 2012 +0000

    Merge "quantum l3 + floating IP support"

commit de10fba3cf379f92d2c4c73b866e4451d8a9f78c
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Fri Aug 17 15:37:44 2012 -0700

    Fix exception message for bulk create failure.
    
    Bug 1038256
    
    Change-Id: I52ae9a7540f07f62174d51382a77ac0997c8f388

commit 3005d16fe3588bdf4b928e79f640b991df9fae3b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 15 12:56:52 2012 -0700

    quantum l3 + floating IP support
    
    bp quantum-l3-fw-nat
    
    router & floating IP API calls, plugin db, and agent implemented
    and unit tested
    
    Change-Id: I6ee61396d22e2fd7840aa2ff7d1f6f4a2c6e54d4

commit 09749a9e5afb662a4c4fd7f3c931bbe0d7b6857f
Merge: 7d29b16 1551085
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 17 14:43:59 2012 +0000

    Merge "Add missing conversion specifiers in exception messages."

commit 155108545fa3b2d534008e4d5bc4e160a37832f0
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Fri Aug 17 12:41:13 2012 +0900

    Add missing conversion specifiers in exception messages.
    
    Fixes bug 1037881
    
    Change-Id: I05760707f28545d9593d30b5c5fe69a21636ba90

commit 7d29b163fa662abc37b0e3e96c334856d1254c61
Author: justin ljj <jiajun@unitedstack.com>
Date:   Wed Aug 15 12:11:56 2012 +0800

    Use a common constant for the port/network 'status' value
    
    Fixes bug 1036054.
    
    'status' have four values 'ACTIVE/DOWN/ERROR/BUILD' in v2 spec.
    However, some plugins still using 'UP/DOWN' from v1. In order to
    consistent the use of 'status' value. A common constant file was
    created and modified all plugins to use the same constant value.
    
    Change-Id: I865dffbe031d9a3e76e52e334db3050a3ef11ed0

commit de7e083212a6b2bd9f92e666aa54876af8da2ec6
Author: RongzeZhu <zrzhit@gmail.com>
Date:   Fri Aug 17 01:46:37 2012 +0800

    Remove unused variable
    
    'reqs_in' in openstack.common.setup.get_reqs_from_files is unused.
    
    Change-Id: I789f380fdbd0fd001196bcebe1568197d4590b92

commit 8c87db4c6ec09754c2f7d34547019ca6f94acfe2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Aug 16 08:27:31 2012 -0400

    Log message missing parameter causes exception
    
    Fixes bug 1037545
    
    Change-Id: Ica6109d676c23ff2e9469ca2ea5441550ff9afc2

commit c9793fdab0aa18a9d13ac995d10408f83a9fbfe9
Merge: bec4afe b5d2170
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 20:26:52 2012 +0000

    Merge "Fix flavor extension based on new attribute extension spec"

commit bec4afe860c59a6232a88d164eaaca5087f985ba
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Aug 15 12:39:28 2012 -0400

    Update README for v2 API.
    
    Fixes bug 1032548
    
    Change-Id: I0509df99d655b4e3a50899b992c7ef3b56339ce5

commit b5d217055d5227f39f7655a80bf0a2a99be32cf0
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Wed Aug 15 15:26:53 2012 +0000

    Fix flavor extension based on new attribute extension spec
    
    Fixes Bug 1037152
    
    Change-Id: I6a92bb6c40d0d4f3ddb438c658d596993f5011f9

commit d51ad9a9cbf47768685343978a36366d28c14c61
Merge: a1d85ef 38d4fa0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 08:16:21 2012 +0000

    Merge "Enhancements to Cisco v2 meta-plugin"

commit a1d85ef8d795ef269918068fcaa71806dea02e32
Merge: d8a4c1c 4ee0d1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 07:55:22 2012 +0000

    Merge "Add model support for DHCP lease expiration"

commit d8a4c1c7f52be6315473c47f4d874a91caa655c5
Merge: 1fc3f55 9682795
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 15 07:52:31 2012 +0000

    Merge "Convert DHCP from polling to RPC"

commit 1fc3f557427385ca6759e2bdc3e7639d2af95286
Author: Aaron Rosen <arosen@nicira.com>
Date:   Mon Aug 6 16:04:55 2012 -0700

    Update the Nicira NVP plugin to support the v2 Quantum API
    
    blueprint: quantum-nvp-plugin-v2
    
    Change-Id: I848ad7b7b99a24e19ea28e65b7d88261c21eac3a

commit 38d4fa088a6050cc34cc60d4e4c72157354d829d
Author: Rohit Agarwalla <roagarwa@cisco.com>
Date:   Tue Aug 7 03:28:12 2012 -0700

    Enhancements to Cisco v2 meta-plugin
    
    Implements blueprint cisco-v2-meta-plugin
    
    This patch allows a stand alone plugin to be configured as a device sub-plugin.
    (changes are contained within the cisco plugin only)
    
    Change-Id: I4de53afc3a7e8c79ab8637fe04a90da1d1b05342

commit 6767b92c5016d0095eb949181012d2512085604c
Merge: 10005f6 a121217
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 23:24:08 2012 +0000

    Merge "Enables Cisco NXOS to configure multiple ports Implements blueprint cisco-nxos-enables-multiple-ports"

commit 10005f6e659fac9daf62f9021bb85db3ed6b1df0
Merge: 096af57 7f28401
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 21:38:22 2012 +0000

    Merge "Allow extra config files in unit tests"

commit 096af57fc7f3b0b26b8c253708b70568064c01d7
Merge: 344882d 7aebe24
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 19:39:17 2012 +0000

    Merge "NEC OpenFlow plugin support."

commit 344882df102a29cb843b57951399d548f904cb76
Merge: 8f83ea8 6c98f91
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 18:33:42 2012 +0000

    Merge "Trivial openvswitch plugin cleanup."

commit 8f83ea8d98906e265bf3593cd74e8426dac1c6be
Merge: 9092860 03fc7f6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 17:27:51 2012 +0000

    Merge "Reset device owner when port on agent is down"

commit 4ee0d1c54a92f258593ff3dbf2acc50075a5d8e1
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Aug 13 23:18:54 2012 -0400

    Add model support for DHCP lease expiration
    
    bug 1022804
    
    This fix is phase 1 of a fix that to address re-allocation of a fixed_ip before
    the DHCP lease expires.  The next phases will add RPC and recycling
    support.
    
    Change-Id: I3c907ade5cde562ff5a222bd97e56ffef367c722

commit 6c98f91c798dab1b3bdb1a62311f52e4d19d63b1
Author: Bob Kukura <rkukura@redhat.com>
Date:   Tue Aug 14 12:21:05 2012 -0400

    Trivial openvswitch plugin cleanup.
    
    Part of provider-networks phase 3 development, but merging separately
    to avoid confusion later.
    
    - eliminate target_v2_api config variable
    - eliminate old V1 version of Port
    - remove unused import
    
    Change-Id: I913def752ec537a7e74a6173f2b6f82372a4dce8

commit 96827953beba575a12acde5377adba95de00690a
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Tue Aug 7 16:23:05 2012 -0400

    Convert DHCP from polling to RPC
    
    blueprint non-polling-dhcp-impl
    
    This requires a change to devstack/stack.sh.
    See https://review.openstack.org/#/c/11278/ for the required changes.
    
    Change-Id: I1ea22c8e1b80e630bcb83f27a31aaeef482aff6c

commit 90928604d533c6de18ecd35e87a04d87325492aa
Merge: 46cac19 8e74cf0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 16:04:17 2012 +0000

    Merge "Fix visual indentation for PEP8 conformance."

commit 46cac19852b7879daa36962a8643727264a42ff5
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Sun Jul 29 20:59:55 2012 +0800

    Add quota per-tenant.
    
    blueprint quantum-api-quotas
    
    We implement it as an extension for linux bridge and ovs plugins.
    We also expose the /quotas/Xx url to client to operate the quota.
    We need admin role to show other tenant's quota, and to update quota data.
    Any user can show its own tenant's quota. An DB table is used to save the
    quota for each tenant.
    
    To use it, we have in quantum.conf:
    quota_driver = quantum.extensions._quotav2_driver.DbQuotaDriver
    
    The default quotas for each tenant are defined in quantum.conf too.
    
    In addition, modify extension framework to allow exposing a new resource and
    its controler. The extension can check the environment, such as configuration
    in global cfg.CONF to decide if it can be enabled.
    
    Also, we can define enabled extensions for each plugin in extensions.py
    New resources can be put into quota framework via quota_items in nova.conf
    
    Change-Id: I54d6107fdb2808cdae1a40b501ed8c7f379dedee

commit 03fc7f654d2001bc8e38eaa9b643c7a77992af93
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Aug 14 10:32:48 2012 -0400

    Reset device owner when port on agent is down
    
    Fixes bug 1036690
    
    Change-Id: If96d2c129a8d5f258ebf8213d3720f2a9809cce2

commit 7f28401e1ed2560424522c90c98df2813fdea53b
Author: Salvatore Orlando <sorlando@nicira.com>
Date:   Tue Aug 14 03:01:29 2012 -0700

    Allow extra config files in unit tests
    
    Fixes bug 1036669
    
    Change-Id: Ic091ab012fbf6c80d2355806b6cd03a63fbfe4ca

commit 8e74cf060abd812071a8d6841d9029a69f6a40ad
Author: Jeremy Stanley <fungi@yuggoth.org>
Date:   Tue Aug 14 05:20:08 2012 +0000

    Fix visual indentation for PEP8 conformance.
    
    Corrects misindented continuations (PEP8 E127, E128).
    
    The run_tests.sh script's PEP8 pass (with current 1.3.3) was
    reporting under- or over-indented visual continuations in a handful
    of files, all of which are fixed with this trivial patch.
    
    Change-Id: I19388dc0011546abe65b37d31df02debb3676003

commit 0ec3ef5003e9f5bc4fb30c80c0e689de2cd17a68
Merge: c2b890e f1e7ec9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 12:19:25 2012 +0000

    Merge "Updates pip requirements"

commit c2b890e74baed651361dd56780121598f769b962
Merge: 7404f16 ce1638c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 10:45:50 2012 +0000

    Merge "Implementation of second phase of provider extension."

commit f1e7ec951a9481f3b5a80f802a3c762b55a16e1c
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Aug 14 03:36:39 2012 -0400

    Updates pip requirements
    
    Fixes bug 1036533
    
    Change-Id: I8e1522ac0d1fbb08f7c9200323fbb1fef3fd0e9a

commit 7aebe2468bdcc1befef7d09136fdedafcb0049ec
Author: Ryota MIBU <r-mibu@cq.jp.nec.com>
Date:   Thu Aug 2 01:42:20 2012 +0900

    NEC OpenFlow plugin support.
    
    blueprint quantum-nec-openflow-plugin
    
    Change-Id: Ib6d6f658bbf6d653527fa7820685f9bed1412a18

commit 7404f16682e62f2581e652b557a846df314d679c
Merge: 8e66b33 de58aec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 08:25:04 2012 +0000

    Merge "deal with parent_id not in target."

commit a1212174c07370284694093063530e6b430df1d5
Author: Edgar Magana <emagana@gmail.com>
Date:   Tue Aug 7 01:20:47 2012 -0700

    Enables Cisco NXOS to configure multiple ports
    Implements blueprint cisco-nxos-enables-multiple-ports
    
    Change-Id: I4e8bccff19eb5b13895d7083623b7291b8c8bf7e

commit ce1638c283f894547fee7ccc83c66a54aa502c7e
Author: Bob Kukura <rkukura@redhat.com>
Date:   Mon Aug 6 09:42:20 2012 -0400

    Implementation of second phase of provider extension.
    
    Enhances provider extension to support flat networks and VLANs on
    multiple physical networks. Implements blueprint provider-networks.
    
    To create a flat network using the CLI with admin rights:
    
    net-create --tenant_id <tenant-id> <net-name> --provider:network_type flat --provider:physical_network <physical-network>
    
    To create a VLAN network using the CLI with admin rights:
    
    net-create --tenant_id <tenant-id> <net-name> --provider:network_type vlan --provider:physical_network <physical-network> --provider:vlan_id <vlan-id>
    
    The provider extension is supported by the linuxbridge and openvswitch
    plugins and their agents [openvswitch phase 2 implementation is
    in-progress, and does not yet support flat networks or multiple
    interfaces].
    
    Ranges of VLANs available on named physical networks for normal
    allocation are specified in the plugin's config file via the
    ListOpt syntax:
    
    network_vlan_ranges = <physical_network>:<vlan_min>:<vlan_max>
    
    The mapping of each named physical network to its physical network
    interface is specified (per-agent-host) in the agent's config file via
    the ListOpt syntax:
    
    physical_interface_mappings = <physical_network>:<physical_interface>
    
    See quantum/plugins/linuxbridge/README for details and examples of
    network_vlan_ranges and physical_interface_mappings usage.
    
    Also, bulk operations are enabled for the linuxbridge plugin.
    
    Change-Id: I93402bd5cc6316e9408ea71c3b3989d06898ee30

commit de58aec76bd5b70d21768a5e6b2fe9ff1ac307d9
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Tue Aug 14 07:27:22 2012 +0800

    deal with parent_id not in target.
    
    bug 1036425
    
    If we filter the fields of the requested resource, we have no parent_id in the target, which we must be tolerant with.
    
    Change-Id: Ieb591d9208f16a0d3e05bda00bf45ae7aca846a5

commit 8e66b33b20e14fbc870a5fe80de082235af06e37
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Aug 13 22:35:21 2012 -0400

    remove old gflags config code
    
    blueprint remove-gflags
    
    This code removes the old gflag based configuration tools.  There was
    no code out of the unit tests that were using it.
    
    Change-Id: Id3f2e9bcfc5abcfd29ef683684f56c69c058bdc8

commit 7df906ff1e573be10e4655b0b660da9663819286
Merge: d562f6b dff9317
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Aug 14 00:22:49 2012 +0000

    Merge "improve test_db_plugin so it can be leveraged by extension tests"

commit d562f6b67c189136d647485c612b497ce2ad3142
Merge: 78b1b6b 1a9717a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 23:58:14 2012 +0000

    Merge "implementation for bug 1008180"

commit 78b1b6b3090392a48629f3c661623a283adebdc0
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Sun Aug 12 10:43:09 2012 +0800

    convert query string according to attr map.
    
    Bug #1035774
    
    Change-Id: I162239ab2baa82636d270689ed3acd0cb6c336d4

commit ea172068114cccb820f1c633b41380a83caaf778
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Mon Aug 13 08:13:20 2012 +0000

    Add device_owner attribute to port
    
    in order for firewall logic to be able to poke a hole allowing traffic to/from a DHCP server,
    we need to expose the IP being used for DHCP in a subnet to external entities.
    This commit adds device_owner attribute, then dhcp-agent will update the device_owner value
    of port to dhcp-agent.
    
    Implement blueprint expose-dhcp-server-ip
    Change-Id: I11283485bff8a3a3cf0b1a2716763ad32e43028a

commit 1a9717a8cbd2fe405ccde25fa21214553deee635
Author: xchenum <xchenum@gmail.com>
Date:   Sun Aug 12 01:11:05 2012 -0400

    implementation for bug 1008180
    
    implement the database models for the v2 db plugin base to store dns + additional routes
    also handles the dns/route remote/update
    
    Change-Id: I06c585b47668ee963324a5064e40a24471da28c4

commit 91330cffc9056633f0f71a164b7cb6b870ea2695
Merge: 1f2d245 795711f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 19:27:33 2012 +0000

    Merge "Make sure that there's a way of creating a subnet without a gateway"

commit 1f2d2454c5dc1923e6bfeb81015d0f0b54885ff4
Merge: ff83702 b1fa5ef
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 17:17:41 2012 +0000

    Merge "Initial implemention of MetaPlugin"

commit ff837025e955799e69eebcab665374436649d6f8
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Mon Aug 13 09:31:38 2012 -0700

    Fix bulk create operations and make them atomic.
    
    Bug 1024844
    Bug 1020639
    
    The API layer is now able to issue bulk create requests to the plugin,
    assuming that the plugin supports them. Otherwise, the API layer will
    emulate atomic behavior.
    This patch also implements OVS plugin support for bulk requests.
    
    Change-Id: I515148d870d0dff8371862fe577c477538364929

commit 827e470a861a41162f8dfd2cb1f938b4136b719e
Merge: 6a1dc0a 3d8950f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 16:22:28 2012 +0000

    Merge "Update latest openstack files"

commit 6a1dc0a1883df0d13004de60dd75757fc9c18c77
Merge: f3b6441 5c69013
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 15:56:13 2012 +0000

    Merge "RPC support for OVS Plugin and Agent"

commit 795711f763a03bd7ae2b5f980a02af62f3a6b382
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Aug 2 22:46:45 2012 +0000

    Make sure that there's a way of creating a subnet without a gateway
    
    Fixes bug 1028646
    You can use null for gateway ip.
    
    Change-Id: I969112ad46efa22203db40106d4e35dce1757165

commit 3d8950f234fb01695f18d6efcbd243ced24ffee4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Aug 13 08:33:37 2012 -0400

    Update latest openstack files
    
    Ensure that the common code is updated with the latest common
    code.
    
    Change-Id: I8a8a21fdcf77a2f444fd3c919cca9aa3912e21af

commit dff93171499d5696e9c1689bcf03edc97c093742
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 13 05:20:11 2012 -0700

    improve test_db_plugin so it can be leveraged by extension tests
    
    prereq for bp quantum-l3-fwd-nat
    
    - load extension middleware as well as core API
    - support 'action' requests in addition to CRUD ops
    - add helper methods that check API return code
    - clean-up places where existing tests where hitting 409s on delete
    but ignoring the errors (basically SubnetInUse errors).
    
    Change-Id: I620f1ef7f2028879b3b86f90c2150c26aa0f23c1

commit f3b64410af40fd59310afefbc6081b2564dafdf9
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Jul 26 01:10:02 2012 -0700

    Adds the 'public network' concept to Quantum
    
    Implements blueprint quantum-v2-public-networks
    
    This patch allows Quantum to handle public networks. It modifies the
    API adding a new attribute to the network resource ('shared')
    and enhances the policy engine in order to handle the behaviour of
    the service wrt shared networks.
    Policy.json specifies a default behaviour which can be changed by
    the administrator, even at runtime.
    Tests added to test_db_plugin validate 'obvious' behaviour - such as
    that only the ports belonging to a given tenant should be returned
    even when they are queried on a public network.
    Tests added to test_policy instead validate the changes added to the
    policy engine.
    
    Change-Id: I0087d449a677ed29357cd3cb4d8580bece940fdf

commit 5c69013201e1ddc0dfa6faa38d3fa03263ec8977
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Aug 6 07:45:34 2012 -0400

    RPC support for OVS Plugin and Agent
    
    blueprint scalable-agent-comms
    
    This adds support for the OVS plugin.
    
    Change-Id: I613de63f5c7f374be87520f32a2f7129d86ef109

commit b1fa5ef2ca3ff24a9c7d970e47e095a1d721cf8d
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Jul 19 07:00:05 2012 +0000

    Initial implemention of MetaPlugin
    
    This plugin supports multiple plugins at same time. This plugin is for L3 connectivility
    between networks which are realized by different plugins. This plugin add new attribute 'flavor:id'.
    flavor:id correspond to specific plugin. flavor-plugin mapping could be configureable by plugin_list config.
    This plugin also support extensions. We can map extension to plugin by using extension_map config.
    
    Implements blueprint metaplugin
    
    Change-Id: Ia94d2349fb3ce9f121bbd2505324ae6f0c34247a

commit f01dafb01071a5285fd43e3905394cb1efbc8cb0
Merge: 636648d 2043c8d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 05:29:31 2012 +0000

    Merge "Make dhcp agent configurable for namespace"

commit 636648d037fefeea9660c7b8b7f0842396a70144
Merge: 746f8b7 081e101
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 05:28:53 2012 +0000

    Merge "Linux Agent improvements for L3"

commit 746f8b74e1e307735f1a4d637d5f511a63f11084
Merge: 77c90db 4e29c8a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 13 04:54:15 2012 +0000

    Merge "normalize the json output of show a given extension."

commit 2043c8d357f604980db96f2828b4ed2f816c421a
Author: Aaron Rosen <arosen@nicira.com>
Date:   Sat Aug 11 17:17:30 2012 -0700

    Make dhcp agent configurable for namespace
    
    Bug #1035769
    
    Change-Id: I9f0d48a73f059a4985d629c7f0209675f5b01bec

commit 081e1016debcae388b383e10302f72287fe4f0fe
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 11 19:42:59 2012 -0700

    Linux Agent improvements for L3
    
    prereq for bp quantum-l3-fw-nat
    
    - make init_l3 take cidrs, rather than assuming an augmented port object
    - make namespace for agent operations optional and allow the namespace
    name to be configured.
    - allow plug() operation to take an optional bridge parameter indicating
    which bridge to plug into
    - add namespace support for iptables manager
    - make OVS plug() set the IP address, etc. of a device even if it already
    exists.
    
    Change-Id: Id4fec9bf7cda30c45b94eccd25e9e54dc5af97b7

commit 77c90dbc960b0736a13d54f80b42f8a24667d627
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Aug 11 12:58:18 2012 -0400

    In some cases device check causes an exception
    
    Fixes bug 1035669
    
    Check the stderr in addition to checking the return codes.
    
    Change-Id: I05e469302bc502b540b0c4af5fbd9c712a9bd309

commit 4e29c8aa9f44355c6bae33bb92c7467b4f035006
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Sun Aug 12 07:50:22 2012 +0800

    normalize the json output of show a given extension.
    
    we should use {'extension':{}} for a given extension query to comply with
    our API design.
    
    Change-Id: Id0b04b29bed4be92498c04178e268c31e9a1d635

commit b45d4eb28025ecc604daf2bbdcd3ab450154f7d2
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Sat Aug 11 11:29:14 2012 -0400

    move the correct veth into the netns for the LB
    
    bug 1035649
    
    This fix moves the correct device into the namespace and improves the test
    to ensure the proper device was moved.  The previous generic check
    failed to catch an error during refactoring.
    
    Change-Id: Ifa2e2bb97dc923549d00b1750c61a22e139647d7

commit 532dc02d2391df010b1ff34f6724f8fabdc4d3cc
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 10 19:37:34 2012 -0700

    linux bridge fixes following v1 code removal.
    
    Change-Id: I4ad84421757db271904c8704a12b2e7abdfa8a0e

commit 6f1af60f544584510e3794ad3bd4485ff4d35381
Merge: f018dc5 77573d7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 11 02:56:02 2012 +0000

    Merge "Remove v1 code from quantum-server"

commit f018dc51a7022fe7ccc09274a98fc6ecffb16d7d
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Aug 10 14:24:17 2012 -0400

    fixes typo in ensure_namespace
    
    bug 1035425
    
    There was an uncheck branch in ensure_namespace that used the wrong
    class name.  This fixes that bug and adds better tests.
    
    Change-Id: I0c22e70938305e180084de4bf9a700aebf512645

commit 77573d733837c6b890d92bc4d46bf5298e5322dd
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 10 10:37:26 2012 -0700

    Remove v1 code from quantum-server
    
    bp remove-v1-related-code
    
    Removes API, DB, and test code that is used only for Quantum v1 API,
    which is no longer supported.
    
    Includes removal of v1 code for sample, ovs, linuxbridge and ryu plugin.
    
    Nicira and Cisco plugins will be handled outside of this patchset.
    
    Change-Id: Id34dc7229bb7b399b5cfd4602dbc8d5ee4e8de61

commit 2a2d7f2e3aefd87979e6221badae6a50bff1f812
Merge: 181083d 2a2800e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 16:39:05 2012 +0000

    Merge "Add netns to support overlapping address ranges"

commit 181083d94d6fe22191915562523490455cc9573a
Merge: 2c1701a dea9ecf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 16:25:23 2012 +0000

    Merge "RPC support for Linux Bridge Plugin and Agent"

commit 2a2800e993e99f7e5fec9b860a32601adf9e80a5
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Jul 19 21:37:24 2012 -0400

    Add netns to support overlapping address ranges
    
    blueprint: dhcp-overlapping-ips
    
    This change uses linux network namespaces to isolate dhcp interfaces so
    that tenant network IP address ranges can properly overlap.
    
    Change-Id: Iaa07e7c38d0813d07c3405884e513276e43e2afd

commit 2c1701af1382131e45667d261e1f9a3157b37959
Merge: bcde97b 82187a4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 10 15:53:10 2012 +0000

    Merge "dhcp-agent: Ryu plugin support for dhcp agent"

commit 82187a476e000733a01abdb6f7399cf56500ca7b
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Jul 28 00:27:30 2012 +0900

    dhcp-agent: Ryu plugin support for dhcp agent
    
    This patch adds Ryu support to dhcp-agent.
    fixes bug 1030830
    Ryu devstack support is available at https://review.openstack.org/#/c/10117/
    
    Change-Id: I3f5fbe8600b4b674834e317e158bac1856b0349c
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit bcde97b48552072bda453e08f6a5c669b2838c05
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Aug 8 15:30:48 2012 -0700

    fix missing deallocation of gateway ip
    
    bug 1032506
    
    when deleting a port that uses the gateway IP, we were not removing
    the IPAllocation entry, which resulted in a depedency issue when we
    deleted the port that the IPAllocation entry referenced.
    
    Change-Id: I272a6572c389ef8c12585f4b62204f5877cda078

commit dea9ecf4b2ab31baef56a5d80d157ab8b539bd57
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 10 11:28:08 2012 -0400

    RPC support for Linux Bridge Plugin and Agent
    
    blueprint scalable-agent-comms
    
    This is the first stage of the blueprint. This adds support to the linux bridge
    plugin.
    
    The development followed the design described in:
    https://docs.google.com/document/d/1MbcBA2Os4b98ybdgAw2qe_68R1NG6KMh8zdZKgOlpvg/edit?pli=1
    
    Change-Id: I4004c05a63ce49f020c2016c8763e73238b465a7

commit de1d7d953772e3667c75caacd8a44f7026f88228
Author: xchenum <xchenum@gmail.com>
Date:   Wed Jul 25 20:58:52 2012 -0400

    Implementation of bp per-net-dhcp-enable
    
    Change-Id: I81c2e6adb02921e8b80f8181a730b1cba9ffa649

commit fe09214372f199d4cfbff76aabf76470543c26f2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Aug 6 09:45:20 2012 -0400

    Enhance Base MAC validation
    
    Fixes bug 1033520
    
    The base mac will now be validated when the configuration file is read.
    In addition to this the following has been done:
    1. checks validaity of the base mac - for example it cannot be a multicast MAC
    2. adds a framework for attributes tests
    
    Change-Id: Ibffab039ca7ee9e87eb79a7288e86401170bf129

commit 03079191cd26d98e3b20c90d8929e408853c2bf5
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Aug 2 14:09:23 2012 -0500

    Use function registration for policy checks
    
    The original policy framework allowed new policy checks to be created
    through inheritance.  This is somewhat clunky and unnecessary in
    Python.  This change refactors policy.py to allow new policy checks
    to be registered using an @register() decorator.  One consequence is
    that HttpBrain is deprecated.
    
    Care has been taken to ensure backwards compatibility; deprecation
    warnings will be emitted for uses of HttpBrain or the inheritance-
    based checks.
    
    (Pull-up from openstack-common, with deprecation of HttpBrain.)
    
    Change-Id: I0aa78d1128e55aa7d59558c62128105c01da8f1b

commit 12628f6f0590740b0d3f543620d184a10397ca0e
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Mon Aug 6 10:00:17 2012 -0500

    Exempt openstack-common from pep8 check
    
    The openstack-common project already does its own pep8 checks; we
    don't need to duplicate the effort.  This also avoids issues with
    pep8 version skew between projects.
    
    Change-Id: I50d6e1b21c743d811e44b415017ca7e19687c9c2

commit 42083d8cac82a53d02ab751303451fae14b12158
Merge: 1090847 36f1f15
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 6 05:15:22 2012 +0000

    Merge "Make 4th octet of mac_range configurable."

commit 10908473dce1a38d828b62441dede7b2153d4397
Merge: 2e07bdc 8807825
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Aug 6 01:02:43 2012 +0000

    Merge "Replace openvswitch plugin's VlanMap with vlan_ids DB table."

commit 36f1f15cfbd93ca528f6c006c5b035f79126339c
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Fri Aug 3 01:37:34 2012 +0000

    Make 4th octet of mac_range configurable.
    
    Fix bug 1022739.
    To get OUI per cluster is not realistic. So This commit
    make 4th octet of mac_range configurable. By this commit,
    the cloud provider can allocate OUI (3 octets)  + 1 extra octet
    range (4 octets) for each cluster.
    
    Change-Id: Ibbd27e6e7f16d73dfd3045ed60f63a38b23ea1ed

commit 2e07bdc8532243b5270f85afe65004bfae23022c
Merge: d326ec0 a9afa9d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Aug 4 19:50:19 2012 +0000

    Merge "update DHCP agent to work with linuxbridge plug-in"

commit 88078250028d50b6d726a6bdf79874a2f4e9abce
Author: Bob Kukura <rkukura@redhat.com>
Date:   Mon Jul 30 14:52:06 2012 -0400

    Replace openvswitch plugin's VlanMap with vlan_ids DB table.
    
    Fixes bug 1023167.
    
    The openswitch plugin's in-memory VlanMap is replaced with a vlan_ids
    DB table similar to that used by the linuxbridge plugin. This will
    prevent conflicting VLAN assignments if multiple server replicas are
    run, and also sets the stage for phase 2 of the provider-networks BP
    implementation that will add support for multiple physical
    networks.
    
    Unlike with the current linuxbridge plugin, the contents of the
    openvswitch plugin's vlan_ids table are properly updated at startup in
    case the vlan_min or vlan_max configuration variables have changed.
    
    A new test_ovs_db test case has been added.
    
    The primary key of the vlan_bindings table is changed from the vlan_id
    to the network_id, which is now a foreign key, and network deletion is
    now properly handled.
    
    The net_id has been removed from the VlanIdInUse exception, requiring
    a minor update to the linuxbridge plugin. The new NoNetworksAvailable
    exception, with ResourceExhausted as its base class, is returned when
    no more VLANs are available.
    
    Change-Id: I65a2347dea5366cc0d15d98a88f40e42e1a45f4c

commit d326ec0088e2e0d464402164c0d4b5850227fcac
Merge: f8e2c11 ff741c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Aug 3 15:24:08 2012 +0000

    Merge "Remove unused properties"

commit ff741c2dfde005963b576c90e8e26eab25caa17c
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Fri Aug 3 06:29:04 2012 +0000

    Remove unused properties
    
    Fixes bug 1032502.
    
    Change-Id: I63d86788e004ac371e69c238caf38c64ee398955

commit f8e2c112829157a0ec12cfd1afa1d1a7ab9becb4
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Wed Jul 25 22:55:33 2012 +0800

    Notification for network/subnet/port create/delete/update.
    blueprint quantum-notifications
    
    Add host configuration into conf, which is determined by socket.gethostname()
    function by default. Host name is part of publiser id, which is in the format
    of 'network'.$host.
    
    We add create/update/delete start and end notification for each kind of resource.
    By default, the notification do nothing since the notifier driver is no_op_notifier.
    We can define it in quantum.conf.
    
    Change-Id: Ibc5eacac7a324584e6ccff120f573444932a88ef

commit eef9c8b3b354a778aa06564e07a2d0b8e93a8fcb
Merge: d4a7eab 34b30b5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Aug 1 17:19:46 2012 +0000

    Merge "ryu/plugin, agent: unbreak 610017c460b85e1b7d11327d050972bb03fcc0c3"

commit d4a7eabec0efc22c568d476b2237367d51a5025f
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Aug 1 04:05:17 2012 -0700

    Make the plugin for test_db_plugin configurable
    
    Bug 1031716
    
    Change-Id: I8dc492eb90d4160a23b3b4ba51feeedba6f852e2

commit 1479a3400e21a30a698fd39769f4e77decc48103
Merge: d7ff293 20560ec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 30 19:38:07 2012 +0000

    Merge "Add classmethod decorator to class methods of providervlan ext."

commit a9afa9dcdb85474b00f3715f75825d77f617011b
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Thu Jul 26 14:42:55 2012 -0400

    update DHCP agent to work with linuxbridge plug-in
    
    Fixes bug: 1027194
    
    Update the interface driver to use veths instead of tap devices.  This
    change is compatible with the netns work.
    
    Change-Id: Ic236f5fdeb79eb36791434999df2b731856de092

commit 34b30b595f95eeab929166c5729a6923d5ff97a5
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Mon Jul 30 11:51:27 2012 +0900

    ryu/plugin, agent: unbreak 610017c460b85e1b7d11327d050972bb03fcc0c3
    
    The changeset of 610017c460b85e1b7d11327d050972bb03fcc0c3,
    Change-Id of I3bd7701526a950c360d7c2cf14b31045010b46ca
    breaks Ryu plugin/agent. This patch unbreaks it.
    fixes bug 1030832
    
    "from quantum.common import config as logging_config" was missing for
    ryu agent.
    "from quantum.openstack.common import cfg" was missing for ryu plugin.
    And unused imports is eliminated.
    
    Change-Id: I2cb3b030dff3ea3fe3db0e5672781f031198eee6
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit d7ff293f470bfa3b8dfe1591733b6c55f26aaf1c
Merge: bc3d89c ddcc951
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 29 20:53:25 2012 +0000

    Merge "Make quantum pipeline configurable from quantum.conf."

commit 20560ecf9557f24b89abe669efb9cea0a876ca13
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Sun Jul 29 21:16:59 2012 +0800

    Add classmethod decorator to class methods of providervlan ext.
    
    Change-Id: If26d75b67c4816de0937f9edaa9f55a5bb2197a2

commit bc3d89c5ab618972641e0afe2f691b6251333374
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sat Jul 28 14:08:47 2012 -0400

    Only delete VLAN information after Quantum network is deleted
    
    Fixes bug 1030271
    
    In the case where a network is deleted and there is a VLAN tag in a
    separate table then the tag should only be deleted if the network
    is deleted.
    
    Change-Id: I99130f863928abf30a521e9a2b6d1233a274d9c6

commit ddcc951f08dc24c2fc605b45937a429c2c354e51
Author: Akihiro MOTOKI <motoki@da.jp.nec.com>
Date:   Thu Jul 26 17:48:48 2012 +0900

    Make quantum pipeline configurable from quantum.conf.
    
    Fixes bug 1029313.
    
    The current api-paste.ini does not provide a way to choose a pipeline:
    there is no way to switching a pipeline between keystone-enabled and
    noauth pipelines without modifying the pipeline directly.
    
    This commit introduces 'auth_strategy' flag to quantum.conf and
    a pipeline used is determined depending on the flag. Supported values for
    this flag are 'keystone' (default) and 'noauth' at the moment.
    
    Change-Id: Ieafaf31eaaec2b02727ed5d3bd36c907e50aee5b

commit 787f763a33cf59a58930e4b6ee329a43d2dbedd0
Author: Nachi Ueno <nachi@nttmcl.com>
Date:   Thu Jul 26 22:54:18 2012 +0000

    ovs_quantum_plugin should use reconnect_interval in common conf.
    
    Fixes Bug : 1029680
    
    Change-Id: I5dd2467bc5e287bbb5ff4a2527b9f701375fa376

commit 03be9b539b087b120433251ce53d7cb8c7b1f4bd
Merge: e508e17 c0cdfff
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 26 16:26:37 2012 +0000

    Merge "Fix linuxbridge agent tests"

commit e508e1778c50b92f1dea8c29c4a221af8f19bc4f
Merge: ddef83e 610017c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 26 16:25:20 2012 +0000

    Merge "Enable agents and plugins to use the same configuration file."

commit ddef83ed1900df6aa692d7ae624890a40e8c7b2d
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Thu Jul 26 07:32:59 2012 +0800

    add name into port and subnet.
    
    f-3-cli-usability-improvments
    
    The name is optional to create network/port/subnet and is up to user to
    decide its uniqueness.
    
    Change-Id: I40c834ed66e2da14a414232c86c9fd4f5c1d9154

commit ef6af3e3d2da3e1483b201b98b06c4555e90f6e7
Author: aaronorosen <arosen@nicira.com>
Date:   Wed Jul 25 13:35:28 2012 -0400

    Update openvswitch tunnel unittest
    
    Bug #1029024
    
    Change-Id: Ie37ef0c3355e86f504fa71417921bb828b40e347

commit 610017c460b85e1b7d11327d050972bb03fcc0c3
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 24 13:15:54 2012 -0400

    Enable agents and plugins to use the same configuration file.
    
    The change also implements blueprint agent-logging (this
    was due to the fact that the existing logging in the agents
    did not work with the change)
    
    Devstack support for the above is in
    https://review.openstack.org/10267
    
    Notes:
    - The service and agent can be run with multiple configuration
      files by using the CLI parameters --config-file <filename>
    - The agent now makes use of the logging and debugging flags
      defined in quantum.conf. This follows the standard common
      configuration command line rules.
    
    Change-Id: I3bd7701526a950c360d7c2cf14b31045010b46ca

commit c0cdfff5dbf3fb00cbf98145d466b9260aad3c2b
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jul 25 09:35:16 2012 -0400

    Fix linuxbridge agent tests
    
    Agent tests failing missing parameter in setUp
    
    Change-Id: I7c7e029fbf88e0fd62aba821e81a55d3aca02190

commit 5583de27c24a2ba8c045a3097d98312905dc5180
Merge: d0e50ba f2e3717
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 21:45:53 2012 +0000

    Merge "Initial V2 implementation of provider extension."

commit d0e50ba5fe1c7c328c78085bef5d204d84c39863
Merge: ad4c6fa f43b1ce
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 15:55:41 2012 +0000

    Merge "Update openstack-common files."

commit ad4c6fa1ee4b536bfcc26bfb0da99121e5159c0c
Merge: a01ca27 9cc6dec
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 24 07:34:58 2012 +0000

    Merge "Add v2 API support for the Cisco plugin Blueprint cisco-plugin-v2-api-support"

commit f43b1cede93bca9acfa493c7f3c83ff5ab961587
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 24 02:28:56 2012 -0400

    Update openstack-common files.
    
    The RPC support requires that the fanout_cast messages enable
    the application to set the topic. This was fixed in
    https://review.openstack.org/#/c/10125/.
    
    In addition to this the jsonutils.py was updated.
    
    Change-Id: I85b5a3a74f129746528910d12acdd00db39d8626

commit f2e37172ef0ee319de171894bd61fd18f9c55a34
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Jun 15 10:20:05 2012 -0400

    Initial V2 implementation of provider extension.
    
    Initial provider extension implementation. Specify vlan_id using the
    CLI with admin rights via "net-create --tenant_id <tenant-id>
    <net-name> --provider:vlan_id <vlan-id>". Also includes
    provider:vlan_id in reply messages for admins. The extension is
    supported in the linuxbridge and openvswitch plugins.
    
    Partially implements blueprint provider-networks.
    
    Change-Id: I2fff64c4247b1a3091c28c7a2cd632afda192c3d

commit a01ca27a88bfc7bdc6913580700315a7789e5a70
Author: Bob Kukura <rkukura@redhat.com>
Date:   Sun Jul 15 20:45:25 2012 -0400

    Implements data-driven views and extended attributes.
    
    The quantum/api/v2/views.py module is replaced by is_visible
    properties in the RESOURCE_ATTRIBUTE_MAP defined in
    quantum/api/v2/attributes.py. Extensions are given the ability to add
    extended attribute descriptions to this map during initialization,
    allowing extended attributes to be implemented similarly to core
    attributes in plugins.
    
    Resolves bug 1023111.
    
    Change-Id: Ic6e224d5d841b6a1d4d1c762d7306adaf91f7a2d

commit 9cc6decb7a554619b565b269f0b29b0b1486847c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Jul 18 13:30:21 2012 -0700

    Add v2 API support for the Cisco plugin
    Blueprint cisco-plugin-v2-api-support
    
    New meta-plugin which makes use of the Quantum db_plugin and supports
    the new v2 API
    Changes to the Cisco DB model, now reusing quantum DB for core attributes
    Changes to the device sub plugins to access the quantum DB for core
    resources' state versus Cisco DB
    Addition of fake/dummy drivers to support testing of the device sub
    plugins even without actual hardware
    New v2 unit tests which exercise the meta-plugin and the device sub
    -plugins as well
    In general creating new v2 modules such that v1.x code can be deprecated
    easily by deleting the older modules. The following files are v2
    versions of older modules, only the imports have changed, most of the
    other code is the same as from the older modules (already reviewed):
    quantum/plugins/cisco/common/cisco_credentials_v2.py
    quantum/plugins/cisco/db/network_db_v2.py
    quantum/plugins/cisco/db/network_models_v2.py
    quantum/plugins/cisco/db/nexus_db_v2.py
    quantum/plugins/cisco/db/nexus_models_v2.py
    quantum/plugins/cisco/db/ucs_db_v2.py
    quantum/plugins/cisco/db/ucs_models_v2.py
    quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py
    quantum/plugins/cisco/ucs/cisco_ucs_inventory_v2.py
    quantum/plugins/cisco/ucs/cisco_ucs_plugin_v2.py
    quantum/plugins/cisco/segmentation/l2network_vlan_mgr_v2.py
    
    All changes are contained with the Cisco plugin.
    
    (Sumit & Rohit)
    
    Change-Id: Ib82a9f843548c286c84ba63caf5406a773ac85b1

commit 73ec08b7fc88cb30ab449ba9e05e0818a4b5b78e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jul 19 08:51:38 2012 -0400

    Enhance V2 validations to work better for integers and booleans
    
    Fixes bug 1026598
    
    The attributes are now able to cast a input value to a specific type.
    At the moment boolean and int are supported.
    
    Change-Id: I568a95bc60f91c3eeae03b305031502d50de9c44

commit 71eac0df7b23a5021210f0d5b092a9ddf0edf067
Merge: d36be52 67f88c2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Jul 20 17:28:12 2012 +0000

    Merge "Add quota features into quantum. Blueprint quantum-api-quotas"

commit d36be5244977d47381ed68c2f60b5a0f4c95f606
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Fri Jul 20 10:07:44 2012 +0800

    Refactor the test cases so that all the test cases are under one test class.
    
    Change-Id: I31c5c51a3f7fa4b7cb068b7b93692411956e62ac

commit 67f88c2a4bef387ef0f51196ecc6f7f3a2a79512
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Wed Jul 11 12:01:04 2012 +0800

    Add quota features into quantum.
    Blueprint quantum-api-quotas
    
    We support quota check for creating network, subnet and port.
    Change-Id: I943335816308767c7eba084d80b969fcb2e5a8fb

commit 730b5b97ccf014ad984451b961a972d24b2b927b
Merge: 5fcf6cc 566eb83
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 19 17:16:15 2012 +0000

    Merge "Assume that subclass validates value of UUID"

commit 566eb8312c35dbfb3207f4eccf0c0a9b74dd528b
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jul 19 06:16:34 2012 -0400

    Assume that subclass validates value of UUID
    
    Change-Id: I8501d10a798cc90c027bb981c5a3ca5a0ef6e622

commit 5fcf6ccd952f74d77f6735831c778d33dfcd6136
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Tue Jul 17 13:23:00 2012 +0800

    fix bug lp:1025526,update iniparser.py to accept  empty value.
    
    also,this patch turn off pep8 E125 check,this for now seems to
    be unnecessary,it check continuous line split.and update the
    latest openstack-common https://review.openstack.org/#/c/9201
    which has fix pep8 1.3 issue except for E125 check.
    
    Change-Id: I86e6a3add56a0a2941031a1248f1696667ac56b8

commit b7501f2be1f423755b1fef56d9e79561215ff673
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Wed Jul 18 17:59:42 2012 -0700

    Ensures policy file is reloaded only if updated.
    
    Fixes bug 1023649
    
    The fix is 'inspired' (ie: copied) from nova. It is cached in memory unless a
    change in policy file is detected. In that case, a reload is triggered.
    
    This patch also adds a set of unit tests for quantum/policy.py, which was
    previously not covered.
    
    Change-Id: I337042ae418b518268acd30c26ef02559887a8be

commit 659d0ba03a076bdacc141069ee4837ac5bc1ccc8
Author: Aaron Rosen <arosen@nicira.com>
Date:   Tue Jul 17 01:59:10 2012 -0400

    Provide way to specify id in models_v2
    
    Bug #1025127
    
    Change-Id: Ie4112b841c1e42408cdb539c2b87446c596e92ba

commit 4605dff64fb2fac764e58baf397f2e6811216ec4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 17 04:52:20 2012 -0400

    Add validity checks to Quantum v2 resources
    
    Fixes bug 1015148
    
    The code enable defining validity checks for input variables. This
    is done via callback functions per type. The following types are supported:
        - type:values - checks that data is valid according to a list of values
        - type:mac_address - checks that data is a valid mac address
        - type:ip_address - checks that data is a valid ip address
        - type:subnet - checks that data is a valid cidr
        - type:regex - checks that data matches a regular expression (for
          example checking UUID validity)
    
    Change-Id: Iaa694cbfe3c518a5cd3951271853fe986106e7f5

commit f8f4615c5884991ee8f76b33511fb4f14d6df43b
Merge: 0e849b0 f3e4b70
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 18 12:39:38 2012 +0000

    Merge "Ryu plugin support for v2 Quantum API"

commit 0e849b0613555f4dfd204ef26854f9c5df6183cc
Merge: eeb0b8e 3cff1e7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jul 18 06:57:27 2012 +0000

    Merge "Introduce files from openstack common."

commit eeb0b8ed9c0c289a05167c0a78b862d0258393e5
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Tue Jul 17 09:32:16 2012 -0700

    Avoid removal of attributes used by policy engine
    
    Fixes bug1025150
    
    Ensures that each attribute which is used by the policy engine is not
    removed by the plugin when the 'fields' query parameter is specified.
    This could be better achieved by not having the plugin perform this
    selection, but as it is part of the plugin interface, it's probably better
    not to introduce changes which alter it.
    
    Change-Id: I68ab0998b7113f06da5df74ccd44e390640de475

commit 2cb30561416a499673c8a32cf7700963ca772da7
Author: justin ljj <jiajun@unitedstack.com>
Date:   Wed Jul 11 13:38:26 2012 +0800

    Raise proper exception if policy file do not exist
    
    Fixes bug 1022966.
    
    Change-Id: Ia1f9a95eb9e956d0d65efb50e674de18d0552b6e

commit 3cff1e7b9723a9a02d3e46cb56d7906134e407d4
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Sun Jul 15 08:17:34 2012 +0800

    Introduce files from openstack common.
    
    Because the openstack common project does not stick to latest pep8 rules,
    I have to exclude some bad-ruled files in the tox.ini and run_tests.sh.
    However pep8 does not support exclude option in the format quantum/openstack/common,
    so I have to exclude some of openstack common files one by one.
    
    Also, I have changed the Qunatum Context to base on the common context.
    
    I does not update the setup.py in our openstack common dir and the one
    under quantum top dir, since it should be maintained in a consistent way
    across all of openstack projects.
    
    After this introduction, we are ready for notification feature.
    
    Change-Id: I2729c2dc3958835374c88d704e842e613785ec14

commit b5db77a4bcbea488d3db5fc76962c798ecac917f
Merge: e702264 6f99f4f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 16 21:42:15 2012 +0000

    Merge "fix bug lp:1019230,update rpc from openstack-common."

commit e702264e310714a2369713fad95264d3ccedb66b
Merge: 825c00b a74b3a5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jul 15 19:37:01 2012 +0000

    Merge "ovs-agent exception non-existent ports"

commit 825c00b96f049f39278d794a0e4968edce8abce6
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Jul 12 05:14:39 2012 -0700

    Ensures API v2 router does not load plugin twice
    
    Fixes bug 1020024
    
    The router will simply use the QuantumManager which stores the instance
    of the plugin being used by the Quantum server. Changes to unit tests
    are for ensuring plugin instances are recycled across tests.
    
    Change-Id: I339a40ee6fef74d938245e9c50c7ed695d866e3b

commit a74b3a55ac6d239a04bb6cfe3ba0e1ad825450bf
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri Jul 13 19:01:34 2012 -0400

    ovs-agent exception non-existent ports
    
    Bug #1019491
    
    Change-Id: Ica3aa3f6c81e4fd062b752867487c89515fb9446

commit f3e4b701fd9158cd7c167d9f188bfb71fa319671
Author: Yoshihiro Kaneko <ykaneko0929@gmail.com>
Date:   Fri Jul 13 16:15:23 2012 +0900

    Ryu plugin support for v2 Quantum API
    
    blueprint update-ryu-plugin-for-v2
    
    Ryu plugin using the v2 Quantum API.
    
    Change-Id: I9d42b3aee4b51edbc0b80d8f8372f65eb47df9af

commit 627a03766d1eb22ed04f0e208aca9b8e16a0303c
Author: justin ljj <jiajun@unitedstack.com>
Date:   Mon Jul 9 11:11:09 2012 +0800

    Add option sql_max_retries for database connection.
    
    Fixes bug 1019728
    
    also add unit tests for linux bridge plugin config
    
    Change-Id: Ibfea9bac87ba36f301671a35de81577debcd460e

commit eb6eded3d13b658a195a432dcde94605e951f3e4
Merge: e2d0eb6 1da4b87
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jul 12 17:17:55 2012 +0000

    Merge "Create DHCP agent tap device from port ID"

commit e2d0eb6ad89b41eab4e40e24e53884de368a80a4
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jul 8 08:05:46 2012 -0400

    Enable quantum agents to work with global cfg.CONF
    
    This implements blueprint global-config-support
    
    A common configuration parse function is used by the service and the agent.
    
    In the case of the service, when loading the plugin, the configuration file
    will be appended to the existing cfg.CONF (this was originally created when
    quantum.conf was loaded).
    
    In the case of the agent a global cfg.CONF will be created.
    
    This task is a prerequisite for the RPC integration into Quantum.
    
    Change-Id: I24ef4a804578502bcce484f44dc55c8fe2aa913e

commit 1da4b87b724f7c2991bd3a502066000658c11f55
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jul 11 07:45:49 2012 -0400

    Create DHCP agent tap device from port ID
    
    Fixes bug 1022806
    
    Change-Id: If29ffdc35d02f8e18789173f250c1eab28a258fc

commit dde2388470d37a25d267775a5ea417a6bff2a9e2
Merge: 6f076c9 67b283e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 10 20:35:06 2012 +0000

    Merge "Fix some syntax errors."

commit 6f076c946f3a6963e5e243bc9381f1a764606dda
Merge: bab54aa 1307025
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jul 10 19:37:52 2012 +0000

    Merge "Validate that network_id in port/subnet POST belong to the same tenant"

commit 67b283e11ba3237699c7c0e0c354dae4b1f60f8d
Author: Adam Gandelman <adamg@canonical.com>
Date:   Mon Jul 9 18:09:18 2012 -0700

    Fix some syntax errors.
    
    Some syntax errors slipped in with a previous pep8 cleanup to this file.
    These errors currently prevent distro packages from installing.
    
    Fixes bug 1023066.
    
    Update: * Proper pep8 indentation.
            * Wrap in paranthesis instead.
    
    Change-Id: I257fbc7f0d8287ac648f2ad23caa7536388486d3

commit 6f99f4fee99159b6c3b270eeb1f5dd8dae78e407
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Sat Jul 7 00:21:17 2012 +0800

    fix bug lp:1019230,update rpc from openstack-common.
    
    Change-Id: I498e578affef4fa9df6c50cd7284ebd7e3f9a64e

commit bab54aaeb84bf5c37d1a43e3d39df64da5485f0d
Merge: 7d5db13 43960ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 9 20:55:56 2012 +0000

    Merge "implement dhcp agent for quantum"

commit 7d5db13b915ed1617b18cca6e84393f148e62285
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 8 12:34:22 2012 -0700

    Fix v2 API policy checks when keystone is in use.
    
    bug 1022032.  There were significant errors in how
    the policy framework was being invoked, but existing
    tests did now show them, since they always invoked the
    API with no keystone context.  This patch fixes those
    issues and add a significant amount of test coverage
    simulating API calls with keystone enabled.
    
    As part of this patch, we also needed to add a tenant-id
    attribute to the subnet object.  Furthermore, we
    changed the API validation code to prevent tenant-id from
    being changed with a PUT, since changing it after creation
    could invalidate some of the create checks we're planning
    on adding (e.g., that a port is being created on a network
    owned by the same tenant).
    
    Change-Id: I6da61f0d4ac3b259aa0afcd42cfa8e6ec1a9b035

commit 43960ee4486925bff2b4da3af5db963b389f7dc2
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Wed Jun 27 14:15:53 2012 -0400

    implement dhcp agent for quantum
    
    blueprint: quantum-dhcp
    
    This change adds an agent to manage DHCP for Quantum networks
    
    Change-Id: If3c62965550dc0b0a7982b01d3468e2e07e2b775

commit bb2b244fe371b7df995cb38189a12963579304eb
Author: Soheil Hassas Yeganeh <soheil@cs.toronto.edu>
Date:   Fri Jul 6 18:27:29 2012 -0400

    Corrects imported modules in Cisco and Ryu according to latest nova packages.
    
    Change-Id: I58b6d4356b071624c725b4dd0d98a60592ef0b45

commit 13070251129155ba4eb435f0af3d61418e9775e2
Author: Juliano Martinez <juliano@martinez.io>
Date:   Wed Jul 4 23:32:59 2012 -0300

    Validate that network_id in port/subnet POST belong to the same tenant
    
    Bug 1014989
    
    Change-Id: I17b619c502afb35fe0829e41a7d0f997d60998fa

commit 05be01c5c484425d22c46348d2f31989e47d1542
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Jul 5 02:20:43 2012 +0100

    Verify CIDR overlaps among networks' subnets.
    
    Make sure CIDR for subnets in a given network do not overlap each other.
    
    Fixes bug 1021106
    
    Change-Id: I212a734ad59bbba86876d372a2f559f21ac60835

commit ae65b07b4c67889ccf28a02a25f2d723c759e80e
Author: Gary Kotton <gkotton@redhat.com>
Date:   Wed Jul 4 06:54:10 2012 -0400

    Address problems with foreign keys with subnet and network deletion
    
    This also fixes bug 1020879 and bug 1020847
    
    Change-Id: Ib68f9357ed65f35e56d17577b83fabe8f96388cf

commit b99dde80e2cb04943d6bf2d17e70c1c976d90da8
Author: Salvatore Orlando <salv.orlando@gmail.com>
Date:   Thu Jun 28 10:22:36 2012 +0100

    Add 'allocation_pools' to Quantum v2 API subnets.
    
    This changeset adds a new parameter, 'allocation_pools' to the 'subnet'
    resource of the Quantum v2 API.
    Allows for creating and validation of subnets with multiple allocation pools.
    This commit only deals with POST verb (subnet creation).
    PUT verb (subnet update) will be dealt with in a subsequent commit.
    
    This is the first commit for fixing bug #1016308
    
    Change-Id: Ic356dcb5dcfa46af8ecc7e598529881f8bcbbeed

commit 06900100ad6ddf81c7e5d48a17db079969dd80ce
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 3 13:11:31 2012 -0400

    Delete IP allocation range for subnet when deleting subnet
    
    Fixes bug 1020563
    
    Change-Id: I034e490825603ab71662a0bbad9b325f419a9e43

commit e39fbbcedb1653c68771af1ea28face10a7be79f
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jul 3 06:34:20 2012 -0400

    Fix linux bridge plugin to be consistent with naming rules
    
    Fixes bug 1020468
    
    Change-Id: I4a84e6c89c450032a791b9f91bc5e4dac6c9f647

commit b0f43d77b8348dce84b5b578d7efeec84ba3a51d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jun 28 06:26:10 2012 -0400

    v2 support for the linux bridge plugin
    
    blueprint lb-api-v2-support
    
    Plugin support for the linuxbridge using the v2 API
    
    1. The core_plugin in quantum.conf must be set to:
    quantum.plugins.linuxbridge.LinuxBridgePluginV2.LinuxBridgePluginV2
    2. By default the agent is v2. A configuration file entry 'target_v2_api'
    in the section 'AGENT' can be set as False to support v1.
    
    Change-Id: I2e196859c13b28e535c6ec394ec3f5bc907bf019

commit 85b0a148c9f0537665bbca7647a058c07ed718e6
Merge: 3e09f32 072dce2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 2 21:49:32 2012 +0000

    Merge "Ensure that subnet_id is on correct network."

commit 3e09f325eed0965f46c12239b96468270863b27a
Merge: 804c936 4742e34
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jul 2 21:49:00 2012 +0000

    Merge "Check if interface exists in bridge prior to adding."

commit 804c936667151cdea9b499dd768adcfd7ae20c1f
Author: Aaron Rosen <arosen@nicira.com>
Date:   Thu Jun 28 18:17:16 2012 -0700

    OVS plugin support for v2 Quantum API
    
    blueprint: ovs-api-v2-support
    
    This commit allows the ovs_quantum_plugin to work with the v2 api.
    
    change-Id: I9e332a799f6bee8a90755f961fbb9711a1ecdaca

commit 4742e34a8979d4a9ddb8ea58c0f2c5448723a6fb
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jul 1 03:06:07 2012 -0400

    Check if interface exists in bridge prior to adding.
    
    This fixes bug 1019730. The fix for bug 1000406 ensures that return
    values of shell commands are checked. The command
        utils.execute(['brctl', 'addif', bridge_name, interface],
                       root_helper=self.root_helper)
    would cause an exception if there was more than one attachment
    on the network. The reason for this was the interface already existed
    on the bridge.
    
    Change-Id: I8a1f6cc7be930c04ce302d7f87814b9bd5bed129

commit 072dce2ad09a6b28813f9b8f13d3e8a7bcc0d987
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jul 1 06:46:29 2012 -0400

    Ensure that subnet_id is on correct network.
    
    Fixes bug 1019759.
    
    Change-Id: I7a732ebf404c6fddaf6f06798411adbadd8ebb3f

commit 6d9ddf1c3737762fa12ce3b910075ed05da48cd9
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jun 28 07:45:35 2012 -0700

    Use setuptools git plugin for file inclusion.
    
    Fixes bug 1018833. We're looking at this as a possible pan-project
    option instead of manual MANIFEST.in inclusion and then looking for
    where the tarballs differ.
    
    Change-Id: I25287d5aca2046c6b613b05d54281533bdd6f79f

commit 4ac32079279347c454f5d9fe22a21dfcbf3ab64f
Author: chnm-kulkarni <chnm.kulkarni@gmail.com>
Date:   Sat Jun 30 09:40:53 2012 +0530

    Cisco's unplug_iface refers to non existing exception
    
    Bug #1006226
    
    An extra exception,InvalidDetach has been added to cisco_exception.py and
    unplug_iface has been redirected to this exception
    
    Change-Id: I5d1e4070fd0cb60a973e55e5645509aef58e8083

commit 681d096ef26247f6f8db8faca1abe9ae6a186562
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jun 21 04:53:48 2012 -0400

    Implement IP address allocation.
    
    This fixes bug 1008029.
    
    The allocation is done as follows (according to the value of
    port['fixed_ips']):
    - api_router.ATTR_NOT_SPECIFIED - Quantum will generate an IP address.
    If a v4 subnet is defined then a v4 address will be generated. If
    a v6 subnet is defined then a v6 address will be generated. If both are
    defined then both v4 and v6 addresses will be generated.
    - user configuration which may contain a list of the following:
       - ip_address - the specific IP address will be generated
       - subnet_id - an IP address from the subnet will be generated
    
    Change-Id: I3bb1b83b8824364b37dbecfa140331c4a1fd2762

commit f54a788cae726b8e1480e27c0a416c66a7afb373
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jun 26 02:15:46 2012 -0400

    Enable user to configure base mac address.
    
    In addition to this enable the user to configure the amount of
    retries to generate a unique MAC address
    
    Change-Id: Ic109ae65993141c6dc7d63f394066a31e79e2b4c

commit 6edab9de8183e92d15e09d5d923fe9995695eef2
Merge: 958b801 8a5c0bb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 26 19:51:14 2012 +0000

    Merge "Bug #1012418 - quantum agent for OVS does not install properly on Xen XCP"

commit 958b801a007de54ca398dfa5eff1c24f669dd160
Merge: 163d15b 842584f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 26 19:49:06 2012 +0000

    Merge "Remove paste configuration details to a seperate file. blueprint use-common-cfg"

commit 8a5c0bbda5d2e0074b4c78a18e685f11eeefac06
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Mon Jun 18 19:30:36 2012 -0300

    Bug #1012418 - quantum agent for OVS does not install properly on Xen XCP
    
    This change added the feature to package and install the ovs-quantum-agent inside XS and XCP,
    added an option on Makefile to gen and install using python2.6 ( by default it will use 2.4 )
    
    Change-Id: I8860d7dcb7e7b74125784cb0f33c6ca03b37702b

commit 163d15b383ccb72ca174f71aeacf448229791849
Author: Armando Migliaccio <amigliaccio@internap.com>
Date:   Thu Jun 21 21:21:17 2012 +0100

    Add simple file loggin to ovs_quantum_agent.
    
    Default behaviour is retained. Fix bug #1016232
    
    Change-Id: If11244d48a5c966bbbf8786e3e9f42d205a70164

commit 7841b681f123e3b636d7ee6b5301de6358871c04
Author: Edgar Magana <emagana@gmail.com>
Date:   Mon Jun 25 21:49:16 2012 -0700

    Fixing pep8 warning messages
    Bug #1017805
    
    Change-Id: I3417215a7a068141b69608e0dc5abaf220ac105d

commit f431a143d4d7b52d2858bfa0a0543a19a29765b6
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jun 25 05:06:36 2012 -0400

    Network deletion and subnet creation bug fixes
    bug 1017395
    
    1. When a subnet is created the network id is validated
    2. when a network is deleted - if a subnet or port is defined then
    the opertaion fails
    
    Change-Id: I746d0f4994c539a908df0220465d753bc3eb8e04

commit 842584f3ef2a6ca17b6753d8b70a5415ebec312d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Thu Jun 21 09:06:44 2012 -0400

    Remove paste configuration details to a seperate file.
    blueprint use-common-cfg
    
    In addition this ensures that the cisco extension units are working
    with the common cfg code.
    
    Change-Id: I8c1f81e295e7ed593f0b58885efeeb15339b7733

commit 43d2ed6342e894ca1809d2a19206b2009ab783a2
Merge: 523b90b a79b1c3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 14:22:58 2012 +0000

    Merge "Reorder imports by full module path"

commit 523b90be60d667d2757a32412759fbd88a81e7e9
Merge: e5e6671 79d0bd7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 13:32:40 2012 +0000

    Merge "Bug 1015953 - linuxbridge_quantum_agent device_exists() is buggy"

commit e5e6671dc4646b241c37a7284098f4a6929e9470
Merge: f7ccaac 0061c0c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 21 13:27:52 2012 +0000

    Merge "Added iptables_manager ( based on openstack/linux_net.py ) This module will be the base library to implement security groups and generic firewall. It is an independent iptables module, made to be easy to package if used by agents and also inside quantum"

commit 79d0bd7124be60075e59b4662c7b7315b78c4f4e
Author: ncode <juliano.martinez@locaweb.com.br>
Date:   Thu Jun 21 07:27:52 2012 -0300

    Bug 1015953 - linuxbridge_quantum_agent device_exists() is buggy
    
    Just added the check_exit_code=False to utils.execute call
    
    Change-Id: I3105131e853d45609bc441482bf5b3c3e035a129

commit a79b1c34258616eb25bd77e4ec5b253c32d90fa3
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Tue Jun 19 01:52:17 2012 +0800

    Reorder imports by full module path
    
    Fixes bug #1014765
    
    Change-Id: I849d73fc756b830b78492a6ed0e8cf2d32fde8cd

commit 0061c0ce4443395a258a99c70e1c1a7d0435e84e
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Mon Jun 18 11:00:45 2012 -0300

    Added iptables_manager ( based on openstack/linux_net.py )
    This module will be the base library to implement security
    groups and generic firewall.
    It is an independent iptables module, made to be easy to package
    if used by agents and also inside quantum
    
    Using quantum.agent.linux.utils
    Added support to root_helper
    
    Change-Id: Iaa29322477fc2e753b52dc4f01e7c4a561110638

commit f7ccaac6f09cf890d51f8974ecf6714afea8c41b
Author: root <root@opnstck-compute2.(none)>
Date:   Mon Jun 18 06:09:00 2012 -0400

    Unit test and Readme changes related to cisco plugin.
    
    Change-Id: Ica6db500a2ec8a895cb90756ca9ff304faa16519
    
    Unit test and Readme changes related to cisco plugin.
    
    Remove additional space in the Readme file
    
    Remove file inadverntently checked in
    
    Bug #1015410
    
    Change-Id: I273255ff475b1ca6e80409fbf7f8c8571b3c456c

commit 0c0d8f00a9d9b9bc69af70bd004c910df0df9951
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jun 3 07:55:09 2012 -0400

    Implements the blueprint use-common-cfg for the quantum service.
    More specifically uses global CONF for the quantum.conf file.
    
    Added support for the RYU plugin (similar to ovs and lb,
    which use non-global conf for plugins)
    
    patch 27: clean up find_config_file
    patch 28: for config file use old paths (plugin unit tests)
              this hopefully will be replaced when we move to common
              config file
    patch 30: rebase and merge (utils.py and policy.py)
    
    Change-Id: Ic0bf5bdd44f24a557240f7afe4e070dee448c63c

commit b6cb4316da8559398653e24de550b321f12e3e86
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Jun 19 16:32:22 2012 -0700

    Ensure unique mac address allocation.
    This is the first part of bug 1008029
    
    If the port command does not contain a MAC address then Quantum will generate
    a random MAC address. The mac address will be saved in the database to ensure
    that it is not used by another port on the same network.
    
    Added mock-based test for mac exhaustion.
    
    Change-Id: I4d3fe12fd1e3c347b8e286d920a0609d0b3c4e8c

commit cabd706b485fffb05de723a41b3f8bf081050b55
Merge: 523e0d0 dd0fe18
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 19 05:44:04 2012 +0000

    Merge "removed "runthis" and other unused functions from utils.py"

commit 523e0d0b726f682bc6288fc6e6d419e4468bb445
Merge: b3a970a 0311490
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 23:09:33 2012 +0000

    Merge "Remove unused functions in common/utils.py"

commit b3a970a5e4d0cf48752e5ad68341163368085c4f
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Thu Jun 14 09:39:57 2012 -0500

    Add authZ through incorporation of policy checks.
    
    Adds the policy openstack-common module and implements policy checks
    for the v2 API.  Note that this cut only addresses whole objects (i.e.,
    a subnet or a network or a port), not specific fields within objects.
    (This means that attributes are not filtered out based on policies.)
    Implements blueprint authorization-support-for-quantum.
    
    Change-Id: I1b52b1791a1f14f0af6508a63a40a38e440f15fe

commit 2d2f656689c1c4cf915ad25facbd0eadf46f626c
Merge: 850a83f 3e763b4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 16:33:44 2012 +0000

    Merge "Fix python2.4 incompatibility"

commit 850a83f304351c33e836c9fce2316489a7809351
Merge: ac05dfe 0d3cfea
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 16:24:09 2012 +0000

    Merge "Use openstack.common.exception"

commit ac05dfef14647703eacaa8356744c3c1324b8b89
Merge: 4ddb71e faea848
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 18 13:34:54 2012 +0000

    Merge "Added vlan range management for OVS plugin"

commit 4ddb71e152102118d6c32659e81bb43c31a8f3f6
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon Jun 18 09:16:10 2012 -0400

    Fix additional pep8 issues on Jenkins
    bug 1014644
    
    Change-Id: If858d04443319d4ddd20a65bc5bf0221564860f8

commit dd0fe18690dfadec6dcc1c9161498db60b053083
Author: Harsh Prasad <prasad.tanay@gmail.com>
Date:   Mon Jun 18 14:18:24 2012 +0530

    removed "runthis" and other unused functions from utils.py
    
    Fixes Bug #1012234
    
    Removed all unused functions and imports from common/utils.py.
    
    Patch set 2: Submitted same code by mistake
    Patch set 3: removed commented code but inappropriate commit msg.
    Patch set 4: removed commented code with appropriate commit msg. Removed pep8 changes for ucs plugin.
    
    Change-Id: I0ec33be127ef0389685a378c6f8d39ce5cbdb58c

commit 1c3a2a0d9735c549f7ae82e0f5e568a930f9a33d
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun Jun 17 08:29:40 2012 -0400

    Linux bridge agents did not work with common linus utils
    bug 1014286
    
    Change-Id: I66327f5414d7f08dd13208707f12291ce202e47f

commit faea848d5f92bf64d7d1153ffef011cf9418b8ce
Author: Roman Sokolkov <rsokolkov@mirantis.com>
Date:   Fri Jun 15 17:13:33 2012 +0400

    Added vlan range management for OVS plugin
    
    * Added integer config flags: vlan_min, vlan_max
    * If vlan_min is larger than vlan_max log warn and use default values
    * Changed test_vlan_map.py in favor removed definitions of VlanMap class
    
    Change-Id: Iaba819e62d70a9c9935cae195718dbf74d13884a

commit 412c7aa0308974a5ba338383ef0da2f91f92f113
Merge: 2fcb3ec 00a4f63
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Jun 17 05:05:29 2012 +0000

    Merge "Remove wrong base class for l2network_models after v2.0 API"

commit 2fcb3ecacfcbaec7c190b50290cc9434c206d4e0
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Sat Jun 16 02:24:25 2012 -0300

    Bug #1013967 - Quantum is breaking on tests with pep 1.3
    
    Fixing files
    
    93/93 files fixed
    
    Change-Id: Ia30f2e2253806fa5f447d44208d13d2c0beba9cd

commit 00a4f63f373af0b87c9c4ba8671720bb8324c80a
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Thu Jun 14 19:42:24 2012 +0800

    Remove wrong base class for l2network_models after v2.0 API
    
    Bug 1012557
    
    Change-Id: I2a43d5c9334525152e5307278020bad16bf64eb3

commit 7b9a0b714736711acdb128b00e8e2f8aea7c41e4
Author: Harsh Prasad <prasad.tanay@gmail.com>
Date:   Thu Jun 14 16:47:56 2012 +0530

    Cisco cli cannot find argument action_prefix
    
    Bug #1012502
    
    Removed use of argument action_prefix for Client. Also, made HOST, PORT and USE_SSL global.
    Signed-off-by: Harsh Prasad <prasad.tanay@gmail.com>
    
    Change-Id: I93037b34fca89786778a2dcd8a3afc80df5687f8

commit 0d3cfea2e193a17afbf65c765dabbbb5cf18fa9c
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jun 14 16:09:34 2012 +0800

    Use openstack.common.exception
    
    Fixes bug #1013040
    
    1. Edit openstack-common.conf and import openstack.common.exception
    2. Remove redundant code
    
    Change-Id: Ia440422e283f8e6796d9a1f720d73b3bcf2f981e

commit 0311490b82479ef1e0d25350a17fe7a254e7a1c2
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jun 14 15:19:14 2012 +0800

    Remove unused functions in common/utils.py
    
    Fixes bug #1013017
    
    Delete functions int_from_bool_as_string and bool_from_string.
    
    Change-Id: I5e838c1659234b885429ac090db4aa49e2f90645

commit 44f66c79d225b651335b2c4c416d1d7ce5751527
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jun 13 10:41:32 2012 -0700

    API v2: mprove validation of post/put, rename few attributes
    
    bug #1012438
    
    Additional work for bp v2-api-melange-integration
    
    - rename few attributes:
      op_state -> status
      additional_routes -> additional_host_routes
      prefix -> cidr
    
    - expand request body validation to indicate whether fields can be
    specified during create and or update.
    - add test cases to validate defaults, and input validation.
    
    - update db_base_plugin_v2 to generate gateway_ip for subnet and mac
    for port when unspecified.
    
    - validate that tenant-id is only specified in req by admin users
    
    - automatically set tenant-id based on request.context.tenant_id if needed
    
    - enable port tests in test_db_plugin.py
    
    Change-Id: If7f5101e4974a6ef93ff8a1d945f8642dd21b16e

commit 0230e96196baf4cfd4cb7f556539fe6758367176
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Thu Jun 7 17:56:07 2012 -0300

    Bug #1000406 - Return value of shell commands is not checked by plugins
    
    Added an utils library for agents and also changed agents to use
    this library.
    
    Changed to keep 2.4 compatibility
    
    Change-Id: Ib4fc0a8dcbfc4b79a0b0e61e1fc1f24ec5da4d46

commit a3e84013e74b86054e3ff86120fe9f811d1f79cb
Merge: c0d0e89 171f51a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 13 07:01:00 2012 +0000

    Merge "Add build_sphinx options."

commit 3e763b4ca4212d99586726202925280cf1f739a5
Author: Piotr Siwczak <psiwczak@internap.com>
Date:   Tue Jun 12 13:57:08 2012 -0700

    Fix python2.4 incompatibility
    
    python2.4 compatibility is needed for the agent
    to work on Xen
    
    Change-Id: Ifa81a5ddb4f2a9dcb6ce94fa0d941ba6e6c2e038

commit c0d0e891c000a7f2b8940b0bbf2c01957a33fa14
Merge: 6881632 20ee7ee
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 12 04:15:52 2012 +0000

    Merge "Fix up test running to match jenkins expectation."

commit 68816323003814411680be45576dfa9f9b118235
Merge: 97b8fb8 e791e9e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 12 03:58:41 2012 +0000

    Merge "Add API v2 support"

commit 97b8fb8ed543ca0c6bd1af51ac5d7f79a95814b1
Merge: 56d6f9c dee8bd1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 11 16:18:29 2012 +0000

    Merge "Remove unused imports"

commit e791e9e3703d0426a80cb0d4423a9501c2445335
Author: Jason Kölker <jason@koelker.net>
Date:   Wed May 9 12:04:11 2012 -0500

    Add API v2 support
    
    * Implements BP v2-api-melange-integration
    * Adds v2 Plugin specification
    * Refactors SQLAlchemy usage for multiple BASE's
    
    Change-Id: I45f008f181c18269afdfe4a9b589a7c5ae56d225

commit 56d6f9ce860904c178ff63ab335185030b9175a5
Author: Harsh Prasad <prasad.tanay@gmail.com>
Date:   Mon Jun 11 12:25:18 2012 +0530

    Binaries should report versions.
    
    Bug #1004966.
    
    Added the version_string() and removed the extra '%' for the quantum-server binary.
    
    Change-Id: Ic1f3e2eb9a742bdfb63df6f901e579349f04f3ec

commit 20ee7ee0e7f250a9167aec194383156ea48cf463
Author: Monty Taylor <mordred@inaugust.com>
Date:   Fri Jun 8 19:46:37 2012 -0400

    Fix up test running to match jenkins expectation.
    
    Change-Id: I215cd92d707f81ed481897704b31188017a5a8b8

commit 171f51a772a00e2677ebfb74c1e4625bedf9eea3
Author: Clark Boylan <clark.boylan@gmail.com>
Date:   Fri Jun 8 14:26:58 2012 -0700

    Add build_sphinx options.
    
    To better facilitate the building and publishing of sphinx
    documentation by Jenkins we are moving all openstack projects with
    sphinx documentation to a common doc tree structure. Documentation
    goes in project/doc and build results go in project/doc/build.
    
    Change-Id: I672fbd296e2b8f1da1eede74d6f0c7a26345cf74

commit dee8bd1a107da26b528cb4350f009cd8d31028aa
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Fri Jun 8 09:52:20 2012 +0800

    Remove unused imports
    
    Fixes bug #1010276
    
    Removed unused imports found by:
    find . -type f -name "*py" -exec pylint -r n {} \; | grep -E "Unused imp|^\*"
    
    Change-Id: Ie2ca545ecfaadd033652554c9e59d6a83d44ed09

commit 268040c3365aacef4e53bb7795ae598dd98bb77f
Merge: dedefae 9895ac6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 16:27:11 2012 +0000

    Merge "Bug #1002605"

commit dedefaeea3d9547e58af8f263327b8bfd28296f1
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Thu Jun 7 10:20:25 2012 +0800

    Quantum should use openstack.common.jsonutils
    
    Implements blueprint use-common-jsonutils
    
    1. Edit openstack-common.conf and import quantum/openstack/common/jsonutils.py
    2. Remove json package imports and replace with jsonutils
    3. Remove json related functions in common/utils.py
    
    Change-Id: Id5abc49175899fa4d83e613f852aaaac539ecfcb

commit 06e1e75ecc27ccb00293585f23e0860eeaafd7b2
Merge: 03f7735 88deb9f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jun 7 02:49:10 2012 +0000

    Merge "Remove hardcoded version for pep8 from tools/test-requires"

commit 03f77351976666fd15aaa1f3e1db284ffdae8970
Merge: b0061e5 b336692
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 22:16:01 2012 +0000

    Merge "Add common dir for shared agent code, add OVS lib."

commit b0061e50931c6a90579c8a1756c1a7e731ae3d87
Merge: 2909362 1f405a2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:08:41 2012 +0000

    Merge "fix bug lp:1007557,remove unused functions in utils.py."

commit 290936236875066e4d638d93279ceecbbdc37972
Merge: cb2d348 6cdd953
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 20:08:11 2012 +0000

    Merge "Register enable_tunneling as bool opt."

commit 88deb9f4eb1bfa8d0e1543d53c598e09f4e5cfd8
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jun 6 12:41:13 2012 -0700

    Remove hardcoded version for pep8 from tools/test-requires
    
    In email discussions we decided that the master branch should always
    pull in the lastest version of the pep8 tool, which keeps us closest
    to the real pep-8 document.  Therefore, I'm removing the hardcoded
    version here to match the lack of a pep8 version in tox.ini (which is
    what the CI infrastructure uses when running the gating pep8 checks).
    
    Note that your pep8 version will only update when you re-run
    pip install --upgrade -r tools/test-requires .
    
    Change-Id: I242cb042cff5f5969aa50d40312f87979191c7b7

commit cb2d3487d7accb2ff1598ecd88486ab17fda06ba
Merge: 978a84d 8894997
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jun 6 19:09:17 2012 +0000

    Merge "Bug #1007153"

commit 978a84df34420cc50b6adaf5f0b2db93151c516d
Author: Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Date:   Wed May 30 18:10:46 2012 -0500

    AuthN support for Quantum
    
    Adds authentication support for Quantum.  Generates a context object
    and stuffs it into the 'quantum.context' variable in the WSGI environment.
    This will be used in conjunction with authZ, later.
    
    Partially implements blueprint authorization-support-for-quantum.
    
    Change-Id: I8af171c2f11a08db5ee41e609d60ad203548650d

commit 1f405a2b121eaedb91b9a9c89cc820cd3aa1a615
Author: Yaguang Tang <heut2008@gmail.com>
Date:   Tue Jun 5 13:48:01 2012 +0800

    fix bug lp:1007557,remove unused functions in utils.py.
    
    Change-Id: Ic8cfe61effd357c49f651fd6cd6e6b721f6addd1

commit b3366921472f1cb61bc96598d511594e1d478989
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jun 4 22:07:27 2012 -0700

    Add common dir for shared agent code, add OVS lib.
    
    bp quantum-agent-common
    
    Adds a common directory that can be used for code shared by agents for
    different plugins.  Also seeds this directory with an OVS library,
    removing that code from the openvswitch plugin itself.  This code
    can then be leveraged by other plugins (e.g., Ryu) who have similar code.
    
    Also add a suite of mox-based tests for OVS lib.
    
    Also add more powerful OVS flow expression builder as suggested by
    salv-orlando, plus additional flow expression testing.
    
    Note: the expectation is that this directory will be used for much of the
    agent functionality that is similar to what Nova's nova/network/linux_net.py
    file included, such as iptables manipulation, dhcp manipulation, etc.
    
    People should be careful about changing code in this directory in a
    non-backward compatible way, as other plugins may be using the code as well.
    
    Change-Id: I8fd15ec6b8016e85a3f02e0d756a3fd61b1cab15

commit 1cc89804a3ca97e6cae72e070112011bb3cecb60
Merge: 0324ea3 366ac60
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jun 5 02:03:52 2012 +0000

    Merge "Quantum should use openstack.common.importutils"

commit 8894997fd059661813b995c6a3f408250af57baa
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Thu May 31 18:51:30 2012 -0300

    Bug #1007153
    
    XS should not have the centos repo enabled by quantum this can break the system, also is possible to get the sqlalchemy from epel and avoid unneeded packages on the system.
    
    Using epel rpm and leave it disabled after use
    
    Change-Id: If6673e59afc545e51df3625d8259ec3fca9aaefb

commit 0324ea3e63140428918b3192fd83f7bbacf8d9f5
Merge: 7b38df1 5c0fc49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jun 4 14:04:56 2012 +0000

    Merge "Fix linux bridge section name Bug #1006684"

commit 6cdd9538f4633abf61e4c8d44d9c7a3098e15b2f
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Mon Jun 4 15:18:29 2012 +0800

    Register enable_tunneling as bool opt.
    
    Bug #1008346
    
    Register enable_tunneling as bool opt, and add test cases.
    
    Change-Id: Ibacf18752430d5e0ed1ab9c17f5370e4fd63ede2

commit 366ac6036efe5ba23e4cea0558dbe6439244793c
Author: Zhongyue Luo <zhongyue.nah@intel.com>
Date:   Mon Jun 4 11:32:17 2012 +0800

    Quantum should use openstack.common.importutils
    
    Implements blueprint use-common-importutils
    
    Change-Id: Ib71a557ea6090d5c8d789b1e4c7b17855f7ee814

commit 7b38df15a1cc324414c52ee26015c163df0f4e3c
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 1 10:50:36 2012 -0500

    PEP8 fixes
    
    Change-Id: Iab4c2ada2bfcb99452f940666b25cb1f7d4d7e58

commit 9895ac62c0ca73e9bcfa57b8609d21fb93129943
Author: Juliano Martinez <juliano.martinez@locaweb.com.br>
Date:   Fri Jun 1 11:31:40 2012 -0300

    Bug #1002605
    
    update webob to be version 1.2 or above
    
    It's running without any issue with 1.2, the exception problem was caused
    by WebTest. We should use at least version 1.3.3 (supplied by Ubuntu 12.04 and Debian Wheezy)
    
    Version to WebTest==1.3.3
    
    Change-Id: Ia8ef543e32ae46f503dd52e93bed4290d077c286

commit 6d14917e76a3f2084142c316a374c6755edda556
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 31 16:00:13 2012 -0500

    Automatically determine Quantum version from source
    
    * Fixes LP1007132
    * Adds keystone link
    * removes __init__.py since doc/source is not a python module
    
    Change-Id: I6a3234fa760ca23889e352735669547ad9afedf8

commit 5c0fc495ffcb0f40294f39f3706648484cf00be0
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Wed May 30 13:59:52 2012 +0800

    Fix linux bridge section name
    Bug #1006684
    
    Change-Id: Ic7a97179d6fbb90f8c7f544a5725e1ff56fd9653

commit 93ee2838a2937e346e78c2e3ee21f5fed478d66f
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Wed May 30 13:59:52 2012 +0800

    Remove the reference to non existing exception by linuxbridgeplugin.
    
    Bug #1006221
    
    According to plugin api of QuantumPluginBase, unplug_interface
    should only raise exception.NetworkNotFound and exception.PortNotFound.
    To unplug a non-attached port should not raise Exception.
    After this modification, to unplug an non-attached port will have no impact.
    In addition, I remove the 'network = db.network_get(net_id)' since
     'db.validate_port_ownership(tenant_id, net_id, port_id)' statement has taken
    care of the check.
    
    patch 2: split test case to test it exclusively compared to patch 1.
    patch 3: remove added test statement in previous test case
    
    Change-Id: I437c3f13fa7a81aeabcdfca7ba03e94a0a7aa32b

commit 76b2d851af70adc52f53241e8bc864674ce9cfba
Author: Edgar Magana <emagana@gmail.com>
Date:   Wed May 30 01:27:47 2012 -0700

    bug #1006281
    
    Removing extra switchport line for NX-OS snippet.
    
    Change-Id: Ib3530af9aa885a719cb712554d05e7d70834186a

commit 91d3b02bc1bdaa4ab3caf462aa93a8b9db45e6eb
Merge: 7d23803 a86c31b
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 30 00:13:51 2012 +0000

    Merge "Parse linuxbridge plugins using openstack.common.cfg"

commit 7d2380316b89b095674f4f32cd2e142db2e2e4fa
Merge: da8b055 8713c49
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 29 23:02:28 2012 +0000

    Merge "Bug #1004584"

commit da8b0552a3f0a510328dbe483fc9fd4977df3675
Merge: d2a21ec 9a44037
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 29 20:18:32 2012 +0000

    Merge "fix errors in database test cases."

commit a86c31ba1544528cd8473896076e8b1b4ef14bce
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 29 08:19:45 2012 -0400

    Parse linuxbridge plugins using openstack.common.cfg
    
    Implements the blueprint use-common-cfg
    
    In order for the linuxbridge plugin to use the rpc code soon to be merged into
    openstack-common, we need to parse our configuration using cfg. Here we
    make the most simple, backwards compatible change in that direction.
    
    The same is relevant for the openvswitch implementation
    
    Fixes after comments.
    
    Change-Id: I70fc1898a802cb4198f72741453283d114added2

commit 8713c4972dff08405930d675d822a018a5898790
Author: Aaron Rosen <arosen@nicira.com>
Date:   Fri May 25 15:20:55 2012 -0700

    Bug #1004584
    
    When running ovs_quantum_agent in tunneling mode and a new tunnel_ip is added while
    an agent is running the following exception below occurs. This causes the agent to
    no longer function since it becomes caught in a loop.
    
    ERROR:__main__:Main-loop Exception:
    Traceback (most recent call last):
      File "ovs_quantum_agent.py", line 583, in daemon_loop
        self.manage_tunnels(tunnel_ips, old_tunnel_ips, db)
      File "ovs_quantum_agent.py", line 550, in manage_tunnels
        self.add_tun_br_flows_for_local_vlan(lv_obj)
    AttributeError: 'OVSQuantumTunnelAgent' object has no attribute 'add_tun_br_flows_for_local_vlan'
    
    Change-Id: Id03dc4a12a0114c8597cb90f4eabcdd3dc9b3f5c

commit d2a21ec921e4158a4fa7573c3d7541d92157dd52
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Fri May 25 20:10:07 2012 +0800

    fix some pylint warnings.
    
    1. Parent class should have instance variables used in its method(s).
    2. remove some unused imports
    Patch 2: fix according to comments
    Patch 4: fix problem under pep8 1.1
    Change-Id: Iafd89a6017b30484fb8da50219be6b4ae073f083

commit 9a4403782d7cc3ea1b8156e50c85459a0b59037e
Author: Yong Sheng Gong <gongysh@cn.ibm.com>
Date:   Fri May 25 09:51:04 2012 +0800

    fix errors in database test cases.
    
    fix errors in database test cases, add one test case to tets port update.
    
    Change-Id: I52108a55924d3ab750a8c453a80ed6abdd62bb23

commit 686982198c146e7c982da175532eeabbd6379a60
Author: Jason Kölker <jason@koelker.net>
Date:   Thu May 24 12:17:21 2012 -0500

    Log the exception so app loading issues can be debuged
    
    * Fixes LP1004062
    
    Change-Id: Iae04f2789fe310a52550354463fe109c13e8ceeb

commit acab9fba55923380c93de703b0031b62dfda822e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue May 22 13:50:20 2012 -0700

    remove unneeded import from OVS agent that break 2.4 compat
    
    bug 1000809
    
    Change-Id: I95b1143702bc8f06067969c6b7040eea861bb56b

commit c8091791412293f25e22a658ed3f4361429e4df2
Author: Gary Kotton <gkotton@redhat.com>
Date:   Mon May 7 04:45:44 2012 -0400

    blueprint man-support and fix documentation build
    bug 995283
    
    Changes after initial comments
    
    Removed spaces
    
    Updates after comments
    
    Remove white spaces
    
    Fix text and remove empty files
    
    Remove config.py
    
    Updated to be similar to the keystone page
    
    Updated afetr comments
    
    Change-Id: If9240114ae31d7120c708cdcf883e8fe4c7d2bb2

commit 783c5c10d5653d82e19dc1fa7529b7bc26d1ce34
Merge: 54c8877 1187aa4
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon May 21 14:15:37 2012 +0000

    Merge "Fix print error for linux bridge bindings bug 1001941"

commit 1187aa490004ee12ad76f99c04595ea75e7aef15
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 15 03:33:04 2012 -0400

    Fix print error for linux bridge bindings
    bug 1001941
    
    Change-Id: I04d5fad62102d3d7f55ea511a5c14d730d003eb4

commit 54c88772afa6c2a82f46730f9b3c389b27bf9823
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 15 03:33:04 2012 -0400

    Add HACKING.rst to tarball generation
    bug 1001220
    
    Change-Id: I808f8d50dc77fc633728e29708802e8292240e84

commit cd9903fd1083a419109d109ee48feb7f9ba46708
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 15 03:33:04 2012 -0400

    fall back to `ip link` when `ip tuntap` unavailable
    bug 989868
    
    In the event that the command "ip tuntap" is not found then a exception will
    be raised and the command "ip link" will be perfomed.
    
    Changes following comments
    
    More appropriate error message
    
    Same style for log/error messages
    
    Change-Id: Ia912e189b73dd0d112b7ef4eefbb7245ee595b54

commit 77df8ddc47d575efad34b1b2d932bec7c0f3a270
Author: mat <mathieu.rohon@gmail.com>
Date:   Wed May 16 16:16:43 2012 +0200

    Cisco plugin CLI call to quantumclient CLI
    
    when Cisco plugin CLI is used, it wil call the quantumclient CLI if the command is not in its extensions.
    the version of the Quantum API must be specified when the the Cisco plugin CLI is looking for Quantum commands.
    
    Bug 1000251
    
    Change-Id: I3e4039edb7cb79411fc60677ef6f99fca8007dc9

commit ae73d027140f87a881f4b324e6c243afc81cfbb0
Author: mat <mathieu.rohon@gmail.com>
Date:   Tue May 15 17:35:12 2012 +0200

    Calling Super method from QuantumPortAwareScheduler.__init__
    
    the quantum.plugins.cisco.nova.quantum_port_aware_scheduler.QuantumPortAwareScheduler class wasn't calling its superclass __init__.
    the host_manager attribute of driver.Scheduler class wasn't initialized, and the scheduler was crashing when it was receiving a host message via amqp.
    
    Fixes bug 994652
    
    Change-Id: I733d80df8f87ff314f4233b10fa8afaf454eedf0

commit c73ab6d10fe40a7a63c9874de27a53cc7a7344bd
Merge: 1121807 50c0266
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 15 20:34:35 2012 +0000

    Merge "Include AUTHORS in release package."

commit 1121807b8528590b20e1109dbdff400fccec3c38
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue May 15 12:41:52 2012 -0700

    OVS plugin: add tunnel ips to central database
    
    bp simplify-ovs-tunnel-mgmt
    
    Makes the OVS plugin agent report its own IP address to the centralized
    quantum database, and build its set of tunnels based on the contents of
    this centralized database.  This removes the need for a removes need for
    a 'remote-ips' file on each compute node that needs to be updated
    when a new host is added.
    
    Also:
    - simplifies error handling within tunnel manager daemon_loop
    - fixes issues with operational status not working for tunnel-mode
    - fixes issue that not-stripping vlan of tunneled packet potentially
    crashes OVS, causing flows to get wiped.
    
    Change-Id: I4d285669e29beecf745fe620581fa6bc332a446c

commit 50c02660b2ce5fd48798e68ec41fc9962c741537
Author: Bhuvan Arumugam <bhuvan@apache.org>
Date:   Sun May 6 20:27:26 2012 -0700

    Include AUTHORS in release package.
    
    Fixes Bug #976267.
    
    Include AUTHORS file in release package. The file is generated
    automatically from git. Handle different combination for mailmap
    records. Include test case to verify this fix.
    
    * MANIFEST.in
      Include AUTHORS file in release package.
    
    * .gitignore
      Add AUTHORS file.
    
    * quantum/openstack/common/setup.py
      generate_authors(): New method to create AUTHORS file. If
      AUTHORS.in file exists, append it's content to AUTHORS file.
      parse_mailmap(): Handle all mailmap combination while parsing.
    
    * setup.py
      Import the new method.
      Generate AUTHORS file before creating the package.
    
    * quantum/tests/unit/test_setup.py
      New test script to verify different combination of records
      in mailmap file.
    
    Change-Id: I220e8a20c96d37df3fa2ba0424e8372496e67895

commit af82348445670e4d8f4490fd60788c3c243d52be
Merge: 5c6cb6e d567937
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat May 12 18:55:57 2012 +0000

    Merge "blueprint database-common bug 995438"

commit d5679376caee206344497ab6228d7ab2c229e9e5
Author: Gary Kotton <gkotton@redhat.com>
Date:   Sun May 6 07:36:47 2012 -0400

    blueprint database-common
    bug 995438
    
    Updates after comments
    
    Updates after comments
    
    Updates after comments
    
    Updates after comments - fix linux bridge tests
    
    Change-Id: Iaee24b08e07a4f4dde5e27f31d3a5f81f5101466

commit 5c6cb6ec01c55f0e9251248af1c2052050415161
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue May 8 07:46:28 2012 -0400

    bug 996163
    
    Remove unnecesary imports
    
    Return missing logging and sys imports
    
    Change-Id: I50923c9d42b94cabc8fbf3de7391bd03d2d14f12

commit 4c0405b4ce05c3379215dd99f35cb1e2c58fccbf
Merge: c4a59c1 d1c563c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu May 10 05:50:34 2012 +0000

    Merge "Change Resource.__call__() to not leak internal errors."

commit c4a59c1af8136ab44e04940b65061af280bfb246
Author: Piotr Siwczak <psiwczak@mirantis.com>
Date:   Fri May 4 11:34:57 2012 -0700

    Bug #994758
    
    Work around this bug by installing the sqlalchemy from pip installer.
    (fix)
    
    Change-Id: I464080e433b4cad71da4510fb95dd5f902da0616

commit d1c563c57df14b4d968bd576bc366d7db86b3e79
Author: Guilherme Salgado <gsalgado@gmail.com>
Date:   Wed May 2 08:36:56 2012 -0300

    Change Resource.__call__() to not leak internal errors.
    
    That method now catches any non-expected errors raised by the controller's
    action method and turn them into an HTTPServerError. Fixes bug 980033.
    
    Change-Id: I7f71c029fae0e27a799f11de0802bde1003683e2

commit 88fab71350100ba544a0002780239042977df246
Author: Hiroaki KAWAI <hiroaki.kawai@gmail.com>
Date:   Wed May 2 18:27:51 2012 +0900

    Let OVSQuantumTunnelAgent sync with database
    
    In daemon_loop, db.commit() is required to fetch
    updated network status. Without this, ports are
    stick to DEAD_VLAN_TAG.
    
    Change-Id: I1a951d60eb75384676309e8db29ea7baa48055bc

commit ce93dca89aa4d0da55e71376853aafc142669362
Author: Maru Newby <mnewby@internap.com>
Date:   Fri May 4 21:38:29 2012 -0700

    Cleaned up log usage.
    
     * Used __name__ where appropriate for log instantiation.
     * Removed unnecessary logging in tests.
    
    Change-Id: I270eb627cd1d330f37707aaf7886a9cacd251031

commit be45b704ac6fc39e9f934f886403a622c30803cb
Author: Gary Kotton <gkotton@redhat.com>
Date:   Tue Apr 24 02:02:03 2012 -0400

    blueprint agent-db-ha
    bug 985470
    bug 985646
    
    The fixes enable the OVS and linuxbridge agenets to "keep alive" when the host running the server/plugin is down.
    
    Fixes after comments. Better logging
    
    Fixes after comments - added reconnect interval + cleanup
    
    Fixes after comments - simplify code + ovs intervals moved to configuration file
    
    Fixes after comments - move int conversion to configuration
    
    Fixes after comments - if one of the polling interval or reconnect interval are not
    defined in the relevant ini files then a default value is used.
    
    Fixes after comments and merges with HACKING.rst fixes
    
    Fixes after port binding comments
    
    Fixes after comments from gongysh
    
    Fixes after comments - align comments in agent ini files
    
    Fixes - revert some code
    
    Change-Id: I9194f142478b130e8ef198b019539357a9916d7f

commit 0c66ab456b859a25f33c762fc55be5a31598a30a
Merge: 8fd1046 6c97b81
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed May 2 06:34:12 2012 +0000

    Merge "Update codebase for HACKING compliance."

commit 8fd1046f0ee17145e59b0e2ee244b317fc8c2d0b
Merge: f6c71b5 1ec96cf
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue May 1 20:15:06 2012 +0000

    Merge "Make sample quantum.conf compliant with docs"

commit 6c97b81bf35df9138d64402ded146df0894110fd
Author: Maru Newby <mnewby@internap.com>
Date:   Fri Apr 13 12:53:56 2012 -0700

    Update codebase for HACKING compliance.
    
     * This is a massive patch that aims to clean up the codebase
       and bring it into compliance with HACKING.rst and PEP8 in one
       fell swoop.
     * Cleaned up use of gettext.
     * Updated log usage for consistency.
     * The tests run successfully against all plugins except
       cisco and nicira (due to dependency issues with these plugins).
     * Addresses bug 981208
    
    Change-Id: I4d8c7ab138d8f7bb906d18dc34f88f8bd0581c19

commit f6c71b52e90a496b9bf2bfd7fb93339906ecc6d6
Merge: b11ec7c 676ba0f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Apr 29 22:49:38 2012 +0000

    Merge "Removed simplejson from pip-requires."

commit b11ec7cc02cfe57d96c7f2fdcf2d9c8c572aebb6
Merge: 438eda8 f6bc5d0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Apr 27 01:20:13 2012 +0000

    Merge "Remove dependency on python-quantumclient"

commit 1ec96cfc8441b71bfb24f20d7c4a6c9bf584e158
Author: Francisco Souza <f@souza.cc>
Date:   Thu Apr 12 09:32:50 2012 -0300

    Make sample quantum.conf compliant with docs
    
    The module quantum_auth_token does not exist. Also, the documentation uses
    authtoken instead of authN.
    
    The docs, for reference: http://docs.openstack.org/incubation/openstack-network/admin/content/configuring-keystone-with-quantum.html
    
    Change-Id: I5a225dd740bb654a0b27937ebfa68f0ef6bff4f8

commit 438eda895c7e24113f116e503f36930c176ebe4d
Author: KAWAI Hiroaki <kawai@iij.ad.jp>
Date:   Wed Apr 25 21:25:32 2012 +0900

    Make ovs Interface option set properly.
    
    Multiple ovs-vsctl set Interface option call overrides the previous
    settings and result in unexpected partial condition.
    
    Change-Id: I62b3bd6ea9adac7c1f4995fc18af9838a7e25b43

commit 676ba0fd70a10e66e95fec47091ff0b494b95fec
Author: Maru Newby <mnewby@internap.com>
Date:   Tue Apr 24 14:01:10 2012 -0700

    Removed simplejson from pip-requires.
    
     * Addresses bug 921295
    
    Change-Id: Ied6015b4115a60778dffc18c18e8907d87a7c83d

commit f6bc5d0e33616dc2ded9bacb3656694ebbab7d58
Author: Maru Newby <mnewby@internap.com>
Date:   Wed Apr 11 03:07:26 2012 -0700

    Remove dependency on python-quantumclient
    
     * quantum previously depended on python-quantumclient for the
       functionality in quantum/common.  This change migrates
       the required modules to the quantum repo and removes that
       dependency.
     * Addresses bug 977711
    
    Change-Id: Ia17a486859eb1aa993900a5f3b582b258c6a6d78

commit 425e1c782d7cdea661fc461993671e1adfbe5527
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Apr 10 18:58:34 2012 -0700

    Add sphinx to the test build deps.
    
    Needed for bug 945259
    
    Change-Id: Idf76b3d253259deff8cc894b03d26420f2de278e

commit 43039fd64d2804527c6fb31820065fcd796516d4
Merge: 102c917 5f4dfbb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Apr 10 18:53:29 2012 +0000

    Merge "Add HACKING.rst coding style doc"

commit 5f4dfbb6fa5460c70143a668586eda06dc358a59
Author: Maru Newby <mnewby@internap.com>
Date:   Mon Apr 9 20:12:49 2012 -0700

    Add HACKING.rst coding style doc
    
     * Addresses bug 977685
    
    Change-Id: Id04cad3021f015abe965f79b8930da55e092ada1

commit 102c917be984079e53e729cc50554c96ba24f248
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Mon Apr 9 10:08:00 2012 -0400

    return 404 for invalid api version request
    
    fixes bug: 934115
    
    This fix returns 404 for all non-root requests that route via the
    versions app. For root requests ('/') the available api version info is
    returned.
    
    Change-Id: I701389d9239cb40426f7a47206642b56c7eeeae1

commit 540f1eda0b5568795b501e44de44c9392ceb7f17
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Apr 2 20:14:37 2012 -0700

    fix issue with OVS plugin VLAN allocation after a quantum-server restart
    
    bug 962853
    
    Also use constants for VLAN_MIN/VLAN_MAX and clean-up VlanMap unit tests.
    
    Change-Id: Id7b580d604092b5fc16d4c87ae866d419aad4d1f

commit ac7fb076c17535c81dd27407d819af198f2f31a2
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Apr 2 10:38:06 2012 -0700

    bug 963152: add a few missing files to sdist tarball
    
    Change-Id: I36e98c98e09c8a91f1e2e2e15f833079ea6b377c

commit 8d86da72e8c5d33c3ff16ca5740d2ab6a88461b4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Mar 22 09:49:54 2012 -0700

    API docs: fix typo for network delete
    
    bug 962282
    
    Change-Id: Ic7f633b59d963e8a14a993468048ccbded9aba34

commit 18aa80234864a1bf7d4c343d203469705d08f8f2
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Mar 16 23:19:22 2012 +0100

    Open Folsom
    
    Change-Id: Ic594468be5b3c79a8e3d97b6a81668a0db98885b

commit cfbd8b8c5fe15b3588c8cf65582d4c5671d11f91
Merge: b94b97c d53fac1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Mar 16 08:12:28 2012 +0000

    Merge "plugin/ryu/agent: unbreak a06b316cb47369ef4a2c522f5240fa3f7f529135"

commit b94b97cbfab1482d8372fc56eacf0c7d654d5645
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Mar 15 16:43:19 2012 -0700

    Bug #956559
    VIF driver and scheduler for UCS plugin are broken since the flag
    configuration mechanism in nova is changed. Fixing that and also
    fixing some property names, along changes to how the quantum client
    code is invoked.
    
    Change-Id: I757cc149f08673ce24d35ee0bfffae8e5b1a4afc

commit d53fac12cd0540fac1bf42e70b6ae70b4fcc0620
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Fri Mar 16 11:47:48 2012 +0900

    plugin/ryu/agent: unbreak a06b316cb47369ef4a2c522f5240fa3f7f529135
    
    ryu quantum agent needs 'import shlex' like ovs and linuxbridge.
    Otherwise it aborts as
    
    > NameError: global name 'shlex' is not defined
    
    Change-Id: I0d0e4a95a4628953bf44bebf54c46f74aa9eddf4
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>

commit 10f0d6a5370d39f07f3b249f05c0c8f2a5d8067a
Author: Brad Hall <brad@nicira.com>
Date:   Thu Mar 15 16:45:09 2012 -0700

    Fix path to python-quantumclient
    
    Change-Id: I428cfd05f8eba34efd06fc6a085e1d7272ef525a

commit 72290e960df0502b265cd2db31cf418d66f5eb75
Merge: c6e1c61 2efcf79
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 23:39:32 2012 +0000

    Merge "ryu/nova: catch up d1888a3359345acffd8d0845c137eefd88072112"

commit c6e1c616ad2ad3949b7bec36233d7aac885922c4
Merge: f080fb4 8f6de69
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 17:13:30 2012 +0000

    Merge "Split out pip requires and aligned tox file."

commit f080fb46bbdda61d53b21f21fd6490db340e3af4
Merge: 311c1f7 a06b316
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 14:47:34 2012 +0000

    Merge "Add root_helper to quantum agents."

commit 311c1f73f6682882f7a9a2cd54721940981ff49d
Merge: f88a1f7 ad07e74
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Mar 15 13:51:32 2012 +0000

    Merge "bug 954538 Fix for the cisco unit tests"

commit 8f6de697f07be316ed9628b6b9f2bb4da85b4818
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Feb 29 09:39:03 2012 -0800

    Split out pip requires and aligned tox file.
    
    Align tox.ini file with standards.
    Align setup.py with openstack-common standards.
    
    Change-Id: I333bbd66648c865a5c97ec2661359ab849274446

commit 2efcf791e96af55e55a701980e0a826ae62a11fe
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Mar 8 16:20:09 2012 +0900

    ryu/nova: catch up d1888a3359345acffd8d0845c137eefd88072112
    
    FLAGS.add_option -> FLAGS.register_opt
    
    > commit d1888a3359345acffd8d0845c137eefd88072112
    > Author: Mark McLoughlin <markmc@redhat.com>
    > Date:   Fri Feb 3 00:50:58 2012 +0000
    >
    >     Remove the last of the gflags shim layer
    >
    >     Make FLAGS a ConfigOpts instance and fix up all the places where we
    >     expected FlagValues behaviour.
    >
    >     Change-Id: I8f96f42e0d8d30ba6b362d29861e717cf0fa9e89
    
    and removed work around for circular import as the nova change set of
    1265104b873d4cd791cecc62134ef874b4656003 fixes the circular import issue.
    
    Change-Id: I4897dc848efa7fff6c73399a72d876fb503121e7

commit a06b316cb47369ef4a2c522f5240fa3f7f529135
Author: Bob Kukura <rkukura@redhat.com>
Date:   Tue Mar 13 17:23:06 2012 -0400

    Add root_helper to quantum agents.
    
    When running commands that require root privileges, the linuxbridge,
    openvswitch, and ryu agent now prepend the commands with the value of
    the root_helper config variable. This is set to "sudo" in the plugins'
    .ini files, allowing the agent to run as a non-root user with
    appropriate sudo privilidges.
    
    If root_helper is changed to "sudo quantum-rootwrap",
    then the command being run will be filtered against lists of each
    agent's valid commands in quantum/rootwrap. See
    http://wiki.openstack.org/Packager/Rootwrap for details.
    
    Fixes bug 948467.
    
    Change-Id: I549515068a4ce8ae480905ec5eaab6257445d0c3
    Signed-off-by: Bob Kukura <rkukura@redhat.com>

commit f88a1f7582cc00fbe386505ee8768ac98548a682
Author: Brad Hall <brad@nicira.com>
Date:   Wed Mar 14 10:14:27 2012 -0700

    Fix missing files in sdist package [bug 954906]
    
    Change-Id: I4736d112b004c4356731de8a37d97fc6536793db

commit e2b1b4a67c517e23d09ab0f198cc4fdfad3d82bd
Merge: 7cfe4e9 189b89a
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 16:51:39 2012 +0000

    Merge "check connection in Listener. refer to Bug #943031"

commit 7cfe4e98defa936c06cb18374e4bab52b232cb20
Merge: b9c7647 fa0e7e6
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Mar 14 16:47:57 2012 +0000

    Merge "Fix for bug 921743 Response codes for create ops in API v1.0 not compliant with spec"

commit b9c7647ef6709bd4e05392fa47f7a569c87ff08b
Merge: f0f16bf 4bacc46
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 18:59:45 2012 +0000

    Merge "Downgraded required version of WebOb to 1.0.8."

commit fa0e7e617e49f190e6ed33caafb853f7b9f5aa42
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Mar 13 16:58:19 2012 +0000

    Fix for bug 921743
    Response codes for create ops in API v1.0 not compliant with spec
    
    Change-Id: I7723e46b05ffd7b29940327b9c7362f843e01817

commit ad07e743cb10ffeb31895670e0d073a4217b1dea
Author: Shweta P <shpadubi@cisco.com>
Date:   Mon Mar 12 19:13:31 2012 -0400

    bug 954538
    Fix for the cisco unit tests
    
    Change-Id: I81e95e91245ba5215f7d8b94ac7aa5ebdd58d976

commit f0f16bffd751017487a0bd5aaee8b2374614ce32
Merge: 1173d90 f0b6de5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 00:43:49 2012 +0000

    Merge "fixed incorrect duplicate title"

commit 1173d90ced200234c9983f7261cb26e1b754bb47
Merge: b53e792 1769ce8
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 00:40:44 2012 +0000

    Merge "add git commit date / sha1 to sphinx html docs"

commit b53e792ed2e8c266fba300e61f03ec5c0246ab72
Merge: 9db5d73 beed3d1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Mar 13 00:37:40 2012 +0000

    Merge "Fixed incorrect title for example 3.10"

commit 9db5d73e31131ede1162d3a743cef50546f7b0cb
Merge: 973f33e f614a7d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 12 19:26:26 2012 +0000

    Merge "Bug #949261 Removing nova drivers for Linux Bridge Plugin"

commit 189b89a9c87b1eae9f55e5b8c98cf907d3acd61d
Author: Peng Yong <ppyy@pubyun.com>
Date:   Mon Mar 12 00:06:53 2012 +0800

    check connection in Listener. refer to Bug #943031
    
    Change-Id: I5a0c975ab7998627a213ac4c69c037e9e2d95bfa

commit f0b6de5dcec80f53b99b6499e11890204e2b1870
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Mar 9 14:50:19 2012 -0500

    fixed incorrect duplicate title
    
    Fixes bug 951089
    
    Changed the JSON example title to label the port JSON API examples properly.
    
    Change-Id: I0bec330256f1dd3de43bc3202cedada2f9d40c01

commit beed3d11227e9e5c59e09297df579e4114aa7b88
Author: Mark McClain <mark.mcclain@dreamhost.com>
Date:   Fri Mar 9 00:11:02 2012 -0500

    Fixed incorrect title for example 3.10
    
    Fixes bug 950535
    
    Changed title for Example 3.10 to correctly reflect JSON
    
    Change-Id: I0f7fae73efa80b617da0a895b80a95f60cb12c42

commit 4bacc462ea2cefc612c1df7bdd82029fa74b1b21
Author: Maru Newby <mnewby@internap.com>
Date:   Thu Mar 8 14:52:35 2012 -0800

    Downgraded required version of WebOb to 1.0.8.
    
     * Maintaining version parity with other OpenStack projects is
       essential to packaging efforts and shared installation (devstack).
     * fixes bug 950374
    
    Change-Id: I9b16f29a3641df7063ec80bc86b03b4857776b42

commit f614a7ddf57a2a4c30d9410671622caca6f4e434
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Mar 7 10:25:18 2012 -0800

    Bug #949261 Removing nova drivers for Linux Bridge Plugin
    
    These have been added to nova, so they need not be in the Quantum
    code base any more.
    
    Change-Id: Ibbd88792bfb0f58b2d9d347298964bf0b77baa95

commit 973f33e5309d533b6eecbcc7bdb91621871ebde9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Mar 6 13:17:19 2012 -0800

    Remove outdated content from OVS plugin README, point to website instead.
    
    bug 943810
    
    Change-Id: I12c801a83789a2c3f3b0adac4b44f2febf32c523

commit 8d1d6cc94e3690c1235b87d98a9b54d4c7f5e9ad
Merge: a59c832 8213824
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Mar 5 16:43:13 2012 +0000

    Merge "remove pep8 and strict lxml version from setup.py"

commit 1769ce8581ad532d203c3c09bec35fb1752b3f72
Author: Jesse Andrews <anotherjesse@gmail.com>
Date:   Fri Mar 2 16:09:16 2012 -0800

    add git commit date / sha1 to sphinx html docs
    
    Change-Id: Ie286200e3f569d6d5b0debf66baf24229b0b86ab

commit a59c832a8a696ebdbab1c5c7b79a2624a459e610
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Feb 29 19:59:56 2012 -0800

    more files missing in sdist tarball
    
    bug 943782
    
    Change-Id: I08df8de1280071e5a528af927d5fc1d30868b140

commit 531ed084cd3136bfb2519d47a20fb208e9f67e9c
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Feb 29 17:03:08 2012 -0800

    make sure pip-requires is included in setup.py sdist
    
    bug 943711
    
    Change-Id: I21a9d047e9fe00d2fa4a47165dd4728f862fdb9f

commit 7ad5d9b093ae4bc8bf132d0ddc422a26749ca057
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Feb 28 22:30:17 2012 -0800

    Introducing the tenant owenrship checks in the Cisco plugin, changes are
    almost identical to those in Bug#942713
    
    Change-Id: Ia320116e73db72090d925796bb2c832f31f878de

commit c029777dd7523c5216fee5d48dd9f9ca4bf3b84d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Feb 28 12:34:49 2012 -0800

    Fix some plugins that don't check that nets + ports are owned by tenant
    
    bug 942713. This bug confuses the validate_networks() method of
    QuantumManager in Nova, causing it to believe that it is valid for a
    tenant to plug into a particular network when in fact that network is not
    owned by the tenant, nor the "provider".
    
    The patch also adds unit tests to confirm correct plugin behavior.
    
    This patch fixes the issue for the Sample Plugin, the OVS plugin,
    the Linux Bridge plugin, and the Ryu plugin, all of which has the
    same DB model.  Validated the fix with the unit tests.
    
    
    I couldn't run the unit tests for the NVP plugin standalone, but by
    inspection, the code seems to handle this case.  I wasn't able to run
    the Cisco plugin unit tests, and that code uses its own DB model, so I
    am uncertain whether this issue exists in that plugin.
    
    
    
    Change-Id: I8c4a5f3eb151b91a1076821dc1916842510dfb90

commit 8853f470a58cbc2f4651c919cb0fb605588b9ed2
Merge: a5f97cc 9f4ec1c
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Feb 28 05:44:34 2012 +0000

    Merge "bug 934459: pip no longer supports -E"

commit 82138245694b452341cc41638058adb3972a9926
Author: Ionuț Arțăriși <iartarisi@suse.cz>
Date:   Thu Feb 16 13:11:04 2012 +0100

    remove pep8 and strict lxml version from setup.py
    
    Change-Id: I671f3e924641cdfdfb5d20d0b0e3c77e1dc714e2

commit a5f97ccc3b2f055554d8b9476f5299637a9266d1
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Sat Nov 19 18:17:03 2011 +0900

    plugin: introduce ryu plugin
    
    blueprint ovs-driver-extention
    This patch implements the blueprint ovs-driver-extention
    https://blueprints.launchpad.net/quantum/+spec/ovs-driver-extension
    
    This patch factors out ovs common logic from ovs plugin into ovscommon
    and adds Ryu NOS plugin.
    This patch enhances ovs plugin for generic OVS controller support and
    
    This patch is to add ofp controller support to OVS.
    Store ofp controller address in ovs quantum data base.
    - nova firewall_driver
    - nova linuxnet_interface_driver
    
    There may be ports unmanaged by nova/quantum. Those ports are used
    to connect vm to outside of physical machine. They needs special care.
    
    ---
    Changes 12 -> 13:
    - rebased to 543e150d6dc9144ebcc588b7d2bd66374a107730
      changed files are only MANIFEST.in, setup.py, tools/pip-requres
    
    Changes 11 -> 12:
    - ryu agent
      eliminated from quantum.common import exceptions as exc
    - ryu.db.api
      eliminated ofp_has_servers
    - ryu.nova
      eliminated from quantum.plugins.ryu.nova import ovs_utils
      and eliminate ovs_utils
    
    Chnages 10 -> 11:
    - rebased to a945d1a30478c644d307c77a8a85f3a08e5a834e
    - more Maru's review
    - setup.py: fix setup() argument
      This isn't directly related to ryu plugin though
    - improve fake ini file when unit test
      remove fake ini file after unit tests.
      use StringIO when no file is required.
    - LOG: don't use %
    
    Chnages 8 -> 9 -> 10:
    - minor fixes: forgot to commit some hunks
    
    Chnages 7 -> 8:
    - rebased to d6bf2b76162ba806b2ad1f636f6273e47e03a117
    - catch up d6bf2b76162ba806b2ad1f636f6273e47e03a117 change
      introduced bin/quantum_ryu_agent
    - addressed Maru's review
      - avoid custom patching, use mock for test
        and added mox and mock to pip-requires
      - more pep8
      - avoid \ for line continuation
      - avoid single char variables
      - db.api: first() -> one()
      - utilize implicit conversion
        var is not None -> var
      - and more...
    
    Changes 6 -> 7:
    - update comment in ryu/run_tests.py
    - make unit tests pass without ryu installed
      i.e.
      PLUGIN_DIR=quantum/plugins/ryu/ ./run_tests.sh
      works now
    
    Chages 5 -> 6:
    - remove comment
    
    Change 4 -> 5:
    - eliminate relative imports
    - copyright
    - doc string
    - naming (s/CONF_FILE/conf_file/g)
    - add " check to ryu/nova/ovs_utils
    - ryu/nova/linux_net: comment
    - ryu agent: eliminated unused methods
    - updated ryu/README: add http://www.osrg.net/ryu/using_with_openstack.html
    - added unit tests
    
    Changes 3 -> 4:
    - reflected Dan's review
    - on-OVS in ryu.ini
    - update @author
    - some naming
    
    Changes 2 -> 3:
    - rebased to 04d144ae0b2ad5618847d1784cea48a08d53a46a
    - abandoned to share code and duplicated codes from openvswitch plugin
      for ovs plugin stability.
    - dropped setup_ryu.sh and added README
    - update nova driver to catch up upstream change (gflags -> cfg)
    
    Changes 1 -> 2:
    - unbreak openvswtich unit test
    - MANIFEST.in
    
    Changes 3 -> new 1:
    - rebased to 1eb3c693b5f6f3f301047100c36c7915434f8be7
    - factor out common loginc from openvswitch plugin into ovscommon
    - Introduced a new independent ryu plugin
    - try new review due to the previous effort was marked abandoned.
      > https://review.openstack.org/#change,3055
      > Change-Id: I17801a7a74d4087838a8a26c1b1f97f28c2dcef3
    
    Changes:
    - rebased to 9c5c2caef13fa58234987527ab6caff829a37050
    - some clean ups
    
    Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
    Change-Id: Ia9fe87525cebccc87b7c18a533f48607272cd97f

commit 9f4ec1c7237b9b2070e7b6d7a6eefbdd51a36324
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Feb 25 10:24:34 2012 -0800

    bug 934459: pip no longer supports -E
    
    Change-Id: I2acdef113d147b7130053088d4bcf8515f61b815

commit 543e150d6dc9144ebcc588b7d2bd66374a107730
Merge: c8c2929 b9805bd
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 18:16:09 2012 +0000

    Merge "Return appropriate error for invalid-port state in create port API."

commit c8c2929151926954e0455cd4973215c25a41ac70
Merge: 48106bb 2386a7e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sat Feb 25 17:43:44 2012 +0000

    Merge "Initial commit: nvp plugin"

commit 48106bbe0bffc58e739c9939ac01eebb75446f9e
Author: Dave Lapsley <dlapsley@nicira.com>
Date:   Fri Feb 24 20:44:46 2012 -0500

    Fix bug 940732 stack.sh can't match sql_connection string.
    
    stack.sh can't match sql_connection string in default
    ovs_quantum_plugin.ini. A space is missing between sql_connection
    and "=" character.
    
    Change-Id: I001e281145c3b6ba23a84e27e3f0e9315c879d96

commit b9805bd234edc0076ff69fafc2ab020562863b58
Author: Madhav Puri <madhav.puri@gmail.com>
Date:   Thu Feb 23 22:44:07 2012 -0800

    Return appropriate error for invalid-port state in create port API.
    
    Fixes ovs-plugin to return appropriate error code when create port API is passed a port state value other than ACTIVE or DOWN. Fixes bug 919265.
    
    Also added unit-test to test the behavior and verified it using ovs-plugin with devstack.
    
    Change-Id: Ibd4e7bfdf4483c7ad1ef4ca70a336cb164493ae1

commit c812b9dc0345426cbff2a9085cc5acde885a8b1b
Author: Dave Lapsley <dlapsley@nicira.com>
Date:   Tue Feb 21 02:41:14 2012 -0500

    blueprint quantum-ovs-tunnel-agent
    
    Enhance existing Quantum OVS Plugin with a tunneling agent that
    enables Hypervisors to be connected via GRE tunnels. The new agent
    can be enabled/disabled via configuration file and provides backwards
    compatibility with existing non-tunneling OVS Agent.
    
    Change-Id: Id3b79430726b162fcb84f99df152d88a5766328f

commit 2386a7e2d5e52ed6a2461fe508735e2f35b41506
Author: Brad Hall <brad@nicira.com>
Date:   Fri Feb 17 10:23:04 2012 -0800

    Initial commit: nvp plugin
    
    blueprint: quantum-nvp-plugin
    
    Change-Id: I07c5d7b305928c341ef1b35a0d9b3281abcb03ae

commit a945d1a30478c644d307c77a8a85f3a08e5a834e
Author: Isaku Yamahata <yamahata@valinux.co.jp>
Date:   Thu Feb 23 01:55:30 2012 +0900

    unittests: setup FLAGS.state_path properly: bug 938637
    
    This patch fixes bug 938637
    Quantum unittests doesn't pass with plugin (openvswitch, linuxbridge) in venv
    as follows.
    This is because config file under <quantum src>/etc/ can't be find due to
    FLAGS.state_path points to <python-quantumclient src> which can be different
    from <quantum src>.
    Set FLAGS.state_path to <quantum src> when quantum unit tests.
    
     $ PLUGIN_DIR=quantum/plugins/openvswitch ./run_tests.sh -V
    <snip>
    ActionExtensionTest
        test_extended_action_for_adding_extra_data (quantum.tests.unit.test_extensions.ActionExtensionTest)ERROR
    <snip>
    ======================================================================
    ERROR: test_extended_action_for_adding_extra_data (quantum.tests.unit.test_extensions.ActionExtensionTest)
    ----------------------------------------------------------------------
    Traceback (most recent call last):
      File "/quantum/tests/unit/test_extensions.py", line 212, in setUp
        self.extension_app = setup_extensions_test_app()
      File "/quantum-src/quantum/tests/unit/test_extensions.py", line 474, in setup_extensions_test_app
        return TestApp(setup_extensions_middleware(extension_manager))
      File "/quantum-src/quantum/tests/unit/test_extensions.py", line 469, in setup_extensions_middleware
        conf, app = config.load_paste_app('extensions_test_app', options, None)
      File "/quantum-src/.venv/src/python-quantumclient/quantum/common/config.py", line 316, in load_paste_app
        conf_file, conf = load_paste_config(app_name, options, args)
      File "/quantum-src/.venv/src/python-quantumclient/quantum/common/config.py", line 286, in load_paste_config
        "Cannot load application %s" % app_name)
    RuntimeError: Unable to locate any configuration file. Cannot load application extensions_test_app
    -------------------- >> begin captured logging << --------------------
    quantum.extensions.extensions: INFO: Initializing extension manager.
    quantum.extensions.extensions: INFO: Loading extension file: foxinsocks.py
    quantum.extensions.extensions: DEBUG: Ext name: Fox In Socks
    quantum.extensions.extensions: DEBUG: Ext alias: FOXNSOX
    quantum.extensions.extensions: DEBUG: Ext description: The Fox In Socks Extension
    quantum.extensions.extensions: DEBUG: Ext namespace: http://www.fox.in.socks/api/ext/pie/v1.0
    quantum.extensions.extensions: DEBUG: Ext updated: 2011-01-22T13:25:27-06:00
    quantum.extensions.extensions: WARNING: Loaded extension: FOXNSOX
    quantum.extensions.extensions: INFO: Loading extension file: __init__.py
    quantum.extensions.extensions: INFO: Loading extension file: foxinsocks.pyc
    quantum.extensions.extensions: INFO: Loading extension file: __init__.pyc
    --------------------- >> end captured logging << ---------------------
    
    Change-Id: I3b8e1414b22b1a526468488fe885ac39f2e6c420

commit d6bf2b76162ba806b2ad1f636f6273e47e03a117
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Feb 17 17:00:52 2012 -0500

    Cleanup the source distribution.
    
    Missing text files such as LICENSE and various READMEs are now
    included in the tarball source distribution. The Makefile and shell
    script for installing the openvswitch agent on xen are also now
    included. The openvswitch and linuxbridge agents are included, and
    executable wrapper scripts for the agents are provided. The cisco and
    linuxbridge nova drivers are now setup to be run from the quantum
    namespace rather than copied to nova. Finally, the setup_*.py scripts
    have been removed from the project. Fixes bug 925074.
    
    Test by running "python setup.py sdist" and examining the generated
    tarball.
    
    Change-Id: I33d336a5eb13678e6d527b575958393b337b6f3d
    Signed-off-by: Bob Kukura <rkukura@redhat.com>

commit 04d144ae0b2ad5618847d1784cea48a08d53a46a
Merge: d8f39db cec98a7
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 18:59:14 2012 +0000

    Merge "Fix ovs config file location"

commit d8f39dbd4d2b4394ecb586a3067c177d687b6712
Merge: 25e22bb a56ad23
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Feb 16 18:57:11 2012 +0000

    Merge "Bug 925372: remove deprecated webob attributes (and also specify stable webob version in pip-requires)"

commit cec98a7374cdb5f0319194da6c2be28b864973ca
Author: Ghe Rivero <ghe@debian.org>
Date:   Wed Feb 15 10:33:34 2012 +0100

    Fix ovs config file location
    
    Change-Id: I957079434e14222e48fffb00e6bc3d58af8e40c8

commit 25e22bb7505c17b770cae4579658d7dfb6f49ae7
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jan 22 01:35:45 2012 -0800

    blueprint quantum-linux-bridge-plugin
    
    Squashed commit of the following:
    
    commit 6c4995736a56349923d34353031eb301780fc6d2
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sat Jan 21 22:31:09 2012 -0800
    
        Some more explanation in the README.
    
        Changing defaults in the conf file.
    
    commit 924b118468d7bd21737e9e2cf468ff83d0a20764
    Author: Shweta <shpadubi@cisco.com>
    Date:   Sat Jan 21 20:58:39 2012 -0500
    
        Adding Unit Tests for LinuxBridge Agent
    
    commit 12115650257483172c5e2bc889634dbdf3596d27
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sat Jan 21 05:21:24 2012 -0800
    
        Adding sqlite requirement
    
        Changing default mysql port number
    
        Fixing log statement
    
    commit 0ad1400e5dfc445b94e9024d92321eb3cd0588a5
    Merge: 1b7ba8f 9c5c2ca
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sat Jan 21 05:12:44 2012 -0800
    
        Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin
    
    commit 1b7ba8f7e7b6657734b669194ddfdcfcbfc833be
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sat Jan 21 04:04:50 2012 -0800
    
        Fixes to get the tests to run correctly.
    
        Also incorporated changes to be able to run both sqlite and mysql DBs.
    
    commit 4cead17576c293319dfdfd363dd18e81ba196b3b
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Fri Jan 20 15:32:35 2012 -0800
    
        Fixed inccorect calls to the DB
    
    commit c4f325729fbd06ee3f5d3520da4d23b2cd8c353b
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Fri Jan 20 12:18:18 2012 -0800
    
        Removing the specialized db modules (which used InnoDB engine) and
        instead using the Quantum DB now.
        Incorporated changes to setup so that the Linux Bridge plugin can be
        installed.
        Other changes to README and tests.
    
    commit b9498939d723e353808cface87f4453e33e94b41
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Mon Jan 16 20:00:14 2012 -0800
    
        Adding unit tests
    
    commit a0ab990fdcbf67a950d08c6b5b6d20ceb850619a
    Merge: 60e38cc f268b5e
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Mon Jan 16 18:02:55 2012 -0800
    
        Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin
    
    commit 60e38cc44886b5c8c9e47d89d8912d1dee23fbd1
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Mon Jan 16 13:44:37 2012 -0800
    
        This contains a fix for the earlier reported issue with the DHCP
        failing.
    
        The gateway IP address is now applied both to the bridge, and the
        gateway interface.
    
    commit ffea86a3465b8a5ed93b13f818e0afaefa6787ee
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sun Jan 15 20:00:38 2012 -0800
    
        Fixing an issue in the agent, sometimes the bridges for deleted networks
        were not getting cleaned up
    
    commit 87f76fc34f1c70cd82576b8698d704853c892422
    Merge: c8b097a 60d171e
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sun Jan 15 19:40:33 2012 -0800
    
        Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin
    
    commit c8b097abc2060b2eae01d84f9fed2c89851d93fd
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sun Jan 15 19:37:08 2012 -0800
    
        Simplified the logic for creating the bridge on the nova network host.
    
    commit 499dbacd4c5352c5320f3b6e5e8cd7f3629dbcc8
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Fri Jan 13 16:07:53 2012 -0800
    
        Fix for the DHCP issue, now applying Gateway IP to the bridge
    
        Also MAC address from original tap device are applied to bridge
        and vlan subinterface
    
    commit 6b4a2aea59702e2c12eeacc86101df9f6770d5ec
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sat Jan 7 14:29:00 2012 -0800
    
        Optimizations for processing in the loop
    
    commit 01aa47d3572439b193077432c63bf2b85c629edb
    Merge: 184f5dd 05df087
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Sun Jan 1 19:04:17 2012 -0800
    
        Changes to incorporate Operational Status
        Merge remote branch 'origin' into snaiksat/linux-bridge-plugin
    
        Conflicts:
        	quantum/db/api.py
    
    commit 05df0870191fac0353fe12a33efff68ef7ed0784
    Merge: 31d586b 5b23b5e
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Fri Dec 30 12:30:05 2011 -0800
    
        Merge remote branch 'upstream/master'
    
    commit 184f5dd8b73bc51025509792c15203ee73cd015e
    Author: Sumit Naiksatam <snaiksat@cisco.com>
    Date:   Mon Dec 12 02:09:12 2011 -0800
    
        Initial checkin for Linux Bridge L2 plugin.
    
    Change-Id: I5b27538be6a768a6f7eb77409197f7d8b4bbc628

commit 12b06b1caf655e3fc06e1f001b06aab554526dc2
Author: Bob Kukura <rkukura@redhat.com>
Date:   Fri Feb 3 16:20:28 2012 -0500

    Remove quantum CLI console script.
    
    The quantum CLI console script is now installed by the
    python-quantumclient project, so remove it from the quantum project's
    setup.py. Fixes bug 925596.
    
    Test by running "python setup.py install --root <somedir>" and
    checking that <somedir>/usr/bin/quantum is not created.
    
    Change-Id: Icd7eff79c8d30511693942a859334829cbf0d9af
    Signed-off-by: Bob Kukura <rkukura@redhat.com>

commit a56ad238f211eb25666124f77afa1e135052c6f7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Feb 2 10:54:33 2012 +0000

    Bug 925372: remove deprecated webob attributes
    (and also specify stable webob version in pip-requires)
    
    Change-Id: Id8dd53368f88042b71fc73a5f94803e635c4140b

commit 1eb3c693b5f6f3f301047100c36c7915434f8be7
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jan 29 14:11:03 2012 -0800

    bug 923510: avoid querying all ports for non-detail GET Network call.
    
    Change-Id: I9b4a20e5f6eb22dc234dfa675e7ca4f52893707d

commit 9a1823d72ba84f6f98a9870970a7cd6eab25822d
Merge: 5143978 48daa42
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 09:39:15 2012 +0000

    Merge "Make tox config work."

commit 5143978bc3f09b388c064b6a1f8dad444e410ed9
Merge: f684bf0 3a38a3f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 09:30:13 2012 +0000

    Merge "bp/api-filters This changeset implements filters for core Quantum API and provides unit tests"

commit 48daa427fadedc962810f44d75103ed138c212ed
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jan 25 01:23:12 2012 -0800

    Make tox config work.
    
    Change-Id: Ic81c7bb0fa2fe5c73200a9195630a0d5bb999e7d

commit f684bf0b47bcda815218e41d586f4e7ad333c836
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Jan 25 01:20:20 2012 -0800

    Pin versions to standard versions.
    
    Change-Id: Id6f9d2c01caee3f4c780366d19889b7311fba8d6

commit 3a38a3f70e205e6e0dc58db475c797f3e27de639
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jan 11 17:26:47 2012 +0000

    bp/api-filters
    This changeset implements filters for core Quantum API and provides unit tests
    
    Change-Id: I8247b3587c2cc8e53785781a45d1e457980261d2

commit c0cdc0f37abe024fbd753deb0ac33ceb442e9e2a
Merge: 609775c 1322295
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 04:56:48 2012 +0000

    Merge "Split out quantum.client and quantum.common."

commit 609775cc6ba84467bf0ba0d5d7b54f9765fa3d65
Merge: e85f2ea cc832e5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 25 02:57:30 2012 +0000

    Merge "bp/api-error-codes Restructured API error codes for Quantum API v1.1 This changeset provides the following changes: - Only standard HTTP errors for Quantum API v1.1 - Customized fault response body formatting according to API version - Changes to unit tests to deal with version specific status codes"

commit 13222958a5c2cf861312bd6198cb0bb6e937aa6d
Author: Monty Taylor <mordred@inaugust.com>
Date:   Thu Jan 19 11:45:25 2012 +1100

    Split out quantum.client and quantum.common.
    
    Change-Id: I1241bcd3305b6859c0cd2bb8c35b523e27aa3b18

commit e85f2ea8bf8bdf1e62b8a1c48e95e48704cc1ebf
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jan 24 17:41:51 2012 -0800

    Quantum was missing depend on lxml.
    
    Change-Id: Ie8d582018f2c5f7972f6d9ab8fcf0f79d00f6a99

commit cc832e5d5865cc94f226d1d88f10b431f221f1f1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jan 17 01:23:00 2012 +0000

    bp/api-error-codes
    Restructured API error codes for Quantum API v1.1
    This changeset provides the following changes:
    - Only standard HTTP errors for Quantum API v1.1
    - Customized fault response body formatting according to API version
    - Changes to unit tests to deal with version specific status codes
    
    NOTE: Client side changes are not in this branch.
    They should be implemented within bp/quantum-client-1.1.
    NOTE-2: Fixing references to QuantumHTTPErrors in extensions framework
    
    Change-Id: I56f50b5c59d73fd6f02905106f0c2a3c8341a741

commit 1dd7766dcadcd52ee0e9cd6c6e44362368167611
Author: Brad Hall <brad@nicira.com>
Date:   Wed Dec 21 14:47:28 2011 -0800

    blueprint ovs-portstats
    
    This adds an extension to support fetching port statistics from any plugin
    that supports it.
    
    Change-Id: Id14ee3c9604878b8a06d668126452cd5a5071b10

commit 975d5a996bcf3e28c572e1c34274c4eab04b46e6
Author: Brad Hall <brad@nicira.com>
Date:   Tue Jan 24 11:12:55 2012 -0800

    Add support for dealing with 501 errors (notimplemented)
    
    This allows us to return NotImplemented() from an extension if the plugin
    doesn't support a given function.
    
    Change-Id: I73c6dec959aea7b2bde1378222b62e6fc82a5d43

commit a645692d25873b0c691a385ad7fc4fdcd3df4672
Merge: 57d69e7 7a7e8e2
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 09:40:07 2012 +0000

    Merge "Improved VlanMap."

commit 57d69e7301bc14184c409b11afe08ff5d409bbe2
Merge: da17af0 d643608
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 24 00:13:34 2012 +0000

    Merge "Getting ready for the client split."

commit da17af0ed9042f2054ec2b6ff7988d349359121e
Merge: 543bf67 f25d1d5
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 23 17:41:36 2012 +0000

    Merge "moving batch config out of quantum-server repo."

commit 7a7e8e2bc14d9cc17f02b782a83f2125008f16da
Author: Ghe Rivero <ghe@debian.org>
Date:   Tue Dec 13 13:14:22 2011 +0100

    Improved VlanMap.
    
    Simplified logic and less time spent creating  vlans.
    
    Change-Id: I90fda09faa1869b38993aa0aeed64d813d29afa9

commit f25d1d51b825cd723f4fe3403f039c4acd0e93fe
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jan 22 21:40:30 2012 -0800

    moving batch config out of quantum-server repo.
    
    a commit to the python-quantumclient repo will add it there.
    
    Change-Id: Iefc293adbbf1eab552f2184f021f184511f9ddeb

commit 543bf67833ae52b117a0c014d7691d1d10b34fda
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jan 22 21:07:37 2012 -0800

    bug 920299: remove duplicate + outdate README
    
    Change-Id: I2122e69f7394420c912ab700da5bc91dd77f84af

commit d643608e336c5c38046cb56a387bd6141adb0b6a
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jan 10 17:44:27 2012 -0800

    Getting ready for the client split.
    
    Change-Id: Ic2e7d637d2c116dfda3d7ad958ccba39a8da7751

commit 9c5c2caef13fa58234987527ab6caff829a37050
Merge: 88f5d2d ea64a12
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Jan 17 21:14:43 2012 +0000

    Merge "fix mysql port in sql_connection example..."

commit 88f5d2db759da394873c95b5764a0e26e00cbfa8
Author: Major Hayden <major@mhtx.net>
Date:   Tue Jan 17 14:11:03 2012 -0600

    Removed erroneous print from setup.py
    
    Change-Id: If174ec35f687d4a5acc71b0ce4292a8b7f6397a1

commit 95f764499402466edbe1528307da8fa92ee2215b
Author: Major Hayden <major@mhtx.net>
Date:   Tue Jan 17 07:29:23 2012 -0600

    Fixes setup scripts for quantum plugins.
    
    Fixes bug 917630.
    
    Change-Id: I3cf66acf46bcfc83755b572756896032cb6a11d1

commit c6ffd875df384313e7b22214b75e00f735c06338
Author: James E. Blair <jeblair@hp.com>
Date:   Tue Jan 17 08:02:10 2012 +1100

    Base version.py on glance.
    
    This makes setting and calculating the versioning of quantum more
    like other OpenStack projects, simplifying the work of the CI
    and Release Management teams.
    
    Addresses bug 916018 which prevents the quantum-tarball job from
    running correctly.
    
    Change-Id: I5b006ccc3d31c5d213c703853dfa38f04d983918

commit ea64a12a3ebf575d4cd9c6f56f2a6f2300d51f9f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jan 16 16:59:22 2012 -0800

    fix mysql port in sql_connection example...
    
    Change-Id: Ie91b554e5549193fb3568cf0bb0dec7c58a6dfc5

commit f268b5e62ca8bbf1712225d4c8d6d38580f38fba
Author: Monty Taylor <mordred@inaugust.com>
Date:   Tue Jan 10 17:17:00 2012 -0800

    Make the quantum top-level a namespace package.
    
    Change-Id: I8fa596dedcc72fcec73972f6bf158e53c17b7e6d

commit d11d0e621b63d036a7d108906c8a34c952e864c0
Merge: 60d171e 98d04ae
Author: Jenkins <jenkins@review.openstack.org>
Date:   Mon Jan 16 22:24:58 2012 +0000

    Merge "Install a good version of pip in the venv."

commit 60d171ea1842d6e44c5c3b5adab45d2208dc2254
Merge: f95ea46 4572e65
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Jan 12 00:39:39 2012 +0000

    Merge "PEP8 quantum cleanup"

commit f95ea46bdcf2594f9f009b28dfb6ed13b21a749f
Merge: e1660a3 ad5541f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 10:19:37 2012 +0000

    Merge "Add __init__.py from plugin to be copied on setup scripts"

commit e1660a3aaa8537ed7120146901157bfdb0f43973
Merge: f3a9665 a90fab1
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Jan 11 10:18:24 2012 +0000

    Merge "Rename .quantum-venv to .venv."

commit ad5541fc3f12f10138168edad7802d0fde4a78c1
Author: Luiz H Ozaki <luiz.ozaki@gmail.com>
Date:   Thu Jan 5 18:09:38 2012 -0200

    Add __init__.py from plugin to be copied on setup scripts
    
    Using debian building scripts to package Quantum and I was getting this error:
    ('Inner Exception: %s', ImportError('No module named plugins.sample.SamplePlugin',))
    
    Because none of the setup_*.py was copying the __init__.py from the plugins
    
    Thanks
    
    Change-Id: I29699f1f293e2ca271234a2b708aaa1d3637c9dd

commit f3a9665e4349160fba08a09b846a773f4e785ba4
Author: Brad Hall <brad@nicira.com>
Date:   Wed Nov 30 13:10:31 2011 -0800

    Fix lp bug 897882
    
    This moves the tree to having a standard setup.py.  For those who want to
    build individual packages you'll need to use the setup_<package>.py files.
    
    This allows us to support the traditional setup.py commands (i.e. sdist, etc)
    that the openstack CI scripts will be using.
    
    Change-Id: I7fe286d9973f43ae118a715276b0c089230f4f7e

commit 4572e6500ace4996f63fb12f09808346e87f9551
Author: lzyeval <zhongyue.nah@intel.com>
Date:   Wed Jan 4 17:10:35 2012 +0800

    PEP8 quantum cleanup
    
    Fixes bug #911663
    
    The None, True, and False values are singletons.
    
    All variable *comparisons* to singletons should use 'is' or 'is not'.
    All variable *evaluations* to boolean should use 'if' or 'if not'.
    All Object type comparisons should use isinstance()
    instead of comparing types directly.
    
    Change-Id: Id5c797d3339d0d7015bac386088133540f0c0c9e

commit 98d04ae684ea761070d8df160a5f47e1701bc072
Author: Monty Taylor <mordred@inaugust.com>
Date:   Mon Jan 2 13:59:59 2012 -0800

    Install a good version of pip in the venv.
    
    Change-Id: If55032a5018b50cd7cc359ec4a013c8c18dc735e

commit a90fab1193eee4ef007026f5997f25d31a552131
Author: James E. Blair <jeblair@hp.com>
Date:   Fri Dec 23 15:02:57 2011 -0800

    Rename .quantum-venv to .venv.
    
    This simplifies a number of Jenkins jobs which currently, other
    than directory names, could be the same for all OpenStack
    projects. By renaming the virtualenv directory, the redundant
    Jenkins virtualenv build and copy jobs can be eliminated.
    
    Change-Id: I93c7f6577b4c3a76b021f002bda59fcb8fac3f95

commit 5b23b5ef6b3fd816150ef0499661a99748e0faad
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Wed Jan 12 20:44:27 2011 -0500

    Updating Cisco README with instructions on installing the patched ncclient library
    
    Change-Id: I6bd7cb96fc6e1d2ac0bc811561b7f89d1c7d18c8

commit dadbae983328b39565f53cadb62b2f696e045c8b
Author: James E. Blair <james.blair@rackspace.com>
Date:   Mon Dec 19 16:25:21 2011 -0800

    Remove plugin pip-requires.
    
    Fixes bug 906636.
    
    The cisco plugin included ncclient, but does not use it when testing.
    The openvswitch plugin included SQLAlchemy which is already required
    by quantum itself.
    
    I've also changed the install_venv.py script to only look at
    tools/pip-requires, so that it behaves more like the rest of the
    OpenStack projects.  In Jenkins that's the only file we look at
    to see if we need to rebuild the virtualenv, so it would be best
    if the project only hade one pip-requires.
    
    Also added .gitignore to ignore files created during testing.
    
    Change-Id: Ic460452ec89aa8377c975ca63b57563119860e6b

commit 80b94c7051ad77a56b00f6592a8dfe3a7511ffdc
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Dec 14 01:53:55 2011 -0800

    blueprint refactor-readme-to-manual
    
    Removes most of the content from the README to avoid it becoming outdated
    and stale given that our currently maintained docs are now on
    http://docs.openstack.org .  In some cases, including keystone config,
    extension writing, etc. this means text from the README is being
    transferred directly from the README to an external doc so we make
    sure we don't lose anything.
    
    Change-Id: Ie08db4bd4854bb45e6777b1e0abe37f51d3e5c5c

commit 7c1b26c2eb2f6049841372ba7fe49990bb130728
Merge: 56974c4 fa912df
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 00:56:21 2011 +0000

    Merge "Implementation of the BP services-insertion-wrapper inside the Cisco Plugin"

commit 56974c425da12ac0763063d49536c3eaa9a72f4c
Merge: 8c53e3b 6f697a3
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 00:54:21 2011 +0000

    Merge "Bug #890028"

commit 8c53e3b726e054ff0767766d8c4303b9a7a02b95
Merge: 0814223 b0652c0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 00:38:01 2011 +0000

    Merge "Fix for bug 902175"

commit 6f697a341e7e37fee9c136fd6ffcd510c79357bf
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Nov 14 00:48:28 2011 +0000

    Bug #890028
    
    Change run_tests.sh for running pep8/pylint validation only
    (also adds .pylintrc file)
    
    Resubmitting this time making sure we run pylint for Quantum!
    Also run just with -l for total number of messages
    Run with -l -v for detailed pylint messages
    
    Change-Id: I593c8aed4e0e6b06204c6c4308934da198778fd6

commit 08142231ad073621c42ff11d2367a7c9c81dd5c9
Merge: f56b93c f4f4a21
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Dec 14 00:12:53 2011 +0000

    Merge "bug 903580: remove invalid extensions path from quantum.conf"

commit f56b93cee959e0e8a84ec22fe8974b13cbff3b0d
Merge: c8f2630 e5095b0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 22:37:24 2011 +0000

    Merge "blueprint operational-status-ovs-plugin"

commit c8f2630ad5e447f1969b7dcfc1d8f10f7a14afb7
Merge: b090b38 915f49d
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 21:35:49 2011 +0000

    Merge "Fixing bug/903829 Making setup_server.py not try to install quantum.conf.sample"

commit fa912dfcd91ea7a7e4a014d7179e7232357dd40c
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Dec 12 23:41:59 2011 -0800

    Implementation of the BP services-insertion-wrapper inside the Cisco Plugin
    
    This utility offers a simplify way to insert and remove network services
    in the path of the traffic to the server VMs, by splitting the network
    into two, and having the service bridge between the two networks,
    in the process applying the service. This model is called In-Path
    (Bump in the Wire)
    
    Change-Id: If7e9ad2dcb8124e7d82ac837c5b62c0d09b00bcd

commit e5095b06d5f7f8b718d3729120b1cd971177a2ea
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Dec 13 12:54:02 2011 -0800

    blueprint operational-status-ovs-plugin
    
    Implements operational status API for OVS plugin.   Uses existing
    database model for operational status.  For network, status is always
    up.  For a port, status is down unless there is an agent that
    indicates that the port is active on its compute host.
    
    Updated: use Salvatore's config hook to set default op-status for OVS
    in OVS run_tests.py
    
    Updated: fixed issue in _make_port_dict() found by Brad.
    
    Change-Id: I0560cbde9dc69bd4211d9aaf12cef204df2f7664

commit f4f4a21fb3b56f7b031c5256bba5621adcde41e6
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Dec 12 23:40:13 2011 -0800

    bug 903580: remove invalid extensions path from quantum.conf
    
    Avoids error message at boot.
    
    Specifying a path here is actually not needed at all.
    
    Change-Id: Id16609bc557a94e1e66191bee589dfd543eda6e6

commit b0652c0dff90d68a6a7cf84b536e7e539e344f74
Author: Brad Hall <brad@nicira.com>
Date:   Mon Dec 12 18:26:21 2011 +0000

    Fix for bug 902175
    
    We can't use merge if we're removing a field from the port object so use add
    instead.  Also, pass the session to port_get so that we don't run into the
    "this port is already bound to session x" error.
    
    Change-Id: I54a8484c8f6429ad18fb0c5e088720d21fc16299

commit 1a048e944e6b0fc41948db9ac971d0acdb26ea70
Merge: 6189053 fd73a50
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 11 07:12:06 2011 +0000

    Merge "bug #891246: Fix paths in agent Makefile"

commit 61890537cb173d516e7824f081a688ebdfa92ac0
Merge: 7ee5686 40f0a17
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 11 07:07:20 2011 +0000

    Merge "Fix for bug 900316"

commit 7ee5686494d2ff2735d9b3dbc59e6720eb8d8779
Merge: f815280 f53fb77
Author: Jenkins <jenkins@review.openstack.org>
Date:   Sun Dec 11 07:06:01 2011 +0000

    Merge "blueprint api-framework-essex"

commit f8152805b1eb54d9560702e9537dc526dee1966c
Author: Shweta P <shpadubi@cisco.com>
Date:   Fri Dec 9 08:40:16 2011 -0500

    Readme Fix
    
    Change-Id: I3bf79cbd591b911e4f6d9329a7bf0c77f811ee8a

commit d957efd706fdd072c46541ec3e1b31892fd63671
Merge: 2184460 9f6c2e0
Author: Jenkins <jenkins@review.openstack.org>
Date:   Thu Dec 8 16:38:31 2011 +0000

    Merge "Fix for bug 900277"

commit f53fb7705a48fb55de6547234a6937fc69a6e35b
Author: Ghe Rivero <ghe@debian.org>
Date:   Thu Dec 1 01:14:29 2011 +0000

    blueprint api-framework-essex
    
    Addressing Dan's comments.
    
    This changeset provides:
    - improved framework for API versioning, with separated controllers for each API version
    - Taken from nova:'Resource' class in WSGI framework. This class is a container for serializers, deserializers and controller
    - Better deserialization thanks to resource class. _parse_request_params has been removed
    - Improved management of HTTP client errors
    NOTE: this changeset does not update the framework used by API extensions.
    
    Change-Id: I88a669ce418225c415e0da22e951762d0708e0a5

commit 9f6c2e0ee6eb156f4673af808878f7478ebd62bc
Author: Rohit Agarwalla <rohitagarwalla@gmail.com>
Date:   Mon Dec 5 09:56:36 2011 -0800

    Fix for bug 900277
    
    Removes duplicate network name checks from cisco db api module
    
    Change-Id: I620b3abefeb2cb80eb98778807fd26c5a084bb0e

commit 40f0a170d7e062707c16f3af434e8a7b15ed9b3b
Author: Brad Hall <brad@nicira.com>
Date:   Mon Dec 5 09:52:24 2011 -0800

    Fix for bug 900316
    
    This fixes the --venv and --user install options as well as the path in the
    cli script.
    
    Change-Id: Ie9f265ca248db3d91ff92b7dc3090e1bfdbb0eb6

commit 2184460b655c66b68d498620bc522ce54ab3b118
Author: Shweta P <shpadubi@cisco.com>
Date:   Mon Dec 5 07:58:58 2011 -0500

    Modified the Readme for Unit Test Execution Instructions
    
    Change-Id: Ib7ff79c166e34c4f99a8df55feb0191f37555597
    
    Removed the trailing whitespaces in the README
    
    Change-Id: Ic2299bf35d9e0d8512ae4f57976884d12ba92159

commit bb6cbb09f58a80e62c8a8b40388e9497718dab4c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 5 01:09:49 2011 +0000

    Bug 900093
    Remove unused function in db/api.py
    
    Change-Id: Icbf72ea4069bf56e147d7bc5160ed8c9905a6791

commit fd73a5019eaeb1029d40acd310b12f3948df4068
Author: Brad Hall <brad@nicira.com>
Date:   Mon Nov 28 16:55:43 2011 -0800

    bug #891246: Fix paths in agent Makefile
    
    Change-Id: I7093ca14eaf45986fcc50e914f9ccf8fa868fb07

commit 6a08320031d03913981c444cce97c7ccd08c8169
Author: Brad Hall <brad@nicira.com>
Date:   Wed Nov 9 22:57:13 2011 -0800

    Second round of packaging changes
    
    This change condenses the directory structure to something more similar to
    what we had before while producing similar packages.
    
    It also introduces version.py which allows us to get the version from git tags
    (or a fallback version if not available).
    
    Fixes lp bug 889336
    Fixes lp bug 888795
    
    Change-Id: I86136bd9dbabb5eb1f8366ed665ed9b54f695124

commit 0a9faf33f78c0d7876190a12f56f3438a7a0dd87
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Nov 18 15:48:21 2011 -0800

    Bug 891705
    Fix to change reference to the Quantum CLI from within the Cisco extensions' CLI module
    
    Removed "tools" from the PYTHONPATH
    
    Change-Id: Icbd3800668219d16fc33a25da9170e9ec7fb6ddb

commit 6edd49f79c3da34a411cb5c10a90b1730483f508
Merge: 912d30f e85d007
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Nov 18 21:29:51 2011 +0000

    Merge "Add quantum.exceptions path to configed ext paths"

commit 912d30ffa29a5077be720e2ff4d600faf27859e6
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Nov 17 19:25:34 2011 -0800

    Correcting the plugins classpath in the Quantum README.
    
    Change-Id: I14645f3c388698ac34cade9f8e8599c12884141a

commit 87dbc61c3460c981515e4ae1ca18ab54e069d790
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Wed Nov 16 14:52:40 2011 -0800

    The relative path for the "ucs_inventory.ini" file has been fixed
    
    Change-Id: I38053df8b398e3fadcc6820c1118b3685ccd4174

commit d2bb51ca2529ef1ce8f8ffa412ac76778e6fd829
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Nov 16 10:07:03 2011 -0800

    bug #891267 : for XS, grab iface-id from XAPI directly if needed.
    
    The version of OVS that ships with XenServer by default does not include
    the script to automatically sync the XAPI other_config:nicira-iface-id
    field of a VIF with the external_ids:iface-id in the OVS interfaces table.
    Thus, make the agent grab the value directly from XAPI if iface-id is
    not already populated.
    
    Change-Id: Id01d9da1761016bcd983ad06621c62e94b2445c1

commit a73ba62920e643355ce6e9b836c075f139623fd9
Author: Monty Taylor <mordred@inaugust.com>
Date:   Wed Nov 16 01:30:40 2011 -0200

    Changes to make pip-based tests work with jenkins.
    
    The git line for the cisco pip-requires was wrong.
    The venv needs to be installed in the source tree, not in the home
    directory for self-contained builds.
    The version of python can't be assumed and must be calculated.
    
    Change-Id: I23d381eb273e82796e309483086dc68f27ce6093

commit 1dffdc3edf1160be50eb4081f9316f3b76aa9ae7
Author: Brad Hall <brad@nicira.com>
Date:   Mon Nov 14 16:54:12 2011 -0800

    Fix for bug 890498
    
    Add mysql-python to pip-requires for the openvswitch plugin
    
    Change-Id: I4f66270cbaa16a6259c130e00c378acbe9abe931

commit 76999023389d13e29623ccb311a079cac63de571
Author: Brad Hall <brad@nicira.com>
Date:   Mon Nov 14 11:04:04 2011 -0800

    Fix for bug 888811
    
    Use version 0.6.24 of python-distribute which allows us to find all of the
    test directories on ubuntu oneiric.
    
    Change-Id: Ibdd7f84e3f344b98cc979b2afcdd3dd2d423dfd1

commit 2c1d1c3257a50acbbd8a518ba7c10342cfeb60ad
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Mar 29 23:15:10 2011 -0400

    Fixing find_config_file after packaging changes
    
    Change-Id: I687793b0f8f7284019e05c044e53d91e0f3f09c2

commit e95aa008efa6eeddd89e02487c8a06a9c45a4aec
Author: Ghe Rivero <ghe@debian.org>
Date:   Thu Nov 17 09:21:09 2011 +0100

    Added timeout flag to ovs-vsctl to avoid infinte waiting
    
    Fixes bug 890180
    
    Change-Id: Iba76359d5ee4f625b6a7007b318cf0eb5f1119da

commit e85d007c074b1e7ab7e48612d8c8a6dc461d9665
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Mar 17 22:38:31 2011 -0400

    Add quantum.exceptions path to configed ext paths
    
    Change-Id: Ica9e1de290d963ef8919e15a242655f933df5b03

commit 3760868eb0953384e67a43b084cef72c321fa051
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Mar 11 19:14:38 2011 -0500

    Fix for Bug #888820 - pip-requires file support for plugins
    
    Change-Id: I6e0833ec0c875ec38db419a88fd6c2db02142f08

commit 881a6850e4b4767cb1ed3dede740b178c37733e1
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Mar 10 00:12:54 2011 -0500

    Fixing Cisco plugin after update_* change
    
    Also a few fixes from packaging changes
    
    Change-Id: I7ad7d5bc741fed9d09120148ad75f41df6722b59

commit e77db9467bb219d601226fd13e976fefafd774f0
Author: Brad Hall <brad@nicira.com>
Date:   Sat Nov 5 04:44:36 2011 -0700

    Fix for bug 888207
    
    Instead of splitting the tests (server/client) we just run the tests like is
    done in run_tests.py.
    
    Change-Id: I204e54eaca4473416b5a540719a13988b90adc30

commit 7c297273045b56395098db9de21f8e44c2939bf6
Author: Brad Hall <brad@nicira.com>
Date:   Sat Nov 5 04:42:16 2011 -0700

    Fix for bug 877525
    
    We now have a verbose flag (-v) for run_tests.sh if you want ot see all that
    crap printed to the screen.  The default behavior is just to print "test nam
    .. OK".  Also, we took the code from nova to cat run_tests.log if there is a
    error so that if we hit an import error we will see it in the console jenkin
    output.
    
    Change-Id: Id8997c658a61691bf9f25b1c01e6a5db0eca428f

commit a08016ae93a229d556a8bd0060d184ba37a86109
Merge: 8aebf5a 911f233
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 16:36:24 2011 +0000

    Merge "Make the openvswitch plugin tests work again"

commit 8aebf5aa3fe2a4abb59424b0aacee620f9f6ebbc
Merge: 8a584f4 dc5ec29
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Nov 9 15:42:47 2011 +0000

    Merge "Change version numbers to be compatible with debian packaging"

commit 8a584f4417006928c06f49b621fc841e1832e892
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Nov 8 20:03:57 2011 -0800

    Bug #875995: Quantum README fixes
    
    Fix the most obvious issues with the Quantum README and add pointers to
    external documentation resources.
    
    In a future commit, we plan to remove most of the content in the README
    and leave it just as references to external documentation.  However,
    this change requires us to be able to support multiple version of our
    external documentation (not yet possible) and have a good location for
    developer documentation.
    
    Change-Id: I57d7f99f070d17564b7a5fdcef8ae8ad2a6575a6

commit dc5ec29f7bc896e8d10bf17c660075de8216edbe
Author: Brad Hall <brad@nicira.com>
Date:   Sat Nov 5 03:21:42 2011 -0700

    Change version numbers to be compatible with debian packaging
    
    Change-Id: I4548049e678ca04f33857b9ae21c1bc879e30cef

commit 911f233dc5b148ae092f4ea584f3547f9e61d610
Author: Brad Hall <brad@nicira.com>
Date:   Sat Nov 5 03:13:51 2011 -0700

    Make the openvswitch plugin tests work again
    
    Change-Id: If715d4821b8e689fe836fe2afd12aaa7c3b73468

commit 687f3d2f5c93bb52e03cf42b7ffc54b03ad0ed44
Author: Brad Hall <brad@nicira.com>
Date:   Sun Oct 2 22:39:26 2011 -0700

    Swich over to update_{net,port} instead of rename_net and set_port_state
    
    This commit changes the plugin interface so that we have update() functions
    that can upate any attributes of the port or network.  In the future when we
    add more things like operational state this will give us the flexibility to be
    able to update those.  This also allows data extensions to be passed into the
    update calls.
    
    Thanks to Tyler and the others at cisco for making the changes to the cisco
    plugins and tests (their patch is included in this commit).
    
    Change-Id: If8a0111a7174d94d9f0aed9630e326d428ef994a

commit 1c88385255e4206744d713167ad494ae4e0ef5b4
Author: Ghe Rivero <ghe@debian.org>
Date:   Tue Nov 8 21:20:51 2011 +0100

    Added try import to quantum-server and quantum-cli
    
    Once that quantum is deployed there is no need to modified the python
    path importing source_environment.
    
    Change-Id: Iad4cce250137c6e5374ee90af6324f32f32da2ad

commit a1707183be3091a2016d655b2349d45a13c2ca07
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Nov 8 18:24:42 2011 +0000

    Bug 887706
    
    Adding *.pyc to PEP8_EXCLUDE
    
    Change-Id: If2c432e8ce85be585aa3b71a5acb76f2f27a4c07

commit e967e1a43512a2ad60bac933068341d4ed28e563
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Nov 4 10:31:05 2011 +0000

    Blueprint authentication-for-quantum
    
    Modifies quantum.conf to include authN filter and pipeline with auth (optional)
    Removes bufferedhttp.py (not used anymore as middleware stays in keystone's tree)
    
    Change-Id: Id6410d88cd9a11c41e8813497a8af3286a88e1dc

commit 24b0207cbe60497a19e84947e008b9fbcf9ffce6
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Feb 22 20:42:24 2011 -0500

    blueprint quantum-packaging
    
    Change-Id: Ica19170540b06ecddb0fbb6d340ee7a6819c1708

commit e767b8f4631eaa66fdf4eab91e6779fe3377f046
Merge: c350d72 8cfd60e
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 28 20:17:21 2011 +0000

    Merge "Moved the initialization of the blade state so that the interfaces which are configured outside of Quantum are also initialized in the blade state."

commit c350d7210a3d9b14fb62e00d060a8438b0ce68f6
Merge: ed7a352 91b5c06
Author: Jenkins <jenkins@review.openstack.org>
Date:   Fri Oct 28 18:38:00 2011 +0000

    Merge "Change the ovs plugin create_*() calls to take the kwargs param"

commit 8cfd60e51c7a6b181f6ceda0b86f882970ade981
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Oct 27 19:10:17 2011 -0700

    Moved the initialization of the blade state so that the interfaces which are configured outside of Quantum are also initialized in the blade state.
    
    Change-Id: Ib3381ea654e3ede7e138184e597cbf98860b049c

commit ed7a3527b5b440457c1d764f650882acb7ec2544
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Oct 15 20:56:24 2011 -0700

    fix minor double-serialization bug in client.py
    
    bug 875468
    
    Change-Id: If79d747c4a2796198e3d968f6bc5fbdca2621f73

commit f9a39018eb9215b5ec00da53fb332a3e58c1225c
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Oct 15 18:19:28 2011 -0700

    bug #863635: remove vestigial cheetah import from bin/cli
    
    Change-Id: I8d7d8dcf11f4e9b6748d6714b82684ac2ab4966d

commit 91b5c06b51ad8d2d1060989e21ec37aa72d18688
Author: Brad Hall <brad@nicira.com>
Date:   Wed Oct 26 12:28:37 2011 -0700

    Change the ovs plugin create_*() calls to take the kwargs param
    
    Change-Id: I16fe3386a172f007573eac2c2de6d23b29a348ad

commit ce2b509c0b50ce882d43737f56245b4145c37064
Author: eperdomo <eperdomo@dhcp-171-71-119-164.cisco.com>
Date:   Tue Oct 25 14:25:46 2011 -0700

    Changing the log messages in order to be always identified by their sub-packages of origin, and they can even be filtered on that basis
    
    Change-Id: I900f8052416cbded698a806895fe145e61d47f1c

commit 121a3fe444d6f72b654ebb0528716f1c20aa7221
Merge: c6a6047 a637d67
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 25 20:32:09 2011 +0000

    Merge "New tests are being adding to the Diablo code (Cisco L2-Network plugin), and some fixes in the case where the tests were failing."

commit c6a6047361a8e8d574f17dbb3f29ec119dee25d7
Merge: f6c9589 14069f9
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Oct 25 03:49:37 2011 +0000

    Merge changes Ie7acb24a,Ief95b806
    
    * changes:
      Add the ability to specify multiple extension directories
      Change port/net create calls to take an additional kwargs param

commit f6c958956aecfa729a26b636f7e0106fce824907
Author: James E. Blair <james.blair@rackspace.com>
Date:   Thu Oct 20 13:51:31 2011 -0400

    Add .gitreview config file for gerrit.
    
    The CI team is developing a new tool, git-review:
    
      https://github.com/openstack-ci/git-review
    
    which is intendend to replace rfc.sh.  This adds a .gitreview file
    so that it can automatically determine the canonical gerrit location
    for the repository when first run.  Later, rfc.sh will be updated to
    indicate it is deprecated, and then eventually removed.
    
    Change-Id: I49edfa303671de58f54eae4e1d7c27916c41dda7

commit a637d67555ecab8cec3cede1ff0b7382ed7e9a25
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Oct 22 20:03:22 2011 -0700

    New tests are being adding to the Diablo code (Cisco L2-Network plugin), and some fixes in the case where the tests were failing.
    
    All changes contained within the Cisco L2-Network plugin and extensions.
    
    Change-Id: I696a2aebeb9027f3b0ce0b6673910e02e304673f

commit 14069f9e0abb31b784050074165b3eeb354ab4ea
Author: Brad Hall <brad@nicira.com>
Date:   Fri Sep 30 01:13:24 2011 -0700

    Add the ability to specify multiple extension directories
    
    This allows for a colon-separated list of extension directories that will be
    loaded at startup.
    
    Change-Id: Ie7acb24a929b1782be3e916113a90ede238dee40

commit 342b8362ee4593f23d794df4058d08baca3645d3
Author: Brad Hall <brad@nicira.com>
Date:   Mon Sep 26 17:18:34 2011 -0700

    Add code-coverage support to run_tests.sh (lp860160)
    
    Change-Id: I404ba58ea882123b8c6669ea32923fa626b27de5

commit aab44f36151ca732e2040f8a6066b99c80c2a04a
Author: Brad Hall <brad@nicira.com>
Date:   Thu Sep 29 22:47:10 2011 -0700

    Change port/net create calls to take an additional kwargs param
    
    This is to allow data extensions to flow through the middleware to the actual
    plugin.
    
    Change-Id: Ief95b806504e10dd05ce7e941437628ac11a215b

commit 109f366975276822f4dba75cfea40a61f3cc562c
Author: Brad Hall <brad@nicira.com>
Date:   Fri Sep 23 22:09:53 2011 -0700

    ovs plugin: Remove reference to set_external_ids.sh
    
    This script is no longer needed/used
    
    Change-Id: Ib54909082a0dca6e205ce25eadfa3987523892c0

commit 7406b69aa4e2d2bc8e3035943011462fa1647f85
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Oct 15 20:37:42 2011 -0700

    fix pep8 issues in Cisco plugin
    
    bug 875458
    
    The cisco plugin has some pep8 errors when using pep8 version 0.6.1
    which is now what is used to gate trunk.
    
    This fix is not supposed to change any functionality.  I was not able
    to test it, so I will need a review + testing from the Cisco team.
    
    Change-Id: I5e95e3ec96d5f53a3bea7cea2764fd421ba0a46e

commit d20af446bac3a33cdbf343cc4c3fe2f2430edacf
Merge: 73feb9b 559aedc
Author: Jenkins <jenkins@review.openstack.org>
Date:   Wed Sep 28 23:04:01 2011 +0000

    Merge "Merge from launchpad quantum/diablo branch:"

commit 73feb9bf0144df15df4320746d280b36b3de1aaa
Author: Brad Hall <brad@nicira.com>
Date:   Fri Sep 23 21:44:05 2011 -0700

    Remove hack for figuring out the vif interface identifier (lp859864)
    
    Change-Id: I5a62d5663df28294f86c3935e18acb1d6163f37e

commit 559aedc3d994ff575590fc92c6361fd7748957e5
Author: Brad Hall <brad@nicira.com>
Date:   Fri Sep 23 20:04:22 2011 -0700

    Merge from launchpad quantum/diablo branch:
    
      merge salv's fix to remove keystone middleware: lp855151
      one more 202->200 from tyler
      merge tylers additional 202 -> 200 changes
      merge additions to OVS readme describing running with multiple hosts
      merge brad's changes to make create API calls return 200, not 202
      merge unit test for showing unset attachment
      merging API docs branch
      Merge: lp:~yinliu2/quantum/bug856564
      Merge: lp:~bgh/quantum/bug850261
    
    Change-Id: I56fe24c59f918737e57b562343c33ec6dcceac60

commit 53420d1964beab57b1e36ac05f3cae5130399af4
Author: Brad Hall <brad@nicira.com>
Date:   Wed Sep 7 00:03:54 2011 -0700

    Update openvswitch plugin README
    
    (address code review feedback)
    
    Change-Id: Id9407001d82eea131c0e88775d9836dd1b769430

commit 56218f5e5452f5e102d378c5732fea50dbbdfe16
Author: Brad Hall <brad@nicira.com>
Date:   Wed Sep 7 00:03:54 2011 -0700

    Update openvswitch plugin README
    
    https://bugs.launchpad.net/quantum/+bug/850261
    
    Change-Id: Ifb3d46f9743cb2159582d9a39cb704206505dced

commit 93909371034b58362d68c92332221927470a1ed9
Author: James E. Blair <james.blair@rackspace.com>
Date:   Fri Sep 16 09:52:31 2011 -0700

    Get output from run_tests.
    
    Remove output redirection from run_tests.
    Remove PEP8 from run_tests; it's called from a separate jenkins job.
    
    Change-Id: I6476a3031fe7a52ac52bec5d2ce75ced9590ab2a

commit 36c71d1f2220b9b60b083630c62872b8dcbeca4d
Author: James E. Blair <james.blair@rackspace.com>
Date:   Fri Sep 16 09:33:48 2011 -0700

    Add rfc.sh to help with gerrit workflow.
    
    Change-Id: I1672ec098ea190a5068df941e48f140409b83e66

commit 6080d44f34dc6dbf70d35eb787d0708048640ac2
Merge: 79df96b 5b0c84f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 9 16:38:20 2011 -0700

    merge tyler's unit tests for cisco plugin changes lp845140

commit 79df96bd1b4876d99ac138a5f8dc7ad645efc175
Merge: 9b6efba 6554f92
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 9 14:33:39 2011 -0700

    merge salv's no-cheetah CLI branch lp 842190

commit 6554f92989f0da06d9e5dec092ce9a6d2e306f8c
Merge: 1028fb8 9b6efba
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Sep 9 21:21:23 2011 +0100

    Merge trunk

commit 1028fb81e40241488eed3bea3bbe234526e1a8db
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Sep 9 21:20:47 2011 +0100

    Addressing Dan's comment on output generator

commit 9b6efba5e9075c169e7e5c375be144ec2df7fc2e
Merge: 9ab9129 bdcbf15
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 9 09:01:30 2011 -0700

    merge sumit's branch for lp837752

commit 9ab9129ba25c77c08b2b51608241201384bd0d13
Merge: b358e9e 5532a28
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Sep 9 08:59:55 2011 -0700

    merge salv's branch for bug834013

commit b358e9ed581840193caf51b6a05207d0eba22cb6
Merge: eb5d8f7 e448ee9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 8 16:44:55 2011 -0700

    merge salv's branch for keystone token on client bug838006

commit eb5d8f7f23121c74da4e5b0ce97aa817fe72062d
Merge: 91430f2 c5e0512
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 8 16:35:55 2011 -0700

    merge rohit's db test branch: lp838318

commit 91430f20a1558f336bde2edd41d968e7cfd412d0
Merge: 7b1e1c0 84fe27e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 8 16:32:18 2011 -0700

    merge salv fix for bug 841982, fix minor pep8 violation

commit 7b1e1c03faa69326f4ba51d9fbd0260d05e4df8f
Merge: b1e2538 fd52a94
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 8 16:28:16 2011 -0700

    merge salv fix for bug834008

commit bdcbf159468ca833df13ca9580c6bc19b5c0f97f
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Sep 7 23:29:55 2011 -0700

    Changes to address Salvatore's review comments, removed unnecessary imports, and changed a debug message.

commit c5e05120e20e1451416f41350e312bb850451813
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Sep 7 23:26:21 2011 -0700

    changing key names to confirm to api specs

commit f7d259a28fa58e82715bc6931a1458cbe3cac585
Merge: d13dd68 b1e2538
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Sep 7 18:24:31 2011 -0700

    Merging latest from lp:quantum

commit b1e25386ab6c7b5807fb957f78d1a8ded598e028
Merge: ce2af48 0d99091
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Sep 7 11:28:25 2011 +0100

    Merging lo:~salvatore-orlando/quantum/quantum-api-auth
    
    Implements blueprint: Quantum API Auth (Keystone Integration)
    https://blueprints.launchpad.net/quantum/+spec/quantum-api-auth

commit 0d990913ffa49d35fb72bb1cb0d6076192cf0cf8
Merge: e4b3bb5 ce2af48
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Sep 7 11:24:55 2011 +0100

    Merge trunk

commit 84fe27e7745729b91c32b9aa42d11e078d74ee57
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Sep 7 11:21:56 2011 +0100

    Implementing Dan's suggestion concerning fixing the bug in db api rather than FakePlugin

commit fd52a945b9103251f8d46813114171a9334d338d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Sep 7 11:19:10 2011 +0100

    Fixing bad indent

commit 111a59b2c55a37e4a81f1d29185243352b10676e
Merge: 448a4d3 c102c90
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Sep 6 08:08:20 2011 -0700

    syncing diverged branches

commit 448a4d357ac96b96f41734a39faefa430db84493
Merge: cf2b9c1 ce2af48
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Sep 6 07:42:49 2011 -0700

    merging from lp:quantum

commit c102c906dd4d81472332f94ec66b3234d426358d
Merge: a1fde3b ce2af48
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Sep 6 03:30:35 2011 -0700

    merging from lp:quantum

commit 6bae7683b8f686018c7a67f6dbedd5af4cd056bb
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Sep 5 18:23:18 2011 +0100

    Updating CLI for not using Cheetah anymore.
    Now using a mechanism based on Python built-in templates.

commit 32a51c648eb2dcb7e59e95b5bde2cfb7c2d885b1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Sep 5 18:18:46 2011 +0100

    Fixing the bug in FakePlugin

commit cf2b9c152677f4e0f4130c3b1a96011a9bc472ab
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Sep 3 03:42:37 2011 -0700

    made general exception handling messages consistent
    removed LOG pylint errors
    cleanup in tests

commit 5532a28c621c22dc8d7bcc9229599a54583bf8b6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Sep 2 12:50:08 2011 +0100

    Create operation now generate response with status code 202

commit e448ee9ee54b7e88a0cb82e6516f71f32b6cb963
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Sep 2 08:14:24 2011 +0100

    restoring correct default pipeline

commit d13dd68d7cc193cc3a59f306ab0e25f904924047
Merge: 8dcf8d2 ce2af48
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Sep 2 00:13:04 2011 -0700

    Mergin from lp:quantum

commit 8dcf8d2229b9b314dce9db9359aa6cf8d198a78c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Sep 2 00:08:26 2011 -0700

    Add information about quantum dependency for nova

commit ce2af48b4837f5a074968b130d0af797032acf07
Merge: a1fde3b 1647142
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Sep 1 22:53:33 2011 -0700

    merge salv's branch to remove dummy plugin

commit 2b9039694bd7391209d4b2a9d69eba58686c9eb9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Sep 1 16:48:17 2011 -0700

    Changing communication between UCSM driver to UCSM to HTTPS.

commit a43487f581cf0703f8da542cf3966f26445ed2b4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Sep 1 16:11:53 2011 -0700

    Adding CLI usage examlpes to the README.

commit fc1b6f0dbf4b29ccaea68e219c8ca27cc3ba03c7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Sep 1 17:49:25 2011 +0100

    Adding client-side support for Keystone integration

commit e4b3bb5179411077047ef3c5f2628f41e1cfb084
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Sep 1 17:26:42 2011 +0100

    Keystone-integrated pipeline should not be default in quantum.conf

commit 16471429bec7ec0be2e70c4bf5e98d6d66768290
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Sep 1 17:17:36 2011 +0100

    Removing class DUmmyDataPlugin

commit f932874ed1f2501406fd7509988448ffc7091a55
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 31 12:56:01 2011 -0700

    Removed redundant configuration, and added more comments in the configuration files.

commit c4afe3c8ca614e835882220572df50e1c80911c7
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 31 10:33:18 2011 -0700

    Updating the README file.

commit 42ddbf938afc0e38b6da06ce46f127cf7ebc3804
Merge: fff680e a1fde3b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 31 11:52:41 2011 +0100

    Merge trunk
    Now re-submitting admin credentials if token expires

commit fa0d2bf680089e423f535f674f8b7ff22ea6dee0
Merge: 4e7b2f3 f43b3c7
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 31 00:34:44 2011 -0700

    Merging Shweta's test cases for mutliport resource

commit f43b3c71c10c9864eca0e808f71ef9dca9bc90c5
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Wed Aug 31 00:33:54 2011 -0700

    Adding Multinic tests

commit 4e7b2f305c6f9de8f9e32dc43913c2e8078fd974
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 21:55:45 2011 -0700

    Typo fix in README

commit 2d95c5f95b5af1cd26ed4daf2acb620458e6aa18
Merge: ce28b04 5f03372
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 21:34:53 2011 -0700

    Merging Sumit's changes including fixes for multinic support, and CLI module for working with extensions.

commit 5f033726663e1d8c6cc5cb03c82c65fe6e31c035
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 21:06:34 2011 -0700

    More fixes for multi-nic support.

commit 428d3a6953b719baec453b2a748ea1e7ecb38851
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 17:35:22 2011 -0700

    Fixed a bug with plug_interface.

commit ba24940ea89b12333915832c3a11a89d5f2e1359
Merge: 613a30b ce28b04
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 16:21:20 2011 -0700

    Merging from Cisco branch

commit 613a30b5a2df33568466800323b476ac3be8caa6
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 16:12:49 2011 -0700

    Changes to incorporate earlier review comments, also for multiport resource

commit 74f6c8135490a4d253b5bebcfa63442b10d3726b
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 30 16:09:47 2011 -0700

    adding quantum database unit test cases

commit ce28b043865808eeb5e3bb8768fc07beb36c2afa
Merge: 65f9260 0aecd28
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 16:03:24 2011 -0700

    Merging changes from Ying's branch (new mutliport resource).

commit 0aecd28498186899e75892b359025af24304c3e8
Author: Ying Liu <yinliu2@cisco.com>
Date:   Tue Aug 30 16:13:59 2011 -0700

    add multiport and exception handling

commit d73c08564cddcfbe371e66ae6860de9ca4e1bdbc
Author: Ying Liu <yinliu2@cisco.com>
Date:   Tue Aug 30 16:09:51 2011 -0700

    add multiport resource

commit 65f9260346718dbe3d25ae62e19c847189d50c35
Merge: 07e5694 a1fde3b
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 14:40:42 2011 -0700

    Merging from lp:quantum

commit 877a4773d8fde06e507365cda3f622c62900f28e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 30 18:06:14 2011 +0100

    Avoiding deserializing body multiple times with several parameters

commit a1fde3b95bfa2f4481f410de1f45bfc9f961bd1f
Merge: b3263d3 a3db135
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 30 09:54:49 2011 -0700

    merge cisco consolidated plugin changes

commit e45508525633ebfdcf8870819276681dd409c233
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 30 17:37:12 2011 +0100

    Test on param_value changes as follows:
    
                # If the parameter wasn't found and it was required, return 400
                if param_value is None and param['required']:
                    msg = ("Failed to parse request. " +
                           "Parameter: " + param_name + " not specified")
                    for line in msg.split('\n'):
                        LOG.error(line)
                    raise exc.HTTPBadRequest(msg)

commit b3263d371b65682a0a49aa58123927eddd70c96d
Merge: 3e7b9c7 45cf620
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 30 17:30:15 2011 +0100

    Merging lp:~salvatore-orlando/quantum/bug834449
    
    Fix for Bug #834449

commit a3db1359565ab08013630a7b0bf8453eb850ab4e
Merge: 613eecb 5ea500a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 09:22:04 2011 -0700

    Merging Ying's changes (minor).

commit 5ea500ad330c73a8c15629d164f92c1fadaaaff0
Author: Ying Liu <yinliu2@cisco.com>
Date:   Tue Aug 30 09:16:23 2011 -0700

    fix print statements in novatenant and portprofile

commit fff680ee63c6c9b4caa8198a255cda2bd0fd19c3
Merge: 6e160e7 a87a43c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 30 17:06:19 2011 +0100

    merge trunk

commit 45cf6205ffd551191e5efde6f9cc56c13419fa3e
Merge: 3d0d738 a87a43c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 30 17:00:11 2011 +0100

    Merge trunk
    Updating names for APIRouter in CLI and CLI tests

commit 2a07db7a879ae0dff0305165e33a4b871faf330b
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 00:19:47 2011 -0700

    Minor refactoring

commit 21ab16d0f02715b6305b6a12ae52631f008ec4ec
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 00:04:39 2011 -0700

    Changes to l2network_plugin for create_ports and pylint fixes to cli.py

commit 25c71cc6f3b550ec4233b3f4baddcdba32d42205
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 29 23:36:46 2011 -0700

    Modified CLI to handle both core and extensions CLI

commit a87a43c8fe4dbb65ec387a29a12acd0e9b7cd7d6
Merge: 8e86ccf a74d433
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 23:32:52 2011 -0700

    merge trunk

commit 8e86ccf37dc8c54dd5a3f7df1b21db417f9dd7aa
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 18:59:14 2011 -0700

    lp835216 client lib was not passing in kwargs when creating exceptions

commit a74d433e15a6b8423da714fd97e8d04f676a6b33
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 29 18:16:39 2011 -0700

    lp834694 fix integrity error when deleting network with unattached ports.  Add unit test.

commit 5122811ae49711f1735c2bc0736d2b580b9f7e53
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 29 02:14:05 2011 -0700

    Minor fix in delete_port

commit 1b9b8138de5f1514ef8c6ebc27154f45e9e3e749
Merge: 4d3c116 613eecb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 29 02:10:43 2011 -0700

    merging changes from cisco consolidated branch

commit 4d3c1165bd5007dc7e4955de50080b2ad8864912
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 29 02:06:48 2011 -0700

    Fixes to support multinic.

commit 613eecb104387a7c57bfee7a4acfab252d7a7fab
Merge: 54f87f6 823a777
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 28 12:41:30 2011 -0700

    Merging fixes from Sumit's branch for extension API version number and to UCS inventory to associated VIF-ID with ports.

commit 823a777f111f5926b7b6613972331437cdc161d5
Merge: 7886ee4 f64f8d7
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 28 12:20:35 2011 -0700

    Merging from the Cisco branch.

commit f64f8d74a1f74323791bb65a5ed8103032ac5a74
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sun Aug 28 12:27:27 2011 -0700

    adding new api methods using just port_id

commit 7886ee494df1757d8c6ccbc5af106d68830ecc01
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 27 22:55:08 2011 -0700

    Fixing the extensions URL to 1.0 and pep8 error.

commit e87990643e34b2ebb8c614f248cb4c010d9abceb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 27 22:00:23 2011 -0700

    bug fixes to handle multinic

commit 54f87f6c16cddb6e683ce04209fda6b1cb5f6621
Merge: 07e5694 274d14a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 27 17:13:44 2011 -0700

    Merging Shweta's fix for extensions' test cases (clean up was not happening completely).

commit 274d14a3305fffcaad85c310179c7d6082c732d5
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Sat Aug 27 16:55:54 2011 -0700

    Adding Network and Port clean up functions for portprofile unit tests

commit 07e569460ef2997f92a055484dcac2156f501fd3
Merge: af81170 fa4e2c4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 19:18:41 2011 -0700

    Merging from lp:quantum

commit af81170b0040b3f3b493ab0f5216067c2fbb1d83
Merge: 3c232b4 b0e199d
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 14:02:49 2011 -0700

    Merging Shweta's fixes in the tests for key names changes in the Core API

commit fa4e2c4c7d2ad62f9827345046cb9628a13f1458
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 13:22:18 2011 -0700

    make CLI show_port command display interface-id, add additional test case

commit 61ad18c3f22a101a6fd0ed489f7775ea1461185b
Merge: f06a9a9 673edc3
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 12:54:33 2011 -0700

    merge salvatore's new cli code

commit b0e199d0a92ce8a79b450b83b63f44c33d8f5d51
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 26 12:49:42 2011 -0700

    Dictionary key values changes in test_extension

commit 3c232b44ae21664b6a6d2a2142e0bfd6d821e855
Merge: 30274f3 f06a9a9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 12:31:57 2011 -0700

    Merging lp:quantum, resolving conflict.

commit f06a9a9d0985c9bfe99b95fbd39eacb1d199401d
Merge: 976007b 329940f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 12:25:31 2011 -0700

    merge two pep8 branch

commit 30274f3bf3004e2be605290260c1dcce0c4ec1b2
Merge: bbf6391 91b4918
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 12:16:19 2011 -0700

    Merging Ying's pep8 fixes.

commit 91b4918241616aaa14882f6ae345f2843904cc7a
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 26 12:24:29 2011 -0700

    fix pep8 issues

commit bbf639131ce8a30a591fed3ab447078d26e79c96
Merge: 9ebab74 f1b68c5
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 11:45:02 2011 -0700

    Merging quantum trunk.

commit 329940fe4a927a8c7b16b388a1cfea849fb2a246
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 26 11:21:46 2011 -0700

    fix pep8 warnings

commit 3d0d7384c5bb9b5615eedd057cac0f0d67192286
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 26 11:20:55 2011 +0100

    Updating common/extensions.py in order not to instantiate a QuantumManager when retrieving plugin
    
    Also renaming API router: APIRouterV01 --> APIRouterV1

commit 976007b95188af757e5fbf7b75e6d7dc9b5fe7af
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 26 10:56:43 2011 +0100

    Cleaning pep8

commit f1b68c543408c7ce67dc8275be4841344ca77a12
Merge: a6ed106 12bb903
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 26 10:21:05 2011 +0100

    Merging lp:~danwent/quantum/lp834491
    Fixing Bug #834491: api alignment merge broke ovs plugin 	(Critical)

commit 673edc3141d5f41e687b0c242a18283bf6b23cb2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 26 09:41:19 2011 +0100

    Addressing comments from Dan
    
    Also solved issue with output from plug_iface and unplug_iface

commit 9ebab74220ee063aa4271e8a648776213dc04db6
Merge: b205a16 a6ed106
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 26 01:35:21 2011 -0700

    Merging from quantum.

commit a6ed106dbb351c677f180fb093339681e46bde0c
Merge: d5086c8 6b47771
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 01:15:01 2011 -0700

    merge cisco extensions branch

commit 12bb903815e11d23562cac925ce95f18230e9053
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 26 01:02:41 2011 -0700

    lp834491: change plugin to work with API code after the API alignment merge

commit b205a16f55a79e2f8fa8d6a2947c39efd227cd9f
Merge: a5b924c 0cc6ccc
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 23:58:02 2011 -0700

    Merging Shweta's fixes to the test cases for the extensions.

commit 0cc6ccc1c8b0b43ecdc62e58e60d047ab5382759
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Thu Aug 25 23:36:20 2011 -0700

    Added Extension & ucs driver test changes and fixes

commit a5b924cc8506096a41bd5484cfcb12d85c823e2a
Merge: 0ab88c2 a17cd23
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 20:37:33 2011 -0700

    Merging from Sumit's branch, changes to VIF-driver and Scheduler; extension action names have been changed in response to Salvatore's review comments in the extensions branch review.

commit a17cd233dabf71ad3133db26854f231cd3fed11a
Merge: bfc0710 0ab88c2
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 20:31:21 2011 -0700

    Merge from Cisco branch and changes to scheduler/vif-driver.

commit 0ab88c27a57cd283070c9c919b31e9295e210c80
Merge: bfe346e 6b47771
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 19:54:08 2011 -0700

    Syncing with Cisco extensions branch.

commit bfe346eaa7b9574416d50c25e933842f23caaf8d
Merge: 3f700dd bfc0710
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 18:43:09 2011 -0700

    Merging changes from Sumit's branch.

commit bfc07107e3f80a16dfe0b86f4f07e9b5a31f9109
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 17:42:16 2011 -0700

    Changes qos description to string; changes extension API names for get_host and get_instance_port

commit 3f700ddb9e8fbea61c38015474eeb3f62e822a10
Merge: b454982 4a79f89
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 17:21:25 2011 -0700

    Mergin Ying's branch.

commit 4a79f89f7bc3316fcb728c3d9421198ed5fc3bd2
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 25 17:01:50 2011 -0700

    change get_host and get_instance_port function name

commit b454982d0e0bc9e07343f07db1f787de2469045c
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Thu Aug 25 16:29:30 2011 -0700

    Cleaning (removing) unused code..hooray ! fixes for extension tests

commit 6e160e74b5d8b4f6fb864ce70cadb19037931a87
Merge: 78bdaa5 d5086c8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 23:49:10 2011 +0100

    Merge trunk
    Sorted "ghost" conflict in etc/quantum.conf

commit 7d7ac483cf323c00c522fa465fd1df0f05fb3317
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 25 12:50:02 2011 -0700

    Sorting correctly all imports for the Nexus Driver and Unit Test

commit 51ddffa2641d0cf0725f7a5147ad0b90551e36a0
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 25 12:34:03 2011 -0700

    Fixed the Unit Test for Nexus Driver

commit 6b477714ba576b8a858b9ad222b14e7fe77e58ca
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 25 12:34:01 2011 -0700

    add cisco_faults under l2network package.

commit ea6c9343a9d91b8235b1e0b9108ec07c46c8d05b
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 25 12:30:20 2011 -0700

    move faults/exceptions to l2network package,
    remove unecessary faults definitions
    change the portprofile action api's method
    fix imports order and other comments issues

commit 6b7045d065f7cb81a6b3c3cae38764e621c67317
Merge: 8e3a228 99a136b
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 11:52:06 2011 -0700

    Merging from Sumit's branch, import ordering related changes.

commit 99a136b03a5db18ed36cb7cbb937ae65740c9725
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 11:39:44 2011 -0700

    Changing the order of imports (to satisfy convention).

commit fd27733783a0f6f9f0db4f84084f206b7d05122a
Merge: 7d11fe0 8e3a228
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 25 11:20:16 2011 -0700

    Merging the Cisco branch.

commit 78bdaa58d2b5c5e8bc683b6518529f0b04381b6f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 19:19:12 2011 +0100

    Updating README according to Somik's comment

commit f4405229e63bdffdf73057a9bad6b3cb085bb6ab
Merge: 38b5406 d5086c8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 18:50:05 2011 +0100

    Finishing cli work
    Fixing bug with XML deserialization

commit 38b54064816233a51ee827c8eaf7d536788bf860
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 12:49:38 2011 +0100

    Completing Unit Tests

commit d5086c8b7985087847e762127a3b835ad4ca0c33
Merge: 5effeb7 c67ae6e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 10:43:36 2011 +0100

    Merging lp:~salvatore-orlando/quantum/quantum-api-alignment
    
    Bug #813433: Align API implementation with specifcation (Critical)
    Bug #821628: Getting network details is failing 	(Undecided)
    Bug #823841: Remove constraint on network names 	(Medium)
    Blueprint: Quantum API v1.0 Implementation (Essential)

commit 727cc292bf5385153b6298445437587146961321
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 25 01:02:01 2011 -0700

    Configuration of multiple VLANs on the same Nexus Switch Interfaces

commit 5ccc126263e1104e8852dd2850b0b42c0804aa4f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 01:52:32 2011 +0100

    Adding unit test for rename_network

commit 22fb01352647aed9b7efe90c8e255a5bdf92d023
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 25 01:21:19 2011 +0100

    Added logging to syslog or file specified at command line
    removed plugin direct mode
    fixed unit tests to reflect changes in cli code
    fixex pep8 errors
    
    todo: complete unit tests
          auto-detect function names from stack trace

commit 72b27f3faf5a2d463897aece4b82321a3371500a
Merge: 35aa8b4 6544087
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 17:02:24 2011 -0700

    Merging from Sumit's branch.

commit 65440872ba3fb875fbb58ee8f5c7bf1dbd366f7a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 16:53:08 2011 -0700

    Fixed some bugs with credential and qos resources; also fixed l2network_single_blade

commit 35aa8b4713dd4cbed0ddebeb263c0d9d8653f8f3
Merge: d9a5ea8 8b50cb0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 16:18:44 2011 -0700

    Merging Rohit's changes.

commit 8b50cb07f6d67518a0495776ee50e645e271c88f
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 16:05:03 2011 -0700

    helper function to get creds based on name

commit 25560fd74e8466d51b4602203f10a03b53562792
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 15:23:56 2011 -0700

    integration with l2network_plugin.py

commit 8e3a228fa3208281b2d02e84a0d90cc9e84ffaab
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 14:11:10 2011 -0700

    fixing relative import in nexus_db.py

commit b5fd8f8075302b3aa56a47d98b56e922022fd803
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 13:36:38 2011 -0700

    putting in db support for creds and qos

commit d85e6e59ddc9fc7ad45eed2b950ba607e0777b24
Merge: bb6e853 b6e55b4
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 24 13:36:32 2011 -0700

    merge latest quantum branch and resolve conflicts

commit 5effeb7d2402ed432a6a6cd285607b301e52a4e3
Merge: b6e55b4 b9bd897
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 21:03:10 2011 +0100

    Merging lp:~asomya/quantum/lp833163
    Fix for Bug #833163: Pep8 violations in recent packaging changes that were merged into trunk (Critical)
    
    
    Thanks Arvind!

commit 95a76422984a7fe57b0b25ae82a584736d8c8ad4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 20:57:08 2011 +0100

    Addressing Somik's comment.

commit bbbdf82de385d360b0a0f7f969a3a586d0f85ff0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 19:10:03 2011 +0100

    Templated output for CLI completed!

commit b9bd8976b2337677255f12e7fd2291094ce3bc49
Author: Arvind Somy <asomya@cisco.com>
Date:   Wed Aug 24 13:10:29 2011 -0400

    PEP8 fixes for setup.py

commit bb6e8534f90f70087fef9a60c23bd147deb2f553
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 24 09:55:47 2011 -0700

    delete quantum/common/test_lib.py to prepare for quantum merge

commit 59e808f1f8c06ddb47f939b9dd123c222c2e7f78
Merge: 36c4a04 4e1d511
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 24 09:43:25 2011 -0700

    Made changes according to reviewer's comments.
    Add addtional information on extension test in README.

commit d9a5ea8cfcdf821e82d0f80c35c3bfc0171c8c38
Merge: 30381cc efe6f0e
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 09:10:30 2011 -0700

    Merging changes from Sumit's branch.

commit f84945bf8d206a2c4eb3e0393ff8f26162699747
Merge: 667dab4 b6e55b4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 12:57:03 2011 +0100

    Merge trunk

commit c67ae6e12feb39311a3a67b257a25bc44465776d
Merge: f1e464d b6e55b4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 12:54:53 2011 +0100

    Merge trunk

commit b6e55b41e92d0ce522d2b3856e44d247e8f50847
Merge: e6e504a 0bb571f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 12:45:58 2011 +0100

    Merging lp:~cisco-openstack/quantum/802dot1qbh-vifdriver-scheduler
    
    VIF driver to support 802.1qbh
    Quantum-aware scheduler
    
    This modules are meant to be run by Nova to communicated with Quantum.

commit e6e504ac306b6461de061b1d1a9dd1d312a3166b
Merge: b4ce107 4ce8fac
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 12:29:49 2011 +0100

    Merging lp:~cisco-openstack/quantum/l2network-plugin-persistence
    
    Improvements on cisco plugin:
    - Persistence support
    - Improved pylint score (now 8.29)

commit efe6f0e0304dbdf9b6a45a648a48a29c147edb0f
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 04:16:15 2011 -0700

    Fixed a bug in the initialization of the UCS inventory; fixed another bug in deleting a port.

commit 0bb571f24bd23ed9f4b38888ed05fd87c50301a8
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 03:27:54 2011 -0700

    Noticed some pep8 errors, fixed them.

commit 0e88293280969683667c4d2e5c6b2c657a9e0659
Merge: ec9c06c b4ce107
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 03:19:06 2011 -0700

    Merging lp:quantum

commit ec9c06cf84fb9566035fc6f4cac5f2847de1c6d4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 03:15:54 2011 -0700

    Changes to incorporate reviwer's comments. Also changed client.py to handle extension URLs.

commit 4e1d511d7661e1156fcb608145f0530979789d31
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Wed Aug 24 00:02:10 2011 -0700

    Review Changes

commit 36c4a0462ced7a69cb1a287038e778a723bf69e9
Author: Ying Liu <yinliu2@cisco.com>
Date:   Tue Aug 23 15:15:16 2011 -0700

    remove unnecessary code and sync faults and exception handling

commit 4ce8facd2ce9284187ded0098739952b6ca653e8
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Tue Aug 23 13:05:22 2011 -0700

    Code changed base on Reviews
    pep8 passed
    pylint 9.10

commit 8fe560cdaad3f84f81d806e664e9c059976f3106
Merge: 53f70ed b4ce107
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 23 12:36:06 2011 -0700

    merging with lp:quantum

commit 53f70ede18ae6d3002c015ed3b35b9d4df7a0f1e
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 23 12:34:18 2011 -0700

    merging from lp:quantum

commit 930d13ce4e1cc2a418d02e904b51582a34fb5ef6
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 23 11:36:50 2011 -0700

    Fixes based on review comments

commit 667dab4e83164902e3f78cd3b650dbfb882391b7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 23 17:47:45 2011 +0100

    Addressing comments from Ziad and Somik

commit 3e7b9c739bb3c17921390680be613c92fc54f91e
Merge: a87a43c db93115
Author: Brad Hall <brad@nicira.com>
Date:   Tue Aug 23 08:29:45 2011 -0700

    merge lp:~bgh/quantum/lp837174

commit db93115c29e437d937d341eab6f57422a3d10b94
Author: Brad Hall <brad@nicira.com>
Date:   Tue Aug 23 04:50:55 2011 -0700

    Fix unit test printing (lp837174)

commit f1e464d9e6c2e61516c7ef3cf6363dd04a7aa6aa
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 23 00:57:33 2011 +0100

    Fixing issue in view builders concerning attachment identifiers

commit 4ee1ac41453dbc800740da1a59320f79a01c4946
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 22 16:17:33 2011 -0700

    Code clean up as per reviewr's request; documentation strings, unused code, etc.

commit c72cb36ef93246051b2e1ac498161c3301b600df
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 22 16:04:55 2011 -0700

    Rewording of the README file to clarify the use of the SSh port

commit 3ed7419816e0fca047a6cf995e9374c2b8f2e5d7
Author: Ying Liu <yinliu2@cisco.com>
Date:   Mon Aug 22 13:13:29 2011 -0700

    clean up code and fix some comments

commit 71d40685d1b7230489b417c5552876e8a60bcad7
Author: Ying Liu <yinliu2@cisco.com>
Date:   Mon Aug 22 13:02:00 2011 -0700

    clean code and fix some comments.

commit 30381ccbfafbc074fa333ae4db9007413183a6a6
Merge: b2ad2b2 54fe0bc
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 22 12:31:18 2011 -0700

    Merging from Sumit's latest branch - Fixed loading of Nexus DB tables; moved imports to l2nework_db.py; Refactoring of code to generalize inventory handling (enhancement).

commit 54fe0bceed186dd68e1fd6fb57ac90a4e50557fb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 22 12:15:35 2011 -0700

    Fixed loading of Nexus DB tables; moved imports to l2nework_db.py, changes discussed & approved by Rohit.

commit d3ff660f78096990bfce0c73bf524d3e38423b24
Merge: d4df7d1 b4ce107
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 17:38:35 2011 +0100

    Making Keystone version configurable

commit d4df7d1c30a59af1336e10fa3f7851baf1eb338a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 16:57:43 2011 +0100

    Accidentally took quantum.conf out of branch.
    Now back in.

commit 4fc835dca3746a45f3a4eb8a03cbede3021f71dc
Merge: dc0a6b9 b4ce107
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 15:30:54 2011 +0100

    Merge trunk
    Solving conflict in common/exceptions.py
    Removing unused error code from client.py

commit b4ce107e8cb241a7e05c79793a7b8ebf675461f5
Merge: a8860ff 7c73d56
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 15:16:24 2011 +0100

    Merging lp:~raxnetworking/quantum/bug827272
    
    Fix for bug #827272 - collection actions for PUT and DELETE methods on resource extension routes ...

commit a8860ff71fc0016dd0157c6b253928fc4ecc4cce
Merge: c40a069 ac5a8c8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 15:14:09 2011 +0100

    Merging branch: lp:~danwent/quantum/test-refactor
    
    Makes it easier for plugins to haave their own unit tests with minimal code duplication

commit dc0a6b900642898287d65a0d64da8f79f8774d44
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 22 12:39:47 2011 +0100

    Removing "excess" file

commit 88dad10e4d7c60e922fc9da7348713a94dabe3cf
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 22 04:16:03 2011 -0700

    Missed adding a file earlier, fixed a small issue.

commit 294fe222ad43ee44bfe65b70dfac1ce8c639b4a6
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 22 03:34:48 2011 -0700

    Refactoring of code to generalize inventory handling (enhancement).

commit b2ad2b2b5b46e9ffa9be457bf8b3368576d3f24d
Merge: c4fcce4 363e87b
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 21 12:45:52 2011 -0700

    Merging UCS inventory state initialization fix from Sumit's branch.

commit 363e87b0279897de52d1775c417bcbb01f339ccf
Merge: 0cd6943 c4fcce4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 21 12:27:43 2011 -0700

    Fixes an issue with loading the UCS inventory when a dynamic nic has been used outside of Quantum.

commit c4fcce4d73e53e1ec165d103ada11b2b6ba3a49f
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 22:39:16 2011 -0700

    Removed obsolete instructions from README.

commit 0cd69434071944b7b3b46d2d74481333c966e8e3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 22:31:50 2011 -0700

    Changes to reflect the new features (mutli-blade, multi-chassis support).

commit 3cf38401c4dec63f6bfe4188ac54627e9cb1a165
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 22:10:33 2011 -0700

    Changes to support calls from VIF Driver and Scheduler.

commit 5186e6de11e5b17577eb76d5d9ff53bc1dc7bc0d
Merge: 825f6c5 2df72d9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 21:07:30 2011 -0700

    Pep8, pylint fixes.

commit 2df72d910faed4bb92580c0a24cbd762c086e8a0
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 20 20:58:13 2011 -0700

    fixing pep8 error

commit beba040e88a6e15d6dba9c6bd38b46689ca5940d
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 20 20:51:07 2011 -0700

    adding helper function for port binding model

commit 825f6c5c5ede31d97d9892e188312ffe3e531720
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 20:37:51 2011 -0700

    UCS inventore persistence and pep8/pylint fixes.

commit 6b78dfc0b865aa76d361fc219fd601948aee6660
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 18:20:43 2011 -0700

    UCS persistence fixes.

commit a570af2974bb4908266ce73eef60dc780519f6fd
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 20 17:02:47 2011 -0700

    added new columns to models for ucs plugin multi blade support
    updated methods in ucs_db for newly added columns
    changed column dynamic_vnic_id in port binding table to blade_intf_dn
    updated tests to handle new column name

commit 59754aa36aad63ba3eeece6580dcd34ee3c88720
Merge: c40afe4 a570af2
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 16:46:12 2011 -0700

    Merging rohit's UCS persistence support.

commit c40afe46835f30e738112cd398ef0bc9379de25c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 16:30:13 2011 -0700

    UCS plugin persistence.

commit 4ba67cea7163ed1bbb51030da8f0ebaa5ccb3ea2
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 13:45:17 2011 -0700

    Persistence support for UCS plugin network.

commit 764eca55d1b206c3c3af3fb69734965dbe23d0bd
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 12:44:23 2011 -0700

    adding utility functions to create dictionaries

commit e34cb7a580f481ea4fc1a0abcc0aa53c83728604
Merge: 7f0be06 58c64f3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 12:14:54 2011 -0700

    Merging changes from Rohit's branch.

commit 7f0be06df2c3f0ac4904c3ea8fd3263a322dc47c
Merge: cb1844e 69dfdc9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 11:53:43 2011 -0700

    Merging changes from cisco extensions.

commit 58c64f3f1af78c991174f087a4722068bee38a31
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 20 10:05:40 2011 -0700

    added ucs plugin related execptions in cisco_exceptions.py
    added ucs plugin persistence related modules - ucs_models.py and ucs_db.py
    added ucs db related unit tests in test_database.py
    fixed formatting in l2network_models.py and test_database.py

commit cb1844ed8e91681ae019d7be64c43be404083a53
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 08:57:38 2011 -0700

    Adding some error checks.

commit ba2cfc5080ca976ac1134ed03382c5080434934a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 03:19:52 2011 -0700

    Reduced excessive logging.

commit 9092441db4a33d5ccde7f32658b3251212eb9ccf
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 02:51:59 2011 -0700

    Several fixes to initial version.

commit 69dfdc95755208663ccfb170b3c50102e31e287e
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Aug 19 23:54:02 2011 -0700

    fixing the the test_database.py tests

commit ca285f9a00a05aea287eb111fc7dd11ba75d9b17
Merge: 5436819 ccaefbd
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 22:21:21 2011 -0700

    Merge Shweta's new propose. Chnage profile-id ot profile_id

commit cd405409b4c765782f4e22f8085dc239fcf3ce47
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 22:02:16 2011 -0700

    pylint and pep8 fixes.

commit ccaefbd69f3c2c4e68fa5587e7aa6f27aac7fe81
Merge: 3f1b36e 5436819
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 21:58:27 2011 -0700

    Merge with Cisco branch

commit 3f1b36e1e48754b30c3f8a8c927008cee1ced648
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 21:55:50 2011 -0700

    Change profile-id

commit 54368197605597cd1c10455ce5a788ec8c7d7b3b
Merge: 28daf38 c0c2e26
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 21:46:15 2011 -0700

    merged Shweta's branch for ext test. Minor fix for review comments.

commit c0c2e2657c3187b3ad1f03458c9b33a841dbca5b
Merge: a22d933 28daf38
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 21:26:56 2011 -0700

    Merge with the Cisco Branch

commit a22d933645a13a9d16c93d3e0305b53511053901
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 21:05:25 2011 -0700

    Review Changes

commit 28daf38fa7ebcb11885d0705458d88847be7c6a4
Merge: 2f1aba8 058958c
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 20:33:15 2011 -0700

    merged Shweta's ext test branch

commit d047001964401cec3e64396bfd73f73901cdc7c5
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 20:07:28 2011 -0700

    Initial commit with lots of changes.

commit 058958c76cbac3248be1208caccbd759391e93bc
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 20:02:49 2011 -0700

    Moved the conf file uncer the cisco directory

commit 3768e6c6eee73f2210982e21214a5862acb3ff91
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 20:01:52 2011 -0700

    Moved the conf file uncer the cisco directory

commit 359b89542c6f224d266621a65a56722d44b82b78
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 19:47:37 2011 -0700

    Updated conf file

commit dca478bd025ea3af28b3eae9362a0baf868b4576
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 19:42:04 2011 -0700

    Adding Entension API unt tests

commit 9c805ac851e7fdcd1dfde0014634c780cf9aee2b
Merge: efcbdde c40a069
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 18:48:20 2011 -0700

    Syncing with lp:quantum

commit efcbdde237cec0ca9689c9353cbc87596973f911
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 18:46:34 2011 -0700

    Code refactored, made changes are per reviwer's suggestions.

commit 2f1aba8dcf590d960040f625ad682593f7e15c76
Merge: 9a6dfc1 bb77141
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 16:53:38 2011 -0700

    sync up with l2network exception handling for extension

commit bb771416f9ced2f45e58bd219fef52d831a807fb
Merge: e65cdf0 9a6dfc1
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 16:28:42 2011 -0700

    merged Cisco branch's latest changes

commit 9a6dfc14e74e9a5e63662e283a7274277452fb85
Merge: ea89f12 5f1b026
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Fri Aug 19 13:48:12 2011 -0700

    Adding changes from Sumit's latest merge

commit e65cdf0820c58ada8ef829fc0f916e00f681d1b8
Merge: 7b215b4 5f1b026
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 13:42:36 2011 -0700

    merge with  lp:~cisco-openstack/quantum/l2network-plugin-extensions

commit 7b215b44d8c19c1ca5172c78b8ea7963bcad1b75
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 13:37:33 2011 -0700

    replace exception handler by using cisco_exceptions

commit 5f1b026e22731f94ff742d94b1a1fb86cabd0099
Merge: 84d0f0a 7d11fe0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 13:05:56 2011 -0700

    Raising exceptions in extension resources handling (where missing). Changing exception name to QosNotFound.

commit 7d11fe01f1ae815dae7ac8b17c1dae16684bb207
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 11:02:53 2011 -0700

    Changing exception name to QosNotFound.

commit afa68b0345737df47416d383fb54e2b11a4c7905
Merge: 47da978 84d0f0a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 10:58:32 2011 -0700

    Mergin from Cisco branch.

commit 47da978a3ddf42591339fe5f2250b119459796e1
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 19 10:55:46 2011 -0700

    Raising exceptions in extension resources handling (where missing).

commit c40a06934fa705499a3e131c964975f43acc961e
Merge: 0e1cdf4 19219e7
Author: Somik Behera <somik@nicira.com>
Date:   Fri Aug 19 10:55:36 2011 -0700

    Merging fixes to client side exception handling. Thanks lp:tylesmit !

commit 0e1cdf4ca2847f8cba27a422bd56ef965f05435d
Merge: 518d3a6 26b4bf0
Author: Somik Behera <somik@nicira.com>
Date:   Fri Aug 19 10:53:00 2011 -0700

    Merging fixes and changes batch-config script. Thanks lp:danwent !

commit ea89f123382617f0c86843b63ae1ed6c162a48d0
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Fri Aug 19 10:13:53 2011 -0700

    Adding the Nexus support to the Persistence Framwork
    Modification of the Nexus Unit Case to be running with Persistence Framework
    pep8 passed
    pylint 8.81/10

commit 84d0f0a4f7b280cdab2cb84773aaa10416a738c1
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Aug 19 09:06:43 2011 -0700

    added nexus exception in cisco_exceptions.py
    added log to methods in l2network_db.py
    added nexus_db.py and nexus_models.py - persistence modules for nexus plugin

commit 4a8599cc90373a3a4f5ebc04869f3e1a02bc23fd
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 08:14:17 2011 -0700

    add plugins.ini back

commit 1caa7874b02899d80f0b0ddffef0bbca12ed231c
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 08:00:37 2011 -0700

    add all conf/*.ini back

commit 49d5a14c7f5d0e8fedbf73bf8be529c2edab7328
Merge: ef53c0b 4de94fa
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 00:47:07 2011 -0700

    merge with ying's branch

commit ef53c0b77722041c00ee7ba28e545ea6bb245c42
Merge: 629b9ba ed84b41
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 00:44:07 2011 -0700

    merging with Ying's extension branch

commit 4de94fa15460636993f542551047d3d85e6e8c57
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 00:41:25 2011 -0700

    remove ying's test ciscoplugin

commit ed84b41a3458a81f8db7c00704e0b773768de50a
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 00:14:44 2011 -0700

    remove all configuration files

commit 770bce2913103ec3e35da6d5415b3b38c935ff05
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 18:57:51 2011 -0700

    remove cisco_demo and test_scripts directory, which were used by our local tests

commit 9939bc6748752852244b6e7165ccc161d3585c18
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 18 16:53:57 2011 -0700

    Removed concatenation per review comments.

commit 5834bcc8e20654feb4e22cab53c83502a315f071
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 16:33:08 2011 -0700

    change the configuration files to the default values

commit a7ef6583c0d275d2d24d8467922ad09c39569ce3
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 15:57:36 2011 -0700

    pylint and pep8 fix

commit 0f6139e21227ab193bb06e07aa471ff5aa71bdb5
Merge: effced8 629b9ba
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 15:45:58 2011 -0700

    merging with ~cisco-openstack/quantum/l2network-plugin-extensions

commit effced8b6b1c721c16c236503d96d1098b7926c8
Merge: 4f7cdf4 8fed131
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 15:36:09 2011 -0700

    fix pylint issuses

commit e91e9ea81cc5cbd6a1df0ea9dc70cedbdd484499
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 18 23:08:15 2011 +0100

    Making keystone integration optional in quantum configuration

commit 65097131abe0d7e056725dfee6ec666489bb7557
Merge: 6f805f2 518d3a6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 18 23:04:02 2011 +0100

    Merge trunk
    pep8 fixes

commit 518d3a6386c81549f5db1bce757fc2486e87341b
Merge: f3627a2 570c35e
Author: Somik Behera <somik@nicira.com>
Date:   Thu Aug 18 14:39:37 2011 -0700

    Merging bug fix for Bug 821733. Thanks lp:salvatore-orlando !

commit 19219e73db8a2a4df31bf92b5c3644a4f0b78f30
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Aug 18 12:58:27 2011 -0700

    Fixing typo

commit 4c2fc02c985927822e0fcef636b8139fed1962c3
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Aug 18 12:49:20 2011 -0700

    Making the client raise the appropriate exception if needed.  Also increasing the pylint score to above 8.

commit f5b1a6547dedf89fd4320f4c68eaa2df3604b890
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Thu Aug 18 11:09:37 2011 -0700

    pep8 error fixed for l2network_db.py

commit 629b9bae2839cc13cb6de99bd90aeaf33decc133
Merge: fe0fed5 8fed131
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 18 00:11:13 2011 -0700

    Mering Sumit's branch with plugin support for Credentials, QoS, NovaTenant resources. Also merging latest from lp:~cisco-openstack/quantum/l2network-plugin-persistence

commit 3e4845164039b730598b9ed44d3f4e719d0084ae
Merge: f3627a2 8ce8639
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 23:50:42 2011 -0700

    Merging from Sumit's branch, VIF-driver and Quantum-aware scheduler.

commit 8ce8639f50ab48fffae8c99212570a30d5d18478
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 19:52:52 2011 -0700

    Removed extra spaces to satisfy pep8.

commit ad0199a73c280279d7aac7f390f597b0c365975f
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 19:47:10 2011 -0700

    VIF driver for 802.1qbh and Quantum aware scheduler.

commit 4f7cdf415c147480f5fac3870f398001dd02b2af
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 17 17:15:21 2011 -0700

    fix some pylint issues

commit 8fed131856ef756c1aab737261b30bf7a3da1b55
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 16:21:27 2011 -0700

    Pylint and pep8 fixes.

commit d6db34f7a1ee0cfdb64a9f8aa1cb094222228ba0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 16:08:22 2011 -0700

    Changes to support credentials, qos, and novatenant extensions.

commit 8ec3041cb6e29e13dcc3f1166e59f60dd71e8aac
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 17 23:06:15 2011 +0100

    Removing unused error response codes

commit f3627a2fd74edd7bd485c00636352f26975edabc
Merge: 8e63fd5 2a89b09
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 17 23:04:00 2011 +0100

    Merging lp:~asomya/quantum/lp824145
    Fix for Bug#824145 : Adding a setup script for quantum

commit 76a7a708d82aa721facd1acfd4e5c964f189f8ca
Merge: dee0405 8e63fd5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 17 22:48:56 2011 +0100

    merge trunk
    pep8 fixes
    adapting CLI to API v1.0
    Fixing wsgi to avoid failure with extensions

commit fe0fed5fb26f6009c005fd7b32af95cb07ee38d9
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 17 12:37:22 2011 -0700

    Fixed indentation and changed file comments

commit 74837113e60007fcca498c2479039ac592557e65
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 17 12:26:32 2011 -0700

    add extension change to ying's branch

commit ac5a8c8a9c133e83af9bc99b60ba4f2e403c41ec
Merge: baa146c 8e63fd5
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 16 19:11:48 2011 -0700

    merge trunk

commit 0b71272e1fde40bd7149f57e45899f53bcdd4522
Merge: af483aa 8e63fd5
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 16 16:03:32 2011 -0700

    Pulling in changes from lp:quantum.

commit 8e63fd5762dfbbc8a7a1f6fda333eb1396d393aa
Merge: 574aa60 9c6bfad
Author: Somik Behera <somik@nicira.com>
Date:   Tue Aug 16 11:12:37 2011 -0700

    Merging Cisco's contribution to Quantum. Thanks to various folks at Cisco Systems, Quantum will have plugins
    to integrate with Cisco UCS blade servers using 802.1Qbh, Cisco Nexus family of switches and the ability for
    Quantum plugin to have multiple switches/devices within a single Quantum plugin.
    
    
    
    added:
      quantum/plugins/cisco/
      quantum/plugins/cisco/README
      quantum/plugins/cisco/__init__.py
      quantum/plugins/cisco/common/
      quantum/plugins/cisco/common/__init__.py
      quantum/plugins/cisco/common/cisco_configparser.py
      quantum/plugins/cisco/common/cisco_constants.py
      quantum/plugins/cisco/common/cisco_credentials.py
      quantum/plugins/cisco/common/cisco_exceptions.py
      quantum/plugins/cisco/common/cisco_nova_configuration.py
      quantum/plugins/cisco/common/cisco_utils.py
      quantum/plugins/cisco/conf/
      quantum/plugins/cisco/conf/credentials.ini
      quantum/plugins/cisco/conf/l2network_plugin.ini
      quantum/plugins/cisco/conf/nexus.ini
      quantum/plugins/cisco/conf/nova.ini
      quantum/plugins/cisco/conf/plugins.ini
      quantum/plugins/cisco/conf/ucs.ini
      quantum/plugins/cisco/db/
      quantum/plugins/cisco/db/__init__.py
      quantum/plugins/cisco/l2device_plugin_base.py
      quantum/plugins/cisco/l2network_model.py
      quantug/plugins/cisco/l2network_model_base.py
      quantum/plugins/cisco/l2network_plugin.py
      quantum/plugins/cisco/l2network_plugin_configuration.py
      quantum/plugins/cisco/nexus/
      quantum/plugins/cisco/nexus/__init__.py
      quantum/plugins/cisco/nexus/cisco_nexus_configuration.py
      quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py
      quantum/plugins/cisco/nexus/cisco_nexus_plugin.py
      quantum/plugins/cisco/run_tests.py
      quantum/plugins/cisco/tests/
      quantum/plugins/cisco/tests/__init__.py
      quantum/plugins/cisco/tests/unit/
      quantum/plugins/cisco/tests/unit/__init__.py
      quantum/plugins/cisco/tests/unit/test_l2networkApi.py
      quantum/plugins/cisco/tests/unit/test_nexus_plugin.py
      quantum/plugins/cisco/tests/unit/test_ucs_driver.py
      quantum/plugins/cisco/tests/unit/test_ucs_plugin.py
      quantum/plugins/cisco/ucs/
      quantum/plugins/cisco/ucs/__init__.py
      quantum/plugins/cisco/ucs/cisco_getvif.py
      quantum/plugins/cisco/ucs/cisco_ucs_configuration.py
      quantum/plugins/cisco/ucs/cisco_ucs_network_driver.py
      quantum/plugins/cisco/ucs/cisco_ucs_plugin.py
    pending merges:
      Sumit Naiksatam 2011-08-15 Changes in the README file to incorporate Somik's comments.
        Edgar Magana 2011-08-15 Removing extra testing function on Nexus Driver
        Sumit Naiksatam 2011-08-13 Removed main from modules as per review comments.
        Sumit Naiksatam 2011-08-09 Tiny change to the README file, instructions on how to get ncclient.
        Sumit Naiksatam 2011-08-08 Changed to default plugin class name.
        Sumit Naiksatam 2011-08-08 [merge] Added tests directory to list of modules in the README file.
        Edgar Magana 2011-08-08 Adding the required build for Nexus support
        Sumit Naiksatam 2011-08-08 [merge] Merge latest from lp:quantum
        Sumit Naiksatam 2011-08-08 Added "tests" directory to the list modules in the README file.
        Sumit Naiksatam 2011-08-08 Fixed typo in README
        Sumit Naiksatam 2011-08-08 README file updates (pointer to Nova Cactus branch), and numerous other edits based on Mark's template.
        Sumit Naiksatam 2011-08-08 [merge] L2 Network Plugin Framework merge.
        Sumit Naiksatam 2011-08-08 Incorporated changes in response to review comments from Ram.
        Sumit Naiksatam 2011-08-08 Making a check for the presence of UCS/Nexus plugin (earlier it was not in certain cases). With this change, if th...
        Sumit Naiksatam 2011-08-08 [merge] Merging test cases from Shwetas' branch, and further modified README file.
        Sumit Naiksatam 2011-08-07 RHEL limitation updated.
        Sumit Naiksatam 2011-08-07 Changes to enhance L2 network plugin framework.
        Sumit Naiksatam 2011-08-06 Added QuantunPluginBase as the base class for the l2network_plugin.
        Sumit Naiksatam 2011-08-06 Generalized and put placeholders.
        Sumit Naiksatam 2011-08-05 Added info about ssh conf required for nexus switch.
        Sumit Naiksatam 2011-08-05 Nexus plugin classpath was incorrect, fixed it.
        Sumit Naiksatam 2011-08-05 [merge] Merge latest from lp:quantum (via lp:~cisco-openstack/quantum/l2network-plugin).
        Sumit Naiksatam 2011-08-05 Edits to reflect conf changes, made it easier to follow.
        Sumit Naiksatam 2011-08-05 Fixed issue with creating new port profiles (one configuration parameter got left out during the migration to the ...
        Sumit Naiksatam 2011-08-05 Fixes the broken call to second level of plugins. Renaming will work now.
        Sumit Naiksatam 2011-08-05 Loading of device-specific plugins and drivers is done dynamically by setting configuration.
        Sumit Naiksatam 2011-08-08 [merge] Merging the test framework from Shweta's branch.
        Shweta P 2011-08-08 Adding Unit Test Cases Now
        Shweta P 2011-08-08 Adding Cisco Unit Tests
        Sumit Naiksatam 2011-08-05 [merge] Merge from lp:quantum
        Edgar Magana 2011-08-04 [merge] Removing extra file in Nexus Driver
        Edgar Magana 2011-08-04 Removing extra file in Nexus Driver
        Sumit Naiksatam 2011-08-03 Removed quantum/plugins/cisco/db/ and quantum/cisco_extensions since these will be merged separately.
        Sumit Naiksatam 2011-08-03 Adding conf directory for configuration files.
        Sumit Naiksatam 2011-08-03 Fixed pep8 error.
        Sumit Naiksatam 2011-08-03 [merge] Merging changes.
        Edgar Magana 2011-08-03 Fixed an issue selecting the right port interface and also properly switching off the Nexus Interface
        Sumit Naiksatam 2011-08-03 [merge] Merging changes from lp:quantum
        Sumit Naiksatam 2011-08-02 [merge] Merging the port profile client name fix.
        Sumit Naiksatam 2011-08-02 Earlier fix resulted in a different issue (profile client name, was also being used as profile name, hence breaking).
        Sumit Naiksatam 2011-08-02 Truncated the port profile client name length to 16 characters (ucsm excepts max 17 chars).
        Edgar Magana 2011-08-01 Including a flag to activate the NX-OS driver
        Edgar Magana 2011-08-01 Adding the Nexus OS driver based on the new PlugIn structure
        rohitagarwalla 2011-07-31 [merge] persistence of l2network & ucs plugins using mysql
        rohitagarwalla 2011-07-31 [merge] merged the latest changes from plugin-framework branch - revision 39
        rohitagarwalla 2011-07-29 persistence of l2network & ucs plugins using mysql
        Sumit Naiksatam 2011-07-31 Adding a tests directory, this can be used for plugin-specific test cases.
        Sumit Naiksatam 2011-07-31 Including copyright info.
        Sumit Naiksatam 2011-07-31 For the modules to get added, missed in the earlier checkin.
        Sumit Naiksatam 2011-07-31 Changed the directory structure to a more organized one.
        Sumit Naiksatam 2011-07-31 [merge] Merging the latest changes from lp:quantum.
        Sumit Naiksatam 2011-07-28 Changed the param name "network-name" to "net-name" since the Quantum service expects the later.
        Sumit Naiksatam 2011-07-24 [merge] Merge changes from lp:quantum
        Ying Liu 2011-07-15 add extension code in.(last push does not include this directory.)
        Ying Liu 2011-07-15 add api extensions (including portprofiles resources and associate/disassociate actions.)
        Sumit Naiksatam 2011-07-15 [merge] Merge latest from lp:quantum (picking up API framework changes like quantum/manager.py and resource contro...
        Sumit Naiksatam 2011-07-14 Changes to support port-profile extension.
        Debo 2011-07-14 Very initial version of the nxos driver .... lets call it ver 0.0.1!
        rohitagarwalla 2011-07-13 Porting shell script get-vif.sh to python module get-vif.py for cisco ucsm module
        Sumit Naiksatam 2011-07-12 [merge] Merge pep8 changes
        Rick Clark 2011-07-08 minor pep8 fix.
        Sumit Naiksatam 2011-07-12 Required for recognizing the "cisco" package. Missed in the initial checkin.
        Sumit Naiksatam 2011-07-08 Changed some credentials (does not affect functionality).
        Sumit Naiksatam 2011-07-08 This file is not required.
        Sumit Naiksatam 2011-07-08 Initial checkin for the L2-Network Plugin with all the associated modules and artifacts.

commit af483aa6c0038a9102d4fa994ac3f06aedeaa9c0
Merge: fd8d87c b8e95b5
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 16 08:36:12 2011 -0700

    Merging Shweta's change to fix a function call in the test code.

commit b8e95b59111f37aac87ab914d03f8f6702d16b02
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Tue Aug 16 07:52:55 2011 -0700

    Adding the changed UCS Driver function names in test_ucs_driver.

commit 7c73d56e1183c93f90a3ffecfa0d7a92d68360f6
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Tue Aug 16 16:54:39 2011 +0530

    Santhosh/Deepak | Fixed an issue where collection actions for PUT and DELETE methods in resource extension were routing to update and delete action of the resource

commit fd8d87cd7cbb240bbbc090a482b9e84d65783120
Merge: 28391f0 1236714
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 16 01:06:07 2011 -0700

    Merging from Sumit's branch pylint fixes and incorporating review comments.

commit 12367142c6627cee946f6b1212f0e58bd2cc76e8
Merge: 89c5a21 28391f0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 16 00:28:39 2011 -0700

    Changes to README file and merging Shweta's changes.

commit 28391f038879489f8870ea79ba6e494eab5e23d1
Merge: 4315a65 4c71489
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 16 00:08:38 2011 -0700

    Mergin Shweta's test changes, also README file.

commit 4c71489e9e940361ea2e014defb58ec78217bc01
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Mon Aug 15 23:02:22 2011 -0700

    Changes to test structure. Adding pylint correctons.

commit 89c5a215e1898ace8007a17c776701d9bacec88a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 21:01:00 2011 -0700

    Fixes to the README file per earlier review comments. Also removed main from one of the modules.

commit 48376fe7a186ff888b1f5db2adf1f61e9bfb24c8
Merge: 14323e6 4315a65
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 20:29:06 2011 -0700

    Mergin from cisco brach.

commit 4315a65f7405bc593c93352cd2893aab5ce50b25
Merge: b0b8f01 574aa60
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 20:27:49 2011 -0700

    Merging from lp:quantum.

commit 14323e6ce5582add474fc07a5908cdb44549bbab
Merge: b1e5581 b0b8f01
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 20:21:32 2011 -0700

    Pulling changes from Cisco branch.

commit b1e5581668d8d5e34225baf1cba03ccb8ce8db28
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 20:19:54 2011 -0700

    Pylint fixes.

commit baa146cf6eedc5c2e203c190e915a96520c7c4b5
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 15 18:13:52 2011 -0700

    exit unit tests if tests are invoked specifying a particular test

commit b0b8f014e399ff0bee380059d427ea805e4c5132
Merge: 97b7dd6 c1aeab0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 17:24:47 2011 -0700

    Merging Nexus pylint changes and other enhancements from Edgar.

commit c1aeab091984af76650589ea74f459edfada7401
Author: eperdomo@cisco.com <>
Date:   Mon Aug 15 17:17:20 2011 -0700

    pep8 passed
    pylint 8.83

commit 97b7dd658eff9200ad8e59f99aba2cd1c567def0
Merge: 0d8580a 15e7e60
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 16:40:25 2011 -0700

    Merging Rohit's changes.

commit a8def0e9fbeb053b6e36f0b0d7d00d66f2731ec3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 16 00:23:46 2011 +0100

    Partial commit

commit 15e7e606fad9cffd65d9b835c0e2c25523570deb
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Mon Aug 15 15:04:53 2011 -0700

    Moved test_database.py to plugins/cisco/tests/unit/
    Edited test_database.py to be able to run like other tests
    pylint for cisco/db folder - 8.85/10
    pylint for cisco/tests/unit/test_database.py - 8.42/10
    pep8 done

commit f1dc7c0b40236a5606543fd1f9b5a96b5d268301
Author: eperdomo@cisco.com <>
Date:   Mon Aug 15 14:50:55 2011 -0700

    Adding a new file with all the XML snippets to make code easier to read
    Moving the Nexus SSH server port to the configuration file
    Removing main functions
    Making some changes based on Dan and Salvatore reviews

commit 9c6bfadfaeec0dee815df345bd5f36d696724fda
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 15 10:13:08 2011 -0700

    Changes in the README file to incorporate Somik's comments.

commit bc296bb35cbbe433a37b8d74b7ae863e3474ff53
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Mon Aug 15 09:51:58 2011 -0700

    pylint changes - pylint score for cisco/db folder - 8.27/10
    pep8 checks done

commit ff74c1deb0914530231582081ab2e736fe9ce443
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 15 09:02:24 2011 -0700

    Removing extra testing function on Nexus Driver

commit 0d8580a2239dc2fe45525c1a878e170651e06e3f
Merge: 2f00bb1 4b16715
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 14 21:56:16 2011 -0700

    Merging plugin and tests' changes.

commit 4b16715fa6961ffe990fe44e53bb80ba1fa1c5c8
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 14 12:33:44 2011 -0700

    Fixes to the tests which were breaking, including fixes to the test cases.

commit 2f00bb1f94cdd076232787dced6bfd658b358892
Merge: 1c2aada 86138e9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 14 11:00:08 2011 -0700

    Merge Rohit's branch with persistence framework fixes.

commit 0b69d5e656d236044672de7355ff69ddcbf2795a
Merge: 52741c4 86138e9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 14 09:37:38 2011 -0700

    Pulling in changes from Rohit's branch.

commit 52741c4b299c8a4aeef3dbe3ea41392dbb42caa3
Merge: 381e753 70966ad
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 14 09:35:19 2011 -0700

    Pulling in changes from Shweta's branch.

commit d8563be5237dbb4720830d2f42fc2e4fb25a5d45
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 13 18:28:02 2011 -0700

    Removed main from modules as per review comments.

commit 86138e9abce6586a06b95fbc4d2dc1a8ee6fcefe
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 13 13:37:20 2011 -0700

    updated README file to include persistence framework setup instructions
    updated db api.py unset_attachment method to return port
    moved db_conn.ini into cisco/conf/ with other configuration files
    updated l2network_plugin_configuration.py to get db config
    cleaned up l2network_db.py - removed config parser code as using cisco config parser
    updated l2network_db.py to raise specific exceptions in error cases
    updated create_vlanid method in l2network_db.py to not raise exception if vlan rows exist
    updated portprofile and portprofile_binding methods to include tenant_id as an argument
    added cisco/db/test_database.py containing unit tests for quantum and l2network_plugin tables
    edited get_pp_binding method in l2network_db.py to return empty list when no results found
    pep8 checks done

commit 70966ad0c46428f696241faaa7d355988e5614b7
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 12 23:24:26 2011 -0700

    Adding Persistence unit test

commit 381e753fcfb0f9b7ec2822d3fecfaadfed894779
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 12 20:19:00 2011 -0700

    Fixed bugs while testing.

commit 61799587695d2d87d2e59d2a9b5a118b19c341bc
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Aug 12 10:52:05 2011 -0700

    pep8 errors fixed

commit 8874691b0a68e56c45830615e5660dbac596142a
Merge: befe78e 6179958
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 12 10:41:16 2011 -0700

    Merging rohit's changes.

commit befe78e263ca8543bce6372faddb910ed3ca649c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 12 10:39:07 2011 -0700

    Changes to support persistence framework.

commit 574aa60b60ceb0aaa7b019422c51547833c9cde6
Merge: 3a9e2f4 f4d7acf
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 12:17:30 2011 +0100

    Merging: lp:~danwent/quantum/client-lib
    
    Some minor tweaks to the Quantum Client Library, based on my experience using the library.

commit 3a9e2f404d3664e6ce1f60e851c67361bc18ccd8
Merge: a9d368c c737329
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 12:15:26 2011 +0100

    Merging: lp:~tylesmit/quantum/api-client-fix-serialization
    Adding automattic serialization to all requests by moving it to do_request

commit 6f805f28b623ce11448281bc3cae66cbd9af02be
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 12:12:36 2011 +0100

    First, trivial, implementation of authN+authZ

commit 8c58f8f4dbf51d41ed09f6ff3e1c2910c0542160
Merge: 32e2e61 533db0a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 11 20:09:31 2011 -0700

    fixes from rohit's branch

commit 32e2e618544eec4798fa413bbf6ee283b6eb8e90
Merge: 1c2aada 7b4e389
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 11 20:08:05 2011 -0700

    from rohit's branch

commit f52588c0409132435489226e8682e9b848394457
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 01:02:12 2011 +0100

    Adding more templates
    More tests
    
    Small change in client to return error details in exception upon API failure

commit 533db0a6274e598eca1e371fd13d2ecbb28762d6
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Thu Aug 11 16:30:58 2011 -0700

    - Added new tables VlanID to generate ids and maintain usage of vlans
    - Added wrapper functions to get next unused vlan, populate vlans, release vlans, getall vlans, isused van and delete van
    - Added ported instead of networked for portprofile binding table
    - Changed wrapper methods and test cases for portprofile binding to use portid

commit 5fdf286bce4a94fdb60051eb37242c8b4f658b1e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 00:01:09 2011 +0100

    Adding missing files to branch

commit c737329187be4e4d20e8b81158bf1bfeaddef924
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Aug 11 15:44:50 2011 -0700

    Simplifying condition

commit 570c35e60d05b84f7936a2c1d05b817e59b50d91
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 23:13:43 2011 +0100

    FIxing missing 'output' variable @ line 243 (syntax error)
    
    Fixing main as the plugin was still being retrieved with get_manager. That method is now get_plugin

commit 6ab0309d0bb6bf7bf30da9c6b531f43dea3c4db1
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Aug 11 12:15:12 2011 -0700

    Adding automattic serialization to all requests by moving it to do_request

commit 7b4e389c1b0096616840529e49f3bffe45ee1d18
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Thu Aug 11 10:39:43 2011 -0700

    added network and port models similar to quantum with following changes -
     - InnoDB as storage engine to allow foreign key constraints
     - joinedLoad operation on the queries to make use of relation between Network and Port
    Moved out the network and port code to make l2network contain vlanbinding, portprofile and portprofile bindings

commit 2e3931e7ba0161913dc359119ecc1899de31aa07
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 17:53:43 2011 +0100

    Authentication with Keystone.
    auth_token Middleware tweaked and imported in Quantum tree
    Developing Authorization middleware

commit 512af84eeea381b57d1556d997fee284151141d6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 16:29:56 2011 +0100

    Introducting cheetah
    Updating list_nets in CLI
    Writing unit tests for list_nets
    Stubbing out with FakeConnection now

commit 1dbd3f67b9e58fb52b6d559f637a46baf332e4ee
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 00:59:00 2011 +0100

    I'm too tired

commit 4898f5b7a8c8b45201c620021a13fb3f8221ce72
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 00:52:15 2011 +0100

    Stubout work in progress

commit a9d368c04adabc006719ec3f9471f4048ce7ec5d
Merge: 5c97893 042cf50
Author: Somik Behera <somik@nicira.com>
Date:   Wed Aug 10 15:26:13 2011 -0700

    Merging quantum extenions framework into trunk. Thanks rajaram vinkesh, deepak & santhosh for the great work!
    
    
    added:
      extensions/
      extensions/__init__.py
      quantum/common/extensions.py
      tests/unit/extension_stubs.py
      tests/unit/extensions/
      tests/unit/extensions/__init__.py
      tests/unit/extensions/foxinsocks.py
      tests/unit/test_extensions.py
    modified:
      README
      etc/quantum.conf
      etc/quantum.conf.sample
      etc/quantum.conf.test
      quantum/api/__init__.py
      quantum/common/flags.py
      quantum/common/utils.py
      quantum/common/wsgi.py
      quantum/db/api.py
      quantum/db/models.py
      quantum/manager.py
      quantum/plugins/SamplePlugin.py
      tests/__init__.py
      tests/unit/test_api.py
      tools/pip-requires
    pending merges:
      Deepak N 2011-08-10 [merge] Merged quantum trunk
        vinkesh banka 2011-08-09 Rajaram/Vinkesh | Added examples of scoping extension alias in request and action extension
        vinkesh banka 2011-08-05 Deepak/Vinkesh | Fixed show action in extension controller to return 404, added example to include namespace in a request extension
        vinkesh banka 2011-08-05 [merge] Merged quantum trunk
        Santhosh Kumar 2011-08-05 Santhosh/Vinkesh | Added extension_stubs file
        vinkesh banka 2011-08-02 Vinkesh | Changed import orders according to pep8 recommendations
        Santhosh Kumar 2011-08-01 Vinkesh/Santhosh | Moved the stub classes in test_extensions to a separate file extension_stubs
        Santhosh Kumar 2011-08-01 [merge] Merged from trunk
        Santhosh Kumar 2011-07-27 Vinkesh/Santhosh | Removed loading extensions from 'contrib' and fixed an indentation bug while loading extensions
        Rajaram Mallya 2011-07-26 Santhosh/Rajaram|modified extensions section in README
        Rajaram Mallya 2011-07-26 Rajaram/Santhosh | Added logging to the PluginAwareExtensionManager failures
        Rajaram Mallya 2011-07-26 Rajaram/Santhosh|Added plugin interface in foxinsox and Updated README
        Rajaram Mallya 2011-07-25 Rajaram/Santhosh|quantum manager loads plugin only once, even though both extension middleware and APIRouter calls it
        Rajaram Mallya 2011-07-25 [merge] Santhosh/Rajaram|latest merge from quantum and made extensions use options to load plugin
        Rajaram Mallya 2011-07-22 Rajaram/Vinkesh | Plugins advertise which extensions it supports.
        vinkesh banka 2011-07-20 Vinkesh/Santhosh | Added tests to check the member and collection custom actions of ResourceExtensions
        Deepak N 2011-07-19 Vinkesh/Deepak | Moved plugin related checks in ExtensionManager code to PluginAwareExtensionManager
        Deepak N 2011-07-19 Deepak/Vinkesh | Added an base abstract class which can be inherited by PluginInterface class which defines the contract expected by extension.
        Deepak N 2011-07-19 Vinkesh/Deepak| Added doc and small refactoring
        Deepak N 2011-07-18 Deepak/Santhosh | ExtensionManager verifies that plugin implements the interface expected by the extension
        Deepak N 2011-07-18 Santhosh/Deepak | Made supports_extension method optional for plugin, plugin will be loaded only once
        Deepak N 2011-07-18 [merge] Merged from quantum trunk
        Deepak N 2011-07-18 Santhosh/deepak| Load extensions supported by plugin
        Rajaram Mallya 2011-07-07 Rajaram/Santosh|misc readablity improvements to extension tests
        Rajaram Mallya 2011-07-07 Santosh/Rajaram| added extenstion test to show header extensibility
        Rajaram Mallya 2011-07-06 Rajaram/Vinkesh | Added tests to confirm extensions can edit previously uneditable field.
        Santhosh 2011-06-23 Santhosh/Vinkesh | Added extensions framework

commit 0d404e9eb8effd1e5e562a91de33916620af7e75
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 10 13:01:35 2011 -0700

    - added network and port models into the l2network plugin instead of using quantum models
    - added api methods for network and ports
    - restructured code to use the l2network network and port
    - added l2network base class for other tables to inherit
    - added support for l2network plugin model objects to behave like dictionary (gets rid of code to convert objects into dictionaries)
    - added foreign key constraints to l2network plugin model attributes representing columns
    - added attributes to represent relation between models in l2network plugin
    - added joinedload only to network and port (need to to for others)
    - added InnoDB as the storage medium in base table for imposing foreign keys
    - updated l2network test cases to handle foreign key constraints

commit 1c2aada8b6e9180f7cdbdfa0a1875a05529158da
Merge: d64f886 0d404e9
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 10 12:52:17 2011 -0700

    Merge from Rohit's branch.

commit 2a89b0996d24decb9488a0ccd40ab7d275a2dba2
Author: Arvind Somy <asomya@cisco.com>
Date:   Wed Aug 10 15:47:11 2011 -0400

    lp Bug#824145 : Adding a setup script for quantum.

commit de4177e2614db8b02f98b71298403f7218ff399a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 10 18:22:17 2011 +0100

    skeleton for cli unit tests

commit 4772f53205e74becd896ef42260fbe3f98e30117
Merge: 70ed071 5c97893
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 10 16:45:26 2011 +0100

    merge trunk

commit d64f886d05194185c932902a9ae13fec071cc87a
Merge: 648ad36 48349e3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 10 08:08:41 2011 -0700

    Merge from the base merge-prop branch (README changes).

commit dee04055e6e8fa6868d815dfc8160c9b07b1467a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 10 13:12:00 2011 +0100

    Removing exceptions as well (previously only API faults were removed)

commit a0d562044d6940acae8f7df23471fcbb7456b837
Merge: 37ac9e3 5c97893
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 10 13:09:48 2011 +0100

    Merge Trunk
    Resolve conflicts
    
    Remove constraint on duplicate names for tenant's networks and NetworkNameExists exception
    Remove PortIsDown exception and related constraint on interface plug

commit 042cf509b316767f862eb7988d972bc26abfe68b
Merge: c15470f 5c97893
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Wed Aug 10 10:28:15 2011 +0530

    Merged quantum trunk

commit f4d7acfe54a4cf03d7b33723c85af88fa6641fee
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 9 19:15:14 2011 -0700

    adding renamed client-lib tests

commit 48349e32d267d0a48f95c963e9094de1ece1d35a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 9 17:14:48 2011 -0700

    Tiny change to the README file, instructions on how to get ncclient.

commit 3094561df6cf5070bf53b3ef44612240a7ddce3d
Author: Arvind Somy <asomya@cisco.com>
Date:   Tue Aug 9 16:45:22 2011 -0400

    - Adding setup script.

commit 648ad36da900dc06e0a25cbf9f8ef2c0356dcd2a
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 9 12:40:14 2011 -0700

    Adding db connection and l2network plugin database modules

commit 9ad5564566940f7557edd445178941cfad44bac9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 9 09:15:04 2011 -0700

    update CLI to use show instead of list for calls that do not return a list

commit d44714c5d296a5ebdf9bc56a0d58d1daf3ff007e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 9 09:11:53 2011 -0700

    rename client_lib unit tests so it is run by ./run_tests.sh, update tests to handle name changes

commit 26b4bf0f4f4840f69d134b695977b114066e87e5
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 9 01:03:32 2011 -0700

    force batch_config.py to use json, as XML has issues (see bug: 798262)

commit d2618faeaa1fda8ca780741c1ec7ca99513df4e2
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 9 00:19:55 2011 -0700

    update batch_config.py to use new client lib, hooray for deleting code

commit 23dc0ed8cf8322831363dd4e5aa9c145ec17be22
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 23:44:36 2011 -0700

    Changed to default plugin class name.

commit c15470f1e15cabeb7b1d21f91651a7819ef20836
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Tue Aug 9 11:19:36 2011 +0530

    Rajaram/Vinkesh | Added examples of scoping extension alias in request and action extension

commit de65d13f0d33b2527603146011c656de8ecd04d9
Merge: 37a1d9e 56e7024
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 18:01:40 2011 -0700

    Added tests directory to list of modules in the README file.

commit 37a1d9efa89f947eb1d518ba3d5a09f8be2b972f
Merge: b95329e 5c97893
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 17:58:43 2011 -0700

    Merge latest from lp:quantum

commit b95329e94aa4c633c1ba8be7bca06609c41e4d00
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 17:55:00 2011 -0700

    Added "tests" directory to the list modules in the README file.

commit 56e702465521c0c5c7cbdb29afb400a7f84ce90c
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 8 17:53:21 2011 -0700

    Adding the required build for Nexus support

commit 5c9789307948bb9af2dce8ed7ef09e2b60fca006
Merge: 30c0ef4 57d1df9
Author: Somik Behera <somik@nicira.com>
Date:   Mon Aug 8 17:35:16 2011 -0700

    Merging changes addressing Bug # 802772. Thanks lp:danwent !
    
    Description of change:
    
    combining with other work to make the tests run green, this cleans up the tests for the OVS plugin

commit 30c0ef43a1f17f2509f5e67bb56f099cf1274c53
Merge: 7a19ea4 8cdaa2d
Author: Somik Behera <somik@nicira.com>
Date:   Mon Aug 8 17:13:32 2011 -0700

    Merging bugfix for Bug 822890 - Added License file for Quantum code distribution.

commit 8ec0f04f667ab341d8751023fc6d3303125b13b4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 16:57:18 2011 -0700

    Fixed typo in README

commit b511b696e0dd4826861d38cea319447a6a2f50dd
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 16:51:58 2011 -0700

    README file updates (pointer to Nova Cactus branch), and numerous other edits based on Mark's template.

commit 44d77c15a6cd601d811f9033cce14f8a9539576e
Merge: 220f82f 66d6a1b
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 13:55:03 2011 -0700

    L2 Network Plugin Framework merge.

commit 66d6a1b400b0041ac64df5148429079024f0ed9e
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 12:54:42 2011 -0700

    Incorporated changes in response to review comments from Ram.

commit 8cdaa2d0dccf0b0407b98b6416c47d3f166040b5
Author: Somik Behera <somik@nicira.com>
Date:   Mon Aug 8 12:31:04 2011 -0700

    Adding Apache Version 2.0 license file. This is the official license agreement under which Quantum code is available to
    the Open Source community.

commit 71dc75bb7bb33a71529b17a28ac149e03770c950
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 11:54:19 2011 -0700

    Making a check for the presence of UCS/Nexus plugin (earlier it was not in certain cases). With this change, if the UCS/Nexus plugins are not enabled, the core API tests can be run even on Ubuntu (and RHEL without the requirement of any specific network hardware).

commit 820f1261b378ae931e91dcaad09677b8cdf6a894
Merge: 7b39a29 220f82f
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 10:01:11 2011 -0700

    Merging test cases from Shwetas' branch, and further modified README file.

commit 220f82f7d5836bdbb9e8b716fa9e51a6e03deedf
Merge: c6925aa cc660e0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 09:41:08 2011 -0700

    Merging the test framework from Shweta's branch.

commit 37ac9e3ab8cdba82cdc1e07206ca7d3001031870
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 8 15:52:05 2011 +0100

    decluttering _parse_request_params method for QuantumController

commit 100f47e9e69361d2859867be6db04be39416d448
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 8 13:02:09 2011 +0100

    Fixing detail action for port collection
    Adding PortIsDown exception
    Adding unit tests for detail actions and PortIsDown
    PEP8 FIXES

commit cc660e0cff0fdaa72f90a8e829dd18cc2643603b
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Mon Aug 8 00:23:44 2011 -0700

    Adding Unit Test Cases Now

commit fb9e81b380b1be0e59e324b43a2fd594683b3b0a
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Mon Aug 8 00:01:03 2011 -0700

    Adding Cisco Unit Tests

commit ec9a458ed1237b7b6e2dcd6622729319da748a47
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Aug 7 21:03:24 2011 -0700

    minor enhancements to quantum client-lib

commit 7b39a29dedc7c201906f31cb3de5eec8ec887b15
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 7 17:13:33 2011 -0700

    RHEL limitation updated.

commit 1b3d8c76e5b05d4790c0ab3c8bd5a7cca5bec81e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 8 00:31:31 2011 +0100

    Adding support for expressing format through Content-Type header
    Adding action detail for port resource (Member & Collection)

commit e3b8bafbb9f3b70e7086ef69adf4f78dc2faa4d3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 7 04:58:50 2011 -0700

    Changes to enhance L2 network plugin framework.

commit 2b17f003b87cc6093af01ccf3e9d508599151813
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 6 22:18:25 2011 -0700

    undo unintentional formatting change in run_tests.sh

commit 9e297d9f20016eaf3ee061467b1866a39b3a7d39
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 6 22:05:52 2011 -0700

    remove unneeded __init__

commit 4fffb10e43290871f08e432c1ebc5f813ddf350a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 6 22:03:52 2011 -0700

    refactoring testing code to support plugin tests

commit bc522e178853337da10939444605e248f5462ecd
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 6 20:43:08 2011 -0700

    Added QuantunPluginBase as the base class for the l2network_plugin.

commit 6f5eced38fa6b930b5a75905d2ac8610af509ead
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 6 18:41:27 2011 -0700

    Generalized and put placeholders.

commit 57d1df9b2beddb6f8e19022832567c4444a8c819
Merge: 1326672 32b5806
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 5 23:12:32 2011 -0700

    another merge

commit 132667244bb6b28815cf4efbabeaab32f38a7b35
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 5 23:06:20 2011 -0700

    pep8 cleanup, restore defaults

commit d725cb3a8807e4c6df48455c759ace43005d3147
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 23:01:55 2011 -0700

    Added info about ssh conf required for nexus switch.

commit b78958b0ccc79d3afa12702f262bb5ae9fcce818
Merge: 292f568 7a19ea4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 5 22:54:37 2011 -0700

    merge

commit 292f5683a6580f1cc5b25d67cf3567907e5a6da5
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 5 22:53:57 2011 -0700

    remove unneeded tests from ovs_quantum_plugin

commit 742e77389f5e1b5b20933203f88a16a27a12c075
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 22:16:25 2011 -0700

    Nexus plugin classpath was incorrect, fixed it.

commit 8f09dec2df5c45ffc294e836f016598e896cf93e
Merge: 9093c6f c6925aa
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 19:22:34 2011 -0700

    Merge latest from lp:quantum (via lp:~cisco-openstack/quantum/l2network-plugin).

commit c6925aa6851a81df1619bf960aec1a77952acf6b
Merge: bdfa32a 7a19ea4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 19:18:58 2011 -0700

    Merge from lp:quantum

commit 9093c6f81c741ac716967665a3ad46b043f92590
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 19:15:27 2011 -0700

    Edits to reflect conf changes, made it easier to follow.

commit 7a19ea4bdc15b914193921fbca63dc28dc0ad275
Merge: 4f50b13 43b3394
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Aug 5 13:32:58 2011 -0700

    merge heckj's pip-requires fixes

commit c5bc02a04b99c093fcd7a76bc19dabd19a356ffb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 12:45:28 2011 -0700

    Fixed issue with creating new port profiles (one configuration parameter got left out during the migration to the new configuration scheme). Also fixed a bug in the calculation of the profile id.

commit d523ce7c18420c998f5f0e8bf16ffad64e005c42
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 12:05:14 2011 -0700

    Fixes the broken call to second level of plugins. Renaming will work now.

commit 43b3394eb5d23d066f130ad08f4fbb880713cc15
Author: Joe Heck <heckj@mac.com>
Date:   Fri Aug 5 09:52:05 2011 -0700

    updates to pip-requires for CI

commit 3c461229f83fc03064c074939b91f38b012fc528
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 02:59:54 2011 -0700

    Loading of device-specific plugins and drivers is done dynamically by setting configuration.
    All configuration is driven through configuration files place in the conf directory.
    Each .ini conf file contains info on the configuration.
    README file updated to reflect all the changes.
    Fixed issue with delete_network deleting the network even when attachments were present.
    Fixed issue with port id generation.

commit bb537a081dbc75cb99b9d0b6970475db262e7068
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Aug 5 12:35:04 2011 +0530

    Deepak/Vinkesh | Fixed show action in extension controller to return 404, added example to include namespace in a request extension

commit 4f783053b6857efc662839e136c14e3b21879f7c
Merge: fc50da6 4f50b13
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Fri Aug 5 12:00:21 2011 +0530

    Merged quantum trunk

commit fc50da6fc64b6821c43a09b1637cf071722566e6
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Fri Aug 5 11:58:45 2011 +0530

    Santhosh/Vinkesh | Added extension_stubs file

commit bdfa32a7d6a9f62b703f7386abfb40152d742cae
Merge: b653ea1 fdf92da
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 4 12:50:12 2011 -0700

    Removing extra file in Nexus Driver

commit fdf92daaa4d96ec12c4bc87b19dbf57f626b501f
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 4 12:02:43 2011 -0700

    Removing extra file in Nexus Driver

commit ca1098c75c23a9c014494cf089e035c45c994325
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 4 17:42:23 2011 +0100

    Relabelling API version to 1.0!

commit 4819574b66756cd16133f7f6bba8c7941f06ea84
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 4 16:56:46 2011 +0100

    Cosmetic changes to unit tests for client library.
    Pep8 fixes.

commit b653ea1c5ccd5626043d7ec75d4aec47f19eedb0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 3 16:17:06 2011 -0700

    Removed quantum/plugins/cisco/db/ and quantum/cisco_extensions since these will be merged separately.

commit 54a4da336f97dc5e8fb8b8da79a5823d0263f903
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 3 16:01:57 2011 -0700

    Adding conf directory for configuration files.

commit e4e1891cc13c8318a1351b3df44db1cb30f2eeef
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 3 15:41:06 2011 -0700

    Fixed pep8 error.

commit e1c068a99968e664ae6778813d95433b74b50305
Merge: 484e0e8 b113a0a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 3 15:38:21 2011 -0700

    Merging changes.

commit 484e0e8544bf4e8a989bb6ed5a2796ef51c8edd5
Merge: aad3552 4f50b13
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 3 15:20:55 2011 -0700

    Merging changes from lp:quantum

commit b113a0a2550781e3e76cc9d6f716ed57f8f06a11
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Wed Aug 3 13:29:43 2011 -0700

    Fixed an issue selecting the right port interface and also properly switching off the Nexus Interface

commit 303eb0bedbcdc6b711f9e048c408625f9e1811a1
Merge: 3843c44 4f50b13
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 3 18:51:50 2011 +0100

    Completing API spec alignment
    Unit tests aligned with changes in the API spec
    
    Still needs to update Tyler's client library

commit 4f50b13b36e083a0b0c01fed74f7ac68ca6b52a7
Merge: d67baf0 11fecbd
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 3 15:45:48 2011 +0100

    Applying fix for bug #814518
    Merging from lp:~salvatore-orlando/quantum/bug814518

commit 3843c448436537a419627f2a39ecc6ac65959631
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 3 15:42:54 2011 +0100

    Adding controller and view builder for attachment resource

commit aad3552cc19fd7f7819342bd09e8345600e80968
Merge: 5c0dbe9 33ee4ca
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 2 20:24:50 2011 -0700

    Merging the port profile client name fix.

commit 33ee4cabd061ba696c227289bea932e57a865554
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 2 18:39:51 2011 -0700

    Earlier fix resulted in a different issue (profile client name, was also being used as profile name, hence breaking).

commit 9f8b25e53c9957f09bab49a14f198356e00bce6c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 2 17:08:58 2011 -0700

    Truncated the port profile client name length to 16 characters (ucsm excepts max 17 chars).

commit d67baf0657f4151686d168fc634901b5e24c8dec
Merge: 17bc039 81c505c
Author: Somik Behera <somik@nicira.com>
Date:   Tue Aug 2 15:05:38 2011 -0700

    Mergin fix for Bug 818321
    
    Thanks lp:danwent !

commit 17bc039420bcad83a5fc130d40d44a9798b34679
Merge: f1992c2 567a0af
Author: Somik Behera <somik@nicira.com>
Date:   Tue Aug 2 12:52:53 2011 -0700

    Merging approved OVS plugin configuration change branch.
    Thanks lp:danwent !
    
    modified:
      quantum/plugins/openvswitch/ovs_quantum_plugin.ini

commit f1992c2c855cea46b2cac25e9ddd73c91649fa18
Merge: 11cc083 4644db0
Author: Somik Behera <somik@nicira.com>
Date:   Tue Aug 2 12:40:57 2011 -0700

    Merging the brand new Quantum-client-library feature.
    
    Thanks to lp:tylesmit for this contribution to the Quantum project.
    
    All, client, CLI, dashboard, Quantum API client, should now start
    using this client library as our defacto "SDK" to program against
    Quantum's Cloud Networking fabric.
    
    
    added:
      quantum/client.py
      tests/unit/api.py
    modified:
      quantum/cli.py

commit 4644db072e7737f032e0704b63bd97d13489c777
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Aug 2 12:27:47 2011 -0700

    Requests now send the Content-Type in the HTTP request

commit 32b5806ddf86b22f4d02cd8bf82753fedc2dd1c0
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Aug 2 10:14:25 2011 -0700

    fix broken flush in db.network_destroy, pep8 fixes

commit fee565d19a5b28860c3dbfb373d19a6df97be71c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 2 17:51:53 2011 +0100

    req/res alignment complete.
    Status code alignment ALMOST complete (need to sort out 200 vs 202 for create ops)
    
    Need to align unit tests.

commit d17344aede6ef3ba955af0ae1d3380de387004d2
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Tue Aug 2 10:19:32 2011 +0530

    Vinkesh | Changed import orders according to pep8 recommendations

commit 5c0dbe9aee15c403910bf7c0deb7eb92f18d0967
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 1 18:32:25 2011 -0700

    Including a flag to activate the NX-OS driver
    Updating the README documentation

commit f7ad4cd852569585bf65ac09e417e70b37ed78b0
Merge: b0691d4 67af7c7
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 17:47:16 2011 -0700

    merging branch for bug802772, which this branch is stacked on top of

commit 6a99c4c8a394721da119fd23944f1d3171a1c8f4
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Aug 2 01:14:09 2011 +0100

    WIP.
    Still need to align APIs for interface plug/unplug

commit e985a1aeabbb9960768454372dfa6a12841b13c1
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 15:05:53 2011 -0700

    Fixing pep8 errors

commit 07281aa581dccfde3a98b5c7aa338dad28397b5a
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 1 12:40:07 2011 -0700

    Adding the Nexus OS driver based on the new PlugIn structure

commit 67af7c736ca6666ae9756e084d60b15f6f0f311e
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 10:11:16 2011 -0700

    fix incorrect handling of duplicate network name, add exception for duplicate network name, and add unit test to confirm detection.

commit 86afe1fc8566a8a32091a1e2f7a5cdedeee6445a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 1 17:42:25 2011 +0100

    WIP

commit b40ae4c1e54737ee44b56044e0215e3129d48f0a
Merge: b69c8d0 11cc083
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 08:47:35 2011 -0700

    Merging lp:quantum updates

commit b69c8d02647c093ec16292efb4315fcbb1ab98db
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 08:40:10 2011 -0700

    Fixing syntax issue. I had a 2.7+ style dict comprehension, so I made it 2.6 friendly.

commit 2d5108887de42801fd7563669f69ce6a7ca91ac9
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 08:17:34 2011 -0700

    Removing a debugging line

commit b0691d4202dc7d4042f7b08a99c39836236b6a9f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 07:45:49 2011 -0700

    pep8 fix

commit 11fecbdd1b221b06f25f69ab8314cf6c14e05631
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 1 15:40:29 2011 +0100

    Fixing API behaviour for throwing 400 error on invalid body.
    Adding unit test for creating a port without request body.

commit 3df4e822a28a20861627b8ab78fb19b26dd3c9e7
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 00:14:18 2011 -0700

    make ovs plugin pay attention to port state

commit c1e123de812d2cb9012ae7464812e852acbdac8b
Merge: 3eb5bcc 38e241e
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sun Jul 31 23:46:15 2011 -0700

    persistence of l2network & ucs plugins using mysql
    - db_conn.ini - configuration details of making a connection to the database
    - db_test_plugin.py - contains abstraction methods for storing database values in a dict and unit test cases for DB testing
    - l2network_db.py - db methods for l2network models
    - l2network_models.py - class definitions for the l2 network tables
    - ucs_db.py - db methods for ucs models
    - ucs_models.py - class definition for the ucs tables
    dynamic loading of the 2nd layer plugin db's based on passed arguments
    Create, Delete, Get, Getall, Update database methods at - Quantum, L2Network and Ucs
    Unit test cases for create, delete, getall and update operations for L2Network and Ucs plugins
    pep8 checks done
    branch based off revision 34 plugin-framework
    
    changes after review comments -
    merged the latest changes from plugin-framework branch - revision 39
    confirming to the new directory structure and moving all db related modules into cisco/db folder
    updated db_test_plugin.py
     - added import of cisco constants module
     - added getLogger to LOG for logging component name
     - updated import module paths for l2network_models/db and ucs_models/db to use the new directory structure
     - updated (rearranged) imports section to obey openstack alphabetical placement convention
    updated db_conn.ini
     - updated database name from cisco_naas to quantum_l2network
    unit test cases ran successfully and pep8 checks done again
    
    
    -------------s This line and the following will be ignored --------------
    
    added:
      quantum/plugins/cisco/db/db_conn.ini
      quantum/plugins/cisco/db/db_test_plugin.py
      quantum/plugins/cisco/db/l2network_db.py
      quantum/plugins/cisco/db/l2network_models.py
      quantum/plugins/cisco/db/ucs_db.py
      quantum/plugins/cisco/db/ucs_models.py
    modified:
      quantum/plugins/cisco/README
    pending merges:
      rohitagarwalla 2011-07-31 [merge] merged the latest changes from plugin-framework branch - revision 39
        rohitagarwalla 2011-07-29 persistence of l2network & ucs plugins using mysql

commit 88c074c0a2b49ad163da3ca0b0c2c01716d4eb7e
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Mon Aug 1 12:07:50 2011 +0530

    Vinkesh/Santhosh | Moved the stub classes in test_extensions to a separate file extension_stubs

commit aa60fb2b5c8ddec055ef5ca5622cd4b8911ce013
Merge: 5e01fb7 11cc083
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Mon Aug 1 11:52:39 2011 +0530

    Merged from trunk

commit d83afeccf1c0c055f783c63f641ac9bbcacf6e90
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 31 23:21:11 2011 -0700

    bug802772 update exception handling in OVS plugin to use API exceptions.

commit 38e241ec485830de47f4024d834d12ad3f7fe2f2
Merge: 5796e43 3eb5bcc
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sun Jul 31 20:31:42 2011 -0700

    merged the latest changes from plugin-framework branch - revision 39
    conforming to the new cisco plugin directory structure and moving all db related modules into cisco/db folder
    updated db_test_plugin.py
     - added import of cisco constants module
     - added LOG.getLogger for logging component name
     - updated import module paths for l2network_models/db and ucs_models/db to use the new directory structure
     - updated (rearranged) imports section to obey openstack alphabetical placement convention
    updated db_conn.ini
     - updated database name from cisco_naas to quantum_l2network
    unit test cases ran successfully and pep8 checks done again

commit 81c505c630ff55bf0691c6119e38f5dca41cb4b1
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 31 18:21:59 2011 -0700

    removing a few additional lines that aren't needed once we don't calculate port count

commit 3eb5bcc009961a2d6b11f7428e7c603ede489888
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 18:00:56 2011 -0700

    Adding a tests directory, this can be used for plugin-specific test cases.

commit 55ca7f0432ac9cfe749bef76e9ebb5b69f9bfed6
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 31 17:46:35 2011 -0700

    also remove line that computes portcount, as it is unneeded now that we don't return it

commit a084284c20bca5dc05df732b9e5323d3950955a0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 12:04:01 2011 -0700

    Including copyright info.

commit 11cc083e2a4c85a3c84c84b238e81e3d49fd21a1
Merge: 7d6b7ca 94e4617
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 31 12:01:37 2011 -0700

    merge branch for to fix bug817826

commit 1ab10658b3439a4c80f597c2e5bcbee1f4c08b5c
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 11:54:29 2011 -0700

    For the modules to get added, missed in the earlier checkin.

commit 2ab7ae449b7d293011e991ae45c8899388946938
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Jul 31 11:53:36 2011 -0700

    remove PortCount attribute of network object, as it is not in the spec and was causing us to hit bug 818321 (note: this commit does not fix the underlyingproblem with xml deserialization, it just makes sure we don't hit it with the existing API code)

commit 6fa2f538e7a825e3e582f44615c2599cb73fce41
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 11:38:26 2011 -0700

    Changed the directory structure to a more organized one.
    Fixed the imports to reflect the new structure.

commit a4f7498438edebaac1d2b49c9149f39c5fc99a58
Merge: 6244bcc 7d6b7ca
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 08:55:13 2011 -0700

    Merging the latest changes from lp:quantum.

commit 567a0af384419055a62267e86a70b55029f98203
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jul 29 22:27:40 2011 -0700

    change default integration bridge from br100 to br-int to reflect new default for OVS vif-plugging in nova Diablo-3 release

commit 94e46173aa9d50ee09406f793f7cb10be4d3172c
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jul 29 22:20:52 2011 -0700

    fix bug 817826 and similar error in batch_config.py

commit 5796e43bd9c4021996112c14aaa3be6537d52187
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Jul 29 20:48:41 2011 -0700

    persistence of l2network & ucs plugins using mysql
    - db_conn.ini - configuration details of making a connection to the database
    - db_test_plugin.py - contains abstraction methods for storing database values in a dict and unit test cases for DB testing
    - l2network_db.py - db methods for l2network models
    - l2network_models.py - class definitions for the l2 network tables
    - ucs_db.py - db methods for ucs models
    - ucs_models.py - class definition for the ucs tables
    dynamic loading of the 2nd layer plugin db's based on passed arguments
    Create, Delete, Get, Getall, Update database methods at - Quantum, L2Network and Ucs
    Unit test cases for create, delete, getall and update operations for L2Network and Ucs plugins
    pep8 checks done
    branch based off revision 34 plugin-framework

commit 7d6b7ca673297beddecb02b8e84961af4d5bdb4d
Merge: 431d319 afa6cf9
Author: Dan Wendlandt <dan@nicira.com>
Date:   Fri Jul 29 16:39:45 2011 -0700

    merge Salvatore's api branch with fixes for tests.  Tweaking branch to remove unwanted bin/quantum.py as part of merge

commit 7f7d1f4c59e28b6edc5567da8875e8572700c5f0
Merge: 914117c 431d319
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jul 29 14:42:07 2011 -0700

    Merging in main repo updates

commit 914117c18e349e24719a3bbdb3b3239e40bbbfdd
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jul 29 14:38:26 2011 -0700

    Updating to fix some SSL issues

commit afa6cf95164121edb9be65fab83536f21deccdb8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 29 22:22:59 2011 +0100

    Removing extra quantum.py file from source control
    removing unused import from quantum/api/__init__.py

commit 431d319c26c7b3907e14e325aa36228843301617
Merge: 602beba c4fc469
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 29 17:41:37 2011 +0100

    Apply fix for bug #817813
    Merging lp:~danwent/quantum/bug817813

commit 602beba9bb81e9c44a3b497049aeb965ac546862
Merge: 2299a05 45ee8c0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 29 17:39:12 2011 +0100

    Apply fix for bug #814012
    Merging lp:~danwent/quantum/bug814012

commit 2299a05c105d2e60f4ff7cb107a72f096ac6eede
Merge: 9793971 68a82b8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 29 17:36:35 2011 +0100

    Apply fix for bug #814517
    merging lp:~tylesmit/quantum/quantum-bug-814517

commit c4fc469d70d50d0494e3a3d39af561c680ce42f3
Author: Dan Wendlandt <dan@nicira.com>
Date:   Thu Jul 28 19:08:56 2011 -0700

    bug 817813: default provider in plugins.ini accidentally changed.  Changing it back to FakePlugin

commit 6244bccdbada53f90f8a5557d28ef6bff1ac9bb1
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Jul 28 18:28:07 2011 -0700

    Changed the param name "network-name" to "net-name" since the Quantum service expects the later.

commit 609fd218c38995903c58a03d6136cef3c6cbe02b
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Jul 28 10:49:18 2011 -0700

    Removing some legacy code from the unit tests

commit dcad79a33fa14b086f2bfb5e65957edc59a29735
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Jul 28 10:42:17 2011 -0700

    Adding unit tests to cover the client library

commit 2436741cfd4905b17496c0514836d3edf23efecb
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Jul 28 10:41:54 2011 -0700

    Changing the CLI to use the new client library

commit 17e3483a43487d56c38cd8bf0209203947bf1707
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Jul 28 10:41:06 2011 -0700

    Adding refactored API Client

commit 45ee8c0db949285909212c9686872c82fa4dc126
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jul 27 10:24:17 2011 -0700

    pep8 fixes

commit dc62dd894f6e6b75c93424556543b4993d2060c4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jul 27 09:33:21 2011 -0700

    fix bug 814012, add unit tests for it

commit 68a82b86224229a043e87d3a2d227a91fefb03e9
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Wed Jul 27 07:33:09 2011 -0700

    Resolving Bug 814517 which caused XML to have extra whitespace.

commit 5e01fb7fbaa1c05b77bc294ef5b2dc064bcb8960
Author: Santhosh Kumar <santhosh.m@thoughtworks.com>
Date:   Wed Jul 27 12:05:20 2011 +0530

    Vinkesh/Santhosh | Removed loading extensions from 'contrib' and fixed an indentation bug while loading extensions

commit c7a04be9f788909e6491e00faaaadaa6a3457875
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 26 14:10:54 2011 +0530

    Santhosh/Rajaram|modified extensions section in README

commit 01ecfb96c82ece8be94c725ed608dc0c5392daf4
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 26 12:32:27 2011 +0530

    Rajaram/Santhosh | Added logging to the PluginAwareExtensionManager failures

commit 01eafb56be207c3660cbe125e28598ac83cef097
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 26 10:57:24 2011 +0530

    Rajaram/Santhosh|Added plugin interface in foxinsox and Updated README

commit 71189050545ee7c5b8885adebc37f8ba66a8a9c1
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Jul 25 18:45:21 2011 +0530

    Rajaram/Santhosh|quantum manager loads plugin only once, even though both extension middleware and APIRouter calls it

commit b282e87f42b0a3d9710c03cc6c2f3d494aa39991
Merge: c651950 9793971
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Mon Jul 25 14:28:52 2011 +0530

    Santhosh/Rajaram|latest merge from quantum and made extensions use options to load plugin

commit 87978cc2bf1db993190fc7339c0ff4e5a1139228
Merge: 6d25812 9793971
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 24 10:00:33 2011 -0700

    Merge changes from lp:quantum

commit 9793971bc2b6b2346fbf70aa5a57d490368c3c53
Merge: 3c009cb 53c506b
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 22 13:13:48 2011 +0100

    Apply fix for bug #797419
    merging lp:~salvatore-orlando/quantum/bug797419

commit 49344b17c44e62a20deca4b2015d12183adf3fd8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 22 10:51:22 2011 +0100

    Re-fixing issues with XML deserialization (changes got lost in merges with trunk)
    Adapting assertions in unit tests merged from trunk to reflect changes in the API due to RFE requested by Erik Carlin

commit c651950e26f69f612c2514a87edd45126f652803
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Fri Jul 22 12:51:38 2011 +0530

    Rajaram/Vinkesh | Plugins advertise which extensions it supports.

commit 3c009cbe75df9f5fdefbef98971dad00d45c7810
Merge: f5bd5b4 ebd311f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 22 08:04:35 2011 +0100

    Merging branch lp:~salvatore-orlando/quantum/bug802892
    Fixing bug #802892

commit f5bd5b40f4ed4acc3a9558c865cf8b8d88b8e1a0
Merge: 76a71fc 70ed071
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 22 08:01:43 2011 +0100

    Merging branch lp:~netstack/quantum/quantum-unit-tests
    
    Provides functionality as specified by blueprint https://blueprints.launchpad.net/quantum/+spec/api-spec-unit-tests

commit 70ed0712c60c4eac92eb77ac6cd8fb26212126c0
Merge: 7e8ae4a 76a71fc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 21 17:37:24 2011 +0100

    Fixing silly pep8 error

commit 70d793c8169e412c2ceef895b993ee750ad72cd0
Merge: be45ced 7e8ae4a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 21 17:24:24 2011 +0100

    Merge with quantum-unit-tests

commit be45ced09cda21a1e2164f47e1d2b1d99385000d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 21 16:54:23 2011 +0100

    doh

commit 7e8ae4a4166bf87c5d3f6bc5efa4dd59a9e3efbc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 21 16:34:58 2011 +0100

    Restoring quantum_plugin_base to previous state.
    Will discuss in the future whether allow API layer to pass options to plugins upon initialization.

commit bb4c1a764072d06f9d650d8c3287da3b1d26379d
Author: vinkesh banka <vinkeshb@thoughtworks.com>
Date:   Wed Jul 20 19:08:16 2011 +0530

    Vinkesh/Santhosh | Added tests to check the member and collection custom actions of ResourceExtensions

commit 4779f609f3900307a028d72ebff85923d286b82e
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 11:53:57 2011 +0530

    Vinkesh/Deepak | Moved plugin related checks in ExtensionManager code to PluginAwareExtensionManager

commit 2de192bb4621601f75172378340be057b9673554
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 11:25:31 2011 +0530

    Deepak/Vinkesh | Added an base abstract class which can be inherited by PluginInterface class which defines the contract expected by extension.

commit 0781498b8459e5df2d12e61e07cfac8236fc6349
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Tue Jul 19 10:20:48 2011 +0530

    Vinkesh/Deepak| Added doc and small refactoring

commit 6feacc0c6d71785783fcee52a4a183230adf1bae
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 18 23:51:22 2011 +0100

    Unit tests for API completed
    fixed pep8 errors

commit 74727d29d9048b187528cebf0ecc83c60cd44a87
Author: Brad Hall <brad@nicira.com>
Date:   Mon Jul 18 13:44:48 2011 -0700

    Add TESTING document: description and polices for quantum tests

commit 3ecf1c6ab65ffa759a85b4a2b9b56f01fb905dd8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 18 17:56:42 2011 +0100

    Adding more unit tests

commit 2392ba00664054a49933c6efbfac9d9868129110
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 18 19:45:24 2011 +0530

    Deepak/Santhosh | ExtensionManager verifies that plugin implements the interface expected by the extension

commit 61e481146837265f245680303293af123622c33f
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 18 17:24:26 2011 +0530

    Santhosh/Deepak | Made supports_extension method optional for plugin, plugin will be loaded only once

commit cba26a3e7ec3cc1e78c6963558d6e45fcfdbadc0
Merge: fbc19d8 76a71fc
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 18 16:19:11 2011 +0530

    Merged from quantum trunk

commit fbc19d8158f359dd1899daadb898a331be4aa7de
Author: Deepak N <deepak.n@thoughtworks.com>
Date:   Mon Jul 18 16:11:20 2011 +0530

    Santhosh/deepak| Load extensions supported by plugin

commit 6d25812ace7585c8f9187d6daf0c6db91268aabd
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Jul 15 17:40:33 2011 -0700

    add extension code in.(last push does not include this directory.)

commit a8915ac3bc0e593c3ba7bc9b56f96e60813a2c0c
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Jul 15 17:33:36 2011 -0700

    add api extensions (including portprofiles resources and associate/disassociate actions.)

commit f7f1b1d2eb8bfa06e4d27f8c7272e8e098388d09
Merge: 62f0f53 76a71fc
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 15 16:57:03 2011 -0700

    Merge latest from lp:quantum (picking up API framework changes like quantum/manager.py and resource controller changes).

commit 62f0f53ddd48721e2bdcddaca27b0dcb59a071b1
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Jul 14 18:24:39 2011 -0700

    Changes to support port-profile extension.
    Fixed an error in the README file.

commit 0d9bf52025ca3044c9ee1e02a9f6dbe30e6666bc
Author: Debo <dedutta@cisco.com>
Date:   Thu Jul 14 17:11:55 2011 -0700

    Very initial version of the nxos driver .... lets call it ver 0.0.1!
    
    yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
    
    added:
      quantum/plugins/cisco/nxosapi.py

commit 71ceb8fb841770b85eea937f0e22d5d2f7b442c7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jul 14 12:47:49 2011 +0100

    Removing code related to functional tests

commit 7fb19f22ce31c1023568cdd6ba9e5b35b15f5cf9
Author: rohitagarwalla roagarwa@cisco.com <>
Date:   Wed Jul 13 12:39:09 2011 -0700

    Porting shell script get-vif.sh to python module get-vif.py for cisco ucsm module

commit cd46f081ecc50e4506c3cc2eca6868e8dc8648c9
Merge: 617e1b5 632b5bb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Jul 12 15:23:23 2011 -0700

    Merge pep8 changes

commit 617e1b5ab83c5e31cfe0d2e7c14aa3fb6dffc896
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Jul 12 14:50:49 2011 -0700

    Required for recognizing the "cisco" package. Missed in the initial checkin.

commit 76a71fc1de50540d01ccddfc50a172e3321abab4
Merge: 5d23ba2 040cba6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sat Jul 9 00:34:49 2011 +0100

    Applying fix for bug #804237
    from branch lp:~salvatore-orlando/quantum/bug804237

commit 632b5bb8003ccfb2f5c9687b31738e081407647e
Author: Rick Clark <rick@openstack.org>
Date:   Fri Jul 8 17:46:20 2011 -0500

    minor pep8 fix.

commit 5c1bca06ff247c712b8df587a083945a9725c183
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 8 14:40:56 2011 -0700

    Changed some credentials (does not affect functionality).

commit c644206e43a9cc198833f5ae544174c8250bffd1
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 8 14:29:45 2011 -0700

    This file is not required.

commit d365ae3ac15dc575013ed8f7adfa0f6c8d524d09
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 8 09:34:04 2011 -0700

    Initial checkin for the L2-Network Plugin with all the associated modules and artifacts.

commit c723fada9ae5229f3ba8a262a9cc18781095120c
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Jul 7 17:35:14 2011 +0530

    Rajaram/Santosh|misc readablity improvements to extension tests

commit de610f66fc79768640d99b40042d575744014b4c
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Thu Jul 7 12:58:20 2011 +0530

    Santosh/Rajaram| added extenstion test to show header extensibility

commit b45f213e78592935922c9be12ec358bb9d83119a
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Wed Jul 6 19:15:54 2011 +0530

    Rajaram/Vinkesh | Added tests to confirm extensions can edit previously uneditable field.

commit 67ee9c1fd4034d2375e0f746d4fd78c7829825ba
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jul 6 12:41:13 2011 +0100

    removing pep8 errors

commit e92064d74522f5db91425286f97ec1ed32cf933f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jul 6 12:23:18 2011 +0100

    Added more unit tests for API
    Starting work on functional tests, importing code from Glance

commit 7e8f06d6ccc4f61a356ff1743e8ee43f8419f277
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 18:27:26 2011 +0100

    Now REALLY using in-memory db

commit 8af12499a88d4c0892ded9003bb9848d7945589a
Merge: 704ed9a a975ec6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 17:50:30 2011 +0100

    Adapated plugin infrastructure to allow API to pass options to plugins
    Now using in-memory sqlite db for tests on FakePlugin
    teardown() now 'resets' the in-memory db
    Adding unit tests for APIs

commit 040cba65627c7cc984cc1aed5816d819db4aa0da
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 11:27:12 2011 +0100

    Fixing error introduced in find_config

commit a975ec64514affa5bb95e61957409954e3d9f7fa
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 10:24:13 2011 +0100

    Removing excess debug line

commit 704ed9a4e1c96fb23f8b964b08664fea3f2be2ff
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 01:08:18 2011 +0100

    Fixing syntax errors in db/models.py

commit c8be977cdcf6bc816a36e0522ac64d8b812cd249
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 4 18:50:45 2011 +0100

    Temporary commit

commit dbd0fa51932745753e65e8949ac869c63324fad7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 4 11:43:16 2011 +0100

    Now loading plugin before setting up routes.
    Passing same plugin instance to API controllers.
    
    Also renamed 'network_manager' to 'plugin' in API controllers.

commit a93c1b1acbffc264ba21f3c0859af5f33afc9a95
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jul 1 12:20:31 2011 +0100

    Adding unit test
    Applying pep8 fixes
    
    Note: teardown does not yet work properly. Thinking about replacing it with something that simply deletes the temporary sql lite db.

commit fcc0f44230582dcf6951e90bf04bf3a780c303c2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Jun 30 18:13:01 2011 +0100

    Starting implementation of unit tests
    Fixing minor bugs with FakePlugin

commit 2a8dc1cc881c40be2676bace03ee7e74838cb608
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jun 29 16:48:55 2011 +0100

    Removing static data for FakePlugin

commit a99caf43c10752534da6288f596901c4067dd5e7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jun 29 16:40:15 2011 +0100

    - Unit tests will use FakePlugin
    - FakePlugin adapted to db API with sqlite
    - db Models updated to inherit from generic Quantum Base model (provides utility functions and capabilities for treating db objects as dicts - see nova.db.models.NovaBase)
    - functional tests commented out temporarily. Will un-comment when code for starting actual service is in place

commit 53c506b7da8d0845a320cacf7ed337e275bb11b8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jun 29 11:18:12 2011 +0100

    Adding Routes>=1.12.3 to tools/pip-requires

commit d0cb0eea78a85a244a32158ceb93aa78120aa293
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 18:04:27 2011 +0100

    Work in progress - just starting

commit ebd311ffd097c4dfa714d3819ea06b56f868764f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:43:11 2011 +0100

    ...and again!

commit f5f9f47370a03be8b906abe4944b297c715d17cc
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:42:30 2011 +0100

    I hope I get the commit right now

commit a0df0746fd752a192aac663617f710d43f66ebf7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:41:40 2011 +0100

    removing "quantum" folder as well from etc

commit 4a8cd2bd8f7411ca48741e5bd3bc58b023e7d932
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:37:48 2011 +0100

    removing api-paste.ini

commit 81f9170ad5e93b331d90b1273fdc801e4bb3dff5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:29:08 2011 +0100

    Addressing comments from Somik

commit 5d23ba259811c2f05d3fcb1296051b003bcf4ef3
Merge: 764937b a0692d9
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 27 16:34:28 2011 -0700

    Merging dan wendlandt's bugfixes for Bug #800466 and improvements that enable Quantum to seamlessly
    run on KVM!
    
    
    removed:
      quantum/plugins/openvswitch/agent/set_external_ids.sh
    added:
      tools/batch_config.py
    renamed:
      quantum/plugins/openvswitch/agent/install.sh => quantum/plugins/openvswitch/agent/xenserver_install.sh
    modified:
      quantum/cli.py
      quantum/db/api.py
      quantum/plugins/openvswitch/README
      quantum/plugins/openvswitch/agent/ovs_quantum_agent.py
      quantum/plugins/openvswitch/ovs_db.py
      quantum/plugins/openvswitch/ovs_models.py
      quantum/plugins/openvswitch/ovs_quantum_plugin.ini
      quantum/plugins/openvswitch/ovs_quantum_plugin.py
    pending merges:
      Dan Wendlandt 2011-06-27 fix pep8 introduced by trunk merge
        Dan Wendlandt 2011-06-27 [merge] merge
        Dan Wendlandt 2011-06-27 more pep8 goodness
        Dan Wendlandt 2011-06-25 refactor batch_config, allow multiple attaches with the empty string
        Dan Wendlandt 2011-06-21 [merge] merge and pep8 cleanup
        Dan Wendlandt 2011-06-21 add example to usage string for batch_config.py
        Dan Wendlandt 2011-06-21 Bug fixes and clean-up, including supporting libvirt

commit a0692d9cc6c027e4ec8fe6deea9f10fc69748b75
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jun 27 16:11:09 2011 -0700

    fix pep8 introduced by trunk merge

commit c0260982ace1338ae2732d9873e0ec3362fa5076
Author: Brad Hall <bhall@nicira.com>
Date:   Mon Jun 27 16:08:58 2011 -0700

    A small start on unit tests: mostly a proof of concept that contains a test
    for api/ports.py

commit 41835dc9ede48d8dfad75a3f520dd82c0418aee3
Author: Brad Hall <bhall@nicira.com>
Date:   Mon Jun 27 16:07:03 2011 -0700

    Added some more plugin agnostic tests (attachment and negative tests) and some
    pep8 fixes.

commit cf660ee8f0235d8cbf6e38162b2e1791751a0add
Merge: 7534f9d 764937b
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jun 27 09:30:08 2011 -0700

    merge

commit 7534f9dea7ef1899bf881753e568d91672bd36fd
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Jun 27 09:27:18 2011 -0700

    more pep8 goodness

commit 1cb59504db2735f6f56892d76b50d64cd45de8b3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 27 14:09:52 2011 +0100

    Fixing bug #798262

commit dad5dbb764d04cb30a22e5e1bbc62d1f2f5c1e2d
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Jun 25 02:04:55 2011 -0700

    refactor batch_config, allow multiple attaches with the empty string

commit 764937bb3d3a47863dcbf5bde27eeb6c2291c9e6
Merge: 8b20e82 55338cf
Author: Brad Hall <brad@nicira.com>
Date:   Fri Jun 24 11:41:48 2011 -0700

    Merge: bzr merge lp:~bgh/quantum/bugfixes

commit 55338cfd4f841491f9e0b35ba03512b5948d2e64
Author: Brad Hall <brad@nicira.com>
Date:   Fri Jun 24 11:20:03 2011 -0700

    Fix cut and paste error in api_unplug_iface
    
    This fixes lp issue: https://bugs.launchpad.net/quantum/+bug/801598

commit 9c6ab1bc280ef0947528c948db7f113cbfa8a1ab
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jun 24 15:21:56 2011 +0100

    Fixing bug #798261

commit a94c424f895b8f168f55311a147a300d11ddeb5a
Merge: cc07877 fdfa94c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jun 24 14:52:17 2011 +0100

    Merge trunk
    Resolving conflicts

commit fdfa94c8ae23ff4c47dc9b0fd70c033f0f08b960
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jun 24 14:05:35 2011 +0100

    no-commit

commit b5ff0823378844fe89b529eee2308a8e879f3fc4
Author: Santhosh <santhom@thoughtworks.com>
Date:   Thu Jun 23 18:03:59 2011 +0530

    Santhosh/Vinkesh | Added extensions framework

commit 5072a9563e206bc580028ee6d3762542f7a88e25
Merge: 0406252 8b20e82
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jun 21 17:40:05 2011 -0700

    merge and pep8 cleanup

commit 8b20e8270d87427e5753dd888e9ee37276d31d36
Merge: a7ca758 26272f4
Author: Somik Behera <somik@nicira.com>
Date:   Tue Jun 21 10:37:34 2011 -0700

    Merging latest changes from parent repo - lp:network-service , Parent repo had approved merge proposal for merging lp:~santhom/network-service/quantum_testing_framework , which has now been merged into lp:network-service

commit 26272f44a573b8265caf14627ed4f6447727a2c0
Merge: cdc4256 fd249e2
Author: Somik Behera <somik@nicira.com>
Date:   Tue Jun 21 10:27:04 2011 -0700

     Merging pep8 and functional test related changes lp:~santhom/network-service/quantum_testing_framework branch

commit 04062526c1031c40f6f2cde9a2d45bc499651efe
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jun 21 10:13:07 2011 -0700

    add example to usage string for batch_config.py

commit 645251dba4b6d920caed9d4f58f39431d85161d4
Author: Dan Wendlandt <dan@nicira.com>
Date:   Tue Jun 21 00:14:14 2011 -0700

    Bug fixes and clean-up, including supporting libvirt

commit a7ca758ee046ced142184c930718e96808d1c665
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 17 11:06:19 2011 -0700

    Fix typo in mysql package check
    
    issue: https://bugs.launchpad.net/bugs/798080

commit cdc4256a72cdd0c59181333392cd6be628982e5c
Author: Brad Hall <bhall@nicira.com>
Date:   Thu Jun 16 10:03:29 2011 -0700

    Fix typo in mysql package check
    
    issue: https://bugs.launchpad.net/bugs/798080

commit cc07877e10b241b398db9fcd6e1c9781236b2a12
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jun 10 15:53:11 2011 +0100

    Adding support for 'detail' action on networks objects
    
    GET /tenants/{tenant-id}/networks/detail
    returns details about all networks (id,name,number of logical ports)
    
    GET /tenants/{tenant-id}/networks/{network-id}/detail
    return complete details about a specific network, including ports and attachments

commit d9d0a6f5653d49e3f55e112b9417b32e4acd33aa
Author: Brad Hall <bhall@nicira.com>
Date:   Thu Jun 9 07:42:19 2011 -0700

    README fixes

commit fd249e222326a99826f79f018cf565b74451a5f2
Author: Santhosh <santhom@thoughtworks.com>
Date:   Thu Jun 9 10:29:30 2011 +0530

    Santhosh/Deepak | Fixed the import issue and config.load_paste_app issue

commit fed70a5272a03b9d1a1a0f27df4236091b1ac882
Author: Santhosh <santhom@thoughtworks.com>
Date:   Wed Jun 8 15:51:47 2011 +0530

    Santhosh/Vinkesh | Fixed all the pep8 violations. Modified the 'req' to 'request' across all the services and wsgi so that it's consistent with other projects

commit 6458fa7cff6bda9a82aa598bcf9d03c76136ccd0
Author: Santhosh <santhom@thoughtworks.com>
Date:   Wed Jun 8 14:22:51 2011 +0530

    Santhosh/Vinkesh | Added the testing framework. Moved the smoketest to tests/functional

commit 17a94bdfadd128ca405cb7b4014078e6dd882114
Merge: 5ece989 645c863
Author: Somik Behera <somik@nicira.com>
Date:   Tue Jun 7 16:58:14 2011 -0700

    merged remote README changes

commit 5ece989e47d1281fb44be5d14bb5c3ed685207b7
Author: Somik Behera <somik@nicira.com>
Date:   Tue Jun 7 16:56:53 2011 -0700

    Fix cli.py from last merge when it got overwritten

commit 15a625ba16a8179a6b3d509cbd80c98b3ed41033
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 7 18:25:16 2011 +0100

    Fixing pep8 errors
    removing excess debug lines

commit 645c863ba3f8829d5327ab194f5dc79729f7af1f
Author: Brad Hall <bhall@nicira.com>
Date:   Tue Jun 7 10:17:56 2011 -0700

    Add dependencies to README and fix whitespace

commit cf4e1eeff4818d4cafe9461a263e8f964a150bd2
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 23:09:53 2011 -0700

     Fix merge indentation errors

commit ef3285903c23497d729469331466df620aba0467
Merge: 5d3d03a 0c25ae8
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 23:07:05 2011 -0700

     Merged Brad's ovsplugin code

commit 5d3d03aee97eef4e822cee83ac35ea66beafe399
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 22:48:57 2011 -0700

    pep8 changes for quantum-framework code pieces.

commit 0c25ae807f32dc47a2ab0979fa6db135e236a25b
Merge: 87a984d 1f5e880
Author: Brad Hall <bhall@nicira.com>
Date:   Mon Jun 6 16:50:33 2011 -0700

    Merge changes from quantum-framework-bgh branch

commit 87a984d3f3c4430b1174ef4b08aaa0544d822922
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 16:35:47 2011 -0700

    Update Quantum README file with instructions to launch the service and get going.

commit 1f5e880341091b56fb0caf5f1ee02d4523b14679
Merge: ccf5aa8 b0e7265
Author: Brad Hall <bhall@nicira.com>
Date:   Mon Jun 6 14:17:43 2011 -0700

    Merge changes from quantum-framework

commit b0e7265fa6c68df6bf6909361c3873a81793d870
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 11:49:12 2011 -0700

    Updated quantum_plugin_base with with return type dataformats as well as exceptions.

commit d769196098d55f39ba1bdc08c0422c711a2b1bbd
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 10:34:43 2011 -0700

    Added a basic README file and updated Quantum plugin base class with appropriate exceptions.

commit 0dfdf96311b05a9ae182091c2c7c3a4da56d75a7
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 09:22:05 2011 -0700

    Initial commit of exceptions that are raised by a quantum plugin.
    
    This list of exceptions is consistent with exceptions being expected by the API service. Please note that the exception list is still evolving and will soon be concrete.

commit ccf5aa87c875d4fab3667736483bc90e470b3180
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:54:44 2011 -0700

    Make the wording a little clearer

commit 8fe528d4f70589300aa9ff7801ba05ea43771a04
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:42:46 2011 -0700

    Remove -a option from examples (it no longer exists)

commit 1a0c3722eecea8709d12e16ddfe0a0a0eb7094ba
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:41:46 2011 -0700

    Make the API the default

commit e33ad93cdbf7b4b279f48917fb6d0ad051802386
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:38:04 2011 -0700

    Address Dan's review comments

commit c93cbb7d1b179a58622356276afcc34f1579e15f
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 21:52:09 2011 -0700

    Make the manager a little smarter about finding its config file

commit f68ba1f58a80b1fe571891c6f7c17f2ffbf920f4
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 22:00:50 2011 -0700

    Fix another TODO: remove main function from manager

commit e1475fcc0707ad3a23262c8db36af2941e2d5fc9
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 21:58:27 2011 -0700

    Fix detail_net and list_ports commands

commit 2265c84a30644160a983bc2aaf48fae020f373e3
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 18:46:44 2011 -0700

    Remove get_all_interfaces and fix detail_network commands

commit 178fcc3240c5c95a4a864ac1822bdfb7e08b19e6
Merge: 48f4e9a 5050560
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 18:19:37 2011 -0700

    Initial version of openvswitch plugin

commit 48f4e9aaa0d92fcb72a0c03888ef7cb8cbb91f17
Merge: 5f0ad8b 6d97d94
Author: Somik Behera <somik@nicira.com>
Date:   Sat Jun 4 17:45:36 2011 -0700

    * Merged changes from Salvatore's branch - quantum-api-workinprogress
    * Removed spurious methods from quantum_base_plugin class.
    * Updated the sample plugins to be compliant with the new QuantumBase class.

commit 5050560418545a2ac94c87f73685bf529f7dbcd6
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 13:23:29 2011 -0700

    Update readme with quantum specific instructions

commit 1e441b67d1e87ddecd570c0d5cf1c590d0a03ee8
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 13:17:32 2011 -0700

    Address some of the remaining TODOs and general cleanup

commit 1c37bde8cb513e531f32424bcbf86deb4b50fa8b
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 20:59:49 2011 -0700

    Add headers

commit 46a57d2c11b99ff4309a9d92023b739138d57896
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 20:56:32 2011 -0700

    Initial cut of openvswitch plugin

commit 84bed05e112c2d616903972769330088551e73fc
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 20:55:26 2011 -0700

    Add database models/functions for ports and networks

commit 9453bb93c455ea8e7fa026e1870a3335d7b584c7
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 11:02:54 2011 -0700

    Print the command list in the help

commit 90a78e410cdcc6aa484b4e5e7ee0d4c0a6018056
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 10:26:36 2011 -0700

    Whitespace fixes

commit bee2ea21aa7b8210e4a2ee69a90e172923cdb9ea
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 10:25:43 2011 -0700

    Added api functions for the interface commands

commit 5cf7dc6cb262f4b9435a052b9244d6cb5b023dc5
Author: Brad Hall <bhall@nicira.com>
Date:   Thu Jun 2 22:30:37 2011 -0700

    Initial rework of cli to use the WS api
    
    - Still need to implement the interface commands and also address TODO's in
      the code.

commit 6d97d94509d14e237c01cf6b25cdd2ad1cf2ed57
Author: Brad Hall <bhall@nicira.com>
Date:   Wed Jun 1 11:00:15 2011 -0700

    Copy over miniclient from testscripts and port tests.py to use unittest

commit dafac9726b775106317787ccb2625086732df82e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue May 31 18:48:43 2011 +0100

    Adding ports.py to source control

commit 75b67e63e2ecf7538772c12babda2ba8fe16118c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue May 31 18:15:00 2011 +0100

    pep8 fixes (1st batch)

commit 9f1c2488260868ce0c4a5ed60219c92679829281
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon May 30 01:08:46 2011 +0100

    First working version of Quantum API

commit 4d0029e8797729d1be697f587c8c3808dc5b3b7a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Sat May 28 21:52:09 2011 +0100

    Adding views/networks.py to bzr

commit e8c29b8b96eeb40fe0bdbba340b8057036427dd7
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 27 17:52:06 2011 +0100

    Adding serialization/deserilization for network resources.
    Adding fake plugin

commit 55599d71849b460a1b0a90e7406542162ba8efdc
Author: salvatore <>
Date:   Fri May 27 00:52:11 2011 +0100

    networks api with final URL structure.
    No serialization yet

commit 5022c07f6b28931a4df2adf197bee733cf3e5d8a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu May 26 18:53:48 2011 +0100

    Implementing interface with plugin

commit 64ed5da2053bc2e5b25516913e44cf26b9970a16
Author: salvatore <>
Date:   Wed May 25 13:11:12 2011 +0100

    adpating wsgi files

commit 3a421e759ff8ead517770470e4edc7226c4dadb3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue May 24 17:45:16 2011 +0100

    Work in progress on network API

commit 702e64fc525535e8ed5052bd6ec55d61ab7f0aee
Merge: 847ecc5 b6f2ca5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon May 23 21:51:00 2011 +0100

    Adding first files for quantum API

commit b6f2ca5aa0e774826dc5855f98fb446ee78a2430
Author: Brad Hall <bhall@nicira.com>
Date:   Fri May 20 16:22:48 2011 -0700

    Minor fixes: indentation in bin/quantum and fix import in config.py

commit 847ecc50286363d5ce3fbcce9e5454bd1af98b56
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 15:30:12 2011 +0100

    Adding api paste configuration file

commit 3e809e45f2d7ddbbe2e9710bf5d6f4c80801d834
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 14:53:02 2011 +0100

    Removing .pydevproject from version control

commit bf3a3b7f685459b7ab40b5b862e7aa8a25239158
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 14:51:28 2011 +0100

    Branching from quantum-framework

commit f5f696b91a339710394bc3289a6c828903f2e1b2
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 09:05:39 2011 +0100

    Adding flags.py to infrastructure code

commit 5f0ad8bfa49fdb48ee512e67445888ab10fd3f75
Author: Somik Behera <somik@nicira.com>
Date:   Thu May 19 17:21:48 2011 -0700

    Move plugin configuration to plugins.ini - a config file.

commit c7e632d3f9e86a3eb42617d8e5ddc4349c6b2240
Author: Somik Behera <somik@nicira.com>
Date:   Sun May 15 13:31:23 2011 -0700

    1) Created a DummDataPlugin in SamplePlugin module.
    
    		- DummyDataPlugin is a sligh improvment over QuantumEchoPlugin in that
               the plugin returns hard-coded data structures.
    
    2) Created a CLI that enabled quantum plugin writers to test their plug-in implementation.
    
    		- Currently I am using DummyDataPlugin to test and run the CLI
               but if anybody has another better Quantum plug-in, please modify
               manager.py to use your plug-in and drive the plug-in using the CLI.
            - Running the CLI against wider variety of plug-ins will help the CLI
               evolve and improve. Please free to send patches.
    
    3) TODO: list
    
    	- Finalize the plug-in data model
        - Finalize the exception and make the plug-in throw exceptions
    	- Write unit tests for plug-in qualification and CLI testing.

commit 1290f3a0e0a6f9fb3c576058326d3ffa26d754ba
Merge: 9a82d8a ec5b5dd
Author: Somik Behera <somik@nicira.com>
Date:   Fri May 13 15:49:08 2011 -0700

    merged salvatore's changes to local branch

commit 9a82d8a9e3571dffe75894108dec1979e4ac34b3
Author: Somik Behera <somik@nicira.com>
Date:   Fri May 13 14:23:37 2011 -0700

    1) Added a bare-bones framework for quantum plugins.
    2) Created demo quantum plugin that conforms to QuantumPluginBase
        Abstract class specification.
    3) Demonstrated plugin registration and invocation using the demo
        plugin called "QuantumEchoPlugin"
    4) Created the initial file structure for a quantum CLI
    5) Seeded the utils module that will contain frequently used Quantum utilities.
    6) Modified the manager module to initialize and register the quantum plugin
        defined in a configuration file. I have hard-coded the path to plugin for now
        but this will move to a quantum.conf file.
    
    TODO:
    
    1) Finish up the Quantum CLI
    2) Write Quantum unit tests that can be run against any plug-in for certification.
    3) Create a working quantum plugin.

commit ec5b5dd523dc8278f8aef725c300684bc827ffb5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 13 12:54:18 2011 +0100

    Fixing pep8 errors

commit 5626c2feddd10af824c3dd7745f5e25b6c49a90c
Author: Somik Behera <somik@nicira.com>
Date:   Wed May 11 14:41:02 2011 -0700

    adding /bzrignore to precent checking in pyc files and that sort of stuff...

commit 44e6ae3a44d73be5618daac6cc7785f08242817b
Author: Somik Behera <somik@nicira.com>
Date:   Wed May 11 14:29:35 2011 -0700

    Pushing initial started code based on Glance project and infrstructure work done by the melange team.

commit 5b0c84f812912712d2086ca314a47bfc89af44f9
Merge: 06a94e1 0bb525e
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Sat Jan 8 01:46:11 2011 -0500

    Merging in Shweta's fixes from the review by Sumit

commit 0bb525e23f61734c31a6597935b35ad9c3d2dfdf
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Sep 9 15:20:07 2011 -0700

    Minor Fix in ucs tests

commit 06a94e1ce9cb910cb229937321da85cdf5daed46
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Sat Jan 8 01:40:40 2011 -0500

    Fixing issues discussed in merge prop.  The UCS Inventory clears the DB on teardown.  The multiblade tests now check to see if a port exists in the db before deleting it.  It checks to make sure the UCSInventory is set in the config.

commit e14576cc83797aa1d9abb7851c9b633758edf4a5
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jan 7 19:46:28 2011 -0500

    Adding UCS inventory tests

commit d412088801179e43db2c2150c7f8f65bdd0a0dd0
Merge: 344a405 9b6efba
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jan 7 19:44:09 2011 -0500

    Merging in latest changes from lp:quantum

commit 344a405ba4152c828fdf8d4743ebd5b4d6498c75
Merge: 1aac182 77cf8c1
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jan 7 18:01:11 2011 -0500

    Merging in Shweta's test changes

commit 77cf8c12afbfdd1b83b67e59e415a34445351f54
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Thu Sep 8 22:23:28 2011 -0700

    Ading Ucs db tests

commit 1aac18238ae45eb39232b257ceae9853b2ab4ceb
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 23:30:45 2011 -0500

    Removing excess imports

commit e6dc574255821d2a97c91426fafd42bababfbddd
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 23:08:54 2011 -0500

    Fixing pep8 errors and pushing pylint score up to 8.57

commit b090b380e90de35d6cf9e8769049261006e02c65
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 20:48:45 2011 -0500

    Fix for bug/893663
    Making Cisco CLI usable from installed packages
    
    Change-Id: I35c34d2d0f5c050016663cf04673582806f35b39

commit 219e0b1b8d08b781e34d766c27a3d74ce02822d8
Merge: 012bb8b 8dc864f
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 16:07:31 2011 +0000

    Merge "Bug 903684: functions defined twice in utils.py"

commit 012bb8b09fc9672b849735bf19654670da28ae4f
Merge: bfbe250 6e38dcb
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 16:01:09 2011 +0000

    Merge "blueprint api-operational-status"

commit bfbe25084cc3a74c0540d48a6c35452d3b09023c
Merge: 2ccf22e 3aea574
Author: Jenkins <jenkins@review.openstack.org>
Date:   Tue Dec 13 14:45:03 2011 +0000

    Merge "bug 903581: remove etc/quantum.conf.sample as it is invalid"

commit 8dc864f42cf66629c33384bfcd464a18cd280113
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Dec 13 12:22:59 2011 +0000

    Bug 903684: functions defined twice in utils.py
    
    Removing duplicate definition for import_class and import_object
    
    Change-Id: Ib651ca7b0f87c36f6d4f51ed2d55745e3576c390

commit 6e38dcb70ebdf7eae955402908c62f0ae048ccf6
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Dec 5 17:28:33 2011 +0000

    blueprint api-operational-status
    
    Adds a new attribute expressing current operational status for port and network resources
    
    Also includes:
    - db models: changes to accomodate operational status concept
    - unit tests: changes to include different validation functions for API v1.0 and v.1.1
    
    This changeset does not include changes to the client library
    
    NOTE: Addressing issue concerning unit tests for OVS plugin. API unit tests launched with
    PLUGIN_DIR set to Cisco's plugin work fine as well.
    
    Change-Id: I0c4f0f8a8c392bae75c668c28070364ca230f965

commit 2ccf22e98a74987ca2ddab88139a0e5f1d9d45af
Author: Ghe Rivero <ghe@debian.org>
Date:   Wed Nov 16 11:34:03 2011 +0100

    Adds sqlalchemy support for ovs_quantum_plugin.
    
    Fixes bug 890672
    
    Allow to use any database as backend (supported by sqlalchemy).
    Need to change ovs_quantum_plugin.ini and add variable sql_connection under DATABASE entry using specific sqlalchemy url schema (same as nova confs)
    
    Change-Id: Ic490b09aad84c7f24d68064c18a8c1b33774cb05

commit 3aea574f22b27baa4d5276188b5ac3fac5063b50
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Dec 12 23:50:21 2011 -0800

    bug 903581: remove etc/quantum.conf.sample as it is invalid
    
    Change-Id: I9314bfb9a58a65d7801125b3756672b831087c9d

commit 915f49de82065a2db474893ca1c69d22a8490af7
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 19:50:34 2011 -0500

    Fixing bug/903829
    Making setup_server.py not try to install quantum.conf.sample
    
    Change-Id: I105e53494cd220f8a0f2b22f7ec15640a04ba2dc

commit d4ac021e849ac3ecbc92bd2ae35248e24203e570
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 19:48:22 2011 -0500

    Removing a couple extra lines

commit 891d938d9755d392bdbc5e090d1a1fc0b1fb22cc
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 19:40:41 2011 -0500

    Adding some tests, fixing some bugs, and making the tearDown correctly remove PortProfiles.

commit 9be42e15139cac49ac568f8477c894e90d22bccd
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:47:43 2011 -0500

    Adding author information

commit 4cd616014cebe413c6802aeae1c55dc7bdc9c572
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:44:37 2011 -0500

    Removing a negative test until I can figure out how to implement it

commit 9fc4f1ba33e56aa22a8000de6838e7140ca1329e
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:41:08 2011 -0500

    Removing some negative tests until I can figure out how to implement them

commit b15e413f93c76c7a861708f06cec32d07153398f
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:39:16 2011 -0500

    Updating tests

commit 90b1fb080675f43c661919f21d03d49633ab5ca5
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 18:28:04 2011 -0500

    Fixing port-related calls

commit aa98712148ed3f4377246fd30eb6210d6a29f05d
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Dec 31 23:52:04 2010 -0500

    Adding tests

commit 8a9133c183f4225a58899985e12f4e8e532aa037
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Sep 2 13:14:33 2011 -0700

    Tweaking other multiblade tests.

commit 438514e9c13d81525d3f54d567310e12e384fbbb
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Dec 31 22:36:55 2010 -0500

    Updating multiblade create_network test

commit 3ab86594371bf1fc1dc4543956489db1ab44e2b6
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Sep 2 11:59:35 2011 -0700

    Starting making multi_blade model return data

commit de15519d3f4043a084e55fd3da2f691e6c2bb394
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Dec 31 19:08:43 2010 -0500

    Adding initial multi blade test file from Shubhangi