Merge "instance model: fix extraction of ip addresses from instance record"

1 files changed, 9 insertions, 9 deletions

diff --git a/trove/instance/models.py b/trove/instance/models.py
index fe424bc8..e09ea77a 100644
--- a/trove/instance/models.py
+++ b/trove/instance/models.py
@@ -262,18 +262,18 @@ class SimpleInstance(object):
 
     def get_visible_ip_addresses(self):
         """Returns IPs that will be visible to the user."""
-        if self.addresses is None:
+        if not self.addresses:
             return None
 
         IPs = []
-
-        for addr_info in self.addresses:
-            if CONF.ip_regex and CONF.black_list_regex:
-                if not ip_visible(addr_info['address'], CONF.ip_regex,
-                                  CONF.black_list_regex):
-                    continue
-
-            IPs.append(addr_info)
+        for address_list in self.addresses.values():
+            for addr_info in address_list:
+                if CONF.ip_regex and CONF.black_list_regex:
+                    if not ip_visible(addr_info['addr'], CONF.ip_regex,
+                                      CONF.black_list_regex):
+                        continue
+
+                IPs.append(addr_info['addr'])
 
         return IPs