Merge lp:~corey.bryant/ubuntu/trusty/neutron/revert-sql-alchemy-patch into lp:ubuntu/trusty/neutron

[Corey Bryant]

debian/patches/sql-alchemy-0.8.3-compat.patch: Revert prior drop

Unmerged revisions

236. By Corey Bryant on 2014-02-21

debian/patches/sql-alchemy-0.8.3-compat.patch: Revert prior drop.

235. By Chuck Short on 2014-02-18

debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed.

234. By Chuck Short on 2014-02-18

debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed.

233. By Chuck Short on 2014-02-13

Disable patch

232. By Chuck Short on 2014-02-13

debian/patches/requirements.patch: Dropped no longer needed.

231. By Chuck Short on 2014-02-06

debian/rules: Re-enabled tests.

230. By Chuck Short on 2014-02-06

releasing package neutron version 1:2014.1~b2-0ubuntu6

229. By Chuck Short on 2014-02-06

releasing package neutron version 1:2014.1~b2-0ubuntu6

228. By Chuck Short on 2014-02-03

Fix up changelog

227. By Chuck Short on 2014-02-03

debian/rules: Really run_tests.sh.

=== added directory 'debian'
=== renamed directory 'debian' => 'debian.moved'
=== added file 'debian/NEWS'
--- debian/NEWS	1970-01-01 00:00:00 +0000
+++ debian/NEWS	2014-02-21 16:49:36 +0000
@@ -0,0 +1,8 @@
+neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low
+
+  Quantum has been renamed to Neutron during the Havana development cycle.
+
+  Please review changed configuration in /etc/quantum and apply to new
+  configuration files in /etc/neutron.
+
+ -- James Page <[e-mail]>  Thu, 18 Jul 2013 10:07:15 +0100
 
