openstack/python-tackerclient
Code Issues Proposed changes

Merge "Fix output regarding PM Job response"

Browse Source
This commit is contained in:
Zuul
2024-02-27 14:27:21 +00:00
committed by Gerrit Code Review
parent 155b09a581 0bae79f913
commit 4e5628fad2
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tackerclient/osc/v2/vnfpm/vnfpm_job.py
View File

@@ -34,10 +34,6 @@ _FORMATTERS = {
'_links': tacker_osc_utils.FormatComplexDataColumn '_links': tacker_osc_utils.FormatComplexDataColumn
} }
_FORMATTERS_UPDATE = {
'authentication': tacker_osc_utils.FormatComplexDataColumn
}
_MIXED_CASE_FIELDS = ( _MIXED_CASE_FIELDS = (
'objectType', 'objectInstanceIds', 'subObjectInstanceIds', 'callbackUri' 'objectType', 'objectInstanceIds', 'subObjectInstanceIds', 'callbackUri'
) )
@@ -52,8 +48,7 @@ _VNF_PM_JOB_ID = 'vnf_pm_job_id'
def _get_columns(vnfpm_job_obj, action=None): def _get_columns(vnfpm_job_obj, action=None):
if action == 'update': if action == 'update':
column_map = { column_map = {
'callbackUri': 'Callback Uri', 'callbackUri': 'Callback Uri'
'authentication': 'Authentication'
} }
else: else:
column_map = { column_map = {
@@ -259,8 +254,7 @@ class UpdateVnfPmJob(command.ShowOne):
tacker_osc_utils.jsonfile2body(parsed_args.request_file)) tacker_osc_utils.jsonfile2body(parsed_args.request_file))
display_columns, columns = _get_columns(updated_values, 'update') display_columns, columns = _get_columns(updated_values, 'update')
data = utils.get_item_properties( data = utils.get_item_properties(
sdk_utils.DictModel(updated_values), sdk_utils.DictModel(updated_values), columns,
columns, formatters=_FORMATTERS_UPDATE,
mixed_case_fields=_MIXED_CASE_FIELDS_UPDATE) mixed_case_fields=_MIXED_CASE_FIELDS_UPDATE)
return (display_columns, data) return (display_columns, data)

2
tackerclient/tests/unit/osc/v2/test_vnfpm_job.py
View File

@@ -44,7 +44,7 @@ class TestVnfPmJob(base.FixturedTestCase):
def _get_columns_vnfpm_job(action=None): def _get_columns_vnfpm_job(action=None):
if action == 'update': if action == 'update':
columns = ['Callback Uri', 'Authentication'] columns = ['Callback Uri']
else: else:
columns = ['ID', 'Object Type', 'Object Instance Ids', columns = ['ID', 'Object Type', 'Object Instance Ids',
'Sub Object Instance Ids', 'Criteria', 'Callback Uri', 'Sub Object Instance Ids', 'Criteria', 'Callback Uri',

17
tackerclient/tests/unit/osc/v2/vnfpm_job_fakes.py
View File

@@ -43,22 +43,7 @@ def vnf_pm_job_response(attrs=None, action=None):
""" """
if action == 'update': if action == 'update':
fake_vnf_pm_job = { fake_vnf_pm_job = {
"callbackUri": "/nfvo/notify/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"
}
}
} }
return fake_vnf_pm_job return fake_vnf_pm_job