Skip to content

Commit d3d18d2

Browse files
authored
ref(scheduler): use scheduler module session singleton to add session mock (#1009)
1 parent 6afa4f2 commit d3d18d2

1 file changed

Lines changed: 19 additions & 14 deletions

File tree

rootfs/scheduler/mock.py

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
import uuid
1212
from zlib import adler32
1313

14-
from . import KubeHTTPClient, KubeHTTPException
14+
import scheduler
15+
from scheduler import KubeHTTPClient, KubeHTTPException
1516

1617
from django.conf import settings
1718
from django.core.cache import cache
@@ -738,7 +739,7 @@ def remove_cache_item(url, resource_type):
738739
cache.set(cache_url, items, None)
739740

740741

741-
def mock(request, context):
742+
def mock_kubernetes(request, context):
742743
# always cleanup pods
743744
cleanup_pods()
744745
# always transition pods
@@ -760,20 +761,23 @@ def mock(request, context):
760761
logger.critical(request.method)
761762

762763

763-
class MockSchedulerClient(KubeHTTPClient):
764-
def __init__(self):
765-
self.url = settings.SCHEDULER_URL
766-
self.registry = settings.REGISTRY_URL
764+
def session():
765+
adapter = requests_mock.Adapter()
766+
session = requests.Session()
767+
session.mount(settings.SCHEDULER_URL, adapter)
768+
769+
# Lets just listen to everything and sort it out ourselves
770+
adapter.register_uri(
771+
requests_mock.ANY, requests_mock.ANY,
772+
json=mock_kubernetes
773+
)
767774

768-
adapter = requests_mock.Adapter()
769-
self.session = requests.Session()
770-
self.session.mount(self.url, adapter)
775+
return session
771776

772-
# Lets just listen to everything and sort it out ourselves
773-
adapter.register_uri(
774-
requests_mock.ANY, requests_mock.ANY,
775-
json=mock
776-
)
777+
778+
class MockSchedulerClient(KubeHTTPClient):
779+
def __init__(self):
780+
super().__init__()
777781

778782
# Pre-seed data that is assumed to otherwise be there
779783
try:
@@ -888,6 +892,7 @@ def __init__(self):
888892
except Exception as e:
889893
logger.critical(e)
890894

895+
scheduler.session = session()
891896
SchedulerClient = MockSchedulerClient
892897

893898

0 commit comments

Comments
 (0)