Merge "Improved display of vnfPkgId for v2 Tacker"

This patch fixes the output of v2 Tacker so that vnfPkgId of
VnfInstance that are only used in v1 Tacker are not displayed
as CLI output.
This is because it is confusing for v2 users that unused vnfPkgId
(VNF Package ID) is always displayed as empty.

The vnfPkgId (VNF Package ID) remain displayed in the v1 Tacker
CLI output.

Change-Id: I4adea34e9c2c7fc51e087d2a00f47db77d67fe4a

releasenotes/source/2023.1.rst

@@ -3,4 +3,4 @@
 ===========================
 
 .. release-notes::
-   :branch: stable/2023.1
+   :branch: unmaintained/2023.1

releasenotes/source/2024.2.rst

@@ -0,0 +1,6 @@
+===========================
+2024.2 Series Release Notes
+===========================
+
+.. release-notes::
+   :branch: stable/2024.2

releasenotes/source/index.rst

@@ -7,6 +7,7 @@ Contents:
    :maxdepth: 2
 
    unreleased
+   2024.2
    2024.1
    2023.2
    2023.1

tackerclient/osc/v1/vnflcm/vnflcm.py

@@ -31,8 +31,7 @@ _attr_map = (
     ('vnfProvider', 'VNF Provider', tacker_osc_utils.LIST_BOTH),
     ('vnfSoftwareVersion', 'VNF Software Version', tacker_osc_utils.LIST_BOTH),
     ('vnfProductName', 'VNF Product Name', tacker_osc_utils.LIST_BOTH),
-    ('vnfdId', 'VNFD ID', tacker_osc_utils.LIST_BOTH),
-    ('vnfPkgId', 'VNF Package ID', tacker_osc_utils.LIST_BOTH)
+    ('vnfdId', 'VNFD ID', tacker_osc_utils.LIST_BOTH)
 )
 
 LOG = logging.getLogger(__name__)
@@ -68,8 +67,7 @@ def _get_columns(vnflcm_obj, action="/?originalUrl=https%3A%2F%2Fgit.openstack.org%2FNone)%3A%253C%2Fcode">
         'vnfdVersion': 'VNFD Version',
         'instantiationState': 'Instantiation State',
         '_links': 'Links',
-        'vnfConfigurableProperties': 'VNF Configurable Properties',
-        'vnfPkgId': 'VNF Package ID',
+        'vnfConfigurableProperties': 'VNF Configurable Properties'
     }
     if action == 'show':
         if vnflcm_obj['instantiationState'] == 'INSTANTIATED':
@@ -80,6 +78,12 @@ def _get_columns(vnflcm_obj, action="/?originalUrl=https%3A%2F%2Fgit.openstack.org%2FNone)%3A%253C%2Fcode">
             {'vimConnectionInfo': 'VIM Connection Info',
              '_links': 'Links'}
         )
+    # Note: To prevent it from appearing in the v2 API output,
+    # the 'VNF Package ID' will be output only if the vnfPkgId exists.
+    if 'vnfPkgId' in vnflcm_obj:
+        column_map.update(
+            {'vnfPkgId': 'VNF Package ID'}
+        )
     return sdk_utils.get_osc_show_columns_for_sdk_resource(vnflcm_obj,
                                                            column_map)
 

tackerclient/tests/unit/osc/v1/test_vnflcm.py

@@ -56,7 +56,7 @@ def _get_columns_vnflcm(action="/?originalUrl=https%3A%2F%2Fgit.openstack.org%2F%26%2339%3Bcreate%26%2339%3B)%3A%253C%2Fcode">
     if action == 'list':
         columns = [ele for ele in columns if ele not in
                    ['VNFD Version', 'VNF Instance Description',
-                    'VNF Configurable Properties']]
+                    'VNF Configurable Properties', 'VNF Package ID']]
         columns.remove('Links')
     return columns
 

tackerclient/v1_0/client.py

@@ -815,7 +815,7 @@ class VnfPMClient(ClientBase):
 
 
 class Client(object):
-    """Unified interface to interact with multiple applications of tacker service.
+    """Unified interface to interact with multiple apps of tacker service.
 
     This class is a single entry point to interact with legacy tacker apis and
     vnf packages apis.

test-requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=4.0.0,<4.1.0 # Apache-2.0
+hacking>=7.0.0,<7.1.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD