Merge lp:~james-page/neutron/grizzly-fix-ppa into lp:~openstack-ubuntu-testing/neutron/grizzly
- grizzly-fix-ppa
- Merge into grizzly
Proposed by
James Page
Status: | Merged |
---|---|
Approved by: | Yolanda Robla |
Approved revision: | 141 |
Merged at revision: | 140 |
Proposed branch: | lp:~james-page/neutron/grizzly-fix-ppa |
Merge into: | lp:~openstack-ubuntu-testing/neutron/grizzly |
Diff against target: |
218 lines (+53/-39) 3 files modified
debian/changelog (+4/-0) debian/patches/fix-quantum-configuration.patch (+31/-29) debian/patches/fix-ubuntu-tests.patch (+18/-10) |
To merge this branch: | bzr merge lp:~james-page/neutron/grizzly-fix-ppa |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Yolanda Robla (community) | Approve | ||
Review via email: mp+151436@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
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-03 22:59:19 +0000 | |||
3 | +++ debian/changelog 2013-03-04 09:10:52 +0000 | |||
4 | @@ -16,6 +16,10 @@ | |||
5 | 16 | * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent | 16 | * d/control,quantum-lbaas-*: Added Load Balancing as-a Service agent |
6 | 17 | package. | 17 | package. |
7 | 18 | * d/control: Bumped Standards-Version, no changes. | 18 | * d/control: Bumped Standards-Version, no changes. |
8 | 19 | * d/p/fix-quantum-configuration.patch: Added midonet sqlite path to | ||
9 | 20 | patch, fixed up linuxbridge path. | ||
10 | 21 | * d/p/fix-ubuntu-tests.patch: Re-added skipTest for linuxbridge tests | ||
11 | 22 | that attempt to setup udev monitors. | ||
12 | 19 | 23 | ||
13 | 20 | -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -0600 | 24 | -- Chuck Short <zulcss@ubuntu.com> Tue, 26 Feb 2013 08:27:14 -0600 |
14 | 21 | 25 | ||
15 | 22 | 26 | ||
16 | === modified file 'debian/patches/fix-quantum-configuration.patch' | |||
17 | --- debian/patches/fix-quantum-configuration.patch 2013-02-26 14:32:08 +0000 | |||
18 | +++ debian/patches/fix-quantum-configuration.patch 2013-03-04 09:10:52 +0000 | |||
19 | @@ -1,6 +1,5 @@ | |||
23 | 1 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini | 1 | --- a/etc/quantum/plugins/bigswitch/restproxy.ini |
24 | 2 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-26 08:24:56.000000000 -0600 | 2 | +++ b/etc/quantum/plugins/bigswitch/restproxy.ini |
22 | 3 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/bigswitch/restproxy.ini 2013-02-26 08:29:05.948260373 -0600 | ||
25 | 4 | @@ -6,7 +6,7 @@ | 3 | @@ -6,7 +6,7 @@ |
26 | 5 | # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum | 4 | # sql_connection = mysql://root:pass@127.0.0.1:3306/restproxy_quantum |
27 | 6 | # Replace 127.0.0.1 above with the IP address of the database used by the | 5 | # Replace 127.0.0.1 above with the IP address of the database used by the |
28 | @@ -10,9 +9,8 @@ | |||
29 | 10 | # Database reconnection retry times - in event connectivity is lost | 9 | # Database reconnection retry times - in event connectivity is lost |
30 | 11 | # set to -1 implies an infinite retry count | 10 | # set to -1 implies an infinite retry count |
31 | 12 | # sql_max_retries = 10 | 11 | # sql_max_retries = 10 |
35 | 13 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini | 12 | --- a/etc/quantum/plugins/brocade/brocade.ini |
36 | 14 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/brocade/brocade.ini 2013-02-26 08:24:56.000000000 -0600 | 13 | +++ b/etc/quantum/plugins/brocade/brocade.ini |
34 | 15 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/brocade/brocade.ini 2013-02-26 08:29:05.952260373 -0600 | ||
37 | 16 | @@ -11,7 +11,7 @@ | 14 | @@ -11,7 +11,7 @@ |
38 | 17 | # ostype = NOS | 15 | # ostype = NOS |
39 | 18 | 16 | ||
40 | @@ -22,21 +20,19 @@ | |||
41 | 22 | # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, | 20 | # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, |
42 | 23 | # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. | 21 | # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. |
43 | 24 | # sql_dbpool_enable = False | 22 | # sql_dbpool_enable = False |
47 | 25 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini | 23 | --- a/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini |
48 | 26 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-26 08:24:56.000000000 -0600 | 24 | +++ b/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini |
46 | 27 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/linuxbridge/linuxbridge_conf.ini 2013-02-26 08:29:05.948260373 -0600 | ||
49 | 28 | @@ -26,7 +26,7 @@ | 25 | @@ -26,7 +26,7 @@ |
50 | 29 | # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge | 26 | # sql_connection = mysql://root:nova@127.0.0.1:3306/quantum_linux_bridge |
51 | 30 | # Replace 127.0.0.1 above with the IP address of the database used by the | 27 | # Replace 127.0.0.1 above with the IP address of the database used by the |
52 | 31 | # main quantum server. (Leave it as is if the database runs on this host.) | 28 | # main quantum server. (Leave it as is if the database runs on this host.) |
53 | 32 | -sql_connection = sqlite:// | 29 | -sql_connection = sqlite:// |
55 | 33 | +sql_connection = sqlite:///var/lib/quantum/linuxbridge.sqlite | 30 | +sql_connection = sqlite:////var/lib/quantum/linuxbridge.sqlite |
56 | 34 | # Database reconnection retry times - in event connectivity is lost | 31 | # Database reconnection retry times - in event connectivity is lost |
57 | 35 | # set to -1 implies an infinite retry count | 32 | # set to -1 implies an infinite retry count |
58 | 36 | # sql_max_retries = 10 | 33 | # sql_max_retries = 10 |
62 | 37 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini | 34 | --- a/etc/quantum/plugins/nec/nec.ini |
63 | 38 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nec/nec.ini 2013-02-26 08:24:56.000000000 -0600 | 35 | +++ b/etc/quantum/plugins/nec/nec.ini |
61 | 39 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nec/nec.ini 2013-02-26 08:29:05.948260373 -0600 | ||
64 | 40 | @@ -6,7 +6,7 @@ | 36 | @@ -6,7 +6,7 @@ |
65 | 41 | # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum | 37 | # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum |
66 | 42 | # Replace 127.0.0.1 above with the IP address of the database used by the | 38 | # Replace 127.0.0.1 above with the IP address of the database used by the |
67 | @@ -55,9 +51,8 @@ | |||
68 | 55 | 51 | ||
69 | 56 | [SECURITYGROUP] | 52 | [SECURITYGROUP] |
70 | 57 | # Firewall driver for realizing quantum security group function | 53 | # Firewall driver for realizing quantum security group function |
74 | 58 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini | 54 | --- a/etc/quantum/plugins/nicira/nvp.ini |
75 | 59 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/nicira/nvp.ini 2013-02-26 08:24:56.000000000 -0600 | 55 | +++ b/etc/quantum/plugins/nicira/nvp.ini |
73 | 60 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/nicira/nvp.ini 2013-02-26 08:29:05.948260373 -0600 | ||
76 | 61 | @@ -4,7 +4,7 @@ | 56 | @@ -4,7 +4,7 @@ |
77 | 62 | # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum | 57 | # sql_connection = mysql://root:quantum@127.0.0.1:3306/nvp_quantum |
78 | 63 | # Replace 127.0.0.1 above with the IP address of the database used by the | 58 | # Replace 127.0.0.1 above with the IP address of the database used by the |
79 | @@ -67,9 +62,8 @@ | |||
80 | 67 | # Database reconnection retry times - in event connectivity is lost | 62 | # Database reconnection retry times - in event connectivity is lost |
81 | 68 | # set to -1 implies an infinite retry count | 63 | # set to -1 implies an infinite retry count |
82 | 69 | # sql_max_retries = 10 | 64 | # sql_max_retries = 10 |
86 | 70 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini | 65 | --- a/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |
87 | 71 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-26 08:24:56.000000000 -0600 | 66 | +++ b/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini |
85 | 72 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/openvswitch/ovs_quantum_plugin.ini 2013-02-26 08:29:05.948260373 -0600 | ||
88 | 73 | @@ -4,7 +4,7 @@ | 67 | @@ -4,7 +4,7 @@ |
89 | 74 | # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum | 68 | # sql_connection = mysql://root:nova@127.0.0.1:3306/ovs_quantum |
90 | 75 | # Replace 127.0.0.1 above with the IP address of the database used by the | 69 | # Replace 127.0.0.1 above with the IP address of the database used by the |
91 | @@ -79,9 +73,8 @@ | |||
92 | 79 | # Database reconnection retry times - in event connectivity is lost | 73 | # Database reconnection retry times - in event connectivity is lost |
93 | 80 | # set to -1 implies an infinite retry count | 74 | # set to -1 implies an infinite retry count |
94 | 81 | # sql_max_retries = 10 | 75 | # sql_max_retries = 10 |
98 | 82 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini | 76 | --- a/etc/quantum/plugins/plumgrid/plumgrid.ini |
99 | 83 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-02-26 08:24:56.000000000 -0600 | 77 | +++ b/etc/quantum/plugins/plumgrid/plumgrid.ini |
97 | 84 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/plumgrid/plumgrid.ini 2013-02-26 08:29:05.948260373 -0600 | ||
100 | 85 | @@ -6,7 +6,7 @@ | 78 | @@ -6,7 +6,7 @@ |
101 | 86 | # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum | 79 | # sql_connection = mysql://<user>:<pass>@<host>:3306/plumgrid_quantum |
102 | 87 | # Replace <host> above with the IP address of the database used by the | 80 | # Replace <host> above with the IP address of the database used by the |
103 | @@ -91,9 +84,8 @@ | |||
104 | 91 | # Database reconnection retry times - in event connectivity is lost | 84 | # Database reconnection retry times - in event connectivity is lost |
105 | 92 | # set to -1 implies an infinite retry count | 85 | # set to -1 implies an infinite retry count |
106 | 93 | # sql_max_retries = 10 | 86 | # sql_max_retries = 10 |
110 | 94 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini | 87 | --- a/etc/quantum/plugins/ryu/ryu.ini |
111 | 95 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum/plugins/ryu/ryu.ini 2013-02-26 08:24:56.000000000 -0600 | 88 | +++ b/etc/quantum/plugins/ryu/ryu.ini |
109 | 96 | +++ quantum-2013.1.a38.g511ac76/etc/quantum/plugins/ryu/ryu.ini 2013-02-26 08:29:05.948260373 -0600 | ||
112 | 97 | @@ -2,7 +2,7 @@ | 89 | @@ -2,7 +2,7 @@ |
113 | 98 | # This line MUST be changed to actually run the plugin. | 90 | # This line MUST be changed to actually run the plugin. |
114 | 99 | # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum | 91 | # Example: sql_connection = mysql://root:nova@127.0.0.1:3306/ryu_quantum |
115 | @@ -103,9 +95,8 @@ | |||
116 | 103 | # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, | 95 | # Enable the use of eventlet's db_pool for MySQL. The flags sql_min_pool_size, |
117 | 104 | # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. | 96 | # sql_max_pool_size and sql_idle_timeout are relevant only if this is enabled. |
118 | 105 | # sql_dbpool_enable = False | 97 | # sql_dbpool_enable = False |
122 | 106 | diff -Naurp quantum-2013.1.a38.g511ac76.orig/etc/quantum.conf quantum-2013.1.a38.g511ac76/etc/quantum.conf | 98 | --- a/etc/quantum.conf |
123 | 107 | --- quantum-2013.1.a38.g511ac76.orig/etc/quantum.conf 2013-02-26 08:24:56.000000000 -0600 | 99 | +++ b/etc/quantum.conf |
121 | 108 | +++ quantum-2013.1.a38.g511ac76/etc/quantum.conf 2013-02-26 08:29:05.948260373 -0600 | ||
124 | 109 | @@ -43,12 +43,13 @@ bind_port = 9696 | 100 | @@ -43,12 +43,13 @@ bind_port = 9696 |
125 | 110 | 101 | ||
126 | 111 | # Quantum plugin provider module | 102 | # Quantum plugin provider module |
127 | @@ -121,7 +112,7 @@ | |||
128 | 121 | 112 | ||
129 | 122 | # The strategy to be used for auth. | 113 | # The strategy to be used for auth. |
130 | 123 | # Supported values are 'keystone'(default), 'noauth'. | 114 | # Supported values are 'keystone'(default), 'noauth'. |
132 | 124 | @@ -226,6 +227,7 @@ notification_topics = notifications | 115 | @@ -251,6 +252,7 @@ notification_topics = notifications |
133 | 125 | # root filter facility. | 116 | # root filter facility. |
134 | 126 | # Change to "sudo" to skip the filtering and just run the comand directly | 117 | # Change to "sudo" to skip the filtering and just run the comand directly |
135 | 127 | # root_helper = sudo | 118 | # root_helper = sudo |
136 | @@ -129,3 +120,14 @@ | |||
137 | 129 | 120 | ||
138 | 130 | # =========== items for agent management extension ============= | 121 | # =========== items for agent management extension ============= |
139 | 131 | # seconds between nodes reporting state to server, should be less than | 122 | # seconds between nodes reporting state to server, should be less than |
140 | 123 | --- a/etc/quantum/plugins/midonet/midonet.ini | ||
141 | 124 | +++ b/etc/quantum/plugins/midonet/midonet.ini | ||
142 | 125 | @@ -4,7 +4,7 @@ | ||
143 | 126 | # sql_connection = mysql://root:pass@127.0.0.1:3306/midonet_quantum | ||
144 | 127 | # Replace 127.0.0.1 above with the IP address of the database used by the | ||
145 | 128 | # main quantum server. (Leave it as is if the database runs on this host.) | ||
146 | 129 | -sql_connection = sqlite:// | ||
147 | 130 | +sql_connection = sqlite:////var/lib/quantum/midonet.sqlite | ||
148 | 131 | # Database reconnection retry times - in event connectivity is lost | ||
149 | 132 | # set to -1 implies an infinite retry count | ||
150 | 133 | # sql_max_retries = 10 | ||
151 | 132 | 134 | ||
152 | === modified file 'debian/patches/fix-ubuntu-tests.patch' | |||
153 | --- debian/patches/fix-ubuntu-tests.patch 2013-02-27 15:02:09 +0000 | |||
154 | +++ debian/patches/fix-ubuntu-tests.patch 2013-03-04 09:10:52 +0000 | |||
155 | @@ -1,6 +1,5 @@ | |||
159 | 1 | diff -Naurp quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/midonet/test_midonet_plugin.py quantum-2013.1.a49.g598483f/quantum/tests/unit/midonet/test_midonet_plugin.py | 1 | --- a/quantum/tests/unit/midonet/test_midonet_plugin.py |
160 | 2 | --- quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/midonet/test_midonet_plugin.py 2013-02-27 07:42:40.000000000 -0600 | 2 | +++ b/quantum/tests/unit/midonet/test_midonet_plugin.py |
158 | 3 | +++ quantum-2013.1.a49.g598483f/quantum/tests/unit/midonet/test_midonet_plugin.py 2013-02-27 08:59:59.752884924 -0600 | ||
161 | 4 | @@ -470,6 +470,7 @@ class TestMidonetSubnetsV2(test_plugin.T | 3 | @@ -470,6 +470,7 @@ class TestMidonetSubnetsV2(test_plugin.T |
162 | 5 | self).test_create_subnet_with_one_host_route() | 4 | self).test_create_subnet_with_one_host_route() |
163 | 6 | 5 | ||
164 | @@ -9,10 +8,9 @@ | |||
165 | 9 | _bridge, _subnet = self._setup_subnet_mocks() | 8 | _bridge, _subnet = self._setup_subnet_mocks() |
166 | 10 | super(TestMidonetSubnetsV2, | 9 | super(TestMidonetSubnetsV2, |
167 | 11 | self).test_create_subnet_with_two_host_routes() | 10 | self).test_create_subnet_with_two_host_routes() |
172 | 12 | diff -Naurp quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/test_db_plugin.py quantum-2013.1.a49.g598483f/quantum/tests/unit/test_db_plugin.py | 11 | --- a/quantum/tests/unit/test_db_plugin.py |
173 | 13 | --- quantum-2013.1.a49.g598483f.orig/quantum/tests/unit/test_db_plugin.py 2013-02-27 07:42:40.000000000 -0600 | 12 | +++ b/quantum/tests/unit/test_db_plugin.py |
174 | 14 | +++ quantum-2013.1.a49.g598483f/quantum/tests/unit/test_db_plugin.py 2013-02-27 09:01:30.136884968 -0600 | 13 | @@ -1392,6 +1392,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_ |
171 | 15 | @@ -1371,6 +1371,7 @@ fixed_ips=ip_address%%3D%s&fixed_ips=ip_ | ||
175 | 16 | self._delete('ports', port4['port']['id']) | 14 | self._delete('ports', port4['port']['id']) |
176 | 17 | 15 | ||
177 | 18 | def test_range_allocation(self): | 16 | def test_range_allocation(self): |
178 | @@ -20,7 +18,7 @@ | |||
179 | 20 | with self.subnet(gateway_ip='10.0.0.3', | 18 | with self.subnet(gateway_ip='10.0.0.3', |
180 | 21 | cidr='10.0.0.0/29') as subnet: | 19 | cidr='10.0.0.0/29') as subnet: |
181 | 22 | kwargs = {"fixed_ips": | 20 | kwargs = {"fixed_ips": |
183 | 23 | @@ -2270,6 +2271,7 @@ class TestNetworksV2(QuantumDbPluginV2Te | 21 | @@ -2291,6 +2292,7 @@ class TestNetworksV2(QuantumDbPluginV2Te |
184 | 24 | class TestSubnetsV2(QuantumDbPluginV2TestCase): | 22 | class TestSubnetsV2(QuantumDbPluginV2TestCase): |
185 | 25 | 23 | ||
186 | 26 | def _test_create_subnet(self, network=None, expected=None, **kwargs): | 24 | def _test_create_subnet(self, network=None, expected=None, **kwargs): |
187 | @@ -28,7 +26,7 @@ | |||
188 | 28 | keys = kwargs.copy() | 26 | keys = kwargs.copy() |
189 | 29 | keys.setdefault('cidr', '10.0.0.0/24') | 27 | keys.setdefault('cidr', '10.0.0.0/24') |
190 | 30 | keys.setdefault('ip_version', 4) | 28 | keys.setdefault('ip_version', 4) |
192 | 31 | @@ -3257,6 +3259,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes | 29 | @@ -3278,6 +3280,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes |
193 | 32 | host_routes=host_routes) | 30 | host_routes=host_routes) |
194 | 33 | 31 | ||
195 | 34 | def test_create_subnet_with_two_host_routes(self): | 32 | def test_create_subnet_with_two_host_routes(self): |
196 | @@ -36,7 +34,7 @@ | |||
197 | 36 | gateway_ip = '10.0.0.1' | 34 | gateway_ip = '10.0.0.1' |
198 | 37 | cidr = '10.0.0.0/24' | 35 | cidr = '10.0.0.0/24' |
199 | 38 | allocation_pools = [{'start': '10.0.0.2', | 36 | allocation_pools = [{'start': '10.0.0.2', |
201 | 39 | @@ -3361,6 +3364,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes | 37 | @@ -3382,6 +3385,7 @@ class TestSubnetsV2(QuantumDbPluginV2Tes |
202 | 40 | self.assertEqual(res.status_int, 400) | 38 | self.assertEqual(res.status_int, 400) |
203 | 41 | 39 | ||
204 | 42 | def test_delete_subnet_with_dns(self): | 40 | def test_delete_subnet_with_dns(self): |
205 | @@ -44,3 +42,13 @@ | |||
206 | 44 | gateway_ip = '10.0.0.1' | 42 | gateway_ip = '10.0.0.1' |
207 | 45 | cidr = '10.0.0.0/24' | 43 | cidr = '10.0.0.0/24' |
208 | 46 | dns_nameservers = ['1.2.3.4'] | 44 | dns_nameservers = ['1.2.3.4'] |
209 | 45 | --- a/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py | ||
210 | 46 | +++ b/quantum/tests/unit/linuxbridge/test_lb_quantum_agent.py | ||
211 | 47 | @@ -26,6 +26,7 @@ class TestLinuxBridge(testtools.TestCase | ||
212 | 48 | |||
213 | 49 | def setUp(self): | ||
214 | 50 | super(TestLinuxBridge, self).setUp() | ||
215 | 51 | + self.skipTest('No udev access on Ubuntu buildd.') | ||
216 | 52 | self.addCleanup(cfg.CONF.reset) | ||
217 | 53 | interface_mappings = {'physnet1': 'eth1'} | ||
218 | 54 | root_helper = cfg.CONF.AGENT.root_helper |
Looks good to me