diff --git a/src/epplibwrapper/client.py b/src/epplibwrapper/client.py index 5381f7ce1..01998b955 100644 --- a/src/epplibwrapper/client.py +++ b/src/epplibwrapper/client.py @@ -163,16 +163,12 @@ class EPPLibWrapper: def get_pool(self): """Get the current pool instance""" return self._pool - + def _create_pool(self, client, login, options): """Creates and returns new pool instance""" - return EPPConnectionPool( - client, login, options - ) + return EPPConnectionPool(client, login, options) - def start_connection_pool( - self, restart_pool_if_exists=True - ): + def start_connection_pool(self, restart_pool_if_exists=True): """Starts a connection pool for the registry. restart_pool_if_exists -> bool: @@ -199,9 +195,7 @@ class EPPLibWrapper: logger.info("Connection pool restarting...") self.kill_pool() - self._pool = self._create_pool( - self._client, self._login, self.pool_options - ) + self._pool = self._create_pool(self._client, self._login, self.pool_options) self.pool_status.pool_running = True self.pool_status.pool_hanging = False diff --git a/src/epplibwrapper/socket.py b/src/epplibwrapper/socket.py index 186b98322..00cad80af 100644 --- a/src/epplibwrapper/socket.py +++ b/src/epplibwrapper/socket.py @@ -59,8 +59,6 @@ class Socket: counter += 1 sleep((counter * 50) / 1000) # sleep 50 ms to 150 ms else: # don't try again - logger.warning("LoginError raised and should not retry or has been retried 3 times already") - logger.warning(f"should retry? {err.should_retry()}") return False else: self.disconnect() @@ -69,7 +67,7 @@ class Socket: if self.is_login_error(response.code): logger.warning("was login error") return False - + # otherwise, just return true return True diff --git a/src/epplibwrapper/tests/test_pool.py b/src/epplibwrapper/tests/test_pool.py index b1912b9cf..077b059ea 100644 --- a/src/epplibwrapper/tests/test_pool.py +++ b/src/epplibwrapper/tests/test_pool.py @@ -1,15 +1,11 @@ import datetime from pathlib import Path -from unittest import skip from unittest.mock import MagicMock, patch from dateutil.tz import tzlocal -from django.conf import settings - from django.test import TestCase from epplibwrapper.client import EPPLibWrapper from epplibwrapper.socket import Socket from epplibwrapper.utility.pool import EPPConnectionPool -from registrar.models.domain import Domain from registrar.models.domain import registry from contextlib import ExitStack @@ -40,7 +36,7 @@ class TestConnectionPool(TestCase): # Value in seconds => (keepalive / size) "keepalive": 60, } - + def fake_socket(self, login, client): # Create a fake client object fake_client = Client( @@ -56,55 +52,57 @@ class TestConnectionPool(TestCase): def patch_success(self): return True - + def fake_send(self, command, cleaned=None): - mock = MagicMock( - code=1000, - msg="Command completed successfully", - res_data=None, - cl_tr_id="xkw1uo#2023-10-17T15:29:09.559376", - sv_tr_id="5CcH4gxISuGkq8eqvr1UyQ==-35a", - extensions=[], - msg_q=None, - ) - return mock - + mock = MagicMock( + code=1000, + msg="Command completed successfully", + res_data=None, + cl_tr_id="xkw1uo#2023-10-17T15:29:09.559376", + sv_tr_id="5CcH4gxISuGkq8eqvr1UyQ==-35a", + extensions=[], + msg_q=None, + ) + return mock + @patch.object(EPPLibWrapper, "_test_registry_connection_success", patch_success) def test_pool_sends_data(self): """A .send is invoked on the pool successfully""" expected_result = { - 'cl_tr_id': None, - 'code': 1000, - 'extensions': [], - 'msg': 'Command completed successfully', - 'msg_q': None, - 'res_data': [info.InfoDomainResultData( - roid='DF1340360-GOV', - statuses=[ - common.Status( - state='serverTransferProhibited', - description=None, - lang='en' - ), - common.Status(state='inactive', - description=None, - lang='en')], - cl_id='gov2023-ote', - cr_id='gov2023-ote', - cr_date=datetime.datetime(2023, 8, 15, 23, 56, 36, tzinfo=tzlocal()), - up_id='gov2023-ote', - up_date=datetime.datetime(2023, 8, 17, 2, 3, 19, tzinfo=tzlocal()), - tr_date=None, - name='test3.gov', - registrant='TuaWnx9hnm84GCSU', - admins=[], - nsset=None, - keyset=None, - ex_date=datetime.date(2024, 8, 15), - auth_info=info.DomainAuthInfo(pw='2fooBAR123fooBaz') - ) - ], - 'sv_tr_id': 'wRRNVhKhQW2m6wsUHbo/lA==-29a' + "cl_tr_id": None, + "code": 1000, + "extensions": [], + "msg": "Command completed successfully", + "msg_q": None, + "res_data": [ + info.InfoDomainResultData( + roid="DF1340360-GOV", + statuses=[ + common.Status( + state="serverTransferProhibited", + description=None, + lang="en", + ), + common.Status(state="inactive", description=None, lang="en"), + ], + cl_id="gov2023-ote", + cr_id="gov2023-ote", + cr_date=datetime.datetime( + 2023, 8, 15, 23, 56, 36, tzinfo=tzlocal() + ), + up_id="gov2023-ote", + up_date=datetime.datetime(2023, 8, 17, 2, 3, 19, tzinfo=tzlocal()), + tr_date=None, + name="test3.gov", + registrant="TuaWnx9hnm84GCSU", + admins=[], + nsset=None, + keyset=None, + ex_date=datetime.date(2024, 8, 15), + auth_info=info.DomainAuthInfo(pw="2fooBAR123fooBaz"), + ) + ], + "sv_tr_id": "wRRNVhKhQW2m6wsUHbo/lA==-29a", } def fake_client(mock_client): @@ -117,16 +115,18 @@ class TestConnectionPool(TestCase): ) ) return client - + # Mock a response from EPP def fake_receive(command, cleaned=None): - location= Path(__file__).parent / "utility" / "infoDomain.xml" + location = Path(__file__).parent / "utility" / "infoDomain.xml" xml = (location).read_bytes() return xml # Mock what happens inside the "with" with ExitStack() as stack: - stack.enter_context(patch.object(EPPConnectionPool, "_create_socket", self.fake_socket)) + stack.enter_context( + patch.object(EPPConnectionPool, "_create_socket", self.fake_socket) + ) stack.enter_context(patch.object(Socket, "connect", fake_client)) stack.enter_context(patch.object(SocketTransport, "send", self.fake_send)) stack.enter_context(patch.object(SocketTransport, "receive", fake_receive)) @@ -141,17 +141,18 @@ class TestConnectionPool(TestCase): # Should this ever fail, it either means that the schema has changed, # or the pool is broken. - # If the schema has changed: Update the associated infoDomain.xml file + # If the schema has changed: Update the associated infoDomain.xml file self.assertEqual(result.__dict__, expected_result) # The number of open pools should match the number of requested ones. # If it is 0, then they failed to open self.assertEqual(len(registry._pool.conn), self.pool_options["size"]) - + @patch.object(EPPLibWrapper, "_test_registry_connection_success", patch_success) def test_raises_transport_error(self): """A .send is invoked on the pool, but registry connection is lost right as we send a command.""" + # Fake data for the _pool object def fake_client(self): client = Client( @@ -165,7 +166,9 @@ class TestConnectionPool(TestCase): return client with ExitStack() as stack: - stack.enter_context(patch.object(EPPConnectionPool, "_create_socket", self.fake_socket)) + stack.enter_context( + patch.object(EPPConnectionPool, "_create_socket", self.fake_socket) + ) stack.enter_context(patch.object(Socket, "connect", fake_client)) # Restart the connection pool, since it starts on app startup registry.start_connection_pool() @@ -176,5 +179,3 @@ class TestConnectionPool(TestCase): # Try to send a command out - should fail with self.assertRaises(TransportError): registry.send(commands.InfoDomain(name="test.gov"), cleaned=True) - - diff --git a/src/epplibwrapper/utility/pool.py b/src/epplibwrapper/utility/pool.py index 2fff8e170..ba7edec91 100644 --- a/src/epplibwrapper/utility/pool.py +++ b/src/epplibwrapper/utility/pool.py @@ -1,9 +1,9 @@ import logging -import greenlet import gevent from geventconnpool import ConnectionPool from epplibwrapper.socket import Socket from epplibwrapper.utility.pool_error import PoolError, PoolErrorCodes + try: from epplib.commands import Hello except ImportError: diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index d4b0af408..2e88154ba 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -546,7 +546,7 @@ EPP_CONNECTION_POOL_SIZE = 1 # Determines the interval in which we ping open connections in seconds # Calculated as POOL_KEEP_ALIVE / EPP_CONNECTION_POOL_SIZE -POOL_KEEP_ALIVE = 60 +POOL_KEEP_ALIVE = 60 # Determines how long we try to keep a pool alive for, # before restarting it. diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py index 94bdae0a1..2bfdd58c5 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -16,7 +16,7 @@ from registrar.utility.errors import ( NameserverError, NameserverErrorCodes as nsErrorCodes, ) - + from epplibwrapper import ( CLIENT as registry, commands,