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

Merge branch 'coretk' into coretk-progress

Browse source
This commit is contained in:
Huy Pham 2019-11-25 14:10:58 -08:00
commit a13eb2f214
2 changed files with 48 additions and 92 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

65
coretk/coretk/coreclient.py
View file

@ -45,7 +45,6 @@ class CoreClient:
self.node_ids = [] self.node_ids = []
self.app = app self.app = app
self.master = app.master self.master = app.master
self.interface_helper = None
self.services = {} self.services = {}
self.default_services = {} self.default_services = {}
self.emane_models = [] self.emane_models = []
@ -59,14 +58,11 @@ class CoreClient:
# helpers # helpers
self.interface_to_edge = {} self.interface_to_edge = {}
self.reusable = []
self.preexisting = set()
self.interfaces_manager = InterfaceManager(self.app) self.interfaces_manager = InterfaceManager(self.app)
self.created_nodes = set() self.created_nodes = set()
self.created_links = set() self.created_links = set()
# session data # session data
self.id = 1
self.state = None self.state = None
self.canvas_nodes = {} self.canvas_nodes = {}
self.location = None self.location = None
@ -80,12 +76,9 @@ class CoreClient:
self.file_configs = {} self.file_configs = {}
def reset(self): def reset(self):
self.id = 1
# helpers # helpers
self.created_nodes.clear() self.created_nodes.clear()
self.created_links.clear() self.created_links.clear()
self.reusable.clear()
self.preexisting.clear()
self.interfaces_manager.reset() self.interfaces_manager.reset()
self.interface_to_edge.clear() self.interface_to_edge.clear()
# session data # session data
@ -193,17 +186,6 @@ class CoreClient:
# get emane model config # get emane model config
# determine next node id and reusable nodes
max_id = 1
for node in session.nodes:
if node.id > max_id:
max_id = node.id
self.preexisting.add(node.id)
self.id = max_id
for i in range(1, self.id):
if i not in self.preexisting:
self.reusable.append(i)
# draw session # draw session
self.app.canvas.reset_and_redraw(session) self.app.canvas.reset_and_redraw(session)
@ -419,19 +401,19 @@ class CoreClient:
logging.debug("Close grpc") logging.debug("Close grpc")
self.client.close() self.client.close()
def get_id(self): def next_node_id(self):
""" """
Get the next node id as well as update id status and reusable ids Get the next usable node id.
:rtype: int
:return: the next id to be used :return: the next id to be used
:rtype: int
""" """
if len(self.reusable) == 0: i = 1
new_id = self.id while True:
self.id = self.id + 1 if i not in self.canvas_nodes:
return new_id break
else: i += 1
return self.reusable.pop(0) return i
def create_node(self, x, y, node_type, model): def create_node(self, x, y, node_type, model):
""" """
@ -443,7 +425,7 @@ class CoreClient:
:param str model: node model :param str model: node model
:return: nothing :return: nothing
""" """
node_id = self.get_id() node_id = self.next_node_id()
position = core_pb2.Position(x=x, y=y) position = core_pb2.Position(x=x, y=y)
image = None image = None
if NodeUtils.is_image_node(node_type): if NodeUtils.is_image_node(node_type):
@ -484,7 +466,6 @@ class CoreClient:
logging.error("unknown node: %s", node_id) logging.error("unknown node: %s", node_id)
continue continue
del self.canvas_nodes[node_id] del self.canvas_nodes[node_id]
self.reusable.append(node_id)
if node_id in self.mobility_configs: if node_id in self.mobility_configs:
del self.mobility_configs[node_id] del self.mobility_configs[node_id]
if node_id in self.wlan_configs: if node_id in self.wlan_configs:
@ -494,8 +475,6 @@ class CoreClient:
if node_id == node_id: if node_id == node_id:
del self.emane_model_configs[key] del self.emane_model_configs[key]
deleted_cidrs = set()
keep_cidrs = set()
for edge in canvas_node.edges: for edge in canvas_node.edges:
if edge in edges: if edge in edges:
continue continue
@ -503,30 +482,6 @@ class CoreClient:
if edge.token not in self.links: if edge.token not in self.links:
logging.error("unknown edge: %s", edge.token) logging.error("unknown edge: %s", edge.token)
del self.links[edge.token] del self.links[edge.token]
other_id = edge.src
other_interface = edge.src_interface
interface = edge.dst_interface
if canvas_node.id == edge.src:
other_id = edge.dst
other_interface = edge.dst_interface
interface = edge.src_interface
other_node = self.app.canvas.nodes.get(other_id)
if not other_node:
continue
if other_interface:
cidr = self.interfaces_manager.get_cidr(other_interface)
deleted_cidrs.add(cidr)
else:
cidr = self.interfaces_manager.find_subnet(other_node)
if cidr:
keep_cidrs.add(cidr)
else:
cidr = self.interfaces_manager.get_cidr(interface)
deleted_cidrs.add(cidr)
deleted_cidrs = deleted_cidrs - keep_cidrs
for cidr in deleted_cidrs:
self.interfaces_manager.deleted_cidr(cidr)
self.reusable.sort()
def create_interface(self, canvas_node): def create_interface(self, canvas_node):
node = canvas_node.core_node node = canvas_node.core_node

