Merge lp://staging/~zulcss/ubuntu/precise/quantum/trunk into lp://staging/~ubuntu-cloud-archive/ubuntu/precise/quantum/trunk

.pc/applied-patches (+0/-2)
.pc/fix-quantum-configuration.patch/etc/dhcp_agent.ini (+0/-36)
.pc/fix-quantum-configuration.patch/etc/l3_agent.ini (+0/-56)
.pc/fix-quantum-configuration.patch/etc/quantum.conf (+0/-171)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini (+0/-55)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/metaplugin/metaplugin.ini (+0/-28)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/nec/nec.ini (+0/-40)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/nicira/nvp.ini (+0/-59)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini (+0/-113)
.pc/fix-quantum-configuration.patch/etc/quantum/plugins/ryu/ryu.ini (+0/-19)
.pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_debug_commands.py (+0/-271)
.pc/fix-ubuntu-tests.patch/quantum/tests/unit/test_linux_ip_lib.py (+0/-608)
AUTHORS (+17/-0)
ChangeLog (+3215/-407)
HACKING.rst (+13/-0)
MANIFEST.in (+1/-0)
PKG-INFO (+10/-2)
bin/quantum-rootwrap (+8/-6)
bin/quantum-server (+2/-1)
bin/quantum-usage-audit (+67/-0)
debian/changelog (+18/-0)
debian/control (+0/-1)
debian/patches/fix-quantum-configuration.patch (+27/-145)
debian/patches/fix-ubuntu-tests.patch (+16/-18)
debian/quantum-common.install (+2/-2)
debian/quantum-dhcp-agent.install (+2/-2)
debian/quantum-l3-agent.install (+1/-1)
debian/quantum-plugin-linuxbridge-agent.install (+1/-1)
debian/quantum-plugin-nec.install (+1/-0)
debian/quantum-plugin-openvswitch-agent.install (+1/-1)
debian/quantum-plugin-ryu-agent.install (+1/-1)
debian/quantum-server.install (+2/-1)
debian/rules (+3/-3)
doc/source/conf.py (+2/-2)
etc/api-paste.ini (+1/-1)
etc/dhcp_agent.ini (+2/-2)
etc/l3_agent.ini (+6/-2)
etc/policy.json (+40/-40)
etc/quantum.conf (+51/-34)
etc/quantum/plugins/bigswitch/restproxy.ini (+30/-0)
etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini (+2/-4)
etc/quantum/plugins/metaplugin/metaplugin.ini (+1/-1)
etc/quantum/plugins/nec/nec.ini (+2/-2)
etc/quantum/plugins/nicira/nvp.ini (+1/-1)
etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini (+3/-3)
etc/quantum/plugins/ryu/ryu.ini (+29/-2)
etc/quantum/rootwrap.d/l3.filters (+4/-0)
openstack-common.conf (+1/-1)
quantum.egg-info/PKG-INFO (+10/-2)
quantum.egg-info/SOURCES.txt (+39/-34)
quantum.egg-info/entry_points.txt (+1/-1)
quantum.egg-info/requires.txt (+2/-3)
quantum/agent/dhcp_agent.py (+9/-21)
quantum/agent/l3_agent.py (+31/-12)
quantum/agent/linux/dhcp.py (+4/-1)
quantum/agent/linux/interface.py (+60/-108)
quantum/agent/linux/iptables_manager.py (+2/-2)
quantum/agent/linux/ovs_lib.py (+1/-1)
quantum/agent/linux/utils.py (+8/-4)
quantum/agent/netns_cleanup_util.py (+1/-1)
quantum/agent/rpc.py (+4/-5)
quantum/api/api_common.py (+1/-1)
quantum/api/extensions.py (+636/-0)
quantum/api/v2/attributes.py (+218/-51)
quantum/api/v2/base.py (+7/-3)
quantum/api/v2/resource.py (+5/-2)
quantum/api/v2/router.py (+2/-2)
quantum/api/versions.py (+1/-1)
quantum/auth.py (+2/-4)
quantum/common/config.py (+15/-45)
quantum/common/exceptions.py (+1/-1)
quantum/common/rpc.py (+41/-0)
quantum/common/utils.py (+50/-29)
quantum/context.py (+42/-12)
quantum/db/api.py (+10/-5)
quantum/db/db_base_plugin_v2.py (+99/-45)
quantum/db/dhcp_rpc_base.py (+4/-21)
quantum/db/l3_db.py (+92/-66)
quantum/db/model_base.py (+0/-2)
quantum/db/securitygroups_db.py (+465/-0)
quantum/debug/README (+8/-3)
quantum/debug/commands.py (+1/-1)
quantum/debug/debug_agent.py (+20/-3)
quantum/debug/shell.py (+3/-7)
quantum/extensions/credential.py (+1/-1)
quantum/extensions/extensions.py (+0/-626)
quantum/extensions/flavor.py (+1/-2)
quantum/extensions/l3.py (+15/-7)
quantum/extensions/multiport.py (+1/-1)
quantum/extensions/novatenant.py (+1/-1)
quantum/extensions/portprofile.py (+1/-1)
quantum/extensions/qos.py (+1/-1)
quantum/extensions/quotasv2.py (+1/-1)
quantum/extensions/securitygroup.py (+318/-0)
quantum/manager.py (+48/-4)
quantum/openstack/common/cfg.py (+3/-3)
quantum/openstack/common/eventlet_backdoor.py (+78/-0)
quantum/openstack/common/exception.py (+0/-12)
quantum/openstack/common/fileutils.py (+35/-0)
quantum/openstack/common/gettextutils.py (+1/-1)
quantum/openstack/common/lockutils.py (+232/-0)
quantum/openstack/common/log.py (+22/-5)
quantum/openstack/common/loopingcall.py (+88/-0)
quantum/openstack/common/network_utils.py (+68/-0)
quantum/openstack/common/notifier/api.py (+3/-3)
quantum/openstack/common/notifier/rabbit_notifier.py (+7/-24)
quantum/openstack/common/notifier/rpc_notifier.py (+46/-0)
quantum/openstack/common/policy.py (+712/-233)
quantum/openstack/common/rpc/__init__.py (+10/-4)
quantum/openstack/common/rpc/amqp.py (+8/-0)
quantum/openstack/common/rpc/impl_kombu.py (+90/-48)
quantum/openstack/common/rpc/impl_qpid.py (+47/-66)
quantum/openstack/common/rpc/impl_zmq.py (+1/-1)
quantum/openstack/common/rpc/service.py (+70/-0)
quantum/openstack/common/service.py (+332/-0)
quantum/openstack/common/setup.py (+211/-48)
quantum/openstack/common/threadgroup.py (+119/-0)
quantum/openstack/common/timeutils.py (+16/-5)
quantum/openstack/common/uuidutils.py (+39/-0)
quantum/openstack/common/version.py (+148/-0)
quantum/plugins/__init__.py (+16/-0)
quantum/plugins/bigswitch/README (+14/-0)
quantum/plugins/bigswitch/__init__.py (+16/-0)
quantum/plugins/bigswitch/plugin.py (+738/-0)
quantum/plugins/bigswitch/tests/__init__.py (+16/-0)
quantum/plugins/bigswitch/tests/test_server.py (+186/-0)
quantum/plugins/bigswitch/version.py (+57/-0)
quantum/plugins/cisco/client/__init__.py (+0/-17)
quantum/plugins/cisco/client/cli.py (+0/-216)
quantum/plugins/cisco/common/cisco_credentials.py (+0/-82)
quantum/plugins/cisco/db/nexus_db.py (+0/-89)
quantum/plugins/cisco/db/nexus_models.py (+0/-37)
quantum/plugins/cisco/db/ucs_db.py (+0/-155)
quantum/plugins/cisco/db/ucs_models.py (+0/-55)
quantum/plugins/cisco/l2network_model_base.py (+0/-156)
quantum/plugins/cisco/l2network_plugin.py (+0/-566)
quantum/plugins/cisco/models/l2network_multi_blade.py (+0/-202)
quantum/plugins/cisco/models/l2network_single_blade.py (+0/-175)
quantum/plugins/cisco/models/virt_phy_sw_v2.py (+12/-0)
quantum/plugins/cisco/network_plugin.py (+5/-0)
quantum/plugins/cisco/nexus/cisco_nexus_network_driver.py (+0/-148)
quantum/plugins/cisco/nexus/cisco_nexus_plugin.py (+0/-198)
quantum/plugins/cisco/nova/quantum_port_aware_scheduler.py (+0/-115)
quantum/plugins/cisco/nova/vifdirect.py (+0/-127)
quantum/plugins/cisco/segmentation/l2network_vlan_mgr.py (+0/-46)
quantum/plugins/cisco/services/service_insertion.py (+6/-2)
quantum/plugins/cisco/services/services_logistics.py (+5/-4)
quantum/plugins/cisco/tests/unit/test_cisco_extension.py (+5/-5)
quantum/plugins/cisco/tests/unit/test_database.py (+2/-2)
quantum/plugins/cisco/tests/unit/test_l2networkApi.py (+0/-1101)
quantum/plugins/cisco/tests/unit/test_l2network_multi_blade.py (+0/-360)
quantum/plugins/cisco/tests/unit/test_nexus_plugin.py (+0/-315)
quantum/plugins/cisco/tests/unit/test_ucs_inventory.py (+0/-198)
quantum/plugins/cisco/tests/unit/test_ucs_plugin.py (+0/-518)
quantum/plugins/cisco/tests/unit/test_vlan_mgr.py (+0/-93)
quantum/plugins/cisco/tests/unit/v2/test_api_v2.py (+1/-1)
quantum/plugins/cisco/ucs/cisco_getvif.py (+8/-4)
quantum/plugins/cisco/ucs/cisco_ucs_inventory.py (+0/-713)
quantum/plugins/cisco/ucs/cisco_ucs_plugin.py (+0/-337)
quantum/plugins/common/__init__.py (+16/-0)
quantum/plugins/common/constants.py (+26/-0)
quantum/plugins/linuxbridge/README (+0/-21)
quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py (+70/-282)
quantum/plugins/linuxbridge/common/config.py (+0/-1)
quantum/plugins/linuxbridge/db/l2network_db_v2.py (+3/-3)
quantum/plugins/linuxbridge/lb_quantum_plugin.py (+17/-26)
quantum/plugins/metaplugin/agent/linuxbridge_quantum_agent.py (+0/-173)
quantum/plugins/metaplugin/agent/ovs_quantum_agent.py (+0/-190)
quantum/plugins/metaplugin/meta_quantum_plugin.py (+4/-2)
quantum/plugins/nec/README (+0/-7)
quantum/plugins/nec/agent/nec_quantum_agent.py (+1/-1)
quantum/plugins/nec/extensions/packetfilter.py (+5/-5)
quantum/plugins/nec/nec_plugin.py (+2/-2)
quantum/plugins/nec/ofc_manager.py (+1/-1)
quantum/plugins/nicira/nicira_nvp_plugin/QuantumPlugin.py (+5/-1)
quantum/plugins/nicira/nicira_nvp_plugin/README (+39/-15)
quantum/plugins/nicira/nicira_nvp_plugin/api_client/request_eventlet.py (+2/-2)
quantum/plugins/nicira/nicira_nvp_plugin/nvplib.py (+9/-2)
quantum/plugins/openvswitch/agent/ovs_quantum_agent.py (+78/-216)
quantum/plugins/openvswitch/common/config.py (+1/-2)
quantum/plugins/openvswitch/ovs_db_v2.py (+4/-5)
quantum/plugins/openvswitch/ovs_quantum_plugin.py (+24/-29)
quantum/plugins/ryu/README (+0/-6)
quantum/plugins/ryu/agent/ryu_quantum_agent.py (+144/-144)
quantum/plugins/ryu/common/config.py (+7/-0)
quantum/plugins/ryu/db/api_v2.py (+209/-5)
quantum/plugins/ryu/db/models_v2.py (+57/-15)
quantum/plugins/ryu/nova/firewall.py (+0/-29)
quantum/plugins/ryu/nova/linux_net.py (+0/-74)
quantum/plugins/ryu/nova/vif.py (+0/-87)
quantum/plugins/ryu/ryu_quantum_plugin.py (+118/-10)
quantum/plugins/services/__init__.py (+16/-0)
quantum/plugins/services/dummy/__init__.py (+16/-0)
quantum/plugins/services/dummy/dummy_plugin.py (+32/-0)
quantum/plugins/services/service_base.py (+35/-0)
quantum/policy.py (+47/-42)
quantum/quantum_plugin_base_v2.py (+62/-3)
quantum/quota.py (+14/-5)
quantum/rootwrap/filters.py (+4/-0)
quantum/server/__init__.py (+1/-2)
quantum/service.py (+10/-12)
quantum/tests/etc/quantum.conf.test (+1/-1)
quantum/tests/unit/bigswitch/__init__.py (+16/-0)
quantum/tests/unit/bigswitch/etc/restproxy.ini.test (+26/-0)
quantum/tests/unit/bigswitch/test_restproxy_plugin.py (+112/-0)
quantum/tests/unit/cisco/test_network_plugin.py (+2/-2)
quantum/tests/unit/extension_stubs.py (+1/-1)
quantum/tests/unit/extensions/foxinsocks.py (+1/-1)
quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py (+54/-0)
quantum/tests/unit/metaplugin/test_basic.py (+1/-1)
quantum/tests/unit/metaplugin/test_metaplugin.py (+1/-1)
quantum/tests/unit/nec/test_pfc_driver.py (+2/-2)
quantum/tests/unit/nec/test_trema_driver.py (+2/-2)
quantum/tests/unit/nicira/fake_nvpapiclient.py (+1/-1)
quantum/tests/unit/openvswitch/test_ovs_defaults.py (+0/-1)
quantum/tests/unit/openvswitch/test_ovs_quantum_agent.py (+149/-0)
quantum/tests/unit/openvswitch/test_ovs_rpcapi.py (+1/-1)
quantum/tests/unit/openvswitch/test_ovs_tunnel.py (+10/-6)
quantum/tests/unit/ryu/test_ryu_db.py (+26/-2)
quantum/tests/unit/ryu/test_ryu_plugin.py (+8/-0)
quantum/tests/unit/ryu/utils.py (+0/-32)
quantum/tests/unit/test_agent_netns_cleanup.py (+3/-2)
quantum/tests/unit/test_api_v2.py (+37/-25)
quantum/tests/unit/test_attributes.py (+366/-17)
quantum/tests/unit/test_common_utils.py (+60/-0)
quantum/tests/unit/test_db_plugin.py (+306/-36)
quantum/tests/unit/test_db_rpc_base.py (+1/-17)
quantum/tests/unit/test_debug_commands.py (+87/-26)
quantum/tests/unit/test_dhcp_agent.py (+18/-22)
quantum/tests/unit/test_extension_security_group.py (+829/-0)
quantum/tests/unit/test_extensions.py (+112/-13)
quantum/tests/unit/test_iptables_manager.py (+25/-25)
quantum/tests/unit/test_l3_agent.py (+26/-5)
quantum/tests/unit/test_l3_plugin.py (+203/-16)
quantum/tests/unit/test_linux_dhcp.py (+9/-1)
quantum/tests/unit/test_linux_interface.py (+38/-101)
quantum/tests/unit/test_linux_ip_lib.py (+0/-1)
quantum/tests/unit/test_policy.py (+58/-49)
quantum/tests/unit/test_quantum_context.py (+66/-0)
quantum/tests/unit/test_quantum_manager.py (+71/-0)
quantum/tests/unit/test_quota_per_tenant_ext.py (+1/-1)
quantum/tests/unit/test_rootwrap.py (+16/-1)
quantum/vcsversion.py (+0/-7)
quantum/version.py (+5/-30)
quantum/versioninfo (+1/-0)
quantum/wsgi.py (+2/-21)
setup.py (+13/-6)
tools/pip-requires (+2/-3)
tox.ini (+3/-1)