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 <iamljj@gmail.com>
Date:   Thu Aug 16 15:13:27 2012 +0800

    removed some unused global variable
    
    Fixes bug 1037082.
    
    Change-Id: Id8e5df04cc0183cd4b2a9ab23cd403a83a2db637

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    4 ----
 .../metaplugin/agent/linuxbridge_quantum_agent.py  |    3 ---
 .../plugins/metaplugin/agent/ovs_quantum_agent.py  |    4 ----
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    4 ----
 4 files changed, 15 deletions(-)

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

 TESTING |   68 ++++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 35 insertions(+), 33 deletions(-)

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

 quantum/tests/unit/test_extensions.py |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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

 quantum/policy.py                             |    3 +-
 quantum/tests/unit/test_db_plugin.py          |    3 +-
 quantum/tests/unit/test_linuxbridge_plugin.py |   50 +++++++++++++++++
 quantum/tests/unit/test_nec_plugin.py         |   45 +++++++++++++++
 quantum/tests/unit/test_nicira_plugin.py      |   74 +++++++++++++++++++++++++
 quantum/tests/unit/test_openvswitch_plugin.py |   50 +++++++++++++++++
 quantum/tests/unit/test_policy.py             |    1 +
 quantum/tests/unit/test_ryu_plugin.py         |   62 +++++++++++++++++++++
 8 files changed, 286 insertions(+), 2 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++++---
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   10 ++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

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

 tools/test-requires |    1 +
 1 file changed, 1 insertion(+)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/agent/l3_agent.py           |  101 ++++++++++++++++++++---------------
 quantum/tests/unit/test_l3_agent.py |   20 +++++--
 2 files changed, 75 insertions(+), 46 deletions(-)

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 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

 quantum/api/v2/attributes.py         |    4 +++
 quantum/db/db_base_plugin_v2.py      |   16 ++++++++-
 quantum/db/models_v2.py              |    1 +
 quantum/tests/unit/test_db_plugin.py |   66 ++++++++++++++++++++++++++++++----
 4 files changed, 80 insertions(+), 7 deletions(-)

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

 quantum/plugins/linuxbridge/lb_quantum_plugin.py  |   11 +++++------
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

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

 quantum/db/l3_db.py |   51 ++++++++++++++++++++-------------------------------
 1 file changed, 20 insertions(+), 31 deletions(-)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

 quantum/agent/linux/ovs_lib.py |   36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

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

 quantum/api/versions.py |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

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

 quantum/agent/linux/ovs_lib.py                     |   34 +++++++++++---
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   47 ++++++++++----------
 quantum/tests/unit/test_ovs_lib.py                 |   15 +++++++
 3 files changed, 68 insertions(+), 28 deletions(-)

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

 quantum/extensions/quotasv2.py                     |    2 +-
 quantum/plugins/metaplugin/proxy_quantum_plugin.py |   12 +++++++-----
 quantum/plugins/nec/db/nec_plugin_base.py          |    8 ++++++++
 3 files changed, 16 insertions(+), 6 deletions(-)

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

 .../plugins/cisco/models/network_multi_blade_v2.py |    3 +
 quantum/plugins/cisco/models/virt_phy_sw_v2.py     |   67 +++++++-
 quantum/plugins/cisco/network_plugin.py            |   23 +--
 .../cisco/tests/unit/api-paste.ini.cisco.test      |    2 +-
 .../cisco/tests/unit/v2/api-paste.ini.cisco.test   |    8 +
 .../cisco/tests/unit/v2/nexus/fake_nexus_driver.py |    2 +-
 .../cisco/tests/unit/v2/quantumv2.conf.cisco.test  |   25 ++-
 quantum/plugins/cisco/tests/unit/v2/test_api_v2.py |    6 +
 .../cisco/tests/unit/v2/test_network_plugin.py     |  179 +++++++++++++++++++-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin_v2.py   |    2 +-
 10 files changed, 290 insertions(+), 27 deletions(-)

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

 quantum/agent/linux/ip_lib.py           |    7 ++++++-
 quantum/tests/unit/test_linux_ip_lib.py |    6 ++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

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

 quantum/agent/l3_agent.py                        |    6 +++--
 quantum/agent/linux/interface.py                 |   27 ++++++++++++++--------
 quantum/plugins/linuxbridge/lb_quantum_plugin.py |   10 ++++++--
 quantum/tests/unit/test_linux_interface.py       |    6 ++---
 4 files changed, 32 insertions(+), 17 deletions(-)

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

 quantum/db/db_base_plugin_v2.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 bin/quantum-l3-agent                              |   20 +
 etc/l3_agent.ini                                  |   19 +
 quantum/agent/l3_agent.py                         |  414 +++++++++++++
 quantum/api/v2/base.py                            |   24 +-
 quantum/common/exceptions.py                      |   10 +-
 quantum/db/db_base_plugin_v2.py                   |    3 +-
 quantum/db/l3_db.py                               |  546 ++++++++++++++++++
 quantum/extensions/l3.py                          |  210 +++++++
 quantum/plugins/cisco/db/api.py                   |    6 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   10 +-
 quantum/tests/unit/test_api_v2.py                 |    5 +-
 quantum/tests/unit/test_l3_agent.py               |  264 +++++++++
 quantum/tests/unit/test_l3_plugin.py              |  642 +++++++++++++++++++++
 setup.py                                          |    1 +
 14 files changed, 2160 insertions(+), 14 deletions(-)

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

 quantum/common/exceptions.py                     |    8 ++++----
 quantum/plugins/cisco/common/cisco_exceptions.py |   24 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

