Merge lp:~thedac/ubuntu/vivid/neutron-fwaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-fwaas

Proposed by Corey Bryant on 2015-08-04
Status: Approved
Approved by: Corey Bryant on 2015-08-05
Approved revision: 9
Proposed branch: lp:~thedac/ubuntu/vivid/neutron-fwaas/2015.1.1
Merge into: lp:ubuntu/vivid-updates/neutron-fwaas
Diff against target: 254 lines (+68/-37)
12 files modified
ChangeLog (+8/-0)
PKG-INFO (+1/-1)
debian/changelog (+7/-0)
neutron_fwaas.egg-info/PKG-INFO (+1/-1)
neutron_fwaas.egg-info/pbr.json (+1/-1)
neutron_fwaas.egg-info/requires.txt (+9/-9)
neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py (+1/-1)
neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py (+20/-3)
requirements.txt (+9/-9)
setup.cfg (+1/-1)
setup.py (+0/-1)
test-requirements.txt (+10/-10)
To merge this branch: bzr merge lp:~thedac/ubuntu/vivid/neutron-fwaas/2015.1.1
Reviewer Review Type Date Requested Status
Corey Bryant Approve on 2015-08-04
Review via email: mp+266918@code.launchpad.net
To post a comment you must log in.
review: Approve
review: Approve
Corey Bryant (corey.bryant) wrote :

I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.

Unmerged revisions

9. By David Ames on 2015-08-04

Import upstream version 2015.1.1

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ChangeLog'
2--- ChangeLog 2015-04-30 17:40:32 +0000
3+++ ChangeLog 2015-08-04 16:55:56 +0000
4@@ -1,6 +1,14 @@
5 CHANGES
6 =======
7
8+2015.1.1
9+--------
10+
11+* Updated from global requirements
12+* Updated from global requirements
13+* Bump pre-release to 2015.1.1
14+* Make iptables firewall work with L3 plugin without DVR support
15+
16 2015.1.0
17 --------
18
19
20=== modified file 'PKG-INFO'
21--- PKG-INFO 2015-04-30 17:40:32 +0000
22+++ PKG-INFO 2015-08-04 16:55:56 +0000
23@@ -1,6 +1,6 @@
24 Metadata-Version: 1.1
25 Name: neutron-fwaas
26-Version: 2015.1.0
27+Version: 2015.1.1
28 Summary: OpenStack Networking FWaaS
29 Home-page: http://www.openstack.org/
30 Author: OpenStack
31
32=== modified file 'debian/changelog'
33--- debian/changelog 2015-04-30 17:40:32 +0000
34+++ debian/changelog 2015-08-04 16:55:56 +0000
35@@ -1,3 +1,10 @@
36+neutron-fwaas (2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
37+
38+ * Resynchronize with stable/kilo (cdcd5a7) (LP: #1481008):
39+ - [cdcd5a7] Make iptables firewall work with L3 plugin without DVR support
40+
41+ -- David Ames <david.ames@canonical.com> Tue, 04 Aug 2015 08:40:49 -0700
42+
43 neutron-fwaas (2015.1.0-0ubuntu1) vivid; urgency=medium
44
45 * New upstream release for OpenStack Kilo. (LP: #1449744)
46
47=== modified file 'neutron_fwaas.egg-info/PKG-INFO'
48--- neutron_fwaas.egg-info/PKG-INFO 2015-04-30 17:40:32 +0000
49+++ neutron_fwaas.egg-info/PKG-INFO 2015-08-04 16:55:56 +0000
50@@ -1,6 +1,6 @@
51 Metadata-Version: 1.1
52 Name: neutron-fwaas
53-Version: 2015.1.0
54+Version: 2015.1.1
55 Summary: OpenStack Networking FWaaS
56 Home-page: http://www.openstack.org/
57 Author: OpenStack
58
59=== modified file 'neutron_fwaas.egg-info/pbr.json'
60--- neutron_fwaas.egg-info/pbr.json 2015-04-30 17:40:32 +0000
61+++ neutron_fwaas.egg-info/pbr.json 2015-08-04 16:55:56 +0000
62@@ -1,1 +1,1 @@
63-{"is_release": true, "git_version": "3313166"}
64\ No newline at end of file
65+{"is_release": true, "git_version": "23441f6"}
66\ No newline at end of file
67
68=== modified file 'neutron_fwaas.egg-info/requires.txt'
69--- neutron_fwaas.egg-info/requires.txt 2015-04-10 09:38:51 +0000
70+++ neutron_fwaas.egg-info/requires.txt 2015-08-04 16:55:56 +0000
71@@ -1,13 +1,13 @@
72-pbr>=0.6,!=0.7,<1.0
73-eventlet>=0.16.1,!=0.17.0
74+pbr!=0.7,<1.0,>=0.6
75+eventlet!=0.17.0,>=0.16.1
76 httplib2>=0.7.5
77 netaddr>=0.7.12
78-SQLAlchemy>=0.9.7,<=0.9.99
79+SQLAlchemy<=0.9.99,>=0.9.7
80 alembic>=0.7.2
81 six>=1.9.0
82-oslo.config>=1.9.3,<1.10.0 # Apache-2.0
83-oslo.db>=1.7.0,<1.8.0 # Apache-2.0
84-oslo.log>=1.0.0,<1.1.0 # Apache-2.0
85-oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
86-oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
87-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
88+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
89+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
90+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
91+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
92+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
93+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
94
95=== modified file 'neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py'
96--- neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py 2015-03-30 11:19:40 +0000
97+++ neutron_fwaas/services/firewall/drivers/linux/iptables_fwaas.py 2015-08-04 16:55:56 +0000
98@@ -73,7 +73,7 @@
99 namespace and a fip so this is provided back as a list - so in that
100 scenario rules can be applied on both.
101 """
102- if not router_info.router['distributed']:
103+ if not router_info.router.get('distributed'):
104 return [{'ipt': router_info.iptables_manager,
105 'if_prefix': INTERNAL_DEV_PREFIX}]
106 ipt_mgrs = []
107
108=== modified file 'neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py'
109--- neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py 2015-04-10 09:38:51 +0000
110+++ neutron_fwaas/tests/unit/services/firewall/drivers/linux/test_iptables_fwaas.py 2015-08-04 16:55:56 +0000
111@@ -93,7 +93,10 @@
112 apply_list = []
113 while router_count > 0:
114 iptables_inst = mock.Mock()
115- router_inst = {'distributed': distributed}
116+ if distributed is not None:
117+ router_inst = {'distributed': distributed}
118+ else:
119+ router_inst = {}
120 v4filter_inst = mock.Mock()
121 v6filter_inst = mock.Mock()
122 v4filter_inst.chains = []
123@@ -203,6 +206,10 @@
124 def test_create_firewall_with_rules(self):
125 self._setup_firewall_with_rules(self.firewall.create_firewall)
126
127+ def test_create_firewall_with_rules_without_distributed_attr(self):
128+ self._setup_firewall_with_rules(self.firewall.create_firewall,
129+ distributed=None)
130+
131 def test_create_firewall_with_rules_two_routers(self):
132 self._setup_firewall_with_rules(self.firewall.create_firewall,
133 router_count=2)
134@@ -210,8 +217,12 @@
135 def test_update_firewall_with_rules(self):
136 self._setup_firewall_with_rules(self.firewall.update_firewall)
137
138- def test_delete_firewall(self):
139- apply_list = self._fake_apply_list()
140+ def test_update_firewall_with_rules_without_distributed_attr(self):
141+ self._setup_firewall_with_rules(self.firewall.update_firewall,
142+ distributed=None)
143+
144+ def _test_delete_firewall(self, distributed=False):
145+ apply_list = self._fake_apply_list(distributed=distributed)
146 firewall = self._fake_firewall_no_rule()
147 self.firewall.delete_firewall('legacy', apply_list, firewall)
148 ingress_chain = 'iv4%s' % firewall['id']
149@@ -221,6 +232,12 @@
150 mock.call.remove_chain('fwaas-default-policy')]
151 apply_list[0].iptables_manager.ipv4['filter'].assert_has_calls(calls)
152
153+ def test_delete_firewall(self):
154+ self._test_delete_firewall()
155+
156+ def test_delete_firewall_without_distributed_attr(self):
157+ self._test_delete_firewall(distributed=None)
158+
159 def test_create_firewall_with_admin_down(self):
160 apply_list = self._fake_apply_list()
161 rule_list = self._fake_rules_v4(FAKE_FW_ID, apply_list)
162
163=== modified file 'requirements.txt'
164--- requirements.txt 2015-04-30 17:40:32 +0000
165+++ requirements.txt 2015-08-04 16:55:56 +0000
166@@ -1,20 +1,20 @@
167 # The order of packages is significant, because pip processes them in the order
168 # of appearance. Changing the order has an impact on the overall integration
169 # process, which may cause wedges in the gate later.
170-pbr>=0.6,!=0.7,<1.0
171+pbr!=0.7,<1.0,>=0.6
172
173-eventlet>=0.16.1,!=0.17.0
174+eventlet!=0.17.0,>=0.16.1
175 httplib2>=0.7.5
176 netaddr>=0.7.12
177-SQLAlchemy>=0.9.7,<=0.9.99
178+SQLAlchemy<=0.9.99,>=0.9.7
179 alembic>=0.7.2
180 six>=1.9.0
181-oslo.config>=1.9.3,<1.10.0 # Apache-2.0
182-oslo.db>=1.7.0,<1.8.0 # Apache-2.0
183-oslo.log>=1.0.0,<1.1.0 # Apache-2.0
184-oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
185-oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
186-oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
187+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
188+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
189+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
190+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
191+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
192+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
193
194 # This project does depend on neutron as a library, but the
195 # openstack tooling does not play nicely with projects that
196
197=== modified file 'setup.cfg'
198--- setup.cfg 2015-02-16 14:11:17 +0000
199+++ setup.cfg 2015-08-04 16:55:56 +0000
200@@ -1,6 +1,6 @@
201 [metadata]
202 name = neutron-fwaas
203-version = 2015.1
204+version = 2015.1.1
205 summary = OpenStack Networking FWaaS
206 description-file =
207 README.rst
208
209=== modified file 'setup.py'
210--- setup.py 2015-01-14 10:11:07 +0000
211+++ setup.py 2015-08-04 16:55:56 +0000
212@@ -1,4 +1,3 @@
213-#!/usr/bin/env python
214 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
215 #
216 # Licensed under the Apache License, Version 2.0 (the "License");
217
218=== modified file 'test-requirements.txt'
219--- test-requirements.txt 2015-04-10 09:38:51 +0000
220+++ test-requirements.txt 2015-08-04 16:55:56 +0000
221@@ -1,23 +1,23 @@
222 # The order of packages is significant, because pip processes them in the order
223 # of appearance. Changing the order has an impact on the overall integration
224 # process, which may cause wedges in the gate later.
225-hacking>=0.10.0,<0.11
226+hacking<0.11,>=0.10.0
227
228-cliff>=1.10.0,<1.11.0 # Apache-2.0
229+cliff<1.11.0,>=1.10.0 # Apache-2.0
230 coverage>=3.6
231 discover
232-fixtures>=0.3.14
233-mock>=1.0
234+fixtures<1.3.0,>=0.3.14
235+mock<1.1.0,>=1.0
236 python-subunit>=0.0.18
237-requests-mock>=0.6.0 # Apache-2.0
238-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
239-oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
240-oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
241+requests-mock>=0.6.0 # Apache-2.0
242+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
243+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
244+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
245 testrepository>=0.0.18
246-testtools>=0.9.36,!=1.2.0
247+testtools!=1.2.0,>=0.9.36
248 testscenarios>=0.4
249 WebOb>=1.2.3
250 WebTest>=2.0
251-oslotest>=1.5.1,<1.6.0 # Apache-2.0
252+oslotest<1.6.0,>=1.5.1 # Apache-2.0
253 psycopg2
254 MySQL-python

Subscribers

People subscribed via source and target branches

to all changes: