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

scripts: updated route monitor to use grpc wrapped client

Browse source
This commit is contained in:
Blake Harnden 2021-05-04 09:56:58 -07:00
parent 1cbe891dab
commit 0ed30a4feb
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
daemon/scripts/core-route-monitor
View file

@ -15,8 +15,8 @@ from typing import Dict, Tuple
import grpc import grpc
from core import utils from core import utils
from core.api.grpc.client import CoreGrpcClient from core.api.grpc.clientw import CoreGrpcClient
from core.api.grpc.core_pb2 import NodeType from core.api.grpc.wrappers import NodeType
SDT_HOST = "127.0.0.1" SDT_HOST = "127.0.0.1"
SDT_PORT = 50000 SDT_PORT = 50000
@ -60,15 +60,15 @@ class SdtClient:
class RouterMonitor: class RouterMonitor:
def __init__( def __init__(
self, self,
session: int, session: int,
src: str, src: str,
dst: str, dst: str,
pkt: str, pkt: str,
rate: int, rate: int,
dead: int, dead: int,
sdt_host: str, sdt_host: str,
sdt_port: int, sdt_port: int,
) -> None: ) -> None:
self.queue = Queue() self.queue = Queue()
self.core = CoreGrpcClient() self.core = CoreGrpcClient()
@ -92,16 +92,15 @@ class RouterMonitor:
self.session = self.get_session() self.session = self.get_session()
print("session: ", self.session) print("session: ", self.session)
try: try:
response = self.core.get_session(self.session) session = self.core.get_session(self.session)
nodes = response.session.nodes
node_map = {} node_map = {}
for node in nodes: for node in session.nodes.values():
if node.type != NodeType.DEFAULT: if node.type != NodeType.DEFAULT:
continue continue
node_map[node.id] = node.channel node_map[node.id] = node.channel
if self.src_id is None: if self.src_id is None:
response = self.core.get_node(self.session, node.id) _, ifaces, _ = self.core.get_node(self.session, node.id)
for iface in response.ifaces: for iface in ifaces:
if self.src == iface.ip4: if self.src == iface.ip4:
self.src_id = node.id self.src_id = node.id
break break
@ -117,8 +116,7 @@ class RouterMonitor:
return node_map return node_map
def get_session(self) -> int: def get_session(self) -> int:
response = self.core.get_sessions() sessions = self.core.get_sessions()
sessions = response.sessions
session = None session = None
if sessions: if sessions:
session = sessions[0] session = sessions[0]