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

grpc: removed get_node_links, added links to get_node instead

Browse source
This commit is contained in:
Blake Harnden 2021-05-02 20:58:24 -07:00
parent f271b0289e
commit 38e162aec5
7 changed files with 28 additions and 136 deletions
Download patch file Download diff file Expand all files Collapse all files

45
daemon/tests/test_grpc.py
View file

@ -265,19 +265,6 @@ class TestGrpc:
assert response.node_id is not None
assert session.get_node(response.node_id, CoreNode) is not None
def test_get_node(self, grpc_server: CoreGrpcServer):
# given
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
node = session.add_node(CoreNode)
# then
with client.context_connect():
response = client.get_node(session.id, node.id)
# then
assert response.node.id == node.id
def test_edit_node(self, grpc_server: CoreGrpcServer):
# given
client = CoreGrpcClient()
@ -379,38 +366,6 @@ class TestGrpc:
assert response.result is True
assert response.session_id is not None
def test_get_node_links(self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes):
# given
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
switch = session.add_node(SwitchNode)
node = session.add_node(CoreNode)
iface_data = ip_prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface_data)
# then
with client.context_connect():
response = client.get_node_links(session.id, switch.id)
# then
assert len(response.links) == 1
def test_get_node_links_exception(
self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes
):
# given
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
switch = session.add_node(SwitchNode)
node = session.add_node(CoreNode)
iface_data = ip_prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface_data)
# then
with pytest.raises(grpc.RpcError):
with client.context_connect():
client.get_node_links(session.id, 3)
def test_add_link(self, grpc_server: CoreGrpcServer, iface_helper: InterfaceHelper):
# given
client = CoreGrpcClient()

36
daemon/tests/test_grpcw.py
View file

@ -316,10 +316,12 @@ class TestGrpcw:
# then
with client.context_connect():
get_node, ifaces = client.get_node(session.id, node.id)
get_node, ifaces, links = client.get_node(session.id, node.id)
# then
assert node.id == get_node.id
assert len(ifaces) == 0
assert len(links) == 0
def test_edit_node(self, grpc_server: CoreGrpcServer):
# given
@ -436,38 +438,6 @@ class TestGrpcw:
assert result is True
assert session_id is not None
def test_get_node_links(self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes):
# given
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
switch = session.add_node(SwitchNode)
node = session.add_node(CoreNode)
iface_data = ip_prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface_data)
# then
with client.context_connect():
links = client.get_node_links(session.id, switch.id)
# then
assert len(links) == 1
def test_get_node_links_exception(
self, grpc_server: CoreGrpcServer, ip_prefixes: IpPrefixes
):
# given
client = CoreGrpcClient()
session = grpc_server.coreemu.create_session()
switch = session.add_node(SwitchNode)
node = session.add_node(CoreNode)
iface_data = ip_prefixes.create_iface(node)
session.add_link(node.id, switch.id, iface_data)
# then
with pytest.raises(grpc.RpcError):
with client.context_connect():
client.get_node_links(session.id, 3)
def test_add_link(self, grpc_server: CoreGrpcServer):
# given
client = CoreGrpcClient()