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

fixed issue with grpc server saving mac addresses on links

Browse source
This commit is contained in:
bharnden 2019-04-05 21:25:46 -07:00
parent 3c8b4ab0a5
commit 747c2792a1
3 changed files with 24 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
daemon/core/corehandlers.py
View file

@ -1761,15 +1761,17 @@ class CoreHandler(SocketServer.BaseRequestHandler):
self.session.broadcast_config(config_data) self.session.broadcast_config(config_data)
# send session metadata # send session metadata
data_values = "|".join(["%s=%s" % item for item in self.session.metadata.get_configs().iteritems()]) metadata_configs = self.session.metadata.get_configs()
data_types = tuple(ConfigDataTypes.STRING.value for _ in self.session.metadata.get_configs()) if metadata_configs:
config_data = ConfigData( data_values = "|".join(["%s=%s" % item for item in metadata_configs.iteritems()])
message_type=0, data_types = tuple(ConfigDataTypes.STRING.value for _ in self.session.metadata.get_configs())
object=self.session.metadata.name, config_data = ConfigData(
type=ConfigFlags.NONE.value, message_type=0,
data_types=data_types, object=self.session.metadata.name,
data_values=data_values type=ConfigFlags.NONE.value,
) data_types=data_types,
self.session.broadcast_config(config_data) data_values=data_values
)
self.session.broadcast_config(config_data)
logging.info("informed GUI about %d nodes and %d links", len(nodes_data), len(links_data)) logging.info("informed GUI about %d nodes and %d links", len(nodes_data), len(links_data))

14
daemon/core/emulator/emudata.py
View file

@ -183,13 +183,13 @@ class InterfaceData(object):
""" """
Creates an InterfaceData object. Creates an InterfaceData object.
:param int _id: :param int _id: interface id
:param str name: :param str name: name for interface
:param str mac: :param core.misc.ipaddress.MacAddress mac: mac address
:param str ip4: :param str ip4: ipv4 address
:param int ip4_mask: :param int ip4_mask: ipv4 bit mask
:param str ip6: :param str ip6: ipv6 address
:param int ip6_mask: :param int ip6_mask: ipv6 bit mask
""" """
self.id = _id self.id = _id
self.name = name self.name = name

5
daemon/core/grpc/server.py
View file

@ -13,6 +13,7 @@ from core.enumerations import NodeTypes, EventTypes, LinkTypes
from core.grpc import core_pb2 from core.grpc import core_pb2
from core.grpc import core_pb2_grpc from core.grpc import core_pb2_grpc
from core.misc import nodeutils from core.misc import nodeutils
from core.misc.ipaddress import MacAddress
from core.mobility import BasicRangeModel, Ns2ScriptedMobility from core.mobility import BasicRangeModel, Ns2ScriptedMobility
from core.service import ServiceManager from core.service import ServiceManager
@ -533,6 +534,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
mac = interface_one_data.mac mac = interface_one_data.mac
if mac == "": if mac == "":
mac = None mac = None
else:
mac = MacAddress.from_string(mac)
interface_one = InterfaceData( interface_one = InterfaceData(
_id=interface_one_data.id, _id=interface_one_data.id,
name=name, name=name,
@ -552,6 +555,8 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
mac = interface_two_data.mac mac = interface_two_data.mac
if mac == "": if mac == "":
mac = None mac = None
else:
mac = MacAddress.from_string(mac)
interface_two = InterfaceData( interface_two = InterfaceData(
_id=interface_two_data.id, _id=interface_two_data.id,
name=name, name=name,