=== added file 'debian/changelog'
--- debian/changelog	1970-01-01 00:00:00 +0000
+++ debian/changelog	2014-02-21 16:49:36 +0000
@@ -0,0 +1,752 @@
+neutron (1:2014.1~b2-0ubuntu7) UNRELEASED; urgency=medium
+
+  [ Chuck Short ]
+  * debian/rules: Re-enabled tests. 
+  * debian/patches/requirements.patch: Dropped no longer needed.
+  * debian/patches/sql-alchemy-0.8.3-compat.patch: Dropped no longer needed.
+  * debian/patches/bump-sqlalchemy-version.patch: Dropped no longer needed.
+
+  [ Corey Bryant ]
+  * debian/patches/sql-alchemy-0.8.3-compat.patch: Revert prior drop.
+
+ -- Corey Bryant <[e-mail]>  Fri, 21 Feb 2014 11:09:33 -0500
+
+neutron (1:2014.1~b2-0ubuntu6) trusty; urgency=medium
+
+  * debian/rules: Temporarily disable testsuite due to upstream breakage. 
+
+ -- Chuck Short <[e-mail]>  Thu, 06 Feb 2014 08:33:08 -0500
+
+neutron (1:2014.1~b2-0ubuntu5) trusty; urgency=medium
+
+  * debian/patches/disable-udev-tests.patch: Skip more tests 
+    because of udev failures.
+  * debian/patches/skip-ipv6-tests.patch: Skip tests that fail 
+    on the buildds due to ipv6.
+
+ -- Chuck Short <[e-mail]>  Mon, 03 Feb 2014 09:02:45 -0500
+
+neutron (1:2014.1~b2-0ubuntu4) trusty; urgency=medium
+
+  * debian/rules: Really run_tests.sh. 
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jan 2014 11:44:21 -0500
+
+neutron (1:2014.1~b2-0ubuntu3) trusty; urgency=medium
+
+  * debian/rules: Switch back to run_test.sh since locking
+    issues have been fixed.
+
+ -- Chuck Short <[e-mail]>  Thu, 30 Jan 2014 10:49:22 -0500
+
+neutron (1:2014.1~b2-0ubuntu2) trusty; urgency=medium
+
+  * debian/patches/skip-lb-test.patch: Skipped lb configuration
+    test. 
+
+ -- Chuck Short <[e-mail]>  Mon, 27 Jan 2014 12:01:50 -0500
+
+neutron (1:2014.1~b2-0ubuntu1) trusty; urgency=low
+
+  [ James Page ]
+  * Switch to using Modular Layer 2 plugin by default:
+    - d/control,neutron-plugin-ml2.install: Add ML2 plugin package
+      (LP: #1243147).
+    - d/p/fix-quantum-configuration,d/control,d/neutron-server.default:
+      Switch to using the ML2 plugin by default.
+    - d/control,neutron-plugin-openvswitch-agent:
+      Use neutron-plugin-ml2 and configuration for openvswitch-agent.
+  * d/neutron-plugin-mlnx-agent.upstart: Reference correct configuration
+    file (LP: #1257732).
+  * Add neutron-ovs-cleanup upstart configuration for OVS plugin
+    (LP: #1249708):
+    - d/rules: Install new configuration in neutron-plugin-openvswitch-agent
+      package, don't restart on install/upgrade (only needed for reboots).
+    - d/neutron-plugin-openvswitch-agent.upstart: Ensure startup happens
+      after neutron-ovs-cleanup.
+    - d/neutron-{l3|dhcp}-agent.upstart: If neutron-ovs-cleanup job is
+      installed, wait for it to reach running state prior to starting
+      agents.
+  * d/control: Add versioned BD/Depends on python-psutil >= 0.6.1.
+  * d/p/requirements.patch: Drop upper version boundary for psutil for
+    compatibility with Trusty.
+  * d/p/requirements.patch: Lift upper boundary for WebOb to < 1.4.
+  * d/p/disable-failing-metaplugin-tests.patch: Disable metaplugin tests that
+    are currently failing.
+  * d/p/disable-ml2-notification-tests.patch: Dropped, tests now pass.
+  * d/rules: Fail package build on unit test failures.
+  * d/p/disable-failing-cisco-test.patch: Disable failing Cisco mechanism test.
+  * d/control,d/p/remove-jsonrpclib.patch: Add BD on python-jsonrpclib and drop
+    patch that excludes it from requirements.txt.
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/rules: Run testr directly
+  * debian/patches/sql-alchemy-0.8.3-compat.patch: Fix tests sqlalchemy 0.8.3
+    compat.
+  * debian/neturon-nicira.install: Add usr/bin/neutron-check-nsx-config.
+
+ -- Chuck Short <[e-mail]>  Fri, 24 Jan 2014 09:17:12 -0500
+
+neutron (1:2014.1~b1-0ubuntu1) trusty; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/control: open icehouse release.
+
+  [ James Page ]
+  * debian/patches: Refresh patches against upstream master. 
+  * debian/control: Drop quantum-* transitional packages, no longer needed. 
+
+ -- Chuck Short <[e-mail]>  Thu, 05 Dec 2013 11:40:39 -0500
+
+neutron (1:2013.2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release (LP: #1236462).
+
+ -- Chuck Short <[e-mail]>  Thu, 17 Oct 2013 10:52:39 -0400
+
+neutron (1:2013.2~rc3-0ubuntu1) saucy; urgency=low
+
+  * New upstream release candidate (LP: #1240665).
+
+ -- Chuck Short <[e-mail]>  Wed, 16 Oct 2013 15:37:02 -0400
+
+neutron (1:2013.2~rc2-0ubuntu1) saucy; urgency=low
+
+  * New upstream release candidate (LP: #1239156).
+
+ -- James Page <[e-mail]>  Sat, 12 Oct 2013 16:51:28 +0100
+
+neutron (1:2013.2~rc1-0ubuntu2) saucy; urgency=low
+
+  * d/tests/control,neutron-server: Limit neutron-server tests to core
+    neutron daemons to avoid tests failures for plugin agents which don't
+    start correctly without additional configuration. 
+
+ -- James Page <[e-mail]>  Thu, 03 Oct 2013 23:05:05 +0100
+
+neutron (1:2013.2~rc1-0ubuntu1) saucy; urgency=low
+
+  [ Yolanda Robla ]
+  * debian/tests: added testing agents
+
+  [ Chuck Short ]
+  * debian/patches/disable-udev-tests.patch: Refreshed.
+  * debian/patches/disable-ml2-notification-tests.patch: Refreshed.
+  * debian/control:
+    - Dropped python-setuptools-git python-netifaces, and python-nose from
+      build dependencies.
+    - Dropped python-configobj, python-gflags from binary dependencies.
+    - Added build python-requests python-six, and python-jinja2 build
+      dependencies.
+    - Added versioned dependencies for python-amqplib,
+      python-pbr, python-novaclient, python-cliff,
+      python-testtools, and python-eventlet.
+    - Bumped versioned depends for python-stevedore, pyhton-novaclient,
+      python-oslo.config, and testrepository
+
+  [ James Page ]
+  * New upstream release candidate:
+    - d/patches: Refreshed.
+  * d/rules: unpatch/patch neutron.conf around test execution to ensure that
+    as many tests as possible actually pass.
+
+ -- James Page <[e-mail]>  Thu, 03 Oct 2013 15:18:04 +0100
+
+neutron (1:2013.2~b3-0ubuntu6) saucy; urgency=low
+
+  * debian/rules: Dont ftbfs the tests if they fail. 
+
+ -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 20:37:18 -0400
+
+neutron (1:2013.2~b3-0ubuntu5) saucy; urgency=low
+
+  * debian/tests/neutron-daemons: Fix typo.
+  * debian/rules: FTBFS if testsuite fails. 
+
+ -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 17:27:25 -0400
+
+neutron (1:2013.2~b3-0ubuntu4) saucy; urgency=low
+
+  * debian/patches/remove_jsonrpclib.patch: Remove jsonrpclib
+    its not needed other than the arista driver. 
+
+ -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 15:19:22 -0400
+
+neutron (1:2013.2~b3-0ubuntu3) saucy; urgency=low
+
+  * debian/tests: Fixed autopkg tests. 
+
+ -- Chuck Short <[e-mail]>  Tue, 10 Sep 2013 12:10:05 -0400
+
+neutron (1:2013.2~b3-0ubuntu2) saucy; urgency=low
+
+  * debian/control, debian/neutron-plugin-vpn-agent.install,
+    debian/neutron-plugin-vpn-agent.install: Add vpn agent.
+  * debian/control, debian/usr/bin/neutron-metering-agent.install,
+    debian/usr/bin/neutron-metering-agent.install: Add metering agent.
+
+ -- Chuck Short <[e-mail]>  Mon, 09 Sep 2013 22:35:59 -0400
+
+neutron (1:2013.2~b3-0ubuntu1) saucy; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/patches/fix-quantum-configuration.patch: Refreshed.
+  * debian/patches/neutron-conf.patch: Dropped.
+  * debian/patches/ignore-quantum-binaries.patch: Dropped
+  * debian/control: Add python-babel as a build depends.
+  * debian/neutron-common.install: Add neutron-usage-audit binary.
+  * debian/rules: Pass the tests even if it fails, temporary measure 
+    until we figure out why the tests fail.
+
+  [ Adam Gandelman ]
+  * debian/rules: Limit testr concurrency to 1 CPU.
+  * debian/patches: Refresh.
+
+  [ James Page ]
+  * d/*.upstart: Added respawn stanza (LP: #1170393), tidied
+    descriptions and rationalized stop on stanzas to be consistent.
+  * d/neutron-dhcp-agent.install: Drop neutron-dhcp-agent-dnsmasq-lease-
+    update inline with upstream.
+  * d/rules: Ignore deprecated quantum binaries when checking for
+    missing files.
+  * d/control: Update/add versioned depends for upgrades:
+    - python-anyjson >= 0.3.3
+    - python-stevedore >= 0.9
+    - python-oslo.config >= 1:1.2.0
+    - python-keystoneclient >= 1:0.2.0
+  * d/*: Wrap and sort.
+
+ -- Chuck Short <[e-mail]>  Mon, 09 Sep 2013 13:12:57 -0400
+
+neutron (1:2013.2~b2-0ubuntu3) saucy; urgency=low
+
+  * d/p/neutron-conf.patch: Cherry picked commit from upstream VCS which
+    fixes a number of 'quantum' references across all configuration files. 
+  * d/neutron_sudoers: Remove typo to re-enable passwordless sudo for neutron.
+  * d/p/fix-quantum-conf.patch: Enable use of neutron-rootwrap by default,
+    fixup problem with use of /var/lib/quantum for keystone signing_dir.
+
+ -- James Page <[e-mail]>  Wed, 24 Jul 2013 16:09:08 +0100
+
+neutron (1:2013.2~b2-0ubuntu2) saucy; urgency=low
+
+  * d/neutron-server.upstart: Execute correct server binary, fixup
+    use of flags in /etc/default/neutron-server.
+  * d/p/bump-sqlalchemy-version.patch: Support SQLAlchemy >= 0.8 until
+    upstream catches up.
+  * Re-jig test disablement patches:
+    - d/p/disable-udev-tests.patch: Disable tests that use udev as it
+      is not always available.
+    - d/p/disable-ml2-notification-tests.patch: Disable failing ML2 plugin
+      tests pending further investigation.
+  * d/p/fix-quantum-configuration.patch: Remove rej and orig cruft, re-added
+    missing default core_plugin configuration.
+  * d/control: Drop pep8 from BD's, no longer required.
+
+ -- James Page <[e-mail]>  Wed, 24 Jul 2013 11:41:56 +0100
+
+neutron (1:2013.2~b2-0ubuntu1) saucy; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/patches/fix-quantum-configuration.patch: Refreshed 
+  * Renamed quantum -> neutron inline with upstream:
+    - debian/neutron*.install: Update paths and files for rename.
+    - debian/cron.d: Update for new neutron names.
+    - debian/control: 
+      + Add transtional packages.
+      + Add breaks/replaces with previous versions of quantum.
+  * debian/patches/fix-ubuntu-tests.patch: Refreshed
+  * debian/patches/ignore-quantum-binaries.patch: Don't install quantum
+    binaries.
+  * Add new mlnx agent package.
+
+  [ James Page ]
+  * d/control: Update VCS fields for new branch locations.
+  * d/NEWS: Let users know they need to migrate configuration manually as part
+    of the quantum->neutron rename.
+  * d/neutron-common.install: Include rootwrap for Xen dom0 installs.
+
+  [ Adam Gandelman ]
+  * debian/control: Set minimum python-kombu version >= 2.5.12.
+
+ -- Chuck Short <[e-mail]>  Fri, 19 Jul 2013 12:11:18 -0400
+
+quantum (1:2013.2~b1-0ubuntu2) saucy; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control:
+    - Add version requirement to python-stevedore (>= 0.8), also add to
+      python-quantum depends.
+    - Add version requirement to python-fixtures (>= 0.3.12).
+  * debian/patches/*: Refreshed.
+
+  [ Yolanda Robla ]
+  * debian/tests: added autopkg tests
+ 
+  [Chuck Short]
+  * debian/patches/fix-ubuntu-tests.patch: Rediff to skip tests
+    that were randomly failing in the PPAS or locally.
+
+ -- Chuck Short <[e-mail]>  Wed, 19 Jun 2013 12:06:15 -0500
+
+quantum (1:2013.2~b1-0ubuntu1) saucy; urgency=low
+
+  * New upstream release.
+  * debian/patches/fix-quantum-configuration.patch: Refreshed
+  * debian/control: Add testrepository.
+  * debian/control: Add subunit.
+  * debian/control: Add python-d21o1 and python-pbr as build-depends.
+  * debian/control: Add python-stevedore.
+
+ -- Chuck Short <[e-mail]>  Fri, 31 May 2013 09:37:25 -0500
+
+quantum (1:2013.1-0ubuntu2) raring; urgency=low
+
+  * Fix invalid multi-line cron jobs (LP: #1170312):
+    - d/cron.d/*: Consolidate jobs into a single command line, set syntax
+      highlighting to type 'crontab'. 
+
+ -- James Page <[e-mail]>  Mon, 22 Apr 2013 15:58:12 +0100
+
+quantum (1:2013.1-0ubuntu1) raring; urgency=low
+
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Thu, 04 Apr 2013 14:03:41 -0500
+
+quantum (1:2013.1~rc2-0ubuntu1) raring; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Tue, 26 Mar 2013 08:33:56 -0500
+
+quantum (1:2013.1~rc1-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * debian/patches/fix-quantum-configuration.patch: Refreshed
+  * debian/control: Add python-testtools and python-fixtures a build-dep.
+  * debian/control: Drop python-gflags no longer needed.
+  * debian/control: Drop python-unittest2 no longer needed.
+
+  [ James Page ]
+  * New upstream release candidate.
+  * d/watch: Update uversionmangle to deal with upstream versioning
+    changes, remove tarballs.openstack.org.
+  * d/rules: Disable PEP-8 tests until fixed upstream.
+  * d/control,quantum-plugin-midonet.install: Added plugin package for
+    Midonet. 
+  * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent
+    package. 
+  * d/control: Bumped Standards-Version, no changes.
+  * d/p/fix-quantum-configuration.patch: Added midonet sqlite path to
+    patch, fixed up linuxbridge path. 
+  * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests
+    that attempt to setup udev monitors.
+  * d/quantum-metadata-agent.*: Refactor metadata-agent into separate
+    package and add Depends from quantum-l3-agent and quantum-dhcp-agent.
+  * d/quantum-plugin-nicira.install: Add quantum-check-nvp-config binary.
+  * d/control: Add iputils-arping to quantum-l3-agent Depends (LP: #1153066).
+  * d/control: python-oslo-config -> python-oslo.config.
+  * d/control: Bump python-quantumclient >= 1:2.2.0 inline with upstream.
+
+ -- James Page <[e-mail]>  Fri, 15 Mar 2013 09:37:28 +0000
+
+quantum (2013.1.g3-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/patches/fix-quantum-configuration.patch: Refreshed and update to
+    reflect new global root_wrap configuration defined only in
+    /etc/quantum/quantum.conf.
+  * debian/patches/fix-ubuntu-tests.patch: Refreshed, added skipTests for
+    linuxbridge tests that attempt to setup udev monitors.
+  * debian/{control, quantum-server.install}: Drop quantum-ns-metadata-proxy,
+    quantum-metadata-agent, quantum-debug from quantum-server package and set a
+    Break/Replaces on the last quantum-server package that shipped them.
+    (LP: #1112203)
+  * debian/{control, quantum-plugin-nec.install}:  Drop rootwrap filters,
+    only install /w the agent.
+  * debian/control: Add Breaks/Replaces between quantum-plugin-nec and new
+    quantum-plugin-nec-agent.
+
+  [ Yolanda Robla ]
+  * debian/patches: refreshed patches
+
+  [ James Page ]
+  * d/p/fix-quantum-configuration.patch: Add root_wrap helper to AGENT
+    section of /etc/quantum/quantum.conf to support new global configuration.
+  * d/control,quantum-plugin-{bigswitch,brocade,plumgrid}.install: Add new
+    plugin packages for BigSwitch, Brocade, Hyper-V and PLUMgrid.
+  * d/p/fix-quantum-configuration.patch: Set sqlite location for new plugins.
+  * d/control,quantum-plugin-nec-agent.*: Add new plugin agent package for NEC.
+  * d/quantum-common.install: Added new binaries and common rootwrap.d config.
+  * d/control: Removed VCS fields, updated maintainer.
+  * Wrapped and sorted debian/*.
+  * d/control: Add BD on python-oslo-config.
+  * d/control: Add BD on python-netifaces to fix RYU unit tests.
+
+  [ Chuck Short ]
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Feb 2013 09:54:36 -0600
+
+quantum (2013.1~g2-0ubuntu1) raring; urgency=low
+
+  [ Chuck Short ]
+  * New upstream version. 
+  * debian/patches/fix-quantum-configuration.patch: Refreshed.
+
+  [ Yolanda Robla ]
+  * debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
+    upstart configuration for Metadata Agent.
+  * debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
+    quantum-metadata-agent and metadata_agent.ini.
+  * debian/patches/fix-quantum-configuration.patch: Update rootwrap
+    configuration in metadata_agent.ini file.
+  * debian/changelog: Updated package version
+  * d/p/fix-quantum-configuration.patch: refresh patches
+  * debian/patches/fix-ubuntu-tests.patch: Refreshed.
+  * debian/control: added python-novaclient dependency
+
+  [ James Page ]
+  * d/*.install: Install entry points from bin directory instead
+    of easy-install ones generated during the package build process
+    (LP: #1085038).
+  * d/control: Drop BD on python-dev-all; its not required.
+  * d/rules: Install multiple upstart configurations for quantum-l3-agent.
+  * d/control: Tidy package descriptions.
+  * d/*.postrm: Drop as debhelper will generate update-rc.d calls in
+    maintainer scripts if required.
+  * d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
+    is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
+    is owned by root:root.
+  * d/*agent*.postinst: Dropped as permissions now correctly set in
+    quantum-common.
+  * d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
+    sqlite defaults for all plugins.
+  * d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.
+
+  [ Maru Newby ]
+  * debian/control: Remove unnecessary openvswitch-vswitch dependency
+    from quantum-plugin-openvswitch (LP: #1076747).
+
+ -- Yolanda Robla <[e-mail]>  Tue, 22 Jan 2013 11:40:00 +0100
+
+quantum (2013.1~g1-0ubuntu1) raring; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/patches/*: Refreshed for opening of Grizzly.
+
+  [ Chuck Short ]
+  * New upstream release.
+  * debian/rules: FTFBS if there is missing binaries.
+  * debian/quantum-server.install: Add quantum-debug.
+
+ -- Chuck Short <[e-mail]>  Fri, 23 Nov 2012 09:43:14 -0600
+
+quantum (2012.2-0ubuntu1) quantal; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release. 
+
+  [ Adam Gandelman ]
+  * debian/cron.d/quantum-{l3, dhcp]-agent-netns-cleanup: Schedule hourly
+    cleanups of leaked Quantum network namespsaces using the
+    quantum-netns-cleanup utility.
+
+ -- Chuck Short <[e-mail]>  Thu, 27 Sep 2012 13:19:33 -0500
+
+quantum (2012.2~rc3-0ubuntu1) quantal; urgency=low
+
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Wed, 26 Sep 2012 15:14:31 -0500
+
+quantum (2012.2~rc2-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/quantum-server.{default, upstart}: Use default file to specify
+    path to plugin config, which is passed to quantum-server as
+    '--config-file' during startup. (LP: #1009294)
+  * debian/control:
+    - Remove quantum-server's dependency on 'quantum-plugin'.
+    - Specify >= 1:0.1.0.1-0ubuntu1 requirement for python-quantumclient.
+    - Add dnsmasq dependencies to quantum-dhcp-agent Depends.
+
+  [ Chuck Short ]
+  * New upstream version.
+  * debian/patches/fix-ubuntu-tests.patch: Refreshed.
+
+ -- Chuck Short <[e-mail]>  Fri, 21 Sep 2012 13:01:18 -0500
+
+quantum (2012.2~rc1-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debain/*.postrm: Fix argument-less calls to update-rc.d, redirect
+    to /dev/null.  (LP: #1047560)
+  * debian/quantum-server.upstart: Invoke start-stop-daemon properly.
+    (LP: #1047404)
+  * debain/*.postrm, *.upstart: Ensure files are named for corresponding
+    agent package, not plugin package.
+  * debian/control:
+    - Group agents with plugins.
+    - Fix some copy/paste mistakes.
+    - Set dependencies between agents and corresponding plugins.
+    - Recommend quantum-plugin-openvswitch for quantum-server.
+    - Require the same version of quantum-common and python-quantum.
+    - Add quantum-netns-cleanup utility to quantum-common.
+  * debian/patches/fix-quantum-configuration.patch: Use correct database
+    for linuxbridge plugin, use OVS plugin by default, call quantum-rootwrap
+    correctly. (LP: #1048668)
+  * Fix all use of /usr/sbin, things should go in /usr/bin.
+  * Remove dhcp and l3 plugins, they are not actually plugins.
+  * Rename packages quantum-plugin-{l3, dhcp}-agent to
+    quantum-{l3, dhcp}-agent.
+  * debain/quantum-*-agent.upstart: Specify config files as a
+    parameter to --config-file, specify log files for all.
+  * debian/*.logrotate: Add logrotate configs for server and agents.
+  * Install quantum_sudoers with quantum-common, not quantum-server.
+  * Install rootwrap filters only with the packages that require them.
+  * debian/*-agent.upstart: Specify --config-file=/etc/quantum/quantum.conf
+    in addition to plugin-specific config.  Specify log files for all agents.
+  * Allow group 'adm' read access to /var/log/quantum.
+  * debian/quantum-server.postinst: Drop, all has been moved to quantum-common.
+  * Add packaging for quantum-plugin-nec.
+
+  [ Chuck Short ]
+  * New usptream release.
+
+ -- Chuck Short <[e-mail]>  Wed, 12 Sep 2012 13:41:20 -0500
+
+quantum (2012.2~rc1~20120907.1154-0ubuntu1) quantal; urgency=low
+
+  [ Adam Gandelman ]
+  * debian/control: Add missing python-keystone dependency.
+  * wrap-and-sort.
+
+  [ Chuck Short ]
+  * debian/rules:
+    - Run testsuite on build.
+    - Use get-orig-source.
+    - Add python-amqplib, python-anyjson, python-httplib2, python-iso8601,
+      python-kombu, python-lxml, python-netadr, python-pyudev to build depends
+      and run time deps.
+    - Add python-mock, python-mox, and python-unitest2 to build deps.
+    - Add adduser as a dep to quantum-common.
+  * debian/control: Bump standards version to 3.9.3
+  * debian/quantum-common.install: Add missing configuration files.
+    (LP: #988999)
+  * debian/quantum-plugin-linuxbridge.install: Make isntallable.
+  * Add manpages: gratitously ripped from debian.
+  * Fix up lintian warnings. (LP: #1025203), (LP: #1021921)
+  * Add metaplugin plugin.
+  * debian/patches/fix-namespace.patch: Dropped it was causing
+    python namespace issues.
+    (LP: #1045064)
+  * debian/*.upstart:
+    - Specify configuration file and log directory.
+    - Start on the right transition.
+  * debian/rules:
+    - Allow to disable testsuite.
+    - Dont fail if the testsuite fails.
+  * debian/patches/fix-quantum-configuration.patch: Fix configuration files.
+  * Add packaging for quantum-plugin-l3 and quantum-plugin-l3-agent
+  * Add packaging for quantum-plugin-dhcp-agent and quantum-plugin-dchp-agent
+  * debian/patches/fix-ubuntu-tests.patch: Fix testsuite failures.
+
+  [ Soren Hansen ]
+  * Update debian/watch to account for symbolically named tarballs and
+    use newer URL.
+  * Add python-configobj as a build and run time dependency. Recently added
+    tests need it, and the Cisco plugin has needed it for a while.
+  * Fix Launchpad URLs in debian/watch.
+
+ -- Chuck Short <[e-mail]>  Fri, 07 Sep 2012 18:50:09 -0500
+
+quantum (2012.2~f3-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+  * New upstream release.
+
+ -- Chuck Short <[e-mail]>  Fri, 17 Aug 2012 10:42:58 -0500
+
+quantum (2012.2~f2-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+
+  [ Adam Gandelman ]
+  * debian/control, pydist-overrides: Add python-setuptools-git as a
+    Build-Depends, override as necessary. 
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Jul 2012 12:41:43 -0400
+
+quantum (2012.2~f1-0ubuntu1~cloud0) precise-folsom; urgency=low
+
+  [ Chuck Short ]
+  * New upstream release.
+  * Add missing upsart jobs for agents. 
+  * Add sudo wrapper for quantum-rootwrap. (LP: #999142)
+
+  [ Adam Gandelman ]
+  * debian/control: Fix spacing issues that cause mk-build-deps to fail.
+  * debian/quantum-server.install: Install new plugins config directory
+    instead of old .ini.
+
+ -- Chuck Short <[e-mail]>  Fri, 22 Jun 2012 12:49:23 -0400
+
+quantum (2012.1-0ubuntu1) precise; urgency=low
+
+  [Adam Gandelman]
+  * Open precise-folsom-proposed.
+  * Merge with current precise-folsom-folsom-proposed.
+
+  [Chuck Short]
+  * New upstream release.
+  * Add missing upsart jobs for agents. 
+  * Add sudo wrapper for quantum-rootwrap. (LP: #999142)
+
+ -- Chuck Short <[e-mail]>  Fri, 01 Jun 2012 10:26:49 -0400
+
+quantum (2012.1-0ubuntu4) precise; urgency=low
+
+  * debian/control: Add breaks replaces since files have moved around. 
+  * Fix typo in upstart job.
+
+ -- Chuck Short <[e-mail]>  Mon, 23 Apr 2012 11:23:38 -0400
+
+quantum (2012.1-0ubuntu3) precise; urgency=low
+
+  * Split out agents into its own packages. (LP: #979192) 
+    Thanks to Ghe Rivero.
+  * Add upstart job. (LP: #979190)
+  * Fix installation issues. (LP: #979159)
+
+ -- Chuck Short <[e-mail]>  Thu, 12 Apr 2012 13:39:06 -0400
+
+quantum (2012.1-0ubuntu2) precise; urgency=low
+
+  * Fix lintian warnings about empty packages. 
+
+ -- Chuck Short <[e-mail]>  Fri, 06 Apr 2012 22:14:42 -0400
+
+quantum (2012.1-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+
+ -- Chuck Short <[e-mail]>  Thu, 05 Apr 2012 11:07:46 -0400
+
+quantum (2012.1~rc2-0ubuntu1) precise; urgency=low
+
+  *  New upstream release: 
+     - debian/quantum-plugin-{ryu,openvswitch}.install: 
+       Install agents.
+
+ -- Chuck Short <[e-mail]>  Tue, 03 Apr 2012 20:29:11 -0400
+
+quantum (2012.1~rc1-0ubuntu5) precise; urgency=low
+
+  * Add missing files. (LP: #972019, LP: #971981, LP: #960731) 
+
+ -- Chuck Short <[e-mail]>  Mon, 02 Apr 2012 20:29:29 -0400
+
+quantum (2012.1~rc1-0ubuntu4) precise; urgency=low
+
+  * Make quantum installable again (LP: #965551):
+    - debian/control: quantum-server depends on quantum-common.
+    - debian/control: Add python-quantumclient dependency.
+    - debian/upstart: Rename and update upstart job.
+    - Fix typos in debian/quantum-common.postinst.
+
+ -- Chuck Short <[e-mail]>  Fri, 30 Mar 2012 14:14:42 -0400
+
+quantum (2012.1~rc1-0ubuntu3) precise; urgency=low
+
+  * debian/control: Fix spelling typos. (LP: #960713) 
+
+ -- Paolo Rotolo <[e-mail]>  Fri, 23 Mar 2012 21:35:54 +0100
+
+quantum (2012.1~rc1-0ubuntu2) precise; urgency=low
+
+  * debian/control: Fix spelling typos.
+  * debian/upstart: Fix typo in upstart job
+  * debian/control: Rename quantum to quantum-server again.
+  * debian/control: Fix empty plugins.
+  * debian/upstart: use start-stop-daemon in upstart job.
+  * debian/patches/fix-namespace.patch: Fix namespace patch
+  * debian/control: Update vcs info. (LP: #960690)
+
+ -- Chuck Short <[e-mail]>  Tue, 20 Mar 2012 13:58:24 -0400
+
+quantum (2012.1~rc1~20120316.764-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+  * debian/watch: Watch correct URL
+
+ -- Adam Gandelman <[e-mail]>  Fri, 16 Mar 2012 12:04:48 -0700
+
+quantum (2012.1~e4-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/rules: Take in account the new build changes.
+  * debian/quantum-server.install: Install the right files due to 
+    build changes.
+  * Client no longer is a part of quantum.
+  * debian/control: Add python-lxml
+  * Add ryu and niciria plugins.
+  * debian/rules: Run right tests script.
+
+ -- Chuck Short <[e-mail]>  Mon, 05 Mar 2012 09:47:22 -0500
+
+quantum (2012.1~e2+git20120112-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/rules: 
+    - Fix git snapshot creation.
+    - Fix running test suite during the build.
+  * debian/control: Add adduser for quantum-server.
+  * debian/quantum-plugin-{cisco,openvswitch}.install: Install
+    everything needed for the plugins.
+
+ -- Chuck Short <[e-mail]>  Thu, 12 Jan 2012 04:19:33 -0500
+
+quantum (2012.1~e2-0ubuntu2) precise; urgency=low
+
+  * debian/control: Build for architecture all. 
+
+ -- Chuck Short <[e-mail]>  Mon, 19 Dec 2011 10:28:16 -0500
+
+quantum (2012.1~e2-0ubuntu1) precise; urgency=low
+
+  * New upstream release. 
+  * debian/rules: Add alternate get-orig-source.
+  * debian/patches/fix-version.patch: Removed no longer needed.
+  * Fix lintian warnings.
+
+ -- Chuck Short <[e-mail]>  Fri, 16 Dec 2011 15:26:41 -0500
+
+quantum (2012.1~e2~20111209.f8152-0ubuntu1) precise; urgency=low
+
+  * New upstream release.
+  * debian/rules, debian/README.Source: Add support fo generating
+    new tarballs from git since tarball snapshots are not available
+    from jenkins yet.
+  * debian/rules: Update for new build system.
+  * debian/rules: Clean up files when running clean.
+  * debian/quantum-server.install, debian/quantum-server.dirs, 
+    debian/quantum-plugins.*: Update for build system changes.
+  * debian/quantum-server.postinst: Fix user creation.
+  * debian/rules: Enable testsuite when building.
+  * Fix lintian errors (LP: #899352)
+  * debian/patches/fix-quantum-version.patch: Fix generating *.pyc
+    when trying to build.
+
+ -- Chuck Short <[e-mail]>  Fri, 09 Dec 2011 15:31:35 -0500
+
+quantum (2012.1~e1-0ubuntu1) precise; urgency=low
+
+  * Initial release.
+
+ -- Chuck Short <[e-mail]>  Fri, 18 Nov 2011 15:29:53 -0500
 
=== added file 'debian/compat'
--- debian/compat	1970-01-01 00:00:00 +0000
+++ debian/compat	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+8
 
=== added file 'debian/control'
--- debian/control	1970-01-01 00:00:00 +0000
+++ debian/control	2014-02-21 16:49:36 +0000
@@ -0,0 +1,667 @@
+Source: neutron
+Section: net
+Priority: optional
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Chuck Short <[e-mail]>
+Build-Depends: debhelper (>= 8.0.0), python-all (>= 2.6)
+Build-Depends-Indep:
+ alembic (>= 0.4.1),
+ python-amqplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
+ python-babel,
+ python-cliff (>= 1.4),
+ python-configobj,
+ python-coverage,
+ python-d2to1,
+ python-eventlet (>= 0.13.0),
+ python-fixtures (>= 0.3.12),
+ python-greenlet (>= 0.3.2),
+ python-httplib2,
+ python-iso8601,
+ python-jinja2,
+ python-jsonrpclib,
+ python-keystoneclient (>= 1:0.2.0),
+ python-kombu (>= 2.5.12),
+ python-lxml,
+ python-mock (>= 1.0b1),
+ python-mox,
+ python-netaddr,
+ python-neutronclient (>= 1:2.2.3),
+ python-novaclient (>= 2.12.0),
+ python-oslo.config (>= 1:1.2.0a3),
+ python-paste,
+ python-pastedeploy,
+ python-pbr (>= 0.5.21),
+ python-psutil (>= 0.6.1),
+ python-pyudev,
+ python-requests (>= 1.1),
+ python-routes,
+ python-setuptools,
+ python-simplejson,
+ python-six,
+ python-sqlalchemy,
+ python-stevedore (>= 0.10),
+ python-testtools (>= 0.9.32),
+ python-webob,
+ python-webtest,
+ subunit,
+ testrepository ( >= 0.0.17)
+XS-Python-Version: >= 2.6
+Standards-Version: 3.9.4
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-server-dev/neutron/icehouse/files
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-server-dev/neutron/icehouse
+XS-Testsuite: autopkgtest
+
+Package: neutron-server
+Architecture: all
+Depends:
+ adduser,
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-server ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-server  ( << 1:2013.2~b2-0ubuntu1~ )
+Recommends: neutron-plugin-ml2
+Description: Neutron is a virtual network service for Openstack - server
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Neutron server
+
+Package: neutron-common
+Architecture: all
+Depends:
+ adduser,
+ python-neutron (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends}
+Breaks: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-common ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - common
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the common files.
+
+Package: neutron-plugin-cisco
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-cisco ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Cisco plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Cisco plugin.
+
+Package: neutron-plugin-nec
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-nec ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - NEC plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the NEC plugin.
+
+Package: neutron-plugin-nec-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ neutron-plugin-nec,
+ openvswitch-switch,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-nec-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - NEC plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the NEC plugin agent.
+
+Package: neutron-plugin-bigswitch
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-bigswitch ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - BigSwitch plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the BigSwitch plugin.
+
+Package: neutron-plugin-hyperv
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-hyperv ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Hyper-V plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Hyper-V plugin.
+
+Package: neutron-plugin-brocade
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-brocade ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Brocade plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Brocade plugin.
+
+Package: neutron-plugin-plumgrid
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-plumgrid ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - PLUMgrid plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the PLUMgrid plugin.
+
+Package: neutron-plugin-metaplugin
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-metaplugin ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Metaplugin plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Metaplugin plugin.
+
+Package: neutron-plugin-nicira
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-nicira ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Nicira plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Nicira NVP plugin
+
+Package: neutron-l3-agent
+Architecture: all
+Depends:
+ iputils-arping,
+ neutron-common (= ${source:Version}),
+ neutron-metadata-agent (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-l3-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - l3 agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the layer 3 routing agent.
+
+Package: neutron-dhcp-agent
+Architecture: all
+Depends:
+ dnsmasq-base,
+ dnsmasq-utils,
+ neutron-common (= ${source:Version}),
+ neutron-metadata-agent (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-dhcp-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - DHCP agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the DHCP agent.
+
+Package: neutron-metadata-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-metadata-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - metadata agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the metadata proxy agent.
+
+Package: neutron-lbaas-agent
+Architecture: all
+Depends:
+ haproxy,
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-lbaas-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-lbass-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - LBaaS agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Load Balancing as-a Service (LBaaS) agent.
+
+Package: python-neutron
+Architecture: all
+Section: python
+Depends:
+ alembic (>= 0.6.0),
+ python-amqplib (>= 0.6.1),
+ python-anyjson (>= 0.3.3),
+ python-babel,
+ python-eventlet (>= 0.13.0),
+ python-greenlet (>= 0.3.12),
+ python-httplib2,
+ python-iso8601,
+ python-jinja2,
+ python-keystoneclient (>= 1:0.3.0),
+ python-kombu (>= 2.5.12),
+ python-netaddr,
+ python-neutronclient (>= 1:2.2.3),
+ python-oslo.config (>= 1:1.2.0a3),
+ python-paste,
+ python-pastedeploy,
+ python-psutil (>= 0.6.1),
+ python-requests (>= 1.1),
+ python-routes,
+ python-six,
+ python-sqlalchemy (>= 0.8.2),
+ python-stevedore (>= 0.10),
+ python-webob,
+ ${misc:Depends},
+ ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Breaks: python-quantum ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: python-quantum ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virutal network service for Openstack - Python library
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Python library.
+
+Package: neutron-plugin-openvswitch
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-openvswitch ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Open vSwitch plugin.
+
+Package: neutron-plugin-ml2
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - ML2 plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Modular Layer 2 plugin.
+
+Package: neutron-plugin-openvswitch-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ neutron-plugin-ml2,
+ openvswitch-switch,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-openvswitch-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Open vSwitch plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Open vSwitch plugin agent.
+
+Package: neutron-plugin-linuxbridge
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-linuxbridge ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - linuxbridge plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the linuxbridge plugin.
+
+Package: neutron-plugin-linuxbridge-agent
+Architecture: all
+Depends:
+ bridge-utils,
+ neutron-common (= ${source:Version}),
+ neutron-plugin-linuxbridge,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-linuxbirdge-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-linuxbridge-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - linuxbridge plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the linuxbridge plugin agent.
+
+Package: neutron-plugin-ryu
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-ryu ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - RYU plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the RYU plugin.
+
+Package: neutron-plugin-ryu-agent
+Architecture: all
+Depends:
+ neutron-common (= ${source:Version}),
+ neutron-plugin-ryu,
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-ryu-agent ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - RYU plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the RYU plugin agent.
+
+Package: neutron-plugin-midonet
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ )
+Replaces: quantum-plugin-midonet ( << 1:2013.2~b2-0ubuntu1~ )
+Description: Neutron is a virtual network service for Openstack - Midonet plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Midonet plugin.
+
+Package: neutron-plugin-mlnx-agent
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - mlnx plugin agent
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the mlnx plugin agent.
+
+Package: neutron-plugin-vpn-agent
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - vpn plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the vpn plugin.
+
+Package: neutron-plugin-metering-agent
+Architecture: all
+Provides: neutron-plugin
+Depends:
+ neutron-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Neutron is a virtual network service for Openstack - metering plugin
+ Neutron is a virtual network service for Openstack, and a part of
+ Netstack. Just like OpenStack Nova provides an API to dynamically
+ request and configure virtual servers, Neutron provides an API to
+ dynamically request and configure virtual networks. These networks
+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
+ from Nova VMs). The Neutron API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the metering plugin.
 
=== added file 'debian/copyright'
--- debian/copyright	1970-01-01 00:00:00 +0000
+++ debian/copyright	2014-02-21 16:49:36 +0000
@@ -0,0 +1,37 @@
+Format: http://dep.debian.net/deps/dep5
+Upstream-Name: neutron
+Source: http://github.com/openstack/neutron
+
+Files: *
+Copyright: 2011 OpenStack, LLC.
+		   2011 Cisco Systems
+		   2011 Nicira Networks
+           2011 Citrix Systems
+License: Apache-2
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+    http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/Apache-2.0'
+
+Files: tools/rfc.sh
+Copyright: Copyright (c) 2010-2011 Gluster, Inc
+License: GPL-v3
+                     GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+ .
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+ .
+ On Debian-based systems the full text of the Apache version 2.0 license
+ can be found in `/usr/share/common-licenses/GPL-3'
 
=== added directory 'debian/cron.d'
=== added file 'debian/cron.d/neutron-dhcp-agent-netns-cleanup'
--- debian/cron.d/neutron-dhcp-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-dhcp-agent-netns-cleanup	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+# vim: set filetype=crontab:
+# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# DHCP agent.
+30 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini >/dev/null 2>&1; fi
 
=== added file 'debian/cron.d/neutron-l3-agent-netns-cleanup'
--- debian/cron.d/neutron-l3-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-l3-agent-netns-cleanup	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+# vim: set filetype=crontab:
+# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# L3 agent.
+0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini >/dev/null 2>&1; fi
 
=== added file 'debian/cron.d/neutron-lbaas-agent-netns-cleanup'
--- debian/cron.d/neutron-lbaas-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/neutron-lbaas-agent-netns-cleanup	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+# vim: set filetype=crontab:
+# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# L3 agent.
+0 * * * * neutron if [ -x /usr/bin/neutron-netns-cleanup ] ; then /usr/bin/neutron-netns-cleanup --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/lbaas_agent.ini >/dev/null 2>&1; fi
 
=== added directory 'debian/mans'
=== added file 'debian/mans/neutron-linuxbridge-agent.8'
--- debian/mans/neutron-linuxbridge-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-linuxbridge-agent.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron\-linuxbridge\-agent 8
+.SH NAME
+neutron\-linuxbridge\-agent \- OpenStack Virtual network service \- linuxbridge agent
+
+.SH SYNOPSIS
+.B neutron\-linuxbridge\-agent
+
+.SH DESCRIPTION
+.B neutron\-linuxbridge\-agent
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/mans/neutron-nec-agent.8'
--- debian/mans/neutron-nec-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-nec-agent.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron\-nec\-agent 8
+.SH NAME
+neutron\-nec\-agent \- OpenStack Virtual network service \- nec agent
+
+.SH SYNOPSIS
+.B neutron\-nec\-agent
+
+.SH DESCRIPTION
+.B neutron\-nec\-agent
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/mans/neutron-openvswitch-agent.8'
--- debian/mans/neutron-openvswitch-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-openvswitch-agent.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron\-openvswitch\-agent 8
+.SH NAME
+neutron\-openvswitch\-agent \- OpenStack Virtual network service \- openvswitch agent
+
+.SH SYNOPSIS
+.B neutron\-openvswitch\-agent
+
+.SH DESCRIPTION
+.B neutron\-openvswitch\-agent
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/mans/neutron-rootwrap.8'
--- debian/mans/neutron-rootwrap.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-rootwrap.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron-rootwrap 8
+.SH NAME
+neutron-rootwrap \- OpenStack Virtual network service \- sudo helper
+
+.SH SYNOPSIS
+.B neutron-rootwrap
+
+.SH DESCRIPTION
+.B neutron-rootwrap
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/mans/neutron-ryu-agent.8'
--- debian/mans/neutron-ryu-agent.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-ryu-agent.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron\-ryu\-agent 8
+.SH NAME
+neutron\-ryu\-agent \- OpenStack Virtual network service \- ryu agent
+
+.SH SYNOPSIS
+.B neutron\-ryu\-agent
+
+.SH DESCRIPTION
+.B neutron\-ryu\-agent
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/mans/neutron-server.8'
--- debian/mans/neutron-server.8	1970-01-01 00:00:00 +0000
+++ debian/mans/neutron-server.8	2014-02-21 16:49:36 +0000
@@ -0,0 +1,11 @@
+.TH neutron-server 8
+.SH NAME
+neutron-server \- OpenStack Virtual network service \- server
+
+.SH SYNOPSIS
+.B neutron-server
+
+.SH DESCRIPTION
+.B neutron-server
+
+This man page is a stub. Please contribute.
 
=== added file 'debian/neutron-common.dirs'
--- debian/neutron-common.dirs	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.dirs	2014-02-21 16:49:36 +0000
@@ -0,0 +1,5 @@
+var/log/neutron
+var/lib/neutron
+etc/neutron
+etc/neutron/rootwrap.d
+etc/neutron/plugins
 
=== added file 'debian/neutron-common.install'
--- debian/neutron-common.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,14 @@
+debian/neutron_sudoers etc/sudoers.d
+etc/api-paste.ini etc/neutron
+etc/neutron.conf etc/neutron
+etc/neutron/rootwrap.d/debug.filters etc/neutron/rootwrap.d
+etc/neutron/rootwrap.d/iptables-firewall.filters etc/neutron/rootwrap.d
+etc/policy.json etc/neutron
+etc/rootwrap.conf etc/neutron
+usr/bin/neutron-db-manage usr/bin
+usr/bin/neutron-debug usr/bin
+usr/bin/neutron-netns-cleanup usr/bin
+usr/bin/neutron-ovs-cleanup usr/bin
+usr/bin/neutron-rootwrap usr/bin
+usr/bin/neutron-rootwrap-xen-dom0 usr/bin
+usr/bin/neutron-usage-audit usr/bin
 
=== added file 'debian/neutron-common.postinst'
--- debian/neutron-common.postinst	1970-01-01 00:00:00 +0000
+++ debian/neutron-common.postinst	2014-02-21 16:49:36 +0000
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e 
+
+if [ "$1" = "configure" ]
+then
+	if ! getent group neutron > /dev/null 2>&1
+	then
+		addgroup --system neutron >/dev/null
+	fi
+	if ! getent passwd neutron > /dev/null 2>&1
+	then
+		adduser --system --home /var/lib/neutron --ingroup neutron --no-create-home --shell /bin/false neutron
+	fi
+	chown -R neutron:neutron /var/lib/neutron/
+
+	chown -R neutron:adm /var/log/neutron/ 
+	chmod 0750 /var/log/neutron/
+
+    chown -R root:neutron /etc/neutron/
+    chmod 0750 /etc/neutron/
+	chown root:root /etc/neutron/rootwrap.conf
+	chown -R root:root /etc/neutron/rootwrap.d
+	chmod 0755 /etc/neutron/rootwrap.d
+
+	if [ -f /etc/sudoers.d/neutron_sudoers ] ; then
+		chmod 0440 /etc/sudoers.d/neutron_sudoers
+	fi
+fi
+
+#DEBHELPER#
 
=== added file 'debian/neutron-dhcp-agent.install'
--- debian/neutron-dhcp-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+debian/cron.d/neutron-dhcp-agent-netns-cleanup etc/cron.d
+etc/dhcp_agent.ini etc/neutron
+etc/neutron/rootwrap.d/dhcp.filters etc/neutron/rootwrap.d
+usr/bin/neutron-dhcp-agent usr/bin
 
=== added file 'debian/neutron-dhcp-agent.logrotate'
--- debian/neutron-dhcp-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/dhcp-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-dhcp-agent.upstart'
--- debian/neutron-dhcp-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-dhcp-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,22 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron DHCP Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+  # Check to see if openvswitch plugin in use by checking
+  # status of cleanup upstart configuration
+  if status neutron-ovs-cleanup; then
+    start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-dhcp-agent
+  fi
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-dhcp-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/dhcp_agent.ini --log-file=/var/log/neutron/dhcp-agent.log
 
=== added file 'debian/neutron-l3-agent.install'
--- debian/neutron-l3-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+debian/cron.d/neutron-l3-agent-netns-cleanup etc/cron.d
+etc/l3_agent.ini etc/neutron
+etc/neutron/rootwrap.d/l3.filters etc/neutron/rootwrap.d
+usr/bin/neutron-l3-agent usr/bin
 
=== added file 'debian/neutron-l3-agent.logrotate'
--- debian/neutron-l3-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/l3-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-l3-agent.upstart'
--- debian/neutron-l3-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-l3-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,22 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron L3 Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+  # Check to see if openvswitch plugin in use by checking
+  # status of cleanup upstart configuration
+  if status neutron-ovs-cleanup; then
+    start wait-for-state WAIT_FOR=neutron-ovs-cleanup WAIT_STATE=running WAITER=neutron-l3-agent
+  fi
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-l3-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/l3_agent.ini --log-file=/var/log/neutron/l3-agent.log
 
=== added file 'debian/neutron-lbaas-agent.install'
--- debian/neutron-lbaas-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+debian/cron.d/neutron-lbaas-agent-netns-cleanup etc/cron.d
+etc/lbaas_agent.ini etc/neutron
+etc/neutron/rootwrap.d/lbaas-haproxy.filters etc/neutron/rootwrap.d
+usr/bin/neutron-lbaas-agent usr/bin
 
=== added file 'debian/neutron-lbaas-agent.logrotate'
--- debian/neutron-lbaas-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/lbaas-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-lbaas-agent.upstart'
--- debian/neutron-lbaas-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-lbaas-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,17 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron LBaaS Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-lbaas-agent -- --config-file=/etc/neutron/lbaas_agent.ini --config-file=/etc/neutron/neutron.conf --log-file=/var/log/neutron/lbaas-agent.log
 
=== added file 'debian/neutron-metadata-agent.install'
--- debian/neutron-metadata-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,3 @@
+etc/metadata_agent.ini etc/neutron
+usr/bin/neutron-metadata-agent usr/bin
+usr/bin/neutron-ns-metadata-proxy usr/bin
 
=== added file 'debian/neutron-metadata-agent.logrotate'
--- debian/neutron-metadata-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/metadata-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-metadata-agent.upstart'
--- debian/neutron-metadata-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-metadata-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron Metadata Plugin Agent"
+author "Yolanda Robla <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metadata-agent -- \
+       --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metadata_agent.ini \
+       --log-file=/var/log/neutron/metadata-agent.log
 
=== added file 'debian/neutron-plugin-bigswitch.install'
--- debian/neutron-plugin-bigswitch.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-bigswitch.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/bigswitch/* etc/neutron/plugins/bigswitch
 
=== added file 'debian/neutron-plugin-brocade.install'
--- debian/neutron-plugin-brocade.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-brocade.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/brocade/* etc/neutron/plugins/brocade
 
=== added file 'debian/neutron-plugin-cisco.install'
--- debian/neutron-plugin-cisco.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-cisco.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/cisco/* etc/neutron/plugins/cisco
 
=== added file 'debian/neutron-plugin-hyperv.install'
--- debian/neutron-plugin-hyperv.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-hyperv.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/plugins/hyperv/* etc/neutron/plugins/hyperv
+usr/bin/neutron-hyperv-agent usr/bin
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.install'
--- debian/neutron-plugin-linuxbridge-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/rootwrap.d/linuxbridge-plugin.filters etc/neutron/rootwrap.d
+usr/bin/neutron-linuxbridge-agent usr/bin
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.logrotate'
--- debian/neutron-plugin-linuxbridge-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/linuxbridge-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.manpages'
--- debian/neutron-plugin-linuxbridge-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.manpages	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-linuxbridge-agent.8
 
=== added file 'debian/neutron-plugin-linuxbridge-agent.upstart'
--- debian/neutron-plugin-linuxbridge-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,17 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron API Server"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-linuxbridge-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/linuxbridge/linuxbridge_conf.ini --log-file=/var/log/neutron/linuxbridge-agent.log
 
=== added file 'debian/neutron-plugin-linuxbridge.install'
--- debian/neutron-plugin-linuxbridge.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-linuxbridge.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/linuxbridge/* etc/neutron/plugins/linuxbridge
 
=== added file 'debian/neutron-plugin-metaplugin.install'
--- debian/neutron-plugin-metaplugin.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-metaplugin.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/metaplugin/* etc/neutron/plugins/metaplugin
 
=== added file 'debian/neutron-plugin-metering-agent.install'
--- debian/neutron-plugin-metering-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-metering-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/metering_agent.ini etc/neutron
+usr/bin/neutron-metering-agent usr/bin
 
=== added file 'debian/neutron-plugin-metering-agent.upstart'
--- debian/neutron-plugin-metering-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-metering-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron metering agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-metering-agent -- \
+       --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/metering_agent.ini \
+       --log-file=/var/log/neutron/metering_agent.log
 
=== added file 'debian/neutron-plugin-midonet.install'
--- debian/neutron-plugin-midonet.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-midonet.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/midonet/* etc/neutron/plugins/midonet
 
=== added file 'debian/neutron-plugin-ml2.install'
--- debian/neutron-plugin-ml2.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ml2.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/ml2/* etc/neutron/plugins/ml2
 
=== added file 'debian/neutron-plugin-mlnx-agent.install'
--- debian/neutron-plugin-mlnx-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-mlnx-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/plugins/mlnx/* etc/neutron/plugins/mlnx
+usr/bin/neutron-mlnx-agent usr/bin
 
=== added file 'debian/neutron-plugin-mlnx-agent.upstart'
--- debian/neutron-plugin-mlnx-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-mlnx-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron MLNX Plugin Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-mlnx-agent -- \
+       --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/mlnx/mlnx_conf.ini \
+       --log-file=/var/log/neutron/mlnx_conf.log
 
=== added file 'debian/neutron-plugin-nec-agent.install'
--- debian/neutron-plugin-nec-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/rootwrap.d/nec-plugin.filters etc/neutron/rootwrap.d
+usr/bin/neutron-nec-agent usr/bin
 
=== added file 'debian/neutron-plugin-nec-agent.logrotate'
--- debian/neutron-plugin-nec-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/nec-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-nec-agent.manpages'
--- debian/neutron-plugin-nec-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.manpages	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-nec-agent.8
 
=== added file 'debian/neutron-plugin-nec-agent.upstart'
--- debian/neutron-plugin-nec-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,17 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron NEC Plugin Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-nec-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/nec/nec.ini --log-file=/var/log/neutron/nec-agent.log
 
=== added file 'debian/neutron-plugin-nec.install'
--- debian/neutron-plugin-nec.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nec.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/nec/* etc/neutron/plugins/nec
 
=== added file 'debian/neutron-plugin-nicira.install'
--- debian/neutron-plugin-nicira.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-nicira.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,3 @@
+etc/neutron/plugins/nicira/* etc/neutron/plugins/nicira
+usr/bin/neutron-check-nvp-config usr/bin
+usr/bin/neutron-check-nsx-config usr/bin
 
=== added file 'debian/neutron-plugin-openvswitch-agent.install'
--- debian/neutron-plugin-openvswitch-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/rootwrap.d/openvswitch-plugin.filters etc/neutron/rootwrap.d
+usr/bin/neutron-openvswitch-agent usr/bin
 
=== added file 'debian/neutron-plugin-openvswitch-agent.logrotate'
--- debian/neutron-plugin-openvswitch-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/openvswitch-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-openvswitch-agent.manpages'
--- debian/neutron-plugin-openvswitch-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.manpages	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-openvswitch-agent.8
 
=== added file 'debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart'
--- debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.neutron-ovs-cleanup.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,13 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron OVS cleanup"
+author "James Page <[e-mail]>"
+
+start on started openvswitch-switch
+stop on runlevel [!2345]
+
+pre-start script
+  [ ! -x /usr/bin/neutron-ovs-cleanup ] && exit 0 
+  start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ovs-cleanup -- \
+    --log-file /var/log/neutron/ovs-cleanup.log \
+    --config-file /etc/neutron/neutron.conf --verbose
+end script
 
=== added file 'debian/neutron-plugin-openvswitch-agent.upstart'
--- debian/neutron-plugin-openvswitch-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,17 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron OpenvSwitch Plugin Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345] and started neutron-ovs-cleanup
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-openvswitch-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ml2/ml2_conf.ini --log-file=/var/log/neutron/openvswitch-agent.log
 
=== added file 'debian/neutron-plugin-openvswitch.install'
--- debian/neutron-plugin-openvswitch.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-openvswitch.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/openvswitch/* etc/neutron/plugins/openvswitch
 
=== added file 'debian/neutron-plugin-plumgrid.install'
--- debian/neutron-plugin-plumgrid.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-plumgrid.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/plumgrid/* etc/neutron/plugins/plumgrid
 
=== added file 'debian/neutron-plugin-ryu-agent.install'
--- debian/neutron-plugin-ryu-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/neutron/rootwrap.d/ryu-plugin.filters etc/neutron/rootwrap.d
+usr/bin/neutron-ryu-agent usr/bin
 
=== added file 'debian/neutron-plugin-ryu-agent.logrotate'
--- debian/neutron-plugin-ryu-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/ryu-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-plugin-ryu-agent.manpages'
--- debian/neutron-plugin-ryu-agent.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.manpages	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+debian/mans/neutron-ryu-agent.8
 
=== added file 'debian/neutron-plugin-ryu-agent.upstart'
--- debian/neutron-plugin-ryu-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,17 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron RYU Plugin Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-ryu-agent -- --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/plugins/ryu/ryu.ini --log-file=/var/log/neutron/ryu-agent.log
 
=== added file 'debian/neutron-plugin-ryu.install'
--- debian/neutron-plugin-ryu.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-ryu.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+etc/neutron/plugins/ryu/* etc/neutron/plugins/ryu
 
=== added file 'debian/neutron-plugin-vpn-agent.install'
--- debian/neutron-plugin-vpn-agent.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-vpn-agent.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+etc/vpn_agent.ini etc/neutron
+usr/bin/neutron-vpn-agent usr/bin
 
=== added file 'debian/neutron-plugin-vpn-agent.upstart'
--- debian/neutron-plugin-vpn-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-plugin-vpn-agent.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron vpn Plugin Agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-vpn-agent -- \
+       --config-file=/etc/neutron/neutron.conf --config-file=/etc/neutron/vpn_agent.ini \
+       --log-file=/var/log/neutron/vpn_agent.log
 
=== added file 'debian/neutron-server.default'
--- debian/neutron-server.default	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.default	2014-02-21 16:49:36 +0000
@@ -0,0 +1,5 @@
+# defaults for neutron-server
+
+# path to config file corresponding to the core_plugin specified in
+# neutron.conf
+NEUTRON_PLUGIN_CONFIG="/etc/neutron/plugins/ml2/ml2_conf.ini"
 
=== added file 'debian/neutron-server.install'
--- debian/neutron-server.install	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+usr/bin/neutron-server usr/bin
 
=== added file 'debian/neutron-server.logrotate'
--- debian/neutron-server.logrotate	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.logrotate	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+/var/log/neutron/server.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/neutron-server.manpages'
--- debian/neutron-server.manpages	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.manpages	2014-02-21 16:49:36 +0000
@@ -0,0 +1,2 @@
+debian/mans/neutron-server.8
+debian/mans/neutron-rootwrap.8
 
=== added file 'debian/neutron-server.upstart'
--- debian/neutron-server.upstart	1970-01-01 00:00:00 +0000
+++ debian/neutron-server.upstart	2014-02-21 16:49:36 +0000
@@ -0,0 +1,23 @@
+# vim:set ft=upstart ts=2 et:
+description "Neutron API Server"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+respawn
+
+chdir /var/run
+
+pre-start script
+  mkdir -p /var/run/neutron
+  chown neutron:root /var/run/neutron
+end script
+
+script
+  [ -r /etc/default/neutron-server ] && . /etc/default/neutron-server
+  [ -r "$NEUTRON_PLUGIN_CONFIG" ] && CONF_ARG="--config-file $NEUTRON_PLUGIN_CONFIG"
+  exec start-stop-daemon --start --chuid neutron --exec /usr/bin/neutron-server -- \
+    --config-file /etc/neutron/neutron.conf \
+    --log-file /var/log/neutron/server.log $CONF_ARG
+end script
 
=== added file 'debian/neutron_sudoers'
--- debian/neutron_sudoers	1970-01-01 00:00:00 +0000
+++ debian/neutron_sudoers	2014-02-21 16:49:36 +0000
@@ -0,0 +1,3 @@
+Defaults:neutron !requiretty
+
+neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
 
=== added directory 'debian/patches'
=== added file 'debian/patches/disable-failing-cisco-test.patch'
--- debian/patches/disable-failing-cisco-test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-failing-cisco-test.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,25 @@
+Description: Skip failing cisco test
+ ======================================================================
+ FAIL: neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin
+ neutron.tests.unit.ml2.drivers.test_cisco_mech.TestCiscoBasicGet.test_single_get_admin
+ ----------------------------------------------------------------------
+ _StringException
+
+ ----------------------------------------------------------------------
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262195
+
+--- a/neutron/tests/unit/ml2/drivers/test_cisco_mech.py
++++ b/neutron/tests/unit/ml2/drivers/test_cisco_mech.py
+@@ -147,8 +147,8 @@ class CiscoML2MechanismTestCase(test_db_
+ 
+ class TestCiscoBasicGet(CiscoML2MechanismTestCase,
+                         test_db_plugin.TestBasicGet):
+-
+-    pass
++    def test_single_get_admin(self):
++        pass
+ 
+ 
+ class TestCiscoV2HTTPResponse(CiscoML2MechanismTestCase,
 
=== added file 'debian/patches/disable-failing-metaplugin-tests.patch'
--- debian/patches/disable-failing-metaplugin-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-failing-metaplugin-tests.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,67 @@
+Description: Disable failing metaplugin tests
+ Some metaplugin tests are currently failing in Ubuntu; patch
+ then out until they get resolved in full.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262174
+
+--- a/neutron/tests/unit/metaplugin/test_basic.py
++++ b/neutron/tests/unit/metaplugin/test_basic.py
+@@ -43,7 +43,14 @@ class TestMetaBasicGet(test_plugin.TestB
+ 
+ class TestMetaV2HTTPResponse(test_plugin.TestV2HTTPResponse,
+                              MetaPluginV2DBTestCase):
+-    pass
++    def test_list_with_fields_noadmin(self):
++        pass
++
++    def test_list_with_fields(self):
++        pass
++
++    def test_list_with_fields_noadmin_and_policy_field(self):
++        pass
+ 
+ 
+ class TestMetaPortsV2(test_plugin.TestPortsV2,
+@@ -53,7 +60,30 @@ class TestMetaPortsV2(test_plugin.TestPo
+ 
+ class TestMetaNetworksV2(test_plugin.TestNetworksV2,
+                          MetaPluginV2DBTestCase):
+-    pass
++
++    def test_list_networks_without_pk_in_fields_pagination_emulated(self):
++        pass
++
++    def test_list_shared_networks_with_non_admin_user(self):
++        pass
++
++    def test_list_networks_with_pagination_emulated(self):
++        pass
++
++    def test_list_networks_with_sort_emulated(self):
++        pass
++
++    def test_list_networks_with_pagination_reverse_emulated(self):
++        pass
++
++    def test_list_networks_with_parameters(self):
++        pass
++
++    def test_list_networks_with_fields(self):
++        pass
++
++    def test_list_networks(self):
++        pass
+ 
+ 
+ class TestMetaSubnetsV2(test_plugin.TestSubnetsV2,
+--- a/neutron/tests/unit/metaplugin/test_metaplugin.py
++++ b/neutron/tests/unit/metaplugin/test_metaplugin.py
+@@ -144,6 +144,7 @@ class MetaNeutronPluginV2Test(base.BaseT
+         return data
+ 
+     def test_create_delete_network(self):
++        return
+         network1 = self._fake_network('fake1')
+         ret1 = self.plugin.create_network(self.context, network1)
+         self.assertEqual('fake1', ret1[FLAVOR_NETWORK])
 
=== added file 'debian/patches/disable-udev-tests.patch'
--- debian/patches/disable-udev-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/disable-udev-tests.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1008 @@
+Description: Disable udev tests
+ udev is not always avaliable in Ubuntu buildds; skip tests that
+ want to use this feature.
+Author: Chuck Short <[e-mail]>
+Fowarded: not-needed
+diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py
+--- neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py	2014-01-23 10:13:25.000000000 -0500
++++ neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py	2014-02-03 08:53:04.409255073 -0500
+@@ -46,6 +46,7 @@ class FakeIpDevice(object):
+ class TestLinuxBridge(base.BaseTestCase):
+ 
+     def setUp(self):
++        self.skipTest("udev not consistently available in Ubuntu buildds")
+         super(TestLinuxBridge, self).setUp()
+         self.addCleanup(cfg.CONF.reset)
+         interface_mappings = {'physnet1': 'eth1'}
+@@ -109,6 +110,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+         self.get_mac.return_value = '00:00:00:00:00:01'
+ 
+     def test_update_devices_failed(self):
++        self.skipTest("udev not consistently available in Ubuntu buildds")
+         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
+                                                                      0,
+                                                                      None)
+@@ -130,6 +132,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+                 self.assertEqual(3, log.call_count)
+ 
+     def test_process_network_devices_failed(self):
++        self.skipTest("udev not consistently available in Ubuntu buildds")
+         device_info = {'current': [1, 2, 3]}
+         agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
+                                                                      0,
+@@ -158,6 +161,7 @@ class TestLinuxBridgeAgent(base.BaseTest
+ 
+ class TestLinuxBridgeManager(base.BaseTestCase):
+     def setUp(self):
++        self.skipTest("udev not consistently available in Ubuntu buildds")
+         super(TestLinuxBridgeManager, self).setUp()
+         self.interface_mappings = {'physnet1': 'eth1'}
+         self.root_helper = cfg.CONF.AGENT.root_helper
+@@ -667,6 +671,7 @@ class TestLinuxBridgeManager(base.BaseTe
+ 
+ class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
+     def setUp(self):
++        self.skipTest("udev not  consistently available in Ubuntu buildds")
+         cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN')
+         self.addCleanup(cfg.CONF.reset)
+         super(TestLinuxBridgeRpcCallbacks, self).setUp()
+diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig
+--- neutron-2014.1.b2.orig/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig	1969-12-31 19:00:00.000000000 -0500
++++ neutron-2014.1.b2/neutron/tests/unit/linuxbridge/test_lb_neutron_agent.py.orig	2014-01-23 10:13:25.000000000 -0500
+@@ -0,0 +1,956 @@
++# vim: tabstop=4 shiftwidth=4 softtabstop=4
++
++# Copyright (c) 2012 OpenStack Foundation.
++#
++#    Licensed under the Apache License, Version 2.0 (the "License"); you may
++#    not use this file except in compliance with the License. You may obtain
++#    a copy of the License at
++#
++#         http://www.apache.org/licenses/LICENSE-2.0
++#
++#    Unless required by applicable law or agreed to in writing, software
++#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
++#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
++#    License for the specific language governing permissions and limitations
++#    under the License.
++
++import contextlib
++import os
++
++import mock
++from oslo.config import cfg
++import testtools
++
++from neutron.agent.linux import ip_lib
++from neutron.agent.linux import utils
++from neutron.common import constants
++from neutron.openstack.common.rpc import common as rpc_common
++from neutron.plugins.common import constants as p_const
++from neutron.plugins.linuxbridge.agent import linuxbridge_neutron_agent
++from neutron.plugins.linuxbridge.common import constants as lconst
++from neutron.tests import base
++
++LOCAL_IP = '192.168.0.33'
++
++
++class FakeIpLinkCommand(object):
++    def set_up(self):
++        pass
++
++
++class FakeIpDevice(object):
++    def __init__(self):
++        self.link = FakeIpLinkCommand()
++
++
++class TestLinuxBridge(base.BaseTestCase):
++
++    def setUp(self):
++        super(TestLinuxBridge, self).setUp()
++        self.addCleanup(cfg.CONF.reset)
++        interface_mappings = {'physnet1': 'eth1'}
++        root_helper = cfg.CONF.AGENT.root_helper
++
++        self.linux_bridge = linuxbridge_neutron_agent.LinuxBridgeManager(
++            interface_mappings, root_helper)
++
++    def test_ensure_physical_in_bridge_invalid(self):
++        result = self.linux_bridge.ensure_physical_in_bridge('network_id',
++                                                             p_const.TYPE_VLAN,
++                                                             'physnetx',
++                                                             7)
++        self.assertFalse(result)
++
++    def test_ensure_physical_in_bridge_flat(self):
++        with mock.patch.object(self.linux_bridge,
++                               'ensure_flat_bridge') as flat_bridge_func:
++            self.linux_bridge.ensure_physical_in_bridge(
++                'network_id', p_const.TYPE_FLAT, 'physnet1', None)
++        self.assertTrue(flat_bridge_func.called)
++
++    def test_ensure_physical_in_bridge_vlan(self):
++        with mock.patch.object(self.linux_bridge,
++                               'ensure_vlan_bridge') as vlan_bridge_func:
++            self.linux_bridge.ensure_physical_in_bridge(
++                'network_id', p_const.TYPE_VLAN, 'physnet1', 7)
++        self.assertTrue(vlan_bridge_func.called)
++
++    def test_ensure_physical_in_bridge_vxlan(self):
++        self.linux_bridge.vxlan_mode = lconst.VXLAN_UCAST
++        with mock.patch.object(self.linux_bridge,
++                               'ensure_vxlan_bridge') as vxlan_bridge_func:
++            self.linux_bridge.ensure_physical_in_bridge(
++                'network_id', 'vxlan', 'physnet1', 7)
++        self.assertTrue(vxlan_bridge_func.called)
++
++
++class TestLinuxBridgeAgent(base.BaseTestCase):
++
++    LINK_SAMPLE = [
++        '1: lo: <LOOPBACK,UP,LOWER_UP> mtu 16436 qdisc noqueue \\'
++        'state UNKNOWN \\'
++        'link/loopback 00:00:00:00:00:00 brd 00:00:00:00:00:00',
++        '2: eth77: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 \\'
++        'qdisc mq state UP qlen 1000\    link/ether \\'
++        'cc:dd:ee:ff:ab:cd brd ff:ff:ff:ff:ff:ff']
++
++    def setUp(self):
++        super(TestLinuxBridgeAgent, self).setUp()
++        cfg.CONF.set_override('rpc_backend',
++                              'neutron.openstack.common.rpc.impl_fake')
++        self.execute_p = mock.patch.object(ip_lib.IPWrapper, '_execute')
++        self.execute = self.execute_p.start()
++        self.addCleanup(self.execute_p.stop)
++        self.execute.return_value = '\n'.join(self.LINK_SAMPLE)
++        self.get_mac_p = mock.patch('neutron.agent.linux.utils.'
++                                    'get_interface_mac')
++        self.get_mac = self.get_mac_p.start()
++        self.addCleanup(self.get_mac_p.stop)
++        self.get_mac.return_value = '00:00:00:00:00:01'
++
++    def test_update_devices_failed(self):
++        agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
++                                                                     0,
++                                                                     None)
++        raise_exception = [0]
++
++        def info_mock(msg):
++            if raise_exception[0] < 2:
++                raise_exception[0] += 1
++            else:
++                raise RuntimeError()
++        with mock.patch.object(agent.br_mgr,
++                               "update_devices") as update_devices:
++            update_devices.side_effect = RuntimeError
++            with mock.patch.object(linuxbridge_neutron_agent.LOG,
++                                   'info') as log:
++                log.side_effect = info_mock
++                with testtools.ExpectedException(RuntimeError):
++                    agent.daemon_loop()
++                self.assertEqual(3, log.call_count)
++
++    def test_process_network_devices_failed(self):
++        device_info = {'current': [1, 2, 3]}
++        agent = linuxbridge_neutron_agent.LinuxBridgeNeutronAgentRPC({},
++                                                                     0,
++                                                                     None)
++        raise_exception = [0]
++
++        def info_mock(msg):
++            if raise_exception[0] < 2:
++                raise_exception[0] += 1
++            else:
++                raise RuntimeError()
++
++        with mock.patch.object(agent.br_mgr,
++                               "update_devices") as update_devices:
++            update_devices.side_effect = device_info
++            with contextlib.nested(
++                mock.patch.object(linuxbridge_neutron_agent.LOG, 'info'),
++                mock.patch.object(agent, 'process_network_devices')
++            ) as (log, process_network_devices):
++                log.side_effect = info_mock
++                process_network_devices.side_effect = RuntimeError
++                with testtools.ExpectedException(RuntimeError):
++                    agent.daemon_loop()
++                self.assertEqual(3, log.call_count)
++
++
++class TestLinuxBridgeManager(base.BaseTestCase):
++    def setUp(self):
++        super(TestLinuxBridgeManager, self).setUp()
++        self.interface_mappings = {'physnet1': 'eth1'}
++        self.root_helper = cfg.CONF.AGENT.root_helper
++
++        self.lbm = linuxbridge_neutron_agent.LinuxBridgeManager(
++            self.interface_mappings, self.root_helper)
++
++    def test_device_exists(self):
++        with mock.patch.object(utils, 'execute') as execute_fn:
++            self.assertTrue(self.lbm.device_exists("eth0"))
++            execute_fn.side_effect = RuntimeError()
++            self.assertFalse(self.lbm.device_exists("eth0"))
++
++    def test_interface_exists_on_bridge(self):
++        with mock.patch.object(os, 'listdir') as listdir_fn:
++            listdir_fn.return_value = ["abc"]
++            self.assertTrue(
++                self.lbm.interface_exists_on_bridge("br-int", "abc")
++            )
++            self.assertFalse(
++                self.lbm.interface_exists_on_bridge("br-int", "abd")
++            )
++
++    def test_get_bridge_name(self):
++        nw_id = "123456789101112"
++        self.assertEqual(self.lbm.get_bridge_name(nw_id),
++                         "brq" + nw_id[0:11])
++        nw_id = ""
++        self.assertEqual(self.lbm.get_bridge_name(nw_id),
++                         "brq")
++
++    def test_get_subinterface_name(self):
++        self.assertEqual(self.lbm.get_subinterface_name("eth0", "0"),
++                         "eth0.0")
++        self.assertEqual(self.lbm.get_subinterface_name("eth0", ""),
++                         "eth0.")
++
++    def test_get_tap_device_name(self):
++        if_id = "123456789101112"
++        self.assertEqual(self.lbm.get_tap_device_name(if_id),
++                         "tap" + if_id[0:11])
++        if_id = ""
++        self.assertEqual(self.lbm.get_tap_device_name(if_id),
++                         "tap")
++
++    def test_get_vxlan_device_name(self):
++        vn_id = constants.MAX_VXLAN_VNI
++        self.assertEqual(self.lbm.get_vxlan_device_name(vn_id),
++                         "vxlan-" + str(vn_id))
++        self.assertIsNone(self.lbm.get_vxlan_device_name(vn_id + 1))
++
++    def test_get_all_neutron_bridges(self):
++        br_list = ["br-int", "brq1", "brq2", "br-ex"]
++        with mock.patch.object(os, 'listdir') as listdir_fn:
++            listdir_fn.return_value = br_list
++            self.assertEqual(self.lbm.get_all_neutron_bridges(),
++                             br_list[1:3])
++            self.assertTrue(listdir_fn.called)
++
++    def test_get_interfaces_on_bridge(self):
++        with contextlib.nested(
++            mock.patch.object(utils, 'execute'),
++            mock.patch.object(os, 'listdir')
++        ) as (exec_fn, listdir_fn):
++            listdir_fn.return_value = ["qbr1"]
++            self.assertEqual(self.lbm.get_interfaces_on_bridge("br0"),
++                             ["qbr1"])
++
++    def test_get_tap_devices_count(self):
++        with mock.patch.object(os, 'listdir') as listdir_fn:
++            listdir_fn.return_value = ['tap2101', 'eth0.100', 'vxlan-1000']
++            self.assertEqual(self.lbm.get_tap_devices_count('br0'), 1)
++            listdir_fn.side_effect = OSError()
++            self.assertEqual(self.lbm.get_tap_devices_count('br0'), 0)
++
++    def test_get_interface_by_ip(self):
++        with contextlib.nested(
++            mock.patch.object(ip_lib.IPWrapper, 'get_devices'),
++            mock.patch.object(ip_lib.IpAddrCommand, 'list')
++        ) as (get_dev_fn, ip_list_fn):
++            device = mock.Mock()
++            device.name = 'dev_name'
++            get_dev_fn.return_value = [device]
++            ip_list_fn.returnvalue = mock.Mock()
++            self.assertEqual(self.lbm.get_interface_by_ip(LOCAL_IP),
++                             'dev_name')
++
++    def test_get_bridge_for_tap_device(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, "get_all_neutron_bridges"),
++            mock.patch.object(self.lbm, "get_interfaces_on_bridge")
++        ) as (get_all_qbr_fn, get_if_fn):
++            get_all_qbr_fn.return_value = ["br-int", "br-ex"]
++            get_if_fn.return_value = ["tap1", "tap2", "tap3"]
++            self.assertEqual(self.lbm.get_bridge_for_tap_device("tap1"),
++                             "br-int")
++            self.assertIsNone(self.lbm.get_bridge_for_tap_device("tap4"))
++
++    def test_is_device_on_bridge(self):
++        self.assertTrue(not self.lbm.is_device_on_bridge(""))
++        with mock.patch.object(os.path, 'exists') as exists_fn:
++            exists_fn.return_value = True
++            self.assertTrue(self.lbm.is_device_on_bridge("tap1"))
++            exists_fn.assert_called_with(
++                "/sys/devices/virtual/net/tap1/brport"
++            )
++
++    def test_get_interface_details(self):
++        with contextlib.nested(
++            mock.patch.object(ip_lib.IpAddrCommand, 'list'),
++            mock.patch.object(ip_lib.IpRouteCommand, 'get_gateway')
++        ) as (list_fn, getgw_fn):
++            gwdict = dict(gateway='1.1.1.1')
++            getgw_fn.return_value = gwdict
++            ipdict = dict(cidr='1.1.1.1/24',
++                          broadcast='1.1.1.255',
++                          scope='global',
++                          ip_version=4,
++                          dynamic=False)
++            list_fn.return_value = ipdict
++            ret = self.lbm.get_interface_details("eth0")
++
++            self.assertTrue(list_fn.called)
++            self.assertTrue(getgw_fn.called)
++            self.assertEqual(ret, (ipdict, gwdict))
++
++    def test_ensure_flat_bridge(self):
++        with contextlib.nested(
++            mock.patch.object(ip_lib.IpAddrCommand, 'list'),
++            mock.patch.object(ip_lib.IpRouteCommand, 'get_gateway')
++        ) as (list_fn, getgw_fn):
++            gwdict = dict(gateway='1.1.1.1')
++            getgw_fn.return_value = gwdict
++            ipdict = dict(cidr='1.1.1.1/24',
++                          broadcast='1.1.1.255',
++                          scope='global',
++                          ip_version=4,
++                          dynamic=False)
++            list_fn.return_value = ipdict
++            with mock.patch.object(self.lbm, 'ensure_bridge') as ens:
++                self.assertEqual(
++                    self.lbm.ensure_flat_bridge("123", "eth0"),
++                    "eth0"
++                )
++                self.assertTrue(list_fn.called)
++                self.assertTrue(getgw_fn.called)
++                ens.assert_called_once_with("brq123", "eth0",
++                                            ipdict, gwdict)
++
++    def test_ensure_vlan_bridge(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, 'ensure_vlan'),
++            mock.patch.object(self.lbm, 'ensure_bridge'),
++            mock.patch.object(self.lbm, 'get_interface_details'),
++        ) as (ens_vl_fn, ens, get_int_det_fn):
++            ens_vl_fn.return_value = "eth0.1"
++            get_int_det_fn.return_value = (None, None)
++            self.assertEqual(self.lbm.ensure_vlan_bridge("123", "eth0", "1"),
++                             "eth0.1")
++            ens.assert_called_with("brq123", "eth0.1", None, None)
++
++            get_int_det_fn.return_value = ("ips", "gateway")
++            self.assertEqual(self.lbm.ensure_vlan_bridge("123", "eth0", "1"),
++                             "eth0.1")
++            ens.assert_called_with("brq123", "eth0.1", "ips", "gateway")
++
++    def test_ensure_local_bridge(self):
++        with mock.patch.object(self.lbm, 'ensure_bridge') as ens_fn:
++            self.lbm.ensure_local_bridge("54321")
++            ens_fn.assert_called_once_with("brq54321")
++
++    def test_ensure_vlan(self):
++        with mock.patch.object(self.lbm, 'device_exists') as de_fn:
++            de_fn.return_value = True
++            self.assertEqual(self.lbm.ensure_vlan("eth0", "1"), "eth0.1")
++            de_fn.return_value = False
++            with mock.patch.object(utils, 'execute') as exec_fn:
++                exec_fn.return_value = False
++                self.assertEqual(self.lbm.ensure_vlan("eth0", "1"), "eth0.1")
++                exec_fn.assert_called_twice()
++                exec_fn.return_value = True
++                self.assertIsNone(self.lbm.ensure_vlan("eth0", "1"))
++                exec_fn.assert_called_once()
++
++    def test_ensure_vxlan(self):
++        seg_id = "12345678"
++        self.lbm.local_int = 'eth0'
++        self.lbm.vxlan_mode = lconst.VXLAN_MCAST
++        with mock.patch.object(self.lbm, 'device_exists') as de_fn:
++            de_fn.return_value = True
++            self.assertEqual(self.lbm.ensure_vxlan(seg_id), "vxlan-" + seg_id)
++            de_fn.return_value = False
++            with mock.patch.object(self.lbm.ip,
++                                   'add_vxlan') as add_vxlan_fn:
++                add_vxlan_fn.return_value = FakeIpDevice()
++                self.assertEqual(self.lbm.ensure_vxlan(seg_id),
++                                 "vxlan-" + seg_id)
++                add_vxlan_fn.assert_called_with("vxlan-" + seg_id, seg_id,
++                                                group="224.0.0.1",
++                                                dev=self.lbm.local_int)
++                cfg.CONF.set_override('l2_population', 'True', 'VXLAN')
++                self.assertEqual(self.lbm.ensure_vxlan(seg_id),
++                                 "vxlan-" + seg_id)
++                add_vxlan_fn.assert_called_with("vxlan-" + seg_id, seg_id,
++                                                group="224.0.0.1",
++                                                dev=self.lbm.local_int,
++                                                proxy=True)
++
++    def test_update_interface_ip_details(self):
++        gwdict = dict(gateway='1.1.1.1',
++                      metric=50)
++        ipdict = dict(cidr='1.1.1.1/24',
++                      broadcast='1.1.1.255',
++                      scope='global',
++                      ip_version=4,
++                      dynamic=False)
++        with contextlib.nested(
++            mock.patch.object(ip_lib.IpAddrCommand, 'add'),
++            mock.patch.object(ip_lib.IpAddrCommand, 'delete')
++        ) as (add_fn, del_fn):
++            self.lbm.update_interface_ip_details("br0", "eth0",
++                                                 [ipdict], None)
++            self.assertTrue(add_fn.called)
++            self.assertTrue(del_fn.called)
++
++        with contextlib.nested(
++            mock.patch.object(ip_lib.IpRouteCommand, 'add_gateway'),
++            mock.patch.object(ip_lib.IpRouteCommand, 'delete_gateway')
++        ) as (addgw_fn, delgw_fn):
++            self.lbm.update_interface_ip_details("br0", "eth0",
++                                                 None, gwdict)
++            self.assertTrue(addgw_fn.called)
++            self.assertTrue(delgw_fn.called)
++
++    def test_ensure_bridge(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, 'device_exists'),
++            mock.patch.object(utils, 'execute'),
++            mock.patch.object(self.lbm, 'update_interface_ip_details'),
++            mock.patch.object(self.lbm, 'interface_exists_on_bridge'),
++            mock.patch.object(self.lbm, 'is_device_on_bridge'),
++            mock.patch.object(self.lbm, 'get_bridge_for_tap_device'),
++        ) as (de_fn, exec_fn, upd_fn, ie_fn, if_br_fn, get_if_br_fn):
++            de_fn.return_value = False
++            exec_fn.return_value = False
++            self.assertEqual(self.lbm.ensure_bridge("br0", None), "br0")
++            ie_fn.return_Value = False
++            self.lbm.ensure_bridge("br0", "eth0")
++            upd_fn.assert_called_with("br0", "eth0", None, None)
++            ie_fn.assert_called_with("br0", "eth0")
++
++            self.lbm.ensure_bridge("br0", "eth0", "ips", "gateway")
++            upd_fn.assert_called_with("br0", "eth0", "ips", "gateway")
++            ie_fn.assert_called_with("br0", "eth0")
++
++            exec_fn.side_effect = Exception()
++            de_fn.return_value = True
++            self.lbm.ensure_bridge("br0", "eth0")
++            ie_fn.assert_called_with("br0", "eth0")
++
++            exec_fn.reset_mock()
++            exec_fn.side_effect = None
++            de_fn.return_value = True
++            ie_fn.return_value = False
++            get_if_br_fn.return_value = "br1"
++            self.lbm.ensure_bridge("br0", "eth0")
++            expected = [
++                mock.call(['brctl', 'delif', 'br1', 'eth0'],
++                          root_helper=self.root_helper),
++                mock.call(['brctl', 'addif', 'br0', 'eth0'],
++                          root_helper=self.root_helper),
++            ]
++            exec_fn.assert_has_calls(expected)
++
++    def test_ensure_physical_in_bridge(self):
++        self.assertFalse(
++            self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN,
++                                               "phys", "1")
++        )
++        with mock.patch.object(self.lbm, "ensure_flat_bridge") as flbr_fn:
++            self.assertTrue(
++                self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_FLAT,
++                                                   "physnet1", None)
++            )
++            self.assertTrue(flbr_fn.called)
++        with mock.patch.object(self.lbm, "ensure_vlan_bridge") as vlbr_fn:
++            self.assertTrue(
++                self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VLAN,
++                                                   "physnet1", "1")
++            )
++            self.assertTrue(vlbr_fn.called)
++
++        with mock.patch.object(self.lbm, "ensure_vxlan_bridge") as vlbr_fn:
++            self.lbm.vxlan_mode = lconst.VXLAN_MCAST
++            self.assertTrue(
++                self.lbm.ensure_physical_in_bridge("123", p_const.TYPE_VXLAN,
++                                                   "physnet1", "1")
++            )
++            self.assertTrue(vlbr_fn.called)
++
++    def test_add_tap_interface(self):
++        with mock.patch.object(self.lbm, "device_exists") as de_fn:
++            de_fn.return_value = False
++            self.assertFalse(
++                self.lbm.add_tap_interface("123", p_const.TYPE_VLAN,
++                                           "physnet1", "1", "tap1")
++            )
++
++            de_fn.return_value = True
++            with contextlib.nested(
++                mock.patch.object(self.lbm, "ensure_local_bridge"),
++                mock.patch.object(utils, "execute"),
++                mock.patch.object(self.lbm, "get_bridge_for_tap_device")
++            ) as (en_fn, exec_fn, get_br):
++                exec_fn.return_value = False
++                get_br.return_value = True
++                self.assertTrue(self.lbm.add_tap_interface("123",
++                                                           p_const.TYPE_LOCAL,
++                                                           "physnet1", None,
++                                                           "tap1"))
++                en_fn.assert_called_with("123")
++
++                get_br.return_value = False
++                exec_fn.return_value = True
++                self.assertFalse(self.lbm.add_tap_interface("123",
++                                                            p_const.TYPE_LOCAL,
++                                                            "physnet1", None,
++                                                            "tap1"))
++
++            with mock.patch.object(self.lbm,
++                                   "ensure_physical_in_bridge") as ens_fn:
++                ens_fn.return_value = False
++                self.assertFalse(self.lbm.add_tap_interface("123",
++                                                            p_const.TYPE_VLAN,
++                                                            "physnet1", "1",
++                                                            "tap1"))
++
++    def test_add_interface(self):
++        with mock.patch.object(self.lbm, "add_tap_interface") as add_tap:
++            self.lbm.add_interface("123", p_const.TYPE_VLAN, "physnet-1",
++                                   "1", "234")
++            add_tap.assert_called_with("123", p_const.TYPE_VLAN, "physnet-1",
++                                       "1", "tap234")
++
++    def test_delete_vlan_bridge(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, "device_exists"),
++            mock.patch.object(self.lbm, "get_interfaces_on_bridge"),
++            mock.patch.object(self.lbm, "remove_interface"),
++            mock.patch.object(self.lbm, "get_interface_details"),
++            mock.patch.object(self.lbm, "update_interface_ip_details"),
++            mock.patch.object(self.lbm, "delete_vlan"),
++            mock.patch.object(self.lbm, "delete_vxlan"),
++            mock.patch.object(utils, "execute")
++        ) as (de_fn, getif_fn, remif_fn, if_det_fn,
++              updif_fn, del_vlan, del_vxlan, exec_fn):
++            de_fn.return_value = False
++            self.lbm.delete_vlan_bridge("br0")
++            self.assertFalse(getif_fn.called)
++
++            de_fn.return_value = True
++            getif_fn.return_value = ["eth0", "eth1.1", "eth1", "vxlan-1002"]
++            if_det_fn.return_value = ("ips", "gateway")
++            exec_fn.return_value = False
++            self.lbm.delete_vlan_bridge("br0")
++            updif_fn.assert_called_with("eth1", "br0", "ips", "gateway")
++            del_vlan.assert_called_with("eth1.1")
++            del_vxlan.assert_called_with("vxlan-1002")
++
++    def test_delete_vxlan_bridge_no_int_mappings(self):
++        interface_mappings = {}
++        lbm = linuxbridge_neutron_agent.LinuxBridgeManager(
++            interface_mappings, self.root_helper)
++
++        with contextlib.nested(
++            mock.patch.object(lbm, "device_exists"),
++            mock.patch.object(lbm, "get_interfaces_on_bridge"),
++            mock.patch.object(lbm, "remove_interface"),
++            mock.patch.object(lbm, "delete_vxlan"),
++            mock.patch.object(utils, "execute")
++        ) as (de_fn, getif_fn, remif_fn, del_vxlan, exec_fn):
++            de_fn.return_value = False
++            lbm.delete_vlan_bridge("br0")
++            self.assertFalse(getif_fn.called)
++
++            de_fn.return_value = True
++            getif_fn.return_value = ["vxlan-1002"]
++            exec_fn.return_value = False
++            lbm.delete_vlan_bridge("br0")
++            del_vxlan.assert_called_with("vxlan-1002")
++
++    def test_remove_empty_bridges(self):
++        self.lbm.network_map = {'net1': mock.Mock(), 'net2': mock.Mock()}
++
++        def tap_count_side_effect(*args):
++            return 0 if args[0] == 'brqnet1' else 1
++
++        with contextlib.nested(
++            mock.patch.object(self.lbm, "delete_vlan_bridge"),
++            mock.patch.object(self.lbm, "get_tap_devices_count",
++                              side_effect=tap_count_side_effect),
++        ) as (del_br_fn, count_tap_fn):
++            self.lbm.remove_empty_bridges()
++            del_br_fn.assert_called_once_with('brqnet1')
++
++    def test_remove_interface(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, "device_exists"),
++            mock.patch.object(self.lbm, "is_device_on_bridge"),
++            mock.patch.object(utils, "execute")
++        ) as (de_fn, isdev_fn, exec_fn):
++            de_fn.return_value = False
++            self.assertFalse(self.lbm.remove_interface("br0", "eth0"))
++            self.assertFalse(isdev_fn.called)
++
++            de_fn.return_value = True
++            isdev_fn.return_value = False
++            self.assertTrue(self.lbm.remove_interface("br0", "eth0"))
++
++            isdev_fn.return_value = True
++            exec_fn.return_value = True
++            self.assertFalse(self.lbm.remove_interface("br0", "eth0"))
++
++            exec_fn.return_value = False
++            self.assertTrue(self.lbm.remove_interface("br0", "eth0"))
++
++    def test_delete_vlan(self):
++        with contextlib.nested(
++            mock.patch.object(self.lbm, "device_exists"),
++            mock.patch.object(utils, "execute")
++        ) as (de_fn, exec_fn):
++            de_fn.return_value = False
++            self.lbm.delete_vlan("eth1.1")
++            self.assertFalse(exec_fn.called)
++
++            de_fn.return_value = True
++            exec_fn.return_value = False
++            self.lbm.delete_vlan("eth1.1")
++            self.assertTrue(exec_fn.called)
++
++    def test_update_devices(self):
++        with mock.patch.object(self.lbm, "udev_get_tap_devices") as gt_fn:
++            gt_fn.return_value = set(["dev1"])
++            self.assertIsNone(self.lbm.update_devices(set(["dev1"])))
++
++            gt_fn.return_value = set(["dev1", "dev2"])
++            self.assertEqual(self.lbm.update_devices(set(["dev2", "dev3"])),
++                             {"current": set(["dev1", "dev2"]),
++                              "added": set(["dev1"]),
++                              "removed": set(["dev3"])
++                              })
++
++    def _check_vxlan_support(self, kernel_version, vxlan_proxy_supported,
++                             fdb_append_supported, l2_population,
++                             expected_mode):
++        def iproute_supported_side_effect(*args):
++            if args[1] == 'proxy':
++                return vxlan_proxy_supported
++            elif args[1] == 'append':
++                return fdb_append_supported
++
++        with contextlib.nested(
++            mock.patch("platform.release", return_value=kernel_version),
++            mock.patch.object(ip_lib, 'iproute_arg_supported',
++                              side_effect=iproute_supported_side_effect),
++        ) as (kver_fn, ip_arg_fn):
++            self.lbm.check_vxlan_support()
++            self.assertEqual(self.lbm.vxlan_mode, expected_mode)
++
++    def test_vxlan_mode_ucast(self):
++        self._check_vxlan_support(kernel_version='3.12',
++                                  vxlan_proxy_supported=True,
++                                  fdb_append_supported=True,
++                                  l2_population=True,
++                                  expected_mode=lconst.VXLAN_MCAST)
++
++    def test_vxlan_mode_mcast(self):
++        self._check_vxlan_support(kernel_version='3.12',
++                                  vxlan_proxy_supported=True,
++                                  fdb_append_supported=False,
++                                  l2_population=True,
++                                  expected_mode=lconst.VXLAN_MCAST)
++        self._check_vxlan_support(kernel_version='3.10',
++                                  vxlan_proxy_supported=True,
++                                  fdb_append_supported=True,
++                                  l2_population=True,
++                                  expected_mode=lconst.VXLAN_MCAST)
++
++    def test_vxlan_mode_unsupported(self):
++        self._check_vxlan_support(kernel_version='3.7',
++                                  vxlan_proxy_supported=True,
++                                  fdb_append_supported=True,
++                                  l2_population=False,
++                                  expected_mode=lconst.VXLAN_NONE)
++        self._check_vxlan_support(kernel_version='3.10',
++                                  vxlan_proxy_supported=False,
++                                  fdb_append_supported=False,
++                                  l2_population=False,
++                                  expected_mode=lconst.VXLAN_NONE)
++        cfg.CONF.set_override('vxlan_group', '', 'VXLAN')
++        self._check_vxlan_support(kernel_version='3.12',
++                                  vxlan_proxy_supported=True,
++                                  fdb_append_supported=True,
++                                  l2_population=True,
++                                  expected_mode=lconst.VXLAN_NONE)
++
++
++class TestLinuxBridgeRpcCallbacks(base.BaseTestCase):
++    def setUp(self):
++        cfg.CONF.set_override('local_ip', LOCAL_IP, 'VXLAN')
++        self.addCleanup(cfg.CONF.reset)
++        super(TestLinuxBridgeRpcCallbacks, self).setUp()
++
++        self.u_execute_p = mock.patch('neutron.agent.linux.utils.execute')
++        self.u_execute = self.u_execute_p.start()
++        self.addCleanup(self.u_execute_p.stop)
++
++        class FakeLBAgent(object):
++            def __init__(self):
++                self.agent_id = 1
++                self.br_mgr = (linuxbridge_neutron_agent.
++                               LinuxBridgeManager({'physnet1': 'eth1'},
++                                                  cfg.CONF.AGENT.root_helper))
++
++                self.br_mgr.vxlan_mode = lconst.VXLAN_UCAST
++                segment = mock.Mock()
++                segment.network_type = 'vxlan'
++                segment.segmentation_id = 1
++                self.br_mgr.network_map['net_id'] = segment
++
++        self.lb_rpc = linuxbridge_neutron_agent.LinuxBridgeRpcCallbacks(
++            object(),
++            FakeLBAgent()
++        )
++
++        self.root_helper = cfg.CONF.AGENT.root_helper
++
++    def test_network_delete(self):
++        with contextlib.nested(
++            mock.patch.object(self.lb_rpc.agent.br_mgr, "get_bridge_name"),
++            mock.patch.object(self.lb_rpc.agent.br_mgr, "delete_vlan_bridge")
++        ) as (get_br_fn, del_fn):
++            get_br_fn.return_value = "br0"
++            self.lb_rpc.network_delete("anycontext", network_id="123")
++            get_br_fn.assert_called_with("123")
++            del_fn.assert_called_with("br0")
++
++    def test_port_update(self):
++        with contextlib.nested(
++            mock.patch.object(self.lb_rpc.agent.br_mgr,
++                              "get_tap_device_name"),
++            mock.patch.object(self.lb_rpc.agent.br_mgr,
++                              "udev_get_tap_devices"),
++            mock.patch.object(self.lb_rpc.agent.br_mgr,
++                              "get_bridge_name"),
++            mock.patch.object(self.lb_rpc.agent.br_mgr,
++                              "remove_interface"),
++            mock.patch.object(self.lb_rpc.agent.br_mgr, "add_interface"),
++            mock.patch.object(self.lb_rpc.agent,
++                              "plugin_rpc", create=True),
++            mock.patch.object(self.lb_rpc.sg_agent,
++                              "refresh_firewall", create=True)
++        ) as (get_tap_fn, udev_fn, getbr_fn, remif_fn,
++              addif_fn, rpc_obj, reffw_fn):
++            get_tap_fn.return_value = "tap123"
++            udev_fn.return_value = ["tap123", "tap124"]
++            port = {"admin_state_up": True,
++                    "id": "1234-5678",
++                    "network_id": "123-123"}
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    vlan_id="1", physical_network="physnet1")
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN,
++                                        "physnet1", "1", port["id"])
++
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    network_type=p_const.TYPE_VLAN,
++                                    segmentation_id="2",
++                                    physical_network="physnet1")
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_VLAN,
++                                        "physnet1", "2", port["id"])
++
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    vlan_id=lconst.FLAT_VLAN_ID,
++                                    physical_network="physnet1")
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT,
++                                        "physnet1", None, port["id"])
++
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    network_type=p_const.TYPE_FLAT,
++                                    segmentation_id=None,
++                                    physical_network="physnet1")
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_FLAT,
++                                        "physnet1", None, port["id"])
++
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    vlan_id=lconst.LOCAL_VLAN_ID,
++                                    physical_network=None)
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL,
++                                        None, None, port["id"])
++
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    network_type=p_const.TYPE_LOCAL,
++                                    segmentation_id=None,
++                                    physical_network=None)
++            self.assertFalse(reffw_fn.called)
++            addif_fn.assert_called_with(port["network_id"], p_const.TYPE_LOCAL,
++                                        None, None, port["id"])
++
++            addif_fn.return_value = True
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    network_type=p_const.TYPE_LOCAL,
++                                    segmentation_id=None,
++                                    physical_network=None)
++            rpc_obj.update_device_up.assert_called_with(
++                self.lb_rpc.context,
++                "tap123",
++                self.lb_rpc.agent.agent_id,
++                cfg.CONF.host
++            )
++
++            addif_fn.return_value = False
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    network_type=p_const.TYPE_LOCAL,
++                                    segmentation_id=None,
++                                    physical_network=None)
++            rpc_obj.update_device_down.assert_called_with(
++                self.lb_rpc.context,
++                "tap123",
++                self.lb_rpc.agent.agent_id,
++                cfg.CONF.host
++            )
++
++            port["admin_state_up"] = False
++            port["security_groups"] = True
++            getbr_fn.return_value = "br0"
++            self.lb_rpc.port_update("unused_context", port=port,
++                                    vlan_id="1", physical_network="physnet1")
++            self.assertTrue(reffw_fn.called)
++            remif_fn.assert_called_with("br0", "tap123")
++            rpc_obj.update_device_down.assert_called_with(
++                self.lb_rpc.context,
++                "tap123",
++                self.lb_rpc.agent.agent_id,
++                cfg.CONF.host
++            )
++
++    def test_port_update_plugin_rpc_failed(self):
++        with contextlib.nested(
++                mock.patch.object(self.lb_rpc.agent.br_mgr,
++                                  "get_tap_device_name"),
++                mock.patch.object(self.lb_rpc.agent.br_mgr,
++                                  "udev_get_tap_devices"),
++                mock.patch.object(self.lb_rpc.agent.br_mgr,
++                                  "get_bridge_name"),
++                mock.patch.object(self.lb_rpc.agent.br_mgr,
++                                  "remove_interface"),
++                mock.patch.object(self.lb_rpc.agent.br_mgr, "add_interface"),
++                mock.patch.object(self.lb_rpc.sg_agent,
++                                  "refresh_firewall", create=True),
++                mock.patch.object(self.lb_rpc.agent,
++                                  "plugin_rpc", create=True),
++                mock.patch.object(linuxbridge_neutron_agent.LOG, 'error'),
++        ) as (get_tap_fn, udev_fn, _, _, _, _, plugin_rpc, log):
++            get_tap_fn.return_value = "tap123"
++            udev_fn.return_value = ["tap123", "tap124"]
++            port = {"admin_state_up": True,
++                    "id": "1234-5678",
++                    "network_id": "123-123"}
++            plugin_rpc.update_device_up.side_effect = rpc_common.Timeout
++            self.lb_rpc.port_update(mock.Mock(), port=port)
++            self.assertTrue(plugin_rpc.update_device_up.called)
++            self.assertEqual(log.call_count, 1)
++
++            log.reset_mock()
++            port["admin_state_up"] = False
++            plugin_rpc.update_device_down.side_effect = rpc_common.Timeout
++            self.lb_rpc.port_update(mock.Mock(), port=port)
++            self.assertTrue(plugin_rpc.update_device_down.called)
++            self.assertEqual(log.call_count, 1)
++
++    def test_fdb_add(self):
++        fdb_entries = {'net_id':
++                       {'ports':
++                        {'agent_ip': [constants.FLOODING_ENTRY,
++                                      ['port_mac', 'port_ip']]},
++                        'network_type': 'vxlan',
++                        'segment_id': 1}}
++
++        with mock.patch.object(utils, 'execute',
++                               return_value='') as execute_fn:
++            self.lb_rpc.fdb_add(None, fdb_entries)
++
++            expected = [
++                mock.call(['bridge', 'fdb', 'show', 'dev', 'vxlan-1'],
++                          root_helper=self.root_helper),
++                mock.call(['bridge', 'fdb', 'add',
++                           constants.FLOODING_ENTRY[0],
++                           'dev', 'vxlan-1', 'dst', 'agent_ip'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++                mock.call(['ip', 'neigh', 'add', 'port_ip', 'lladdr',
++                           'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++                mock.call(['bridge', 'fdb', 'add', 'port_mac', 'dev',
++                           'vxlan-1', 'dst', 'agent_ip'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++            ]
++            execute_fn.assert_has_calls(expected)
++
++    def test_fdb_ignore(self):
++        fdb_entries = {'net_id':
++                       {'ports':
++                        {LOCAL_IP: [constants.FLOODING_ENTRY,
++                                    ['port_mac', 'port_ip']]},
++                        'network_type': 'vxlan',
++                        'segment_id': 1}}
++
++        with mock.patch.object(utils, 'execute',
++                               return_value='') as execute_fn:
++            self.lb_rpc.fdb_add(None, fdb_entries)
++            self.lb_rpc.fdb_remove(None, fdb_entries)
++
++            self.assertFalse(execute_fn.called)
++
++        fdb_entries = {'other_net_id':
++                       {'ports':
++                        {'192.168.0.67': [constants.FLOODING_ENTRY,
++                                          ['port_mac', 'port_ip']]},
++                        'network_type': 'vxlan',
++                        'segment_id': 1}}
++
++        with mock.patch.object(utils, 'execute',
++                               return_value='') as execute_fn:
++            self.lb_rpc.fdb_add(None, fdb_entries)
++            self.lb_rpc.fdb_remove(None, fdb_entries)
++
++            self.assertFalse(execute_fn.called)
++
++    def test_fdb_remove(self):
++        fdb_entries = {'net_id':
++                       {'ports':
++                        {'agent_ip': [constants.FLOODING_ENTRY,
++                                      ['port_mac', 'port_ip']]},
++                        'network_type': 'vxlan',
++                        'segment_id': 1}}
++
++        with mock.patch.object(utils, 'execute',
++                               return_value='') as execute_fn:
++            self.lb_rpc.fdb_remove(None, fdb_entries)
++
++            expected = [
++                mock.call(['bridge', 'fdb', 'del',
++                           constants.FLOODING_ENTRY[0],
++                           'dev', 'vxlan-1', 'dst', 'agent_ip'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++                mock.call(['ip', 'neigh', 'del', 'port_ip', 'lladdr',
++                           'port_mac', 'dev', 'vxlan-1'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++                mock.call(['bridge', 'fdb', 'del', 'port_mac',
++                           'dev', 'vxlan-1', 'dst', 'agent_ip'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++            ]
++            execute_fn.assert_has_calls(expected)
++
++    def test_fdb_update_chg_ip(self):
++        fdb_entries = {'chg_ip':
++                       {'net_id':
++                        {'agent_ip':
++                         {'before': [['port_mac', 'port_ip_1']],
++                          'after': [['port_mac', 'port_ip_2']]}}}}
++
++        with mock.patch.object(utils, 'execute',
++                               return_value='') as execute_fn:
++            self.lb_rpc.fdb_update(None, fdb_entries)
++
++            expected = [
++                mock.call(['ip', 'neigh', 'add', 'port_ip_2', 'lladdr',
++                           'port_mac', 'dev', 'vxlan-1', 'nud', 'permanent'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False),
++                mock.call(['ip', 'neigh', 'del', 'port_ip_1', 'lladdr',
++                           'port_mac', 'dev', 'vxlan-1'],
++                          root_helper=self.root_helper,
++                          check_exit_code=False)
++            ]
++            execute_fn.assert_has_calls(expected)
 
=== added file 'debian/patches/fix-quantum-configuration.patch'
--- debian/patches/fix-quantum-configuration.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-quantum-configuration.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,48 @@
+Description: Fixes to neutron configuration for distribution.
+ Patch various bits of config to be more suitable for packaging.
+Author: James Page <[e-mail]>
+Forwarded: not-needed
+
+diff --git a/etc/neutron.conf b/etc/neutron.conf
+index 1e2226f..a5fe086 100644
+--- a/etc/neutron.conf
++++ b/etc/neutron.conf
+@@ -7,7 +7,7 @@
+ 
+ # Where to store Neutron state files.  This directory must be writable by the
+ # user executing the agent.
+-# state_path = /var/lib/neutron
++state_path = /var/lib/neutron
+ 
+ # Where to store lock files
+ lock_path = $state_path/lock
+@@ -50,7 +50,7 @@ lock_path = $state_path/lock
+ # previous versions, the class name of a plugin can be specified instead of its
+ # entrypoint name.
+ #
+-# core_plugin =
++core_plugin = neutron.plugins.ml2.plugin.Ml2Plugin
+ # Example: core_plugin = ml2
+ 
+ # (ListOpt) List of service plugin entrypoints to be loaded from the
+@@ -320,7 +320,7 @@ notification_driver = neutron.openstack.common.notifier.rpc_notifier
+ # Use "sudo neutron-rootwrap /etc/neutron/rootwrap.conf" to use the real
+ # root filter facility.
+ # Change to "sudo" to skip the filtering and just run the comand directly
+-# root_helper = sudo
++root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+ 
+ # =========== items for agent management extension =============
+ # seconds between nodes reporting state to server; should be less than
+@@ -344,7 +344,7 @@ signing_dir = $state_path/keystone-signing
+ # connection = mysql://root:pass@127.0.0.1:3306/neutron
+ # Replace 127.0.0.1 above with the IP address of the database used by the
+ # main neutron server. (Leave it as is if the database runs on this host.)
+-# connection = sqlite://
++connection = sqlite:////var/lib/neutron/neutron.sqlite
+ 
+ # The SQLAlchemy connection string used to connect to the slave database
+ # slave_connection =
+-- 
+1.8.5.2
+
 
=== added file 'debian/patches/series'
--- debian/patches/series	1970-01-01 00:00:00 +0000
+++ debian/patches/series	2014-02-21 16:49:36 +0000
@@ -0,0 +1,7 @@
+fix-quantum-configuration.patch
+disable-udev-tests.patch
+disable-failing-metaplugin-tests.patch
+#disable-failing-cisco-test.patch
+sql-alchemy-0.8.3-compat.patch
+skip-lb-test.patch
+skip-ipv6-tests.patch
 
=== added file 'debian/patches/skip-ipv6-tests.patch'
--- debian/patches/skip-ipv6-tests.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip-ipv6-tests.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,22 @@
+Description: Skip ipv6 tests because they fail on the ppa buildds.
+Author: Chuck Short <[e-mail]>
+Forwarded: Not Needed
+diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/test_wsgi.py neutron-2014.1.b2/neutron/tests/unit/test_wsgi.py
+--- neutron-2014.1.b2.orig/neutron/tests/unit/test_wsgi.py	2014-01-23 10:13:25.000000000 -0500
++++ neutron-2014.1.b2/neutron/tests/unit/test_wsgi.py	2014-02-03 08:58:27.817255230 -0500
+@@ -64,6 +64,7 @@ class TestWSGIServer(base.BaseTestCase):
+         launcher.wait.assert_called_once_with()
+ 
+     def test_start_random_port_with_ipv6(self):
++        self.skipTest('Skipped by Ubuntu')
+         server = wsgi.Server("test_random_port")
+         server.start(None, 0, host="::1")
+         self.assertEqual("::1", server.host)
+@@ -1109,6 +1110,7 @@ class TestWSGIServerWithSSL(base.BaseTes
+         server.stop()
+ 
+     def test_app_using_ipv6_and_ssl(self):
++        self.skipTest('Skipped by Ubuntu')
+         CONF.set_default('use_ssl', True)
+         CONF.set_default("ssl_cert_file",
+                          os.path.join(TEST_VAR_DIR, 'certificate.crt'))
 
=== added file 'debian/patches/skip-lb-test.patch'
--- debian/patches/skip-lb-test.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/skip-lb-test.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,14 @@
+Description: Temporarily Skip LB test
+Author: Chuck Short <[e-mail]>
+Forwarded: Not Needed
+diff -Naurp neutron-2014.1.b2.orig/neutron/tests/unit/test_provider_configuration.py neutron-2014.1.b2/neutron/tests/unit/test_provider_configuration.py
+--- neutron-2014.1.b2.orig/neutron/tests/unit/test_provider_configuration.py	2014-01-23 10:13:25.000000000 -0500
++++ neutron-2014.1.b2/neutron/tests/unit/test_provider_configuration.py	2014-01-27 11:39:28.611298704 -0500
+@@ -79,6 +79,7 @@ class ParseServiceProviderConfigurationT
+                                 'default': True}])
+ 
+     def test_parse_service_provider_opt_not_allowed_raises(self):
++        self.skipTest('Skipped by Ubuntu')
+         cfg.CONF.set_override('service_provider',
+                               [constants.LOADBALANCER +
+                                ':lbaas:driver_path',
 
=== added file 'debian/patches/sql-alchemy-0.8.3-compat.patch'
--- debian/patches/sql-alchemy-0.8.3-compat.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/sql-alchemy-0.8.3-compat.patch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,67 @@
+Description: Fix sqlalchemy 0.8.3 compat
+Author: Chuck Short <[e-mail]>
+Forwarded: No
+diff --git a/neutron/openstack/common/db/sqlalchemy/session.py b/neutron/openstack/common/db/sqlalchemy/session.py
+index 3279343..113424c 100644
+--- a/neutron/openstack/common/db/sqlalchemy/session.py
++++ b/neutron/openstack/common/db/sqlalchemy/session.py
+@@ -441,6 +441,11 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # 1 column - (IntegrityError) column c1 is not unique
+ # N columns - (IntegrityError) column c1, c2, ..., N are not unique
+ #
++# sqlite since 3.7.16:
++# 1 column - (IntegrityError) UNIQUE constraint failed: k1
++#
++# N columns - (IntegrityError) UNIQUE constraint failed: k1, k2
++#
+ # postgres:
+ # 1 column - (IntegrityError) duplicate key value violates unique
+ #               constraint "users_c1_key"
+@@ -453,9 +458,10 @@ def get_session(autocommit=True, expire_on_commit=False,
+ # N columns - (IntegrityError) (1062, "Duplicate entry 'values joined
+ #               with -' for key 'name_of_our_constraint'")
+ _DUP_KEY_RE_DB = {
+-    "sqlite": re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
+-    "postgresql": re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),
+-    "mysql": re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$")
++    "sqlite": (re.compile(r"^.*columns?([^)]+)(is|are)\s+not\s+unique$"),
++              re.compile(r"^.*UNIQUE\s+constraint\s+failed:\s+(.+)$")),
++    "postgresql": (re.compile(r"^.*duplicate\s+key.*\"([^\"]+)\"\s*\n.*$"),),
++    "mysql": (re.compile(r"^.*\(1062,.*'([^\']+)'\"\)$"),)
+ }
+ 
+ 
+@@ -480,10 +486,14 @@ def _raise_if_duplicate_entry_error(integrity_error, engine_name):
+     if engine_name not in ["mysql", "sqlite", "postgresql"]:
+         return
+ 
+-    m = _DUP_KEY_RE_DB[engine_name].match(integrity_error.message)
+-    if not m:
++    for pattern in _DUP_KEY_RE_DB[engine_name]:
++        match = pattern.match(integrity_error.message)
++        if match:
++            break
++    else:
+         return
+-    columns = m.group(1)
++
++    columns = match.group(1)
+ 
+     if engine_name == "sqlite":
+         columns = columns.strip().split(", ")
+diff --git a/run_tests.sh b/run_tests.sh
+index cc17124..06934e9 100755
+--- a/run_tests.sh
++++ b/run_tests.sh
+@@ -162,7 +162,7 @@ function run_pep8 {
+ }
+ 
+ 
+-TESTRTESTS="python setup.py testr"
++TESTRTESTS="python -m neutron.openstack.common.lockutils python setup.py testr"
+ 
+ if [ $never_venv -eq 0 ]
+ then
+-- 
+1.8.5.2
+
 
=== added file 'debian/pydist-overrides'
--- debian/pydist-overrides	1970-01-01 00:00:00 +0000
+++ debian/pydist-overrides	2014-02-21 16:49:36 +0000
@@ -0,0 +1,3 @@
+quantum_server quantum-server
+quantum_common quantum-common
+setuptools-git
 
=== added file 'debian/python-neutron.install'
--- debian/python-neutron.install	1970-01-01 00:00:00 +0000
+++ debian/python-neutron.install	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+usr/lib/python*/dist-packages/*
 
=== added file 'debian/rules'
--- debian/rules	1970-01-01 00:00:00 +0000
+++ debian/rules	2014-02-21 16:49:36 +0000
@@ -0,0 +1,31 @@
+#!/usr/bin/make -f
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+%:
+	dh $@  --with python2
+
+override_dh_install:
+	dh_install --fail-missing -X/usr/etc -X/usr/bin/quantum
+
+override_dh_installinit:
+	dh_installinit
+	dh_installinit -pneutron-plugin-openvswitch-agent --no-start --name=neutron-ovs-cleanup
+
+override_dh_auto_clean:
+	dh_clean
+
+get-orig-source:
+	uscan --verbose --force-download --rename --destdir=../build-area
+
+ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
+override_dh_auto_test:
+	# Unpatch quantum configuration to fixup tests which conflict
+	# with a core_plugin being set.
+	patch -p1 -R < debian/patches/fix-quantum-configuration.patch
+	# Set a reasonable level of concurrency
+	./run_tests.sh -N -P
+	# Patch configuration file after testing
+	patch -p1 < debian/patches/fix-quantum-configuration.patch
+endif
 
=== added directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2014-02-21 16:49:36 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== added directory 'debian/tests'
=== added file 'debian/tests/bigswitch-plugin'
--- debian/tests/bigswitch-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/bigswitch-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-------------------------
+# Testing bigswitch-plugin
+#-------------------------
+set -e
+apt-get -y install neutron-plugin-bigswitch
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/bigswitch\/restproxy\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.bigswitch\.plugin\.NeutronRestProxyV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-bigswitch
+    echo "OK"
+else
+    echo "ERROR: BIGSWITCH PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-bigswitch
+    exit 1
+fi
 
=== added file 'debian/tests/brocade-plugin'
--- debian/tests/brocade-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/brocade-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-----------------------
+# Testing brocade-plugin
+#-----------------------
+set -e
+apt-get -y install neutron-plugin-brocade
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/brocade\/brocade\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.brocade\.NeutronPlugin\.BrocadePluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-brocade
+    echo "OK"
+else
+    echo "ERROR: BROCADE PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-brocade
+    exit 1
+fi
 
=== added file 'debian/tests/cisco-plugin'
--- debian/tests/cisco-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/cisco-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#---------------------
+# Testing cisco-plugin
+#---------------------
+set -e
+apt-get -y install neutron-plugin-cisco
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/cisco\/cisco_plugins\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.cisco\.network_plugin\.PluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-cisco
+    echo "OK"
+else
+    echo "ERROR: CISCO PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-cisco
+    exit 1
+fi
 
=== added file 'debian/tests/control'
--- debian/tests/control	1970-01-01 00:00:00 +0000
+++ debian/tests/control	2014-02-21 16:49:36 +0000
@@ -0,0 +1,6 @@
+Tests: neutron-daemons python-neutron cisco-plugin nec-plugin bigswitch-plugin
+ hyperv-plugin brocade-plugin plumgrid-plugin nicira-plugin openvswitch-plugin
+ linuxbridge-plugin ryu-plugin midonet-plugin
+Depends: neutron-server, neutron-l3-agent, neutron-dhcp-agent, neutron-metadata-agent,
+ neutron-lbaas-agent, python-neutron, rabbitmq-server
+Restrictions: needs-root
 
=== added file 'debian/tests/hyperv-plugin'
--- debian/tests/hyperv-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/hyperv-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#----------------------
+# Testing hyperv-plugin
+#----------------------
+set -e
+apt-get -y install neutron-plugin-hyperv
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/hyperv\/hyperv_neutron_plugin\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.hyperv\.hyperv_neutron_plugin\.HyperVNeutronPlugin/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-hyperv
+    echo "OK"
+else
+    echo "ERROR: HYPERV PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-hyperv
+    exit 1
+fi
 
=== added file 'debian/tests/linuxbridge-plugin'
--- debian/tests/linuxbridge-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/linuxbridge-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#---------------------------
+# Testing linuxbridge-plugin
+#---------------------------
+set -e
+apt-get -y install neutron-plugin-linuxbridge
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/linuxbridge\/linuxbridge_conf\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.linuxbridge\.lb_neutron_plugin\.LinuxBridgePluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-linuxbridge
+    echo "OK"
+else
+    echo "ERROR: LINUXBRIDGE PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-linuxbridge
+    exit 1
+fi
 
=== added file 'debian/tests/midonet-plugin'
--- debian/tests/midonet-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/midonet-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-----------------------
+# Testing midonet-plugin
+#-----------------------
+set -e
+apt-get -y install neutron-plugin-midonet
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/midonet\/midonet\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.midonet\.MidonetPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-midonet
+    echo "OK"
+else
+    echo "ERROR: MIDONET PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-midonet
+    exit 1
+fi
 
=== added file 'debian/tests/nec-plugin'
--- debian/tests/nec-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/nec-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-------------------
+# Testing nec-plugin
+#-------------------
+set -e
+apt-get -y install neutron-plugin-nec
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nec\/nec\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nec\.nec_plugin\.NECPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-nec
+    echo "OK"
+else
+    echo "ERROR: NEC PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-nec
+    exit 1
+fi
 
=== added file 'debian/tests/neutron-daemons'
--- debian/tests/neutron-daemons	1970-01-01 00:00:00 +0000
+++ debian/tests/neutron-daemons	2014-02-21 16:49:36 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-----------------------
+# Testing neutron-daemon
+#-----------------------
+set -e
+DAEMONS=('neutron-server' 'neutron-l3-agent' 'neutron-dhcp-agent' 'neutron-metadata-agent' 'neutron-lbaas-agent')
+for daemon in "${DAEMONS[@]}"; do
+    if pidof -x $daemon > /dev/null; then
+        echo "OK"
+    else
+        echo "ERROR: ${daemon} IS NOT RUNNING"
+        exit 1
+    fi
+done
 
=== added file 'debian/tests/nicira-plugin'
--- debian/tests/nicira-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/nicira-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#----------------------
+# Testing nicira-plugin
+#----------------------
+set -e
+apt-get -y install neutron-plugin-nicira
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/nicira\/nvp\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.nicira\.NeutronPlugin\.NvpPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-nicira
+    echo "OK"
+else
+    echo "ERROR: NICIRA PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-nicira
+    exit 1
+fi
 
=== added file 'debian/tests/openvswitch-plugin'
--- debian/tests/openvswitch-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/openvswitch-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#---------------------------
+# Testing openvswitch-plugin
+#---------------------------
+set -e
+apt-get -y install neutron-plugin-openvswitch
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/openvswitch\/ovs_neutron_plugin\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.openvswitch\.ovs_neutron_plugin\.OVSNeutronPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-openvswitch
+    echo "OK"
+else
+    echo "ERROR: OPENVSWITCH PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-openvswitch
+    exit 1
+fi
 
=== added file 'debian/tests/plumgrid-plugin'
--- debian/tests/plumgrid-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/plumgrid-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#------------------------
+# Testing plumgrid-plugin
+#------------------------
+set -e
+apt-get -y install neutron-plugin-plumgrid
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/plumgrid\/plumgrid\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.plumgrid\.plumgrid_plugin\.plumgrid_plugin\.NeutronPluginPLUMgridV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-plumgrid
+    echo "OK"
+else
+    echo "ERROR: PLUMGRID PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-plumgrid
+    exit 1
+fi
 
=== added file 'debian/tests/python-neutron'
--- debian/tests/python-neutron	1970-01-01 00:00:00 +0000
+++ debian/tests/python-neutron	2014-02-21 16:49:36 +0000
@@ -0,0 +1,14 @@
+#!/bin/bash
+#-------------------------
+# Testing client utilities
+#-------------------------
+set -e
+
+result=$(python `dirname $0`/test_import_neutron.py 2>&1)
+if [ "$result" ]; then
+    echo "ERROR: PYTHON-NEUTRON MODULE CANNOT BE IMPORTED"
+    exit 1
+else
+    echo "OK"
+    exit 0
+fi
 
=== added file 'debian/tests/ryu-plugin'
--- debian/tests/ryu-plugin	1970-01-01 00:00:00 +0000
+++ debian/tests/ryu-plugin	2014-02-21 16:49:36 +0000
@@ -0,0 +1,19 @@
+#!/bin/bash
+#-------------------
+# Testing ryu-plugin
+#-------------------
+set -e
+apt-get -y install neutron-plugin-ryu
+
+# update plugin path
+sed -i 's/NEUTRON_PLUGIN_CONFIG\=.*/NEUTRON_PLUGIN_CONFIG\=\"\/etc\/neutron\/plugins\/ryu\/ryu\.ini\"/g' /etc/default/neutron-server
+sed -i 's/core_plugin/core_plugin \= neutron\.plugins\.ryu\.ryu_neutron_plugin\.RyuNeutronPluginV2/g' /etc/neutron/neutron.conf
+service neutron-server restart  > /dev/null 2>&1
+if pidof -x neutron-server > /dev/null; then
+    apt-get -y remove --purge neutron-plugin-ryu
+    echo "OK"
+else
+    echo "ERROR: RYU PLUGIN IS NOT RUNNING"
+    apt-get -y remove --purge neutron-plugin-ryu
+    exit 1
+fi
 
=== added file 'debian/tests/test_import_neutron.py'
--- debian/tests/test_import_neutron.py	1970-01-01 00:00:00 +0000
+++ debian/tests/test_import_neutron.py	2014-02-21 16:49:36 +0000
@@ -0,0 +1,4 @@
+try:
+    import neutron
+except ImportError, e:
+    print "ERROR IMPORTING MODULE"
 
=== added file 'debian/watch'
--- debian/watch	1970-01-01 00:00:00 +0000
+++ debian/watch	2014-02-21 16:49:36 +0000
@@ -0,0 +1,3 @@
+version=3
+opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/" \
+ https://launchpad.net/neutron/+download https://launchpad.net/neutron/.*/.*/.*/neutron-(.*)\.tar\.gz