updates to grpc add_link to return created interface data

daemon/core/api/grpc/grpcutils.py

@@ -2,6 +2,8 @@ import logging
 import time
 from typing import Any, Dict, List, Tuple, Type
 
+import netaddr
+
 from core import utils
 from core.api.grpc import common_pb2, core_pb2
 from core.config import ConfigurableOptions
@@ -10,6 +12,7 @@ from core.emulator.emudata import InterfaceData, LinkOptions, NodeOptions
 from core.emulator.enumerations import LinkTypes, NodeTypes
 from core.emulator.session import Session
 from core.nodes.base import CoreNetworkBase, NodeBase
+from core.nodes.interface import CoreInterface
 from core.services.coreservices import CoreService
 
 WORKERS = 10
@@ -397,3 +400,40 @@ def get_service_configuration(service: Type[CoreService]) -> core_pb2.NodeServic
         shutdown=service.shutdown,
         meta=service.meta,
     )
+
+
+def interface_to_proto(interface: CoreInterface) -> core_pb2.Interface:
+    """
+    Convenience for converting a core interface to the protobuf representation.
+    :param interface: interface to convert
+    :return: interface proto
+    """
+    net_id = None
+    if interface.net:
+        net_id = interface.net.id
+    ip4 = None
+    ip4mask = None
+    ip6 = None
+    ip6mask = None
+    for addr in interface.addrlist:
+        network = netaddr.IPNetwork(addr)
+        mask = network.prefixlen
+        ip = str(network.ip)
+        if netaddr.valid_ipv4(ip) and not ip4:
+            ip4 = ip
+            ip4mask = mask
+        elif netaddr.valid_ipv6(ip) and not ip6:
+            ip6 = ip
+            ip6mask = mask
+    return core_pb2.Interface(
+        id=interface.netindex,
+        netid=net_id,
+        name=interface.name,
+        mac=str(interface.hwaddr),
+        mtu=interface.mtu,
+        flowid=interface.flow_id,
+        ip4=ip4,
+        ip4mask=ip4mask,
+        ip6=ip6,
+        ip6mask=ip6mask,
+    )

daemon/core/api/grpc/server.py

@@ -637,17 +637,7 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
         interfaces = []
         for interface_id in node._netif:
             interface = node._netif[interface_id]
-            net_id = None
-            if interface.net:
-                net_id = interface.net.id
-            interface_proto = core_pb2.Interface(
-                id=interface_id,
-                netid=net_id,
-                name=interface.name,
-                mac=str(interface.hwaddr),
-                mtu=interface.mtu,
-                flowid=interface.flow_id,
-            )
+            interface_proto = grpcutils.interface_to_proto(interface)
             interfaces.append(interface_proto)
 
         emane_model = None
@@ -795,10 +785,20 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
         node_one_id = request.link.node_one_id
         node_two_id = request.link.node_two_id
         interface_one, interface_two, options = grpcutils.add_link_data(request.link)
-        session.add_link(
+        node_one_interface, node_two_interface = session.add_link(
             node_one_id, node_two_id, interface_one, interface_two, link_options=options
         )
-        return core_pb2.AddLinkResponse(result=True)
+        interface_one_proto = None
+        interface_two_proto = None
+        if node_one_interface:
+            interface_one_proto = grpcutils.interface_to_proto(node_one_interface)
+        if node_two_interface:
+            interface_two_proto = grpcutils.interface_to_proto(node_two_interface)
+        return core_pb2.AddLinkResponse(
+            result=True,
+            interface_one=interface_one_proto,
+            interface_two=interface_two_proto,
+        )
 
     def EditLink(
         self, request: core_pb2.EditLinkRequest, context: ServicerContext