75
coretk/coretk/interface.py
View file

@ -11,39 +11,40 @@ def random_mac():
class InterfaceManager: class InterfaceManager:
def __init__(self, app, cidr="10.0.0.0/24"): def __init__(self, app, address="10.0.0.0", mask=24):
self.app = app self.app = app
self.default = cidr self.mask = mask
self.cidr = IPNetwork(cidr) self.base_prefix = max(self.mask - 8, 0)
self.deleted = [] self.subnets = IPNetwork(f"{address}/{self.base_prefix}")
self.current = None self.current_subnet = None
def reset(self):
self.cidr = IPNetwork(self.default)
self.deleted.clear()
self.current = None
def get_ips(self, node_id):
ip4 = self.current[node_id]
ip6 = ip4.ipv6()
return str(ip4), str(ip6), self.current.prefixlen
def next_subnet(self): def next_subnet(self):
if self.deleted: # define currently used subnets
return self.deleted.pop(0) used_subnets = set()
else: for link in self.app.core.links.values():
if self.current: if link.HasField("interface_one"):
self.cidr = self.cidr.next() subnet = self.get_subnet(link.interface_one)
return self.cidr used_subnets.add(subnet)
if link.HasField("interface_two"):
subnet = self.get_subnet(link.interface_two)
used_subnets.add(subnet)
def deleted_cidr(self, cidr): # find next available subnet
logging.info("deleted cidr: %s", cidr) for i in self.subnets.subnet(self.mask):
if cidr not in self.deleted: if i not in used_subnets:
self.deleted.append(cidr) return i
self.deleted.sort()
def reset(self):
self.current_subnet = None
def get_ips(self, node_id):
ip4 = self.current_subnet[node_id]
ip6 = ip4.ipv6()
prefix = self.current_subnet.prefixlen
return str(ip4), str(ip6), prefix
@classmethod @classmethod
def get_cidr(cls, interface): def get_subnet(cls, interface):
return IPNetwork(f"{interface.ip4}/{interface.ip4mask}").cidr return IPNetwork(f"{interface.ip4}/{interface.ip4mask}").cidr
def determine_subnet(self, canvas_src_node, canvas_dst_node): def determine_subnet(self, canvas_src_node, canvas_dst_node):
@ -52,19 +53,19 @@ class InterfaceManager:
is_src_container = NodeUtils.is_container_node(src_node.type) is_src_container = NodeUtils.is_container_node(src_node.type)
is_dst_container = NodeUtils.is_container_node(dst_node.type) is_dst_container = NodeUtils.is_container_node(dst_node.type)
if is_src_container and is_dst_container: if is_src_container and is_dst_container:
self.current = self.next_subnet() self.current_subnet = self.next_subnet()
elif is_src_container and not is_dst_container: elif is_src_container and not is_dst_container:
cidr = self.find_subnet(canvas_dst_node, visited={src_node.id}) subnet = self.find_subnet(canvas_dst_node, visited={src_node.id})
if cidr: if subnet:
self.current = cidr self.current_subnet = subnet
else: else:
self.current = self.next_subnet() self.current_subnet = self.next_subnet()
elif not is_src_container and is_dst_container: elif not is_src_container and is_dst_container:
cidr = self.find_subnet(canvas_src_node, visited={dst_node.id}) subnet = self.find_subnet(canvas_src_node, visited={dst_node.id})
if cidr: if subnet:
self.current = cidr self.current_subnet = subnet
else: else:
self.current = self.next_subnet() self.current_subnet = self.next_subnet()
else: else:
logging.info("ignoring subnet change for link between network nodes") logging.info("ignoring subnet change for link between network nodes")
@ -87,7 +88,7 @@ class InterfaceManager:
continue continue
visited.add(check_node.core_node.id) visited.add(check_node.core_node.id)
if interface: if interface:
cidr = self.get_cidr(interface) cidr = self.get_subnet(interface)
else: else:
cidr = self.find_subnet(check_node, visited) cidr = self.find_subnet(check_node, visited)
if cidr: if cidr: