openstack
/
tacker
Code Issues Proposed changes

Merge "Fix output regarding PM Job/Threshold response"

This commit is contained in:
Zuul 2024-03-14 07:56:40 +00:00 committed by Gerrit Code Review
parent aac06464a0 715fdf699f
commit 552b9f5ad8
10 changed files with 81 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
doc/source/cli/cli-etsi-vnfpm.rst
View File

@ -131,7 +131,6 @@ Result:
+----------------+---------------------------------------------------------+
| Field | Value |
+----------------+---------------------------------------------------------+
| Authentication | |
| Callback Uri | http://localhost:9990/notification/callback/callbackUri |
+----------------+---------------------------------------------------------+
@ -298,40 +297,40 @@ Result:
.. code-block:: console
+-------------------------+------------------------------------------------------------------------------------------------------------------------+
| Field | Value |
+-------------------------+------------------------------------------------------------------------------------------------------------------------+
| Callback Uri | http://localhost:9990/notification/callback/callbackUri |
| Criteria | { |
| | "performanceMetric": [ |
| | "VCpuUsageMeanVnf.{7749c637-6e8d-4b6c-a6f4-563aa73744dd}" |
| | ], |
| | "collectionPeriod": 5, |
| | "reportingPeriod": 10 |
| | } |
| ID | ca9b58cf-8493-44e3-9e76-678ea0e80a80 |
| Links | { |
| | "self": { |
| | "href": "http://127.0.0.1:9890/vnfpm/v2/pm_jobs/ca9b58cf-8493-44e3-9e76-678ea0e80a80" |
| | }, |
| | "objects": [ |
| | { |
| | "href": "http://127.0.0.1:9890/vnflcm/v2/vnf_instances/7749c637-6e8d-4b6c-a6f4-563aa73744dd" |
| | } |
| | ] |
| | } |
| Object Instance Ids | [ |
| | "7749c637-6e8d-4b6c-a6f4-563aa73744dd" |
| | ] |
| Object Type | Vnf |
| Reports | [ |
| | { |
| | "href": "/vnfpm/v2/pm_jobs/ca9b58cf-8493-44e3-9e76-678ea0e80a80/reports/53aafe25-7124-4880-8b58-47a93b3dc371", |
| | "readyTime": "2022-08-30T08:02:58Z" |
| | } |
| | ] |
| Sub Object Instance Ids | |
+-------------------------+------------------------------------------------------------------------------------------------------------------------+
+-------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+
| Field | Value |
+-------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+
| Callback Uri | http://127.0.0.1:9990/notification/callbackuri/5c5985e3-9f28-4e80-9ed8-66c18cca50e5 |
| Criteria | { |
| | "performanceMetric": [ |
| | "VCpuUsageMeanVnf.5c5985e3-9f28-4e80-9ed8-66c18cca50e5" |
| | ], |
| | "collectionPeriod": 30, |
| | "reportingPeriod": 60 |
| | } |
| ID | 8a1979b3-29dc-4ba3-aeb5-acce07607648 |
| Links | { |
| | "self": { |
| | "href": "http://127.0.0.1:9890/vnfpm/v2/pm_jobs/8a1979b3-29dc-4ba3-aeb5-acce07607648" |
| | }, |
| | "objects": [ |
| | { |
| | "href": "http://127.0.0.1:9890/vnflcm/v2/vnf_instances/5c5985e3-9f28-4e80-9ed8-66c18cca50e5" |
| | } |
| | ] |
| | } |
| Object Instance Ids | [ |
| | "5c5985e3-9f28-4e80-9ed8-66c18cca50e5" |
| | ] |
| Object Type | Vnf |
| Reports | [ |
| | { |
| | "href": "http://127.0.0.1:9890/vnfpm/v2/pm_jobs/8a1979b3-29dc-4ba3-aeb5-acce07607648/reports/e138a740-039c-40d2-9467-85bef9819c90", |
| | "readyTime": "2024-02-21T09:00:53Z" |
| | } |
| | ] |
| Sub Object Instance Ids | |
+-------------------------+---------------------------------------------------------------------------------------------------------------------------------------------+
Help:

1
doc/source/user/v2/cnf/auto_scale_pm_job/index.rst
View File

@ -585,7 +585,6 @@ Here is an example of changing target PM job:
+----------------+--------------------------------------------------------------------------------------------+
| Field | Value |
+----------------+--------------------------------------------------------------------------------------------+
| Authentication | |
| Callback Uri | http://127.0.0.1:9990/notification/callbackuri/a0205e7c-fdeb-4f6c-b266-962246e32626-update |
+----------------+--------------------------------------------------------------------------------------------+

8
tacker/sol_refactored/common/pm_job_utils.py
View File

@ -26,11 +26,11 @@ LOG = logging.getLogger(__name__)
CONF = config.CONF
def update_report(context, job_id, report, timestamp):
def update_report(context, job_id, report, timestamp, endpoint):
# update reports in the pmJob
pm_job = get_pm_job(context, job_id)
job_report = _gen_job_report(job_id, report, timestamp)
job_report = _gen_job_report(job_id, report, timestamp, endpoint)
if pm_job.obj_attr_is_set('reports'):
pm_job.reports.append(job_report)
@ -40,9 +40,9 @@ def update_report(context, job_id, report, timestamp):
return pm_job
def _gen_job_report(job_id, report, timestamp):
def _gen_job_report(job_id, report, timestamp, endpoint):
return objects.VnfPmJobV2_Reports(
href=f'/vnfpm/v2/pm_jobs/{job_id}/reports/{report.id}',
href=f'{endpoint}/vnfpm/v2/pm_jobs/{job_id}/reports/{report.id}',
readyTime=timestamp
)

7
tacker/sol_refactored/conductor/vnfpm_driver_v2.py
View File

@ -42,7 +42,7 @@ class VnfPmDriverV2():
job_id = report.jobId
timestamp = report.entries[0].performanceValues[0].timeStamp
pm_job = self._update_job_reports(
context, job_id, report, timestamp)
context, job_id, report, timestamp, self.endpoint)
# Send a notify pm job request to the NFVO client.
# POST /{pmjob.callbackUri}
@ -79,10 +79,11 @@ class VnfPmDriverV2():
report.create(context)
return report
def _update_job_reports(self, context, job_id, report, timestamp):
def _update_job_reports(
self, context, job_id, report, timestamp, endpoint):
# update reports in the pmJob
update_job = pm_job_utils.update_report(
context, job_id, report, timestamp)
context, job_id, report, timestamp, endpoint)
with context.session.begin(subtransactions=True):
update_job.update(context)
return update_job

12
tacker/sol_refactored/controller/vnfpm_v2.py
View File

@ -244,9 +244,9 @@ class VnfPmControllerV2(sol_wsgi.SolAPIController):
with context.session.begin(subtransactions=True):
pm_job.update(context)
pm_job_modifications = objects.PmJobModificationsV2(
callbackUri=pm_job.callbackUri,
)
pm_job_modifications = objects.PmJobModificationsV2()
if body.get("callbackUri"):
setattr(pm_job_modifications, "callbackUri", body["callbackUri"])
resp = pm_job_modifications.to_dict()
return sol_wsgi.SolResponse(200, resp,
@ -418,8 +418,10 @@ class VnfPmControllerV2(sol_wsgi.SolAPIController):
with context.session.begin(subtransactions=True):
pm_threshold.update(context)
pm_threshold_modifications = objects.ThresholdModificationsV2(
callbackUri=pm_threshold.callbackUri)
pm_threshold_modifications = objects.ThresholdModificationsV2()
if body.get("callbackUri"):
setattr(
pm_threshold_modifications, "callbackUri", body["callbackUri"])
resp = pm_threshold_modifications.to_dict()
return sol_wsgi.SolResponse(200, resp,
version=api_version.CURRENT_PM_VERSION)

4
tacker/sol_refactored/objects/v2/pm_job_modification.py
View File

@ -26,7 +26,7 @@ class PmJobModificationsV2(base.TackerObject, base.TackerObjectDictCompat):
VERSION = '1.0'
fields = {
'callbackUri': fields.StringField(nullable=False),
'callbackUri': fields.StringField(nullable=True),
'authentication': fields.ObjectField(
'SubscriptionAuthentication', nullable=False),
'SubscriptionAuthentication', nullable=True),
}

