From 6d8b2acc0859b7f97a24af5c78fc624d498cae26 Mon Sep 17 00:00:00 2001 From: Jesus Bermudez Velazquez Date: Fri, 17 May 2024 10:55:42 +0100 Subject: [PATCH] Rename method for accuracy --- lib/cloudregister/registerutils.py | 6 +++--- tests/test_registerutils.py | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/cloudregister/registerutils.py b/lib/cloudregister/registerutils.py index b8e60ad..1e7157d 100644 --- a/lib/cloudregister/registerutils.py +++ b/lib/cloudregister/registerutils.py @@ -1445,17 +1445,17 @@ def write_framework_identifier(cfg): # ---------------------------------------------------------------------------- def has_ipv4_access(): """Check if we have IPv4 network configuration""" - return has_network_access_by_ipversion('8.8.8.8') + return has_network_access_by_ip_address('8.8.8.8') # ---------------------------------------------------------------------------- def has_ipv6_access(): """Check if we have IPv6 network configuration""" - return has_network_access_by_ipversion('2001:4860:4860::8888') + return has_network_access_by_ip_address('2001:4860:4860::8888') # ---------------------------------------------------------------------------- -def has_network_access_by_ipversion(server_ip): +def has_network_access_by_ip_address(server_ip): """Check if we can connect to the given server""" try: connection = socket.create_connection((server_ip, 443), timeout=2) diff --git a/tests/test_registerutils.py b/tests/test_registerutils.py index 0c1297e..aab3474 100644 --- a/tests/test_registerutils.py +++ b/tests/test_registerutils.py @@ -747,7 +747,7 @@ def test_fetch_smt_data_metadata_server( etree.tostring(smt_server, encoding='utf-8') -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') @patch('cloudregister.registerutils.time.sleep') @patch('cloudregister.registerutils.logging') def test_fetch_smt_data_api_no_answer( @@ -791,7 +791,7 @@ def test_fetch_smt_data_api_no_answer( ] -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') @patch('cloudregister.registerutils.requests.get') @patch('cloudregister.registerutils.os.path.isfile') @patch('cloudregister.registerutils.time.sleep') @@ -863,7 +863,7 @@ def test_fetch_smt_data_api_no_valid_ip( assert etree.tostring(smt_data, encoding='utf-8') == smt_xml.encode() -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') @patch('cloudregister.registerutils.requests.get') @patch('cloudregister.registerutils.os.path.isfile') @patch('cloudregister.registerutils.time.sleep') @@ -919,7 +919,7 @@ def test_fetch_smt_data_api_error_response( ] -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') @patch('cloudregister.registerutils.requests.get') @patch('cloudregister.registerutils.os.path.isfile') @patch('cloudregister.registerutils.time.sleep') @@ -968,7 +968,7 @@ def test_fetch_smt_data_api_exception( ] -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') @patch('cloudregister.registerutils.requests.get') @patch('cloudregister.registerutils.os.path.isfile') @patch('cloudregister.registerutils.time.sleep') @@ -3046,21 +3046,21 @@ def test_remove_service( mock_logging.info.not_called() -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') def test_has_ipv4_access(mock_has_network_access): mock_has_network_access.return_value = True assert utils.has_ipv4_access() -@patch('cloudregister.registerutils.has_network_access_by_ipversion') +@patch('cloudregister.registerutils.has_network_access_by_ip_address') def test_has_ipv6_access(mock_has_network_access): mock_has_network_access.return_value = True assert utils.has_ipv6_access() @patch('cloudregister.registerutils.socket.create_connection') -def test_has_network_access_by_ipversion(mock_socket_create_connection): - assert utils.has_network_access_by_ipversion('1.1.1.1') +def test_has_network_access_by_ip_address(mock_socket_create_connection): + assert utils.has_network_access_by_ip_address('1.1.1.1') # ---------------------------------------------------------------------------