From d8af190875c972388a8b9cfe558475e8b8e49173 Mon Sep 17 00:00:00 2001 From: nsubbot Date: Wed, 5 Nov 2025 10:49:50 +0300 Subject: [PATCH] =?UTF-8?q?=D0=90=D0=BA=D1=82=D1=83=D0=B0=D0=BB=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D1=8F=20=D1=82=D0=B5=D1=81=D1=82=D0=B0?= =?UTF-8?q?=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=82=D0=B5=D0=BA=D1=81=D1=82=D0=B0=20=D0=BB=D0=B8?= =?UTF-8?q?=D1=86=D0=B5=D0=BD=D0=B7=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env | 2 +- .env.69 | 2 +- .env.76 | 2 +- pages/license_tab.py | 47 ++++++++++++-------------------------------- 4 files changed, 16 insertions(+), 37 deletions(-) diff --git a/.env b/.env index 356453e..f4ddf1d 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ ENV=develop AUTH_LOGIN = admin -AUTH_PASSWORD = admin123 +AUTH_PASSWORD = enodemon-admin diff --git a/.env.69 b/.env.69 index 356453e..f4ddf1d 100644 --- a/.env.69 +++ b/.env.69 @@ -1,3 +1,3 @@ ENV=develop AUTH_LOGIN = admin -AUTH_PASSWORD = admin123 +AUTH_PASSWORD = enodemon-admin diff --git a/.env.76 b/.env.76 index 73a7825..7571ece 100644 --- a/.env.76 +++ b/.env.76 @@ -1,3 +1,3 @@ ENV=test AUTH_LOGIN = admin -AUTH_PASSWORD = admin +AUTH_PASSWORD = enodemon-admin diff --git a/pages/license_tab.py b/pages/license_tab.py index 00b2991..30daca1 100644 --- a/pages/license_tab.py +++ b/pages/license_tab.py @@ -12,7 +12,6 @@ from locators.button_locators import ButtonLocators from elements.text_input_element import TextInput from elements.text_element import Text from elements.button_element import Button -from data.environment import host from components.toolbar_component import ToolbarComponent from components.json_container_component import JsonContainerComponent from components.alert_component import AlertComponent @@ -157,41 +156,21 @@ class LicenseTab(BasePage): actual_data = self.json_container.read_data(JsonContainerLocators.CONTAINER) - env_name = host.get_env_name() + # send request to backend to get license info + response = self.send_get_api_request("api/service-manager/license") - # temporarily because of difference in version - if env_name == "test": - # send request to backend to get license info - response = self.send_get_api_request("e-cmdb/api/lic") + if response.status == 200: response_body = self.get_response_body(response) + expected_data = response_body["data"]["config"]["config"]["e-nms"] - del response_body["netManagment"] - response_body["ui"]["lcc"].pop("lcc_object") - response_body["ui"]["lcc"].pop("lcc_reference_book") - response_body["ui"]["lcc"].pop("lcc_reports") - response_body["ui"]["lcc"].pop("lcc_library_files") - response_body["ui"]["lcc"].pop("lcc_global_map") - response_body["ui"]["cmdb"].pop("logical_phone") - response_body["ui"]["cmdb"].pop("logical_ip") - response_body["ui"]["cmdb"].pop("logical_vlan") - response_body["ui"]["cmdb"].pop("logical_vm") + for key_1, item in actual_data.items(): + if not isinstance(item, dict): + assert actual_data[key_1] == expected_data[key_1],\ + f"Expected json content is not equal actual: {actual_data[key_1]} {expected_data[key_1]}" + continue - # compare actual and response from cmdb - self.json_container.check_json_equals( - actual_data, - response_body, - "Expected json content is not equal actual:" - ) - elif env_name == "develop" != 0: - # send request to backend to get license info - response = self.send_get_api_request("api/service-manager/license") - response_body = self.get_response_body(response) - - # compare actual and response from cmdb - self.json_container.check_json_equals( - actual_data, - response_body["data"]["config"]["config"]["e-nms"], - "Expected json content is not equal actual:" - ) + for key_2 in item: + assert actual_data[key_1][key_2] == expected_data[key_1][key_2],\ + f"Expected json content is not equal actual: {actual_data[key_1][key_2]} {expected_data[key_1][key_2]}" else: - pass + assert False, f"No response from 'api/service-manager/license' request: {response.status_text}"