Merge lp:~james-page/neutron/lbaas-midonet into lp:~openstack-ubuntu-testing/neutron/grizzly

[James Page]

Fixup test failures caused by pep8 patch

Add packages for midonet and lbaas.

[lp:~james-page/neutron/lbaas-midonet]

140. By James Page on 2013-03-03

Actually disable pep tests

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-01 14:54:57 +0000
+++ debian/changelog	2013-03-03 23:06:20 +0000
@@ -6,11 +6,16 @@
   * 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.
-  * debian/patches/fix-pep8-tests.patch: Fix pep8 tests.
 
   [ James Page ]
   * d/watch: Update uversionmangle to deal with upstream versioning
-    changes, remove tarballs.openstack.org. 
+    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.
 
  -- Chuck Short <[e-mail]>  Tue, 26 Feb 2013 08:27:14 -0600
 
 
=== modified file 'debian/control'
--- debian/control	2013-02-27 15:02:09 +0000
+++ debian/control	2013-03-03 23:06:20 +0000
@@ -39,7 +39,7 @@
  python-webob,
  python-webtest
 XS-Python-Version: >= 2.6
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 
 Package: quantum-server
 Architecture: all
@@ -312,6 +312,28 @@
  .
  This package provides the DHCP agent.
 
+Package: quantum-lbaas-agent
+Architecture: all
+Depends:
+ haproxy,
+ quantum-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
+Description: Quantum is a virtual network service for Openstack - LBaaS agent
+ Quantum 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, Quantum 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 Quantum 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-quantum
 Architecture: all
 Section: python
@@ -482,3 +504,24 @@
  etc.)
  .
  This package provides the RYU plugin agent.
+
+Package: quantum-plugin-midonet
+Architecture: all
+Provides: quantum-plugin
+Depends:
+ quantum-common (= ${source:Version}),
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Description: Quantum is a virtual network service for Openstack - Midonet plugin
+ Quantum 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, Quantum 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 Quantum API supports extensions to provide
+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
+ etc.)
+ .
+ This package provides the Midonet plugin.
+
 
=== added file 'debian/cron.d/quantum-lbaas-agent-netns-cleanup'
--- debian/cron.d/quantum-lbaas-agent-netns-cleanup	1970-01-01 00:00:00 +0000
+++ debian/cron.d/quantum-lbaas-agent-netns-cleanup	2013-03-03 23:06:20 +0000
@@ -0,0 +1,6 @@
+# Periodically cleans Quantum's network namespaces on behalf of the Quantum
+# L3 agent.
+0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then \
+                    /usr/bin/quantum-netns-cleanup \
+                    --config-file=/etc/quantum/quantum.conf  \
+                    --config-file=/etc/quantum/lbaas_agent.ini >/dev/null 2>&1; fi
 
