diff options
| author |   Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-09-21 13:29:35 +0200 |
|---|---|---|
| committer | Michal Jagiello <michal.jagiello@t-mobile.pl> | 2023-09-25 11:21:09 +0200 |
| commit | 53a57495a511dcdfb2d8b663c35efc22f9840318 (patch) | |
| tree | 36e04d5230c71c9d9e50ddd681e7e9ff245b5dfd | |
| parent | 3e8bb0ba2c6f04da8ebd6254ee7f859d5f8ac448 (diff) | |
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 <michal.jagiello@t-mobile.pl>
| -rw-r--r-- | src/onapsdk/so/templates/instantiate_multi_vnf_service_macro.json.j2 | 10 | ||||
| -rw-r--r-- | src/onapsdk/version.py | 2 | ||||
| -rw-r--r-- | tests/test_version.py | 2 |
3 files changed, 7 insertions, 7 deletions
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" diff --git a/tests/test_version.py b/tests/test_version.py index c1cace3..0b7a879 100644 --- a/tests/test_version.py +++ b/tests/test_version.py @@ -17,4 +17,4 @@ import onapsdk.version as version def test_version(): """Check version is the right one.""" - assert version.__version__ == '12.3.1' + assert version.__version__ == '12.3.2' |