From 7761e073aaefc2f773277ed8baffd3069a063329 Mon Sep 17 00:00:00 2001
From: Kyaw Myo Thant <kyawmyothant@ntt-at.co.jp>
Date: Tue, 3 Sep 2024 11:47:31 +0900
Subject: [PATCH] Add `VNF Package ID` to output of SHOW VNFLCM

Tacker API add VNF Package ID to the Tacker V1 VNFLCM API.
This patch adds `VNF Package ID` to the output of
`openstack vnflcm show` command.

Fixes-bug: #2078757
Change-Id: I6edd3b5c080aff350cc6e1c8cab4f25bafe02890
---
 tackerclient/osc/v1/vnflcm/vnflcm.py           | 6 ++++--
 tackerclient/tests/unit/osc/v1/test_vnflcm.py  | 2 +-
 tackerclient/tests/unit/osc/v1/vnflcm_fakes.py | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/tackerclient/osc/v1/vnflcm/vnflcm.py b/tackerclient/osc/v1/vnflcm/vnflcm.py
index 53e6053d..6fa7a90a 100644
--- a/tackerclient/osc/v1/vnflcm/vnflcm.py
+++ b/tackerclient/osc/v1/vnflcm/vnflcm.py
@@ -31,7 +31,8 @@ _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)
+    ('vnfdId', 'VNFD ID', tacker_osc_utils.LIST_BOTH),
+    ('vnfPkgId', 'VNF Package ID', tacker_osc_utils.LIST_BOTH)
 )
 
 LOG = logging.getLogger(__name__)
@@ -40,7 +41,7 @@ _mixed_case_fields = ('vnfInstanceName', 'vnfInstanceDescription', 'vnfdId',
                       'vnfProvider', 'vnfProductName', 'vnfSoftwareVersion',
                       'vnfdVersion', 'instantiationState',
                       'vimConnectionInfo', 'instantiatedVnfInfo',
-                      'vnfConfigurableProperties')
+                      'vnfConfigurableProperties', 'vnfPkgId')
 
 _VNF_INSTANCE = 'vnf_instance'
 
@@ -68,6 +69,7 @@ def _get_columns(vnflcm_obj, action=None):
         'instantiationState': 'Instantiation State',
         '_links': 'Links',
         'vnfConfigurableProperties': 'VNF Configurable Properties',
+        'vnfPkgId': 'VNF Package ID',
     }
     if action == 'show':
         if vnflcm_obj['instantiationState'] == 'INSTANTIATED':
diff --git a/tackerclient/tests/unit/osc/v1/test_vnflcm.py b/tackerclient/tests/unit/osc/v1/test_vnflcm.py
index 4b40948d..dca1f0f9 100644
--- a/tackerclient/tests/unit/osc/v1/test_vnflcm.py
+++ b/tackerclient/tests/unit/osc/v1/test_vnflcm.py
@@ -50,7 +50,7 @@ def _get_columns_vnflcm(action='create'):
     columns = ['ID', 'Instantiation State', 'VNF Instance Description',
                'VNF Instance Name', 'VNF Product Name', 'VNF Provider',
                'VNF Software Version', 'VNFD ID', 'VNFD Version', 'Links',
-               'VNF Configurable Properties']
+               'VNF Configurable Properties', 'VNF Package ID']
     if action == 'show':
         columns.extend(['Instantiated Vnf Info', 'VIM Connection Info'])
     if action == 'list':
diff --git a/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py b/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
index 56e6e72d..56dc83ea 100644
--- a/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
+++ b/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
@@ -39,6 +39,7 @@ def vnf_instance_response(attrs=None, instantiation_state='NOT_INSTANTIATED'):
         "vnfProductName": "Sample VNF",
         "vnfSoftwareVersion": "1.0",
         "vnfdVersion": "1.0",
+        "vnfPkgId": uuidsentinel.uuid,
         "_links": "vnflcm/v1/vnf_instances/" + uuidsentinel.vnf_instance_id +
                   "/instantiate",
         "instantiationState": instantiation_state,