2
tacker/tests/functional/common/fake_grant_server.py
View File

@ -320,7 +320,7 @@ def get_common_resp_info(request_body):
return glance_image, flavour_vdu_dict, zone_name_list
@GrantServer.app.route('v1/grant/v1/grants', methods=['POST'])
@GrantServer.app.route('/v1/grant/v1/grants', methods=['POST'])
def grant():
body = request.json
request_body = Grant.convert_body_to_dict(body)

6
tacker/tests/unit/sol_refactored/common/test_pm_job_utils.py
View File

@ -63,8 +63,12 @@ class TestPmJobUtils(base.BaseTestCase):
)
result = pm_job_utils.update_report(self.context, 'pm_job_1',
report, '2008-01-03 08:04:34')
report, '2008-01-03 08:04:34',
'endpoint')
href = result.reports[0].href
self.assertEqual('pm_job_1', result.id)
self.assertEqual(
f'endpoint/vnfpm/v2/pm_jobs/pm_job_1/reports/{report.id}', href)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_all')
def test_get_pm_job_all(self, mock_pm):

2
tacker/tests/unit/sol_refactored/conductor/test_vnfpm_driver_v2.py
View File

@ -145,5 +145,5 @@ class TestVnfPmDriverV2(base.BaseTestCase):
mock_update.return_value = None
result = VnfPmDriverV2()._update_job_reports(
context=self.context, job_id='pm_job_1', report='report',
timestamp='timestamp')
timestamp='timestamp', endpoint='endpoint')
self.assertEqual('pm_job_1', result.id)

26
tacker/tests/unit/sol_refactored/controller/test_vnfpm_v2.py
View File

@ -349,14 +349,23 @@ class TestVnfpmV2(base.BaseTestCase):
}
}
body = {
'objectType': 'Vnf',
'callbackUri': 'callbackuri',
'callbackUri': 'callbackUri',
'authentication': _SubscriptionAuthentication
}
result = self.controller.update(request=self.request, id='id',
body=body)
self.assertEqual(200, result.status)
self.assertEqual("callbackUri", result.body["callbackUri"])
self.assertNotIn("authentication", result.body)
body = {
'authentication': _SubscriptionAuthentication
}
result = self.controller.update(request=self.request, id='id',
body=body)
self.assertEqual({}, result.body)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_filter')
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
@ -609,7 +618,7 @@ class TestVnfpmV2(base.BaseTestCase):
}
}
body = {
'callbackUri': 'callbackuri_update',
'callbackUri': 'callbackUri',
'authentication': _SubscriptionAuthentication
}
@ -617,6 +626,17 @@ class TestVnfpmV2(base.BaseTestCase):
request=self.request, thresholdId='id',
body=body)
self.assertEqual(200, result.status)
self.assertEqual('callbackUri', result.body['callbackUri'])
self.assertNotIn("authentication", result.body)
body = {
'authentication': _SubscriptionAuthentication
}
result = self.controller.update_threshold(
request=self.request, thresholdId='id',
body=body)
self.assertEqual({}, result.body)
@mock.patch.object(objects.base.TackerPersistentObject, 'get_by_id')
def test_pm_threshold_update_not_exist(self, mock_pm):