python-openstackclient 7.3.0__py3-none-any.whl → 7.3.1__py3-none-any.whl

openstackclient/network/v2/port.py

@@ -65,8 +65,9 @@ _formatters = {
     'fixed_ips': format_columns.ListDictColumn,
     'security_group_ids': format_columns.ListColumn,
     'tags': format_columns.ListColumn,
-    'trunk_details': SubPortColumn,
 }
+_list_formatters = copy.deepcopy(_formatters)
+_list_formatters.update({'trunk_details': SubPortColumn})
 
 
 def _get_columns(item):
@@ -952,7 +953,7 @@ class ListPort(command.Lister):
                 utils.get_item_properties(
                     s,
                     attrs,
-                    formatters=_formatters,
+                    formatters=_list_formatters,
                 )
                 for s in data
             ),

openstackclient/tests/functional/network/v2/test_port.py

@@ -289,3 +289,82 @@ class PortTests(common.NetworkTagTests):
             f'{self.base_command} create --network {self.NETWORK_NAME} {args} {name}',
             parse_output=True,
         )
+
+    def _trunk_creation(self):
+        pport = uuid.uuid4().hex
+        sport1 = uuid.uuid4().hex
+        sport2 = uuid.uuid4().hex
+        trunk = uuid.uuid4().hex
+        json_output = self.openstack(
+            'port create ' f'--network {self.NETWORK_NAME} {pport}',
+            parse_output=True,
+        )
+        pport_id = json_output.get('id')
+        json_output = self.openstack(
+            'port create ' f'--network {self.NETWORK_NAME} {sport1}',
+            parse_output=True,
+        )
+        sport1_id = json_output.get('id')
+        json_output = self.openstack(
+            'port create ' f'--network {self.NETWORK_NAME} {sport2}',
+            parse_output=True,
+        )
+        sport2_id = json_output.get('id')
+
+        self.openstack(
+            f'network trunk create --parent-port {pport} {trunk}',
+        )
+        self.openstack(
+            f'network trunk set --subport port={sport1},'
+            f'segmentation-type=vlan,segmentation-id=100 {trunk}',
+        )
+        self.openstack(
+            f'network trunk set --subport port={sport2},'
+            f'segmentation-type=vlan,segmentation-id=101 {trunk}',
+        )
+
+        # NOTE(ralonsoh): keep this order to first delete the trunk and then
+        # the ports.
+        self.addCleanup(self.openstack, f'port delete {pport_id}')
+        self.addCleanup(self.openstack, f'port delete {sport1_id}')
+        self.addCleanup(self.openstack, f'port delete {sport2_id}')
+        self.addCleanup(self.openstack, f'network trunk delete {trunk}')
+
+        return pport_id, sport1_id, sport2_id
+
+    def check_subports(self, subports, pport_id, sport1_id, sport2_id):
+        self.assertEqual(2, len(subports))
+        for subport in subports:
+            if subport['port_id'] == sport1_id:
+                self.assertEqual(100, subport['segmentation_id'])
+            elif subport['port_id'] == sport2_id:
+                self.assertEqual(101, subport['segmentation_id'])
+            else:
+                self.fail(
+                    f'Port {pport_id} does not have subport '
+                    f'{subport["port_id"]}'
+                )
+            self.assertEqual('vlan', subport['segmentation_type'])
+
+    def test_port_list_with_trunk(self):
+        pport_id, sport1_id, sport2_id = self._trunk_creation()
+
+        # List all ports with "--long" flag to retrieve the trunk details
+        json_output = self.openstack(
+            'port list --long',
+            parse_output=True,
+        )
+        port = next(port for port in json_output if port['ID'] == pport_id)
+        subports = port['Trunk subports']
+        self.check_subports(subports, pport_id, sport1_id, sport2_id)
+
+    def test_port_show_with_trunk(self):
+        pport_id, sport1_id, sport2_id = self._trunk_creation()
+
+        # List all ports with "--long" flag to retrieve the trunk details
+        port = self.openstack(
+            f'port show {pport_id}',
+            parse_output=True,
+        )
+        subports = port['trunk_details']['sub_ports']
+        self.check_subports(subports, pport_id, sport1_id, sport2_id)

