fixed issue with sending the wrong type flag from cleaning up configuration request code in services

This commit is contained in:
Blake J. Harnden 2017-05-05 15:14:27 -07:00
parent 8e9dc21c3c
commit 97f3c3a070
7 changed files with 73 additions and 77 deletions

View file

@ -48,18 +48,10 @@ class Core(object):
network.link(from_interface, to_interface)
def configure_link(self, network, interface_one, interface_two, values, unidirectional=False):
network.linkconfig(
netif=interface_one,
netif2=interface_two,
**values
)
network.linkconfig(netif=interface_one, netif2=interface_two, **values)
if not unidirectional:
network.linkconfig(
netif=interface_two,
netif2=interface_one,
**values
)
network.linkconfig(netif=interface_two, netif2=interface_one, **values)
def ping(self, from_name, to_name):
from_node = self.nodes[from_name]

View file

@ -6,9 +6,41 @@ import time
from core.mobility import BasicRangeModel
from core.netns import nodes
from core.phys.pnodes import PhysicalNode
class TestCore:
def test_physical(self, core):
"""
Test physical node network.
:param conftest.Core core: core fixture to test with
"""
# create switch node
switch_node = core.session.add_object(cls=nodes.SwitchNode)
# create a physical node
physical_node = core.session.add_object(cls=PhysicalNode, name="p1")
core.nodes[physical_node.name] = physical_node
# create regular node
core.create_node("n1")
# add interface
core.add_interface(switch_node, "n1")
core.add_interface(switch_node, "p1")
# instantiate session
core.session.instantiate()
# assert node directories created
core.assert_nodes()
# ping n2 from n1 and assert success
status = core.ping("n1", "p1")
assert not status
def test_ptp(self, core):
"""
Test ptp node network.
@ -16,7 +48,7 @@ class TestCore:
:param conftest.Core core: core fixture to test with
"""
# create switch
# create ptp
ptp_node = core.session.add_object(cls=nodes.PtpNet)
# create nodes
@ -44,7 +76,7 @@ class TestCore:
:param conftest.Core core: core fixture to test with
"""
# create switch
# create hub
hub_node = core.session.add_object(cls=nodes.HubNode)
# create nodes