daemon: removed unused variables from LinkOptions

daemon/core/api/grpc/grpcutils.py

@@ -88,19 +88,18 @@ def add_link_data(
     iface2_data = link_iface(link_proto.iface2)
     link_type = LinkTypes(link_proto.type)
     options = LinkOptions()
-    options_data = link_proto.options
+    options_proto = link_proto.options
-    if options_data:
+    if options_proto:
-        options.delay = options_data.delay
+        options.delay = options_proto.delay
-        options.bandwidth = options_data.bandwidth
+        options.bandwidth = options_proto.bandwidth
-        options.loss = options_data.loss
+        options.loss = options_proto.loss
-        options.dup = options_data.dup
+        options.dup = options_proto.dup
-        options.jitter = options_data.jitter
+        options.jitter = options_proto.jitter
-        options.mer = options_data.mer
+        options.mer = options_proto.mer
-        options.burst = options_data.burst
+        options.burst = options_proto.burst
-        options.mburst = options_data.mburst
+        options.mburst = options_proto.mburst
-        options.unidirectional = options_data.unidirectional
+        options.unidirectional = options_proto.unidirectional
-        options.key = options_data.key
+        options.key = options_proto.key
-        options.opaque = options_data.opaque
     return iface1_data, iface2_data, options, link_type
 
 
@@ -320,7 +319,6 @@ def convert_iface(iface_data: InterfaceData) -> core_pb2.Interface:
 
 def convert_link_options(options_data: LinkOptions) -> core_pb2.LinkOptions:
     return core_pb2.LinkOptions(
-        opaque=options_data.opaque,
         jitter=options_data.jitter,
         key=options_data.key,
         mburst=options_data.mburst,

daemon/core/api/grpc/server.py

@@ -879,19 +879,18 @@ class CoreGrpcServer(core_pb2_grpc.CoreApiServicer):
         node2_id = request.node2_id
         iface1_id = request.iface1_id
         iface2_id = request.iface2_id
-        options_data = request.options
+        options_proto = request.options
         options = LinkOptions(
-            delay=options_data.delay,
+            delay=options_proto.delay,
-            bandwidth=options_data.bandwidth,
+            bandwidth=options_proto.bandwidth,
-            loss=options_data.loss,
+            loss=options_proto.loss,
-            dup=options_data.dup,
+            dup=options_proto.dup,
-            jitter=options_data.jitter,
+            jitter=options_proto.jitter,
-            mer=options_data.mer,
+            mer=options_proto.mer,
-            burst=options_data.burst,
+            burst=options_proto.burst,
-            mburst=options_data.mburst,
+            mburst=options_proto.mburst,
-            unidirectional=options_data.unidirectional,
+            unidirectional=options_proto.unidirectional,
-            key=options_data.key,
+            key=options_proto.key,
-            opaque=options_data.opaque,
         )
         session.update_link(node1_id, node2_id, iface1_id, iface2_id, options)
         return core_pb2.EditLinkResponse(result=True)

daemon/core/api/tlv/corehandlers.py

@@ -371,9 +371,7 @@ class CoreHandler(socketserver.BaseRequestHandler):
                 (LinkTlvs.BURST, options_data.burst),
                 (LinkTlvs.MBURST, options_data.mburst),
                 (LinkTlvs.TYPE, link_data.type.value),
-                (LinkTlvs.GUI_ATTRIBUTES, options_data.gui_attributes),
                 (LinkTlvs.UNIDIRECTIONAL, options_data.unidirectional),
-                (LinkTlvs.EMULATION_ID, options_data.emulation_id),
                 (LinkTlvs.NETWORK_ID, link_data.network_id),
                 (LinkTlvs.KEY, options_data.key),
                 (LinkTlvs.IFACE1_NUMBER, iface1.id),
@@ -388,7 +386,6 @@ class CoreHandler(socketserver.BaseRequestHandler):
                 (LinkTlvs.IFACE2_MAC, iface2.mac),
                 (LinkTlvs.IFACE2_IP6, iface2.ip6),
                 (LinkTlvs.IFACE2_IP6_MASK, iface2.ip6_mask),
-                (LinkTlvs.OPAQUE, options_data.opaque),
             ],
         )
 
@@ -792,12 +789,8 @@ class CoreHandler(socketserver.BaseRequestHandler):
         options.mer = message.get_tlv(LinkTlvs.MER.value)
         options.burst = message.get_tlv(LinkTlvs.BURST.value)
         options.mburst = message.get_tlv(LinkTlvs.MBURST.value)
-        options.gui_attributes = message.get_tlv(LinkTlvs.GUI_ATTRIBUTES.value)
         options.unidirectional = message.get_tlv(LinkTlvs.UNIDIRECTIONAL.value)
-        options.emulation_id = message.get_tlv(LinkTlvs.EMULATION_ID.value)
-        options.network_id = message.get_tlv(LinkTlvs.NETWORK_ID.value)
         options.key = message.get_tlv(LinkTlvs.KEY.value)
-        options.opaque = message.get_tlv(LinkTlvs.OPAQUE.value)
 
         if message.flags & MessageFlags.ADD.value:
             self.session.add_link(

daemon/core/emulator/data.py

@@ -183,11 +183,8 @@ class LinkOptions:
     mer: int = None
     burst: int = None
     mburst: int = None
-    gui_attributes: str = None
     unidirectional: int = None
-    emulation_id: int = None
     key: int = None
-    opaque: str = None
 
 
 @dataclass

daemon/core/xml/corexml.py

@@ -547,12 +547,9 @@ class CoreXmlWriter:
             add_attribute(options, "mer", options_data.mer)
             add_attribute(options, "burst", options_data.burst)
             add_attribute(options, "mburst", options_data.mburst)
-            add_attribute(options, "gui_attributes", options_data.gui_attributes)
             add_attribute(options, "unidirectional", options_data.unidirectional)
-            add_attribute(options, "emulation_id", options_data.emulation_id)
             add_attribute(options, "network_id", link_data.network_id)
             add_attribute(options, "key", options_data.key)
-            add_attribute(options, "opaque", options_data.opaque)
             if options.items():
                 link_element.append(options)
 
@@ -939,9 +936,6 @@ class CoreXmlReader:
                 if options.loss is None:
                     options.loss = get_float(options_element, "per")
                 options.unidirectional = get_int(options_element, "unidirectional")
-                options.emulation_id = get_int(options_element, "emulation_id")
-                options.opaque = options_element.get("opaque")
-                options.gui_attributes = options_element.get("gui_attributes")
 
             if options.unidirectional == 1 and node_set in node_sets:
                 logging.info("updating link node1(%s) node2(%s)", node1_id, node2_id)