openstackclient/tests/unit/network/v2/test_port.py

@@ -122,7 +122,7 @@ class TestPort(network_fakes.TestNetworkV2):
             fake_port.status,
             format_columns.ListColumn(fake_port.tags),
             fake_port.trusted,
-            port.SubPortColumn(fake_port.trunk_details),
+            fake_port.trunk_details,
             fake_port.updated_at,
         )
 

{python_openstackclient-7.3.0.dist-info → python_openstackclient-7.3.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openstackclient
-Version: 7.3.0
+Version: 7.3.1
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack

{python_openstackclient-7.3.0.dist-info → python_openstackclient-7.3.1.dist-info}/RECORD

@@ -127,7 +127,7 @@ openstackclient/network/v2/network_segment.py,sha256=3bJFnFz4QOwgb_diuLZ-QJ9WOj3
 openstackclient/network/v2/network_segment_range.py,sha256=phZ4h-tRPpHbFNA8s_IegdXKm8Y84kffV62RxVITAn0,17514
 openstackclient/network/v2/network_service_provider.py,sha256=b0pKHxB5Qq1U2lfOCWHKJ8CMX661gBbKtv0jXvuE3Xg,1384
 openstackclient/network/v2/network_trunk.py,sha256=2QUGXB4lUGv9BvKPErzFUlgU9Tm_6Agp2pljRx3vTVw,13846
-openstackclient/network/v2/port.py,sha256=1q4iQ1TMfSxGaGXKQ5dGFfGdlvHaaHd5-j3MRWoq5pw,50295
+openstackclient/network/v2/port.py,sha256=sarZXmbVioCIQdZkIP44D-ot_d22NvJEQSua2pu5sBg,50368
 openstackclient/network/v2/router.py,sha256=_-C3D4EnXFCzMYW2AML_t7zpaZROTFdudxmulw3f4rY,50102
 openstackclient/network/v2/security_group.py,sha256=XYOze-FQFJWtGxBc-6hiGViKVSi6fDPRWtjC9Keb1Pw,15488
 openstackclient/network/v2/security_group_rule.py,sha256=UQwuJ2uOmdGpaxcmeKNf8c3ay8I5vVjzb4fSFT3liPg,22371
@@ -224,7 +224,7 @@ openstackclient/tests/functional/network/v2/test_network_segment.py,sha256=FB7PI
 openstackclient/tests/functional/network/v2/test_network_segment_range.py,sha256=bf1XRaNza6qzVrb5LNuIEtmWCFb8q-OQbktINgXwoKg,4727
 openstackclient/tests/functional/network/v2/test_network_service_provider.py,sha256=HOKvmIkUSR_e01sQOn8XS83mvflbkcC1iVKkjqi1GFk,1499
 openstackclient/tests/functional/network/v2/test_network_trunk.py,sha256=uliAsz_xGyy8oim2RaN1D9G5944svgsRWreYtQKAliM,5289
-openstackclient/tests/functional/network/v2/test_port.py,sha256=hsWTf9pFNCV1ilwcmBAPYWeYiMvAJqIYM6eyACIsNbM,10231
+openstackclient/tests/functional/network/v2/test_port.py,sha256=f3D5LS954L6ytS8doMaQONIO7Wt2gNLeHFnLaM3fNH4,13319
 openstackclient/tests/functional/network/v2/test_router.py,sha256=LHODy_BoGdBc9_rL7rZTPhXiqcuTNpLShvXw_Qkw0pA,10116
 openstackclient/tests/functional/network/v2/test_security_group.py,sha256=HXqULP4WQoxCgbzyvwqd4dMo624airNDQ5fSm2XPdwg,2160
 openstackclient/tests/functional/network/v2/test_security_group_rule.py,sha256=iVoR1MUhxApNRHg0klv90yYkN6KSyNoJc4rxhMr3bII,2285
@@ -397,7 +397,7 @@ openstackclient/tests/unit/network/v2/test_network_segment.py,sha256=D6MVB6eETA2
 openstackclient/tests/unit/network/v2/test_network_segment_range.py,sha256=zLgAZdHqbWKn5tYYCUuDn9UA7BFOMYOowC3DQztrZyQ,23388
 openstackclient/tests/unit/network/v2/test_network_service_provider.py,sha256=iHsMqAGuK3onjUI46uGKX1_DwGq-y6b_SOR2IU9PdfU,2047
 openstackclient/tests/unit/network/v2/test_network_trunk.py,sha256=1VPt6Nzv92nRxLoDgwffmpTJ0sgYl4b5PmLO3qJ9INk,30556
-openstackclient/tests/unit/network/v2/test_port.py,sha256=6uWKnZELyH9resbra7e_7L7RBEjxMlF1ogqVPh1acgE,94757
+openstackclient/tests/unit/network/v2/test_port.py,sha256=V2Krim-bHykarUW1UOK7j_v1c54HnKfH4gXstSXe4jU,94737
 openstackclient/tests/unit/network/v2/test_router.py,sha256=ELxY_k5ibnxLYYbcr41X7GzAPpxGPuM23VyDseLnJ1A,84356
 openstackclient/tests/unit/network/v2/test_security_group_compute.py,sha256=725tUWOhxjWJwUXVdKfxD7eXMe7zrz7bKNdK_HvK624,12576
 openstackclient/tests/unit/network/v2/test_security_group_network.py,sha256=PIE6TgW-bUGSAZLk0B60lPELIJsw_MTKxxcHw-E1fak,20916
@@ -494,11 +494,11 @@ openstackclient/volume/v3/volume_message.py,sha256=HBBxPEcYoNqGjEbzGIEnIJ1XTcQ2K
 openstackclient/volume/v3/volume_snapshot.py,sha256=pZ4q_qCwqh4jaGhX28G59wsWDmEc3uXdbpeD176osZg,3186
 openstackclient/volume/v3/volume_transfer_request.py,sha256=PthOJV2m-pTV1njFzwTpaekXZkET1c6alIJrpuN7R6Q,7530
 openstackclient/volume/v3/volume_type.py,sha256=_nbmu6e87UAHRjh30fQIwScMubox_FpHcQKDUOxO4NA,33955
-python_openstackclient-7.3.0.dist-info/AUTHORS,sha256=z7JOCAe9kF-Kh6UmborfoPLRMILaSdEv8zUoNhaVdJM,21563
-python_openstackclient-7.3.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-7.3.0.dist-info/METADATA,sha256=yZ_aebnMobWk5uo4PmvxS-s9_8Tt3tOn99cuud1MLe0,6516
-python_openstackclient-7.3.0.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-python_openstackclient-7.3.0.dist-info/entry_points.txt,sha256=VsZCw-6So3hkHuIiX-dGaMVL1PEqmfDynF37m1EwjCs,53260
-python_openstackclient-7.3.0.dist-info/pbr.json,sha256=8bOPQYB_S2BPjvljnJqAaGxQj4EPpjEP6HNU-X6MseI,47
-python_openstackclient-7.3.0.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-7.3.0.dist-info/RECORD,,
+python_openstackclient-7.3.1.dist-info/AUTHORS,sha256=z7JOCAe9kF-Kh6UmborfoPLRMILaSdEv8zUoNhaVdJM,21563
+python_openstackclient-7.3.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-7.3.1.dist-info/METADATA,sha256=PwCFj_JWf_t5YRjCoLkRGySOLjzfqPTCOFM8hfCpBYQ,6516
+python_openstackclient-7.3.1.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+python_openstackclient-7.3.1.dist-info/entry_points.txt,sha256=VsZCw-6So3hkHuIiX-dGaMVL1PEqmfDynF37m1EwjCs,53260
+python_openstackclient-7.3.1.dist-info/pbr.json,sha256=E5uUJNuOcXl1clAJ5dAvKRdI6PEscruKO3B38AEFDLA,47
+python_openstackclient-7.3.1.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-7.3.1.dist-info/RECORD,,

python_openstackclient-7.3.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "0ba77e67", "is_release": true}

python_openstackclient-7.3.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "34121473", "is_release": true}