Merge "vpnaas: show external_vx_ip for vpn service show"

Zuul · openstack-gerrit · commit 1d7a13ab11f4 · 2024-11-20T17:34:37.000Z
diff --git a/neutronclient/osc/v2/vpnaas/vpnservice.py b/neutronclient/osc/v2/vpnaas/vpnservice.py
@@ -36,6 +36,8 @@
     ('status', 'Status', column_util.LIST_BOTH),
     ('description', 'Description', column_util.LIST_LONG_ONLY),
     ('project_id', 'Project', column_util.LIST_LONG_ONLY),
+    ('external_v4_ip', 'Ext v4 IP', column_util.LIST_LONG_ONLY),
+    ('external_v6_ip', 'Ext v6 IP', column_util.LIST_LONG_ONLY),
 )
 
 _attr_map_dict = {
@@ -48,6 +50,8 @@
     'status': 'Status',
     'description': 'Description',
     'project_id': 'Project',
+    'external_v4_ip': 'Ext v4 IP',
+    'external_v6_ip': 'Ext v6 IP',
 }
 
 
@@ -135,8 +139,7 @@ def take_action(self, parsed_args):
             attrs['router_id'] = _router_id
         obj = client.create_vpn_service(**attrs)
         display_columns, columns = utils.get_osc_show_columns_for_sdk_resource(
-            obj, _attr_map_dict, ['location', 'tenant_id', 'external_v4_ip',
-                                  'external_v6_ip'])
+            obj, _attr_map_dict, ['location', 'tenant_id'])
         data = utils.get_dict_properties(obj, columns)
         return display_columns, data
 
@@ -244,7 +247,6 @@ def take_action(self, parsed_args):
                                          ignore_missing=False)['id']
         obj = client.get_vpn_service(vpn_id)
         display_columns, columns = utils.get_osc_show_columns_for_sdk_resource(
-            obj, _attr_map_dict, ['location', 'tenant_id', 'external_v4_ip',
-                                  'external_v6_ip'])
+            obj, _attr_map_dict, ['location', 'tenant_id'])
         data = utils.get_dict_properties(obj, columns)
         return (display_columns, data)
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py b/neutronclient/tests/unit/osc/v2/vpnaas/fakes.py
@@ -125,6 +125,8 @@ def __init__(self):
             ('status', 'ACTIVE'),
             ('description', 'my-desc-' + uuid.uuid4().hex),
             ('project_id', 'project-id-' + uuid.uuid4().hex),
+            ('external_v4_ip', '192.0.2.42'),
+            ('external_v6_ip', '2001:0db8:207a:4a3a:053b:6fab:7df9:1afd'),
         ))
 
 
diff --git a/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py b/neutronclient/tests/unit/osc/v2/vpnaas/test_vpnservice.py
@@ -106,10 +106,14 @@ def _mock_vpnservice(*args, **kwargs):
             'Status',
             'Description',
             'Project',
+            'Ext v4 IP',
+            'Ext v6 IP',
         )
         self.data = _generate_data()
         self.ordered_headers = (
             'Description',
+            'Ext v4 IP',
+            'Ext v6 IP',
             'Flavor',
             'ID',
             'Name',
@@ -121,6 +125,8 @@ def _mock_vpnservice(*args, **kwargs):
         )
         self.ordered_data = (
             _vpnservice['description'],
+            _vpnservice['external_v4_ip'],
+            _vpnservice['external_v6_ip'],
             _vpnservice['flavor_id'],
             _vpnservice['id'],
             _vpnservice['name'],
@@ -132,6 +138,8 @@ def _mock_vpnservice(*args, **kwargs):
         )
         self.ordered_columns = (
             'description',
+            'external_v4_ip',
+            'external_v6_ip',
             'flavor_id',
             'id',
             'name',
