Skip to content

Restyle Issue 78 redis not saving data #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vladyslav-fenchak merged 2 commits into from
Mar 30, 2022
Merged

Restyle Issue 78 redis not saving data #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d866eea
Restyled by black
restyled-commits Mar 30, 2022
af91b8d
Restyled by isort
restyled-commits Mar 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion minos/api_gateway/discovery/database/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ class OrdersMinosApiRouter(MinosApiRouter):
import logging
from typing import (
Any,
Optional
Optional,
)

import aioredis
Expand Down
22 changes: 15 additions & 7 deletions tests/test_api_gateway/test_discovery/dataset.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
import random
import socket
import struct
from uuid import uuid4
from uuid import (
uuid4,
)


def generate_random_microservice_names(quantity: int):
Expand All @@ -11,21 +13,27 @@ def generate_random_microservice_names(quantity: int):


def generate_record(name):
ip = socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
ip = socket.inet_ntoa(struct.pack(">I", random.randint(1, 0xFFFFFFFF)))
port = random.randint(1, 9999)

record = {"address": f"{ip}", "port": port,
"endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]]}
record = {
"address": f"{ip}",
"port": port,
"endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]],
}

return record


def generate_record_old(x):
ip = socket.inet_ntoa(struct.pack('>I', random.randint(1, 0xffffffff)))
ip = socket.inet_ntoa(struct.pack(">I", random.randint(1, 0xFFFFFFFF)))
port = random.randint(1, 9999)
name = f"microservice_{x}"

record = {"address": f"{ip}", "port": port,
"endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]]}
record = {
"address": f"{ip}",
"port": port,
"endpoints": [["GET", f"test_endpoint_{name}"], ["POST", f"test_endpoint_{name}"]],
}

return name, record
26 changes: 16 additions & 10 deletions tests/test_api_gateway/test_discovery/test_views/test_microservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,18 @@
AioHTTPTestCase,
unittest_run_loop,
)

from minos.api_gateway.common import (
MinosConfig,
)
from minos.api_gateway.discovery import (
DiscoveryService,
)
from tests.test_api_gateway.test_discovery.dataset import generate_record, generate_random_microservice_names, \
generate_record_old
from tests.test_api_gateway.test_discovery.dataset import (
generate_random_microservice_names,
generate_record,
generate_record_old,
)
from tests.utils import (
BASE_PATH,
)
Expand Down Expand Up @@ -70,15 +74,16 @@ async def test_bulk_update(self):
# Check updated records are correct
for record in expected:
response = await self.client.get(
f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}")
f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}"
)

self.assertEqual(200, response.status)

body = await response.json()

self.assertEqual(record['body']['address'], body["address"])
self.assertEqual(record['body']['port'], int(body["port"]))
self.assertEqual(record['name'], body["name"])
self.assertEqual(record["body"]["address"], body["address"])
self.assertEqual(record["body"]["port"], int(body["port"]))
self.assertEqual(record["name"], body["name"])

async def test_bulk_update_2(self):
expected = list()
Expand Down Expand Up @@ -106,15 +111,16 @@ async def test_bulk_update_2(self):

for record in expected:
response = await self.client.get(
f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}")
f"/microservices?verb={record['body']['endpoints'][0][0]}&path={record['body']['endpoints'][0][1]}"
)

self.assertEqual(200, response.status)

body = await response.json()

self.assertEqual(record['body']['address'], body["address"])
self.assertEqual(int(record['body']['port']), int(body["port"]))
self.assertEqual(record['name'], body["name"])
self.assertEqual(record["body"]["address"], body["address"])
self.assertEqual(int(record["body"]["port"]), int(body["port"]))
self.assertEqual(record["name"], body["name"])

@unittest_run_loop
async def test_post_missing_param(self):
Expand Down