Merge branch 'feature/1816_Database-Service-(Network-and-User-Interaction)' into feature/1752-dns-server-and-client

This commit is contained in:
Czar Echavez
2023-09-11 09:50:16 +01:00
13 changed files with 246 additions and 10 deletions

View File

@@ -2,7 +2,7 @@ from ipaddress import IPv4Address
from primaite.simulator.network.hardware.nodes.server import Server
from primaite.simulator.system.applications.database_client import DatabaseClient
from primaite.simulator.system.services.database import DatabaseService
from primaite.simulator.system.services.database_service import DatabaseService
def test_database_client_server_connection(uc2_network):

View File

@@ -3,7 +3,7 @@ import json
import pytest
from primaite.simulator.network.hardware.base import Node
from primaite.simulator.system.services.database import DatabaseService
from primaite.simulator.system.services.database_service import DatabaseService
DDL = """
CREATE TABLE IF NOT EXISTS user (