Merge "Add "os port show" command"

2 files changed, 125 insertions, 4 deletions

diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index 95c5aca6..812a64af 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -172,15 +172,31 @@ class FakePort(object):
         :param Dictionary methods:
             A dictionary with all methods
         :return:
-            A FakeResource object, with id, name, admin_state_up,
-            status, tenant_id
+            A FakeResource object, with id, name, etc.
         """
+
         # Set default attributes.
         port_attrs = {
+            'admin_state_up': True,
+            'allowed_address_pairs': [{}],
+            'binding:host_id': 'binding-host-id-' + uuid.uuid4().hex,
+            'binding:profile': {},
+            'binding:vif_details': {},
+            'binding:vif_type': 'ovs',
+            'binding:vnic_type': 'normal',
+            'device_id': 'device-id-' + uuid.uuid4().hex,
+            'device_owner': 'compute:nova',
+            'dns_assignment': [{}],
+            'dns_name': 'dns-name-' + uuid.uuid4().hex,
+            'extra_dhcp_opts': [{}],
+            'fixed_ips': [{}],
             'id': 'port-id-' + uuid.uuid4().hex,
+            'mac_address': 'fa:16:3e:a9:4e:72',
             'name': 'port-name-' + uuid.uuid4().hex,
+            'network_id': 'network-id-' + uuid.uuid4().hex,
+            'port_security_enabled': True,
+            'security_groups': [],
             'status': 'ACTIVE',
-            'admin_state_up': True,
             'tenant_id': 'project-id-' + uuid.uuid4().hex,
         }
 
@@ -188,7 +204,16 @@ class FakePort(object):
         port_attrs.update(attrs)
 
         # Set default methods.
-        port_methods = {}
+        port_methods = {
+            'keys': ['admin_state_up', 'allowed_address_pairs',
+                     'binding:host_id', 'binding:profile',
+                     'binding:vif_details', 'binding:vif_type',
+                     'binding:vnic_type', 'device_id', 'device_owner',
+                     'dns_assignment', 'dns_name', 'extra_dhcp_opts',
+                     'fixed_ips', 'id', 'mac_address', 'name',
+                     'network_id', 'port_security_enabled',
+                     'security_groups', 'status', 'tenant_id'],
+        }
 
         # Overwrite default methods.
         port_methods.update(methods)
@@ -196,6 +221,15 @@ class FakePort(object):
         port = fakes.FakeResource(info=copy.deepcopy(port_attrs),
                                   methods=copy.deepcopy(port_methods),
                                   loaded=True)
+
+        # Set attributes with special mappings.
+        port.project_id = port_attrs['tenant_id']
+        port.binding_host_id = port_attrs['binding:host_id']
+        port.binding_profile = port_attrs['binding:profile']
+        port.binding_vif_details = port_attrs['binding:vif_details']
+        port.binding_vif_type = port_attrs['binding:vif_type']
+        port.binding_vnic_type = port_attrs['binding:vnic_type']
+
         return port
 
     @staticmethod
diff --git a/openstackclient/tests/network/v2/test_port.py b/openstackclient/tests/network/v2/test_port.py
index a1ddefa1..bc246bd8 100644
--- a/openstackclient/tests/network/v2/test_port.py
+++ b/openstackclient/tests/network/v2/test_port.py
@@ -13,8 +13,10 @@
 
 import mock
 
+from openstackclient.common import utils
 from openstackclient.network.v2 import port
 from openstackclient.tests.network.v2 import fakes as network_fakes
+from openstackclient.tests import utils as tests_utils
 
 
 class TestPort(network_fakes.TestNetworkV2):
@@ -51,3 +53,88 @@ class TestDeletePort(TestPort):
         result = self.cmd.take_action(parsed_args)
         self.network.delete_port.assert_called_with(self._port)
         self.assertIsNone(result)
+
+
+class TestShowPort(TestPort):
+
+    # The port to show.
+    _port = network_fakes.FakePort.create_one_port()
+
+    columns = (
+        'admin_state_up',
+        'allowed_address_pairs',
+        'binding_host_id',
+        'binding_profile',
+        'binding_vif_details',
+        'binding_vif_type',
+        'binding_vnic_type',
+        'device_id',
+        'device_owner',
+        'dns_assignment',
+        'dns_name',
+        'extra_dhcp_opts',
+        'fixed_ips',
+        'id',
+        'mac_address',
+        'name',
+        'network_id',
+        'port_security_enabled',
+        'project_id',
+        'security_groups',
+        'status',
+    )
+
+    data = (
+        port._format_admin_state(_port.admin_state_up),
+        utils.format_list_of_dicts(_port.allowed_address_pairs),
+        _port.binding_host_id,
+        utils.format_dict(_port.binding_profile),
+        utils.format_dict(_port.binding_vif_details),
+        _port.binding_vif_type,
+        _port.binding_vnic_type,
+        _port.device_id,
+        _port.device_owner,
+        utils.format_list_of_dicts(_port.dns_assignment),
+        _port.dns_name,
+        utils.format_list_of_dicts(_port.extra_dhcp_opts),
+        utils.format_list_of_dicts(_port.fixed_ips),
+        _port.id,
+        _port.mac_address,
+        _port.name,
+        _port.network_id,
+        _port.port_security_enabled,
+        _port.project_id,
+        utils.format_list(_port.security_groups),
+        _port.status,
+    )
+
+    def setUp(self):
+        super(TestShowPort, self).setUp()
+
+        self.network.find_port = mock.Mock(return_value=self._port)
+
+        # Get the command object to test
+        self.cmd = port.ShowPort(self.app, self.namespace)
+
+    def test_show_no_options(self):
+        arglist = []
+        verifylist = []
+
+        self.assertRaises(tests_utils.ParserException,
+                          self.check_parser, self.cmd, arglist, verifylist)
+
+    def test_show_all_options(self):
+        arglist = [
+            self._port.name,
+        ]
+        verifylist = [
+            ('port', self._port.name),
+        ]
+        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+        columns, data = self.cmd.take_action(parsed_args)
+
+        self.network.find_port.assert_called_with(self._port.name,
+                                                  ignore_missing=False)
+        self.assertEqual(tuple(self.columns), columns)
+        self.assertEqual(self.data, data)