openstack
/
python-ironic-inspector-client
Code Issues Proposed changes

Merge "Clean imports in code"

This commit is contained in:
Zuul 2018-03-09 17:17:14 +00:00 committed by Gerrit Code Review
parent 0dd0d43e4a 47b86dfb13
commit 6bd4819a39
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ironic_inspector_client/test/test_shell.py
View File

@ -13,7 +13,7 @@
import sys
from collections import OrderedDict
import collections
import mock
from osc_lib.tests import utils
import six
@ -438,7 +438,7 @@ class TestInterfaceCmds(BaseTest):
def test_show(self):
self.client.get_data.return_value = self.inspector_db
data = OrderedDict(
data = collections.OrderedDict(
[('node_ident', "uuid1"),
('interface', "em1"),
('mac', "00:11:22:33:44:55"),
@ -480,15 +480,15 @@ class TestInterfaceCmds(BaseTest):
def test_show_field(self):
self.client.get_data.return_value = self.inspector_db
data = OrderedDict([('node_ident', "uuid1"),
('interface', "em1"),
('switch_port_vlans',
[{"id": 101, "name": "vlan101"},
{"id": 102, "name": "vlan102"},
{"id": 104, "name": "vlan104"},
{"id": 201, "name": "vlan201"},
{"id": 203, "name": "vlan203"}])
])
data = collections.OrderedDict([('node_ident', "uuid1"),
('interface', "em1"),
('switch_port_vlans',
[{"id": 101, "name": "vlan101"},
{"id": 102, "name": "vlan102"},
{"id": 104, "name": "vlan104"},
{"id": 201, "name": "vlan201"},
{"id": 203, "name": "vlan203"}])
])
self.client.get_interface_data.return_value = data

6
ironic_inspector_client/test/test_v1.py
View File

@ -11,7 +11,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from collections import OrderedDict
import collections
import six
import unittest
@ -406,7 +406,7 @@ class TestInterfaceApi(BaseTest):
"switch_chassis_id", "switch_port_id",
"switch_port_mtu", "switch_port_vlans", "switch_foo"]
expected_values = OrderedDict(
expected_values = collections.OrderedDict(
[('node_ident', self.uuid),
('interface', "em1"),
('mac', "00:11:22:33:44:55"),
@ -428,7 +428,7 @@ class TestInterfaceApi(BaseTest):
self.assertEqual(expected_values, iface_dict)
# Test interface name not in 'all_interfaces'
expected_values = OrderedDict()
expected_values = collections.OrderedDict()
iface_dict = self.get_client().get_interface_data(
self.uuid, "em55", fields)
self.assertEqual(expected_values, iface_dict)

4
ironic_inspector_client/v1.py
View File

@ -13,7 +13,7 @@
"""Client for V1 API."""
from collections import OrderedDict
import collections
import logging
import time
@ -275,7 +275,7 @@ class ClientV1(http.BaseClient):
:returns: interface data in OrderedDict
"""
# Use OrderedDict to maintain order of user-entered fields
iface_data = OrderedDict()
iface_data = collections.OrderedDict()
data = self.get_data(node_ident)
all_interfaces = data.get('all_interfaces', [])