=== removed file 'debian/patches/fix-pep8-tests.patch'
--- debian/patches/fix-pep8-tests.patch	2013-03-01 14:54:57 +0000
+++ debian/patches/fix-pep8-tests.patch	1970-01-01 00:00:00 +0000
@@ -1,58 +0,0 @@
-From 0d71ce29f825453761fd52dffb7370fa8fbacb42 Mon Sep 17 00:00:00 2001
-From: Chuck Short <[e-mail]>
-Date: Fri, 1 Mar 2013 08:21:31 -0600
-Subject: [PATCH] Pin pep8 to 1.3.3
-
-Apart of making pep8 version standard across all openstack
-projects.
-
-Change-Id: Iefc923123243df161ed72888c1651a622afbda04
-Signed-off-by: Chuck Short <[e-mail]>
----
- quantum/scheduler/dhcp_agent_scheduler.py | 2 +-
- quantum/scheduler/l3_agent_scheduler.py   | 2 +-
- tools/test-requires                       | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/quantum/scheduler/dhcp_agent_scheduler.py b/quantum/scheduler/dhcp_agent_scheduler.py
-index 6292988..e3810ce 100644
---- a/quantum/scheduler/dhcp_agent_scheduler.py
-+++ b/quantum/scheduler/dhcp_agent_scheduler.py
-@@ -81,7 +81,7 @@ class ChanceScheduler(object):
-             query = query.filter(agents_db.Agent.agent_type ==
-                                  constants.AGENT_TYPE_DHCP,
-                                  agents_db.Agent.host == host,
--                                 agents_db.Agent.admin_state_up == True)
-+                                 agents_db.Agent.admin_state_up is True)
-             try:
-                 dhcp_agent = query.one()
-             except (exc.MultipleResultsFound, exc.NoResultFound):
-diff --git a/quantum/scheduler/l3_agent_scheduler.py b/quantum/scheduler/l3_agent_scheduler.py
-index 0d3b1ef..6e99346 100644
---- a/quantum/scheduler/l3_agent_scheduler.py
-+++ b/quantum/scheduler/l3_agent_scheduler.py
-@@ -48,7 +48,7 @@ class ChanceScheduler(object):
-             query = query.filter(agents_db.Agent.agent_type ==
-                                  constants.AGENT_TYPE_L3,
-                                  agents_db.Agent.host == host,
--                                 agents_db.Agent.admin_state_up == True)
-+                                 agents_db.Agent.admin_state_up is True)
-             try:
-                 l3_agent = query.one()
-             except (exc.MultipleResultsFound, exc.NoResultFound):
-diff --git a/tools/test-requires b/tools/test-requires
-index d86688e..8e93e94 100644
---- a/tools/test-requires
-+++ b/tools/test-requires
-@@ -9,7 +9,7 @@ nose
- nosehtmloutput
- nosexcover
- openstack.nose_plugin
--pep8
-+pep8==1.3.3
- sphinx>=1.1.2
- testtools>=0.9.27
- webtest==1.3.3
--- 
-1.8.1.2
-
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-03-01 14:54:57 +0000
+++ debian/patches/series	2013-03-03 23:06:20 +0000
@@ -1,3 +1,2 @@
 fix-quantum-configuration.patch
 fix-ubuntu-tests.patch
-fix-pep8-tests.patch
 
=== added file 'debian/quantum-lbaas-agent.install'
--- debian/quantum-lbaas-agent.install	1970-01-01 00:00:00 +0000
+++ debian/quantum-lbaas-agent.install	2013-03-03 23:06:20 +0000
@@ -0,0 +1,4 @@
+bin/quantum-lbaas-agent usr/bin
+debian/cron.d/quantum-lbaas-agent-netns-cleanup etc/cron.d
+etc/quantum/rootwrap.d/lbaas-haproxy.filters etc/quantum/rootwrap.d
+etc/lbaas_agent.ini etc/quantum
 
=== added file 'debian/quantum-lbaas-agent.logrotate'
--- debian/quantum-lbaas-agent.logrotate	1970-01-01 00:00:00 +0000
+++ debian/quantum-lbaas-agent.logrotate	2013-03-03 23:06:20 +0000
@@ -0,0 +1,7 @@
+/var/log/quantum/lbaas-agent.log {
+    daily
+    missingok
+    compress
+    delaycompress
+    notifempty
+}
 
=== added file 'debian/quantum-lbaas-agent.upstart'
--- debian/quantum-lbaas-agent.upstart	1970-01-01 00:00:00 +0000
+++ debian/quantum-lbaas-agent.upstart	2013-03-03 23:06:20 +0000
@@ -0,0 +1,14 @@
+description "Quantum LBaaS agent"
+author "Chuck Short <[e-mail]>"
+
+start on runlevel [2345]
+stop on runlevel [!2345]
+
+chdir /var/run
+
+pre-start script
+        mkdir -p /var/run/quantum
+        chown quantum:root /var/run/quantum
+end script
+
+exec start-stop-daemon --start --chuid quantum --exec /usr/bin/quantum-lbaas-agent -- --config-file=/etc/quantum/lbaas_agent.ini --config-file=/etc/quantum/quantum.conf --log-file=/var/log/quantum/lbaas-agent.log
 
=== added file 'debian/quantum-plugin-midonet.install'
--- debian/quantum-plugin-midonet.install	1970-01-01 00:00:00 +0000
+++ debian/quantum-plugin-midonet.install	2013-03-03 23:06:20 +0000
@@ -0,0 +1,1 @@
+etc/quantum/plugins/midonet/* etc/quantum/plugins/midonet
 
=== modified file 'debian/rules'
--- debian/rules	2013-02-27 15:02:09 +0000
+++ debian/rules	2013-03-03 23:06:20 +0000
@@ -22,5 +22,5 @@
 
 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 override_dh_auto_test:
-	./run_tests.sh -N
+	./run_tests.sh -N -P
 endif