From c20ef24533d753ebe8700812a9afa06ba78bb984 Mon Sep 17 00:00:00 2001
From: Renu <rani.renu@gmail.com>
Date: Thu, 10 Jun 2021 06:02:36 +0000
Subject: [PATCH] vnfConfigurableProperties missing in VNF show

This patch will resolve this issue and display the parameter
vnfConfigurableProperties in Query VNF. This parameter will be visible
in output of CLI like "openstack vnflcm show".

Closes-Bug: #1930571
Change-Id: I67b9bf854000ae52d2e1df40e4edf437713162b5
---
 tackerclient/osc/v1/vnflcm/vnflcm.py           | 4 +++-
 tackerclient/tests/unit/osc/v1/test_vnflcm.py  | 6 ++++--
 tackerclient/tests/unit/osc/v1/vnflcm_fakes.py | 4 +++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/tackerclient/osc/v1/vnflcm/vnflcm.py b/tackerclient/osc/v1/vnflcm/vnflcm.py
index e39a57a7..796d0d79 100644
--- a/tackerclient/osc/v1/vnflcm/vnflcm.py
+++ b/tackerclient/osc/v1/vnflcm/vnflcm.py
@@ -41,7 +41,8 @@ LOG = logging.getLogger(__name__)
 _mixed_case_fields = ('vnfInstanceName', 'vnfInstanceDescription', 'vnfdId',
                       'vnfProvider', 'vnfProductName', 'vnfSoftwareVersion',
                       'vnfdVersion', 'instantiationState',
-                      'vimConnectionInfo', 'instantiatedVnfInfo')
+                      'vimConnectionInfo', 'instantiatedVnfInfo',
+                      'vnfConfigurableProperties')
 
 _VNF_INSTANCE = 'vnf_instance'
 
@@ -68,6 +69,7 @@ def _get_columns(vnflcm_obj, action=None):
         'vnfdVersion': 'VNFD Version',
         'instantiationState': 'Instantiation State',
         '_links': 'Links',
+        'vnfConfigurableProperties': 'VNF Configurable Properties',
     }
     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 6e4826bb..9c6dd480 100644
--- a/tackerclient/tests/unit/osc/v1/test_vnflcm.py
+++ b/tackerclient/tests/unit/osc/v1/test_vnflcm.py
@@ -46,12 +46,14 @@ class TestVnfLcm(base.FixturedTestCase):
 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 Software Version', 'VNFD ID', 'VNFD Version', 'Links',
+               'VNF Configurable Properties']
     if action == 'show':
         columns.extend(['Instantiated Vnf Info', 'VIM Connection Info'])
     if action == 'list':
         columns = [ele for ele in columns if ele not in
-                   ['VNFD Version', 'VNF Instance Description']]
+                   ['VNFD Version', 'VNF Instance Description',
+                    'VNF Configurable Properties']]
         columns.remove('Links')
     return columns
 
diff --git a/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py b/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
index 828940d0..ac463316 100644
--- a/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
+++ b/tackerclient/tests/unit/osc/v1/vnflcm_fakes.py
@@ -41,7 +41,9 @@ def vnf_instance_response(attrs=None, instantiation_state='NOT_INSTANTIATED'):
         "vnfdVersion": "1.0",
         "_links": "vnflcm/v1/vnf_instances/" + uuidsentinel.vnf_instance_id +
                   "/instantiate",
-        "instantiationState": instantiation_state}
+        "instantiationState": instantiation_state,
+        "vnfConfigurableProperties": {
+            "test": "test_value"}}
     if instantiation_state == 'INSTANTIATED':
         dummy_vnf_instance.update({
             "vimConnectionInfo": [{