engineering-degree/orchestrator-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

Browse Source
This commit is contained in:
Wojciech Janota 2022-11-01 14:45:50 +01:00
parent d2066d45b2
commit bccb9af65c
No known key found for this signature in database
GPG Key ID: E83FBD2850CC1F14
2 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
utils/database/database.py
View File

@ -1,6 +1,6 @@
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import sessionmaker
from utils.models import Client, VMImage from utils.models.models import Client, VMImage
import logging import logging
@ -27,15 +27,15 @@ class Database:
print(ex) print(ex)
exit(-1) exit(-1)
def get_clients(self) -> list(Client): def get_clients(self) -> list[Client]:
result = None result = []
try: try:
with self.session.begin(): with self.session.begin():
result = self.session.query(Client).all() result = self.session.query(Client).all()
except Exception as ex: except Exception as ex:
self.logger.error( self.logger.error(
f"Error getting list of clients from database: {ex}") f"Error getting list of clients from database: {ex}")
result = None result = []
return result return result
def get_client_by_mac_address(self, mac_address: str) -> Client: def get_client_by_mac_address(self, mac_address: str) -> Client:
@ -45,8 +45,29 @@ class Database:
result = self.session.query( result = self.session.query(
Client, mac_address=mac_address).first() Client, mac_address=mac_address).first()
except Exception as ex: except Exception as ex:
self.logger.error(f"Error getting client by mac address: {ex}") self.logger.warn(f"Error getting client by mac address: {ex}")
return result return result
def get_clients_by_client_version(self, client_version: str) -> list(Client): def get_clients_by_client_version(self, client_version: str) -> list[Client]:
result = None result = []
try:
with self.session.begin():
result = self.session.query(
Client, client_version=client_version).all()
except Exception as ex:
self.logger.warn(
f"Error getting client list by software version: {ex}")
return result
def get_clients_by_vm_image(self, vm_image: VMImage) -> list[Client]:
result = []
try:
clients_list = self.get_clients()
for client in clients_list:
if client.has_vm_installed(vm_image.image_hash):
result.append()
except Exception as ex:
self.logger.warn(
f"Error getting list of clients with VM installed: {ex}")
result = []
return result

2
utils/models/__init__.py
View File

@ -1 +1 @@
from utils.models import Client, VMImage from utils.models import Client, VMImage