openstack/tacker
Code Issues Proposed changes

Merge "Fix links of v2 API resources"

Browse Source
This commit is contained in:
Zuul 2022-03-10 09:58:21 +00:00 committed by Gerrit Code Review
commit f55ed58501
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tacker/sol_refactored/common/lcm_op_occ_utils.py
View File

@ -41,11 +41,11 @@ def get_lcmocc_all(context):
def lcmocc_href(lcmocc_id, endpoint): def lcmocc_href(lcmocc_id, endpoint):
return "{}/v2/vnflcm/vnf_lcm_op_occs/{}".format(endpoint, lcmocc_id) return "{}/vnflcm/v2/vnf_lcm_op_occs/{}".format(endpoint, lcmocc_id)
def lcmocc_task_href(lcmocc_id, task, endpoint): def lcmocc_task_href(lcmocc_id, task, endpoint):
return "{}/v2/vnflcm/vnf_lcm_op_occs/{}/{}".format(endpoint, lcmocc_id, return "{}/vnflcm/v2/vnf_lcm_op_occs/{}/{}".format(endpoint, lcmocc_id,
task) task)

2
tacker/sol_refactored/common/subscription_utils.py
View File

@ -47,7 +47,7 @@ def get_subsc_all(context):
def subsc_href(subsc_id, endpoint): def subsc_href(subsc_id, endpoint):
return "{}/v2/vnflcm/subscriptions/{}".format(endpoint, subsc_id) return "{}/vnflcm/v2/subscriptions/{}".format(endpoint, subsc_id)
def _get_notification_auth_handle(subsc): def _get_notification_auth_handle(subsc):

2
tacker/sol_refactored/common/vnf_instance_utils.py
View File

@ -35,7 +35,7 @@ def get_inst_all(context):
def inst_href(inst_id, endpoint): def inst_href(inst_id, endpoint):
return "{}/v2/vnflcm/vnf_instances/{}".format(endpoint, inst_id) return "{}/vnflcm/v2/vnf_instances/{}".format(endpoint, inst_id)
def make_inst_links(inst, endpoint): def make_inst_links(inst, endpoint):

4
tacker/tests/unit/sol_refactored/conductor/test_vnflcm_driver_v2.py
View File

@ -645,11 +645,11 @@ class TestVnfLcmDriverV2(base.BaseTestCase):
def _grant_req_links(self, lcmocc_id, inst_id): def _grant_req_links(self, lcmocc_id, inst_id):
return { return {
'vnfLcmOpOcc': { 'vnfLcmOpOcc': {
'href': '{}/v2/vnflcm/vnf_lcm_op_occs/{}'.format( 'href': '{}/vnflcm/v2/vnf_lcm_op_occs/{}'.format(
self.driver.endpoint, lcmocc_id) self.driver.endpoint, lcmocc_id)
}, },
'vnfInstance': { 'vnfInstance': {
'href': '{}/v2/vnflcm/vnf_instances/{}'.format( 'href': '{}/vnflcm/v2/vnf_instances/{}'.format(
self.driver.endpoint, inst_id) self.driver.endpoint, inst_id)
} }
} }