From 53a57495a511dcdfb2d8b663c35efc22f9840318 Mon Sep 17 00:00:00 2001 From: Michal Jagiello Date: Thu, 21 Sep 2023 13:29:35 +0200 Subject: Fix invalid pnf model instantiation parameters Use PNF instantiation parameters instead of service's ones Issue-ID: INT-2264 Change-Id: I6fea78df4467d4751f4a7fc008e9de9ef7219955 Signed-off-by: Michal Jagiello --- .../so/templates/instantiate_multi_vnf_service_macro.json.j2 | 10 +++++----- src/onapsdk/version.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/onapsdk') diff --git a/src/onapsdk/so/templates/instantiate_multi_vnf_service_macro.json.j2 b/src/onapsdk/so/templates/instantiate_multi_vnf_service_macro.json.j2 index 93ef79c..d02c259 100644 --- a/src/onapsdk/so/templates/instantiate_multi_vnf_service_macro.json.j2 +++ b/src/onapsdk/so/templates/instantiate_multi_vnf_service_macro.json.j2 @@ -12,11 +12,11 @@ "modelInfo":{ {% for sdc_pnf in sdc_service.pnfs %} {% if sdc_pnf.model_name == pnf.model_name %} - "modelCustomizationName":"{{ sdc_pnf.name }}", + "modelCustomizationName":"{{ sdc_pnf.model_name }}", "modelCustomizationId":"{{ sdc_pnf.model_customization_id }}", - "modelInvariantId":"{{ sdc_service.unique_uuid }}", - "modelVersionId":"{{ sdc_service.identifier }}", - "modelName":"{{ sdc_service.name }}", + "modelInvariantId":"{{ sdc_pnf.unique_uuid }}", + "modelVersionId":"{{ sdc_pnf.identifier }}", + "modelName":"{{ sdc_pnf.name }}", "modelType":"pnf", "modelVersion":"{{ sdc_pnf.model_version }}" {% endif %} @@ -61,7 +61,7 @@ {% if sdc_vnf.model_name == vnf.model_name %} "modelName": "{{ sdc_vnf.model_name }}", "modelVersionId": "{{ sdc_vnf.model_version_id }}", - "modelInvariantUuid": "{{ sdc_vnf.model_invariant_uuid }}", + "modelInvariantUuid": "{{ sdc_vnf.model_invariant_id }}", "modelVersion": "{{ sdc_vnf.model_version }}", "modelCustomizationId": "{{ sdc_vnf.model_customization_id }}", "modelInstanceName": "{{ sdc_vnf.model_name }}" diff --git a/src/onapsdk/version.py b/src/onapsdk/version.py index 3aed6ca..9dbc226 100644 --- a/src/onapsdk/version.py +++ b/src/onapsdk/version.py @@ -13,4 +13,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "12.3.1" +__version__ = "12.3.2" -- cgit 1.2.3-korg