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

Proposed by James Page on 2013-03-03
Status: Merged
Approved by: Chuck Short on 2013-03-04
Approved revision: 140
Merged at revision: 139
Proposed branch: lp:~james-page/neutron/lbaas-midonet
Merge into: lp:~openstack-ubuntu-testing/neutron/grizzly
Diff against target: 228 lines (+84/-63)
10 files modified
debian/changelog (+7/-2)
debian/control (+44/-1)
debian/cron.d/quantum-lbaas-agent-netns-cleanup (+6/-0)
debian/patches/fix-pep8-tests.patch (+0/-58)
debian/patches/series (+0/-1)
debian/quantum-lbaas-agent.install (+4/-0)
debian/quantum-lbaas-agent.logrotate (+7/-0)
debian/quantum-lbaas-agent.upstart (+14/-0)
debian/quantum-plugin-midonet.install (+1/-0)
debian/rules (+1/-1)
To merge this branch: bzr merge lp:~james-page/neutron/lbaas-midonet
Reviewer Review Type Date Requested Status
Openstack Ubuntu Testers 2013-03-03 Pending
Review via email: mp+151400@code.launchpad.net

Description of the change

Fixup test failures caused by pep8 patch

Add packages for midonet and lbaas.

To post a comment you must log in.
lp:~james-page/neutron/lbaas-midonet updated on 2013-03-03
140. By James Page on 2013-03-03

