afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated session.add_node to use better type hinting and force usage of classes directly, instead of indirectly through NodeTypes

Browse source
This commit is contained in:
Blake Harnden 2020-05-20 22:14:03 -07:00
parent d5254e6a91
commit c07766e1eb
31 changed files with 315 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

20
daemon/tests/test_nodes.py
View file

@ -1,12 +1,12 @@
import pytest
from core.emulator.emudata import NodeOptions
from core.emulator.enumerations import NodeTypes
from core.errors import CoreError
from core.nodes.base import CoreNode
from core.nodes.network import HubNode, SwitchNode, WlanNode
MODELS = ["router", "host", "PC", "mdr"]
NET_TYPES = [NodeTypes.SWITCH, NodeTypes.HUB, NodeTypes.WIRELESS_LAN]
NET_TYPES = [SwitchNode, HubNode, WlanNode]
class TestNodes:
@ -16,7 +16,7 @@ class TestNodes:
options = NodeOptions(model=model)
# when
node = session.add_node(options=options)
node = session.add_node(CoreNode, options=options)
# then
assert node
@ -25,7 +25,7 @@ class TestNodes:
def test_node_update(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
position_value = 100
update_options = NodeOptions()
update_options.set_position(x=position_value, y=position_value)
@ -39,7 +39,7 @@ class TestNodes:
def test_node_delete(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
# when
session.delete_node(node.id)
@ -50,7 +50,7 @@ class TestNodes:
def test_node_sethwaddr(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
index = node.newnetif()
interface = node.netif(index)
mac = "aa:aa:aa:ff:ff:ff"
@ -63,7 +63,7 @@ class TestNodes:
def test_node_sethwaddr_exception(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
index = node.newnetif()
node.netif(index)
mac = "aa:aa:aa:ff:ff:fff"
@ -74,7 +74,7 @@ class TestNodes:
def test_node_addaddr(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
index = node.newnetif()
interface = node.netif(index)
addr = "192.168.0.1/24"
@ -87,7 +87,7 @@ class TestNodes:
def test_node_addaddr_exception(self, session):
# given
node = session.add_node()
node = session.add_node(CoreNode)
index = node.newnetif()
node.netif(index)
addr = "256.168.0.1/24"
@ -101,7 +101,7 @@ class TestNodes:
# given
# when
node = session.add_node(_type=net_type)
node = session.add_node(net_type)
# then
assert node