dnsproject/server
2
0
Fork 0
Code Pull Requests Releases Activity

removed bugs

Browse Source
This commit is contained in:
Torma Kristóf
2021-11-11 19:15:24 +01:00
parent 8bff435ef3
commit 8a1ad07e30
4 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/resources.py
View File

@@ -25,7 +25,7 @@ class ServiceDiscoveryResource(Resource):
def get(self):
try:
servicelist = self.servicedirectoryschema.load(json.load(redis_client.get('servicelist').decode('UTF-8')))
servicelist = self.servicedirectoryschema.load(json.loads(redis_client.get('servicelist').decode('UTF-8')))
except Exception as e:
current_app.logger.info(e)
abort(404, "not found")
@@ -40,7 +40,7 @@ class ServiceLocationResource(Resource):
def get(self, serviceid: str):
try:
serviceobject: dict = self.servicelocatorschema.load(json.load(redis_client.get(serviceid).decode('UTF-8')))
serviceobject: dict = self.servicelocatorschema.load(json.loads(redis_client.get(serviceid).decode('UTF-8')))
servicelocation: str = random.choice(serviceobject['servicearray'])['location']
except Exception as e:
current_app.logger.info(e)
@@ -67,10 +67,10 @@ class ServiceDatabaseResource(Resource):
current_app.logger.info(e)
abort(417, "invalid JSON schema")
try:
redis_client.set(servicelocation['id'], self.servicelocatorschema.dump(servicelocation).encode('UTF-8'))
servicelist = self.servicedirectoryschema.load(json.load(redis_client.get('servicelist').decode('UTF-8')))
redis_client.set(servicelocation['id'], json.dumps(self.servicelocatorschema.dump(servicelocation)).encode('UTF-8'))
servicelist = self.servicedirectoryschema.load(json.loads(redis_client.get('servicelist').decode('UTF-8')))
servicelist.append({"name": servicelocation['name'], "id": servicelocation['id']})
redis_client.set('servicelist', self.servicedirectoryschema.dump(servicelist).encode('UTF-8'))
redis_client.set('servicelist', json.dumps(self.servicedirectoryschema.dump(servicelist)).encode('UTF-8'))
except Exception as e:
current_app.logger.info(e)
abort(404, "not found")
@@ -97,7 +97,7 @@ class ServiceDatabaseItemResource(Resource):
abort(417, "invalid JSON schema")
try:
redis_client.get(serviceid)
redis_client.set(serviceid, self.servicelocatorschema.dump(servicelocation).encode('UTF-8'))
redis_client.set(serviceid, json.dumps(self.servicelocatorschema.dump(servicelocation)).encode('UTF-8'))
except Exception as e:
current_app.logger.info(e)
abort(404, "not found")
@@ -105,8 +105,35 @@ class ServiceDatabaseItemResource(Resource):
def get(self, serviceid: str):
try:
servicelocation = self.servicelocatorschema.load(json.load(redis_client.get(serviceid).decode('UTF-8')))
servicelocation = self.servicelocatorschema.load(json.loads(redis_client.get(serviceid).decode('UTF-8')))
except Exception as e:
current_app.logger.info(e)
abort(404, "not found")
return servicelocation, 200
class ResetApplicationResource(Resource):
"""
Reset the application
"""
servicedirectoryschema = ServiceDirectorySchema(many=True)
servicelocatorschema = ServiceLocatorSchema(many=False)
def get(self):
try:
redis_client.set('servicelist', json.dumps(self.servicedirectoryschema.dump(
[{"name": "Test App", "id": "c03b5706-5ea3-46c9-a2cb-e1442f3528e3"}])).encode('UTF-8'))
redis_client.set('c03b5706-5ea3-46c9-a2cb-e1442f3528e3',
json.dumps(self.servicelocatorschema.dump({"name": "Test App",
"id": "c03b5706-5ea3-46c9-a2cb-e1442f3528e3",
"servicearray": [
{
"location": "198.51.100.42",
"zone": "string"
}
]})).encode(
'UTF-8'))
except Exception as e:
current_app.logger.info(e)
abort(404, e)
return 200