From 0bae79f9130a924f0c58e9c8607e8904e99a5147 Mon Sep 17 00:00:00 2001
From: Kaori Mitani <mitani.kaori@fujitsu.com>
Date: Thu, 22 Feb 2024 08:58:15 +0000
Subject: [PATCH] Fix output regarding PM Job response

According to SOL003, "authentication" should not appear
in the PmJobModifications response.
Therefore, it has been removed from the output obtained
when running "openstack vnfpm job update".

Closes-Bug: #2054420
Change-Id: I14b415a161983e682a4415d11d1fdad5792be3f8
---
 tackerclient/osc/v2/vnfpm/vnfpm_job.py          | 10 ++--------
 .../tests/unit/osc/v2/test_vnfpm_job.py         |  2 +-
 .../tests/unit/osc/v2/vnfpm_job_fakes.py        | 17 +----------------
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/tackerclient/osc/v2/vnfpm/vnfpm_job.py b/tackerclient/osc/v2/vnfpm/vnfpm_job.py
index d7eae498..3e24889a 100644
--- a/tackerclient/osc/v2/vnfpm/vnfpm_job.py
+++ b/tackerclient/osc/v2/vnfpm/vnfpm_job.py
@@ -34,10 +34,6 @@ _FORMATTERS = {
     '_links': tacker_osc_utils.FormatComplexDataColumn
 }
 
-_FORMATTERS_UPDATE = {
-    'authentication': tacker_osc_utils.FormatComplexDataColumn
-}
-
 _MIXED_CASE_FIELDS = (
     'objectType', 'objectInstanceIds', 'subObjectInstanceIds', 'callbackUri'
 )
@@ -52,8 +48,7 @@ _VNF_PM_JOB_ID = 'vnf_pm_job_id'
 def _get_columns(vnfpm_job_obj, action=None):
     if action == 'update':
         column_map = {
-            'callbackUri': 'Callback Uri',
-            'authentication': 'Authentication'
+            'callbackUri': 'Callback Uri'
         }
     else:
         column_map = {
@@ -259,8 +254,7 @@ class UpdateVnfPmJob(command.ShowOne):
             tacker_osc_utils.jsonfile2body(parsed_args.request_file))
         display_columns, columns = _get_columns(updated_values, 'update')
         data = utils.get_item_properties(
-            sdk_utils.DictModel(updated_values),
-            columns, formatters=_FORMATTERS_UPDATE,
+            sdk_utils.DictModel(updated_values), columns,
             mixed_case_fields=_MIXED_CASE_FIELDS_UPDATE)
         return (display_columns, data)
 
diff --git a/tackerclient/tests/unit/osc/v2/test_vnfpm_job.py b/tackerclient/tests/unit/osc/v2/test_vnfpm_job.py
index 77224bf3..4cad666a 100644
--- a/tackerclient/tests/unit/osc/v2/test_vnfpm_job.py
+++ b/tackerclient/tests/unit/osc/v2/test_vnfpm_job.py
@@ -44,7 +44,7 @@ class TestVnfPmJob(base.FixturedTestCase):
 
 def _get_columns_vnfpm_job(action=None):
     if action == 'update':
-        columns = ['Callback Uri', 'Authentication']
+        columns = ['Callback Uri']
     else:
         columns = ['ID', 'Object Type', 'Object Instance Ids',
                    'Sub Object Instance Ids', 'Criteria', 'Callback Uri',
diff --git a/tackerclient/tests/unit/osc/v2/vnfpm_job_fakes.py b/tackerclient/tests/unit/osc/v2/vnfpm_job_fakes.py
index 7d81ef58..f88d9a74 100644
--- a/tackerclient/tests/unit/osc/v2/vnfpm_job_fakes.py
+++ b/tackerclient/tests/unit/osc/v2/vnfpm_job_fakes.py
@@ -43,22 +43,7 @@ def vnf_pm_job_response(attrs=None, action=None):
     """
     if action == 'update':
         fake_vnf_pm_job = {
-            "callbackUri": "/nfvo/notify/job",
-            "authentication": {
-                "authType": [
-                    "BASIC",
-                    "OAUTH2_CLIENT_CREDENTIALS"
-                ],
-                "paramsBasic": {
-                    "userName": "nfvo",
-                    "password": "nfvopwd"
-                },
-                "paramsOauth2ClientCredentials": {
-                    "clientId": "auth_user_name",
-                    "clientPassword": "auth_password",
-                    "tokenEndpoint": "token_endpoint"
-                }
-            }
+            "callbackUri": "/nfvo/notify/job"
         }
         return fake_vnf_pm_job