commit 7d29b163fa662abc37b0e3e96c334856d1254c61
Author: justin ljj <iamljj@gmail.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

 quantum/api/api_common.py                          |    4 ----
 quantum/common/constants.py                        |   24 ++++++++++++++++++++
 quantum/common/test_lib.py                         |    6 +++--
 quantum/db/db_base_plugin_v2.py                    |    5 ++--
 quantum/plugins/cisco/db/api.py                    |    4 +++-
 .../plugins/cisco/services/service_insertion.py    |    3 ++-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    9 ++++----
 quantum/plugins/linuxbridge/db/l2network_db_v2.py  |    4 ++--
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |   12 +++++-----
 .../metaplugin/agent/linuxbridge_quantum_agent.py  |   10 ++++----
 .../plugins/metaplugin/agent/ovs_quantum_agent.py  |   14 ++++++------
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |   15 ++++++------
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |    7 +++---
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   23 +++++++++++--------
 quantum/plugins/openvswitch/ovs_db_v2.py           |    4 ++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    6 ++---
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   13 +++++------
 quantum/quantum_plugin_base_v2.py                  |    2 +-
 18 files changed, 97 insertions(+), 68 deletions(-)

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

 quantum/openstack/common/setup.py |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/db/dhcp_rpc_base.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 README |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 quantum/extensions/flavor.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 etc/quantum/plugins/nicira/nvp.ini                 |   69 +-
 .../nicira/nicira_nvp_plugin/NvpApiClient.py       |   53 +-
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      | 1004 ++++++++++++--------
 .../plugins/nicira/nicira_nvp_plugin/__init__.py   |    5 +-
 .../nicira_nvp_plugin/api_client/__init__.py       |   16 +
 .../nicira/nicira_nvp_plugin/api_client/client.py  |    7 +-
 .../api_client/client_eventlet.py                  |  206 ++--
 .../nicira/nicira_nvp_plugin/api_client/common.py  |    7 +-
 .../nicira/nicira_nvp_plugin/api_client/request.py |    6 +-
 .../api_client/request_eventlet.py                 |  200 ++--
 quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |  132 ---
 .../nicira/nicira_nvp_plugin/common/__init__.py    |   17 +
 .../nicira/nicira_nvp_plugin/common/config.py      |  132 +++
 .../nicira/nicira_nvp_plugin/nvp_plugin_version.py |   20 +
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |  551 ++++++-----
 .../plugins/nicira/nicira_nvp_plugin/run_tests.py  |  113 +++
 .../nicira/nicira_nvp_plugin/tests/__init__.py     |   17 +
 .../nicira_nvp_plugin/tests/fake_get_lport.json    |   18 +
 .../tests/fake_get_lport_status.json               |   22 +
 .../nicira_nvp_plugin/tests/fake_get_lswitch.json  |   10 +
 .../nicira_nvp_plugin/tests/fake_nvpapiclient.py   |  234 +++++
 .../nicira_nvp_plugin/tests/fake_post_lport.json   |   17 +
 .../nicira_nvp_plugin/tests/fake_post_lswitch.json |   12 +
 .../nicira/nicira_nvp_plugin/tests/nvp.ini.test    |   10 +
 .../nicira/nicira_nvp_plugin/tests/test_check.py   |   37 -
 .../nicira/nicira_nvp_plugin/tests/test_config.py  |  241 -----
 .../nicira/nicira_nvp_plugin/tests/test_network.py |  201 ----
 .../nicira_nvp_plugin/tests/test_nvp_api_common.py |   26 +-
 .../tests/test_nvp_api_request.py                  |   27 +-
 .../tests/test_nvp_api_request_eventlet.py         |   20 +-
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |  521 ----------
 31 files changed, 1951 insertions(+), 2000 deletions(-)

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

 etc/quantum/plugins/cisco/nexus.ini                |    2 +-
 quantum/plugins/cisco/README                       |   32 +++
 quantum/plugins/cisco/common/cisco_constants.py    |    1 +
 quantum/plugins/cisco/db/network_db_v2.py          |   12 +-
 quantum/plugins/cisco/db/network_models_v2.py      |    6 +-
 quantum/plugins/cisco/models/virt_phy_sw_v2.py     |  251 ++++++++++++++++++++
 quantum/plugins/cisco/network_plugin.py            |   84 +++++--
 .../cisco/nexus/cisco_nexus_network_driver_v2.py   |  150 ++++++++++++
 .../plugins/cisco/nexus/cisco_nexus_plugin_v2.py   |   26 +-
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    2 +-
 .../cisco/tests/unit/v2/test_network_plugin.py     |    3 +-
 11 files changed, 532 insertions(+), 37 deletions(-)

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

 etc/quantum.conf                     |    3 +++
 quantum/common/config.py             |    1 +
 quantum/db/db_base_plugin_v2.py      |   10 +++++++++-
 quantum/db/models_v2.py              |    1 +
 quantum/tests/unit/test_db_plugin.py |   13 +++++++++++++
 5 files changed, 27 insertions(+), 1 deletion(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    4 --
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   62 +++-----------------
 quantum/plugins/openvswitch/common/config.py       |    1 -
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    5 +-
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   12 ++--
 5 files changed, 14 insertions(+), 70 deletions(-)

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

 etc/dhcp_agent.ini                                |   22 +-
 etc/quantum.conf                                  |   38 +-
 quantum/agent/dhcp_agent.py                       |  540 ++++++------
 quantum/agent/linux/dhcp.py                       |    9 +
 quantum/agent/linux/interface.py                  |   10 +-
 quantum/agent/linux/ip_lib.py                     |    6 +-
 quantum/agent/rpc.py                              |   39 +
 quantum/common/topics.py                          |    1 +
 quantum/db/dhcp_rpc_base.py                       |  173 ++++
 quantum/plugins/linuxbridge/lb_quantum_plugin.py  |    3 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    3 +-
 quantum/tests/unit/test_agent_rpc.py              |  119 +++
 quantum/tests/unit/test_db_plugin.py              |    1 +
 quantum/tests/unit/test_db_rpc_base.py            |  165 ++++
 quantum/tests/unit/test_dhcp_agent.py             |  950 ++++++++++++---------
 quantum/tests/unit/test_linux_dhcp.py             |   17 +
 quantum/tests/unit/test_linux_interface.py        |    3 +-
 17 files changed, 1381 insertions(+), 718 deletions(-)

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

 etc/quantum.conf                                |   12 +-
 quantum/api/v2/base.py                          |   86 ++++++----
 quantum/common/exceptions.py                    |    4 +
 quantum/extensions/_quotav2_driver.py           |  158 +++++++++++++++++++
 quantum/extensions/_quotav2_model.py            |   30 ++++
 quantum/extensions/extensions.py                |   56 ++++++-
 quantum/extensions/providernet.py               |    2 +-
 quantum/extensions/quotasv2.py                  |  171 ++++++++++++++++++++
 quantum/quota.py                                |   56 ++++---
 quantum/tests/unit/extensions/v2attributes.py   |    2 +-
 quantum/tests/unit/test_quota_per_tenant_ext.py |  190 +++++++++++++++++++++++
 quantum/wsgi.py                                 |   29 +++-
 12 files changed, 728 insertions(+), 68 deletions(-)

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

 quantum/plugins/linuxbridge/db/l2network_db_v2.py |    1 +
 quantum/plugins/openvswitch/ovs_db_v2.py          |    1 +
 2 files changed, 2 insertions(+)

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

 quantum/tests/unit/test_db_plugin.py |    3 +++
 1 file changed, 3 insertions(+)

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

 quantum/openstack/common/notifier/api.py |    7 ++++---
 quantum/openstack/common/policy.py       |    2 +-
 quantum/openstack/common/timeutils.py    |    5 +++--
 3 files changed, 8 insertions(+), 6 deletions(-)

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

 tools/pip-requires |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

 etc/quantum/plugins/nec/nec.ini                    |   39 ++
 quantum/plugins/nec/README                         |   20 +
 quantum/plugins/nec/__init__.py                    |   15 +
 quantum/plugins/nec/agent/__init__.py              |   15 +
 quantum/plugins/nec/agent/nec_quantum_agent.py     |  130 +++++
 quantum/plugins/nec/common/__init__.py             |   15 +
 quantum/plugins/nec/common/config.py               |   59 +++
 quantum/plugins/nec/common/exceptions.py           |   39 ++
 quantum/plugins/nec/common/ofc_client.py           |   99 ++++
 quantum/plugins/nec/db/__init__.py                 |   15 +
 quantum/plugins/nec/db/api.py                      |  123 +++++
 quantum/plugins/nec/db/models.py                   |   72 +++
 quantum/plugins/nec/db/nec_plugin_base.py          |  118 +++++
 quantum/plugins/nec/drivers/__init__.py            |   36 ++
 quantum/plugins/nec/drivers/pfc.py                 |  101 ++++
 quantum/plugins/nec/drivers/trema.py               |  248 ++++++++++
 quantum/plugins/nec/extensions/__init__.py         |   15 +
 quantum/plugins/nec/extensions/packetfilter.py     |  131 +++++
 quantum/plugins/nec/nec_plugin.py                  |  505 ++++++++++++++++++++
 quantum/plugins/nec/ofc_driver_base.py             |  103 ++++
 quantum/plugins/nec/ofc_manager.py                 |  150 ++++++
 quantum/plugins/nec/run_tests.py                   |   72 +++
 quantum/plugins/nec/tests/__init__.py              |   15 +
 quantum/plugins/nec/tests/unit/__init__.py         |   15 +
 quantum/plugins/nec/tests/unit/stub_ofc_driver.py  |   56 +++
 quantum/plugins/nec/tests/unit/test_config.py      |   39 ++
 quantum/plugins/nec/tests/unit/test_db.py          |  141 ++++++
 .../plugins/nec/tests/unit/test_nec_plugin_v2.py   |   62 +++
 quantum/plugins/nec/tests/unit/test_ofc_manager.py |  160 +++++++
 quantum/plugins/nec/tests/unit/test_pfc_driver.py  |  158 ++++++
 .../plugins/nec/tests/unit/test_trema_driver.py    |  236 +++++++++
 setup.py                                           |    6 +-
 32 files changed, 3007 insertions(+), 1 deletion(-)

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

 etc/quantum/plugins/cisco/nexus.ini                |    5 ++---
 quantum/plugins/cisco/README                       |   13 +++++--------
 quantum/plugins/cisco/common/cisco_exceptions.py   |    5 +++++
 quantum/plugins/cisco/network_plugin.py            |    2 +-
 .../cisco/nexus/cisco_nexus_configuration.py       |    3 +--
 .../cisco/nexus/cisco_nexus_network_driver.py      |   20 +++++++-------------
 .../plugins/cisco/nexus/cisco_nexus_plugin_v2.py   |   19 ++++++++++---------
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    4 ++--
 .../cisco/tests/unit/v2/nexus/fake_nexus_driver.py |    6 ++----
 9 files changed, 35 insertions(+), 42 deletions(-)

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

 etc/quantum.conf                                   |    2 +-
 .../plugins/linuxbridge/linuxbridge_conf.ini       |   17 +-
 quantum/api/v2/attributes.py                       |   18 ++
 quantum/common/exceptions.py                       |    3 +-
 quantum/db/db_base_plugin_v2.py                    |   12 +-
 quantum/extensions/providernet.py                  |   12 +-
 quantum/plugins/linuxbridge/README                 |   46 ++-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |  173 ++++++-----
 quantum/plugins/linuxbridge/common/config.py       |   14 +-
 quantum/plugins/linuxbridge/common/constants.py    |   40 +--
 quantum/plugins/linuxbridge/common/exceptions.py   |   58 ----
 quantum/plugins/linuxbridge/db/l2network_db.py     |  311 --------------------
 quantum/plugins/linuxbridge/db/l2network_db_v2.py  |  196 ++++++++++++
 .../plugins/linuxbridge/db/l2network_models_v2.py  |   42 +--
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |  214 +++++++++++---
 .../linuxbridge/tests/unit/test_defaults.py        |   42 +++
 .../plugins/linuxbridge/tests/unit/test_lb_db.py   |  125 ++++++++
 .../plugins/linuxbridge/tests/unit/test_rpcapi.py  |    4 +-
 quantum/plugins/openvswitch/ovs_db_v2.py           |    4 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   83 +++++-
 .../openvswitch/tests/unit/test_defaults.py        |    1 +
 quantum/tests/etc/quantum.conf.test                |    3 +
 22 files changed, 839 insertions(+), 581 deletions(-)

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

 quantum/api/v2/attributes.py |    2 ++
 1 file changed, 2 insertions(+)

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

 quantum/common/config.py            |    1 +
 quantum/common/flags.py             |  249 -----------------------------------
 quantum/common/utils.py             |   39 +-----
 quantum/tests/unit/__init__.py      |    5 +-
 quantum/tests/unit/declare_flags.py |   23 ----
 quantum/tests/unit/runtime_flags.py |   24 ----
 quantum/tests/unit/test_flags.py    |  199 ----------------------------
 tools/pip-requires                  |    1 -
 8 files changed, 6 insertions(+), 535 deletions(-)

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

 quantum/api/v2/base.py               |   33 +++++++++++++++++--------
 quantum/tests/unit/test_db_plugin.py |   44 ++++++++++++++++++++++++++++++++++
 2 files changed, 67 insertions(+), 10 deletions(-)

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

 quantum/agent/dhcp_agent.py          |    8 ++++++--
 quantum/api/v2/attributes.py         |    3 +++
 quantum/db/db_base_plugin_v2.py      |    6 ++++--
 quantum/db/models_v2.py              |    1 +
 quantum/tests/unit/test_api_v2.py    |    4 +++-
 quantum/tests/unit/test_db_plugin.py |    6 ++++--
 6 files changed, 21 insertions(+), 7 deletions(-)

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

 quantum/api/v2/attributes.py         |   12 +--
 quantum/api/v2/base.py               |    2 +
 quantum/common/config.py             |    2 +
 quantum/common/exceptions.py         |   12 +++
 quantum/db/db_base_plugin_v2.py      |  135 ++++++++++++++++++++++-
 quantum/db/models_v2.py              |   29 ++++-
 quantum/tests/unit/test_db_plugin.py |  198 ++++++++++++++++++++++++++++++++--
 7 files changed, 370 insertions(+), 20 deletions(-)

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

 etc/quantum.conf                                   |    2 +
 quantum/api/v2/base.py                             |   85 ++++--
 quantum/api/v2/router.py                           |    5 +-
 quantum/common/config.py                           |    3 +-
 quantum/db/db_base_plugin_v2.py                    |   41 ++-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |    1 -
 quantum/plugins/openvswitch/ovs_db_v2.py           |   19 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   13 +-
 .../plugins/openvswitch/tests/unit/test_ovs_db.py  |   20 +-
 quantum/tests/unit/test_api_v2.py                  |   14 +-
 quantum/tests/unit/test_db_plugin.py               |  312 +++++++++++++++++++-
 11 files changed, 453 insertions(+), 62 deletions(-)

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

 quantum/api/v2/attributes.py         |   10 ++++++++--
 quantum/db/db_base_plugin_v2.py      |   12 ++++++++----
 quantum/tests/unit/test_db_plugin.py |   33 ++++++++++++++++++++++++++++++---
 3 files changed, 46 insertions(+), 9 deletions(-)

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

 quantum/openstack/common/cfg.py          |   19 ++++++++++
 quantum/openstack/common/log.py          |    7 ++--
 quantum/openstack/common/notifier/api.py |   60 +++++++++++++++++++++++++-----
 quantum/openstack/common/timeutils.py    |   18 +++++++++
 4 files changed, 90 insertions(+), 14 deletions(-)

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

 quantum/tests/unit/test_db_plugin.py |  141 ++++++++++++++++++++++++++--------
 1 file changed, 108 insertions(+), 33 deletions(-)

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

 etc/policy.json                      |   32 ++--
 quantum/api/v2/attributes.py         |   51 ++++--
 quantum/api/v2/base.py               |   89 +++++++----
 quantum/common/exceptions.py         |    5 +
 quantum/db/db_base_plugin_v2.py      |   32 +++-
 quantum/db/models_v2.py              |    1 +
 quantum/policy.py                    |  120 ++++++++++++--
 quantum/tests/unit/test_api_v2.py    |   64 +++++---
 quantum/tests/unit/test_db_plugin.py |  284 ++++++++++++++++++++++++++++++----
 quantum/tests/unit/test_policy.py    |  111 +++++++++++++
 quantum/tests/unit/testlib_api.py    |    5 +-
 11 files changed, 674 insertions(+), 120 deletions(-)

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

 quantum/agent/linux/ovs_lib.py                     |   22 +-
 quantum/agent/rpc.py                               |   33 ++
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   37 +--
 .../plugins/linuxbridge/tests/unit/test_rpcapi.py  |    6 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  336 +++++++++++++++++++-
 quantum/plugins/openvswitch/common/config.py       |    4 +
 quantum/plugins/openvswitch/ovs_db_v2.py           |   61 ++++
 quantum/plugins/openvswitch/ovs_models_v2.py       |   15 +
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  158 ++++++++-
 .../plugins/openvswitch/tests/unit/test_rpcapi.py  |  107 +++++++
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   12 +-
 tools/pip-requires                                 |    2 +-
 12 files changed, 743 insertions(+), 50 deletions(-)

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

 etc/quantum/plugins/metaplugin/metaplugin.ini      |   26 ++
 quantum/agent/linux/interface.py                   |   65 ++++-
 quantum/extensions/flavor.py                       |   59 +++++
 quantum/plugins/metaplugin/README                  |   81 ++++++
 quantum/plugins/metaplugin/__init__.py             |   16 ++
 .../metaplugin/agent/linuxbridge_quantum_agent.py  |  176 +++++++++++++
 .../plugins/metaplugin/agent/ovs_quantum_agent.py  |  194 ++++++++++++++
 quantum/plugins/metaplugin/common/__init__.py      |   16 ++
 quantum/plugins/metaplugin/common/config.py        |   45 ++++
 quantum/plugins/metaplugin/meta_db_v2.py           |   40 +++
 quantum/plugins/metaplugin/meta_models_v2.py       |   32 +++
 quantum/plugins/metaplugin/meta_quantum_plugin.py  |  216 ++++++++++++++++
 quantum/plugins/metaplugin/proxy_quantum_plugin.py |  132 ++++++++++
 quantum/plugins/metaplugin/run_tests.py            |   57 +++++
 quantum/plugins/metaplugin/tests/__init__.py       |   16 ++
 quantum/plugins/metaplugin/tests/unit/__init__.py  |   16 ++
 quantum/plugins/metaplugin/tests/unit/basetest.py  |   44 ++++
 .../plugins/metaplugin/tests/unit/fake_plugin.py   |   57 +++++
 .../metaplugin/tests/unit/test_plugin_base.py      |  268 ++++++++++++++++++++
 quantum/tests/unit/test_linux_interface.py         |   53 ++++
 setup.py                                           |    3 +
 21 files changed, 1610 insertions(+), 2 deletions(-)

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

 etc/dhcp_agent.ini                    |    4 ++++
 quantum/agent/dhcp_agent.py           |   20 +++++++++++++-------
 quantum/agent/linux/dhcp.py           |   28 +++++++++++++++++++---------
 quantum/tests/unit/test_dhcp_agent.py |    1 +
 quantum/tests/unit/test_linux_dhcp.py |    1 +
 5 files changed, 38 insertions(+), 16 deletions(-)

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

 quantum/agent/dhcp_agent.py                |   14 +++-
 quantum/agent/linux/interface.py           |  101 ++++++++++++-----------
 quantum/agent/linux/ip_lib.py              |    2 +-
 quantum/agent/linux/iptables_manager.py    |   13 ++-
 quantum/agent/linux/ovs_lib.py             |    2 +-
 quantum/tests/unit/test_dhcp_agent.py      |   43 +++++++---
 quantum/tests/unit/test_linux_interface.py |  120 ++++++++++++++++++----------
 quantum/tests/unit/test_linux_ip_lib.py    |    2 +-
 8 files changed, 192 insertions(+), 105 deletions(-)

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

 quantum/agent/linux/utils.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

 quantum/extensions/extensions.py      |    2 +-
 quantum/tests/unit/test_extensions.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 quantum/agent/linux/interface.py           |    2 +-
 quantum/tests/unit/test_linux_interface.py |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 quantum/api/api_common.py                        |    5 ++++-
 quantum/plugins/linuxbridge/db/l2network_db.py   |    2 +-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py |    4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

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

 quantum/agent/linux/ip_lib.py           |    2 +-
 quantum/tests/unit/test_linux_ip_lib.py |   21 +++++++++++++++------
 2 files changed, 16 insertions(+), 7 deletions(-)

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

 etc/api-paste.ini                                  |   18 -
 quantum/api/__init__.py                            |  108 --
 quantum/api/api_common.py                          |  137 ---
 quantum/api/attachments.py                         |   89 --
 quantum/api/faults.py                              |  187 ---
 quantum/api/networks.py                            |  188 ---
 quantum/api/ports.py                               |  185 ---
 quantum/api/views/attachments.py                   |   37 -
 quantum/api/views/filters.py                       |  160 ---
 quantum/api/views/networks.py                      |   91 --
 quantum/api/views/ports.py                         |   60 -
 quantum/db/api.py                                  |  198 +---
 quantum/db/models.py                               |   77 --
 quantum/extensions/_portstats_view.py              |   49 -
 quantum/extensions/portstats.py                    |   96 --
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |  258 ----
 quantum/plugins/linuxbridge/common/utils.py        |   53 -
 quantum/plugins/linuxbridge/db/l2network_db.py     |    8 +-
 quantum/plugins/linuxbridge/db/l2network_models.py |   50 -
 quantum/plugins/linuxbridge/run_tests.py           |    4 -
 .../linuxbridge/tests/unit/test_database.py        |  289 -----
 quantum/plugins/openvswitch/ovs_db.py              |   56 -
 quantum/plugins/openvswitch/ovs_models.py          |   50 -
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  211 ----
 quantum/plugins/openvswitch/run_tests.py           |    4 -
 .../openvswitch/tests/unit/test_vlan_map.py        |   67 --
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   16 +-
 quantum/plugins/ryu/common/config.py               |    1 -
 quantum/plugins/ryu/db/api.py                      |   27 -
 quantum/plugins/ryu/db/models.py                   |   37 -
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |  173 ---
 quantum/plugins/ryu/run_tests.py                   |    4 -
 quantum/plugins/ryu/ryu_quantum_plugin.py          |   39 -
 quantum/plugins/ryu/tests/unit/basetest.py         |   42 -
 quantum/plugins/ryu/tests/unit/fake_plugin.py      |   37 -
 quantum/plugins/ryu/tests/unit/fake_rest_nw_id.py  |   17 -
 quantum/plugins/ryu/tests/unit/fake_ryu_client.py  |   46 -
 quantum/plugins/ryu/tests/unit/test_defaults.py    |   34 +
 quantum/plugins/ryu/tests/unit/test_plugin_base.py |   66 --
 quantum/plugins/ryu/tests/unit/test_ryu_db.py      |   52 +
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |   75 --
 quantum/plugins/ryu/tests/unit/utils.py            |   58 +-
 quantum/plugins/sample/SamplePlugin.py             |  344 ------
 quantum/plugins/sample/SamplePluginV2.py           |  121 --
 quantum/quantum_plugin_base.py                     |  270 -----
 quantum/tests/unit/_test_api.py                    | 1227 --------------------
 quantum/tests/unit/test_api.py                     |  372 ------
 quantum/tests/unit/test_database.py                |  127 --
 quantum/tests/unit/test_extensions.py              |   21 +-
 quantum/tests/unit/testlib_api.py                  |  167 ---
 50 files changed, 117 insertions(+), 5986 deletions(-)

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

 quantum/agent/dhcp_agent.py                |    4 +++-
 quantum/agent/linux/dhcp.py                |   16 ++++++++++++----
 quantum/agent/linux/interface.py           |   21 ++++++++++++++++++---
 quantum/tests/unit/test_dhcp_agent.py      |    1 +
 quantum/tests/unit/test_linux_dhcp.py      |   15 +++++++++++----
 quantum/tests/unit/test_linux_interface.py |   28 ++++++++++++++++++----------
 6 files changed, 63 insertions(+), 22 deletions(-)

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>

 etc/dhcp_agent.ini                         |    5 ++
 quantum/agent/linux/interface.py           |   27 +++++++++++
 quantum/agent/linux/ovs_lib.py             |    4 ++
 quantum/tests/unit/test_linux_interface.py |   69 ++++++++++++++++++++++++++++
 quantum/tests/unit/test_ovs_lib.py         |   10 ++++
 5 files changed, 115 insertions(+)

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

 quantum/db/db_base_plugin_v2.py |   13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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

 bin/quantum-server                                 |    2 +
 etc/quantum.conf                                   |   81 +++---
 .../plugins/linuxbridge/linuxbridge_conf.ini       |    8 +-
 quantum/agent/linux/utils.py                       |   14 +
 quantum/agent/rpc.py                               |   36 +++
 quantum/common/topics.py                           |   42 +++
 quantum/openstack/common/cfg.py                    |    5 +-
 quantum/openstack/common/exception.py              |    1 -
 quantum/openstack/common/log.py                    |   33 +--
 quantum/openstack/common/rpc/common.py             |    6 +-
 quantum/openstack/common/rpc/impl_qpid.py          |    2 +-
 quantum/openstack/common/timeutils.py              |    1 -
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |  281 ++++++++++++++++++--
 quantum/plugins/linuxbridge/common/config.py       |    1 +
 quantum/plugins/linuxbridge/db/l2network_db.py     |   30 +++
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |  132 +++++++++
 .../tests/unit/_test_linuxbridgeAgent.py           |   22 +-
 .../plugins/linuxbridge/tests/unit/test_rpcapi.py  |   91 +++++++
 tools/pip-requires                                 |    1 +
 19 files changed, 686 insertions(+), 103 deletions(-)

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

 quantum/agent/dhcp_agent.py           |   11 ++-
 quantum/agent/linux/dhcp.py           |   29 +++++-
 quantum/api/v2/attributes.py          |    5 +
 quantum/db/db_base_plugin_v2.py       |    6 +-
 quantum/db/models_v2.py               |    2 +
 quantum/tests/unit/test_api_v2.py     |    2 +-
 quantum/tests/unit/test_db_plugin.py  |   26 ++++--
 quantum/tests/unit/test_dhcp_agent.py |  164 +++++++++++++++++++++++++++++++--
 quantum/tests/unit/test_linux_dhcp.py |   25 +++++
 9 files changed, 245 insertions(+), 25 deletions(-)

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

 quantum/api/v2/attributes.py          |    3 ++
 quantum/common/config.py              |    8 ++++
 quantum/db/db_base_plugin_v2.py       |    6 ---
 quantum/tests/unit/test_attributes.py |   85 +++++++++++++++++++++++++++++++++
 4 files changed, 96 insertions(+), 6 deletions(-)

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

 quantum/openstack/common/policy.py |  152 +++++++++++++++++++++++++-----------
 quantum/policy.py                  |    2 +-
 2 files changed, 107 insertions(+), 47 deletions(-)

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

 tox.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 etc/quantum.conf                     |    8 ++++++--
 quantum/db/db_base_plugin_v2.py      |   10 +++++++++-
 quantum/tests/unit/test_db_plugin.py |   24 ++++++++++++++++++++++++
 3 files changed, 39 insertions(+), 3 deletions(-)

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

 quantum/api/v2/base.py                             |    1 +
 quantum/common/exceptions.py                       |   11 +-
 quantum/plugins/linuxbridge/db/l2network_db.py     |    4 +-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |    4 +-
 .../linuxbridge/tests/unit/test_database.py        |    4 +-
 quantum/plugins/openvswitch/ovs_db_v2.py           |  109 ++++++++++++++++++++
 quantum/plugins/openvswitch/ovs_models_v2.py       |   30 ++++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   18 ++--
 .../plugins/openvswitch/tests/unit/test_ovs_db.py  |  108 +++++++++++++++++++
 .../openvswitch/tests/unit/test_vlan_map.py        |    1 +
 10 files changed, 269 insertions(+), 21 deletions(-)

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

 quantum/api/v2/attributes.py      |    4 +---
 quantum/tests/unit/test_api_v2.py |    2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

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

 etc/quantum.conf                  |  109 +++++++++++++++++++++++++++++++++++++
 quantum/api/v2/base.py            |   51 ++++++++++++++++-
 quantum/tests/unit/test_api_v2.py |   46 ++++++++++++++++
 3 files changed, 204 insertions(+), 2 deletions(-)

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

 quantum/plugins/linuxbridge/run_tests.py |    1 +
 quantum/plugins/openvswitch/run_tests.py |    1 +
 quantum/plugins/ryu/run_tests.py         |    1 +
 quantum/tests/unit/test_db_plugin.py     |    6 +++++-
 4 files changed, 8 insertions(+), 1 deletion(-)

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

 quantum/agent/dhcp_agent.py                |    2 +-
 quantum/agent/linux/interface.py           |   30 ++-
 quantum/agent/linux/ip_lib.py              |  178 +++++++++++++----
 quantum/tests/unit/test_dhcp_agent.py      |   18 +-
 quantum/tests/unit/test_linux_interface.py |   85 ++++----
 quantum/tests/unit/test_linux_ip_lib.py    |  288 ++++++++++++++++++++++------
 6 files changed, 438 insertions(+), 163 deletions(-)

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>

 quantum/plugins/ryu/agent/ryu_quantum_agent.py |    1 +
 quantum/plugins/ryu/ryu_quantum_plugin.py      |    3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 quantum/extensions/providernet.py |    5 +++++
 1 file changed, 5 insertions(+)

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

 .../plugins/linuxbridge/db/l2network_models_v2.py  |    3 ++-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |    4 ++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    3 ++-
 quantum/plugins/ryu/ryu_quantum_plugin.py          |    3 ++-
 4 files changed, 8 insertions(+), 5 deletions(-)

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

 etc/api-paste.ini        |   34 ++++++++++++++--------------------
 etc/quantum.conf         |    4 ++++
 quantum/auth.py          |   13 +++++++++++++
 quantum/common/config.py |    5 +++--
 4 files changed, 34 insertions(+), 22 deletions(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/api/v2/attributes.py         |    6 +++++-
 quantum/db/db_base_plugin_v2.py      |    4 ++++
 quantum/db/models_v2.py              |    2 ++
 quantum/tests/unit/test_api_v2.py    |   23 ++++++++++++-----------
 quantum/tests/unit/test_db_plugin.py |   19 ++++++++++++-------
 5 files changed, 35 insertions(+), 19 deletions(-)

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

 .../plugins/openvswitch/tests/unit/test_tunnel.py  |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 quantum/plugins/linuxbridge/README                 |   10 +-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   35 ++---
 quantum/plugins/linuxbridge/common/config.py       |   16 +--
 quantum/plugins/linuxbridge/db/l2network_db.py     |   19 ++-
 .../linuxbridge/tests/unit/test_database.py        |   22 ++++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   51 ++------
 quantum/plugins/openvswitch/common/config.py       |   14 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   22 ++--
 .../openvswitch/tests/unit/test_defaults.py        |   31 +++++
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   34 ++---
 quantum/plugins/ryu/common/config.py               |   14 +-
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |   20 +--
 quantum/plugins/ryu/ryu_quantum_plugin.py          |   19 +--
 quantum/plugins/ryu/tests/unit/test_plugin_base.py |   11 ++
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |    7 +-
 quantum/tests/unit/test_lb_config.py               |   84 ------------
 quantum/tests/unit/test_ovs_config.py              |  134 --------------------
 quantum/tests/unit/test_ryu_config.py              |   88 -------------
 18 files changed, 147 insertions(+), 484 deletions(-)

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

 .../tests/unit/_test_linuxbridgeAgent.py           |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

 quantum/openstack/common/jsonutils.py |    6 ++++--
 quantum/openstack/common/rpc/proxy.py |   12 ++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

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

 etc/policy.json                                    |    4 +
 quantum/api/v2/base.py                             |    3 +-
 quantum/common/exceptions.py                       |    5 ++
 quantum/extensions/providernet.py                  |   66 +++++++++++++++
 quantum/plugins/linuxbridge/db/l2network_db.py     |   53 +++++++++---
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |   76 +++++++++++++++---
 .../linuxbridge/tests/unit/test_database.py        |   61 +++++++++++---
 quantum/plugins/openvswitch/ovs_db_v2.py           |   11 +++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   84 +++++++++++++++++++-
 9 files changed, 322 insertions(+), 41 deletions(-)

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

 quantum/api/v2/attributes.py                  |   81 ++++++++++++------
 quantum/api/v2/base.py                        |   14 ++-
 quantum/api/v2/router.py                      |    4 +
 quantum/api/v2/views.py                       |   44 ----------
 quantum/extensions/extensions.py              |   39 ++++++++-
 quantum/tests/unit/extensions/v2attributes.py |   48 +++++++++++
 quantum/tests/unit/test_api_v2.py             |  114 ++++++++++++++++++++++---
 7 files changed, 259 insertions(+), 85 deletions(-)

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

 etc/quantum/plugins/cisco/cisco_plugins.ini        |    7 +-
 etc/quantum/plugins/cisco/credentials.ini          |    6 +-
 etc/quantum/plugins/cisco/l2network_plugin.ini     |    5 +-
 etc/quantum/plugins/cisco/nexus.ini                |    3 +-
 etc/quantum/plugins/cisco/ucs.ini                  |    3 +-
 quantum/plugins/cisco/README                       |  353 +++++++++-
 quantum/plugins/cisco/common/cisco_constants.py    |    6 +
 .../plugins/cisco/common/cisco_credentials_v2.py   |   82 +++
 quantum/plugins/cisco/db/network_db_v2.py          |  527 +++++++++++++++
 quantum/plugins/cisco/db/network_models_v2.py      |  195 ++++++
 quantum/plugins/cisco/db/nexus_db_v2.py            |   89 +++
 quantum/plugins/cisco/db/nexus_models_v2.py        |   37 +
 quantum/plugins/cisco/db/ucs_db_v2.py              |  155 +++++
 quantum/plugins/cisco/db/ucs_models_v2.py          |   53 ++
 quantum/plugins/cisco/l2device_plugin_base.py      |   38 +-
 .../plugins/cisco/models/network_multi_blade_v2.py |  296 ++++++++
 quantum/plugins/cisco/network_plugin.py            |  455 +++++++++++++
 .../plugins/cisco/nexus/cisco_nexus_plugin_v2.py   |  203 ++++++
 .../cisco/segmentation/l2network_vlan_mgr_v2.py    |   52 ++
 quantum/plugins/cisco/tests/unit/v2/__init__.py    |   32 +
 .../plugins/cisco/tests/unit/v2/nexus/__init__.py  |   32 +
 .../cisco/tests/unit/v2/nexus/fake_nexus_driver.py |  101 +++
 .../cisco/tests/unit/v2/quantumv2.conf.cisco.test  |   20 +
 quantum/plugins/cisco/tests/unit/v2/test_api_v2.py |   55 ++
 .../cisco/tests/unit/v2/test_network_plugin.py     |   86 +++
 .../plugins/cisco/tests/unit/v2/ucs/__init__.py    |   32 +
 .../tests/unit/v2/ucs/cisco_ucs_inventory_fake.py  |   59 ++
 .../cisco/tests/unit/v2/ucs/fake_ucs_driver.py     |   96 +++
 .../cisco/tests/unit/v2/ucs/fake_ucs_inventory.ini |    7 +
 .../tests/unit/v2/ucs/test_ucs_inventory_v2.py     |  127 ++++
 .../plugins/cisco/ucs/cisco_ucs_inventory_v2.py    |  709 ++++++++++++++++++++
 quantum/plugins/cisco/ucs/cisco_ucs_plugin_v2.py   |  337 ++++++++++
 32 files changed, 4236 insertions(+), 22 deletions(-)

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

 quantum/api/v2/attributes.py         |   42 ++++++++++++++++++++++++++++++----
 quantum/api/v2/base.py               |    8 +++++--
 quantum/tests/unit/test_db_plugin.py |   23 +++++++++++++------
 3 files changed, 59 insertions(+), 14 deletions(-)

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

 quantum/tests/unit/test_dhcp_agent.py |   23 +++++++++--------------
 quantum/tests/unit/test_extensions.py |   30 +++++++++++++++---------------
 2 files changed, 24 insertions(+), 29 deletions(-)

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

 etc/quantum.conf                  |   13 ++
 quantum/api/v2/base.py            |   15 ++-
 quantum/common/exceptions.py      |   13 ++
 quantum/quota.py                  |  262 +++++++++++++++++++++++++++++++++++++
 quantum/tests/unit/test_api_v2.py |   53 +++++++-
 5 files changed, 348 insertions(+), 8 deletions(-)

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

 quantum/db/db_base_plugin_v2.py |   21 ---------------------
 1 file changed, 21 deletions(-)

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

 quantum/openstack/common/iniparser.py              |    3 +-
 quantum/openstack/common/log.py                    |   30 ++++++++++----------
 quantum/openstack/common/notifier/api.py           |   16 +++++------
 quantum/openstack/common/notifier/list_notifier.py |    7 +++--
 quantum/openstack/common/notifier/log_notifier.py  |    4 +--
 .../openstack/common/notifier/rabbit_notifier.py   |    6 ++--
 quantum/openstack/common/rpc/impl_zmq.py           |    2 +-
 quantum/tests/unit/test_api_v2.py                  |    2 +-
 quantum/tests/unit/test_db_plugin.py               |    4 +--
 run_tests.sh                                       |   10 ++-----
 tox.ini                                            |    2 +-
 11 files changed, 42 insertions(+), 44 deletions(-)

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

 quantum/common/utils.py           |   21 ++++
 quantum/policy.py                 |   13 ++-
 quantum/tests/unit/test_policy.py |  208 +++++++++++++++++++++++++++++++++++++
 3 files changed, 238 insertions(+), 4 deletions(-)

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

 quantum/db/db_base_plugin_v2.py |   23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

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

 quantum/api/v2/attributes.py         |  164 ++++++++++++++++++++++++++++++++++
 quantum/api/v2/base.py               |   17 +++-
 quantum/api/v2/router.py             |   73 +--------------
 quantum/db/db_base_plugin_v2.py      |   10 +--
 quantum/tests/unit/test_api_v2.py    |    7 +-
 quantum/tests/unit/test_db_plugin.py |   77 ++++++++++++++++
 6 files changed, 270 insertions(+), 78 deletions(-)

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

 quantum/api/v2/base.py               |   32 ++++++++++++---
 quantum/api/v2/router.py             |   13 ++++--
 quantum/api/v2/views.py              |   20 ++++++----
 quantum/policy.py                    |    3 --
 quantum/tests/unit/test_api_v2.py    |   15 ++++---
 quantum/tests/unit/test_db_plugin.py |   73 +++++++++++++++++++++++++++++++---
 6 files changed, 126 insertions(+), 30 deletions(-)

commit 2cb30561416a499673c8a32cf7700963ca772da7
Author: justin ljj <iamljj@gmail.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

 quantum/common/config.py |    1 +
 quantum/policy.py        |    5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

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

 etc/quantum.conf                                   |    2 +-
 openstack-common.conf                              |    4 +-
 quantum/context.py                                 |    8 +-
 quantum/openstack/common/cfg.py                    |    4 +-
 quantum/openstack/common/importutils.py            |    4 +-
 quantum/openstack/common/jsonutils.py              |   10 +-
 quantum/openstack/common/log.py                    |  459 ++++++++++++++++++++
 quantum/openstack/common/notifier/__init__.py      |   14 +
 quantum/openstack/common/notifier/api.py           |  142 ++++++
 quantum/openstack/common/notifier/list_notifier.py |  117 +++++
 quantum/openstack/common/notifier/log_notifier.py  |   35 ++
 .../openstack/common/notifier/no_op_notifier.py    |   19 +
 .../openstack/common/notifier/rabbit_notifier.py   |   46 ++
 quantum/openstack/common/notifier/test_notifier.py |   22 +
 quantum/openstack/common/policy.py                 |    1 +
 quantum/openstack/common/rpc/__init__.py           |    3 +-
 quantum/openstack/common/rpc/amqp.py               |    1 +
 quantum/openstack/common/rpc/common.py             |    2 +-
 quantum/openstack/common/rpc/dispatcher.py         |   39 ++
 quantum/openstack/common/rpc/impl_zmq.py           |   31 +-
 quantum/openstack/common/rpc/matchmaker.py         |    1 +
 quantum/openstack/common/timeutils.py              |  109 +++++
 run_tests.sh                                       |    6 +
 tools/pip-requires                                 |    1 +
 tox.ini                                            |    2 +-
 25 files changed, 1056 insertions(+), 26 deletions(-)

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

 quantum/api/v2/router.py             |    4 +---
 quantum/manager.py                   |   24 ++++++++++--------------
 quantum/tests/unit/test_api_v2.py    |    3 +++
 quantum/tests/unit/test_db_plugin.py |    3 +++
 4 files changed, 17 insertions(+), 17 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 quantum/plugins/ryu/agent/ryu_quantum_agent.py |   93 +++++++-----------------
 quantum/plugins/ryu/common/config.py           |    1 +
 quantum/plugins/ryu/db/api_v2.py               |   33 +++++++++
 quantum/plugins/ryu/db/models_v2.py            |   37 ++++++++++
 quantum/plugins/ryu/nova/vif.py                |   19 +++--
 quantum/plugins/ryu/ryu_quantum_plugin.py      |   58 ++++++++++++++-
 6 files changed, 165 insertions(+), 76 deletions(-)

commit 627a03766d1eb22ed04f0e208aca9b8e16a0303c
Author: justin ljj <iamljj@gmail.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

 .../plugins/linuxbridge/linuxbridge_conf.ini       |    3 +++
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    3 +++
 quantum/db/api.py                                  |   17 +++++++++++++----
 quantum/plugins/linuxbridge/common/config.py       |    1 +
 quantum/plugins/linuxbridge/db/l2network_db.py     |    1 +
 quantum/plugins/openvswitch/common/config.py       |    1 +
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    4 ++++
 quantum/plugins/ryu/common/config.py               |    1 +
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |    2 ++
 quantum/tests/unit/test_lb_config.py               |    3 +++
 quantum/tests/unit/test_ovs_config.py              |    3 +++
 quantum/tests/unit/test_ryu_config.py              |    3 +++
 12 files changed, 38 insertions(+), 4 deletions(-)

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

 quantum/plugins/linuxbridge/common/config.py |    8 ++-
 quantum/plugins/openvswitch/common/config.py |    8 ++-
 quantum/plugins/ryu/common/config.py         |    8 ++-
 quantum/tests/unit/test_lb_config.py         |   81 ++++++++++++++++++++++++
 quantum/tests/unit/test_ovs_config.py        |   18 +++++-
 quantum/tests/unit/test_ryu_config.py        |   85 ++++++++++++++++++++++++++
 6 files changed, 200 insertions(+), 8 deletions(-)

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

 quantum/agent/dhcp_agent.py           |    8 +++++---
 quantum/agent/linux/interface.py      |    4 ----
 quantum/tests/unit/test_dhcp_agent.py |   36 ++++++++++++++++++++++++++++++---
 3 files changed, 38 insertions(+), 10 deletions(-)

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

 quantum/plugins/nicira/nicira_nvp_plugin/cli.py |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

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

 openstack-common.conf                      |    2 +-
 quantum/openstack/common/context.py        |   81 +++
 quantum/openstack/common/exception.py      |    1 +
 quantum/openstack/common/excutils.py       |   49 ++
 quantum/openstack/common/gettextutils.py   |   33 ++
 quantum/openstack/common/importutils.py    |   15 +-
 quantum/openstack/common/iniparser.py      |    5 +-
 quantum/openstack/common/jsonutils.py      |   11 +-
 quantum/openstack/common/local.py          |   37 ++
 quantum/openstack/common/policy.py         |    9 +-
 quantum/openstack/common/rpc/__init__.py   |  263 ++++++++++
 quantum/openstack/common/rpc/amqp.py       |  417 +++++++++++++++
 quantum/openstack/common/rpc/common.py     |  315 ++++++++++++
 quantum/openstack/common/rpc/dispatcher.py |  111 ++++
 quantum/openstack/common/rpc/impl_fake.py  |  184 +++++++
 quantum/openstack/common/rpc/impl_kombu.py |  751 ++++++++++++++++++++++++++++
 quantum/openstack/common/rpc/impl_qpid.py  |  599 ++++++++++++++++++++++
 quantum/openstack/common/rpc/impl_zmq.py   |  714 ++++++++++++++++++++++++++
 quantum/openstack/common/rpc/matchmaker.py |  257 ++++++++++
 quantum/openstack/common/rpc/proxy.py      |  161 ++++++
 20 files changed, 4006 insertions(+), 9 deletions(-)

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

 quantum/api/v2/base.py               |    7 +--
 quantum/api/v2/router.py             |    5 +-
 quantum/db/db_base_plugin_v2.py      |    9 ++-
 quantum/db/models_v2.py              |    2 +-
 quantum/tests/unit/test_api_v2.py    |  114 +++++++++++++++++++++++++++++-----
 quantum/tests/unit/test_db_plugin.py |   29 ++++++++-
 6 files changed, 138 insertions(+), 28 deletions(-)

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

 bin/quantum-dhcp-agent                     |   20 ++
 etc/dhcp_agent.ini                         |   38 +++
 quantum/agent/common/__init__.py           |   16 ++
 quantum/agent/common/config.py             |   36 +++
 quantum/agent/dhcp_agent.py                |  361 ++++++++++++++++++++++++++
 quantum/agent/linux/dhcp.py                |  270 ++++++++++++++++++++
 quantum/agent/linux/interface.py           |  174 +++++++++++++
 quantum/agent/linux/ip_lib.py              |  191 ++++++++++++++
 quantum/common/exceptions.py               |   12 +
 quantum/rootwrap/dhcp-agent.py             |   26 ++
 quantum/tests/unit/test_agent_config.py    |   23 ++
 quantum/tests/unit/test_agent_utils.py     |    2 +
 quantum/tests/unit/test_dhcp_agent.py      |  318 +++++++++++++++++++++++
 quantum/tests/unit/test_linux_dhcp.py      |  376 ++++++++++++++++++++++++++++
 quantum/tests/unit/test_linux_interface.py |  224 +++++++++++++++++
 quantum/tests/unit/test_linux_ip_lib.py    |  274 ++++++++++++++++++++
 setup.py                                   |    6 +-
 tools/pip-requires                         |    2 +
 18 files changed, 2368 insertions(+), 1 deletion(-)

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

 .../cisco/nova/quantum_port_aware_scheduler.py     |    2 +-
 quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
 quantum/plugins/ryu/nova/linux_net.py              |    2 +-
 quantum/plugins/ryu/nova/vif.py                    |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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

 quantum/api/v2/base.py               |   32 ++++++++++++++++++++++++++++++--
 quantum/tests/unit/test_api_v2.py    |    1 +
 quantum/tests/unit/test_db_plugin.py |   28 ++++++++++++++++++++++++++--
 3 files changed, 57 insertions(+), 4 deletions(-)

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

 quantum/db/db_base_plugin_v2.py      |   19 ++++++++++++++
 quantum/tests/unit/test_db_plugin.py |   45 +++++++++++++++++++++++++++++++---
 2 files changed, 61 insertions(+), 3 deletions(-)

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

 quantum/db/db_base_plugin_v2.py                  |    3 ---
 quantum/db/models_v2.py                          |   15 ++++++++----
 quantum/plugins/linuxbridge/lb_quantum_plugin.py |    2 +-
 quantum/tests/unit/test_db_plugin.py             |   28 ++++++++++++++++++++++
 4 files changed, 39 insertions(+), 9 deletions(-)

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

 quantum/api/v2/base.py               |    6 +-
 quantum/api/v2/router.py             |    3 +
 quantum/api/v2/views.py              |    2 +-
 quantum/common/exceptions.py         |   14 +++
 quantum/db/db_base_plugin_v2.py      |  198 ++++++++++++++++++++++++++--------
 quantum/db/models_v2.py              |   37 +++++--
 quantum/tests/unit/test_db_plugin.py |  191 ++++++++++++++++++++++++++------
 7 files changed, 365 insertions(+), 86 deletions(-)

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

 quantum/db/db_base_plugin_v2.py |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

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

 quantum/plugins/linuxbridge/LinuxBridgePluginV2.py |   54 --------------------
 quantum/plugins/linuxbridge/README                 |    5 +-
 quantum/plugins/linuxbridge/lb_quantum_plugin.py   |   54 ++++++++++++++++++++
 3 files changed, 57 insertions(+), 56 deletions(-)

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

 quantum/plugins/linuxbridge/LinuxBridgePluginV2.py |   54 ++++++++++++++++++++
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   49 ++++++++++++------
 quantum/plugins/linuxbridge/common/config.py       |    1 +
 quantum/plugins/linuxbridge/db/l2network_db.py     |   46 ++++++++++-------
 .../plugins/linuxbridge/db/l2network_models_v2.py  |   50 ++++++++++++++++++
 5 files changed, 164 insertions(+), 36 deletions(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    4 +
 quantum/common/utils.py                            |    6 ++
 quantum/db/model_base.py                           |    7 --
 quantum/db/models_v2.py                            |   14 ++-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   96 +++++++++++++++-----
 quantum/plugins/openvswitch/common/config.py       |    1 +
 quantum/plugins/openvswitch/ovs_db_v2.py           |   51 +++++++++++
 quantum/plugins/openvswitch/ovs_models_v2.py       |   49 ++++++++++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   88 +++++++++++-------
 9 files changed, 250 insertions(+), 66 deletions(-)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

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

 quantum/db/db_base_plugin_v2.py      |    5 +++++
 quantum/tests/unit/test_db_plugin.py |   18 ++++++++++++++++++
 2 files changed, 23 insertions(+)

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

 MANIFEST.in           |   36 +++++++-----------------------------
 setup.py              |    1 +
 tools/install_venv.py |    2 ++
 tox.ini               |    4 +++-
 4 files changed, 13 insertions(+), 30 deletions(-)

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

 quantum/plugins/cisco/common/cisco_exceptions.py |    6 ++++++
 quantum/plugins/cisco/l2network_plugin.py        |    4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

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

 quantum/api/v2/base.py               |    3 +-
 quantum/api/v2/router.py             |    6 +-
 quantum/common/exceptions.py         |   18 ++
 quantum/db/db_base_plugin_v2.py      |  432 ++++++++++++++++++++++++++++++++--
 quantum/db/models_v2.py              |   46 ++--
 quantum/tests/unit/test_api_v2.py    |    5 +-
 quantum/tests/unit/test_db_plugin.py |  340 +++++++++++++++++++++++++-
 7 files changed, 804 insertions(+), 46 deletions(-)

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

 etc/quantum.conf                     |    7 +++++++
 quantum/common/config.py             |    2 ++
 quantum/db/db_base_plugin_v2.py      |    9 +++++----
 quantum/tests/unit/test_db_plugin.py |    7 +++----
 4 files changed, 17 insertions(+), 8 deletions(-)

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

 quantum/plugins/openvswitch/Makefile               |   48 ++++++++++++++++----
 .../agent/ovs-quantum-agent-xs_xcp.spec            |   33 ++++++++++++++
 .../plugins/openvswitch/agent/xenserver_install.sh |   27 ++++++-----
 3 files changed, 87 insertions(+), 21 deletions(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 ++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++++
 quantum/plugins/openvswitch/common/config.py       |    1 +
 3 files changed, 12 insertions(+)

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

 .../plugins/cisco/tests/unit/test_ucs_driver.py    |   21 ++++++++++----------
 quantum/tests/unit/test_iptables_manager.py        |    4 ++--
 2 files changed, 12 insertions(+), 13 deletions(-)

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

 quantum/db/db_base_plugin_v2.py      |    9 +++++----
 quantum/tests/unit/test_db_plugin.py |    9 +++++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

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

 etc/api-paste.ini                                  |   54 +++++++++++++++++++
 etc/quantum.conf                                   |   56 +-------------------
 etc/quantum/plugins/cisco/quantum.conf.ciscoext    |   24 ---------
 quantum/common/config.py                           |    7 +--
 .../cisco/tests/unit/api-paste.ini.cisco.test      |    8 +++
 .../cisco/tests/unit/quantum.conf.cisco.test       |   20 +++++++
 .../cisco/tests/unit/test_cisco_extension.py       |   26 ++++-----
 quantum/service.py                                 |    2 +-
 quantum/tests/etc/api-paste.ini.test               |    8 +++
 quantum/tests/etc/quantum.conf.test                |   10 +---
 quantum/tests/unit/test_extensions.py              |    4 +-
 setup.py                                           |    2 +-
 12 files changed, 116 insertions(+), 105 deletions(-)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit a79b1c34258616eb25bd77e4ec5b253c32d90fa3
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Tue Jun 19 01:52:17 2012 +0800

    Reorder imports by full module path
    
    Fixes bug #1014765
    
    Change-Id: I849d73fc756b830b78492a6ed0e8cf2d32fde8cd

 quantum/agent/linux/utils.py                       |    2 +-
 quantum/api/__init__.py                            |    2 +-
 quantum/api/api_common.py                          |    2 +-
 quantum/api/v2/resource.py                         |    4 ++--
 quantum/api/v2/router.py                           |    4 ++--
 quantum/api/versions.py                            |    2 +-
 quantum/db/db_base_plugin_v2.py                    |    2 +-
 quantum/db/model_base.py                           |    2 +-
 quantum/extensions/novatenant.py                   |    2 +-
 quantum/plugins/cisco/client/cli.py                |    2 +-
 quantum/plugins/cisco/db/l2network_db.py           |    2 +-
 quantum/plugins/cisco/db/l2network_models.py       |    2 +-
 quantum/plugins/cisco/db/ucs_models.py             |    2 +-
 quantum/plugins/cisco/l2network_plugin.py          |    4 ++--
 .../plugins/cisco/models/l2network_multi_blade.py  |    2 +-
 .../plugins/cisco/models/l2network_single_blade.py |    2 +-
 .../plugins/cisco/services/services_logistics.py   |    4 ++--
 quantum/plugins/cisco/tests/unit/__init__.py       |    2 ++
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |    4 ++--
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    6 +++---
 quantum/plugins/linuxbridge/db/l2network_db.py     |    2 +-
 .../tests/unit/_test_linuxbridgeAgent.py           |    2 +-
 .../api_client/client_eventlet.py                  |    2 +-
 .../api_client/request_eventlet.py                 |    2 +-
 .../nicira/nicira_nvp_plugin/tests/test_check.py   |    2 +-
 .../nicira/nicira_nvp_plugin/tests/test_network.py |    2 +-
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    2 +-
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |    2 +-
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |    2 +-
 quantum/plugins/ryu/ryu_quantum_plugin.py          |    4 ++--
 quantum/plugins/ryu/tests/unit/test_plugin_base.py |    2 +-
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |    2 +-
 quantum/plugins/ryu/tests/unit/utils.py            |    2 +-
 quantum/policy.py                                  |    2 +-
 quantum/quantum_plugin_base.py                     |    2 +-
 quantum/tests/unit/_test_api.py                    |    4 ++--
 quantum/tests/unit/test_api_v2.py                  |    6 +++---
 quantum/tests/unit/test_db_plugin.py               |    8 ++++----
 40 files changed, 55 insertions(+), 53 deletions(-)

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

 quantum/agent/linux/iptables_manager.py     |  342 +++++++++++++++++++++++++++
 quantum/rootwrap/iptables-firewall-agent.py |   34 +++
 quantum/rootwrap/wrapper.py                 |    3 +-
 quantum/tests/unit/test_iptables_manager.py |  294 +++++++++++++++++++++++
 4 files changed, 672 insertions(+), 1 deletion(-)

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

 etc/quantum/plugins/cisco/cisco_plugins.ini        |    4 +-
 quantum/plugins/cisco/README                       |   32 +++--
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |  139 ++++++++++++--------
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |    2 -
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |    4 +-
 5 files changed, 105 insertions(+), 76 deletions(-)

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

 etc/plugins.ini                                    |    3 -
 etc/quantum.conf                                   |    3 +
 etc/quantum.conf.test                              |   24 --
 etc/quantum/plugins/ryu/ryu.ini                    |   10 +-
 quantum/api/__init__.py                            |   12 +-
 quantum/api/v2/base.py                             |    2 +-
 quantum/api/v2/router.py                           |   14 +-
 quantum/common/config.py                           |  317 +++----------------
 quantum/common/utils.py                            |   57 +++-
 quantum/extensions/extensions.py                   |   15 +-
 quantum/manager.py                                 |   30 +-
 quantum/openstack/common/cfg.py                    |  319 +++++++++++++-------
 quantum/plugins/cisco/common/cisco_credentials.py  |    4 +-
 .../cisco/l2network_plugin_configuration.py        |    8 +-
 .../cisco/nexus/cisco_nexus_configuration.py       |    4 +-
 .../cisco/tests/unit/test_cisco_extension.py       |    6 +-
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    6 +-
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |    4 +-
 quantum/plugins/linuxbridge/common/config.py       |    4 +-
 quantum/plugins/linuxbridge/db/l2network_db.py     |    4 +-
 quantum/plugins/openvswitch/common/config.py       |    4 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    4 +-
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   18 +-
 quantum/plugins/ryu/common/__init__.py             |   15 +
 quantum/plugins/ryu/common/config.py               |   43 +++
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |   22 +-
 quantum/plugins/ryu/ryu_quantum_plugin.py          |   12 +-
 quantum/plugins/ryu/tests/unit/fake_plugin.py      |    4 +-
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |    9 +-
 quantum/policy.py                                  |    4 +-
 quantum/server/__init__.py                         |   25 +-
 quantum/service.py                                 |   45 +--
 quantum/tests/etc/quantum.conf.test                |   24 ++
 quantum/tests/unit/_test_api.py                    |   21 +-
 quantum/tests/unit/test_api_v2.py                  |   19 +-
 quantum/tests/unit/test_db_plugin.py               |   18 +-
 quantum/tests/unit/test_extensions.py              |   25 +-
 setup.py                                           |    2 +-
 38 files changed, 578 insertions(+), 582 deletions(-)

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

 quantum/api/v2/base.py               |    2 ++
 quantum/common/exceptions.py         |    9 ++++++
 quantum/db/db_base_plugin_v2.py      |   52 ++++++++++++++++++++++++++++------
 quantum/tests/unit/test_db_plugin.py |   35 +++++++++++++++++++++++
 4 files changed, 90 insertions(+), 8 deletions(-)

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

 etc/policy.json                    |   19 +++
 openstack-common.conf              |    2 +-
 quantum/api/v2/base.py             |   82 ++++++++++---
 quantum/common/exceptions.py       |    8 ++
 quantum/openstack/common/policy.py |  238 ++++++++++++++++++++++++++++++++++++
 quantum/policy.py                  |   93 ++++++++++++++
 6 files changed, 427 insertions(+), 15 deletions(-)

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

 quantum/extensions/portprofile.py            |   12 ++++++------
 quantum/plugins/cisco/common/cisco_faults.py |    4 ++--
 quantum/plugins/cisco/db/api.py              |    5 ++---
 3 files changed, 10 insertions(+), 11 deletions(-)

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

 quantum/common/utils.py |   96 -----------------------------------------------
 1 file changed, 96 deletions(-)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   34 ++++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    4 ++++
 quantum/plugins/openvswitch/common/config.py       |    2 ++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   19 ++++++++++++++-----
 .../openvswitch/tests/unit/test_vlan_map.py        |   12 ++++++------
 4 files changed, 26 insertions(+), 11 deletions(-)

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

 quantum/agent/linux/ovs_lib.py                     |   12 +-
 quantum/api/attachments.py                         |   10 +-
 quantum/api/faults.py                              |  150 +++++++-------
 quantum/api/networks.py                            |   16 +-
 quantum/api/ports.py                               |   16 +-
 quantum/api/v2/base.py                             |   14 +-
 quantum/api/v2/router.py                           |   12 +-
 quantum/api/versions.py                            |    4 +-
 quantum/api/views/filters.py                       |    7 +-
 quantum/api/views/networks.py                      |    4 +-
 quantum/api/views/ports.py                         |    3 +-
 quantum/common/config.py                           |   27 ++-
 quantum/common/test_lib.py                         |   16 +-
 quantum/common/utils.py                            |    3 +-
 quantum/context.py                                 |    4 +-
 quantum/db/db_base_plugin_v2.py                    |    2 +-
 quantum/db/models.py                               |    4 +-
 quantum/db/models_v2.py                            |    4 +-
 quantum/extensions/_pprofiles.py                   |   16 +-
 quantum/extensions/credential.py                   |    2 +-
 quantum/extensions/extensions.py                   |    8 +-
 quantum/extensions/multiport.py                    |    2 +-
 quantum/extensions/novatenant.py                   |    4 +-
 quantum/extensions/portprofile.py                  |   58 +++---
 quantum/extensions/portstats.py                    |    6 +-
 quantum/extensions/qos.py                          |    2 +-
 quantum/openstack/common/cfg.py                    |   35 ++--
 quantum/openstack/common/importutils.py            |    2 +-
 quantum/plugins/cisco/client/cli.py                |   12 +-
 quantum/plugins/cisco/common/cisco_exceptions.py   |    4 +-
 quantum/plugins/cisco/common/cisco_faults.py       |   21 +-
 quantum/plugins/cisco/common/cisco_utils.py        |    4 +-
 quantum/plugins/cisco/db/api.py                    |   78 ++++----
 quantum/plugins/cisco/db/l2network_db.py           |  206 ++++++++------------
 quantum/plugins/cisco/db/l2network_models.py       |   37 ++--
 quantum/plugins/cisco/db/models.py                 |    7 +-
 quantum/plugins/cisco/db/nexus_db.py               |   18 +-
 quantum/plugins/cisco/db/nexus_models.py           |    3 +-
 quantum/plugins/cisco/db/services_db.py            |   13 +-
 quantum/plugins/cisco/db/services_models.py        |    4 +-
 quantum/plugins/cisco/db/ucs_db.py                 |   40 ++--
 quantum/plugins/cisco/db/ucs_models.py             |    6 +-
 quantum/plugins/cisco/l2network_plugin.py          |    2 +-
 .../plugins/cisco/models/l2network_single_blade.py |    4 +-
 .../cisco/nova/quantum_port_aware_scheduler.py     |    2 +-
 quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
 .../cisco/segmentation/l2network_vlan_mgr.py       |    2 +-
 .../plugins/cisco/services/service_insertion.py    |   10 +-
 .../cisco/tests/unit/test_cisco_extension.py       |  100 +++++-----
 quantum/plugins/cisco/tests/unit/test_database.py  |    8 +-
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   51 ++---
 .../cisco/tests/unit/test_l2network_multi_blade.py |    4 +-
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  114 ++++++-----
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |   30 +--
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  178 ++++++++---------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    4 +-
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |    2 +-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   19 +-
 quantum/plugins/linuxbridge/common/utils.py        |    4 +-
 quantum/plugins/linuxbridge/db/l2network_db.py     |    5 +-
 .../tests/unit/_test_linuxbridgeAgent.py           |   84 ++++----
 .../nicira/nicira_nvp_plugin/NvpApiClient.py       |    6 +-
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |   37 ++--
 .../api_client/client_eventlet.py                  |    2 +-
 .../api_client/request_eventlet.py                 |   12 +-
 quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |   38 ++--
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |   22 +--
 .../nicira/nicira_nvp_plugin/tests/test_config.py  |    2 +-
 .../nicira/nicira_nvp_plugin/tests/test_network.py |    8 +-
 .../tests/test_nvp_api_request_eventlet.py         |    2 +-
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |   24 +--
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   11 +-
 quantum/plugins/openvswitch/ovs_models.py          |    3 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    4 +-
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   10 +-
 .../openvswitch/tests/unit/test_vlan_map.py        |    2 +-
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |    5 +-
 quantum/rootwrap/filters.py                        |    6 +-
 quantum/rootwrap/linuxbridge-agent.py              |    2 +-
 quantum/rootwrap/openvswitch-agent.py              |    2 +-
 quantum/rootwrap/ryu-agent.py                      |    2 +-
 quantum/rootwrap/wrapper.py                        |    3 +-
 quantum/tests/unit/_test_api.py                    |    9 +-
 quantum/tests/unit/extensions/foxinsocks.py        |    8 +-
 quantum/tests/unit/test_agent_utils.py             |    2 +-
 quantum/tests/unit/test_api.py                     |    9 +-
 quantum/tests/unit/test_db_plugin.py               |    3 +-
 quantum/tests/unit/test_extensions.py              |    6 +-
 quantum/tests/unit/test_ovs_lib.py                 |   64 +++---
 quantum/tests/unit/test_setup.py                   |    6 +-
 quantum/wsgi.py                                    |    6 +-
 tools/install_venv.py                              |    6 +-
 93 files changed, 909 insertions(+), 936 deletions(-)

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

 quantum/plugins/linuxbridge/db/l2network_models.py |    5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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

 quantum/plugins/cisco/client/cli.py |   15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

commit 0d3cfea2e193a17afbf65c765dabbbb5cf18fa9c
Author: Zhongyue Luo <lzyeval@gmail.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

 openstack-common.conf                 |    2 +-
 quantum/common/exceptions.py          |   34 +-------
 quantum/common/utils.py               |    2 +-
 quantum/openstack/common/exception.py |  147 +++++++++++++++++++++++++++++++++
 4 files changed, 153 insertions(+), 32 deletions(-)

commit 0311490b82479ef1e0d25350a17fe7a254e7a1c2
Author: Zhongyue Luo <lzyeval@gmail.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

 quantum/common/utils.py |   31 -------------------------------
 1 file changed, 31 deletions(-)

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

 quantum/api/v2/base.py               |   76 ++++++++++---
 quantum/api/v2/router.py             |   63 ++++++++---
 quantum/api/v2/views.py              |    6 +-
 quantum/db/db_base_plugin_v2.py      |   39 ++++---
 quantum/db/models_v2.py              |    8 +-
 quantum/quantum_plugin_base_v2.py    |   13 +--
 quantum/tests/unit/test_api_v2.py    |  165 +++++++++++++++++++++++++---
 quantum/tests/unit/test_db_plugin.py |  197 ++++++++++++++++++----------------
 tools/pip-requires                   |    1 +
 9 files changed, 404 insertions(+), 164 deletions(-)

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

 quantum/agent/linux/ovs_lib.py                     |   26 +---
 quantum/agent/linux/utils.py                       |   52 +++++++
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   72 +++++----
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   22 +--
 quantum/tests/unit/test_agent_utils.py             |   54 +++++++
 quantum/tests/unit/test_ovs_lib.py                 |  163 +++++++++++---------
 6 files changed, 247 insertions(+), 142 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 etc/quantum.conf                         |   11 +
 quantum/api/v2/__init__.py               |   14 +
 quantum/api/v2/base.py                   |  208 +++++++++++++
 quantum/api/v2/resource.py               |  126 ++++++++
 quantum/api/v2/router.py                 |  119 ++++++++
 quantum/api/v2/views.py                  |   40 +++
 quantum/api/versions.py                  |    6 +-
 quantum/common/exceptions.py             |   25 +-
 quantum/common/utils.py                  |   19 +-
 quantum/db/api.py                        |   29 +-
 quantum/db/db_base_plugin_v2.py          |  295 ++++++++++++++++++
 quantum/db/model_base.py                 |   72 +++++
 quantum/db/models.py                     |   45 +--
 quantum/db/models_v2.py                  |   72 +++++
 quantum/manager.py                       |   56 ++--
 quantum/plugins/sample/SamplePluginV2.py |  121 ++++++++
 quantum/quantum_plugin_base_v2.py        |  195 ++++++++++++
 quantum/tests/unit/test_api_v2.py        |  486 ++++++++++++++++++++++++++++++
 quantum/tests/unit/test_db_plugin.py     |  317 +++++++++++++++++++
 quantum/wsgi.py                          |   37 +++
 tools/pip-requires                       |    2 +-
 tools/test-requires                      |    2 +-
 22 files changed, 2210 insertions(+), 87 deletions(-)

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

 quantum/server/__init__.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 .coveragerc                       |    6 ++++
 quantum/openstack/common/setup.py |   58 +++++++++++++++++++++++++++++++++++--
 setup.cfg                         |   10 +++----
 setup.py                          |   25 ++++++----------
 tools/install_venv.py             |    3 +-
 tox.ini                           |   41 +++++++++-----------------
 6 files changed, 91 insertions(+), 52 deletions(-)

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

 .gitignore |    1 +
 setup.cfg  |    5 +++++
 2 files changed, 6 insertions(+)

commit dee8bd1a107da26b528cb4350f009cd8d31028aa
Author: Zhongyue Luo <lzyeval@gmail.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

 quantum/common/test_lib.py                         |    2 --
 quantum/extensions/multiport.py                    |    1 -
 quantum/plugins/cisco/client/cli.py                |    2 --
 quantum/plugins/cisco/common/cisco_configparser.py |    2 --
 quantum/plugins/cisco/common/cisco_credentials.py  |    1 -
 quantum/plugins/cisco/common/cisco_utils.py        |    4 ----
 quantum/plugins/cisco/db/l2network_db.py           |    3 ---
 quantum/plugins/cisco/db/services_db.py            |    1 -
 quantum/plugins/cisco/l2network_plugin.py          |    1 -
 .../cisco/l2network_plugin_configuration.py        |    2 --
 .../plugins/cisco/models/l2network_multi_blade.py  |    3 ---
 .../plugins/cisco/models/l2network_single_blade.py |    3 ---
 .../cisco/nexus/cisco_nexus_configuration.py       |    1 -
 .../cisco/nexus/cisco_nexus_network_driver.py      |    1 -
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    2 --
 .../cisco/nova/quantum_port_aware_scheduler.py     |    1 -
 quantum/plugins/cisco/run_tests.py                 |    1 -
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    2 --
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    1 -
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |    2 --
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 --
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    1 -
 quantum/plugins/linuxbridge/db/l2network_models.py |    4 ----
 quantum/plugins/linuxbridge/run_tests.py           |    4 ----
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 --
 quantum/plugins/openvswitch/ovs_db.py              |    1 -
 quantum/plugins/openvswitch/ovs_models.py          |    6 +-----
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    2 --
 quantum/plugins/openvswitch/run_tests.py           |    3 ---
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |    1 -
 quantum/plugins/ryu/db/models.py                   |    1 -
 quantum/plugins/ryu/run_tests.py                   |    3 ---
 quantum/plugins/ryu/tests/unit/basetest.py         |    1 -
 quantum/tests/unit/test_api.py                     |    2 +-
 34 files changed, 2 insertions(+), 67 deletions(-)

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 <lzyeval@gmail.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

 openstack-common.conf                              |    2 +-
 quantum/common/utils.py                            |    9 --
 quantum/openstack/common/jsonutils.py              |  133 ++++++++++++++++++++
 .../cisco/tests/unit/test_cisco_extension.py       |   72 +++++------
 .../api_client/request_eventlet.py                 |    4 +-
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |   64 ++++++----
 .../nicira/nicira_nvp_plugin/tests/test_network.py |    6 +-
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |    9 +-
 quantum/tests/unit/extensions/foxinsocks.py        |   10 +-
 quantum/tests/unit/test_api.py                     |    4 +-
 quantum/tests/unit/test_extensions.py              |   37 +++---
 quantum/wsgi.py                                    |   10 +-
 12 files changed, 248 insertions(+), 112 deletions(-)

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

 tools/test-requires |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

 etc/quantum.conf                |   17 +++---
 quantum/auth.py                 |   52 ++++++++++++++++++
 quantum/context.py              |  113 +++++++++++++++++++++++++++++++++++++++
 quantum/tests/unit/test_auth.py |   90 +++++++++++++++++++++++++++++++
 4 files changed, 263 insertions(+), 9 deletions(-)

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

 quantum/common/utils.py |   44 +++-----------------------------------------
 1 file changed, 3 insertions(+), 41 deletions(-)

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

 quantum/agent/__init__.py                          |   16 ++
 quantum/agent/linux/__init__.py                    |   16 ++
 quantum/agent/linux/ovs_lib.py                     |  214 +++++++++++++++++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  194 ++-------------
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   31 +--
 quantum/tests/unit/test_ovs_lib.py                 |  250 ++++++++++++++++++++
 6 files changed, 525 insertions(+), 196 deletions(-)

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

 .../plugins/openvswitch/agent/xenserver_install.sh |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

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

 quantum/plugins/openvswitch/common/config.py |    2 +-
 quantum/tests/unit/test_ovs_config.py        |  117 ++++++++++++++++++++++++++
 2 files changed, 118 insertions(+), 1 deletion(-)

commit 366ac6036efe5ba23e4cea0558dbe6439244793c
Author: Zhongyue Luo <lzyeval@gmail.com>
Date:   Mon Jun 4 11:32:17 2012 +0800

    Quantum should use openstack.common.importutils
    
    Implements blueprint use-common-importutils
    
    Change-Id: Ib71a557ea6090d5c8d789b1e4c7b17855f7ee814

 openstack-common.conf                              |    2 +-
 quantum/common/utils.py                            |   21 ----------
 quantum/manager.py                                 |    3 +-
 quantum/openstack/common/importutils.py            |   44 ++++++++++++++++++++
 quantum/plugins/cisco/l2network_plugin.py          |    6 +--
 .../plugins/cisco/models/l2network_multi_blade.py  |   10 ++---
 .../plugins/cisco/models/l2network_single_blade.py |   10 ++---
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    4 +-
 .../plugins/cisco/services/services_logistics.py   |    6 +--
 .../cisco/tests/unit/test_l2network_multi_blade.py |    6 +--
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    4 +-
 quantum/tests/unit/_test_api.py                    |    4 +-
 12 files changed, 72 insertions(+), 48 deletions(-)

commit 7b38df15a1cc324414c52ee26015c163df0f4e3c
Author: Jason Kölker <jason@koelker.net>
Date:   Fri Jun 1 10:50:36 2012 -0500

    PEP8 fixes
    
    Change-Id: Iab4c2ada2bfcb99452f940666b25cb1f7d4d7e58

 quantum/api/api_common.py                          |    2 +-
 quantum/api/views/filters.py                       |    3 ++-
 quantum/common/utils.py                            |    7 ++++---
 quantum/openstack/common/setup.py                  |    4 ++--
 quantum/plugins/cisco/db/l2network_db.py           |    4 ++--
 quantum/plugins/cisco/db/services_db.py            |    2 +-
 quantum/plugins/cisco/db/ucs_db.py                 |    5 +++--
 quantum/plugins/cisco/l2network_plugin.py          |    2 +-
 quantum/plugins/cisco/nova/vifdirect.py            |   16 ++++++++--------
 .../plugins/cisco/services/service_insertion.py    |    4 ++--
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |    2 +-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    6 +++---
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |    4 ++--
 quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |    2 +-
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |    2 +-
 setup.py                                           |    9 +++------
 16 files changed, 37 insertions(+), 37 deletions(-)

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

 tools/pip-requires  |    2 +-
 tools/test-requires |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 doc/__init__.py        |   13 -------------
 doc/source/__init__.py |   13 -------------
 doc/source/conf.py     |   14 +++++++-------
 3 files changed, 7 insertions(+), 33 deletions(-)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    2 +-
 quantum/plugins/linuxbridge/common/config.py       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |   10 +---------
 .../tests/unit/_test_linuxbridgeAgent.py           |   17 +++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

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

 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    1 -
 1 file changed, 1 deletion(-)

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

 doc/source/devref/common.rst                       |   25 +
 doc/source/index.rst                               |    1 +
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |   20 +-
 openstack-common.conf                              |    2 +-
 quantum/openstack/common/cfg.py                    | 1489 ++++++++++++++++++++
 quantum/openstack/common/iniparser.py              |  126 ++
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |    1 -
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   40 +-
 quantum/plugins/linuxbridge/common/config.py       |   50 +
 quantum/plugins/linuxbridge/common/configparser.py |   31 -
 quantum/plugins/linuxbridge/db/l2network_db.py     |   15 +-
 .../plugins/linuxbridge/plugin_configuration.py    |   44 -
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   70 +-
 quantum/plugins/openvswitch/common/__init__.py     |   15 +
 quantum/plugins/openvswitch/common/config.py       |   44 +
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   16 +-
 16 files changed, 1798 insertions(+), 191 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    6 ------
 1 file changed, 6 deletions(-)

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

 quantum/api/__init__.py                     |    1 +
 quantum/api/api_common.py                   |    2 ++
 quantum/api/attachments.py                  |   18 +++++-------------
 quantum/api/networks.py                     |   18 +++++-------------
 quantum/api/ports.py                        |   16 +++++-----------
 quantum/api/versions.py                     |    8 ++++++--
 quantum/common/utils.py                     |    8 --------
 quantum/extensions/extensions.py            |    6 +++---
 quantum/plugins/cisco/db/api.py             |   10 +++++-----
 quantum/service.py                          |    4 +++-
 quantum/tests/unit/extensions/foxinsocks.py |    6 +++---
 quantum/tests/unit/test_extensions.py       |    3 ---
 quantum/wsgi.py                             |    2 +-
 13 files changed, 39 insertions(+), 63 deletions(-)

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

 .../linuxbridge/tests/unit/test_database.py        |  128 --------------------
 quantum/tests/unit/database_stubs.py               |    3 +-
 quantum/tests/unit/test_database.py                |   14 +++
 3 files changed, 15 insertions(+), 130 deletions(-)

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

 quantum/common/config.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 --
 1 file changed, 2 deletions(-)

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

 doc/source/_static/basic.css       |  416 ++++++++++++++++++++++++++++++++++++
 doc/source/_static/default.css     |  230 ++++++++++++++++++++
 doc/source/_static/jquery.tweet.js |  154 +++++++++++++
 doc/source/_static/tweaks.css      |  218 +++++++++++++++++++
 doc/source/_theme/layout.html      |   83 +++++++
 doc/source/_theme/theme.conf       |    5 +
 doc/source/conf.py                 |   18 +-
 doc/source/devref/index.rst        |   23 ++
 doc/source/index.rst               |   40 +++-
 doc/source/man/quantum-server.rst  |   75 +++++++
 10 files changed, 1248 insertions(+), 14 deletions(-)

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

 quantum/plugins/linuxbridge/db/l2network_models.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

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

 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   50 +++++++++++++-------
 1 file changed, 34 insertions(+), 16 deletions(-)

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

 quantum/plugins/cisco/client/cli.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 .../cisco/nova/quantum_port_aware_scheduler.py     |    1 +
 1 file changed, 1 insertion(+)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |   10 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  352 ++++++++++----------
 quantum/plugins/openvswitch/ovs_models.py          |   13 +
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   41 ---
 4 files changed, 198 insertions(+), 218 deletions(-)

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

 .gitignore                        |    1 +
 MANIFEST.in                       |    2 +-
 quantum/openstack/common/setup.py |   29 +++++++++++++++----
 quantum/tests/unit/test_setup.py  |   57 +++++++++++++++++++++++++++++++++++++
 setup.py                          |    2 ++
 5 files changed, 85 insertions(+), 6 deletions(-)

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

 .../plugins/linuxbridge/linuxbridge_conf.ini       |   21 ++++++++------------
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    7 ++++---
 quantum/db/api.py                                  |   21 ++++++++++++++++++--
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   21 ++++++--------------
 quantum/plugins/linuxbridge/db/l2network_db.py     |   12 ++---------
 .../plugins/linuxbridge/plugin_configuration.py    |   12 +++++------
 .../tests/unit/_test_linuxbridgeAgent.py           |    3 +++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    5 +++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    6 ++++++
 9 files changed, 56 insertions(+), 52 deletions(-)

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

 quantum/common/config.py |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

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

 .../plugins/openvswitch/agent/xenserver_install.sh |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

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

 TESTING                         |    9 +++++++++
 quantum/api/faults.py           |    2 +-
 quantum/tests/unit/_test_api.py |   24 +++++++++++++++++++++++-
 quantum/wsgi.py                 |    6 ++++++
 tools/pip-requires              |    1 -
 tools/test-requires             |    2 ++
 6 files changed, 41 insertions(+), 3 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    8 ++++++++
 1 file changed, 8 insertions(+)

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

 quantum/api/api_common.py                          |    4 ++-
 quantum/api/attachments.py                         |    2 +-
 quantum/api/networks.py                            |    2 +-
 quantum/api/ports.py                               |    2 +-
 quantum/api/versions.py                            |    3 +-
 quantum/api/views/filters.py                       |    2 +-
 quantum/common/config.py                           |    1 -
 quantum/db/api.py                                  |    4 ++-
 quantum/extensions/extensions.py                   |    2 +-
 quantum/manager.py                                 |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    1 -
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |    5 ---
 quantum/service.py                                 |    2 +-
 quantum/tests/unit/test_api.py                     |   33 --------------------
 quantum/tests/unit/test_database.py                |    5 ---
 quantum/tests/unit/test_extensions.py              |    4 ---
 quantum/wsgi.py                                    |    2 +-
 17 files changed, 16 insertions(+), 60 deletions(-)

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

 .../plugins/linuxbridge/linuxbridge_conf.ini       |    6 +-
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    4 +
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |  137 ++++++++++++--------
 .../tests/unit/_test_linuxbridgeAgent.py           |    2 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  121 ++++++++++++-----
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   14 +-
 6 files changed, 187 insertions(+), 97 deletions(-)

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

 quantum/__init__.py                                |    5 +
 quantum/api/__init__.py                            |   18 +-
 quantum/api/api_common.py                          |    1 +
 quantum/api/attachments.py                         |   35 +-
 quantum/api/faults.py                              |   17 +-
 quantum/api/networks.py                            |   73 +--
 quantum/api/ports.py                               |   57 +-
 quantum/common/config.py                           |   22 +-
 quantum/common/exceptions.py                       |   12 +-
 quantum/common/flags.py                            |    2 +-
 quantum/common/test_lib.py                         |    9 +-
 quantum/common/utils.py                            |   28 +-
 quantum/db/api.py                                  |   73 +--
 quantum/db/models.py                               |    6 +-
 quantum/extensions/_credential_view.py             |    6 +-
 quantum/extensions/_novatenant_view.py             |    3 +-
 quantum/extensions/_portstats_view.py              |    2 -
 quantum/extensions/_pprofiles.py                   |   21 +-
 quantum/extensions/_qos_view.py                    |    6 +-
 quantum/extensions/credential.py                   |   50 +-
 quantum/extensions/extensions.py                   |   36 +-
 quantum/extensions/multiport.py                    |   37 +-
 quantum/extensions/novatenant.py                   |   54 +-
 quantum/extensions/portprofile.py                  |    8 +-
 quantum/extensions/portstats.py                    |   19 +-
 quantum/extensions/qos.py                          |   47 +-
 quantum/manager.py                                 |   23 +-
 quantum/plugins/cisco/__init__.py                  |    2 -
 quantum/plugins/cisco/client/__init__.py           |    3 -
 quantum/plugins/cisco/client/cli.py                |   88 +--
 quantum/plugins/cisco/common/__init__.py           |    3 -
 quantum/plugins/cisco/common/cisco_configparser.py |    4 +-
 quantum/plugins/cisco/common/cisco_constants.py    |    4 +-
 quantum/plugins/cisco/common/cisco_credentials.py  |    6 +-
 quantum/plugins/cisco/common/cisco_exceptions.py   |   60 +-
 quantum/plugins/cisco/common/cisco_faults.py       |   14 +-
 quantum/plugins/cisco/common/cisco_utils.py        |    7 +-
 quantum/plugins/cisco/l2device_inventory_base.py   |    5 +-
 quantum/plugins/cisco/l2device_plugin_base.py      |    5 +-
 quantum/plugins/cisco/l2network_model_base.py      |    5 +-
 quantum/plugins/cisco/l2network_plugin.py          |   36 +-
 .../cisco/l2network_plugin_configuration.py        |   19 +-
 .../plugins/cisco/l2network_segmentation_base.py   |    5 +-
 quantum/plugins/cisco/models/__init__.py           |    3 -
 .../plugins/cisco/models/l2network_multi_blade.py  |   47 +-
 .../plugins/cisco/models/l2network_single_blade.py |   20 +-
 .../cisco/nexus/cisco_nexus_configuration.py       |    1 +
 .../cisco/nexus/cisco_nexus_network_driver.py      |    5 +-
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   13 +-
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    1 +
 .../cisco/nova/quantum_port_aware_scheduler.py     |   29 +-
 quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
 quantum/plugins/cisco/run_tests.py                 |    3 +
 quantum/plugins/cisco/segmentation/__init__.py     |    2 -
 .../cisco/segmentation/l2network_vlan_mgr.py       |    8 +-
 .../plugins/cisco/services/service_insertion.py    |   94 +--
 .../plugins/cisco/services/services_constants.py   |    3 +-
 .../plugins/cisco/services/services_logistics.py   |   13 +-
 .../cisco/tests/unit/test_cisco_extension.py       |  602 ++++++++++++--------
 quantum/plugins/cisco/tests/unit/test_database.py  |  137 ++---
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |  323 ++++++-----
 .../cisco/tests/unit/test_l2network_multi_blade.py |   68 +--
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |   45 +-
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  112 ++--
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |   19 +-
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  323 ++++++-----
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |   27 +-
 quantum/plugins/cisco/ucs/__init__.py              |    2 -
 quantum/plugins/cisco/ucs/cisco_getvif.py          |   26 +-
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    8 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  308 +++++-----
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |    4 +-
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |   80 ++-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   59 +-
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |   16 +-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   61 +-
 quantum/plugins/linuxbridge/common/__init__.py     |    3 -
 quantum/plugins/linuxbridge/common/configparser.py |    5 +-
 quantum/plugins/linuxbridge/common/constants.py    |    4 +-
 quantum/plugins/linuxbridge/common/exceptions.py   |   24 +-
 quantum/plugins/linuxbridge/common/utils.py        |   23 +-
 quantum/plugins/linuxbridge/db/l2network_db.py     |   93 ++-
 quantum/plugins/linuxbridge/db/l2network_models.py |    8 +-
 .../plugins/linuxbridge/plugin_configuration.py    |    2 -
 quantum/plugins/linuxbridge/run_tests.py           |    3 +-
 .../tests/unit/_test_linuxbridgeAgent.py           |  239 ++++----
 .../linuxbridge/tests/unit/test_database.py        |   18 +-
 .../nicira/nicira_nvp_plugin/NvpApiClient.py       |   46 +-
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |  171 +++---
 .../api_client/client_eventlet.py                  |   62 +-
 .../nicira/nicira_nvp_plugin/api_client/common.py  |    2 +-
 .../nicira/nicira_nvp_plugin/api_client/request.py |    1 -
 .../api_client/request_eventlet.py                 |   73 +--
 quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |   11 +-
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |   66 ++-
 .../nicira/nicira_nvp_plugin/tests/test_check.py   |    5 +-
 .../nicira/nicira_nvp_plugin/tests/test_config.py  |   44 +-
 .../nicira/nicira_nvp_plugin/tests/test_network.py |   24 +-
 .../nicira_nvp_plugin/tests/test_nvp_api_common.py |    5 +-
 .../tests/test_nvp_api_request.py                  |    5 +-
 .../tests/test_nvp_api_request_eventlet.py         |   31 +-
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |  103 ++--
 quantum/plugins/openvswitch/README                 |    4 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   95 +--
 quantum/plugins/openvswitch/ovs_db.py              |   13 +-
 quantum/plugins/openvswitch/ovs_models.py          |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   62 +-
 quantum/plugins/openvswitch/run_tests.py           |    7 +-
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   14 +-
 .../openvswitch/tests/unit/test_vlan_map.py        |    6 +-
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   17 +-
 quantum/plugins/ryu/nova/linux_net.py              |   11 +-
 quantum/plugins/ryu/nova/vif.py                    |    8 +-
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |   11 +-
 quantum/plugins/ryu/run_tests.py                   |    3 +-
 quantum/plugins/ryu/ryu_quantum_plugin.py          |   11 +-
 quantum/plugins/ryu/tests/unit/test_plugin_base.py |    3 +-
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |    2 +-
 quantum/plugins/ryu/tests/unit/utils.py            |    3 +-
 quantum/plugins/sample/SamplePlugin.py             |   11 +-
 quantum/quantum_plugin_base.py                     |    4 +-
 quantum/rootwrap/filters.py                        |   17 +-
 quantum/server/__init__.py                         |    8 +-
 quantum/service.py                                 |   25 +-
 quantum/tests/unit/__init__.py                     |    4 +-
 quantum/tests/unit/_test_api.py                    |  274 ++++-----
 quantum/tests/unit/extension_stubs.py              |    3 +-
 quantum/tests/unit/extensions/foxinsocks.py        |   10 +-
 quantum/tests/unit/runtime_flags.py                |    1 +
 quantum/tests/unit/test_api.py                     |   53 +-
 quantum/tests/unit/test_database.py                |    4 +-
 quantum/tests/unit/test_extensions.py              |   67 ++-
 quantum/tests/unit/test_flags.py                   |    4 +-
 quantum/tests/unit/testlib_api.py                  |   72 ++-
 quantum/wsgi.py                                    |   13 +-
 135 files changed, 2696 insertions(+), 2617 deletions(-)

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

 etc/quantum.conf |   27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

 tools/pip-requires |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/__init__.py                         |    3 -
 quantum/common/__init__.py                  |   16 ++
 quantum/common/config.py                    |  345 +++++++++++++++++++++++++++
 quantum/common/exceptions.py                |  114 +++++++++
 quantum/common/flags.py                     |  249 +++++++++++++++++++
 quantum/common/test_lib.py                  |  291 ++++++++++++++++++++++
 quantum/common/utils.py                     |  267 +++++++++++++++++++++
 quantum/plugins/cisco/client/cli.py         |   13 +-
 quantum/server/__init__.py                  |    7 -
 quantum/tests/unit/client_tools/__init__.py |   15 --
 quantum/tests/unit/client_tools/stubs.py    |   65 -----
 quantum/tests/unit/testlib_api.py           |    2 +-
 tools/pip-requires                          |    2 -
 13 files changed, 1286 insertions(+), 103 deletions(-)

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

 tools/test-requires |    1 +
 1 file changed, 1 insertion(+)

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

 HACKING.rst |  202 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 202 insertions(+)

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

 quantum/api/versions.py           |    3 +++
 quantum/tests/unit/test_api.py    |   37 ++++++++++++++++++++++++++++++++++---
 quantum/tests/unit/testlib_api.py |    5 ++---
 3 files changed, 39 insertions(+), 6 deletions(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   30 +++++++++++------
 .../openvswitch/tests/unit/test_vlan_map.py        |   35 +++++++++++++++-----
 2 files changed, 46 insertions(+), 19 deletions(-)

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

 MANIFEST.in |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

 .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 18aa80234864a1bf7d4c343d203469705d08f8f2
Author: Thierry Carrez <thierry@openstack.org>
Date:   Fri Mar 16 23:19:22 2012 +0100

    Open Folsom
    
    Change-Id: Ic594468be5b3c79a8e3d97b6a81668a0db98885b

 quantum/version.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/plugins/cisco/README                       |  877 ++++++++++----------
 .../cisco/nova/quantum_port_aware_scheduler.py     |   61 +-
 quantum/plugins/cisco/nova/vifdirect.py            |   50 +-
 3 files changed, 499 insertions(+), 489 deletions(-)

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>

 quantum/plugins/ryu/agent/ryu_quantum_agent.py |    1 +
 1 file changed, 1 insertion(+)

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

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 .gitignore                        |    2 +
 openstack-common.conf             |    7 ++
 quantum/openstack/common/setup.py |  127 +++++++++++++++++++++++++++++++++++++
 setup.py                          |   70 ++++++++------------
 tools/install_venv.py             |    3 +
 tools/pip-requires                |   10 ---
 tools/test-requires               |    9 +++
 tox.ini                           |   23 ++++---
 8 files changed, 189 insertions(+), 62 deletions(-)

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

 quantum/plugins/ryu/nova/linux_net.py |   41 +++++++++------------------------
 quantum/plugins/ryu/nova/vif.py       |    2 +-
 2 files changed, 12 insertions(+), 31 deletions(-)

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>

 bin/quantum-rootwrap                               |   73 ++++++++++
 .../plugins/linuxbridge/linuxbridge_conf.ini       |    3 +
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    9 ++
 etc/quantum/plugins/ryu/ryu.ini                    |    5 +
 quantum/plugins/linuxbridge/README                 |   13 +-
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |   21 ++-
 .../tests/unit/_test_linuxbridgeAgent.py           |   13 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   30 ++--
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |   27 ++--
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |   17 ++-
 quantum/rootwrap/__init__.py                       |   16 +++
 quantum/rootwrap/filters.py                        |  143 ++++++++++++++++++++
 quantum/rootwrap/linuxbridge-agent.py              |   46 +++++++
 quantum/rootwrap/openvswitch-agent.py              |   36 +++++
 quantum/rootwrap/ryu-agent.py                      |   31 +++++
 quantum/rootwrap/wrapper.py                        |   63 +++++++++
 16 files changed, 508 insertions(+), 38 deletions(-)

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

 MANIFEST.in |    7 +++++++
 1 file changed, 7 insertions(+)

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

 quantum/api/api_common.py       |   30 ++++++++++++++++++++++++------
 quantum/tests/unit/_test_api.py |   10 +++++++---
 quantum/tests/unit/test_api.py  |    3 +++
 3 files changed, 34 insertions(+), 9 deletions(-)

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

 quantum/extensions/credential.py                   |   17 +++++++-----
 quantum/extensions/multiport.py                    |   14 ++++++----
 quantum/extensions/novatenant.py                   |   25 +++++++++++------
 quantum/extensions/portprofile.py                  |   28 +++++++++++++-------
 quantum/extensions/qos.py                          |   15 +++++++----
 quantum/plugins/cisco/client/cli.py                |    8 ++++--
 quantum/plugins/cisco/db/api.py                    |    2 +-
 quantum/plugins/cisco/db/l2network_models.py       |    3 +--
 .../plugins/cisco/models/l2network_multi_blade.py  |   10 ++++---
 quantum/plugins/cisco/run_tests.py                 |   22 +++++++--------
 .../cisco/tests/unit/test_cisco_extension.py       |   18 ++++++++-----
 .../cisco/tests/unit/test_l2network_multi_blade.py |   26 +++++++-----------
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    8 +++---
 13 files changed, 115 insertions(+), 81 deletions(-)

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

 quantum/db/api.py |   39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

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

 .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 .../docbkx/quantum-api-1.0/quantum-api-guide.xml   |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 tools/pip-requires |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/plugins/linuxbridge/README                 |   16 +--
 .../linuxbridge/nova/linux_net_linux_bridge.py     |  117 --------------------
 .../linuxbridge/nova/vif_linuxbridge_quantum.py    |   73 ------------
 3 files changed, 8 insertions(+), 198 deletions(-)

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

 quantum/plugins/openvswitch/README |  177 +-----------------------------------
 1 file changed, 4 insertions(+), 173 deletions(-)

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

 doc/source/conf.py |    2 ++
 1 file changed, 2 insertions(+)

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

 MANIFEST.in |    3 +++
 1 file changed, 3 insertions(+)

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

 MANIFEST.in |    1 +
 1 file changed, 1 insertion(+)

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

 quantum/plugins/cisco/db/api.py           |   16 ++++++++++++++++
 quantum/plugins/cisco/l2network_plugin.py |   11 +++++++++++
 2 files changed, 27 insertions(+)

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

 quantum/db/api.py                                 |   16 ++++++
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py  |   10 ++++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   12 ++++-
 quantum/plugins/ryu/ovs_quantum_plugin_base.py    |   10 ++++
 quantum/plugins/sample/SamplePlugin.py            |    5 ++
 quantum/tests/unit/_test_api.py                   |   56 +++++++++++++++++++++
 6 files changed, 108 insertions(+), 1 deletion(-)

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

 quantum/wsgi.py    |    1 +
 setup.py           |    3 +--
 tools/pip-requires |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

 MANIFEST.in                                        |    1 +
 bin/quantum-ryu-agent                              |   24 ++
 etc/quantum/plugins/ryu/ryu.ini                    |   13 +
 quantum/db/api.py                                  |    5 +
 quantum/plugins/ryu/README                         |   28 ++
 quantum/plugins/ryu/agent/ryu_quantum_agent.py     |  312 ++++++++++++++++++++
 quantum/plugins/ryu/db/api.py                      |   27 ++
 quantum/plugins/ryu/db/models.py                   |   38 +++
 quantum/plugins/ryu/nova/firewall.py               |   29 ++
 quantum/plugins/ryu/nova/linux_net.py              |   90 ++++++
 quantum/plugins/ryu/nova/vif.py                    |   80 +++++
 quantum/plugins/ryu/ofp_service_type.py            |   19 ++
 quantum/plugins/ryu/ovs_quantum_plugin_base.py     |  172 +++++++++++
 quantum/plugins/ryu/run_tests.py                   |   84 ++++++
 quantum/plugins/ryu/ryu_quantum_plugin.py          |   68 +++++
 quantum/plugins/ryu/tests/unit/basetest.py         |   43 +++
 quantum/plugins/ryu/tests/unit/fake_plugin.py      |   35 +++
 quantum/plugins/ryu/tests/unit/fake_rest_nw_id.py  |   17 ++
 quantum/plugins/ryu/tests/unit/fake_ryu_client.py  |   46 +++
 quantum/plugins/ryu/tests/unit/test_plugin_base.py |   54 ++++
 quantum/plugins/ryu/tests/unit/test_ryu_driver.py  |   73 +++++
 quantum/plugins/ryu/tests/unit/utils.py            |   73 +++++
 setup.py                                           |   12 +-
 tools/pip-requires                                 |    1 +
 24 files changed, 1340 insertions(+), 4 deletions(-)

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

 tools/install_venv.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/db/api.py               |    6 +++++-
 quantum/tests/unit/_test_api.py |   14 ++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |   48 ++-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  398 +++++++++++++++++++-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    1 +
 .../plugins/openvswitch/tests/unit/test_tunnel.py  |  202 ++++++++++
 tools/pip-requires                                 |    1 +
 5 files changed, 637 insertions(+), 13 deletions(-)

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

 MANIFEST.in                                        |    1 +
 etc/quantum/plugins/nicira/nvp.ini                 |   36 ++
 .../nicira/nicira_nvp_plugin/NvpApiClient.py       |  204 +++++++
 .../nicira/nicira_nvp_plugin/QuantumPlugin.py      |  593 ++++++++++++++++++++
 quantum/plugins/nicira/nicira_nvp_plugin/README    |   24 +
 .../plugins/nicira/nicira_nvp_plugin/__init__.py   |   13 +
 .../nicira/nicira_nvp_plugin/api_client/client.py  |   69 +++
 .../api_client/client_eventlet.py                  |  226 ++++++++
 .../nicira/nicira_nvp_plugin/api_client/common.py  |   30 +
 .../nicira/nicira_nvp_plugin/api_client/request.py |   44 ++
 .../api_client/request_eventlet.py                 |  362 ++++++++++++
 quantum/plugins/nicira/nicira_nvp_plugin/cli.py    |  131 +++++
 quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py |  402 +++++++++++++
 .../nicira/nicira_nvp_plugin/tests/test_check.py   |   36 ++
 .../nicira/nicira_nvp_plugin/tests/test_config.py  |  239 ++++++++
 .../nicira/nicira_nvp_plugin/tests/test_network.py |  197 +++++++
 .../nicira_nvp_plugin/tests/test_nvp_api_common.py |   40 ++
 .../tests/test_nvp_api_request.py                  |   36 ++
 .../tests/test_nvp_api_request_eventlet.py         |  353 ++++++++++++
 .../nicira/nicira_nvp_plugin/tests/test_port.py    |  509 +++++++++++++++++
 setup.py                                           |    3 +
 21 files changed, 3548 insertions(+)

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

 quantum/tests/unit/__init__.py        |    8 ++++++++
 quantum/tests/unit/test_extensions.py |    8 --------
 2 files changed, 8 insertions(+), 8 deletions(-)

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>

 MANIFEST.in                                        |   13 ++-
 bin/quantum-linuxbridge-agent                      |   24 +++++
 bin/quantum-openvswitch-agent                      |   24 +++++
 quantum/plugins/linuxbridge/README                 |   19 +---
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |    7 +-
 .../linuxbridge/nova/linux_net_linux_bridge.py     |    2 +-
 .../linuxbridge/nova/vif_linuxbridge_quantum.py    |    4 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    6 +-
 setup.py                                           |    4 +
 setup_cisco_plugin.py                              |   74 ----------------
 setup_openvswitch_plugin.py                        |   65 --------------
 setup_sample_plugin.py                             |   51 -----------
 setup_server.py                                    |   92 --------------------
 13 files changed, 78 insertions(+), 307 deletions(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 MANIFEST.in                                        |    1 +
 .../plugins/linuxbridge/linuxbridge_conf.ini       |   24 +
 quantum/plugins/linuxbridge/LinuxBridgePlugin.py   |  257 +++++++++++
 quantum/plugins/linuxbridge/README                 |  155 +++++++
 .../linuxbridge/agent/linuxbridge_quantum_agent.py |  470 ++++++++++++++++++++
 quantum/plugins/linuxbridge/common/__init__.py     |   20 +
 quantum/plugins/linuxbridge/common/configparser.py |   34 ++
 quantum/plugins/linuxbridge/common/constants.py    |   65 +++
 quantum/plugins/linuxbridge/common/exceptions.py   |   72 +++
 quantum/plugins/linuxbridge/common/utils.py        |   50 +++
 quantum/plugins/linuxbridge/db/__init__.py         |   18 +
 quantum/plugins/linuxbridge/db/l2network_db.py     |  255 +++++++++++
 quantum/plugins/linuxbridge/db/l2network_models.py |   57 +++
 .../linuxbridge/nova/linux_net_linux_bridge.py     |  117 +++++
 .../linuxbridge/nova/vif_linuxbridge_quantum.py    |   73 +++
 .../plugins/linuxbridge/plugin_configuration.py    |   48 ++
 quantum/plugins/linuxbridge/run_tests.py           |   81 ++++
 .../tests/unit/_test_linuxbridgeAgent.py           |  451 +++++++++++++++++++
 .../linuxbridge/tests/unit/test_database.py        |  362 +++++++++++++++
 setup.py                                           |    3 +
 20 files changed, 2613 insertions(+)

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>

 setup.py |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/api/networks.py |    2 +-
 quantum/api/ports.py    |    2 +-
 tools/pip-requires      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

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

 quantum/api/networks.py |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

 tox.ini |   21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

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

 tools/pip-requires |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

 .bzrignore                                        |    2 +-
 quantum/api/networks.py                           |   30 ++-
 quantum/api/ports.py                              |   29 ++-
 quantum/api/views/filters.py                      |  160 +++++++++++++
 quantum/plugins/cisco/l2network_plugin.py         |    4 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    5 +-
 quantum/plugins/sample/SamplePlugin.py            |   12 +-
 quantum/quantum_plugin_base.py                    |   17 +-
 quantum/tests/unit/_test_api.py                   |   89 ++++----
 quantum/tests/unit/test_api.py                    |  254 ++++++++++++++++++++-
 quantum/tests/unit/testlib_api.py                 |   29 ++-
 11 files changed, 564 insertions(+), 67 deletions(-)

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

 .gitignore                                         |    2 +-
 bin/quantum                                        |   24 -
 etc/quantum.conf                                   |    2 +-
 etc/quantum/plugins/cisco/quantum.conf.ciscoext    |    2 +-
 quantum/client/__init__.py                         |  359 -----------
 quantum/client/cli.py                              |  167 ------
 quantum/client/cli_lib.py                          |  335 -----------
 quantum/common/__init__.py                         |   16 -
 quantum/common/config.py                           |  327 ----------
 quantum/common/exceptions.py                       |  178 ------
 quantum/common/extensions.py                       |  545 -----------------
 quantum/common/flags.py                            |  249 --------
 quantum/common/serializer.py                       |  153 -----
 quantum/common/test_lib.py                         |  291 ---------
 quantum/common/utils.py                            |  267 ---------
 quantum/extensions/credential.py                   |    2 +-
 quantum/extensions/extensions.py                   |  545 +++++++++++++++++
 quantum/extensions/multiport.py                    |    2 +-
 quantum/extensions/novatenant.py                   |    2 +-
 quantum/extensions/portprofile.py                  |    2 +-
 quantum/extensions/qos.py                          |    2 +-
 .../cisco/tests/unit/test_cisco_extension.py       |    6 +-
 quantum/tests/unit/extension_stubs.py              |    2 +-
 quantum/tests/unit/extensions/foxinsocks.py        |    2 +-
 quantum/tests/unit/test_cli.py                     |  422 -------------
 quantum/tests/unit/test_clientlib.py               |  625 --------------------
 quantum/tests/unit/test_extensions.py              |   11 +-
 setup.cfg                                          |   10 -
 setup_client.py                                    |   56 --
 setup_common.py                                    |   67 ---
 tools/pip-requires                                 |   16 +-
 31 files changed, 577 insertions(+), 4112 deletions(-)

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

 setup.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 quantum/api/api_common.py             |   20 ++++++-
 quantum/api/faults.py                 |  106 ++++++++++++++++++++++++++++++++-
 quantum/api/networks.py               |   11 ++--
 quantum/tests/unit/_test_api.py       |   56 +++++++++++------
 quantum/tests/unit/test_api.py        |   14 +++++
 quantum/tests/unit/test_extensions.py |    2 +-
 quantum/wsgi.py                       |   36 +++++++----
 7 files changed, 202 insertions(+), 43 deletions(-)

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

 quantum/extensions/_portstats_view.py |   51 +++++++++++++++++
 quantum/extensions/portstats.py       |  101 +++++++++++++++++++++++++++++++++
 2 files changed, 152 insertions(+)

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

 quantum/api/faults.py                 |    6 ++++++
 quantum/client/__init__.py            |    3 ++-
 quantum/common/exceptions.py          |    4 ++++
 quantum/tests/unit/test_extensions.py |   25 +++++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   41 ++++++++++++--------
 .../openvswitch/tests/unit/test_vlan_map.py        |    9 +++++
 2 files changed, 33 insertions(+), 17 deletions(-)

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

 tools/batch_config.py |  113 -------------------------------------------------
 1 file changed, 113 deletions(-)

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

 quantum/README |  239 --------------------------------------------------------
 1 file changed, 239 deletions(-)

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

 .gitignore   |    1 +
 MANIFEST.in  |    1 -
 run_tests.sh |   11 ++++++++++-
 setup.cfg    |   23 +++++++++++++++++++++++
 tox.ini      |   31 +++++++++++++++++++++++++++++++
 5 files changed, 65 insertions(+), 2 deletions(-)

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

 setup.py |    1 -
 1 file changed, 1 deletion(-)

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

 setup_cisco_plugin.py       |    4 ++--
 setup_client.py             |    4 ++--
 setup_common.py             |    4 ++--
 setup_openvswitch_plugin.py |    4 ++--
 setup_sample_plugin.py      |    4 ++--
 setup_server.py             |    4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

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

 .gitignore         |    1 +
 quantum/version.py |   46 +++++++++++++++++++++++
 run_tests.sh       |    2 +-
 setup.py           |   30 ++++++++++++++-
 version.py         |  105 ----------------------------------------------------
 5 files changed, 76 insertions(+), 108 deletions(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/__init__.py |   19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

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

 setup_common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 MANIFEST.in         |    1 +
 setup.py            |  252 +++++++++++++++++----------------------------------
 tools/build_rpms.sh |    2 -
 tools/pip-requires  |    1 +
 4 files changed, 86 insertions(+), 170 deletions(-)

commit 4572e6500ace4996f63fb12f09808346e87f9551
Author: lzyeval <lzyeval@gmail.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

 quantum/api/api_common.py                          |    2 +-
 quantum/client/__init__.py                         |    6 +++---
 quantum/common/flags.py                            |    2 +-
 quantum/common/serializer.py                       |    4 ++--
 quantum/common/utils.py                            |   11 +++++------
 quantum/extensions/_pprofiles.py                   |    2 +-
 quantum/plugins/cisco/l2network_plugin.py          |    4 ++--
 .../plugins/cisco/models/l2network_single_blade.py |    2 +-
 .../plugins/cisco/services/services_logistics.py   |    4 ++--
 quantum/plugins/cisco/tests/unit/test_database.py  |    6 +++---
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    8 ++++----
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    6 +++---
 .../openvswitch/tests/unit/test_vlan_map.py        |    2 +-
 quantum/tests/unit/test_database.py                |    2 +-
 quantum/wsgi.py                                    |   12 ++++++------
 16 files changed, 37 insertions(+), 38 deletions(-)

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

 tools/install_venv.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 .bzrignore               |    1 +
 .gitignore               |    1 +
 quantum/README           |    2 +-
 quantum/common/config.py |    2 +-
 run_tests.sh             |    2 +-
 tools/install_venv.py    |    4 ++--
 tools/with_venv.sh       |    2 +-
 7 files changed, 8 insertions(+), 6 deletions(-)

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

 quantum/plugins/cisco/README |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 .gitignore                               |    8 ++++++++
 quantum/plugins/cisco/pip-requires       |    1 -
 quantum/plugins/openvswitch/pip-requires |    1 -
 tools/install_venv.py                    |   22 +++-------------------
 4 files changed, 11 insertions(+), 21 deletions(-)

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

 README |  229 ++--------------------------------------------------------------
 1 file changed, 7 insertions(+), 222 deletions(-)

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

 .pylintrc       |   42 ++++++++++++++++++++++++++++++++++++++++++
 run_tests.sh    |   51 +++++++++++++++++++++++++++++++++++++++++----------
 setup_server.py |    5 +++--
 version.py      |    3 ++-
 4 files changed, 88 insertions(+), 13 deletions(-)

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

 quantum/plugins/cisco/db/api.py                    |   11 +
 quantum/plugins/cisco/db/l2network_db.py           |    1 +
 quantum/plugins/cisco/db/services_db.py            |   78 +++++
 quantum/plugins/cisco/db/services_models.py        |   42 +++
 quantum/plugins/cisco/services/README              |   70 +++++
 quantum/plugins/cisco/services/__init__.py         |   19 ++
 .../plugins/cisco/services/service_insertion.py    |  318 ++++++++++++++++++++
 .../plugins/cisco/services/services_constants.py   |   35 +++
 .../plugins/cisco/services/services_logistics.py   |  122 ++++++++
 quantum/plugins/cisco/tests/unit/test_database.py  |  120 ++++++++
 10 files changed, 816 insertions(+)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   22 +++++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   63 +++++++++++---------
 quantum/plugins/openvswitch/run_tests.py           |   10 ++--
 3 files changed, 56 insertions(+), 39 deletions(-)

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

 etc/quantum.conf |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/db/api.py |   11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

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

 quantum/plugins/cisco/README |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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

 etc/quantum.conf                         |   23 +-
 quantum/api/__init__.py                  |   38 +-
 quantum/api/api_common.py                |  149 ++--
 quantum/api/attachments.py               |   91 +--
 quantum/api/faults.py                    |  179 ++---
 quantum/api/networks.py                  |  117 ++--
 quantum/api/ports.py                     |  171 ++---
 quantum/api/versions.py                  |    2 +-
 quantum/api/views/networks.py            |   16 +-
 quantum/common/exceptions.py             |    4 +
 quantum/common/test_lib.py               |    6 +-
 quantum/service.py                       |    2 +-
 quantum/tests/unit/_test_api.py          | 1122 ++++++++++++++++++++++++++++++
 quantum/tests/unit/client_tools/stubs.py |    2 +-
 quantum/tests/unit/declare_flags.py      |   23 +
 quantum/tests/unit/runtime_flags.py      |   23 +
 quantum/tests/unit/test_api.py           | 1073 +---------------------------
 quantum/tests/unit/test_cli.py           |    3 +-
 quantum/tests/unit/test_flags.py         |  197 ++++++
 quantum/wsgi.py                          |  518 +++++++++++++-
 20 files changed, 2319 insertions(+), 1440 deletions(-)

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

 quantum/plugins/cisco/db/api.py |   17 -----------------
 1 file changed, 17 deletions(-)

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

 setup.py        |   31 ++++++++++++++++++++++++-------
 setup_client.py |    2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)

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

 quantum/plugins/cisco/README |   69 +++++++++++++++++++++---------------------
 1 file changed, 34 insertions(+), 35 deletions(-)

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

 quantum/db/api.py |   21 ---------------------
 1 file changed, 21 deletions(-)

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

 quantum/plugins/openvswitch/Makefile |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

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

 MANIFEST.in                                        |    5 +
 bin/quantum                                        |   17 +-
 bin/quantum-server                                 |   12 +-
 client/lib/quantum/__init__.py                     |    5 -
 client/lib/quantum/cli.py                          |  167 ---
 client/lib/quantum/cli_lib.py                      |  335 ------
 client/lib/quantum/client.py                       |  358 ------
 client/lib/quantum/tests/__init__.py               |   19 -
 client/lib/quantum/tests/unit/__init__.py          |   38 -
 client/lib/quantum/tests/unit/test_clientlib.py    |  625 -----------
 client/setup.py                                    |   57 -
 common/README                                      |  239 ----
 common/lib/quantum/__init__.py                     |    5 -
 common/lib/quantum/common/__init__.py              |   16 -
 common/lib/quantum/common/config.py                |  323 ------
 common/lib/quantum/common/exceptions.py            |  170 ---
 common/lib/quantum/common/extensions.py            |  545 ---------
 common/lib/quantum/common/flags.py                 |  249 ----
 common/lib/quantum/common/serializer.py            |  153 ---
 common/lib/quantum/common/test_lib.py              |  287 -----
 common/lib/quantum/common/utils.py                 |  290 -----
 common/lib/quantum/run_tests.py                    |   67 --
 common/setup.py                                    |   67 --
 etc/init.d/quantum-server                          |   68 ++
 etc/plugins.ini                                    |    3 +
 etc/quantum.conf                                   |   50 +
 etc/quantum.conf.sample                            |   32 +
 etc/quantum.conf.test                              |   24 +
 etc/quantum/plugins/cisco/cisco_plugins.ini        |    7 +
 etc/quantum/plugins/cisco/credentials.ini          |   10 +
 etc/quantum/plugins/cisco/db_conn.ini              |    5 +
 etc/quantum/plugins/cisco/l2network_plugin.ini     |   19 +
 etc/quantum/plugins/cisco/nexus.ini                |   11 +
 etc/quantum/plugins/cisco/quantum.conf.ciscoext    |   24 +
 etc/quantum/plugins/cisco/ucs.ini                  |   11 +
 etc/quantum/plugins/cisco/ucs_inventory.ini        |   24 +
 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    9 +
 plugins/cisco-plugin/MANIFEST.in                   |    1 -
 plugins/cisco-plugin/README                        |  445 --------
 plugins/cisco-plugin/etc/cisco_plugins.ini         |    7 -
 plugins/cisco-plugin/etc/credentials.ini           |   10 -
 plugins/cisco-plugin/etc/db_conn.ini               |    5 -
 plugins/cisco-plugin/etc/l2network_plugin.ini      |   19 -
 plugins/cisco-plugin/etc/nexus.ini                 |   11 -
 plugins/cisco-plugin/etc/quantum.conf.ciscoext     |   24 -
 plugins/cisco-plugin/etc/ucs.ini                   |   11 -
 plugins/cisco-plugin/etc/ucs_inventory.ini         |   24 -
 plugins/cisco-plugin/lib/quantum/__init__.py       |    5 -
 .../cisco-plugin/lib/quantum/plugins/__init__.py   |    5 -
 .../lib/quantum/plugins/cisco/__init__.py          |   20 -
 .../lib/quantum/plugins/cisco/client/cli.py        |  210 ----
 .../lib/quantum/plugins/cisco/common/__init__.py   |   20 -
 .../plugins/cisco/common/cisco_configparser.py     |   35 -
 .../plugins/cisco/common/cisco_constants.py        |  165 ---
 .../plugins/cisco/common/cisco_credentials.py      |   84 --
 .../plugins/cisco/common/cisco_exceptions.py       |  199 ----
 .../quantum/plugins/cisco/common/cisco_faults.py   |  164 ---
 .../quantum/plugins/cisco/common/cisco_utils.py    |   77 --
 .../lib/quantum/plugins/cisco/db/__init__.py       |   18 -
 .../lib/quantum/plugins/cisco/db/api.py            |  300 -----
 .../lib/quantum/plugins/cisco/db/l2network_db.py   |  558 ---------
 .../quantum/plugins/cisco/db/l2network_models.py   |  190 ----
 .../lib/quantum/plugins/cisco/db/models.py         |  102 --
 .../lib/quantum/plugins/cisco/db/nexus_db.py       |   93 --
 .../lib/quantum/plugins/cisco/db/nexus_models.py   |   38 -
 .../lib/quantum/plugins/cisco/db/ucs_db.py         |  162 ---
 .../lib/quantum/plugins/cisco/db/ucs_models.py     |   55 -
 .../plugins/cisco/l2device_inventory_base.py       |  343 ------
 .../quantum/plugins/cisco/l2device_plugin_base.py  |  160 ---
 .../quantum/plugins/cisco/l2network_model_base.py  |  159 ---
 .../lib/quantum/plugins/cisco/l2network_plugin.py  |  558 ---------
 .../cisco/l2network_plugin_configuration.py        |   73 --
 .../plugins/cisco/l2network_segmentation_base.py   |   75 --
 .../lib/quantum/plugins/cisco/models/__init__.py   |   20 -
 .../plugins/cisco/models/l2network_multi_blade.py  |  206 ----
 .../plugins/cisco/models/l2network_single_blade.py |  180 ---
 .../lib/quantum/plugins/cisco/nexus/__init__.py    |   21 -
 .../cisco/nexus/cisco_nexus_configuration.py       |   39 -
 .../cisco/nexus/cisco_nexus_network_driver.py      |  154 ---
 .../plugins/cisco/nexus/cisco_nexus_plugin.py      |  195 ----
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |  155 ---
 .../cisco/nova/quantum_port_aware_scheduler.py     |   97 --
 .../lib/quantum/plugins/cisco/nova/vifdirect.py    |  119 --
 .../lib/quantum/plugins/cisco/run_tests.py         |   52 -
 .../quantum/plugins/cisco/segmentation/__init__.py |   20 -
 .../cisco/segmentation/l2network_vlan_mgr.py       |   46 -
 .../lib/quantum/plugins/cisco/tests/__init__.py    |   23 -
 .../quantum/plugins/cisco/tests/unit/__init__.py   |   38 -
 .../cisco/tests/unit/test_cisco_extension.py       | 1183 --------------------
 .../plugins/cisco/tests/unit/test_database.py      | 1151 -------------------
 .../plugins/cisco/tests/unit/test_l2networkApi.py  | 1066 ------------------
 .../cisco/tests/unit/test_l2network_multi_blade.py |  366 ------
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  312 ------
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  157 ---
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |  201 ----
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  521 ---------
 .../plugins/cisco/tests/unit/test_vlan_mgr.py      |   94 --
 .../lib/quantum/plugins/cisco/ucs/__init__.py      |   20 -
 .../lib/quantum/plugins/cisco/ucs/cisco_getvif.py  |   54 -
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   41 -
 .../plugins/cisco/ucs/cisco_ucs_inventory.py       |  714 ------------
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |   29 -
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  325 ------
 .../quantum/plugins/cisco/ucs/cisco_ucs_plugin.py  |  339 ------
 plugins/cisco-plugin/pip-requires                  |    1 -
 plugins/cisco-plugin/setup.py                      |   72 --
 plugins/openvswitch-plugin/MANIFEST.in             |    1 -
 plugins/openvswitch-plugin/README                  |  166 ---
 .../openvswitch-plugin/etc/ovs_quantum_plugin.ini  |    9 -
 plugins/openvswitch-plugin/lib/quantum/__init__.py |    5 -
 .../lib/quantum/plugins/__init__.py                |    5 -
 .../lib/quantum/plugins/openvswitch/Makefile       |   30 -
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  289 -----
 .../plugins/openvswitch/agent/xenserver_install.sh |   37 -
 .../lib/quantum/plugins/openvswitch/ovs_db.py      |   58 -
 .../lib/quantum/plugins/openvswitch/ovs_models.py  |   42 -
 .../plugins/openvswitch/ovs_quantum_plugin.py      |  196 ----
 .../lib/quantum/plugins/openvswitch/run_tests.py   |   98 --
 .../quantum/plugins/openvswitch/tests/__init__.py  |    5 -
 .../plugins/openvswitch/tests/unit/__init__.py     |    5 -
 .../openvswitch/tests/unit/test_vlan_map.py        |   36 -
 plugins/openvswitch-plugin/pip-requires            |    1 -
 plugins/openvswitch-plugin/setup.py                |   66 --
 plugins/sample-plugin/lib/quantum/__init__.py      |    5 -
 .../lib/quantum/plugins/SamplePlugin.py            |  322 ------
 .../sample-plugin/lib/quantum/plugins/__init__.py  |    5 -
 plugins/sample-plugin/setup.py                     |   55 -
 quantum/README                                     |  239 ++++
 quantum/api/__init__.py                            |   85 ++
 quantum/api/api_common.py                          |   89 ++
 quantum/api/attachments.py                         |   87 ++
 quantum/api/faults.py                              |  147 +++
 quantum/api/networks.py                            |  145 +++
 quantum/api/ports.py                               |  158 +++
 quantum/api/versions.py                            |   63 ++
 quantum/api/views/__init__.py                      |   15 +
 quantum/api/views/attachments.py                   |   37 +
 quantum/api/views/networks.py                      |   59 +
 quantum/api/views/ports.py                         |   39 +
 quantum/api/views/versions.py                      |   59 +
 quantum/client/__init__.py                         |  358 ++++++
 quantum/client/cli.py                              |  167 +++
 quantum/client/cli_lib.py                          |  335 ++++++
 quantum/common/__init__.py                         |   16 +
 quantum/common/config.py                           |  323 ++++++
 quantum/common/exceptions.py                       |  170 +++
 quantum/common/extensions.py                       |  545 +++++++++
 quantum/common/flags.py                            |  249 ++++
 quantum/common/serializer.py                       |  153 +++
 quantum/common/test_lib.py                         |  287 +++++
 quantum/common/utils.py                            |  290 +++++
 quantum/db/__init__.py                             |   17 +
 quantum/db/api.py                                  |  269 +++++
 quantum/db/models.py                               |  104 ++
 quantum/extensions/__init__.py                     |   15 +
 quantum/extensions/_credential_view.py             |   56 +
 quantum/extensions/_novatenant_view.py             |   51 +
 quantum/extensions/_pprofiles.py                   |   62 +
 quantum/extensions/_qos_view.py                    |   56 +
 quantum/extensions/credential.py                   |  166 +++
 quantum/extensions/multiport.py                    |  116 ++
 quantum/extensions/novatenant.py                   |  178 +++
 quantum/extensions/portprofile.py                  |  216 ++++
 quantum/extensions/qos.py                          |  164 +++
 quantum/manager.py                                 |   88 ++
 quantum/plugins/cisco/README                       |  445 ++++++++
 quantum/plugins/cisco/__init__.py                  |   20 +
 quantum/plugins/cisco/client/cli.py                |  209 ++++
 quantum/plugins/cisco/common/__init__.py           |   20 +
 quantum/plugins/cisco/common/cisco_configparser.py |   35 +
 quantum/plugins/cisco/common/cisco_constants.py    |  165 +++
 quantum/plugins/cisco/common/cisco_credentials.py  |   84 ++
 quantum/plugins/cisco/common/cisco_exceptions.py   |  199 ++++
 quantum/plugins/cisco/common/cisco_faults.py       |  164 +++
 quantum/plugins/cisco/common/cisco_utils.py        |   77 ++
 quantum/plugins/cisco/db/__init__.py               |   18 +
 quantum/plugins/cisco/db/api.py                    |  300 +++++
 quantum/plugins/cisco/db/l2network_db.py           |  558 +++++++++
 quantum/plugins/cisco/db/l2network_models.py       |  190 ++++
 quantum/plugins/cisco/db/models.py                 |  102 ++
 quantum/plugins/cisco/db/nexus_db.py               |   93 ++
 quantum/plugins/cisco/db/nexus_models.py           |   38 +
 quantum/plugins/cisco/db/ucs_db.py                 |  162 +++
 quantum/plugins/cisco/db/ucs_models.py             |   55 +
 quantum/plugins/cisco/l2device_inventory_base.py   |  343 ++++++
 quantum/plugins/cisco/l2device_plugin_base.py      |  160 +++
 quantum/plugins/cisco/l2network_model_base.py      |  159 +++
 quantum/plugins/cisco/l2network_plugin.py          |  558 +++++++++
 .../cisco/l2network_plugin_configuration.py        |   73 ++
 .../plugins/cisco/l2network_segmentation_base.py   |   75 ++
 quantum/plugins/cisco/models/__init__.py           |   20 +
 .../plugins/cisco/models/l2network_multi_blade.py  |  206 ++++
 .../plugins/cisco/models/l2network_single_blade.py |  180 +++
 quantum/plugins/cisco/nexus/__init__.py            |   21 +
 .../cisco/nexus/cisco_nexus_configuration.py       |   39 +
 .../cisco/nexus/cisco_nexus_network_driver.py      |  154 +++
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |  195 ++++
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |  155 +++
 .../cisco/nova/quantum_port_aware_scheduler.py     |   97 ++
 quantum/plugins/cisco/nova/vifdirect.py            |  119 ++
 quantum/plugins/cisco/pip-requires                 |    1 +
 quantum/plugins/cisco/run_tests.py                 |   51 +
 quantum/plugins/cisco/segmentation/__init__.py     |   20 +
 .../cisco/segmentation/l2network_vlan_mgr.py       |   46 +
 quantum/plugins/cisco/tests/unit/__init__.py       |   33 +
 .../cisco/tests/unit/test_cisco_extension.py       | 1183 ++++++++++++++++++++
 quantum/plugins/cisco/tests/unit/test_database.py  | 1151 +++++++++++++++++++
 .../plugins/cisco/tests/unit/test_l2networkApi.py  | 1066 ++++++++++++++++++
 .../cisco/tests/unit/test_l2network_multi_blade.py |  366 ++++++
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  312 ++++++
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  157 +++
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |  201 ++++
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  521 +++++++++
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |   94 ++
 quantum/plugins/cisco/ucs/__init__.py              |   20 +
 quantum/plugins/cisco/ucs/cisco_getvif.py          |   54 +
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   41 +
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  714 ++++++++++++
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |   29 +
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  325 ++++++
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |  339 ++++++
 quantum/plugins/openvswitch/Makefile               |   30 +
 quantum/plugins/openvswitch/README                 |  166 +++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  289 +++++
 .../plugins/openvswitch/agent/xenserver_install.sh |   37 +
 quantum/plugins/openvswitch/ovs_db.py              |   58 +
 quantum/plugins/openvswitch/ovs_models.py          |   42 +
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  198 ++++
 quantum/plugins/openvswitch/pip-requires           |    1 +
 quantum/plugins/openvswitch/run_tests.py           |   76 ++
 .../openvswitch/tests/unit/test_vlan_map.py        |   36 +
 quantum/plugins/sample/SamplePlugin.py             |  322 ++++++
 quantum/quantum_plugin_base.py                     |  259 +++++
 quantum/server/__init__.py                         |   64 ++
 quantum/service.py                                 |  115 ++
 quantum/setup.py                                   |   49 -
 quantum/tests/__init__.py                          |   19 +
 quantum/tests/unit/__init__.py                     |   33 +
 quantum/tests/unit/client_tools/__init__.py        |   15 +
 quantum/tests/unit/client_tools/stubs.py           |   65 ++
 quantum/tests/unit/database_stubs.py               |  191 ++++
 quantum/tests/unit/extension_stubs.py              |   75 ++
 quantum/tests/unit/extensions/__init__.py          |   15 +
 quantum/tests/unit/extensions/foxinsocks.py        |  110 ++
 quantum/tests/unit/test_api.py                     | 1083 ++++++++++++++++++
 quantum/tests/unit/test_cli.py                     |  421 +++++++
 quantum/tests/unit/test_clientlib.py               |  625 +++++++++++
 quantum/tests/unit/test_database.py                |  118 ++
 quantum/tests/unit/test_extensions.py              |  468 ++++++++
 quantum/tests/unit/testlib_api.py                  |  171 +++
 quantum/wsgi.py                                    |  538 +++++++++
 run_tests.py                                       |   68 +-
 run_tests.sh                                       |    2 +-
 server/MANIFEST.in                                 |    2 -
 server/etc/init.d/quantum-server                   |   68 --
 server/etc/plugins.ini                             |    3 -
 server/etc/quantum.conf                            |   50 -
 server/etc/quantum.conf.sample                     |   32 -
 server/etc/quantum.conf.test                       |   24 -
 server/lib/quantum/__init__.py                     |   21 -
 server/lib/quantum/api/__init__.py                 |   85 --
 server/lib/quantum/api/api_common.py               |   89 --
 server/lib/quantum/api/attachments.py              |   87 --
 server/lib/quantum/api/faults.py                   |  147 ---
 server/lib/quantum/api/networks.py                 |  145 ---
 server/lib/quantum/api/ports.py                    |  158 ---
 server/lib/quantum/api/versions.py                 |   63 --
 server/lib/quantum/api/views/__init__.py           |   15 -
 server/lib/quantum/api/views/attachments.py        |   37 -
 server/lib/quantum/api/views/networks.py           |   59 -
 server/lib/quantum/api/views/ports.py              |   39 -
 server/lib/quantum/api/views/versions.py           |   59 -
 server/lib/quantum/db/__init__.py                  |   17 -
 server/lib/quantum/db/api.py                       |  269 -----
 server/lib/quantum/db/models.py                    |  104 --
 server/lib/quantum/extensions/__init__.py          |   15 -
 server/lib/quantum/extensions/_credential_view.py  |   56 -
 server/lib/quantum/extensions/_novatenant_view.py  |   51 -
 server/lib/quantum/extensions/_pprofiles.py        |   62 -
 server/lib/quantum/extensions/_qos_view.py         |   56 -
 server/lib/quantum/extensions/credential.py        |  166 ---
 server/lib/quantum/extensions/multiport.py         |  116 --
 server/lib/quantum/extensions/novatenant.py        |  178 ---
 server/lib/quantum/extensions/portprofile.py       |  216 ----
 server/lib/quantum/extensions/qos.py               |  164 ---
 server/lib/quantum/manager.py                      |   88 --
 server/lib/quantum/quantum_plugin_base.py          |  259 -----
 server/lib/quantum/server.py                       |   64 --
 server/lib/quantum/service.py                      |  115 --
 server/lib/quantum/tests/__init__.py               |   19 -
 server/lib/quantum/tests/unit/__init__.py          |   38 -
 .../quantum/tests/unit/client_tools/__init__.py    |   15 -
 .../lib/quantum/tests/unit/client_tools/stubs.py   |   65 --
 server/lib/quantum/tests/unit/database_stubs.py    |  191 ----
 server/lib/quantum/tests/unit/extension_stubs.py   |   75 --
 .../lib/quantum/tests/unit/extensions/__init__.py  |   15 -
 .../quantum/tests/unit/extensions/foxinsocks.py    |  110 --
 server/lib/quantum/tests/unit/test_api.py          | 1083 ------------------
 server/lib/quantum/tests/unit/test_cli.py          |  420 -------
 server/lib/quantum/tests/unit/test_database.py     |  118 --
 server/lib/quantum/tests/unit/test_extensions.py   |  466 --------
 server/lib/quantum/tests/unit/testlib_api.py       |  171 ---
 server/lib/quantum/wsgi.py                         |  538 ---------
 server/setup.py                                    |   76 --
 setup.py                                           |    3 +-
 setup_cisco_plugin.py                              |   69 ++
 setup_client.py                                    |   56 +
 setup_common.py                                    |   67 ++
 setup_openvswitch_plugin.py                        |   65 ++
 setup_sample_plugin.py                             |   51 +
 setup_server.py                                    |   92 ++
 tools/build_debs.sh                                |    7 +-
 tools/build_rpms.sh                                |    2 +-
 tools/source_environment.py                        |   28 -
 tools/source_nonplugin_environment.py              |   26 -
 version.py                                         |  104 ++
 316 files changed, 24408 insertions(+), 24603 deletions(-)

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

 plugins/cisco-plugin/README                        |   20 +++++++-------
 .../lib/quantum/plugins/cisco/client/cli.py        |   29 +++++---------------
 2 files changed, 17 insertions(+), 32 deletions(-)

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

 README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 .../plugins/cisco/ucs/cisco_ucs_inventory.py       |    6 +++---
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

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

 plugins/cisco-plugin/pip-requires |    2 +-
 tools/install_venv.py             |    7 +++++--
 tools/with_venv.sh                |    2 +-
 3 files changed, 7 insertions(+), 4 deletions(-)

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

 plugins/openvswitch-plugin/pip-requires |    1 +
 1 file changed, 1 insertion(+)

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

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

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

 quantum/common/config.py                           |    8 ++++++--
 quantum/plugins/cisco/common/cisco_credentials.py  |    3 ++-
 .../cisco/l2network_plugin_configuration.py        |    6 +++---
 .../cisco/nexus/cisco_nexus_configuration.py       |    3 ++-
 .../cisco/tests/unit/test_cisco_extension.py       |    3 ++-
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    5 +++--
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |    2 +-
 7 files changed, 19 insertions(+), 11 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

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

 common/lib/quantum/common/extensions.py          |   15 +++++++++++++--
 server/etc/quantum.conf                          |    4 +++-
 server/lib/quantum/tests/unit/test_extensions.py |    3 ++-
 3 files changed, 18 insertions(+), 4 deletions(-)

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

 plugins/cisco-plugin/pip-requires |    1 +
 tools/install_venv.py             |   17 ++++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

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

 .../quantum/plugins/cisco/common/cisco_faults.py   |    2 +-
 .../plugins/cisco/models/l2network_multi_blade.py  |    9 +-
 .../cisco/nexus/cisco_nexus_configuration.py       |    6 +-
 .../lib/quantum/plugins/cisco/run_tests.py         |   52 +
 .../lib/quantum/plugins/cisco/tests/__init__.py    |   23 +
 .../quantum/plugins/cisco/tests/unit/__init__.py   |   38 +
 .../cisco/tests/unit/test_cisco_extension.py       | 1183 +++++++++++++++++++
 .../plugins/cisco/tests/unit/test_database.py      | 1151 +++++++++++++++++++
 .../plugins/cisco/tests/unit/test_l2networkApi.py  | 1066 ++++++++++++++++++
 .../cisco/tests/unit/test_l2network_multi_blade.py |  366 ++++++
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  312 ++++++
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  157 +++
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |  201 ++++
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  521 +++++++++
 .../plugins/cisco/tests/unit/test_vlan_mgr.py      |   94 ++
 .../plugins/cisco/ucs/cisco_ucs_inventory.py       |    8 +-
 plugins/cisco-plugin/lib/quantum/tests/__init__.py |   23 -
 .../lib/quantum/tests/unit/__init__.py             |   38 -
 .../lib/quantum/tests/unit/test_cisco_extension.py | 1184 --------------------
 .../lib/quantum/tests/unit/test_database.py        | 1151 -------------------
 .../lib/quantum/tests/unit/test_l2networkApi.py    | 1068 ------------------
 .../tests/unit/test_l2network_multi_blade.py       |  366 ------
 .../lib/quantum/tests/unit/test_nexus_plugin.py    |  312 ------
 .../lib/quantum/tests/unit/test_ucs_driver.py      |  157 ---
 .../lib/quantum/tests/unit/test_ucs_inventory.py   |  201 ----
 .../lib/quantum/tests/unit/test_ucs_plugin.py      |  521 ---------
 .../lib/quantum/tests/unit/test_vlan_mgr.py        |   94 --
 run_tests.py                                       |    2 +-
 server/lib/quantum/extensions/credential.py        |    2 +-
 server/lib/quantum/extensions/novatenant.py        |    2 +-
 server/lib/quantum/extensions/portprofile.py       |    2 +-
 server/lib/quantum/extensions/qos.py               |    2 +-
 32 files changed, 5182 insertions(+), 5132 deletions(-)

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

 .../lib/quantum/plugins/openvswitch/run_tests.py   |   22 ++++++++------------
 .../openvswitch/tests/unit/test_vlan_map.py        |    2 +-
 2 files changed, 10 insertions(+), 14 deletions(-)

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

 run_tests.sh |   21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

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

 README |  162 ++++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 81 insertions(+), 81 deletions(-)

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

 client/setup.py                |    2 +-
 common/setup.py                |    2 +-
 plugins/sample-plugin/setup.py |    2 +-
 quantum/setup.py               |    2 +-
 server/setup.py                |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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

 common/lib/quantum/common/test_lib.py              |   10 +++++-
 .../lib/quantum/plugins/openvswitch/run_tests.py   |   16 +++++++--
 .../quantum/plugins/openvswitch/tests/__init__.py  |    5 +++
 .../plugins/openvswitch/tests/unit/__init__.py     |    5 +++
 .../openvswitch/tests/unit/test_vlan_map.py        |   36 ++++++++++++++++++++
 .../lib/quantum/tests/__init__.py                  |    5 ---
 .../lib/quantum/tests/unit/__init__.py             |    5 ---
 .../lib/quantum/tests/unit/test_vlan_map.py        |   36 --------------------
 8 files changed, 68 insertions(+), 50 deletions(-)

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

 client/lib/quantum/cli.py                          |   10 +-
 client/lib/quantum/cli_lib.py                      |   40 +++----
 client/lib/quantum/client.py                       |    7 +-
 client/lib/quantum/tests/unit/test_clientlib.py    |   44 ++++----
 .../lib/quantum/plugins/cisco/db/api.py            |   19 ++--
 .../plugins/cisco/l2device_inventory_base.py       |    2 +-
 .../quantum/plugins/cisco/l2device_plugin_base.py  |    4 +-
 .../quantum/plugins/cisco/l2network_model_base.py  |    2 +-
 .../lib/quantum/plugins/cisco/l2network_plugin.py  |   23 ++--
 .../plugins/cisco/models/l2network_multi_blade.py  |    6 +-
 .../plugins/cisco/models/l2network_single_blade.py |    6 +-
 .../plugins/cisco/nexus/cisco_nexus_plugin.py      |    8 +-
 .../plugins/cisco/ucs/cisco_ucs_inventory.py       |    4 +-
 .../quantum/plugins/cisco/ucs/cisco_ucs_plugin.py  |    6 +-
 .../lib/quantum/tests/unit/test_database.py        |   18 ++--
 .../lib/quantum/tests/unit/test_l2networkApi.py    |  113 +++++++++++---------
 .../tests/unit/test_l2network_multi_blade.py       |   23 ++--
 .../lib/quantum/tests/unit/test_nexus_plugin.py    |   24 +++--
 .../lib/quantum/tests/unit/test_ucs_inventory.py   |    6 +-
 .../plugins/openvswitch/ovs_quantum_plugin.py      |    8 +-
 .../lib/quantum/plugins/SamplePlugin.py            |   31 +++---
 server/lib/quantum/api/networks.py                 |    4 +-
 server/lib/quantum/api/ports.py                    |    2 +-
 server/lib/quantum/db/api.py                       |   20 ++--
 server/lib/quantum/quantum_plugin_base.py          |    9 +-
 server/lib/quantum/tests/unit/database_stubs.py    |   13 +--
 server/lib/quantum/tests/unit/test_api.py          |   42 ++++----
 server/lib/quantum/tests/unit/test_cli.py          |   28 ++---
 server/lib/quantum/tests/unit/test_database.py     |    7 +-
 29 files changed, 276 insertions(+), 253 deletions(-)

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

 bin/quantum        |    7 ++++++-
 bin/quantum-server |    6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

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

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 common/lib/quantum/common/bufferedhttp.py |  165 -----------------------------
 server/etc/quantum.conf                   |   14 +++
 2 files changed, 14 insertions(+), 165 deletions(-)

commit 24b0207cbe60497a19e84947e008b9fbcf9ffce6
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Feb 22 20:42:24 2011 -0500

    blueprint quantum-packaging
    
    Change-Id: Ica19170540b06ecddb0fbb6d340ee7a6819c1708

 README                                             |   79 +-
 bin/__init__.py                                    |   21 +
 bin/cli                                            |  167 ---
 bin/quantum                                        |   43 +-
 bin/quantum-server                                 |   26 +
 client/lib/quantum/__init__.py                     |    5 +
 client/lib/quantum/cli.py                          |  167 +++
 client/lib/quantum/cli_lib.py                      |  331 ++++++
 client/lib/quantum/client.py                       |  359 ++++++
 client/lib/quantum/tests/__init__.py               |   19 +
 client/lib/quantum/tests/unit/__init__.py          |   38 +
 client/lib/quantum/tests/unit/test_clientlib.py    |  625 +++++++++++
 client/setup.py                                    |   57 +
 common/README                                      |  239 ++++
 common/lib/quantum/__init__.py                     |    5 +
 common/lib/quantum/common/__init__.py              |   16 +
 common/lib/quantum/common/bufferedhttp.py          |  165 +++
 common/lib/quantum/common/config.py                |  323 ++++++
 common/lib/quantum/common/exceptions.py            |  170 +++
 common/lib/quantum/common/extensions.py            |  534 +++++++++
 common/lib/quantum/common/flags.py                 |  249 ++++
 common/lib/quantum/common/serializer.py            |  153 +++
 common/lib/quantum/common/test_lib.py              |  279 +++++
 common/lib/quantum/common/utils.py                 |  290 +++++
 common/lib/quantum/run_tests.py                    |   67 ++
 common/setup.py                                    |   67 ++
 etc/quantum.conf                                   |   34 -
 etc/quantum.conf.sample                            |   32 -
 etc/quantum.conf.test                              |   24 -
 extensions/__init__.py                             |   15 -
 extensions/_credential_view.py                     |   56 -
 extensions/_novatenant_view.py                     |   51 -
 extensions/_pprofiles.py                           |   62 -
 extensions/_qos_view.py                            |   56 -
 extensions/credential.py                           |  166 ---
 extensions/multiport.py                            |  116 --
 extensions/novatenant.py                           |  178 ---
 extensions/portprofile.py                          |  216 ----
 extensions/qos.py                                  |  164 ---
 plugins/cisco-plugin/MANIFEST.in                   |    1 +
 plugins/cisco-plugin/README                        |  445 ++++++++
 plugins/cisco-plugin/etc/cisco_plugins.ini         |    7 +
 plugins/cisco-plugin/etc/credentials.ini           |   10 +
 plugins/cisco-plugin/etc/db_conn.ini               |    5 +
 plugins/cisco-plugin/etc/l2network_plugin.ini      |   19 +
 plugins/cisco-plugin/etc/nexus.ini                 |   11 +
 plugins/cisco-plugin/etc/quantum.conf.ciscoext     |   24 +
 plugins/cisco-plugin/etc/ucs.ini                   |   11 +
 plugins/cisco-plugin/etc/ucs_inventory.ini         |   24 +
 plugins/cisco-plugin/lib/quantum/__init__.py       |    5 +
 .../cisco-plugin/lib/quantum/plugins/__init__.py   |    5 +
 .../lib/quantum/plugins/cisco/__init__.py          |   20 +
 .../lib/quantum/plugins/cisco/client/cli.py        |  225 ++++
 .../lib/quantum/plugins/cisco/common/__init__.py   |   20 +
 .../plugins/cisco/common/cisco_configparser.py     |   35 +
 .../plugins/cisco/common/cisco_constants.py        |  165 +++
 .../plugins/cisco/common/cisco_credentials.py      |   84 ++
 .../plugins/cisco/common/cisco_exceptions.py       |  199 ++++
 .../quantum/plugins/cisco/common/cisco_faults.py   |  164 +++
 .../quantum/plugins/cisco/common/cisco_utils.py    |   77 ++
 .../lib/quantum/plugins/cisco/db/__init__.py       |   18 +
 .../lib/quantum/plugins/cisco/db/api.py            |  297 +++++
 .../lib/quantum/plugins/cisco/db/l2network_db.py   |  558 +++++++++
 .../quantum/plugins/cisco/db/l2network_models.py   |  190 ++++
 .../lib/quantum/plugins/cisco/db/models.py         |  102 ++
 .../lib/quantum/plugins/cisco/db/nexus_db.py       |   93 ++
 .../lib/quantum/plugins/cisco/db/nexus_models.py   |   38 +
 .../lib/quantum/plugins/cisco/db/ucs_db.py         |  162 +++
 .../lib/quantum/plugins/cisco/db/ucs_models.py     |   55 +
 .../plugins/cisco/l2device_inventory_base.py       |  343 ++++++
 .../quantum/plugins/cisco/l2device_plugin_base.py  |  160 +++
 .../quantum/plugins/cisco/l2network_model_base.py  |  159 +++
 .../lib/quantum/plugins/cisco/l2network_plugin.py  |  557 +++++++++
 .../cisco/l2network_plugin_configuration.py        |   73 ++
 .../plugins/cisco/l2network_segmentation_base.py   |   75 ++
 .../lib/quantum/plugins/cisco/models/__init__.py   |   20 +
 .../plugins/cisco/models/l2network_multi_blade.py  |  201 ++++
 .../plugins/cisco/models/l2network_single_blade.py |  176 +++
 .../lib/quantum/plugins/cisco/nexus/__init__.py    |   21 +
 .../cisco/nexus/cisco_nexus_configuration.py       |   41 +
 .../cisco/nexus/cisco_nexus_network_driver.py      |  154 +++
 .../plugins/cisco/nexus/cisco_nexus_plugin.py      |  195 ++++
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |  155 +++
 .../cisco/nova/quantum_port_aware_scheduler.py     |   97 ++
 .../lib/quantum/plugins/cisco/nova/vifdirect.py    |  119 ++
 .../quantum/plugins/cisco/segmentation/__init__.py |   20 +
 .../cisco/segmentation/l2network_vlan_mgr.py       |   46 +
 .../lib/quantum/plugins/cisco/ucs/__init__.py      |   20 +
 .../lib/quantum/plugins/cisco/ucs/cisco_getvif.py  |   54 +
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   41 +
 .../plugins/cisco/ucs/cisco_ucs_inventory.py       |  712 ++++++++++++
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |   29 +
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  325 ++++++
 .../quantum/plugins/cisco/ucs/cisco_ucs_plugin.py  |  339 ++++++
 plugins/cisco-plugin/lib/quantum/tests/__init__.py |   23 +
 .../lib/quantum/tests/unit/__init__.py             |   38 +
 .../lib/quantum/tests/unit/test_cisco_extension.py | 1184 ++++++++++++++++++++
 .../lib/quantum/tests/unit/test_database.py        | 1151 +++++++++++++++++++
 .../lib/quantum/tests/unit/test_l2networkApi.py    | 1059 +++++++++++++++++
 .../tests/unit/test_l2network_multi_blade.py       |  365 ++++++
 .../lib/quantum/tests/unit/test_nexus_plugin.py    |  310 +++++
 .../lib/quantum/tests/unit/test_ucs_driver.py      |  157 +++
 .../lib/quantum/tests/unit/test_ucs_inventory.py   |  201 ++++
 .../lib/quantum/tests/unit/test_ucs_plugin.py      |  521 +++++++++
 .../lib/quantum/tests/unit/test_vlan_mgr.py        |   94 ++
 plugins/cisco-plugin/setup.py                      |   72 ++
 plugins/openvswitch-plugin/MANIFEST.in             |    1 +
 plugins/openvswitch-plugin/README                  |  166 +++
 .../openvswitch-plugin/etc/ovs_quantum_plugin.ini  |    9 +
 plugins/openvswitch-plugin/lib/quantum/__init__.py |    5 +
 .../lib/quantum/plugins/__init__.py                |    5 +
 .../lib/quantum/plugins/openvswitch/Makefile       |   30 +
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  272 +++++
 .../plugins/openvswitch/agent/xenserver_install.sh |   37 +
 .../lib/quantum/plugins/openvswitch/ovs_db.py      |   58 +
 .../lib/quantum/plugins/openvswitch/ovs_models.py  |   42 +
 .../plugins/openvswitch/ovs_quantum_plugin.py      |  196 ++++
 .../lib/quantum/plugins/openvswitch/run_tests.py   |   92 ++
 .../lib/quantum/tests/__init__.py                  |    5 +
 .../lib/quantum/tests/unit/__init__.py             |    5 +
 .../lib/quantum/tests/unit/test_vlan_map.py        |   36 +
 plugins/openvswitch-plugin/setup.py                |   66 ++
 plugins/sample-plugin/lib/quantum/__init__.py      |    5 +
 .../lib/quantum/plugins/SamplePlugin.py            |  329 ++++++
 .../sample-plugin/lib/quantum/plugins/__init__.py  |    5 +
 plugins/sample-plugin/setup.py                     |   55 +
 quantum/__init__.py                                |   16 -
 quantum/api/__init__.py                            |   85 --
 quantum/api/api_common.py                          |   89 --
 quantum/api/attachments.py                         |   87 --
 quantum/api/faults.py                              |  147 ---
 quantum/api/networks.py                            |  145 ---
 quantum/api/ports.py                               |  158 ---
 quantum/api/versions.py                            |   63 --
 quantum/api/views/__init__.py                      |   15 -
 quantum/api/views/attachments.py                   |   37 -
 quantum/api/views/networks.py                      |   59 -
 quantum/api/views/ports.py                         |   39 -
 quantum/api/views/versions.py                      |   59 -
 quantum/cli_lib.py                                 |  331 ------
 quantum/client.py                                  |  359 ------
 quantum/common/__init__.py                         |   16 -
 quantum/common/bufferedhttp.py                     |  165 ---
 quantum/common/config.py                           |  308 -----
 quantum/common/exceptions.py                       |  170 ---
 quantum/common/extensions.py                       |  534 ---------
 quantum/common/flags.py                            |  249 ----
 quantum/common/test_lib.py                         |  279 -----
 quantum/common/utils.py                            |  227 ----
 quantum/common/wsgi.py                             |  538 ---------
 quantum/db/__init__.py                             |   17 -
 quantum/db/api.py                                  |  267 -----
 quantum/db/models.py                               |  104 --
 quantum/manager.py                                 |   77 --
 quantum/plugins.ini                                |    3 -
 quantum/plugins/SamplePlugin.py                    |  329 ------
 quantum/plugins/__init__.py                        |   16 -
 quantum/plugins/cisco/README                       |  445 --------
 quantum/plugins/cisco/__init__.py                  |   20 -
 quantum/plugins/cisco/client/cli.py                |  225 ----
 quantum/plugins/cisco/common/__init__.py           |   20 -
 quantum/plugins/cisco/common/cisco_configparser.py |   35 -
 quantum/plugins/cisco/common/cisco_constants.py    |  165 ---
 quantum/plugins/cisco/common/cisco_credentials.py  |   81 --
 quantum/plugins/cisco/common/cisco_exceptions.py   |  199 ----
 quantum/plugins/cisco/common/cisco_faults.py       |  164 ---
 quantum/plugins/cisco/common/cisco_utils.py        |   77 --
 quantum/plugins/cisco/conf/credentials.ini         |   10 -
 quantum/plugins/cisco/conf/db_conn.ini             |    5 -
 quantum/plugins/cisco/conf/l2network_plugin.ini    |   19 -
 quantum/plugins/cisco/conf/nexus.ini               |   11 -
 quantum/plugins/cisco/conf/plugins.ini             |    7 -
 quantum/plugins/cisco/conf/quantum.conf.ciscoext   |   24 -
 quantum/plugins/cisco/conf/ucs.ini                 |   11 -
 quantum/plugins/cisco/conf/ucs_inventory.ini       |   24 -
 quantum/plugins/cisco/db/__init__.py               |   18 -
 quantum/plugins/cisco/db/api.py                    |  297 -----
 quantum/plugins/cisco/db/l2network_db.py           |  558 ---------
 quantum/plugins/cisco/db/l2network_models.py       |  190 ----
 quantum/plugins/cisco/db/models.py                 |  102 --
 quantum/plugins/cisco/db/nexus_db.py               |   93 --
 quantum/plugins/cisco/db/nexus_models.py           |   38 -
 quantum/plugins/cisco/db/ucs_db.py                 |  162 ---
 quantum/plugins/cisco/db/ucs_models.py             |   55 -
 quantum/plugins/cisco/l2device_inventory_base.py   |  343 ------
 quantum/plugins/cisco/l2device_plugin_base.py      |  160 ---
 quantum/plugins/cisco/l2network_model_base.py      |  159 ---
 quantum/plugins/cisco/l2network_plugin.py          |  557 ---------
 .../cisco/l2network_plugin_configuration.py        |   79 --
 .../plugins/cisco/l2network_segmentation_base.py   |   75 --
 quantum/plugins/cisco/models/__init__.py           |   20 -
 .../plugins/cisco/models/l2network_multi_blade.py  |  201 ----
 .../plugins/cisco/models/l2network_single_blade.py |  176 ---
 quantum/plugins/cisco/nexus/__init__.py            |   21 -
 .../cisco/nexus/cisco_nexus_configuration.py       |   41 -
 .../cisco/nexus/cisco_nexus_network_driver.py      |  154 ---
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |  195 ----
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |  155 ---
 .../cisco/nova/quantum_port_aware_scheduler.py     |   97 --
 quantum/plugins/cisco/nova/vifdirect.py            |  119 --
 quantum/plugins/cisco/run_tests.py                 |   89 --
 quantum/plugins/cisco/segmentation/__init__.py     |   20 -
 .../cisco/segmentation/l2network_vlan_mgr.py       |   46 -
 quantum/plugins/cisco/tests/__init__.py            |   18 -
 quantum/plugins/cisco/tests/unit/__init__.py       |   32 -
 .../cisco/tests/unit/test_cisco_extension.py       | 1184 --------------------
 quantum/plugins/cisco/tests/unit/test_database.py  | 1151 -------------------
 .../plugins/cisco/tests/unit/test_l2networkApi.py  | 1059 -----------------
 .../cisco/tests/unit/test_l2network_multi_blade.py |  365 ------
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  310 -----
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  157 ---
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |  201 ----
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  521 ---------
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |   94 --
 quantum/plugins/cisco/ucs/__init__.py              |   20 -
 quantum/plugins/cisco/ucs/cisco_getvif.py          |   54 -
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   46 -
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  712 ------------
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |   31 -
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  325 ------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |  339 ------
 quantum/plugins/openvswitch/Makefile               |   30 -
 quantum/plugins/openvswitch/README                 |  166 ---
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  272 -----
 .../plugins/openvswitch/agent/xenserver_install.sh |   37 -
 quantum/plugins/openvswitch/ovs_db.py              |   58 -
 quantum/plugins/openvswitch/ovs_models.py          |   42 -
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    9 -
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  202 ----
 quantum/plugins/openvswitch/run_tests.py           |   92 --
 quantum/plugins/openvswitch/tests/test_vlan_map.py |   36 -
 quantum/quantum_plugin_base.py                     |  260 -----
 quantum/service.py                                 |  115 --
 quantum/setup.py                                   |   49 +
 quantum/utils.py                                   |   92 --
 run_tests.py                                       |   62 +-
 run_tests.sh                                       |    2 +-
 server/MANIFEST.in                                 |    2 +
 server/etc/init.d/quantum-server                   |   68 ++
 server/etc/plugins.ini                             |    3 +
 server/etc/quantum.conf                            |   34 +
 server/etc/quantum.conf.sample                     |   32 +
 server/etc/quantum.conf.test                       |   24 +
 server/lib/quantum/__init__.py                     |   21 +
 server/lib/quantum/api/__init__.py                 |   85 ++
 server/lib/quantum/api/api_common.py               |   89 ++
 server/lib/quantum/api/attachments.py              |   87 ++
 server/lib/quantum/api/faults.py                   |  147 +++
 server/lib/quantum/api/networks.py                 |  145 +++
 server/lib/quantum/api/ports.py                    |  158 +++
 server/lib/quantum/api/versions.py                 |   63 ++
 server/lib/quantum/api/views/__init__.py           |   15 +
 server/lib/quantum/api/views/attachments.py        |   37 +
 server/lib/quantum/api/views/networks.py           |   59 +
 server/lib/quantum/api/views/ports.py              |   39 +
 server/lib/quantum/api/views/versions.py           |   59 +
 server/lib/quantum/db/__init__.py                  |   17 +
 server/lib/quantum/db/api.py                       |  267 +++++
 server/lib/quantum/db/models.py                    |  104 ++
 server/lib/quantum/extensions/__init__.py          |   15 +
 server/lib/quantum/extensions/_credential_view.py  |   56 +
 server/lib/quantum/extensions/_novatenant_view.py  |   51 +
 server/lib/quantum/extensions/_pprofiles.py        |   62 +
 server/lib/quantum/extensions/_qos_view.py         |   56 +
 server/lib/quantum/extensions/credential.py        |  166 +++
 server/lib/quantum/extensions/multiport.py         |  116 ++
 server/lib/quantum/extensions/novatenant.py        |  178 +++
 server/lib/quantum/extensions/portprofile.py       |  216 ++++
 server/lib/quantum/extensions/qos.py               |  164 +++
 server/lib/quantum/manager.py                      |   88 ++
 server/lib/quantum/quantum_plugin_base.py          |  260 +++++
 server/lib/quantum/server.py                       |   64 ++
 server/lib/quantum/service.py                      |  115 ++
 server/lib/quantum/tests/__init__.py               |   19 +
 server/lib/quantum/tests/unit/__init__.py          |   38 +
 .../quantum/tests/unit/client_tools/__init__.py    |   15 +
 .../lib/quantum/tests/unit/client_tools/stubs.py   |   65 ++
 server/lib/quantum/tests/unit/database_stubs.py    |  190 ++++
 server/lib/quantum/tests/unit/extension_stubs.py   |   75 ++
 .../lib/quantum/tests/unit/extensions/__init__.py  |   15 +
 .../quantum/tests/unit/extensions/foxinsocks.py    |  110 ++
 server/lib/quantum/tests/unit/test_api.py          | 1083 ++++++++++++++++++
 server/lib/quantum/tests/unit/test_cli.py          |  420 +++++++
 server/lib/quantum/tests/unit/test_database.py     |  117 ++
 server/lib/quantum/tests/unit/test_extensions.py   |  465 ++++++++
 server/lib/quantum/tests/unit/testlib_api.py       |  171 +++
 server/lib/quantum/wsgi.py                         |  538 +++++++++
 server/setup.py                                    |   76 ++
 setup.py                                           |  186 ++-
 tests/__init__.py                                  |   19 -
 tests/unit/__init__.py                             |   32 -
 tests/unit/client_tools/__init__.py                |   15 -
 tests/unit/client_tools/stubs.py                   |   65 --
 tests/unit/database_stubs.py                       |  190 ----
 tests/unit/extension_stubs.py                      |   75 --
 tests/unit/extensions/__init__.py                  |   15 -
 tests/unit/extensions/foxinsocks.py                |  110 --
 tests/unit/test_api.py                             | 1082 ------------------
 tests/unit/test_cli.py                             |  420 -------
 tests/unit/test_clientlib.py                       |  625 -----------
 tests/unit/test_database.py                        |  117 --
 tests/unit/test_extensions.py                      |  464 --------
 tests/unit/testlib_api.py                          |  171 ---
 tools/build_debs.sh                                |   27 +
 tools/build_rpms.sh                                |    2 +
 tools/clean.sh                                     |    5 +
 tools/install_venv.py                              |   33 +-
 tools/source_environment.py                        |   28 +
 tools/source_nonplugin_environment.py              |   26 +
 tools/with_venv.sh                                 |    2 +-
 310 files changed, 24930 insertions(+), 23690 deletions(-)

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

 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py |   16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

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

 quantum/client.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

 bin/cli |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 .../cisco/nexus/cisco_nexus_network_driver.py      |    5 ++---
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    5 ++---
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |    5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

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

 .gitreview |    4 ++++
 1 file changed, 4 insertions(+)

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

 extensions/_novatenant_view.py                     |    4 +
 extensions/novatenant.py                           |   24 +++-
 quantum/plugins/cisco/README                       |   34 +++--
 quantum/plugins/cisco/common/cisco_configparser.py |    4 -
 quantum/plugins/cisco/common/cisco_constants.py    |   10 ++
 quantum/plugins/cisco/common/cisco_credentials.py  |    4 -
 quantum/plugins/cisco/common/cisco_exceptions.py   |    8 ++
 quantum/plugins/cisco/common/cisco_utils.py        |    5 +-
 quantum/plugins/cisco/db/l2network_db.py           |    2 +
 quantum/plugins/cisco/db/ucs_db.py                 |   32 +++++
 quantum/plugins/cisco/l2network_plugin.py          |   43 ++++--
 .../plugins/cisco/models/l2network_multi_blade.py  |   15 ++-
 .../plugins/cisco/models/l2network_single_blade.py |   13 +-
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   13 +-
 quantum/plugins/cisco/nova/vifdirect.py            |   42 +++---
 .../cisco/segmentation/l2network_vlan_mgr.py       |    5 +-
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |  142 +++++++++++++++-----
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  112 +++++++++------
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  100 +++++++++-----
 quantum/plugins/cisco/tests/unit/test_vlan_mgr.py  |   94 +++++++++++++
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |   47 +++++--
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    6 +-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   80 ++++++-----
 23 files changed, 612 insertions(+), 227 deletions(-)

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

 etc/quantum.conf             |    4 +++-
 quantum/common/extensions.py |    7 +++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

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

 quantum/common/test_lib.py |    1 +
 run_tests.py               |    4 +++-
 run_tests.sh               |   26 ++++++++++++++++++++++++--
 tools/pip-requires         |    2 ++
 4 files changed, 30 insertions(+), 3 deletions(-)

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

 quantum/api/api_common.py       |    6 ++++++
 quantum/api/networks.py         |   10 ++++++++--
 quantum/api/ports.py            |    5 ++---
 quantum/plugins/SamplePlugin.py |    8 ++++----
 quantum/quantum_plugin_base.py  |    4 ++--
 5 files changed, 22 insertions(+), 11 deletions(-)

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

 .../plugins/openvswitch/agent/xenserver_install.sh |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py |  147 +++++++++-------------
 1 file changed, 62 insertions(+), 85 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   29 +-------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

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

 doc/Makefile                                       |   96 +
 doc/__init__.py                                    |   13 +
 doc/pom.xml                                        |  135 ++
 doc/source/__init__.py                             |   13 +
 doc/source/conf.py                                 |  245 +++
 doc/source/docbkx/docbkx-example/README            |   14 +
 doc/source/docbkx/docbkx-example/pom.xml           |   38 +
 .../docbkx/docbkx-example/src/docbkx/example.xml   |  318 ++++
 .../docbkx-example/src/docbkx/figures/example.sdx  |   79 +
 .../docbkx-example/src/docbkx/figures/example.svg  |  523 +++++
 doc/source/docbkx/quantum-api-1.0/common.ent       |  112 ++
 .../docbkx/quantum-api-1.0/figures/Arrow_east.svg  |   70 +
 .../figures/Check_mark_23x20_02.svg                |   60 +
 .../docbkx/quantum-api-1.0/js/shjs/sh_java.js      |  337 ++++
 .../quantum-api-1.0/js/shjs/sh_javascript.js       |  347 ++++
 .../docbkx/quantum-api-1.0/js/shjs/sh_main.js      |  538 ++++++
 .../docbkx/quantum-api-1.0/js/shjs/sh_xml.js       |  115 ++
 .../quantum-api-1.0/js/trc/schema/controller.js    |  184 ++
 .../quantum-api-1.0/js/trc/schema/layoutManager.js |  137 ++
 .../quantum-api-1.0/js/trc/schema/sampleManager.js |  342 ++++
 doc/source/docbkx/quantum-api-1.0/js/trc/util.js   |  564 ++++++
 .../docbkx/quantum-api-1.0/quantum-api-guide.xml   | 2011 ++++++++++++++++++++
 .../quantum-api-1.0/samples/att-get-res-none.json  |    3 +
 .../quantum-api-1.0/samples/att-get-res-none.xml   |    1 +
 .../quantum-api-1.0/samples/att-get-res.json       |    6 +
 .../docbkx/quantum-api-1.0/samples/att-get-res.xml |    1 +
 .../quantum-api-1.0/samples/att-put-req.json       |    6 +
 .../docbkx/quantum-api-1.0/samples/att-put-req.xml |    2 +
 .../docbkx/quantum-api-1.0/samples/extensions.json |   19 +
 .../docbkx/quantum-api-1.0/samples/extensions.xml  |   21 +
 .../docbkx/quantum-api-1.0/samples/fault.json      |    7 +
 .../docbkx/quantum-api-1.0/samples/fault.xml       |    8 +
 .../samples/network-get-detail-res.json            |   22 +
 .../samples/network-get-detail-res.xml             |   14 +
 .../quantum-api-1.0/samples/network-get-res.json   |    7 +
 .../quantum-api-1.0/samples/network-get-res.xml    |    3 +
 .../quantum-api-1.0/samples/network-post-req.json  |    6 +
 .../quantum-api-1.0/samples/network-post-req.xml   |    2 +
 .../quantum-api-1.0/samples/network-post-res.json  |    6 +
 .../quantum-api-1.0/samples/network-post-res.xml   |    2 +
 .../samples/networks-get-detail-res.json           |   13 +
 .../samples/networks-get-detail-res.xml            |    8 +
 .../quantum-api-1.0/samples/networks-get-res.json  |   11 +
 .../quantum-api-1.0/samples/networks-get-res.xml   |    4 +
 .../quantum-api-1.0/samples/networks-post-req.json |    5 +
 .../quantum-api-1.0/samples/networks-post-req.xml  |    2 +
 .../quantum-api-1.0/samples/networks-post-res.json |    5 +
 .../quantum-api-1.0/samples/networks-post-res.xml  |    2 +
 .../docbkx/quantum-api-1.0/samples/notfound.json   |    7 +
 .../docbkx/quantum-api-1.0/samples/notfound.xml    |    7 +
 .../quantum-api-1.0/samples/notimplemented.json    |    7 +
 .../quantum-api-1.0/samples/notimplemented.xml     |    5 +
 .../samples/port-get-detail-res.json               |   12 +
 .../samples/port-get-detail-res.xml                |    6 +
 .../quantum-api-1.0/samples/port-get-res.json      |    8 +
 .../quantum-api-1.0/samples/port-get-res.xml       |    3 +
 .../quantum-api-1.0/samples/port-post-req.json     |    6 +
 .../quantum-api-1.0/samples/port-post-req.xml      |    2 +
 .../quantum-api-1.0/samples/port-post-res.json     |    6 +
 .../quantum-api-1.0/samples/port-post-res.xml      |    2 +
 .../samples/ports-get-detail-res.json              |   12 +
 .../samples/ports-get-detail-res.xml               |    8 +
 .../quantum-api-1.0/samples/ports-get-res.json     |   11 +
 .../quantum-api-1.0/samples/ports-get-res.xml      |    6 +
 .../docbkx/quantum-api-1.0/samples/private.json    |    9 +
 .../docbkx/quantum-api-1.0/samples/private.xml     |    6 +
 .../docbkx/quantum-api-1.0/samples/public.json     |   11 +
 .../docbkx/quantum-api-1.0/samples/public.xml      |    8 +
 .../quantum-api-1.0/samples/versions-atom.xml      |   22 +
 .../docbkx/quantum-api-1.0/samples/versions.json   |   24 +
 .../docbkx/quantum-api-1.0/samples/versions.xml    |   12 +
 doc/source/docbkx/quantum-api-1.0/style/schema.css |   82 +
 .../docbkx/quantum-api-1.0/style/shjs/sh_acid.css  |  151 ++
 .../quantum-api-1.0/style/shjs/sh_darkblue.css     |  151 ++
 .../docbkx/quantum-api-1.0/style/shjs/sh_emacs.css |  139 ++
 .../docbkx/quantum-api-1.0/style/shjs/sh_night.css |  151 ++
 .../docbkx/quantum-api-1.0/style/shjs/sh_pablo.css |  151 ++
 .../docbkx/quantum-api-1.0/style/shjs/sh_print.css |  145 ++
 .../docbkx/quantum-api-1.0/style/shjs/sh_style.css |   66 +
 .../quantum-api-1.0/style/shjs/sh_whitengrey.css   |  139 ++
 doc/source/docbkx/quantum-api-1.0/xsd/.htaccess    |    6 +
 doc/source/docbkx/quantum-api-1.0/xsd/actions.xsd  |  439 +++++
 .../docbkx/quantum-api-1.0/xsd/affinity-id.xjb     |   11 +
 .../docbkx/quantum-api-1.0/xsd/affinity-id.xsd     |   39 +
 .../docbkx/quantum-api-1.0/xsd/api-common.xjb      |   11 +
 .../docbkx/quantum-api-1.0/xsd/api-common.xsd      |   66 +
 doc/source/docbkx/quantum-api-1.0/xsd/api.xjb      |   21 +
 doc/source/docbkx/quantum-api-1.0/xsd/api.xsd      |  103 +
 doc/source/docbkx/quantum-api-1.0/xsd/atom.xjb     |   11 +
 .../docbkx/quantum-api-1.0/xsd/atom/atom.xsd       |  105 +
 doc/source/docbkx/quantum-api-1.0/xsd/atom/xml.xsd |  294 +++
 doc/source/docbkx/quantum-api-1.0/xsd/backup.xsd   |  378 ++++
 doc/source/docbkx/quantum-api-1.0/xsd/common.xsd   |  156 ++
 .../docbkx/quantum-api-1.0/xsd/ext/rax-dme/api.xsd |   38 +
 .../quantum-api-1.0/xsd/ext/rax-dme/rax-dme.xsd    |   25 +
 .../docbkx/quantum-api-1.0/xsd/extensions.xsd      |  203 ++
 doc/source/docbkx/quantum-api-1.0/xsd/faults.xsd   |  532 ++++++
 doc/source/docbkx/quantum-api-1.0/xsd/flavor.xsd   |  244 +++
 doc/source/docbkx/quantum-api-1.0/xsd/image.xsd    |  443 +++++
 doc/source/docbkx/quantum-api-1.0/xsd/ipgroup.xsd  |  245 +++
 doc/source/docbkx/quantum-api-1.0/xsd/limits.xsd   |  315 +++
 doc/source/docbkx/quantum-api-1.0/xsd/metadata.xsd |   89 +
 doc/source/docbkx/quantum-api-1.0/xsd/server.xsd   | 1013 ++++++++++
 doc/source/docbkx/quantum-api-1.0/xsd/shareip.xjb  |   11 +
 doc/source/docbkx/quantum-api-1.0/xsd/shareip.xsd  |   83 +
 doc/source/docbkx/quantum-api-1.0/xsd/txt.htaccess |    4 +
 doc/source/docbkx/quantum-api-1.0/xsd/version.xsd  |  355 ++++
 doc/source/docbkx/quantum-api-1.0/xslt/schema.xsl  | 1342 +++++++++++++
 doc/source/index.rst                               |   26 +
 etc/quantum.conf                                   |   17 -
 extensions/credential.py                           |    2 +-
 extensions/portprofile.py                          |    6 +-
 extensions/qos.py                                  |    4 +-
 quantum/api/networks.py                            |    5 +-
 quantum/api/ports.py                               |    5 +-
 quantum/common/authentication.py                   |  374 ----
 quantum/common/authorization.py                    |  107 --
 .../cisco/tests/unit/test_cisco_extension.py       |   10 +-
 quantum/plugins/openvswitch/README                 |   20 +
 run_tests.sh                                       |   11 +-
 tests/unit/test_api.py                             |   26 +-
 121 files changed, 14531 insertions(+), 516 deletions(-)

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

 quantum/plugins/openvswitch/README |   24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

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

 quantum/plugins/openvswitch/README |  132 ++++++++++++++++++++++--------------
 1 file changed, 82 insertions(+), 50 deletions(-)

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

 run_tests.sh |   13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

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

 tools/rfc.sh |  136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

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

 quantum/cli_lib.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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.

 quantum/plugins/cisco/client/cli.py           |    2 --
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py |    2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

commit c5e05120e20e1451416f41350e312bb850451813
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Sep 7 23:26:21 2011 -0700

    changing key names to confirm to api specs

 tests/unit/database_stubs.py |   46 ++++++++++++++++++-------------------
 tests/unit/test_database.py  |   52 +++++++++++++++++++++---------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

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

 quantum/db/api.py               |    2 ++
 quantum/plugins/SamplePlugin.py |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

commit fd52a945b9103251f8d46813114171a9334d338d
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Sep 7 11:19:10 2011 +0100

    Fixing bad indent

 quantum/api/api_common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.

 quantum/cli_lib.py          |  126 +++++++++++++++++++++++++++++++++++++++----
 quantum/cli_output.template |   56 -------------------
 tools/pip-requires          |    1 -
 3 files changed, 115 insertions(+), 68 deletions(-)

commit 32a51c648eb2dcb7e59e95b5bde2cfb7c2d885b1
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Sep 5 18:18:46 2011 +0100

    Fixing the bug in FakePlugin

 quantum/plugins/SamplePlugin.py |    1 +
 tests/unit/test_api.py          |   14 ++++++++++++++
 2 files changed, 15 insertions(+)

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

 tests/unit/database_stubs.py |   48 +++++++++++++++++++++---------------------
 tests/unit/test_database.py  |   44 +++++++++-----------------------------
 2 files changed, 34 insertions(+), 58 deletions(-)

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

 quantum/api/api_common.py |   20 ++++++++++++++++++++
 quantum/api/networks.py   |    6 ++++--
 quantum/api/ports.py      |    5 ++++-
 quantum/client.py         |    3 +--
 tests/unit/test_api.py    |    8 ++++----
 5 files changed, 33 insertions(+), 9 deletions(-)

commit e448ee9ee54b7e88a0cb82e6516f71f32b6cb963
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Sep 2 08:14:24 2011 +0100

    restoring correct default pipeline

 etc/quantum.conf |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 quantum/plugins/cisco/README |   31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

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.

 quantum/plugins/cisco/README                       |   29 ++++++++------------
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 +-
 2 files changed, 12 insertions(+), 19 deletions(-)

commit a43487f581cf0703f8da542cf3966f26445ed2b4
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Sep 1 16:11:53 2011 -0700

    Adding CLI usage examlpes to the README.

 quantum/plugins/cisco/README |  140 ++++++++++++++++++++++++++++++++++--------
 1 file changed, 115 insertions(+), 25 deletions(-)

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

 bin/cli           |    5 ++++-
 quantum/client.py |   11 ++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

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

 etc/quantum.conf |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

commit 16471429bec7ec0be2e70c4bf5e98d6d66768290
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Sep 1 17:17:36 2011 +0100

    Removing class DUmmyDataPlugin

 quantum/plugins/SamplePlugin.py |   99 ---------------------------------------
 1 file changed, 99 deletions(-)

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.

 quantum/plugins/cisco/README                       |    6 +++-
 .../cisco/common/cisco_nova_configuration.py       |   37 --------------------
 quantum/plugins/cisco/common/cisco_utils.py        |   33 -----------------
 quantum/plugins/cisco/conf/credentials.ini         |    7 +---
 quantum/plugins/cisco/conf/nova.ini                |    8 -----
 quantum/plugins/cisco/conf/ucs.ini                 |    1 +
 6 files changed, 7 insertions(+), 85 deletions(-)

commit c4afe3c8ca614e835882220572df50e1c80911c7
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 31 10:33:18 2011 -0700

    Updating the README file.

 quantum/plugins/cisco/README |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

 .../cisco/tests/unit/test_cisco_extension.py       |  117 ++++++++++++++++++++
 1 file changed, 117 insertions(+)

commit 4e7b2f305c6f9de8f9e32dc43913c2e8078fd974
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 21:55:45 2011 -0700

    Typo fix in README

 quantum/plugins/cisco/README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.

 quantum/plugins/cisco/README                       |   63 ++++++++++++++++----
 quantum/plugins/cisco/l2network_plugin.py          |   13 +++-
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |    3 +-
 3 files changed, 63 insertions(+), 16 deletions(-)

commit 428d3a6953b719baec453b2a748ea1e7ecb38851
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Tue Aug 30 17:35:22 2011 -0700

    Fixed a bug with plug_interface.

 quantum/plugins/cisco/l2network_plugin.py |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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

 quantum/plugins/cisco/README                       |    6 +-
 quantum/plugins/cisco/client/cli.py                |   10 +-
 quantum/plugins/cisco/l2network_plugin.py          |    7 +-
 .../plugins/cisco/models/l2network_multi_blade.py  |    2 +-
 .../plugins/cisco/models/l2network_single_blade.py |    2 +-
 .../plugins/cisco/nova/quantum_aware_scheduler.py  |   97 --------------------
 .../cisco/nova/quantum_port_aware_scheduler.py     |   97 ++++++++++++++++++++
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    2 +-
 9 files changed, 114 insertions(+), 111 deletions(-)

commit 74f6c8135490a4d253b5bebcfa63442b10d3726b
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 30 16:09:47 2011 -0700

    adding quantum database unit test cases

 tests/unit/database_stubs.py |  190 ++++++++++++++++++++++++++++++++++++++++++
 tests/unit/test_database.py  |  141 +++++++++++++++++++++++++++++++
 2 files changed, 331 insertions(+)

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

 extensions/multiport.py |  116 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 116 insertions(+)

commit d73c08564cddcfbe371e66ae6860de9ca4e1bdbc
Author: Ying Liu <yinliu2@cisco.com>
Date:   Tue Aug 30 16:09:51 2011 -0700

    add multiport resource

 quantum/plugins/cisco/common/cisco_exceptions.py |    6 ++++++
 quantum/plugins/cisco/common/cisco_faults.py     |   22 +++++++++++++++++++---
 2 files changed, 25 insertions(+), 3 deletions(-)

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

 quantum/api/api_common.py |   29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

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)

 quantum/api/api_common.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 extensions/novatenant.py  |    2 --
 extensions/portprofile.py |    2 --
 2 files changed, 4 deletions(-)

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

 quantum/plugins/cisco/client/cli.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/plugins/cisco/client/cli.py       |   62 +++++++++++++++--------------
 quantum/plugins/cisco/l2network_plugin.py |   19 +++------
 2 files changed, 38 insertions(+), 43 deletions(-)

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

 quantum/plugins/cisco/client/cli    |  194 ------------------------------
 quantum/plugins/cisco/client/cli.py |  223 +++++++++++++++++++++++++++++++++++
 2 files changed, 223 insertions(+), 194 deletions(-)

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

 quantum/client.py            |   42 ++++++++++++++++++++++++++++--------------
 quantum/common/exceptions.py |   15 +++++++++++++++
 2 files changed, 43 insertions(+), 14 deletions(-)

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.

 quantum/db/api.py      |    7 +++++++
 tests/unit/test_api.py |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)

commit 5122811ae49711f1735c2bc0736d2b580b9f7e53
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 29 02:14:05 2011 -0700

    Minor fix in delete_port

 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py |    1 -
 1 file changed, 1 deletion(-)

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.

 quantum/plugins/cisco/client/cli                   |  194 ++++++++++++++
 quantum/plugins/cisco/common/cisco_constants.py    |    4 +
 quantum/plugins/cisco/l2network_plugin.py          |   55 +++-
 .../plugins/cisco/models/l2network_multi_blade.py  |    5 +
 .../plugins/cisco/models/l2network_single_blade.py |    5 +
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  268 +++++++++++++-------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   33 +++
 7 files changed, 463 insertions(+), 101 deletions(-)

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

 quantum/plugins/cisco/db/api.py |   43 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

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.

 .../plugins/cisco/nova/quantum_aware_scheduler.py  |    2 +-
 quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

commit e87990643e34b2ebb8c614f248cb4c010d9abceb
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 27 22:00:23 2011 -0700

    bug fixes to handle multinic

 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py |  101 +++++++++++++++++-----
 1 file changed, 81 insertions(+), 20 deletions(-)

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

 .../cisco/tests/unit/test_cisco_extension.py       |   27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

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

 quantum/cli_lib.py     |    9 +++++++--
 tests/unit/test_cli.py |   29 ++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

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

 .../cisco/tests/unit/test_cisco_extension.py       |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

 extensions/_credential_view.py |    8 +++-----
 extensions/_novatenant_view.py |    8 ++++----
 extensions/_pprofiles.py       |    7 +++----
 extensions/_qos_view.py        |    6 +++---
 extensions/credential.py       |    4 ++--
 extensions/novatenant.py       |   33 +++++++++++++++-----------------
 extensions/portprofile.py      |   41 ++++++++++++++++++++--------------------
 extensions/qos.py              |   14 +++++++-------
 8 files changed, 57 insertions(+), 64 deletions(-)

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

 extensions/_credential_view.py               |    8 ++---
 extensions/_novatenant_view.py               |    8 ++---
 extensions/_pprofiles.py                     |    7 ++---
 extensions/_qos_view.py                      |    6 ++--
 extensions/credential.py                     |    4 +--
 extensions/novatenant.py                     |   28 ++++++++----------
 extensions/portprofile.py                    |   41 +++++++++++++-------------
 extensions/qos.py                            |   14 ++++-----
 quantum/plugins/cisco/common/cisco_faults.py |   20 ++++++-------
 9 files changed, 64 insertions(+), 72 deletions(-)

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

 etc/quantum.conf                                   |    2 +-
 quantum/api/__init__.py                            |    6 ++----
 quantum/common/extensions.py                       |    2 +-
 quantum/manager.py                                 |    2 +-
 .../cisco/tests/unit/test_cisco_extension.py       |    2 +-
 tests/unit/test_api.py                             |    2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

commit 976007b95188af757e5fbf7b75e6d7dc9b5fe7af
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 26 10:56:43 2011 +0100

    Cleaning pep8

 quantum/plugins/cisco/common/cisco_faults.py |   20 ++++++++++----------
 tests/unit/test_extensions.py                |    4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

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

 bin/cli                          |    8 ++++----
 quantum/cli_lib.py               |   24 ++++++++----------------
 quantum/cli_output.template      |   37 ++++++++++++++++++++-----------------
 quantum/client.py                |    1 -
 tests/unit/client_tools/stubs.py |    2 +-
 tests/unit/test_cli.py           |   35 ++++++++++++-----------------------
 tools/pip-requires               |    1 -
 7 files changed, 45 insertions(+), 63 deletions(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   25 +++++++++++----------
 quantum/plugins/openvswitch/run_tests.py          |    3 +++
 2 files changed, 16 insertions(+), 12 deletions(-)

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

 quantum/plugins/cisco/README                       |    4 +
 .../cisco/tests/unit/test_cisco_extension.py       |  104 +++++++++++++++++---
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |   10 --
 3 files changed, 97 insertions(+), 21 deletions(-)

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

 quantum/plugins/cisco/l2network_plugin.py          |   10 +++++-----
 .../plugins/cisco/models/l2network_multi_blade.py  |    8 ++++----
 .../plugins/cisco/models/l2network_single_blade.py |    8 ++++----
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |    8 ++++----
 4 files changed, 17 insertions(+), 17 deletions(-)

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

 extensions/novatenant.py                           |   18 ++++++++--------
 .../cisco/tests/unit/test_cisco_extension.py       |   22 ++++++++++----------
 2 files changed, 20 insertions(+), 20 deletions(-)

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

 quantum/plugins/cisco/db/l2network_models.py      |    4 +-
 quantum/plugins/cisco/db/ucs_db.py                |  256 -----------
 quantum/plugins/cisco/db/ucs_models.py            |   83 +---
 quantum/plugins/cisco/tests/unit/test_database.py |  467 +--------------------
 4 files changed, 10 insertions(+), 800 deletions(-)

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

 .../cisco/nexus/cisco_nexus_network_driver.py      |    2 +-
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    2 +-
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

commit 51ddffa2641d0cf0725f7a5147ad0b90551e36a0
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Thu Aug 25 12:34:03 2011 -0700

    Fixed the Unit Test for Nexus Driver

 .../cisco/nexus/cisco_nexus_network_driver.py      |    2 ++
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |   18 +++++++++++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

commit 6b477714ba576b8a858b9ad222b14e7fe77e58ca
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 25 12:34:01 2011 -0700

    add cisco_faults under l2network package.

 quantum/plugins/cisco/common/cisco_faults.py |  148 ++++++++++++++++++++++++++
 1 file changed, 148 insertions(+)

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

 extensions/_credential_view.py                     |    6 +-
 extensions/_exceptions.py                          |  160 --------------------
 extensions/_faults.py                              |  153 -------------------
 extensions/_novatenant_view.py                     |    5 +-
 extensions/_pprofiles.py                           |    2 +-
 extensions/_qos_view.py                            |    4 +-
 extensions/credential.py                           |   14 +-
 extensions/novatenant.py                           |   33 +---
 extensions/portprofile.py                          |    9 +-
 extensions/qos.py                                  |    7 +-
 .../cisco/tests/unit/test_cisco_extension.py       |   16 +-
 11 files changed, 34 insertions(+), 375 deletions(-)

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).

 quantum/plugins/cisco/common/cisco_credentials.py  |    2 +-
 quantum/plugins/cisco/l2network_model.py           |    2 +-
 quantum/plugins/cisco/l2network_plugin.py          |    2 +-
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 +-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

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

 README |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 quantum/cli.py              |   12 +--
 quantum/cli_output.template |    5 ++
 tests/unit/test_cli.py      |  177 ++++++++++++++++++++++++++++++++++++++++---
 3 files changed, 179 insertions(+), 15 deletions(-)

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

 .../cisco/nexus/cisco_nexus_network_driver.py      |   25 ++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

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

 quantum/cli.py              |    8 +++----
 quantum/cli_output.template |    2 +-
 quantum/client.py           |   16 +++++++------
 tests/unit/test_cli.py      |   56 ++++++++++++++++++++++++++++---------------
 4 files changed, 51 insertions(+), 31 deletions(-)

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

 quantum/cli.py                      |   73 ++++++++++++++++++++--------
 quantum/cli_output.template         |    1 +
 quantum/client.py                   |    6 +--
 tests/unit/client_tools/__init__.py |    2 +-
 tests/unit/client_tools/stubs.py    |   39 +++++----------
 tests/unit/test_cli.py              |   91 ++++++++++-------------------------
 6 files changed, 95 insertions(+), 117 deletions(-)

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

 quantum/plugins/cisco/common/cisco_constants.py    |    3 +-
 quantum/plugins/cisco/common/cisco_credentials.py  |   47 +++++---
 quantum/plugins/cisco/l2network_plugin.py          |  116 +++++---------------
 .../plugins/cisco/models/l2network_single_blade.py |  103 ++++++++++-------
 4 files changed, 121 insertions(+), 148 deletions(-)

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

 quantum/plugins/cisco/common/cisco_exceptions.py |    6 ++++++
 quantum/plugins/cisco/db/l2network_db.py         |   18 ++++++++++++++++--
 2 files changed, 22 insertions(+), 2 deletions(-)

commit 25560fd74e8466d51b4602203f10a03b53562792
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 15:23:56 2011 -0700

    integration with l2network_plugin.py

 quantum/plugins/cisco/common/cisco_exceptions.py |   10 +++---
 quantum/plugins/cisco/db/l2network_db.py         |   28 ++++++++--------
 quantum/plugins/cisco/db/l2network_models.py     |   37 +++++++++++-----------
 quantum/plugins/cisco/db/ucs_db.py               |    2 +-
 4 files changed, 39 insertions(+), 38 deletions(-)

commit 8e3a228fa3208281b2d02e84a0d90cc9e84ffaab
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 14:11:10 2011 -0700

    fixing relative import in nexus_db.py

 quantum/plugins/cisco/db/nexus_db.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b5fd8f8075302b3aa56a47d98b56e922022fd803
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Wed Aug 24 13:36:38 2011 -0700

    putting in db support for creds and qos

 quantum/plugins/cisco/common/cisco_exceptions.py |   15 ++
 quantum/plugins/cisco/db/l2network_db.py         |  176 +++++++++++++++++++++-
 quantum/plugins/cisco/db/l2network_models.py     |   42 ++++++
 3 files changed, 231 insertions(+), 2 deletions(-)

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.

 README                           |   26 +++++++++++++++++++++
 etc/quantum.conf                 |   15 ++++++-------
 etc/quantum.conf.keystone        |   46 --------------------------------------
 quantum/common/authentication.py |    6 ++---
 4 files changed, 36 insertions(+), 57 deletions(-)

commit bbbdf82de385d360b0a0f7f969a3a586d0f85ff0
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 24 19:10:03 2011 +0100

    Templated output for CLI completed!

 quantum/cli.py              |  341 +++++++++++++++----------------------------
 quantum/cli_output.template |   33 ++++-
 quantum/client.py           |    1 +
 3 files changed, 153 insertions(+), 222 deletions(-)

commit b9bd8976b2337677255f12e7fd2291094ce3bc49
Author: Arvind Somy <asomya@cisco.com>
Date:   Wed Aug 24 13:10:29 2011 -0400

    PEP8 fixes for setup.py

 setup.py |   35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

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

 quantum/common/test_lib.py |  278 --------------------------------------------
 1 file changed, 278 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py  |    1 +
 quantum/plugins/cisco/l2network_plugin.py        |    7 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py |   81 +++++++++++++++-------
 3 files changed, 62 insertions(+), 27 deletions(-)

commit 0bb571f24bd23ed9f4b38888ed05fd87c50301a8
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 24 03:27:54 2011 -0700

    Noticed some pep8 errors, fixed them.

 .../plugins/cisco/nova/quantum_aware_scheduler.py  |    5 ++---
 quantum/plugins/cisco/nova/vifdirect.py            |    3 +--
 2 files changed, 3 insertions(+), 5 deletions(-)

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.

 quantum/client.py                                  |    7 ++-
 quantum/plugins/cisco/nova/__init__.py             |   18 -------
 .../plugins/cisco/nova/quantum_aware_scheduler.py  |   52 ++++++++++++++-----
 quantum/plugins/cisco/nova/vifdirect.py            |   54 +++++++++++++++-----
 4 files changed, 82 insertions(+), 49 deletions(-)

commit 4e1d511d7661e1156fcb608145f0530979789d31
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Wed Aug 24 00:02:10 2011 -0700

    Review Changes

 quantum/plugins/cisco/README                       |   17 ++-
 quantum/plugins/cisco/conf/quantum.conf.ciscoext   |    4 +-
 .../cisco/tests/unit/test_cisco_extension.py       |  144 ++++++++++++++++++--
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   71 ++++------
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |   18 +--
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |    3 +-
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |   90 +++++++++++-
 7 files changed, 261 insertions(+), 86 deletions(-)

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

 extensions/_faults.py |   10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

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

 .../cisco/nexus/cisco_nexus_network_driver.py      |   19 +++++++++++++------
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |   11 ++++-------
 2 files changed, 17 insertions(+), 13 deletions(-)

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

 quantum/common/test_lib.py |  278 --------------------------------------------
 1 file changed, 278 deletions(-)

commit 930d13ce4e1cc2a418d02e904b51582a34fb5ef6
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 23 11:36:50 2011 -0700

    Fixes based on review comments

 quantum/plugins/cisco/README                       |    9 +++-
 quantum/plugins/cisco/db/l2network_db.py           |    9 ++--
 quantum/plugins/cisco/l2network_model.py           |    2 +-
 quantum/plugins/cisco/l2network_plugin.py          |   14 ------
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   46 --------------------
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |    2 -
 6 files changed, 13 insertions(+), 69 deletions(-)

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

 README                           |   37 +++++++++++++++++++++++++++++++++++++
 etc/quantum.conf                 |    7 ++++---
 quantum/common/authentication.py |    6 ++----
 quantum/common/authorization.py  |   24 +++++++++++++++++++-----
 4 files changed, 62 insertions(+), 12 deletions(-)

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)

 tests/unit/test_api.py |   30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

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

 quantum/api/views/attachments.py |    4 ++--
 quantum/api/views/networks.py    |    4 ++--
 quantum/api/views/ports.py       |    4 ++--
 quantum/plugins/SamplePlugin.py  |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_exceptions.py   |   10 ++++++----
 quantum/plugins/cisco/db/nexus_models.py           |    2 --
 quantum/plugins/cisco/l2network_plugin.py          |    8 ++++----
 .../cisco/l2network_plugin_configuration.py        |    9 +++++++++
 4 files changed, 19 insertions(+), 10 deletions(-)

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

 quantum/plugins/cisco/README |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 3ed7419816e0fca047a6cf995e9374c2b8f2e5d7
Author: Ying Liu <yinliu2@cisco.com>
Date:   Mon Aug 22 13:13:29 2011 -0700

    clean up code and fix some comments

 extensions/novatenant.py  |    1 -
 extensions/portprofile.py |    2 --
 extensions/qos.py         |    1 -
 3 files changed, 4 deletions(-)

commit 71d40685d1b7230489b417c5552876e8a60bcad7
Author: Ying Liu <yinliu2@cisco.com>
Date:   Mon Aug 22 13:02:00 2011 -0700

    clean code and fix some comments.

 extensions/_exceptions.py |   21 ---------------------
 extensions/_faults.py     |    3 ++-
 extensions/credential.py  |    7 ++-----
 extensions/novatenant.py  |   12 +++++-------
 extensions/portprofile.py |    5 +----
 5 files changed, 10 insertions(+), 38 deletions(-)

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.

 quantum/plugins/cisco/db/l2network_db.py  |    2 ++
 quantum/plugins/cisco/l2network_plugin.py |    1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

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.

 etc/quantum.conf |   48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

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

 tests/unit/test_clientlib.py.THIS |  625 -------------------------------------
 1 file changed, 625 deletions(-)

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.

 quantum/plugins/cisco/l2device_inventory_base.py   |  343 ++++++++++++++++++++
 .../plugins/cisco/models/l2network_multi_blade.py  |   17 +-
 2 files changed, 354 insertions(+), 6 deletions(-)

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).

 quantum/plugins/cisco/common/cisco_constants.py    |    5 +-
 quantum/plugins/cisco/conf/plugins.ini             |    4 +
 .../plugins/cisco/models/l2network_multi_blade.py  |  160 +++++-------
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  265 +++++++++++++++-----
 4 files changed, 269 insertions(+), 165 deletions(-)

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.

 quantum/plugins/cisco/README |   49 ------------------------------------------
 1 file changed, 49 deletions(-)

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).

 quantum/plugins/cisco/README |   54 ++++++++++++++++++++++++++++++++++++++----
 1 file changed, 49 insertions(+), 5 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py    |    2 +-
 quantum/plugins/cisco/conf/l2network_plugin.ini    |    2 +-
 .../plugins/cisco/models/l2network_multi_blade.py  |   26 ++++++++-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |   58 ++------------------
 4 files changed, 31 insertions(+), 57 deletions(-)

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

 quantum/plugins/cisco/db/ucs_db.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit beba040e88a6e15d6dba9c6bd38b46689ca5940d
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Sat Aug 20 20:51:07 2011 -0700

    adding helper function for port binding model

 quantum/plugins/cisco/db/ucs_db.py |   12 ++++++++++++
 1 file changed, 12 insertions(+)

commit 825f6c5c5ede31d97d9892e188312ffe3e531720
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 20:37:51 2011 -0700

    UCS inventore persistence and pep8/pylint fixes.

 .../cisco/tests/unit/test_cisco_extension.py       |   12 ++----
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |   43 ++++++++++++++++----
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   10 ++---
 3 files changed, 43 insertions(+), 22 deletions(-)

commit 6b78dfc0b865aa76d361fc219fd601948aee6660
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 18:20:43 2011 -0700

    UCS persistence fixes.

 quantum/plugins/cisco/l2network_plugin.py     |   84 +++++++++----------------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py |    4 +-
 2 files changed, 32 insertions(+), 56 deletions(-)

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

 quantum/plugins/cisco/db/ucs_db.py                |   37 +++++++++++++++++----
 quantum/plugins/cisco/db/ucs_models.py            |   19 +++++++----
 quantum/plugins/cisco/tests/unit/test_database.py |   16 ++++-----
 3 files changed, 51 insertions(+), 21 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py |    2 +
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py   |  133 +++++++----------------
 2 files changed, 40 insertions(+), 95 deletions(-)

commit 4ba67cea7163ed1bbb51030da8f0ebaa5ccb3ea2
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 13:45:17 2011 -0700

    Persistence support for UCS plugin network.

 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py |   92 ++++++++++++++++---------
 1 file changed, 60 insertions(+), 32 deletions(-)

commit 764eca55d1b206c3c3af3fb69734965dbe23d0bd
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 12:44:23 2011 -0700

    adding utility functions to create dictionaries

 quantum/plugins/cisco/common/cisco_utils.py |   40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

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

 quantum/plugins/cisco/common/cisco_exceptions.py  |   40 ++
 quantum/plugins/cisco/db/l2network_models.py      |    6 +-
 quantum/plugins/cisco/db/ucs_db.py                |  350 +++++++++++
 quantum/plugins/cisco/db/ucs_models.py            |  129 +++++
 quantum/plugins/cisco/tests/unit/test_database.py |  644 ++++++++++++++++++++-
 5 files changed, 1158 insertions(+), 11 deletions(-)

commit cb1844ed8e91681ae019d7be64c43be404083a53
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 08:57:38 2011 -0700

    Adding some error checks.

 quantum/plugins/cisco/l2network_plugin.py |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit ba2cfc5080ca976ac1134ed03382c5080434934a
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 03:19:52 2011 -0700

    Reduced excessive logging.

 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |   26 +++++++++-----------
 1 file changed, 11 insertions(+), 15 deletions(-)

commit 9092441db4a33d5ccde7f32658b3251212eb9ccf
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 20 02:51:59 2011 -0700

    Several fixes to initial version.

 quantum/plugins/cisco/common/cisco_constants.py    |    1 +
 quantum/plugins/cisco/l2network_plugin.py          |    6 +-
 .../plugins/cisco/models/l2network_multi_blade.py  |   20 +++-
 .../cisco/segmentation/l2network_vlan_mgr.py       |    2 +
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  119 +++++++++++++++++---
 .../cisco/ucs/cisco_ucs_inventory_configuration.py |   31 +++++
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    2 -
 7 files changed, 161 insertions(+), 20 deletions(-)

commit 69dfdc95755208663ccfb170b3c50102e31e287e
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Aug 19 23:54:02 2011 -0700

    fixing the the test_database.py tests

 quantum/plugins/cisco/tests/unit/test_database.py |   53 +++++++++++----------
 1 file changed, 29 insertions(+), 24 deletions(-)

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.

 .../cisco/l2network_plugin_configuration.py        |    3 +
 .../plugins/cisco/l2network_segmentation_base.py   |    2 +-
 .../plugins/cisco/models/l2network_multi_blade.py  |    8 +-
 .../plugins/cisco/models/l2network_single_blade.py |    2 +-
 .../cisco/segmentation/l2network_vlan_mgr.py       |    4 +-
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |   24 +++--
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  107 ++++++--------------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   10 +-
 8 files changed, 62 insertions(+), 98 deletions(-)

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

 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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

 .../cisco/tests/unit/test_cisco_extension.py       |    9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py    |   12 +
 quantum/plugins/cisco/conf/l2network_plugin.ini    |    9 +-
 quantum/plugins/cisco/conf/ucs_inventory.ini       |   24 ++
 quantum/plugins/cisco/l2network_model.py           |  123 -------
 quantum/plugins/cisco/l2network_plugin.py          |   25 +-
 .../plugins/cisco/l2network_segmentation_base.py   |   75 ++++
 quantum/plugins/cisco/models/__init__.py           |   20 ++
 .../plugins/cisco/models/l2network_multi_blade.py  |  170 +++++++++
 .../plugins/cisco/models/l2network_single_blade.py |  139 ++++++++
 quantum/plugins/cisco/segmentation/__init__.py     |   20 ++
 .../cisco/segmentation/l2network_vlan_mgr.py       |   47 +++
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    7 +
 quantum/plugins/cisco/ucs/cisco_ucs_inventory.py   |  361 ++++++++++++++++++++
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  127 ++++++-
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   49 ++-
 15 files changed, 1050 insertions(+), 158 deletions(-)

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

 quantum/plugins/cisco/conf/quantum.conf.ciscoext |   24 ++++++++++++++++++++++
 1 file changed, 24 insertions(+)

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

 etc/quantum.conf.mocktest |   24 ------------------------
 1 file changed, 24 deletions(-)

commit 359b89542c6f224d266621a65a56722d44b82b78
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 19:47:37 2011 -0700

    Updated conf file

 etc/quantum.conf.mocktest |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit dca478bd025ea3af28b3eae9362a0baf868b4576
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 19 19:42:04 2011 -0700

    Adding Entension API unt tests

 etc/quantum.conf.mocktest                          |   24 +
 quantum/plugins/cisco/README                       |    7 +-
 .../cisco/tests/unit/test_cisco_extension.py       |  849 ++++++++++++++++++++
 3 files changed, 878 insertions(+), 2 deletions(-)

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.

 .../plugins/cisco/nova/quantum_aware_scheduler.py  |   12 +++++-------
 quantum/plugins/cisco/nova/vifdirect.py            |   13 ++++++-------
 2 files changed, 11 insertions(+), 14 deletions(-)

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

 extensions/credential.py  |    3 ++-
 extensions/novatenant.py  |   11 ++++-------
 extensions/portprofile.py |   18 ++++++++++--------
 extensions/qos.py         |    3 ++-
 4 files changed, 18 insertions(+), 17 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_exceptions.py |    2 +-
 quantum/plugins/cisco/l2network_plugin.py        |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

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).

 quantum/plugins/cisco/l2network_plugin.py |   56 +++++++++++++++++++++++------
 1 file changed, 45 insertions(+), 11 deletions(-)

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

 quantum/plugins/cisco/README                       |    7 ++++---
 quantum/plugins/cisco/conf/nexus.ini               |    5 +++--
 .../cisco/nexus/cisco_nexus_configuration.py       |    3 ++-
 .../cisco/nexus/cisco_nexus_network_driver.py      |   14 +++++++++-----
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   17 +++++++++++++----
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    3 ++-
 6 files changed, 33 insertions(+), 16 deletions(-)

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

 quantum/plugins/cisco/common/cisco_exceptions.py  |    5 +
 quantum/plugins/cisco/db/l2network_db.py          |   26 +++-
 quantum/plugins/cisco/db/nexus_db.py              |   93 +++++++++++++++
 quantum/plugins/cisco/db/nexus_models.py          |   40 +++++++
 quantum/plugins/cisco/tests/unit/test_database.py |  131 +++++++++++++++++++++
 5 files changed, 293 insertions(+), 2 deletions(-)

