oxbrbtx/PrimAITE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Czar Echavez
2023-09-11 09:50:16 +01:00
parent 5cd1e2edf0 388176b8bd
commit 5a101d5426
13 changed files with 246 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/primaite/simulator/network/hardware/base.py
View File

@@ -960,6 +960,7 @@ class Node(SimComponent):
return state
def show(self, markdown: bool = False, component: Literal["NIC", "OPEN_PORTS"] = "NIC"):
"""A multi-use .show function that accepts either NIC or OPEN_PORTS."""
if component == "NIC":
self._show_nic(markdown)
elif component == "OPEN_PORTS":

2
src/primaite/simulator/network/networks.py
View File

@@ -7,7 +7,7 @@ from primaite.simulator.network.hardware.nodes.switch import Switch
from primaite.simulator.network.transmission.network_layer import IPProtocol
from primaite.simulator.network.transmission.transport_layer import Port
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 client_server_routed() -> Network: