variable/grpc cleanup to rename everything using spelt out numbers instead of actual numbers
This commit is contained in:
Blake Harnden
parent
b28ef76d65
commit
876699e8ef
45 changed files with 932 additions and 966 deletions
|
|
@ -10,71 +10,71 @@ def create_ptp_network(
|
|||
session: Session, ip_prefixes: IpPrefixes
|
||||
) -> Tuple[CoreNode, CoreNode]:
|
||||
# create nodes
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
|
||||
# link nodes to net node
|
||||
interface_one = ip_prefixes.create_interface(node_one)
|
||||
interface_two = ip_prefixes.create_interface(node_two)
|
||||
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
|
||||
|
||||
# instantiate session
|
||||
session.instantiate()
|
||||
|
||||
return node_one, node_two
|
||||
return node1, node2
|
||||
|
||||
|
||||
class TestLinks:
|
||||
def test_add_ptp(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_one = ip_prefixes.create_interface(node_one)
|
||||
interface_two = ip_prefixes.create_interface(node_two)
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
|
||||
# when
|
||||
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
|
||||
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
|
||||
|
||||
# then
|
||||
assert node_one.netif(interface_one.id)
|
||||
assert node_two.netif(interface_two.id)
|
||||
assert node1.netif(interface1_data.id)
|
||||
assert node2.netif(interface2_data.id)
|
||||
|
||||
def test_add_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(SwitchNode)
|
||||
interface_one = ip_prefixes.create_interface(node_one)
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(SwitchNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
|
||||
# when
|
||||
session.add_link(node_one.id, node_two.id, interface_one=interface_one)
|
||||
session.add_link(node1.id, node2.id, interface1_data=interface1_data)
|
||||
|
||||
# then
|
||||
assert node_two.all_link_data()
|
||||
assert node_one.netif(interface_one.id)
|
||||
assert node2.all_link_data()
|
||||
assert node1.netif(interface1_data.id)
|
||||
|
||||
def test_add_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(SwitchNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_two = ip_prefixes.create_interface(node_two)
|
||||
node1 = session.add_node(SwitchNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
|
||||
# when
|
||||
session.add_link(node_one.id, node_two.id, interface_two=interface_two)
|
||||
session.add_link(node1.id, node2.id, interface2_data=interface2_data)
|
||||
|
||||
# then
|
||||
assert node_one.all_link_data()
|
||||
assert node_two.netif(interface_two.id)
|
||||
assert node1.all_link_data()
|
||||
assert node2.netif(interface2_data.id)
|
||||
|
||||
def test_add_net_to_net(self, session):
|
||||
# given
|
||||
node_one = session.add_node(SwitchNode)
|
||||
node_two = session.add_node(SwitchNode)
|
||||
node1 = session.add_node(SwitchNode)
|
||||
node2 = session.add_node(SwitchNode)
|
||||
|
||||
# when
|
||||
session.add_link(node_one.id, node_two.id)
|
||||
session.add_link(node1.id, node2.id)
|
||||
|
||||
# then
|
||||
assert node_one.all_link_data()
|
||||
assert node1.all_link_data()
|
||||
|
||||
def test_update_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
|
|
@ -83,34 +83,31 @@ class TestLinks:
|
|||
per = 25
|
||||
dup = 25
|
||||
jitter = 10
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(SwitchNode)
|
||||
interface_one_data = ip_prefixes.create_interface(node_one)
|
||||
session.add_link(node_one.id, node_two.id, interface_one_data)
|
||||
interface_one = node_one.netif(interface_one_data.id)
|
||||
assert interface_one.getparam("delay") != delay
|
||||
assert interface_one.getparam("bw") != bandwidth
|
||||
assert interface_one.getparam("loss") != per
|
||||
assert interface_one.getparam("duplicate") != dup
|
||||
assert interface_one.getparam("jitter") != jitter
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(SwitchNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
session.add_link(node1.id, node2.id, interface1_data)
|
||||
interface1 = node1.netif(interface1_data.id)
|
||||
assert interface1.getparam("delay") != delay
|
||||
assert interface1.getparam("bw") != bandwidth
|
||||
assert interface1.getparam("loss") != per
|
||||
assert interface1.getparam("duplicate") != dup
|
||||
assert interface1.getparam("jitter") != jitter
|
||||
|
||||
# when
|
||||
link_options = LinkOptions(
|
||||
options = LinkOptions(
|
||||
delay=delay, bandwidth=bandwidth, per=per, dup=dup, jitter=jitter
|
||||
)
|
||||
session.update_link(
|
||||
node_one.id,
|
||||
node_two.id,
|
||||
interface_one_id=interface_one_data.id,
|
||||
options=link_options,
|
||||
node1.id, node2.id, interface1_id=interface1_data.id, options=options
|
||||
)
|
||||
|
||||
# then
|
||||
assert interface_one.getparam("delay") == delay
|
||||
assert interface_one.getparam("bw") == bandwidth
|
||||
assert interface_one.getparam("loss") == per
|
||||
assert interface_one.getparam("duplicate") == dup
|
||||
assert interface_one.getparam("jitter") == jitter
|
||||
assert interface1.getparam("delay") == delay
|
||||
assert interface1.getparam("bw") == bandwidth
|
||||
assert interface1.getparam("loss") == per
|
||||
assert interface1.getparam("duplicate") == dup
|
||||
assert interface1.getparam("jitter") == jitter
|
||||
|
||||
def test_update_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
|
|
@ -119,34 +116,31 @@ class TestLinks:
|
|||
per = 25
|
||||
dup = 25
|
||||
jitter = 10
|
||||
node_one = session.add_node(SwitchNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_two_data = ip_prefixes.create_interface(node_two)
|
||||
session.add_link(node_one.id, node_two.id, interface_two=interface_two_data)
|
||||
interface_two = node_two.netif(interface_two_data.id)
|
||||
assert interface_two.getparam("delay") != delay
|
||||
assert interface_two.getparam("bw") != bandwidth
|
||||
assert interface_two.getparam("loss") != per
|
||||
assert interface_two.getparam("duplicate") != dup
|
||||
assert interface_two.getparam("jitter") != jitter
|
||||
node1 = session.add_node(SwitchNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
session.add_link(node1.id, node2.id, interface2_data=interface2_data)
|
||||
interface2 = node2.netif(interface2_data.id)
|
||||
assert interface2.getparam("delay") != delay
|
||||
assert interface2.getparam("bw") != bandwidth
|
||||
assert interface2.getparam("loss") != per
|
||||
assert interface2.getparam("duplicate") != dup
|
||||
assert interface2.getparam("jitter") != jitter
|
||||
|
||||
# when
|
||||
link_options = LinkOptions(
|
||||
options = LinkOptions(
|
||||
delay=delay, bandwidth=bandwidth, per=per, dup=dup, jitter=jitter
|
||||
)
|
||||
session.update_link(
|
||||
node_one.id,
|
||||
node_two.id,
|
||||
interface_two_id=interface_two_data.id,
|
||||
options=link_options,
|
||||
node1.id, node2.id, interface2_id=interface2_data.id, options=options
|
||||
)
|
||||
|
||||
# then
|
||||
assert interface_two.getparam("delay") == delay
|
||||
assert interface_two.getparam("bw") == bandwidth
|
||||
assert interface_two.getparam("loss") == per
|
||||
assert interface_two.getparam("duplicate") == dup
|
||||
assert interface_two.getparam("jitter") == jitter
|
||||
assert interface2.getparam("delay") == delay
|
||||
assert interface2.getparam("bw") == bandwidth
|
||||
assert interface2.getparam("loss") == per
|
||||
assert interface2.getparam("duplicate") == dup
|
||||
assert interface2.getparam("jitter") == jitter
|
||||
|
||||
def test_update_ptp(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
|
|
@ -155,93 +149,85 @@ class TestLinks:
|
|||
per = 25
|
||||
dup = 25
|
||||
jitter = 10
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_one_data = ip_prefixes.create_interface(node_one)
|
||||
interface_two_data = ip_prefixes.create_interface(node_two)
|
||||
session.add_link(
|
||||
node_one.id, node_two.id, interface_one_data, interface_two_data
|
||||
)
|
||||
interface_one = node_one.netif(interface_one_data.id)
|
||||
interface_two = node_two.netif(interface_two_data.id)
|
||||
assert interface_one.getparam("delay") != delay
|
||||
assert interface_one.getparam("bw") != bandwidth
|
||||
assert interface_one.getparam("loss") != per
|
||||
assert interface_one.getparam("duplicate") != dup
|
||||
assert interface_one.getparam("jitter") != jitter
|
||||
assert interface_two.getparam("delay") != delay
|
||||
assert interface_two.getparam("bw") != bandwidth
|
||||
assert interface_two.getparam("loss") != per
|
||||
assert interface_two.getparam("duplicate") != dup
|
||||
assert interface_two.getparam("jitter") != jitter
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
|
||||
interface1 = node1.netif(interface1_data.id)
|
||||
interface2 = node2.netif(interface2_data.id)
|
||||
assert interface1.getparam("delay") != delay
|
||||
assert interface1.getparam("bw") != bandwidth
|
||||
assert interface1.getparam("loss") != per
|
||||
assert interface1.getparam("duplicate") != dup
|
||||
assert interface1.getparam("jitter") != jitter
|
||||
assert interface2.getparam("delay") != delay
|
||||
assert interface2.getparam("bw") != bandwidth
|
||||
assert interface2.getparam("loss") != per
|
||||
assert interface2.getparam("duplicate") != dup
|
||||
assert interface2.getparam("jitter") != jitter
|
||||
|
||||
# when
|
||||
link_options = LinkOptions(
|
||||
options = LinkOptions(
|
||||
delay=delay, bandwidth=bandwidth, per=per, dup=dup, jitter=jitter
|
||||
)
|
||||
session.update_link(
|
||||
node_one.id,
|
||||
node_two.id,
|
||||
interface_one_data.id,
|
||||
interface_two_data.id,
|
||||
link_options,
|
||||
node1.id, node2.id, interface1_data.id, interface2_data.id, options
|
||||
)
|
||||
|
||||
# then
|
||||
assert interface_one.getparam("delay") == delay
|
||||
assert interface_one.getparam("bw") == bandwidth
|
||||
assert interface_one.getparam("loss") == per
|
||||
assert interface_one.getparam("duplicate") == dup
|
||||
assert interface_one.getparam("jitter") == jitter
|
||||
assert interface_two.getparam("delay") == delay
|
||||
assert interface_two.getparam("bw") == bandwidth
|
||||
assert interface_two.getparam("loss") == per
|
||||
assert interface_two.getparam("duplicate") == dup
|
||||
assert interface_two.getparam("jitter") == jitter
|
||||
assert interface1.getparam("delay") == delay
|
||||
assert interface1.getparam("bw") == bandwidth
|
||||
assert interface1.getparam("loss") == per
|
||||
assert interface1.getparam("duplicate") == dup
|
||||
assert interface1.getparam("jitter") == jitter
|
||||
assert interface2.getparam("delay") == delay
|
||||
assert interface2.getparam("bw") == bandwidth
|
||||
assert interface2.getparam("loss") == per
|
||||
assert interface2.getparam("duplicate") == dup
|
||||
assert interface2.getparam("jitter") == jitter
|
||||
|
||||
def test_delete_ptp(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_one = ip_prefixes.create_interface(node_one)
|
||||
interface_two = ip_prefixes.create_interface(node_two)
|
||||
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
|
||||
assert node_one.netif(interface_one.id)
|
||||
assert node_two.netif(interface_two.id)
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
session.add_link(node1.id, node2.id, interface1_data, interface2_data)
|
||||
assert node1.netif(interface1_data.id)
|
||||
assert node2.netif(interface2_data.id)
|
||||
|
||||
# when
|
||||
session.delete_link(
|
||||
node_one.id, node_two.id, interface_one.id, interface_two.id
|
||||
)
|
||||
session.delete_link(node1.id, node2.id, interface1_data.id, interface2_data.id)
|
||||
|
||||
# then
|
||||
assert not node_one.netif(interface_one.id)
|
||||
assert not node_two.netif(interface_two.id)
|
||||
assert not node1.netif(interface1_data.id)
|
||||
assert not node2.netif(interface2_data.id)
|
||||
|
||||
def test_delete_node_to_net(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(CoreNode)
|
||||
node_two = session.add_node(SwitchNode)
|
||||
interface_one = ip_prefixes.create_interface(node_one)
|
||||
session.add_link(node_one.id, node_two.id, interface_one)
|
||||
assert node_one.netif(interface_one.id)
|
||||
node1 = session.add_node(CoreNode)
|
||||
node2 = session.add_node(SwitchNode)
|
||||
interface1_data = ip_prefixes.create_interface(node1)
|
||||
session.add_link(node1.id, node2.id, interface1_data)
|
||||
assert node1.netif(interface1_data.id)
|
||||
|
||||
# when
|
||||
session.delete_link(node_one.id, node_two.id, interface_one_id=interface_one.id)
|
||||
session.delete_link(node1.id, node2.id, interface1_id=interface1_data.id)
|
||||
|
||||
# then
|
||||
assert not node_one.netif(interface_one.id)
|
||||
assert not node1.netif(interface1_data.id)
|
||||
|
||||
def test_delete_net_to_node(self, session: Session, ip_prefixes: IpPrefixes):
|
||||
# given
|
||||
node_one = session.add_node(SwitchNode)
|
||||
node_two = session.add_node(CoreNode)
|
||||
interface_two = ip_prefixes.create_interface(node_two)
|
||||
session.add_link(node_one.id, node_two.id, interface_two=interface_two)
|
||||
assert node_two.netif(interface_two.id)
|
||||
node1 = session.add_node(SwitchNode)
|
||||
node2 = session.add_node(CoreNode)
|
||||
interface2_data = ip_prefixes.create_interface(node2)
|
||||
session.add_link(node1.id, node2.id, interface2_data=interface2_data)
|
||||
assert node2.netif(interface2_data.id)
|
||||
|
||||
# when
|
||||
session.delete_link(node_one.id, node_two.id, interface_two_id=interface_two.id)
|
||||
session.delete_link(node1.id, node2.id, interface2_id=interface2_data.id)
|
||||
|
||||
# then
|
||||
assert not node_two.netif(interface_two.id)
|
||||
assert not node2.netif(interface2_data.id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue