#1962: merge dev into branch + fix minor diffs + ensure that imports pull from src

This commit is contained in:
Czar.Echavez
2023-11-08 10:36:47 +00:00
201 changed files with 4799 additions and 16458 deletions

View File

@@ -1,4 +1,4 @@
from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
def test_node_to_node_ping():

View File

@@ -1,4 +1,4 @@
from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
def test_link_up():

View File

@@ -1,7 +1,7 @@
import pytest
from primaite.simulator.network.container import Network
from primaite.simulator.network.hardware.base import NIC, Node
from src.primaite.simulator.network.container import Network
from src.primaite.simulator.network.hardware.base import NIC, Node
def test_adding_removing_nodes():

View File

@@ -1,6 +1,6 @@
import pytest
from primaite.simulator.network.hardware.base import Link, NIC
from src.primaite.simulator.network.hardware.base import Link, NIC
def test_link_fails_with_same_nic():

View File

@@ -2,10 +2,10 @@ from typing import Tuple
import pytest
from primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
from primaite.simulator.network.hardware.nodes.router import ACLAction, Router
from primaite.simulator.network.transmission.network_layer import IPProtocol
from primaite.simulator.network.transmission.transport_layer import Port
from src.primaite.simulator.network.hardware.base import Link, NIC, Node, NodeOperatingState
from src.primaite.simulator.network.hardware.nodes.router import ACLAction, Router
from src.primaite.simulator.network.transmission.network_layer import IPProtocol
from src.primaite.simulator.network.transmission.transport_layer import Port
@pytest.fixture(scope="function")

View File

@@ -1,7 +1,7 @@
from primaite.simulator.network.hardware.base import Link, NodeOperatingState
from primaite.simulator.network.hardware.nodes.computer import Computer
from primaite.simulator.network.hardware.nodes.server import Server
from primaite.simulator.network.hardware.nodes.switch import Switch
from src.primaite.simulator.network.hardware.base import Link, NodeOperatingState
from src.primaite.simulator.network.hardware.nodes.computer import Computer
from src.primaite.simulator.network.hardware.nodes.server import Server
from src.primaite.simulator.network.hardware.nodes.switch import Switch
def test_switched_network():