Merge lp:~corey.bryant/neutron/2014.1.2 into lp:~ubuntu-server-dev/neutron/icehouse

Proposed by Corey Bryant on 2014-08-08
Status: Merged
Merged at revision: 265
Proposed branch: lp:~corey.bryant/neutron/2014.1.2
Merge into: lp:~ubuntu-server-dev/neutron/icehouse
Diff against target: 198 lines (+82/-83)
5 files modified
debian/changelog (+81/-0)
debian/neutron_sudoers (+1/-1)
debian/patches/disable-failing-metaplugin-tests.patch (+0/-67)
debian/patches/series (+0/-2)
debian/patches/skip-lb-test.patch (+0/-13)
To merge this branch: bzr merge lp:~corey.bryant/neutron/2014.1.2
Reviewer Review Type Date Requested Status
Chuck Short (community) 2014-08-08 Needs Fixing on 2014-08-08
Review via email: mp+230116@code.launchpad.net
To post a comment you must log in.
Chuck Short (zulcss) wrote :

Can you resync with what we have in the archive.

review: Needs Fixing
lp:~corey.bryant/neutron/2014.1.2 updated on 2014-08-08
265. By Corey Bryant on 2014-08-08

* Resynchronize with stable/icehouse (5db494d) (LP: #1354159):
  - [1d4a3e3] Add dsvm-functional tox env to fix functional job
  - [c19633d] Fix deprecated opt in haproxy driver
  - [2c762be] Add configurable http_timeout parameter for Cisco N1K
  - [9c94d96] Avoid notifying while inside transaction opened in delete_port()
  - [f9379ef] BSN: Remove db lock and add missing contexts
  - [bea1e2d] Set python hash seed to 0 in tox.ini
  - [f427754] Big Switch: Remove consistency hash on full sync
  - [3ad288d] Add -s option for neutron metering rules
  - [231010b] Do not mark device as processed if it wasn't
  - [72edc13] Big Switch: Lock consistency table for REST calls
  - [b65c036] NSX: fix router ports port_security_enabled=False
  - [9dcc476] NSX: Remove unneed call to _ensure_default_security_group
  - [2ce59ec] Added support for NOS version 4.1.0, 5.0.0 and greater
  - [2c4828e] no quota for allowed address pair
  - [46a37e2] NSX: neutron router-interface-add should clear security-groups
  - [5d0d72b] Control update, delete for cisco-network-profile
  - [0459a6a] NSX: return 400 if dscp set for trusted queue
  - [d880134] Fix typo in ml2 configuration file
  - [fb40f65] Register LBaaS resources to quotas engine
  - [0cb4aaa] Make plugin deallocation check optional
  - [478f487] Ensure core plugin deallocation after every test
  - [ea5ecf9] OVS agent: Correct bridge setup ordering
  - [98ef1bc] Fixed dhcp & gateway ip conflict in PLUMgrid plugin
  - [38bf2be] Exit rpc_loop when SIGTERM is recieved in ovs-agent
  - [67ef62d] NSX sync cache: add a flag to skip item deletion
  - [d2c11e5] OFAgent: Avoid processing ports which are not yet ready
  - [c02763a] OFAgent: Fixing lost vlan ids on interfaces
  - [8d56f44] OFAgent: Improve handling of security group updates
  - [63d3a54] OFAgent: Avoid re-wiring ports unnecessarily
  - [8131a2e] Synced jsonutils from oslo-incubator
  - [33992c8] Brocade mechanism driver depends on the brocade plugin templates
  - [1da7abd] ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN
  - [2a79749] netaddr<=0.7.10 raises ValueError instead of AddrFormatError
  - [45281bb] Brocade mechanism driver should be derived from ML2 plugin base class
  - [3eeda2c] Add missing keyword raise to get_profile_binding function
  - [e517da2] Big Switch: Remove unnecessary initialization code
  - [2f65656] ovs-agent: Ensure integration bridge is created
  - [0324965] remove token from notifier middleware
  - [6d62c91] Big Switch: Add missing data to topology sync
  - [fac71fe] Added missing core_plugins symbolic names
  - [505f902] Big Switch: Catch exceptions in watchdog thread
  - [ac90f9b] Segregate the VSM calls from database calls in N1kv plugin
  - [86e4b80] Fix network profile subtype validation in N1kv plugin
  - [24f2460] ofagent: Add a missing push_vlan action
  - [50408e6] OFA agent: use hexadecimal IP address in tunnel port name
  - [f0af041] Big Switch: Call correct method in watchdog
  - [71097a0] Check DB scheme prior to migration to Ml2
  - [db7f8a7] ofa_neutron_agent: Fix _phys_br_block_untranslated_traffic
  - [d5d345b] Fix race condition with firewall deletion
  - [ce712b2] Metadata agent caches networks for routers
  - [cac3aa8] Ensure routing key is specified in the address for a direct producer
  - [5e0ea72] Default to setting secure mode on the integration bridge
  - [77d8da1] OVS and OF Agents: Create updated_ports attribute before setup_rpc
  - [9268ea6] OFAgent: Process port_update notifications in the main agent loop
  - [9124db5] Remove RPC to plugin when dhcp sets default route
  - [6fd5a20] Improve iptables_manager _modify_rules() method
  - [5285164] Big Switch: fix capabilities retrieval code
  - [ca7ed8f] OVS Agent: limit veth names to 15 chars
  - [7d76335] NSX: Fix request_id in api_client to increment
  - [583db13] NSX: fix tenant_id passed as security_profile_id
  - [066760e] LBaaS add missing rootwrap filter for route
  - [cd7a622] Do not defer IPTables apply in firewall path
  - [315319c] BSN: Set hash header to empty instead of False
  - [5d9a034] Remove function replacement with mock patch
  - [a4b467d] NSX: fix bug for flat provider network
  - [96e580d] Wrong key router.interface reported by ceilometer
  - [9ce5ef3] Common decorator for caching methods
  - [f3fa89f] Fixes Hyper-V agent security groups disabling
  - [6fe2596] Fixes Hyper-V agent security group ICMP rules
  - [5db494d] Add support for multiple RPC workers under Metaplugin
* d/p/disable-failing-metaplugin-tests.patch: Dropped.
* d/p/skip-lb-test.patch: Dropped.
* SECURITY UPDATE: specify /etc/neutron/rootwrap.conf for use with
  neutron-rootwrap
  - CVE-2013-6433 (LP: #1185019)

Corey Bryant (corey.bryant) wrote :

> Can you resync with what we have in the archive.

Chuck, thanks for reviewing. I've resync'd and pushed a new version that is ready for review.

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 2014-06-13 14:18:56 +0000
3+++ debian/changelog 2014-08-08 19:13:18 +0000
4@@ -1,3 +1,84 @@
5+neutron (1:2014.1.2-0ubuntu1) trusty; urgency=medium
6+
7+ * Resynchronize with stable/icehouse (5db494d) (LP: #1354159):
8+ - [1d4a3e3] Add dsvm-functional tox env to fix functional job
9+ - [c19633d] Fix deprecated opt in haproxy driver
10+ - [2c762be] Add configurable http_timeout parameter for Cisco N1K
11+ - [9c94d96] Avoid notifying while inside transaction opened in delete_port()
12+ - [f9379ef] BSN: Remove db lock and add missing contexts
13+ - [bea1e2d] Set python hash seed to 0 in tox.ini
14+ - [f427754] Big Switch: Remove consistency hash on full sync
15+ - [3ad288d] Add -s option for neutron metering rules
16+ - [231010b] Do not mark device as processed if it wasn't
17+ - [72edc13] Big Switch: Lock consistency table for REST calls
18+ - [b65c036] NSX: fix router ports port_security_enabled=False
19+ - [9dcc476] NSX: Remove unneed call to _ensure_default_security_group
20+ - [2ce59ec] Added support for NOS version 4.1.0, 5.0.0 and greater
21+ - [2c4828e] no quota for allowed address pair
22+ - [46a37e2] NSX: neutron router-interface-add should clear security-groups
23+ - [5d0d72b] Control update, delete for cisco-network-profile
24+ - [0459a6a] NSX: return 400 if dscp set for trusted queue
25+ - [d880134] Fix typo in ml2 configuration file
26+ - [fb40f65] Register LBaaS resources to quotas engine
27+ - [0cb4aaa] Make plugin deallocation check optional
28+ - [478f487] Ensure core plugin deallocation after every test
29+ - [ea5ecf9] OVS agent: Correct bridge setup ordering
30+ - [98ef1bc] Fixed dhcp & gateway ip conflict in PLUMgrid plugin
31+ - [38bf2be] Exit rpc_loop when SIGTERM is recieved in ovs-agent
32+ - [67ef62d] NSX sync cache: add a flag to skip item deletion
33+ - [d2c11e5] OFAgent: Avoid processing ports which are not yet ready
34+ - [c02763a] OFAgent: Fixing lost vlan ids on interfaces
35+ - [8d56f44] OFAgent: Improve handling of security group updates
36+ - [63d3a54] OFAgent: Avoid re-wiring ports unnecessarily
37+ - [8131a2e] Synced jsonutils from oslo-incubator
38+ - [33992c8] Brocade mechanism driver depends on the brocade plugin templates
39+ - [1da7abd] ofagent: Fix VLAN usage for TYPE_FLAT and TYPE_VLAN
40+ - [2a79749] netaddr<=0.7.10 raises ValueError instead of AddrFormatError
41+ - [45281bb] Brocade mechanism driver should be derived from ML2 plugin base class
42+ - [3eeda2c] Add missing keyword raise to get_profile_binding function
43+ - [e517da2] Big Switch: Remove unnecessary initialization code
44+ - [2f65656] ovs-agent: Ensure integration bridge is created
45+ - [0324965] remove token from notifier middleware
46+ - [6d62c91] Big Switch: Add missing data to topology sync
47+ - [fac71fe] Added missing core_plugins symbolic names
48+ - [505f902] Big Switch: Catch exceptions in watchdog thread
49+ - [ac90f9b] Segregate the VSM calls from database calls in N1kv plugin
50+ - [86e4b80] Fix network profile subtype validation in N1kv plugin
51+ - [24f2460] ofagent: Add a missing push_vlan action
52+ - [50408e6] OFA agent: use hexadecimal IP address in tunnel port name
53+ - [f0af041] Big Switch: Call correct method in watchdog
54+ - [71097a0] Check DB scheme prior to migration to Ml2
55+ - [db7f8a7] ofa_neutron_agent: Fix _phys_br_block_untranslated_traffic
56+ - [d5d345b] Fix race condition with firewall deletion
57+ - [ce712b2] Metadata agent caches networks for routers
58+ - [cac3aa8] Ensure routing key is specified in the address for a direct producer
59+ - [5e0ea72] Default to setting secure mode on the integration bridge
60+ - [77d8da1] OVS and OF Agents: Create updated_ports attribute before setup_rpc
61+ - [9268ea6] OFAgent: Process port_update notifications in the main agent loop
62+ - [9124db5] Remove RPC to plugin when dhcp sets default route
63+ - [6fd5a20] Improve iptables_manager _modify_rules() method
64+ - [5285164] Big Switch: fix capabilities retrieval code
65+ - [ca7ed8f] OVS Agent: limit veth names to 15 chars
66+ - [7d76335] NSX: Fix request_id in api_client to increment
67+ - [583db13] NSX: fix tenant_id passed as security_profile_id
68+ - [066760e] LBaaS add missing rootwrap filter for route
69+ - [cd7a622] Do not defer IPTables apply in firewall path
70+ - [315319c] BSN: Set hash header to empty instead of False
71+ - [5d9a034] Remove function replacement with mock patch
72+ - [a4b467d] NSX: fix bug for flat provider network
73+ - [96e580d] Wrong key router.interface reported by ceilometer
74+ - [9ce5ef3] Common decorator for caching methods
75+ - [f3fa89f] Fixes Hyper-V agent security groups disabling
76+ - [6fe2596] Fixes Hyper-V agent security group ICMP rules
77+ - [5db494d] Add support for multiple RPC workers under Metaplugin
78+ * d/p/disable-failing-metaplugin-tests.patch: Dropped.
79+ * d/p/skip-lb-test.patch: Dropped.
80+ * SECURITY UPDATE: specify /etc/neutron/rootwrap.conf for use with
81+ neutron-rootwrap
82+ - CVE-2013-6433 (LP: #1185019)
83+
84+ -- Corey Bryant <corey.bryant@canonical.com> Fri, 08 Aug 2014 08:30:52 -0400
85+
86 neutron (1:2014.1.1-0ubuntu1) trusty; urgency=medium
87
88 * Resynchronize with stable/icehouse (54ac82b) (LP: #1328134):
89
90=== modified file 'debian/neutron_sudoers'
91--- debian/neutron_sudoers 2013-07-24 14:07:48 +0000
92+++ debian/neutron_sudoers 2014-08-08 19:13:18 +0000
93@@ -1,3 +1,3 @@
94 Defaults:neutron !requiretty
95
96-neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap
97+neutron ALL = (root) NOPASSWD: /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf *
98
99=== removed file 'debian/patches/disable-failing-metaplugin-tests.patch'
100--- debian/patches/disable-failing-metaplugin-tests.patch 2014-04-01 15:23:04 +0000
101+++ debian/patches/disable-failing-metaplugin-tests.patch 1970-01-01 00:00:00 +0000
102@@ -1,67 +0,0 @@
103-Description: Disable failing metaplugin tests
104- Some metaplugin tests are currently failing in Ubuntu; patch
105- then out until they get resolved in full.
106-Author: James Page <james.page@ubuntu.com>
107-Forwarded: not-needed
108-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1262174
109-
110---- a/neutron/tests/unit/metaplugin/test_basic.py
111-+++ b/neutron/tests/unit/metaplugin/test_basic.py
112-@@ -45,7 +45,14 @@ class TestMetaBasicGet(test_plugin.TestB
113-
114- class TestMetaV2HTTPResponse(test_plugin.TestV2HTTPResponse,
115- MetaPluginV2DBTestCase):
116-- pass
117-+ def test_list_with_fields_noadmin(self):
118-+ pass
119-+
120-+ def test_list_with_fields(self):
121-+ pass
122-+
123-+ def test_list_with_fields_noadmin_and_policy_field(self):
124-+ pass
125-
126-
127- class TestMetaPortsV2(test_plugin.TestPortsV2,
128-@@ -55,7 +62,30 @@ class TestMetaPortsV2(test_plugin.TestPo
129-
130- class TestMetaNetworksV2(test_plugin.TestNetworksV2,
131- MetaPluginV2DBTestCase):
132-- pass
133-+
134-+ def test_list_networks_without_pk_in_fields_pagination_emulated(self):
135-+ pass
136-+
137-+ def test_list_shared_networks_with_non_admin_user(self):
138-+ pass
139-+
140-+ def test_list_networks_with_pagination_emulated(self):
141-+ pass
142-+
143-+ def test_list_networks_with_sort_emulated(self):
144-+ pass
145-+
146-+ def test_list_networks_with_pagination_reverse_emulated(self):
147-+ pass
148-+
149-+ def test_list_networks_with_parameters(self):
150-+ pass
151-+
152-+ def test_list_networks_with_fields(self):
153-+ pass
154-+
155-+ def test_list_networks(self):
156-+ pass
157-
158-
159- class TestMetaSubnetsV2(test_plugin.TestSubnetsV2,
160---- a/neutron/tests/unit/metaplugin/test_metaplugin.py
161-+++ b/neutron/tests/unit/metaplugin/test_metaplugin.py
162-@@ -167,6 +167,7 @@ class MetaNeutronPluginV2Test(base.BaseT
163- return data
164-
165- def test_create_delete_network(self):
166-+ return
167- network1 = self._fake_network('fake1')
168- ret1 = self.plugin.create_network(self.context, network1)
169- self.assertEqual('fake1', ret1[FLAVOR_NETWORK])
170
171=== modified file 'debian/patches/series'
172--- debian/patches/series 2014-03-04 14:57:03 +0000
173+++ debian/patches/series 2014-08-08 19:13:18 +0000
174@@ -1,6 +1,4 @@
175 fix-quantum-configuration.patch
176 disable-udev-tests.patch
177-disable-failing-metaplugin-tests.patch
178-skip-lb-test.patch
179 skip-ipv6-tests.patch
180 use-concurrency.patch
181
182=== removed file 'debian/patches/skip-lb-test.patch'
183--- debian/patches/skip-lb-test.patch 2014-04-01 15:23:04 +0000
184+++ debian/patches/skip-lb-test.patch 1970-01-01 00:00:00 +0000
185@@ -1,13 +0,0 @@
186-Description: Temporarily Skip LB test
187-Author: Chuck Short <zulcss@ubuntu.com>
188-Forwarded: Not Needed
189---- a/neutron/tests/unit/test_provider_configuration.py
190-+++ b/neutron/tests/unit/test_provider_configuration.py
191-@@ -79,6 +79,7 @@ class ParseServiceProviderConfigurationT
192- 'default': True}])
193-
194- def test_parse_service_provider_opt_not_allowed_raises(self):
195-+ self.skipTest('Skipped by Ubuntu')
196- cfg.CONF.set_override('service_provider',
197- [constants.LOADBALANCER +
198- ':lbaas:driver_path',

Subscribers

People subscribed via source and target branches