From c1cf91e41376e9b9dbf13013a3f79fb09debaf09 Mon Sep 17 00:00:00 2001 From: "peukerl@telekom.de" Date: Wed, 21 Jun 2023 15:25:40 +0200 Subject: Orchestration request changes status-message added to orchestration-request pnfRegistrationFields added to service-instantiation Issue-ID: INT-2253 Signed-off-by: peukerl@telekom.de Change-Id: I8dd1ee326d63c915591829ceaca2e0f8247afdde --- tests/test_so_instantiation.py | 20 +++++++++++++++++++- tests/test_so_orchestration_request.py | 28 ++++++++++++++++++++++++---- 2 files changed, 43 insertions(+), 5 deletions(-) (limited to 'tests') diff --git a/tests/test_so_instantiation.py b/tests/test_so_instantiation.py index 8f2a93e..3babdd3 100644 --- a/tests/test_so_instantiation.py +++ b/tests/test_so_instantiation.py @@ -1051,7 +1051,16 @@ def test_service_instantiation_so_service(mock_send_message_json): ), SoServicePnf( model_name="test_so_service_pnf_model_name_2", - instance_name="test_so_service_pnf_instance_name_2" + instance_name="test_so_service_pnf_instance_name_2", + registration_parameters=PnfRegistrationParameters( + model_number="test_model_number", + oam_v4_ip_address="test_ip", + oam_v6_ip_address="test_mac", + serial_number="test_serial_number", + software_version="test_software_version", + unit_type="test_unit_type", + vendor_name="test_vendor" + ) ) ] ) @@ -1106,8 +1115,17 @@ def test_service_instantiation_so_service(mock_send_message_json): assert vf_module_2_data["instanceParams"][0]["vf_module_param_2"] == "vf_module_param_2_value" assert pnf_1_data["instanceName"] == "test_so_service_pnf_instance_name_1" + assert not "pnfRegistrationFields" in pnf_1_data assert pnf_2_data["instanceName"] == "test_so_service_pnf_instance_name_2" + assert pnf_2_data["pnfRegistrationFields"]["modelNumber"] == "test_model_number" + assert pnf_2_data["pnfRegistrationFields"]["oamV4IpAddress"] == "test_ip" + assert pnf_2_data["pnfRegistrationFields"]["oamV6IpAddress"] == "test_mac" + assert pnf_2_data["pnfRegistrationFields"]["serialNumber"] == "test_serial_number" + assert pnf_2_data["pnfRegistrationFields"]["softwareVersion"] == "test_software_version" + assert pnf_2_data["pnfRegistrationFields"]["unitType"] == "test_unit_type" + assert pnf_2_data["pnfRegistrationFields"]["vendorName"] == "test_vendor" + def test_so_service_load_from_yaml(): diff --git a/tests/test_so_orchestration_request.py b/tests/test_so_orchestration_request.py index c93189b..56d0ad4 100644 --- a/tests/test_so_orchestration_request.py +++ b/tests/test_so_orchestration_request.py @@ -21,28 +21,32 @@ from onapsdk.onap_service import OnapService IN_PROGRESS = { "request": { "requestStatus": { - "requestState": "IN_PROGRESS" + "requestState": "IN_PROGRESS", + "statusMessage": "test-message" } } } FAILED = { "request": { "requestStatus": { - "requestState": "FAILED" + "requestState": "FAILED", + "statusMessage": "test-message" } } } COMPLETE = { "request": { "requestStatus": { - "requestState": "COMPLETE" + "requestState": "COMPLETE", + "statusMessage": "test-message" } } } UNKNOWN = { "request": { "requestStatus": { - "requestState": "INVALID" + "requestState": "INVALID", + "statusMessage": "test-message" } } } @@ -81,6 +85,22 @@ def test_orchestration_request_status(mock_send_message): assert not orchestration_req.completed assert orchestration_req.failed +@mock.patch.object(OrchestrationRequest, "send_message_json") +def test_orchestration_request_status_message(mock_send_message): + orchestration_req = OrchestrationRequest(request_id="test") + + mock_send_message.return_value = BAD_RESPONSE + assert orchestration_req.status_message == "Unknown request state" + + mock_send_message.return_value = UNKNOWN + assert orchestration_req.status_message == "test-message" + + mock_send_message.return_value = FAILED + assert orchestration_req.status_message == "test-message" + + mock_send_message.return_value = COMPLETE + assert orchestration_req.status_message == "test-message" + #Test the Class SoElement def test_SoElement_headers(): -- cgit 1.2.3-korg