Fix Octavia gate breakage caused by _get_columns()

Nir Magnezi · Nir Magnezi · commit 142c5faae38c · 2017-01-09T16:44:08.000+02:00
The above mentioned function tries to extract keys() from an item which
is type class.

This patch fixes the issue by converting item to dict by using
to_dict().

Change-Id: Ida520ae9fe64171d105f486ba06eda127a24547b
Closes-Bug: #1654887
diff --git a/openstackclient/network/v2/security_group.py b/openstackclient/network/v2/security_group.py
@@ -74,7 +74,7 @@ def _format_compute_security_group_rules(sg_rules):
 def _get_columns(item):
     # Build the display columns and a list of the property columns
     # that need to be mapped (display column name, property name).
-    columns = list(item.keys())
+    columns = list(item.to_dict().keys())
     property_column_mappings = []
     if 'security_group_rules' in columns:
         columns.append('rules')
@@ -156,7 +156,7 @@ def take_action_compute(self, client, parsed_args):
             parsed_args.name,
             description,
         )
-        display_columns, property_columns = _get_columns(obj._info)
+        display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
             obj._info,
             property_columns,
@@ -336,7 +336,7 @@ def take_action_compute(self, client, parsed_args):
             client.security_groups,
             parsed_args.group,
         )
-        display_columns, property_columns = _get_columns(obj._info)
+        display_columns, property_columns = _get_columns(obj)
         data = utils.get_dict_properties(
             obj._info,
             property_columns,
diff --git a/openstackclient/tests/functional/network/v2/test_security_group.py b/openstackclient/tests/functional/network/v2/test_security_group.py
@@ -12,8 +12,6 @@
 
 import uuid
 
-import testtools
-
 from openstackclient.tests.functional import base
 
 
@@ -25,7 +23,6 @@ class SecurityGroupTests(base.TestCase):
     FIELDS = ['name']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         opts = cls.get_opts(cls.FIELDS)
         raw_output = cls.openstack('security group create ' + cls.NAME + opts)
diff --git a/openstackclient/tests/functional/network/v2/test_security_group_rule.py b/openstackclient/tests/functional/network/v2/test_security_group_rule.py
@@ -26,7 +26,6 @@ class SecurityGroupRuleTests(base.TestCase):
     ID_HEADER = ['ID']
 
     @classmethod
-    @testtools.skip('broken SDK testing')
     def setUpClass(cls):
         # Create the security group to hold the rule.
         opts = cls.get_opts(cls.NAME_FIELD)
@@ -55,6 +54,7 @@ def tearDownClass(cls):
                                    cls.SECURITY_GROUP_NAME)
         cls.assertOutput('', raw_output)
 
+    @testtools.skip('broken SDK testing')
     def test_security_group_rule_list(self):
         opts = self.get_opts(self.ID_HEADER)
         raw_output = self.openstack('security group rule list ' +
diff --git a/openstackclient/tests/unit/fakes.py b/openstackclient/tests/unit/fakes.py
@@ -212,6 +212,9 @@ def __repr__(self):
     def keys(self):
         return self._info.keys()
 
+    def to_dict(self):
+        return self._info
+
     @property
     def info(self):
         return self._info