Actually disable pep tests

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-03-01 14:54:57 +0000
3+++ debian/changelog 2013-03-03 23:06:20 +0000
4@@ -6,11 +6,16 @@
5 * debian/control: Add python-testtools and python-fixtures a build-dep.
6 * debian/control: Drop python-gflags no longer needed.
7 * debian/control: Drop python-unittest2 no longer needed.
8- * debian/patches/fix-pep8-tests.patch: Fix pep8 tests.
9
10 [ James Page ]
11 * d/watch: Update uversionmangle to deal with upstream versioning
12- changes, remove tarballs.openstack.org.
13+ changes, remove tarballs.openstack.org.
14+ * d/rules: Disable PEP-8 tests until fixed upstream.
15+ * d/control,quantum-plugin-midonet.install: Added plugin package for
16+ Midonet.
17+ * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent
18+ package.
19+ * d/control: Bumped Standards-Version, no changes.
20
21 -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -0600
22
23
24=== modified file 'debian/control'
25--- debian/control 2013-02-27 15:02:09 +0000
26+++ debian/control 2013-03-03 23:06:20 +0000
27@@ -39,7 +39,7 @@
28 python-webob,
29 python-webtest
30 XS-Python-Version: >= 2.6
31-Standards-Version: 3.9.3
32+Standards-Version: 3.9.4
33
34 Package: quantum-server
35 Architecture: all
36@@ -312,6 +312,28 @@
37 .
38 This package provides the DHCP agent.
39
40+Package: quantum-lbaas-agent
41+Architecture: all
42+Depends:
43+ haproxy,
44+ quantum-common (= ${source:Version}),
45+ ${misc:Depends},
46+ ${python:Depends},
47+ ${shlibs:Depends}
48+Breaks: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
49+Replaces: quantum-common ( <= 2012.2~rc1~20120907.1154-0ubuntu1 )
50+Description: Quantum is a virtual network service for Openstack - LBaaS agent
51+ Quantum is a virtual network service for Openstack, and a part of
52+ Netstack. Just like OpenStack Nova provides an API to dynamically
53+ request and configure virtual servers, Quantum provides an API to
54+ dynamically request and configure virtual networks. These networks
55+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
56+ from Nova VMs). The Quantum API supports extensions to provide
57+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
58+ etc.)
59+ .
60+ This package provides the Load Balancing as-a Service (LBaaS) agent.
61+
62 Package: python-quantum
63 Architecture: all
64 Section: python
65@@ -482,3 +504,24 @@
66 etc.)
67 .
68 This package provides the RYU plugin agent.
69+
70+Package: quantum-plugin-midonet
71+Architecture: all
72+Provides: quantum-plugin
73+Depends:
74+ quantum-common (= ${source:Version}),
75+ ${misc:Depends},
76+ ${python:Depends},
77+ ${shlibs:Depends}
78+Description: Quantum is a virtual network service for Openstack - Midonet plugin
79+ Quantum is a virtual network service for Openstack, and a part of
80+ Netstack. Just like OpenStack Nova provides an API to dynamically
81+ request and configure virtual servers, Quantum provides an API to
82+ dynamically request and configure virtual networks. These networks
83+ connect "interfaces" from other OpenStack services (e.g., virtual NICs
84+ from Nova VMs). The Quantum API supports extensions to provide
85+ advanced network capabilities (e.g., QoS, ACLs, network monitoring,
86+ etc.)
87+ .
88+ This package provides the Midonet plugin.
89+
90
91=== added file 'debian/cron.d/quantum-lbaas-agent-netns-cleanup'
92--- debian/cron.d/quantum-lbaas-agent-netns-cleanup 1970-01-01 00:00:00 +0000
93+++ debian/cron.d/quantum-lbaas-agent-netns-cleanup 2013-03-03 23:06:20 +0000
94@@ -0,0 +1,6 @@
95+# Periodically cleans Quantum's network namespaces on behalf of the Quantum
96+# L3 agent.
97+0 * * * * quantum if [ -x /usr/bin/quantum-netns-cleanup ] ; then \
98+ /usr/bin/quantum-netns-cleanup \
99+ --config-file=/etc/quantum/quantum.conf \
100+ --config-file=/etc/quantum/lbaas_agent.ini >/dev/null 2>&1; fi
101
102=== removed file 'debian/patches/fix-pep8-tests.patch'
103--- debian/patches/fix-pep8-tests.patch 2013-03-01 14:54:57 +0000
104+++ debian/patches/fix-pep8-tests.patch 1970-01-01 00:00:00 +0000
105@@ -1,58 +0,0 @@
106-From 0d71ce29f825453761fd52dffb7370fa8fbacb42 Mon Sep 17 00:00:00 2001
107-From: Chuck Short <chuck.short@canonical.com>
108-Date: Fri, 1 Mar 2013 08:21:31 -0600
109-Subject: [PATCH] Pin pep8 to 1.3.3
110-
111-Apart of making pep8 version standard across all openstack
112-projects.
113-
114-Change-Id: Iefc923123243df161ed72888c1651a622afbda04
115-Signed-off-by: Chuck Short <chuck.short@canonical.com>
116----
117- quantum/scheduler/dhcp_agent_scheduler.py | 2 +-
118- quantum/scheduler/l3_agent_scheduler.py | 2 +-
119- tools/test-requires | 2 +-
120- 3 files changed, 3 insertions(+), 3 deletions(-)
121-
122-diff --git a/quantum/scheduler/dhcp_agent_scheduler.py b/quantum/scheduler/dhcp_agent_scheduler.py
123-index 6292988..e3810ce 100644
124---- a/quantum/scheduler/dhcp_agent_scheduler.py
125-+++ b/quantum/scheduler/dhcp_agent_scheduler.py
126-@@ -81,7 +81,7 @@ class ChanceScheduler(object):
127- query = query.filter(agents_db.Agent.agent_type ==
128- constants.AGENT_TYPE_DHCP,
129- agents_db.Agent.host == host,
130-- agents_db.Agent.admin_state_up == True)
131-+ agents_db.Agent.admin_state_up is True)
132- try:
133- dhcp_agent = query.one()
134- except (exc.MultipleResultsFound, exc.NoResultFound):
135-diff --git a/quantum/scheduler/l3_agent_scheduler.py b/quantum/scheduler/l3_agent_scheduler.py
136-index 0d3b1ef..6e99346 100644
137---- a/quantum/scheduler/l3_agent_scheduler.py
138-+++ b/quantum/scheduler/l3_agent_scheduler.py
139-@@ -48,7 +48,7 @@ class ChanceScheduler(object):
140- query = query.filter(agents_db.Agent.agent_type ==
141- constants.AGENT_TYPE_L3,
142- agents_db.Agent.host == host,
143-- agents_db.Agent.admin_state_up == True)
144-+ agents_db.Agent.admin_state_up is True)
145- try:
146- l3_agent = query.one()
147- except (exc.MultipleResultsFound, exc.NoResultFound):
148-diff --git a/tools/test-requires b/tools/test-requires
149-index d86688e..8e93e94 100644
150---- a/tools/test-requires
151-+++ b/tools/test-requires
152-@@ -9,7 +9,7 @@ nose
153- nosehtmloutput
154- nosexcover
155- openstack.nose_plugin
156--pep8
157-+pep8==1.3.3
158- sphinx>=1.1.2
159- testtools>=0.9.27
160- webtest==1.3.3
161---
162-1.8.1.2
163-
164
165=== modified file 'debian/patches/series'
166--- debian/patches/series 2013-03-01 14:54:57 +0000
167+++ debian/patches/series 2013-03-03 23:06:20 +0000
168@@ -1,3 +1,2 @@
169 fix-quantum-configuration.patch
170 fix-ubuntu-tests.patch
171-fix-pep8-tests.patch
172
173=== added file 'debian/quantum-lbaas-agent.install'
174--- debian/quantum-lbaas-agent.install 1970-01-01 00:00:00 +0000
175+++ debian/quantum-lbaas-agent.install 2013-03-03 23:06:20 +0000
176@@ -0,0 +1,4 @@
177+bin/quantum-lbaas-agent usr/bin
178+debian/cron.d/quantum-lbaas-agent-netns-cleanup etc/cron.d
179+etc/quantum/rootwrap.d/lbaas-haproxy.filters etc/quantum/rootwrap.d
180+etc/lbaas_agent.ini etc/quantum
181
182=== added file 'debian/quantum-lbaas-agent.logrotate'
183--- debian/quantum-lbaas-agent.logrotate 1970-01-01 00:00:00 +0000
184+++ debian/quantum-lbaas-agent.logrotate 2013-03-03 23:06:20 +0000
185@@ -0,0 +1,7 @@
186+/var/log/quantum/lbaas-agent.log {
187+ daily
188+ missingok
189+ compress
190+ delaycompress
191+ notifempty
192+}
193
194=== added file 'debian/quantum-lbaas-agent.upstart'
195--- debian/quantum-lbaas-agent.upstart 1970-01-01 00:00:00 +0000
196+++ debian/quantum-lbaas-agent.upstart 2013-03-03 23:06:20 +0000
197@@ -0,0 +1,14 @@
198+description "Quantum LBaaS agent"
199+author "Chuck Short <zulcss@ubuntu.com>"
200+
201+start on runlevel [2345]
202+stop on runlevel [!2345]
203+
204+chdir /var/run
205+
206+pre-start script
207+ mkdir -p /var/run/quantum
208+ chown quantum:root /var/run/quantum
209+end script
210+
211+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
212
213=== added file 'debian/quantum-plugin-midonet.install'
214--- debian/quantum-plugin-midonet.install 1970-01-01 00:00:00 +0000
215+++ debian/quantum-plugin-midonet.install 2013-03-03 23:06:20 +0000
216@@ -0,0 +1,1 @@
217+etc/quantum/plugins/midonet/* etc/quantum/plugins/midonet
218
219=== modified file 'debian/rules'
220--- debian/rules 2013-02-27 15:02:09 +0000
221+++ debian/rules 2013-03-03 23:06:20 +0000
222@@ -22,5 +22,5 @@
223
224 ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
225 override_dh_auto_test:
226- ./run_tests.sh -N
227+ ./run_tests.sh -N -P
228 endif

Subscribers

People subscribed via source and target branches