From 2232142a54a8697056064ad30196c698df145a55 Mon Sep 17 00:00:00 2001 From: tzumainn Date: Tue, 5 Sep 2017 16:04:00 -0400 Subject: [PATCH] Merge pull request #90 from mansam/fix-network-port-subnet-collection Old Refresh: Don't error out if a port refers to an unknown subnet. (cherry picked from commit c7c8332e68633188b220ee8948963c254506ce29) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1564264 --- .../providers/openstack/network_manager/refresh_parser.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/manageiq/providers/openstack/network_manager/refresh_parser.rb b/app/models/manageiq/providers/openstack/network_manager/refresh_parser.rb index 324f7244ca4..e12fd465df3 100644 --- a/app/models/manageiq/providers/openstack/network_manager/refresh_parser.rb +++ b/app/models/manageiq/providers/openstack/network_manager/refresh_parser.rb @@ -208,7 +208,7 @@ def find_device_object(network_port) subnet_id = network_port.fixed_ips.try(:first).try(:[], "subnet_id") network_router = @data_index.fetch_path(:network_routers, network_port.device_id) subnet = @data_index.fetch_path(:cloud_subnets, subnet_id) - subnet[:network_router] = network_router + subnet[:network_router] = network_router unless subnet.nil? end # Returning nil for non VM port, we don't want to store those as ports nil