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
This commit is contained in:
@@ -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)
|
||||
|
||||
|
@@ -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',
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user