diff options
| author |   peukerl@telekom.de <peukerl@telekom.de> | 2023-06-16 09:05:05 +0200 |
|---|---|---|
| committer | peukerl@telekom.de <peukerl@telekom.de> | 2023-06-19 11:02:25 +0200 |
| commit | bb7533ad0175979f893724eed272148ff65f438c (patch) | |
| tree | 6de9e642b0366d7f86d9556b3c2585a0480e163d /src/onapsdk/so/templates | |
| parent | a13ff9ac968ddced994205539a494ecbdb2d6b34 (diff) | |
pnf-functionalities added, parameters for service-instantiation added
Issue-ID: INT-2250
Signed-off-by: peukerl@telekom.de <peukerl@telekom.de>
Change-Id: I71d7ea0e05be0571a195c093a59fe3d08a138493
Diffstat (limited to 'src/onapsdk/so/templates')
3 files changed, 48 insertions, 2 deletions
diff --git a/src/onapsdk/so/templates/deletion_pnf.json.j2 b/src/onapsdk/so/templates/deletion_pnf.json.j2 new file mode 100644 index 0000000..852432a --- /dev/null +++ b/src/onapsdk/so/templates/deletion_pnf.json.j2 @@ -0,0 +1,27 @@ +{ + "requestDetails": { + "requestInfo": { + "source": "VID", + "requestorId": "demo" + }, + "modelInfo": { + "modelType": "pnf", + "modelName": "{{ pnf_instance.pnf.model_name }}", + "modelInvariantId": "{{ pnf_instance.pnf.model_invariant_id }}", + "modelVersion": "{{ pnf_instance.pnf.model_version }}", + "modelVersionId": "{{ pnf_instance.pnf.model_version_id }}", + "modelCustomizationId": "{{ pnf_instance.pnf.model_customization_id }}", + "modelCustomizationName": "{{ pnf_instance.pnf.name }}" + }, + "requestParameters": { + "testApi": "GR_API", + "aLaCarte": {{ a_la_carte | tojson }} + }, + {# the code below is needed to be refactored # + } + {# https: //gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk/-/issues/133 #} "cloudConfiguration": { "cloudOwner": "{{ pnf_instance.service_instance.service_subscription.cloud_region.cloud_owner }}", + "lcpCloudRegionId": "{{ pnf_instance.service_instance.service_subscription.cloud_region.cloud_region_id }}", + "tenantId": "{{ pnf_instance.service_instance.service_subscription.tenant.tenant_id }}" + } + } +}
\ No newline at end of file diff --git a/src/onapsdk/so/templates/instantiate_pnf_macro_so_pnf.json.j2 b/src/onapsdk/so/templates/instantiate_pnf_macro_so_pnf.json.j2 index a6571bd..5f1f22c 100755 --- a/src/onapsdk/so/templates/instantiate_pnf_macro_so_pnf.json.j2 +++ b/src/onapsdk/so/templates/instantiate_pnf_macro_so_pnf.json.j2 @@ -64,6 +64,17 @@ "lineOfBusiness": {
"lineOfBusinessName": "{{ line_of_business }}"
},
+ {% if so_pnf.registration_parameters %}
+ "pnfRegistrationFields": {
+ "modelNumber": "{{ so_pnf.registration_parameters.model_number }}",
+ "oamV4IpAddress": "{{ so_pnf.registration_parameters.oam_v4_ip_address }}",
+ "oamV6IpAddress": "{{ so_pnf.registration_parameters.oam_v6_ip_address }}",
+ "serialNumber": "{{ so_pnf.registration_parameters.serial_number }}",
+ "softwareVersion": "{{ so_pnf.registration_parameters.software_version }}",
+ "unitType": "{{ so_pnf.registration_parameters.unit_type }}",
+ "vendorName": "{{ so_pnf.registration_parameters.vendor_name }}"
+ },
+ {% endif %}
"productFamilyId": "1234",
"instanceName": "{{ instance_name }}",
"instanceParams": [
@@ -72,7 +83,7 @@ "{{ key }}": "{{ value }}"{% if not loop.last %},{% endif %}
{% endfor %}
}
- ],
+ ]
}
]
{% endblock %}
diff --git a/src/onapsdk/so/templates/instantiate_service_macro.json.j2 b/src/onapsdk/so/templates/instantiate_service_macro.json.j2 index 43b92ee..b00a043 100644 --- a/src/onapsdk/so/templates/instantiate_service_macro.json.j2 +++ b/src/onapsdk/so/templates/instantiate_service_macro.json.j2 @@ -44,7 +44,15 @@ {% endif %} { "service": { - "instanceParams": [], + "instanceParams": [ + {% if so_service %} + { + {% for key, value in so_service.parameters.items() %} + "{{ key }}": "{{ value }}"{% if not loop.last %},{% endif %} + {% endfor %} + } + {% endif %} + ], "instanceName": "{{ service_instance_name }}", "resources": { {% block pnfs %} |