components/openstack/horizon/patches/08-_get_reachable_subnets.patch
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4072 db0cec748ec0
child 6856 356aeea98c39
--- a/components/openstack/horizon/patches/08-_get_reachable_subnets.patch	Mon May 16 14:46:20 2016 +0200
+++ b/components/openstack/horizon/patches/08-_get_reachable_subnets.patch	Fri May 20 17:42:29 2016 -0400
@@ -3,15 +3,15 @@
 report will be filed to cover the regression and eventually this patch
 should be replaced with something official.
 
---- horizon-2014.2.2/openstack_dashboard/api/neutron.py.orig	2015-02-05 09:06:50.000000000 -0800
-+++ horizon-2014.2.2/openstack_dashboard/api/neutron.py	2015-03-22 21:56:14.619688527 -0700
-@@ -411,8 +411,7 @@ class FloatingIpManager(network_base.Flo
+--- horizon-2015.1.2/openstack_dashboard/api/neutron.py.orig	2015-12-12 16:12:01.520290169 -0500
++++ horizon-2015.1.2/openstack_dashboard/api/neutron.py	2015-12-12 16:14:28.179524164 -0500
+@@ -431,8 +431,7 @@
                            in ext_net_ids)]
          reachable_subnets = set([p.fixed_ips[0]['subnet_id'] for p in ports
-                                  if ((p.device_owner ==
--                                      'network:router_interface')
--                                     and (p.device_id in gw_routers))])
-+                                      'network:router_interface'))])
-         return reachable_subnets
- 
-     def list_targets(self):
+                                 if ((p.device_owner in
+-                                     ROUTER_INTERFACE_OWNERS)
+-                                    and (p.device_id in gw_routers))])
++                                     ROUTER_INTERFACE_OWNERS))])
+         # we have to include any shared subnets as well because we may not
+         # have permission to see the router interface to infer connectivity
+         shared = set([s.id for n in network_list(self.request, shared=True)