commit 4a8599cc90373a3a4f5ebc04869f3e1a02bc23fd
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 08:14:17 2011 -0700

    add plugins.ini back

 quantum/plugins.ini |    3 +++
 1 file changed, 3 insertions(+)

commit 1caa7874b02899d80f0b0ddffef0bbca12ed231c
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 08:00:37 2011 -0700

    add all conf/*.ini back

 quantum/plugins/cisco/conf/credentials.ini      |   15 +++++++++++++++
 quantum/plugins/cisco/conf/db_conn.ini          |    5 +++++
 quantum/plugins/cisco/conf/l2network_plugin.ini |   16 ++++++++++++++++
 quantum/plugins/cisco/conf/nexus.ini            |   10 ++++++++++
 quantum/plugins/cisco/conf/nova.ini             |    8 ++++++++
 quantum/plugins/cisco/conf/plugins.ini          |    3 +++
 quantum/plugins/cisco/conf/ucs.ini              |   10 ++++++++++
 7 files changed, 67 insertions(+)

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

 quantum/plugins/cisco/CiscoPlugin.py |  562 ----------------------------------
 1 file changed, 562 deletions(-)

commit ed84b41a3458a81f8db7c00704e0b773768de50a
Author: Ying Liu <yinliu2@cisco.com>
Date:   Fri Aug 19 00:14:44 2011 -0700

    remove all configuration files

 extensions/_faults.py                           |    2 +-
 quantum/plugins.ini                             |    2 --
 quantum/plugins/cisco/conf/credentials.ini      |   15 ---------------
 quantum/plugins/cisco/conf/db_conn.ini          |    5 -----
 quantum/plugins/cisco/conf/l2network_plugin.ini |   16 ----------------
 quantum/plugins/cisco/conf/nexus.ini            |   10 ----------
 quantum/plugins/cisco/conf/nova.ini             |    8 --------
 quantum/plugins/cisco/conf/plugins.ini          |    3 ---
 quantum/plugins/cisco/conf/ucs.ini              |   10 ----------
 9 files changed, 1 insertion(+), 70 deletions(-)

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

 cisco_demo/demo_client.py    |  386 ------------------------------------------
 cisco_demo/demo_client.py.bk |  127 --------------
 cisco_demo/test_client.py    |   83 ---------
 test_scripts/miniclient.py   |   98 -----------
 test_scripts/tests.py        |  150 ----------------
 5 files changed, 844 deletions(-)

commit 9939bc6748752852244b6e7165ccc161d3585c18
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Thu Aug 18 16:53:57 2011 -0700

    Removed concatenation per review comments.

 .../plugins/cisco/nova/quantum_aware_scheduler.py  |    2 +-
 quantum/plugins/cisco/nova/vifdirect.py            |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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

 quantum/plugins.ini                             |    4 +---
 quantum/plugins/cisco/conf/db_conn.ini          |    6 +++---
 quantum/plugins/cisco/conf/l2network_plugin.ini |    4 ++--
 quantum/plugins/cisco/conf/plugins.ini          |    2 +-
 4 files changed, 7 insertions(+), 9 deletions(-)

commit a7ef6583c0d275d2d24d8467922ad09c39569ce3
Author: Ying Liu <yinliu2@cisco.com>
Date:   Thu Aug 18 15:57:36 2011 -0700

    pylint and pep8 fix

 extensions/_credential_view.py |    2 +-
 extensions/_pprofiles.py       |    2 +-
 extensions/credential.py       |    1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

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

 etc/quantum.conf          |   45 ---------------------------------------------
 etc/quantum.conf.keystone |   45 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 45 deletions(-)

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

 quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.

 quantum/client.py            |   77 +++++++++++++++++++++++++++++-------------
 quantum/common/exceptions.py |    4 +++
 2 files changed, 57 insertions(+), 24 deletions(-)

commit f5b1a6547dedf89fd4320f4c68eaa2df3604b890
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Thu Aug 18 11:09:37 2011 -0700

    pep8 error fixed for l2network_db.py

 quantum/plugins/cisco/db/l2network_db.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.

 .../plugins/cisco/nova/quantum_aware_scheduler.py  |    4 +---
 quantum/plugins/cisco/nova/vifdirect.py            |    4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

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.

 quantum/plugins/cisco/nova/__init__.py             |   18 ++++
 .../plugins/cisco/nova/quantum_aware_scheduler.py  |   77 +++++++++++++++++
 quantum/plugins/cisco/nova/vifdirect.py            |   88 ++++++++++++++++++++
 3 files changed, 183 insertions(+)

commit 4f7cdf415c147480f5fac3870f398001dd02b2af
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 17 17:15:21 2011 -0700

    fix some pylint issues

 extensions/_credential_view.py |   20 ++++++++++++++++++++
 extensions/_exceptions.py      |    2 ++
 extensions/_faults.py          |    2 ++
 extensions/_novatenant_view.py |   25 ++++++++++++++++++++-----
 extensions/_pprofiles.py       |   20 ++++++++++++++++++++
 extensions/_qos_view.py        |   20 ++++++++++++++++++++
 extensions/credential.py       |    3 ++-
 extensions/novatenant.py       |   11 +++++++----
 extensions/portprofile.py      |   23 ++++++++++++++++++-----
 extensions/qos.py              |    3 ++-
 quantum/plugins.ini            |    4 ++--
 11 files changed, 115 insertions(+), 18 deletions(-)

commit 8fed131856ef756c1aab737261b30bf7a3da1b55
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Wed Aug 17 16:21:27 2011 -0700

    Pylint and pep8 fixes.

 quantum/plugins/cisco/common/cisco_constants.py |    2 --
 quantum/plugins/cisco/l2network_plugin.py       |   14 ++------------
 2 files changed, 2 insertions(+), 14 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py  |   32 +++--
 quantum/plugins/cisco/common/cisco_exceptions.py |   16 +++
 quantum/plugins/cisco/l2network_plugin.py        |  151 +++++++++++++++++++++-
 3 files changed, 188 insertions(+), 11 deletions(-)

commit 8ec3041cb6e29e13dcc3f1166e59f60dd71e8aac
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 17 23:06:15 2011 +0100

    Removing unused error response codes

 quantum/api/faults.py |    2 --
 1 file changed, 2 deletions(-)

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

 quantum/plugins/cisco/db/l2network_db.py |   12 ++++++------
 quantum/plugins/cisco/run_tests.py       |   13 ++++++-------
 2 files changed, 12 insertions(+), 13 deletions(-)

commit 74837113e60007fcca498c2479039ac592557e65
Author: Ying Liu <yinliu2@cisco.com>
Date:   Wed Aug 17 12:26:32 2011 -0700

    add extension change to ying's branch

 cisco_demo/demo_client.py                       |  385 ++++++++++++++++
 cisco_demo/demo_client.py.bk                    |  127 +++++
 cisco_demo/test_client.py                       |   83 ++++
 extensions/_credential_view.py                  |   35 ++
 extensions/_exceptions.py                       |  160 +++++++
 extensions/_faults.py                           |  157 +++++++
 extensions/_novatenant_view.py                  |   28 ++
 extensions/_pprofiles.py                        |   40 ++
 extensions/_qos_view.py                         |   35 ++
 extensions/credential.py                        |  159 +++++++
 extensions/novatenant.py                        |  161 +++++++
 extensions/portprofile.py                       |  207 +++++++++
 extensions/qos.py                               |  154 +++++++
 quantum/plugins.ini                             |    5 +-
 quantum/plugins/cisco/CiscoPlugin.py            |  562 +++++++++++++++++++++++
 quantum/plugins/cisco/conf/db_conn.ini          |    6 +-
 quantum/plugins/cisco/conf/l2network_plugin.ini |    4 +-
 quantum/plugins/cisco/conf/plugins.ini          |    2 +-
 test_scripts/miniclient.py                      |   98 ++++
 test_scripts/tests.py                           |  150 ++++++
 20 files changed, 2550 insertions(+), 8 deletions(-)

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.

 .../plugins/cisco/tests/unit/test_ucs_driver.py    |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 quantum/common/extensions.py  |   15 ++++++++-
 tests/unit/test_extensions.py |   67 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 79 insertions(+), 3 deletions(-)

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.

 quantum/common/test_lib.py                         |  278 +++++++++++++++++++
 quantum/plugins/cisco/README                       |   37 ++-
 quantum/plugins/cisco/run_tests.py                 |  281 +++-----------------
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   37 +--
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |    7 +-
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |   55 ++--
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |   36 +--
 run_tests.py                                       |  246 +----------------
 run_tests.sh                                       |   15 +-
 tests/unit/test_api.py                             |   42 +--
 10 files changed, 429 insertions(+), 605 deletions(-)

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.

 quantum/plugins/cisco/README                       |   32 +++++++++++---------
 .../cisco/nexus/cisco_nexus_configuration.py       |   10 ------
 2 files changed, 18 insertions(+), 24 deletions(-)

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.

 quantum/plugins/cisco/__init__.py                  |    2 +
 quantum/plugins/cisco/common/__init__.py           |    2 +
 quantum/plugins/cisco/common/cisco_configparser.py |   18 +--
 quantum/plugins/cisco/common/cisco_constants.py    |    2 +
 quantum/plugins/cisco/common/cisco_credentials.py  |   20 ++--
 quantum/plugins/cisco/common/cisco_exceptions.py   |   34 +++++-
 .../cisco/common/cisco_nova_configuration.py       |   25 ++--
 quantum/plugins/cisco/common/cisco_utils.py        |   14 ++-
 quantum/plugins/cisco/l2device_plugin_base.py      |   10 +-
 quantum/plugins/cisco/l2network_model.py           |   76 +++++++-----
 quantum/plugins/cisco/l2network_model_base.py      |   11 +-
 quantum/plugins/cisco/l2network_plugin.py          |  126 +++++++++++---------
 .../cisco/l2network_plugin_configuration.py        |   60 +++++-----
 quantum/plugins/cisco/ucs/__init__.py              |    2 +
 quantum/plugins/cisco/ucs/cisco_getvif.py          |   10 +-
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   27 ++---
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |   58 ++++-----
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   13 +-
 18 files changed, 287 insertions(+), 223 deletions(-)

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

 quantum/plugins/openvswitch/run_tests.py |    7 +++++++
 1 file changed, 7 insertions(+)

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

 quantum/plugins/cisco/nexus/__init__.py            |    5 +-
 .../cisco/nexus/cisco_nexus_configuration.py       |   23 ++++--
 .../cisco/nexus/cisco_nexus_network_driver.py      |   78 ++++++++++++++------
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   19 ++++-
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |   20 +++--
 5 files changed, 97 insertions(+), 48 deletions(-)

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

 quantum/cli.py              |   24 +++++++++++----------
 quantum/cli_output.template |    6 ++++++
 tests/unit/test_cli.py      |   50 ++++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 68 insertions(+), 12 deletions(-)

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

 quantum/plugins/cisco/db/test_database.py         |  825 --------------------
 quantum/plugins/cisco/tests/unit/test_database.py |  840 +++++++++++++++++++++
 2 files changed, 840 insertions(+), 825 deletions(-)

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

 quantum/plugins/cisco/README                       |    4 +-
 quantum/plugins/cisco/conf/nexus.ini               |    2 +
 .../cisco/nexus/cisco_nexus_configuration.py       |    1 +
 .../cisco/nexus/cisco_nexus_network_driver.py      |  198 +++-----------------
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    7 +-
 .../plugins/cisco/nexus/cisco_nexus_snippets.py    |  161 ++++++++++++++++
 6 files changed, 197 insertions(+), 176 deletions(-)

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.

 quantum/plugins/cisco/README |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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

 quantum/plugins/cisco/db/l2network_db.py     |   15 +-
 quantum/plugins/cisco/db/l2network_models.py |    8 +-
 quantum/plugins/cisco/db/test_database.py    |  306 ++++++++++++++++----------
 3 files changed, 208 insertions(+), 121 deletions(-)

commit ff74c1deb0914530231582081ab2e736fe9ce443
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 15 09:02:24 2011 -0700

    Removing extra testing function on Nexus Driver

 .../cisco/nexus/cisco_nexus_network_driver.py      |   10 ----------
 1 file changed, 10 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py    |    2 +-
 quantum/plugins/cisco/l2network_plugin.py          |   41 ++++++++--------
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |   51 +++++++++++++-------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    7 ++-
 4 files changed, 59 insertions(+), 42 deletions(-)

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.

 quantum/plugins/cisco/README                       |    2 ++
 quantum/plugins/cisco/common/cisco_configparser.py |    9 --------
 quantum/plugins/cisco/common/cisco_credentials.py  |    8 -------
 .../cisco/common/cisco_nova_configuration.py       |    7 -------
 quantum/plugins/cisco/l2network_model.py           |    7 -------
 quantum/plugins/cisco/l2network_plugin.py          |   13 ------------
 .../cisco/l2network_plugin_configuration.py        |    7 -------
 .../cisco/nexus/cisco_nexus_configuration.py       |    7 -------
 .../cisco/nexus/cisco_nexus_network_driver.py      |    7 -------
 quantum/plugins/cisco/ucs/cisco_getvif.py          |    5 -----
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |    7 -------
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |   22 --------------------
 12 files changed, 2 insertions(+), 99 deletions(-)

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

 quantum/plugins/cisco/README                       |    8 +
 quantum/plugins/cisco/common/cisco_exceptions.py   |   25 +-
 quantum/plugins/cisco/conf/db_conn.ini             |    5 +
 quantum/plugins/cisco/db/api.py                    |    1 +
 quantum/plugins/cisco/db/db_conn.ini               |    5 -
 quantum/plugins/cisco/db/l2network_db.py           |   91 +--
 quantum/plugins/cisco/db/test_database.py          |  745 ++++++++++++++++++++
 .../cisco/l2network_plugin_configuration.py        |   12 +-
 8 files changed, 829 insertions(+), 63 deletions(-)

commit 70966ad0c46428f696241faaa7d355988e5614b7
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Fri Aug 12 23:24:26 2011 -0700

    Adding Persistence unit test

 quantum/plugins/cisco/common/cisco_utils.py        |    2 +-
 quantum/plugins/cisco/db/l2network_db.py           |    8 +-
 quantum/plugins/cisco/l2network_plugin.py          |   15 +-
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |  298 +++++++++++++-------
 4 files changed, 210 insertions(+), 113 deletions(-)

commit 381e753fcfb0f9b7ec2822d3fecfaadfed894779
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 12 20:19:00 2011 -0700

    Fixed bugs while testing.

 quantum/plugins/cisco/common/cisco_utils.py |    1 +
 quantum/plugins/cisco/l2network_plugin.py   |   33 +++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

commit 61799587695d2d87d2e59d2a9b5a118b19c341bc
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Fri Aug 12 10:52:05 2011 -0700

    pep8 errors fixed

 quantum/plugins/cisco/db/api.py              |    1 -
 quantum/plugins/cisco/db/l2network_db.py     |   23 ++++++++++++++---------
 quantum/plugins/cisco/db/l2network_models.py |    3 ++-
 3 files changed, 16 insertions(+), 11 deletions(-)

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.

 quantum/plugins/cisco/common/cisco_constants.py |   17 ++
 quantum/plugins/cisco/common/cisco_utils.py     |    7 +-
 quantum/plugins/cisco/l2network_plugin.py       |  369 ++++++++++++-----------
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py   |    4 +-
 4 files changed, 213 insertions(+), 184 deletions(-)

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

 etc/quantum.conf                 |   11 +-
 quantum/common/auth_token.py     |  358 --------------------------------------
 quantum/common/authentication.py |  358 ++++++++++++++++++++++++++++++++++++++
 quantum/common/authorization.py  |   35 ++--
 4 files changed, 389 insertions(+), 373 deletions(-)

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

 quantum/cli.py              |   56 ++++++++++++++++++++++++++-----------------
 quantum/cli_output.template |    4 ++++
 quantum/client.py           |    4 +++-
 tests/unit/test_cli.py      |   46 +++++++++++++++++++++++++++++++----
 4 files changed, 83 insertions(+), 27 deletions(-)

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

 quantum/plugins/cisco/db/l2network_db.py     |   93 ++++++++++++++++++++++----
 quantum/plugins/cisco/db/l2network_models.py |   25 +++++--
 2 files changed, 99 insertions(+), 19 deletions(-)

commit 5fdf286bce4a94fdb60051eb37242c8b4f658b1e
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Aug 12 00:01:09 2011 +0100

    Adding missing files to branch

 quantum/cli_output.template         |    8 ++++++++
 tests/unit/client_tools/__init__.py |   15 +++++++++++++++
 2 files changed, 23 insertions(+)

commit c737329187be4e4d20e8b81158bf1bfeaddef924
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Aug 11 15:44:50 2011 -0700

    Simplifying condition

 quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/cli.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 quantum/client.py |    7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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

 quantum/plugins/cisco/db/api.py              |  254 +++++++++++++++++++++
 quantum/plugins/cisco/db/l2network_db.py     |  309 ++++++--------------------
 quantum/plugins/cisco/db/l2network_models.py |   46 +---
 quantum/plugins/cisco/db/models.py           |  102 +++++++++
 4 files changed, 427 insertions(+), 284 deletions(-)

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

 etc/quantum.conf                |   15 +-
 quantum/cli.py                  |    4 +-
 quantum/client.py               |    2 +
 quantum/common/auth_token.py    |  358 +++++++++++++++++++++++++++++++++++++++
 quantum/common/authorization.py |   84 +++++++++
 quantum/common/bufferedhttp.py  |  165 ++++++++++++++++++
 6 files changed, 626 insertions(+), 2 deletions(-)

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

 quantum/api/views/networks.py    |    2 +-
 quantum/api/views/ports.py       |    2 +-
 quantum/cli.py                   |   39 ++++++++++++++++-----------
 tests/unit/client_tools/stubs.py |   47 +++++++++++++++++++++++++++++++--
 tests/unit/test_cli.py           |   54 +++++++++++++++++++++++++++++++-------
 tools/pip-requires               |    1 +
 6 files changed, 115 insertions(+), 30 deletions(-)

commit 1dbd3f67b9e58fb52b6d559f637a46baf332e4ee
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 00:59:00 2011 +0100

    I'm too tired

 tests/unit/test_cli.py |    5 +++++
 1 file changed, 5 insertions(+)

commit 4898f5b7a8c8b45201c620021a13fb3f8221ce72
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu Aug 11 00:52:15 2011 +0100

    Stubout work in progress

 quantum/client.py                |   11 +++++++++--
 tests/unit/client_tools/stubs.py |   37 +++++++++++++++++++++++++++++++++++++
 tests/unit/test_cli.py           |   18 ++++++++++++++++++
 3 files changed, 64 insertions(+), 2 deletions(-)

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

 quantum/plugins/cisco/db/l2network_db.py     |  283 +++++++++++++++++++++++---
 quantum/plugins/cisco/db/l2network_models.py |  101 ++++++++-
 2 files changed, 347 insertions(+), 37 deletions(-)

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.

 setup.py |   10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

commit de4177e2614db8b02f98b71298403f7218ff399a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Aug 10 18:22:17 2011 +0100

    skeleton for cli unit tests

 tests/unit/test_cli.py |   41 +++++++++++++++++++++++++++++++++++++++++
 tools/pip-requires     |    1 +
 2 files changed, 42 insertions(+)

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)

 quantum/common/exceptions.py |   12 ------------
 1 file changed, 12 deletions(-)

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

 tests/unit/test_clientlib.py |  625 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 625 insertions(+)

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.

 quantum/plugins/cisco/README |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

commit 3094561df6cf5070bf53b3ef44612240a7ddce3d
Author: Arvind Somy <asomya@cisco.com>
Date:   Tue Aug 9 16:45:22 2011 -0400

    - Adding setup script.

 setup.py |   36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

commit 648ad36da900dc06e0a25cbf9f8ef2c0356dcd2a
Author: rohitagarwalla <roagarwa@cisco.com>
Date:   Tue Aug 9 12:40:14 2011 -0700

    Adding db connection and l2network plugin database modules

 quantum/plugins/cisco/db/db_conn.ini         |    5 +
 quantum/plugins/cisco/db/l2network_db.py     |  239 ++++++++++++++++++++++++++
 quantum/plugins/cisco/db/l2network_models.py |   86 +++++++++
 3 files changed, 330 insertions(+)

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

 quantum/cli.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 tests/unit/api.py |  625 -----------------------------------------------------
 1 file changed, 625 deletions(-)

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)

 tools/batch_config.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 tools/batch_config.py |  103 ++++++++++---------------------------------------
 1 file changed, 21 insertions(+), 82 deletions(-)

commit 23dc0ed8cf8322831363dd4e5aa9c145ec17be22
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Mon Aug 8 23:44:36 2011 -0700

    Changed to default plugin class name.

 quantum/plugins.ini |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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

 tests/unit/extensions/foxinsocks.py |   15 +++++++++------
 tests/unit/test_extensions.py       |    8 ++++----
 2 files changed, 13 insertions(+), 10 deletions(-)

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.

 quantum/plugins/cisco/README |    1 +
 1 file changed, 1 insertion(+)

commit 56e702465521c0c5c7cbdb29afb400a7f84ce90c
Author: Edgar Magana <eperdomo@cisco.com>
Date:   Mon Aug 8 17:53:21 2011 -0700

    Adding the required build for Nexus support

 quantum/plugins/cisco/README |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 quantum/plugins/cisco/README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.

 quantum/plugins/cisco/README |  299 +++++++++++++++++++++++++++++++-----------
 1 file changed, 226 insertions(+), 73 deletions(-)

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.

 quantum/plugins/cisco/README |   43 +++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)

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.

 LICENSE |  176 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 176 insertions(+)

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).

 quantum/plugins/cisco/README             |    8 ++++----
 quantum/plugins/cisco/l2network_model.py |   10 ++++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

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

 quantum/api/api_common.py |   27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

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

 quantum/api/attachments.py      |    2 +
 quantum/api/faults.py           |   14 ++++
 quantum/api/networks.py         |    3 +-
 quantum/api/ports.py            |   19 +++--
 quantum/api/views/ports.py      |    4 +-
 quantum/common/exceptions.py    |    6 ++
 quantum/common/wsgi.py          |    4 +-
 quantum/plugins/SamplePlugin.py |    5 +-
 tests/unit/test_api.py          |  147 +++++++++++++++++++++++++++++++++++++++
 tests/unit/testlib_api.py       |   56 ++++++++++++---
 10 files changed, 241 insertions(+), 19 deletions(-)

commit cc660e0cff0fdaa72f90a8e829dd18cc2643603b
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Mon Aug 8 00:23:44 2011 -0700

    Adding Unit Test Cases Now

 quantum/plugins/cisco/run_tests.py                 |  301 +++++++
 quantum/plugins/cisco/tests/unit/__init__.py       |   32 +
 .../plugins/cisco/tests/unit/test_l2networkApi.py  |  892 ++++++++++++++++++++
 .../plugins/cisco/tests/unit/test_nexus_plugin.py  |  282 +++++++
 .../plugins/cisco/tests/unit/test_ucs_driver.py    |  165 ++++
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  480 +++++++++++
 6 files changed, 2152 insertions(+)

commit fb9e81b380b1be0e59e324b43a2fd594683b3b0a
Author: Shweta P <shweta.ap05@gmail.com>
Date:   Mon Aug 8 00:01:03 2011 -0700

    Adding Cisco Unit Tests

 quantum/plugins/cisco/README |   10 ++++++++++
 1 file changed, 10 insertions(+)

commit ec9a458ed1237b7b6e2dcd6622729319da748a47
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sun Aug 7 21:03:24 2011 -0700

    minor enhancements to quantum client-lib

 quantum/client.py |   70 ++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 25 deletions(-)

commit 7b39a29dedc7c201906f31cb3de5eec8ec887b15
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 7 17:13:33 2011 -0700

    RHEL limitation updated.

 quantum/plugins/cisco/README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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)

 quantum/api/__init__.py    |    2 ++
 quantum/api/ports.py       |   49 +++++++++++++++++++++++++++++++-------------
 quantum/api/views/ports.py |   20 ++++++------------
 quantum/common/wsgi.py     |   11 ++++++++--
 4 files changed, 52 insertions(+), 30 deletions(-)

commit e3b8bafbb9f3b70e7086ef69adf4f78dc2faa4d3
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Aug 7 04:58:50 2011 -0700

    Changes to enhance L2 network plugin framework.

 quantum/plugins/cisco/README                       |    3 +
 quantum/plugins/cisco/common/cisco_constants.py    |    5 +
 quantum/plugins/cisco/conf/l2network_plugin.ini    |    7 +-
 quantum/plugins/cisco/l2device_plugin_base.py      |  152 ++++++++++++++++++++
 quantum/plugins/cisco/l2network_model.py           |  105 ++++++++++++++
 quantum/plugins/cisco/l2network_model_base.py      |  150 +++++++++++++++++++
 quantum/plugins/cisco/l2network_plugin.py          |   67 +++++----
 .../cisco/l2network_plugin_configuration.py        |    3 +
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   27 ++--
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |   31 ++--
 10 files changed, 493 insertions(+), 57 deletions(-)

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

 run_tests.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 9e297d9f20016eaf3ee061467b1866a39b3a7d39
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 6 22:05:52 2011 -0700

    remove unneeded __init__

 quantum/plugins/openvswitch/tests/__init__.py |   32 -------------------------
 1 file changed, 32 deletions(-)

commit 4fffb10e43290871f08e432c1ebc5f813ddf350a
Author: Dan Wendlandt <dan@nicira.com>
Date:   Sat Aug 6 22:03:52 2011 -0700

    refactoring testing code to support plugin tests

 quantum/common/test_lib.py                         |  278 ++++++++++++++++++++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  143 ----------
 quantum/plugins/openvswitch/run_tests.py           |   82 ++++++
 quantum/plugins/openvswitch/tests/__init__.py      |   32 +++
 quantum/plugins/openvswitch/tests/test_vlan_map.py |   36 +++
 run_tests.py                                       |  246 +----------------
 run_tests.sh                                       |   17 +-
 tests/unit/test_api.py                             |    4 +-
 8 files changed, 445 insertions(+), 393 deletions(-)

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.

 quantum/plugins/cisco/l2network_plugin.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

commit 6f5eced38fa6b930b5a75905d2ac8610af509ead
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sat Aug 6 18:41:27 2011 -0700

    Generalized and put placeholders.

 quantum/plugins/cisco/conf/nova.ini |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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

 quantum/db/api.py                                 |    1 +
 quantum/plugins.ini                               |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

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.

 quantum/plugins/cisco/README |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/api/faults.py                              |    1 +
 quantum/common/exceptions.py                       |    4 +
 quantum/db/api.py                                  |    1 +
 quantum/plugins.ini                                |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  105 --------------------
 6 files changed, 8 insertions(+), 107 deletions(-)

commit 742e77389f5e1b5b20933203f88a16a27a12c075
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Aug 5 22:16:25 2011 -0700

    Nexus plugin classpath was incorrect, fixed it.

 quantum/plugins/cisco/conf/plugins.ini |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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.

 quantum/plugins/cisco/README |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

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.

 quantum/plugins/cisco/conf/l2network_plugin.ini    |    4 +++-
 quantum/plugins/cisco/l2network_plugin.py          |   19 ++++++++++++++++---
 .../cisco/l2network_plugin_configuration.py        |    3 +++
 3 files changed, 22 insertions(+), 4 deletions(-)

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.

 quantum/plugins/cisco/l2network_plugin.py |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

commit 43b3394eb5d23d066f130ad08f4fbb880713cc15
Author: Joe Heck <heckj@mac.com>
Date:   Fri Aug 5 09:52:05 2011 -0700

    updates to pip-requires for CI

 tools/pip-requires |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.

 etc/quantum.conf                                   |    5 -
 quantum/plugins/cisco/README                       |   78 +++-------------
 quantum/plugins/cisco/common/cisco_configparser.py |   49 ++++++++++
 .../plugins/cisco/common/cisco_configuration.py    |   97 --------------------
 quantum/plugins/cisco/common/cisco_constants.py    |   51 ++++++++++
 quantum/plugins/cisco/common/cisco_credentials.py  |   49 +++++-----
 .../cisco/common/cisco_nova_configuration.py       |   42 +++++++++
 quantum/plugins/cisco/common/cisco_utils.py        |    6 +-
 quantum/plugins/cisco/conf/credentials.ini         |   15 +++
 quantum/plugins/cisco/conf/l2network_plugin.ini    |   11 +++
 quantum/plugins/cisco/conf/nexus.ini               |    8 ++
 quantum/plugins/cisco/conf/nova.ini                |    8 ++
 quantum/plugins/cisco/conf/plugins.ini             |    4 +
 quantum/plugins/cisco/conf/ucs.ini                 |   10 ++
 quantum/plugins/cisco/l2network_plugin.py          |   82 ++++++++---------
 .../cisco/l2network_plugin_configuration.py        |   51 ++++++++++
 .../cisco/nexus/cisco_nexus_configuration.py       |   42 +++++++++
 .../cisco/nexus/cisco_nexus_network_driver.py      |    1 -
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    8 +-
 quantum/plugins/cisco/ucs/cisco_getvif.py          |   56 +++++++++++
 .../plugins/cisco/ucs/cisco_ucs_configuration.py   |   44 +++++++++
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |   19 ++--
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |    7 +-
 quantum/plugins/cisco/ucs/get-vif.py               |   37 --------
 quantum/plugins/cisco/ucs/get-vif.sh               |   15 ---
 25 files changed, 484 insertions(+), 311 deletions(-)

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

 quantum/common/extensions.py  |    5 ++++-
 tests/unit/test_extensions.py |   10 ++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

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

 tests/unit/extension_stubs.py |   75 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 75 insertions(+)

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

 quantum/plugins/cisco/nexus/nxosapi.py |  172 --------------------------------
 1 file changed, 172 deletions(-)

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!

 etc/quantum.conf        |    2 +-
 quantum/api/versions.py |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

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.

 quantum/api/__init__.py          |    4 +-
 quantum/api/views/attachments.py |    2 +-
 quantum/api/views/networks.py    |    9 +-
 quantum/db/api.py                |    5 +-
 tests/unit/api.py                |  625 --------------------------------------
 tests/unit/test_clientlib.py     |  625 ++++++++++++++++++++++++++++++++++++++
 6 files changed, 634 insertions(+), 636 deletions(-)

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.

 cisco_extensions/__init__.py                 |   71 --
 cisco_extensions/exceptions.py               |  148 ----
 cisco_extensions/extensions.py               |   42 --
 cisco_extensions/faults.py                   |  111 ---
 cisco_extensions/portprofiles.py             |  180 -----
 cisco_extensions/pprofiles.py                |   45 --
 quantum/plugins/cisco/db/db_conn.ini         |    5 -
 quantum/plugins/cisco/db/db_test_plugin.py   | 1049 --------------------------
 quantum/plugins/cisco/db/l2network_db.py     |  239 ------
 quantum/plugins/cisco/db/l2network_models.py |   86 ---
 quantum/plugins/cisco/db/ucs_db.py           |  314 --------
 quantum/plugins/cisco/db/ucs_models.py       |  113 ---
 12 files changed, 2403 deletions(-)

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.

 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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

 .../cisco/nexus/cisco_nexus_network_driver.py      |   12 ++++++++++--
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

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

 quantum/api/attachments.py       |   86 ++++++++++++++++++++++++++++++++++++++
 quantum/api/views/attachments.py |   37 ++++++++++++++++
 2 files changed, 123 insertions(+)

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).

 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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).

 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/client.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 quantum/api/faults.py        |    1 +
 quantum/common/exceptions.py |    1 +
 quantum/db/api.py            |    4 +++-
 3 files changed, 5 insertions(+), 1 deletion(-)

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.

 quantum/api/__init__.py       |   10 ++++++---
 quantum/api/ports.py          |   46 -----------------------------------------
 quantum/api/views/networks.py |    2 +-
 quantum/db/api.py             |    7 +++++--
 quantum/db/models.py          |    3 ++-
 5 files changed, 15 insertions(+), 53 deletions(-)

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

 quantum/common/extensions.py  |    7 +++----
 quantum/common/flags.py       |    4 +---
 quantum/common/utils.py       |    8 ++++----
 quantum/common/wsgi.py        |    8 ++++----
 quantum/db/api.py             |    2 ++
 quantum/db/models.py          |    2 ++
 tests/unit/test_api.py        |    2 +-
 tests/unit/test_extensions.py |    8 +++++---
 8 files changed, 22 insertions(+), 19 deletions(-)

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

 quantum/plugins/cisco/README                       |   25 ++++++++++++++++----
 .../plugins/cisco/common/cisco_configuration.py    |    3 +++
 quantum/plugins/cisco/l2network_plugin.py          |   22 ++++++++++++++---
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |    1 +
 4 files changed, 43 insertions(+), 8 deletions(-)

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

 quantum/api/networks.py |    4 ++--
 quantum/api/ports.py    |   19 ++++++++-----------
 2 files changed, 10 insertions(+), 13 deletions(-)

commit e985a1aeabbb9960768454372dfa6a12841b13c1
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 15:05:53 2011 -0700

    Fixing pep8 errors

 quantum/cli.py    |    5 +-
 quantum/client.py |   43 ++++++++--------
 tests/unit/api.py |  140 ++++++++++++++++++++++-------------------------------
 3 files changed, 84 insertions(+), 104 deletions(-)

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

 quantum/plugins/cisco/README                       |    9 +-
 .../plugins/cisco/common/cisco_configuration.py    |    7 +
 .../cisco/nexus/cisco_nexus_network_driver.py      |  236 ++++++++++++++++++++
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |   28 ++-
 4 files changed, 271 insertions(+), 9 deletions(-)

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.

 quantum/api/faults.py           |   16 +++++++++++++
 quantum/api/networks.py         |   13 +++++++----
 quantum/common/exceptions.py    |    5 +++++
 quantum/db/api.py               |   47 +++++++++++++++++++--------------------
 quantum/plugins/SamplePlugin.py |    5 +----
 tests/unit/test_api.py          |   19 ++++++++++++++++
 6 files changed, 73 insertions(+), 32 deletions(-)

commit 86afe1fc8566a8a32091a1e2f7a5cdedeee6445a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Aug 1 17:42:25 2011 +0100

    WIP

 quantum/api/networks.py |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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.

 quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit 2d5108887de42801fd7563669f69ce6a7ca91ac9
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Aug 1 08:17:34 2011 -0700

    Removing a debugging line

 quantum/client.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit b0691d4202dc7d4042f7b08a99c39836236b6a9f
Author: Dan Wendlandt <dan@nicira.com>
Date:   Mon Aug 1 07:45:49 2011 -0700

    pep8 fix

 quantum/plugins/openvswitch/ovs_quantum_plugin.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.

 quantum/api/api_common.py |    8 +++++++-
 tests/unit/test_api.py    |   21 +++++++++++++++++++++
 tests/unit/testlib_api.py |    5 +++--
 3 files changed, 31 insertions(+), 3 deletions(-)

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

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   12 ++++++------
 tests/unit/test_api.py                             |   17 +++++++++++++++++
 3 files changed, 24 insertions(+), 7 deletions(-)

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

 tests/unit/test_extensions.py |   65 ++++-------------------------------------
 1 file changed, 6 insertions(+), 59 deletions(-)

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.

 quantum/db/api.py                                 |   97 ++++++++++++------
 quantum/plugins/SamplePlugin.py                   |   10 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |  109 ++++++++++-----------
 3 files changed, 121 insertions(+), 95 deletions(-)

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

 quantum/api/views/networks.py |    2 --
 1 file changed, 2 deletions(-)

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.

 quantum/plugins/cisco/tests/__init__.py |   18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

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

 quantum/api/views/networks.py |    1 -
 1 file changed, 1 deletion(-)

commit a084284c20bca5dc05df732b9e5323d3950955a0
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Sun Jul 31 12:04:01 2011 -0700

    Including copyright info.

 quantum/plugins/cisco/__init__.py        |   18 ++++++++++++++++++
 quantum/plugins/cisco/common/__init__.py |   18 ++++++++++++++++++
 quantum/plugins/cisco/db/__init__.py     |   18 ++++++++++++++++++
 quantum/plugins/cisco/nexus/__init__.py  |   18 ++++++++++++++++++
 quantum/plugins/cisco/ucs/__init__.py    |   18 ++++++++++++++++++
 5 files changed, 90 insertions(+)

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.

 0 files changed

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)

 quantum/api/views/networks.py |    3 +--
 tests/unit/test_api.py        |    6 ++----
 2 files changed, 3 insertions(+), 6 deletions(-)

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.

 quantum/plugins/cisco/README                       |   18 +-
 quantum/plugins/cisco/cisco_configuration.py       |   87 ------
 quantum/plugins/cisco/cisco_constants.py           |   47 ----
 quantum/plugins/cisco/cisco_credentials.py         |   71 -----
 quantum/plugins/cisco/cisco_exceptions.py          |   57 ----
 quantum/plugins/cisco/cisco_nexus_plugin.py        |  152 ----------
 quantum/plugins/cisco/cisco_ucs_network_driver.py  |  256 -----------------
 quantum/plugins/cisco/cisco_ucs_plugin.py          |  294 --------------------
 quantum/plugins/cisco/cisco_utils.py               |   59 ----
 .../plugins/cisco/common/cisco_configuration.py    |   87 ++++++
 quantum/plugins/cisco/common/cisco_constants.py    |   47 ++++
 quantum/plugins/cisco/common/cisco_credentials.py  |   71 +++++
 quantum/plugins/cisco/common/cisco_exceptions.py   |   57 ++++
 quantum/plugins/cisco/common/cisco_utils.py        |   59 ++++
 quantum/plugins/cisco/get-vif.py                   |   37 ---
 quantum/plugins/cisco/get-vif.sh                   |   15 -
 quantum/plugins/cisco/l2network_plugin.py          |   14 +-
 quantum/plugins/cisco/nexus/cisco_nexus_plugin.py  |  152 ++++++++++
 quantum/plugins/cisco/nexus/nxosapi.py             |  172 ++++++++++++
 quantum/plugins/cisco/nxosapi.py                   |  172 ------------
 .../plugins/cisco/ucs/cisco_ucs_network_driver.py  |  256 +++++++++++++++++
 quantum/plugins/cisco/ucs/cisco_ucs_plugin.py      |  294 ++++++++++++++++++++
 quantum/plugins/cisco/ucs/get-vif.py               |   37 +++
 quantum/plugins/cisco/ucs/get-vif.sh               |   15 +
 24 files changed, 1263 insertions(+), 1263 deletions(-)

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

 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/cli.py        |    4 ++--
 tools/batch_config.py |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

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

 quantum/plugins/cisco/db_conn.ini         |    5 +
 quantum/plugins/cisco/db_test_plugin.py   | 1046 +++++++++++++++++++++++++++++
 quantum/plugins/cisco/l2network_db.py     |  239 +++++++
 quantum/plugins/cisco/l2network_models.py |   86 +++
 quantum/plugins/cisco/ucs_db.py           |  314 +++++++++
 quantum/plugins/cisco/ucs_models.py       |  113 ++++
 6 files changed, 1803 insertions(+)

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

 quantum/cli.py    |    4 ++--
 quantum/client.py |    6 +++---
 tests/unit/api.py |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

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

 quantum/api/__init__.py |    1 -
 1 file changed, 1 deletion(-)

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

 quantum/plugins.ini |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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.

 quantum/cli.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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

 tests/unit/api.py |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

 tests/unit/api.py |  649 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 649 insertions(+)

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

 quantum/cli.py |  200 +++++++++++++++++++-------------------------------------
 1 file changed, 69 insertions(+), 131 deletions(-)

commit 17e3483a43487d56c38cd8bf0209203947bf1707
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Thu Jul 28 10:41:06 2011 -0700

    Adding refactored API Client

 quantum/client.py |  266 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 266 insertions(+)

commit 45ee8c0db949285909212c9686872c82fa4dc126
Author: Dan Wendlandt <dan@nicira.com>
Date:   Wed Jul 27 10:24:17 2011 -0700

    pep8 fixes

 tests/unit/test_api.py |    2 --
 1 file changed, 2 deletions(-)

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

 quantum/common/wsgi.py |    5 ++++-
 tests/unit/test_api.py |   24 ++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

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.

 quantum/common/wsgi.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/common/extensions.py |    8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

commit c7a04be9f788909e6491e00faaaadaa6a3457875
Author: Rajaram Mallya <rajarammallya@gmail.com>
Date:   Tue Jul 26 14:10:54 2011 +0530

    Santhosh/Rajaram|modified extensions section in README

 README |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

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

 quantum/common/extensions.py                       |   53 +++++++++++++-------
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
 2 files changed, 35 insertions(+), 20 deletions(-)

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

 README                              |   27 ++++++++++++++++++++++++++-
 quantum/common/extensions.py        |    2 +-
 quantum/plugins/SamplePlugin.py     |    7 +++++--
 tests/unit/extensions/foxinsocks.py |   11 +++++++++++
 tests/unit/test_extensions.py       |    7 +++++--
 5 files changed, 48 insertions(+), 6 deletions(-)

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

 etc/quantum.conf                                   |    2 +-
 etc/quantum.conf.sample                            |    2 +-
 etc/quantum.conf.test                              |   19 +-----
 quantum/api/__init__.py                            |    2 +-
 quantum/common/extensions.py                       |   25 ++++---
 quantum/manager.py                                 |    9 ++-
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    2 +-
 tests/unit/test_extensions.py                      |   69 ++++++++------------
 8 files changed, 53 insertions(+), 77 deletions(-)

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

 quantum/api/__init__.py         |    2 --
 quantum/api/networks.py         |   12 +++++---
 quantum/api/ports.py            |    9 ++++--
 quantum/api/views/networks.py   |    6 ++--
 quantum/api/views/ports.py      |    7 ++---
 quantum/plugins/SamplePlugin.py |    5 +++-
 tests/unit/test_api.py          |   59 ++++++++++++++++++++++-----------------
 7 files changed, 59 insertions(+), 41 deletions(-)

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.

 quantum/common/extensions.py    |   85 ++++-----
 quantum/plugins/SamplePlugin.py |    5 +-
 quantum/quantum_plugin_base.py  |    9 -
 tests/unit/test_extensions.py   |  371 +++++++++++++++++++--------------------
 4 files changed, 228 insertions(+), 242 deletions(-)

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

 .project |   17 -----------------
 1 file changed, 17 deletions(-)

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.

 quantum/manager.py              |    2 +-
 quantum/plugins.ini             |    3 ++-
 quantum/plugins/SamplePlugin.py |    9 ++-------
 quantum/quantum_plugin_base.py  |    8 --------
 tests/unit/test_api.py          |    2 --
 5 files changed, 5 insertions(+), 19 deletions(-)

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

 tests/unit/test_extensions.py |   28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

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

 quantum/common/extensions.py  |   51 +++++++++++++++++++++++------------------
 tests/unit/test_extensions.py |   22 ++++++++++--------
 2 files changed, 42 insertions(+), 31 deletions(-)

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.

 quantum/common/extensions.py  |   40 +++++++++++++++++++++++++++++++++-------
 tests/unit/test_extensions.py |   22 +++++++++++++++++++---
 2 files changed, 52 insertions(+), 10 deletions(-)

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

 quantum/common/extensions.py  |    2 +-
 tests/unit/test_extensions.py |    8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

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

 quantum/api/ports.py            |    3 +-
 quantum/db/api.py               |    8 +
 quantum/plugins/SamplePlugin.py |    6 +-
 tests/unit/test_api.py          |  325 ++++++++++++++++++++++++++++-----------
 tests/unit/testlib.py           |  121 ---------------
 tests/unit/testlib_api.py       |  130 ++++++++++++++++
 6 files changed, 375 insertions(+), 218 deletions(-)

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

 TESTING |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

commit 3ecf1c6ab65ffa759a85b4a2b9b56f01fb905dd8
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 18 17:56:42 2011 +0100

    Adding more unit tests

 quantum/api/ports.py            |    2 +-
 quantum/db/api.py               |    3 +-
 quantum/plugins/SamplePlugin.py |   12 +-
 tests/unit/test_api.py          |  372 +++++++++++++++++++++++++++++++++++++--
 tests/unit/testlib.py           |   34 +++-
 5 files changed, 401 insertions(+), 22 deletions(-)

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

 quantum/common/extensions.py  |   16 ++++++-
 tests/unit/test_extensions.py |   92 +++++++++++++++++++++++++++++++++--------
 2 files changed, 89 insertions(+), 19 deletions(-)

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

 quantum/api/__init__.py        |    2 +-
 quantum/common/extensions.py   |    8 ++++++--
 quantum/manager.py             |   10 ++++++++--
 quantum/quantum_plugin_base.py |    4 ++--
 tests/__init__.py              |   19 +++++++++++++++++++
 tests/unit/test_extensions.py  |   15 +++++++++++++++
 6 files changed, 51 insertions(+), 7 deletions(-)

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

 quantum/common/extensions.py    |   13 +++++----
 quantum/manager.py              |    6 ++--
 quantum/plugins/SamplePlugin.py |    3 ++
 quantum/quantum_plugin_base.py  |    9 ++++++
 tests/unit/test_extensions.py   |   59 ++++++++++++++++++++++++++++-----------
 5 files changed, 65 insertions(+), 25 deletions(-)

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.)

 cisco_extensions/__init__.py     |   71 +++++++++++++++
 cisco_extensions/exceptions.py   |  148 +++++++++++++++++++++++++++++++
 cisco_extensions/extensions.py   |   42 +++++++++
 cisco_extensions/faults.py       |  111 +++++++++++++++++++++++
 cisco_extensions/portprofiles.py |  180 ++++++++++++++++++++++++++++++++++++++
 cisco_extensions/pprofiles.py    |   45 ++++++++++
 6 files changed, 597 insertions(+)

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.)

 etc/quantum.conf |    3 +++
 1 file changed, 3 insertions(+)

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.

 quantum/plugins/cisco/README              |    2 +-
 quantum/plugins/cisco/cisco_constants.py  |    3 ++-
 quantum/plugins/cisco/cisco_exceptions.py |    7 ++++++-
 quantum/plugins/cisco/l2network_plugin.py |   32 ++++++++++++++++++++++++-----
 4 files changed, 36 insertions(+), 8 deletions(-)

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

 quantum/plugins/cisco/nxosapi.py |  172 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 172 insertions(+)

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

 tests/functional/__init__.py     |  294 --------------------------------------
 tests/functional/miniclient.py   |   99 -------------
 tests/functional/test_service.py |  221 ----------------------------
 3 files changed, 614 deletions(-)

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

 quantum/plugins/cisco/get-vif.py |   37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

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.

 0 files changed

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.

 quantum/plugins/cisco/cisco_credentials.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit 5c1bca06ff247c712b8df587a083945a9725c183
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 8 14:40:56 2011 -0700

    Changed some credentials (does not affect functionality).

 quantum/plugins/cisco/cisco_credentials.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit c644206e43a9cc198833f5ae544174c8250bffd1
Author: Sumit Naiksatam <snaiksat@cisco.com>
Date:   Fri Jul 8 14:29:45 2011 -0700

    This file is not required.

 quantum/plugins/cisco/cisco_ucs.py |  102 ------------------------------------
 1 file changed, 102 deletions(-)

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.

 quantum/plugins.ini                               |    2 +-
 quantum/plugins/cisco/README                      |   78 +++++
 quantum/plugins/cisco/cisco_configuration.py      |   87 ++++++
 quantum/plugins/cisco/cisco_constants.py          |   46 +++
 quantum/plugins/cisco/cisco_credentials.py        |   73 +++++
 quantum/plugins/cisco/cisco_exceptions.py         |   52 +++
 quantum/plugins/cisco/cisco_nexus_plugin.py       |  152 +++++++++
 quantum/plugins/cisco/cisco_ucs.py                |  102 ++++++
 quantum/plugins/cisco/cisco_ucs_network_driver.py |  256 +++++++++++++++
 quantum/plugins/cisco/cisco_ucs_plugin.py         |  294 +++++++++++++++++
 quantum/plugins/cisco/cisco_utils.py              |   59 ++++
 quantum/plugins/cisco/get-vif.sh                  |   15 +
 quantum/plugins/cisco/l2network_plugin.py         |  348 +++++++++++++++++++++
 13 files changed, 1563 insertions(+), 1 deletion(-)

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

 quantum/common/extensions.py        |   16 +--
 tests/unit/extensions/foxinsocks.py |   15 ++-
 tests/unit/test_extensions.py       |  190 ++++++++++++++++++++---------------
 3 files changed, 127 insertions(+), 94 deletions(-)

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

 tests/unit/test_extensions.py |   38 ++++++++++++++++++++++++++------------
 1 file changed, 26 insertions(+), 12 deletions(-)

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.

 tests/unit/test_extensions.py |   31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

commit 67ee9c1fd4034d2375e0f746d4fd78c7829825ba
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jul 6 12:41:13 2011 +0100

    removing pep8 errors

 quantum/plugins/SamplePlugin.py |    6 +++---
 tests/functional/__init__.py    |    6 ++----
 tests/unit/testlib.py           |    2 ++
 3 files changed, 7 insertions(+), 7 deletions(-)

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

 quantum/api/networks.py          |    9 +-
 quantum/plugins/SamplePlugin.py  |   10 +-
 tests/functional/__init__.py     |  296 ++++++++++++++++++++++++++++++++++++++
 tests/functional/test_service.py |    2 +-
 tests/unit/test_api.py           |   65 ++++++++-
 tests/unit/testlib.py            |   12 +-
 6 files changed, 380 insertions(+), 14 deletions(-)

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

 quantum/db/api.py      |   11 ++++++-----
 tests/unit/test_api.py |   12 ++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

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

 quantum/manager.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

commit a975ec64514affa5bb95e61957409954e3d9f7fa
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jul 5 10:24:13 2011 +0100

    Removing excess debug line

 quantum/manager.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

 quantum/db/models.py |   23 ++---------------------
 1 file changed, 2 insertions(+), 21 deletions(-)

commit c8be977cdcf6bc816a36e0522ac64d8b812cd249
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jul 4 18:50:45 2011 +0100

    Temporary commit

 quantum/db/models.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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.

 quantum/api/__init__.py   |   15 ++++++++-------
 quantum/api/api_common.py |    8 ++------
 quantum/api/networks.py   |   14 +++++++-------
 quantum/api/ports.py      |   20 ++++++++++----------
 quantum/manager.py        |    2 +-
 5 files changed, 28 insertions(+), 31 deletions(-)

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.

 quantum/api/ports.py             |    3 +-
 quantum/db/models.py             |    3 +-
 quantum/manager.py               |    1 +
 quantum/plugins/SamplePlugin.py  |   37 +++++++-------
 run_tests.py                     |    4 +-
 tests/functional/test_service.py |    5 +-
 tests/unit/test_api.py           |  101 ++++++++++++++++++++++++--------------
 tests/unit/testlib.py            |   18 +++++--
 8 files changed, 106 insertions(+), 66 deletions(-)

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

 quantum/api/networks.py         |    2 +-
 quantum/api/ports.py            |    4 +-
 quantum/api/views/ports.py      |    1 -
 quantum/common/wsgi.py          |    5 --
 quantum/plugins/SamplePlugin.py |   30 ++++++-----
 tests/unit/test_api.py          |  110 +++++++++++++++++++++++++++------------
 tests/unit/testlib.py           |   59 ++++++++++++++-------
 7 files changed, 136 insertions(+), 75 deletions(-)

commit 2a8dc1cc881c40be2676bace03ee7e74838cb608
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Wed Jun 29 16:48:55 2011 +0100

    Removing static data for FakePlugin

 quantum/plugins/SamplePlugin.py |   26 --------------------------
 1 file changed, 26 deletions(-)

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

 quantum/api/networks.py         |    2 +-
 quantum/db/api.py               |   15 +++++-
 quantum/db/models.py            |   70 ++++++++++++++++++++++++---
 quantum/plugins/SamplePlugin.py |  102 +++++++++++++++++++--------------------
 4 files changed, 127 insertions(+), 62 deletions(-)

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

 tools/pip-requires |    1 +
 1 file changed, 1 insertion(+)

commit d0cb0eea78a85a244a32158ceb93aa78120aa293
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 18:04:27 2011 +0100

    Work in progress - just starting

 quantum/api/ports.py             |    1 -
 quantum/api/views/networks.py    |    1 -
 quantum/api/views/ports.py       |    1 -
 quantum/manager.py               |   11 +-
 quantum/plugins/SamplePlugin.py  |   37 +++--
 run_tests.py                     |   10 +-
 run_tests.sh                     |    2 +-
 tests/functional/test_service.py |  284 +++++++++++++++++++-------------------
 tests/unit/test_api.py           |   25 +++-
 9 files changed, 194 insertions(+), 178 deletions(-)

commit ebd311ffd097c4dfa714d3819ea06b56f868764f
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:43:11 2011 +0100

    ...and again!

 etc/quantum/api-paste.ini |   29 -----------------------------
 1 file changed, 29 deletions(-)

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

 etc/quantum/api-paste.ini |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 4a8cd2bd8f7411ca48741e5bd3bc58b023e7d932
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:37:48 2011 +0100

    removing api-paste.ini

 etc/quantum/api-paste.ini |   29 -----------------------------
 1 file changed, 29 deletions(-)

commit 81f9170ad5e93b331d90b1273fdc801e4bb3dff5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue Jun 28 10:29:08 2011 +0100

    Addressing comments from Somik

 .pydevproject                      |   10 --------
 .pydevproject.moved                |   10 --------
 pep8.errors                        |   49 ------------------------------------
 quantum/api/ports.py               |    4 +--
 quantum/common/wsgi.py             |    3 ---
 quantum/plugins/SamplePlugin.py    |   38 ++--------------------------
 quantum/plugins/openvswitch/README |    4 +--
 tests/functional/test_service.py   |    3 +--
 8 files changed, 7 insertions(+), 114 deletions(-)

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

 quantum/cli.py |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

 tests/unit/test_api.py |   64 ++++++++++++++++++++++++++++++++++++++++++++++++
 tests/unit/testlib.py  |   42 +++++++++++++++++++++++++++++++
 2 files changed, 106 insertions(+)

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.

 quantum/cli.py                   |    6 +-
 quantum/plugins/SamplePlugin.py  |   13 ++++-
 tests/functional/test_service.py |  116 +++++++++++++++++++++++++++++++++-----
 3 files changed, 117 insertions(+), 18 deletions(-)

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

 tools/batch_config.py |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

commit 1cb59504db2735f6f56892d76b50d64cd45de8b3
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Mon Jun 27 14:09:52 2011 +0100

    Fixing bug #798262

 .project                         |   17 +++++++++++
 .pydevproject                    |   10 +++++++
 .pydevproject.moved              |   10 +++++++
 bin/quantum.py                   |   61 ++++++++++++++++++++++++++++++++++++++
 pep8.errors                      |   49 ++++++++++++++++++++++++++++++
 quantum/api/api_common.py        |    3 +-
 quantum/api/networks.py          |    6 ++--
 quantum/common/wsgi.py           |    8 ++---
 tests/functional/test_service.py |    6 ++--
 9 files changed, 158 insertions(+), 12 deletions(-)

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

 quantum/db/api.py                                  |   15 +--
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |    2 -
 tools/batch_config.py                              |  127 ++++++++++++--------
 3 files changed, 82 insertions(+), 62 deletions(-)

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

 quantum/cli.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit 9c6ab1bc280ef0947528c948db7f113cbfa8a1ab
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri Jun 24 15:21:56 2011 +0100

    Fixing bug #798261

 quantum/api/faults.py           |    2 +-
 quantum/api/ports.py            |    2 --
 quantum/plugins/SamplePlugin.py |    1 +
 3 files changed, 2 insertions(+), 3 deletions(-)

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

 quantum/api/__init__.py            |    1 +
 quantum/plugins/openvswitch/README |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

commit b5ff0823378844fe89b529eee2308a8e879f3fc4
Author: Santhosh <santhom@thoughtworks.com>
Date:   Thu Jun 23 18:03:59 2011 +0530

    Santhosh/Vinkesh | Added extensions framework

 etc/quantum.conf                    |   13 +-
 etc/quantum.conf.sample             |   25 +-
 etc/quantum.conf.test               |   19 +-
 extensions/__init__.py              |   15 ++
 quantum/common/extensions.py        |  440 +++++++++++++++++++++++++++++++++++
 tests/unit/extensions/__init__.py   |   15 ++
 tests/unit/extensions/foxinsocks.py |   97 ++++++++
 tests/unit/test_extensions.py       |  229 ++++++++++++++++++
 8 files changed, 843 insertions(+), 10 deletions(-)

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

 tools/batch_config.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

 quantum/cli.py                                     |    1 +
 quantum/db/api.py                                  |    4 +-
 quantum/plugins/openvswitch/README                 |    9 +-
 quantum/plugins/openvswitch/agent/install.sh       |   38 ------
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   77 ++++++-----
 .../plugins/openvswitch/agent/set_external_ids.sh  |   15 ---
 .../plugins/openvswitch/agent/xenserver_install.sh |   38 ++++++
 quantum/plugins/openvswitch/ovs_db.py              |   16 ---
 quantum/plugins/openvswitch/ovs_models.py          |   16 ---
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    6 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    2 -
 tools/batch_config.py                              |  137 ++++++++++++++++++++
 12 files changed, 229 insertions(+), 130 deletions(-)

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

 quantum/plugins/openvswitch/agent/install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/plugins/openvswitch/agent/install.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

 quantum/api/__init__.py       |    4 ++++
 quantum/api/networks.py       |   37 ++++++++++++++++++++++++++++---------
 quantum/api/views/networks.py |   25 +++++++++++++++++++------
 quantum/api/views/ports.py    |    3 ++-
 4 files changed, 53 insertions(+), 16 deletions(-)

commit d9d0a6f5653d49e3f55e112b9417b32e4acd33aa
Author: Brad Hall <bhall@nicira.com>
Date:   Thu Jun 9 07:42:19 2011 -0700

    README fixes

 README                             |   58 ++++++++++++++++++++----------------
 quantum/plugins/openvswitch/README |   21 ++++++-------
 2 files changed, 44 insertions(+), 35 deletions(-)

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

 quantum/common/config.py |    1 -
 quantum/service.py       |    4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

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

 bin/quantum                                        |    4 +-
 etc/quantum.conf.test                              |    2 +-
 quantum/api/__init__.py                            |    5 +-
 quantum/api/faults.py                              |    5 +-
 quantum/api/networks.py                            |   37 +++--
 quantum/api/ports.py                               |   70 ++++----
 quantum/api/views/__init__.py                      |    2 +-
 quantum/api/views/networks.py                      |    6 +-
 quantum/api/views/ports.py                         |    2 +-
 quantum/cli.py                                     |   71 +++++---
 quantum/common/config.py                           |   12 +-
 quantum/common/exceptions.py                       |   11 +-
 quantum/common/flags.py                            |    3 +-
 quantum/common/utils.py                            |    2 +
 quantum/common/wsgi.py                             |   22 +--
 quantum/db/api.py                                  |   18 +-
 quantum/db/models.py                               |   10 +-
 quantum/manager.py                                 |   12 +-
 quantum/plugins/SamplePlugin.py                    |  172 ++++++++------------
 quantum/plugins/__init__.py                        |    2 +-
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   66 ++++----
 quantum/plugins/openvswitch/ovs_db.py              |    6 +-
 quantum/plugins/openvswitch/ovs_models.py          |    3 +-
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   29 +++-
 tests/functional/miniclient.py                     |    9 +-
 tests/functional/test_service.py                   |   17 +-
 26 files changed, 326 insertions(+), 272 deletions(-)

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

 run_tests.py                     |  293 ++++++++++++++++++++++++++++++++++++++
 run_tests.sh                     |   83 +++++++++++
 smoketests/miniclient.py         |   98 -------------
 smoketests/tests.py              |  133 -----------------
 test_scripts/miniclient.py       |   98 -------------
 test_scripts/tests.py            |  150 -------------------
 tests/functional/miniclient.py   |   98 +++++++++++++
 tests/functional/test_service.py |  133 +++++++++++++++++
 tests/unit/__init__.py           |   32 +++++
 tools/install_venv.py            |  137 ++++++++++++++++++
 tools/pip-requires               |   10 ++
 tools/with_venv.sh               |   21 +++
 12 files changed, 807 insertions(+), 479 deletions(-)

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

 quantum/cli.py |  442 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 406 insertions(+), 36 deletions(-)

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

 quantum/api/__init__.py         |    6 +-
 quantum/api/faults.py           |    2 +-
 quantum/api/networks.py         |    2 +-
 quantum/api/ports.py            |   64 ++++++------
 quantum/api/views/__init__.py   |    1 -
 quantum/api/views/networks.py   |    5 +-
 quantum/api/views/ports.py      |    5 +-
 quantum/cli.py                  |    9 +-
 quantum/common/config.py        |    4 +-
 quantum/common/exceptions.py    |   11 ++-
 quantum/common/flags.py         |    3 +-
 quantum/common/utils.py         |    2 +
 quantum/common/wsgi.py          |   15 +--
 quantum/manager.py              |    7 +-
 quantum/plugins/SamplePlugin.py |  204 +++++++++++++++++----------------------
 quantum/plugins/__init__.py     |    2 +-
 quantum/service.py              |    4 +-
 17 files changed, 153 insertions(+), 193 deletions(-)

commit 645c863ba3f8829d5327ab194f5dc79729f7af1f
Author: Brad Hall <bhall@nicira.com>
Date:   Tue Jun 7 10:17:56 2011 -0700

    Add dependencies to README and fix whitespace

 README |   37 +++++++++++++++++++++++++++++--------
 1 file changed, 29 insertions(+), 8 deletions(-)

commit cf4e1eeff4818d4cafe9461a263e8f964a150bd2
Author: Somik Behera <somik@nicira.com>
Date:   Mon Jun 6 23:09:53 2011 -0700

     Fix merge indentation errors

 quantum/manager.py |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

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.

 quantum/api/__init__.py         |    2 +-
 quantum/cli.py                  |    9 ++--
 quantum/manager.py              |    7 +--
 quantum/plugins/SamplePlugin.py |    2 +-
 quantum/quantum_plugin_base.py  |   96 +++++++++++++++++++++++----------------
 quantum/service.py              |    4 +-
 6 files changed, 69 insertions(+), 51 deletions(-)

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.

 README |   52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 51 insertions(+), 1 deletion(-)

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.

 quantum/quantum_plugin_base.py |   65 ++++++++++++++++++++++++++++++++--------
 1 file changed, 52 insertions(+), 13 deletions(-)

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.

 README                         |   29 +++++++++++++++++++++++++++++
 quantum/quantum_plugin_base.py |    2 +-
 2 files changed, 30 insertions(+), 1 deletion(-)

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.

 quantum/quantum_plugin_base.py |   49 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 47 insertions(+), 2 deletions(-)

commit ccf5aa87c875d4fab3667736483bc90e470b3180
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:54:44 2011 -0700

    Make the wording a little clearer

 quantum/plugins/openvswitch/README |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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)

 quantum/plugins/openvswitch/README |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

commit 1a0c3722eecea8709d12e16ddfe0a0a0eb7094ba
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:41:46 2011 -0700

    Make the API the default

 quantum/cli.py |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

commit e33ad93cdbf7b4b279f48917fb6d0ad051802386
Author: Brad Hall <bhall@nicira.com>
Date:   Sun Jun 5 22:38:04 2011 -0700

    Address Dan's review comments

 quantum/plugins/openvswitch/README           |  103 ++++++++++++++++++++------
 quantum/plugins/openvswitch/agent/install.sh |   12 +--
 2 files changed, 87 insertions(+), 28 deletions(-)

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

 quantum/manager.py |   17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

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

 quantum/manager.py |   12 ------------
 1 file changed, 12 deletions(-)

commit e1475fcc0707ad3a23262c8db36af2941e2d5fc9
Author: Brad Hall <bhall@nicira.com>
Date:   Sat Jun 4 21:58:27 2011 -0700

    Fix detail_net and list_ports commands

 quantum/cli.py |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

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

 quantum/cli.py                                    |   85 +++++----------------
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   18 ++---
 2 files changed, 25 insertions(+), 78 deletions(-)

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

 quantum/plugins/openvswitch/README |   15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

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

 quantum/db/api.py                                 |   25 +++---
 quantum/plugins/openvswitch/ovs_quantum_plugin.py |   85 ++++++++++++++-------
 2 files changed, 72 insertions(+), 38 deletions(-)

commit 1c37bde8cb513e531f32424bcbf86deb4b50fa8b
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 20:59:49 2011 -0700

    Add headers

 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   18 ++++++++++++++++++
 .../plugins/openvswitch/agent/set_external_ids.sh  |    2 +-
 quantum/plugins/openvswitch/ovs_db.py              |   20 ++++++++++++++++++++
 quantum/plugins/openvswitch/ovs_models.py          |   20 ++++++++++++++++++++
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |   19 +++++++++++++++++++
 5 files changed, 78 insertions(+), 1 deletion(-)

commit 46a57d2c11b99ff4309a9d92023b739138d57896
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 20:56:32 2011 -0700

    Initial cut of openvswitch plugin

 quantum/plugins/openvswitch/Makefile               |   30 ++
 quantum/plugins/openvswitch/README                 |   37 +++
 quantum/plugins/openvswitch/agent/install.sh       |   38 +++
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |  272 ++++++++++++++++++
 .../plugins/openvswitch/agent/set_external_ids.sh  |   15 +
 quantum/plugins/openvswitch/ovs_db.py              |   52 ++++
 quantum/plugins/openvswitch/ovs_models.py          |   38 +++
 quantum/plugins/openvswitch/ovs_quantum_plugin.ini |    9 +
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |  296 ++++++++++++++++++++
 9 files changed, 787 insertions(+)

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

 quantum/db/__init__.py |   17 +++++
 quantum/db/api.py      |  166 ++++++++++++++++++++++++++++++++++++++++++++++++
 quantum/db/models.py   |   59 +++++++++++++++++
 3 files changed, 242 insertions(+)

commit 9453bb93c455ea8e7fa026e1870a3335d7b584c7
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 11:02:54 2011 -0700

    Print the command list in the help

 quantum/cli.py |    1 +
 1 file changed, 1 insertion(+)

commit 90a78e410cdcc6aa484b4e5e7ee0d4c0a6018056
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 10:26:36 2011 -0700

    Whitespace fixes

 quantum/api/__init__.py |    3 +--
 quantum/api/ports.py    |   39 +++++++++++++++++----------------------
 2 files changed, 18 insertions(+), 24 deletions(-)

commit bee2ea21aa7b8210e4a2ee69a90e172923cdb9ea
Author: Brad Hall <bhall@nicira.com>
Date:   Fri Jun 3 10:25:43 2011 -0700

    Added api functions for the interface commands

 quantum/cli.py |   83 ++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 74 insertions(+), 9 deletions(-)

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.

 quantum/api/views/ports.py |    7 +-
 quantum/cli.py             |  467 ++++++++++++++++++++++++++++++++++++--------
 2 files changed, 388 insertions(+), 86 deletions(-)

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

 smoketests/miniclient.py |   98 ++++++++++++++++++++++++++++++++++
 smoketests/tests.py      |  133 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 231 insertions(+)

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

 quantum/api/ports.py |  183 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 183 insertions(+)

commit 75b67e63e2ecf7538772c12babda2ba8fe16118c
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Tue May 31 18:15:00 2011 +0100

    pep8 fixes (1st batch)

 quantum/api/__init__.py        |   23 ++++++++--------
 quantum/api/api_common.py      |   24 +++++++++--------
 quantum/api/faults.py          |   27 ++++++++++---------
 quantum/api/networks.py        |   25 ++++++++---------
 quantum/api/versions.py        |    9 ++++---
 quantum/cli.py                 |   58 ++++++++++++++++++++++++----------------
 quantum/manager.py             |   22 +++++++--------
 quantum/quantum_plugin_base.py |   10 +++----
 quantum/service.py             |   21 ++++++---------
 quantum/utils.py               |    4 ++-
 10 files changed, 118 insertions(+), 105 deletions(-)

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

 quantum/api/__init__.py         |   56 +++++------
 quantum/api/api_common.py       |   47 +++++++++
 quantum/api/faults.py           |   97 ++++++++++++++++--
 quantum/api/networks.py         |   98 ++++++------------
 quantum/api/views/ports.py      |   48 +++++++++
 quantum/common/exceptions.py    |   54 +++++++++-
 quantum/plugins/SamplePlugin.py |  212 +++++++++++++++++++++++++++------------
 quantum/quantum_plugin_base.py  |   10 +-
 test_scripts/miniclient.py      |   98 ++++++++++++++++++
 test_scripts/tests.py           |  150 +++++++++++++++++++++++++++
 10 files changed, 699 insertions(+), 171 deletions(-)

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

 quantum/api/views/networks.py |   50 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)

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

 bin/quantum                     |   12 ---
 quantum/api/networks.py         |  218 ++++++++++++++-------------------------
 quantum/common/utils.py         |    8 +-
 quantum/common/wsgi.py          |   13 ++-
 quantum/plugins.ini             |    2 +-
 quantum/plugins/SamplePlugin.py |  158 ++++++++++++++++++++++++++++
 6 files changed, 249 insertions(+), 162 deletions(-)

commit 55599d71849b460a1b0a90e7406542162ba8efdc
Author: salvatore <>
Date:   Fri May 27 00:52:11 2011 +0100

    networks api with final URL structure.
    No serialization yet

 bin/quantum             |    1 +
 quantum/common/utils.py |    7 ++++---
 quantum/manager.py      |    7 ++++++-
 quantum/plugins.ini     |    2 +-
 quantum/utils.py        |    2 +-
 5 files changed, 13 insertions(+), 6 deletions(-)

commit 5022c07f6b28931a4df2adf197bee733cf3e5d8a
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Thu May 26 18:53:48 2011 +0100

    Implementing interface with plugin

 quantum/api/__init__.py |    9 +++++----
 quantum/api/networks.py |   24 ++++++++++++++----------
 quantum/common/utils.py |   16 ++++++++++++----
 quantum/common/wsgi.py  |    9 ++++++++-
 quantum/manager.py      |    3 ++-
 5 files changed, 41 insertions(+), 20 deletions(-)

commit 64ed5da2053bc2e5b25516913e44cf26b9970a16
Author: salvatore <>
Date:   Wed May 25 13:11:12 2011 +0100

    adpating wsgi files

 quantum/api/networks.py      |    4 +-
 quantum/common/exceptions.py |    4 ++
 quantum/common/wsgi.py       |  163 ++++++++++++++++++++++++++++++++----------
 quantum/utils.py             |   33 +++++++++
 4 files changed, 164 insertions(+), 40 deletions(-)

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

 bin/quantum               |   17 +++-
 etc/quantum.conf          |   12 ++-
 quantum/api/__init__.py   |   67 ++++++++++++++-
 quantum/api/api_common.py |   21 +++++
 quantum/api/faults.py     |   62 ++++++++++++++
 quantum/api/networks.py   |  200 +++++++++++++++++++++++++++++++++++++++++++++
 quantum/common/config.py  |   34 ++------
 quantum/common/utils.py   |    2 +-
 quantum/common/wsgi.py    |   10 ++-
 quantum/service.py        |  108 ++++++++++++++++++++----
 10 files changed, 478 insertions(+), 55 deletions(-)

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

 bin/quantum              |   13 ++++++-------
 quantum/common/config.py |    2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

commit 847ecc50286363d5ce3fbcce9e5454bd1af98b56
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 15:30:12 2011 +0100

    Adding api paste configuration file

 etc/quantum/api-paste.ini |   29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

commit 3e809e45f2d7ddbbe2e9710bf5d6f4c80801d834
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 14:53:02 2011 +0100

    Removing .pydevproject from version control

 .pydevproject |    7 -------
 1 file changed, 7 deletions(-)

commit bf3a3b7f685459b7ab40b5b862e7aa8a25239158
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 20 14:51:28 2011 +0100

    Branching from quantum-framework

 .pydevproject |    7 -------
 1 file changed, 7 deletions(-)

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

 quantum/common/flags.py |  247 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 247 insertions(+)

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.

 quantum/common/utils.py |   10 ++++++++--
 quantum/manager.py      |   10 +++-------
 quantum/plugins.ini     |    3 +++
 3 files changed, 14 insertions(+), 9 deletions(-)

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.

 quantum/cli.py                  |   98 +++++++++++++++++++++++++++++
 quantum/manager.py              |    6 +-
 quantum/plugins/SamplePlugin.py |  133 ++++++++++++++++++++++++++++++++++++++-
 quantum/quantumCLI.py           |   33 ----------
 quantum/quantum_plugin_base.py  |    4 +-
 5 files changed, 235 insertions(+), 39 deletions(-)

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.

 quantum/manager.py              |   48 +++++++++++++-
 quantum/plugins/SamplePlugin.py |  131 +++++++++++++++++++++++++++++++++++++++
 quantum/plugins/__init__.py     |   16 +++++
 quantum/quantumCLI.py           |   33 ++++++++++
 quantum/quantum_plugin_base.py  |   20 +++++-
 quantum/utils.py                |   57 +++++++++++++++++
 6 files changed, 301 insertions(+), 4 deletions(-)

commit ec5b5dd523dc8278f8aef725c300684bc827ffb5
Author: Salvatore Orlando <salvatore.orlando@eu.citrix.com>
Date:   Fri May 13 12:54:18 2011 +0100

    Fixing pep8 errors

 quantum/__init__.py            |    2 +-
 quantum/common/__init__.py     |    2 +-
 quantum/manager.py             |    2 +-
 quantum/quantum_plugin_base.py |   27 ++++++++++++++-------------
 quantum/service.py             |   23 +++++++++++++----------
 5 files changed, 30 insertions(+), 26 deletions(-)

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...

 .bzrignore |   11 +++++++++++
 1 file changed, 11 insertions(+)

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.

 .pydevproject                  |    7 +
 bin/quantum                    |   62 ++++++++
 etc/quantum.conf.sample        |   15 ++
 etc/quantum.conf.test          |   15 ++
 quantum/__init__.py            |   16 ++
 quantum/common/__init__.py     |   16 ++
 quantum/common/config.py       |  328 ++++++++++++++++++++++++++++++++++++++++
 quantum/common/exceptions.py   |   93 ++++++++++++
 quantum/common/utils.py        |  216 ++++++++++++++++++++++++++
 quantum/common/wsgi.py         |  313 ++++++++++++++++++++++++++++++++++++++
 quantum/manager.py             |   21 +++
 quantum/quantum_plugin_base.py |  135 +++++++++++++++++
 quantum/service.py             |   41 +++++
 13 files changed, 1278 insertions(+)

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

 .../plugins/cisco/tests/unit/test_ucs_inventory.py |    4 ----
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |   24 ++++++++++----------
 2 files changed, 12 insertions(+), 16 deletions(-)

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.

 .../cisco/tests/unit/test_l2network_multi_blade.py |   23 ++++++++++++++------
 .../plugins/cisco/tests/unit/test_ucs_inventory.py |    1 +
 2 files changed, 17 insertions(+), 7 deletions(-)

commit e14576cc83797aa1d9abb7851c9b633758edf4a5
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Jan 7 19:46:28 2011 -0500

    Adding UCS inventory tests

 .../plugins/cisco/tests/unit/test_ucs_inventory.py |  204 ++++++++++++++++++++
 1 file changed, 204 insertions(+)

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

 quantum/plugins/cisco/common/cisco_constants.py    |    2 +-
 .../plugins/cisco/tests/unit/test_ucs_plugin.py    |  741 +++++++++-----------
 2 files changed, 331 insertions(+), 412 deletions(-)

commit 1aac18238ae45eb39232b257ceae9853b2ab4ceb
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 23:30:45 2011 -0500

    Removing excess imports

 .../cisco/tests/unit/test_l2network_multi_blade.py |    2 --
 1 file changed, 2 deletions(-)

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

 .../cisco/tests/unit/test_l2network_multi_blade.py |   74 +++++++++++---------
 1 file changed, 41 insertions(+), 33 deletions(-)

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

 quantum/plugins/cisco/client/__init__.py |   20 ++++++++++++++++++++
 quantum/plugins/cisco/client/cli.py      |    7 ++++++-
 setup_cisco_plugin.py                    |    5 +++++
 setup_common.py                          |    2 +-
 4 files changed, 32 insertions(+), 2 deletions(-)

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

 quantum/common/utils.py |   22 ----------------------
 1 file changed, 22 deletions(-)

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

 quantum/api/api_common.py                |   16 +++++++++
 quantum/api/networks.py                  |   12 +++++--
 quantum/api/ports.py                     |    8 ++---
 quantum/api/views/networks.py            |   28 +++++++++++++--
 quantum/api/views/ports.py               |   26 ++++++++++++--
 quantum/common/test_lib.py               |    2 ++
 quantum/db/api.py                        |    9 ++---
 quantum/db/models.py                     |   22 ++++++++----
 quantum/plugins/openvswitch/run_tests.py |    5 +++
 quantum/plugins/sample/SamplePlugin.py   |   16 +++++++--
 quantum/tests/unit/_test_api.py          |   40 ++++++++++------------
 quantum/tests/unit/test_api.py           |   55 ++++++++++++++++++++++++++++++
 12 files changed, 190 insertions(+), 49 deletions(-)

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

 .../plugins/openvswitch/ovs_quantum_plugin.ini     |    8 ++-
 quantum/plugins/openvswitch/README                 |   17 +++++--
 .../plugins/openvswitch/agent/ovs_quantum_agent.py |   52 +++++++++-----------
 .../plugins/openvswitch/agent/xenserver_install.sh |   10 ++--
 quantum/plugins/openvswitch/ovs_quantum_plugin.py  |    7 +--
 quantum/plugins/openvswitch/pip-requires           |    2 +-
 6 files changed, 46 insertions(+), 50 deletions(-)

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

 etc/quantum.conf.sample |   32 --------------------------------
 1 file changed, 32 deletions(-)

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

 setup_server.py |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

commit d4ac021e849ac3ecbc92bd2ae35248e24203e570
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Tue Jan 4 19:48:22 2011 -0500

    Removing a couple extra lines

 .../cisco/tests/unit/test_l2network_multi_blade.py |    4 ----
 1 file changed, 4 deletions(-)

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.

 .../cisco/tests/unit/test_l2network_multi_blade.py |   90 +++++++++++++-------
 1 file changed, 58 insertions(+), 32 deletions(-)

commit 9be42e15139cac49ac568f8477c894e90d22bccd
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:47:43 2011 -0500

    Adding author information

 .../cisco/tests/unit/test_l2network_multi_blade.py |    3 +++
 1 file changed, 3 insertions(+)

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

 .../cisco/tests/unit/test_l2network_multi_blade.py |   19 -------------------
 1 file changed, 19 deletions(-)

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

 .../cisco/tests/unit/test_l2network_multi_blade.py |   34 --------------------
 1 file changed, 34 deletions(-)

commit b15e413f93c76c7a861708f06cec32d07153398f
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 22:39:16 2011 -0500

    Updating tests

 .../cisco/tests/unit/test_l2network_multi_blade.py |  284 ++++++++++++++------
 1 file changed, 205 insertions(+), 79 deletions(-)

commit 90b1fb080675f43c661919f21d03d49633ab5ca5
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Mon Jan 3 18:28:04 2011 -0500

    Fixing port-related calls

 .../cisco/tests/unit/test_l2network_multi_blade.py |   15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

commit aa98712148ed3f4377246fd30eb6210d6a29f05d
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Dec 31 23:52:04 2010 -0500

    Adding tests

 .../cisco/tests/unit/test_l2network_multi_blade.py |  106 ++++++++++++++++----
 1 file changed, 84 insertions(+), 22 deletions(-)

commit 8a9133c183f4225a58899985e12f4e8e532aa037
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Sep 2 13:14:33 2011 -0700

    Tweaking other multiblade tests.

 .../plugins/cisco/models/l2network_multi_blade.py  |   36 +++++++-----
 .../cisco/tests/unit/test_l2network_multi_blade.py |   62 +++++++-------------
 2 files changed, 44 insertions(+), 54 deletions(-)

commit 438514e9c13d81525d3f54d567310e12e384fbbb
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Dec 31 22:36:55 2010 -0500

    Updating multiblade create_network test

 .../plugins/cisco/models/l2network_multi_blade.py  |   11 +++---
 .../cisco/tests/unit/test_l2network_multi_blade.py |   36 ++++++++++++--------
 2 files changed, 28 insertions(+), 19 deletions(-)

commit 3ab86594371bf1fc1dc4543956489db1ab44e2b6
Author: Tyler Smith <tylesmit@cisco.com>
Date:   Fri Sep 2 11:59:35 2011 -0700

    Starting making multi_blade model return data

 .../plugins/cisco/models/l2network_multi_blade.py  |   21 ++++++++-----
 .../cisco/tests/unit/test_l2network_multi_blade.py |   31 ++++++++++----------
 2 files changed, 28 insertions(+), 24 deletions(-)

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

 .../cisco/tests/unit/test_l2network_multi_blade.py |  202 ++++++++++++++++++++
 1 file changed, 202 insertions(+)