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

daemon: removed missing params from python docs, updated node ValueErrors to CoreErrors

Browse source
This commit is contained in:
Blake Harnden 2020-06-18 09:33:54 -07:00
parent ecc3eb1c89
commit e46a072f74
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/core/nodes/interface.py
View file

@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Callable, Dict, List, Optional, Tuple
from core import utils from core import utils
from core.emulator.data import LinkOptions from core.emulator.data import LinkOptions
from core.emulator.enumerations import TransportType from core.emulator.enumerations import TransportType
from core.errors import CoreCommandError from core.errors import CoreCommandError, CoreError
from core.nodes.netclient import LinuxNetClient, get_net_client from core.nodes.netclient import LinuxNetClient, get_net_client
if TYPE_CHECKING: if TYPE_CHECKING:
@ -544,7 +544,7 @@ class GreTap(CoreInterface):
if not start: if not start:
return return
if remoteip is None: if remoteip is None:
raise ValueError("missing remote IP required for GRE TAP device") raise CoreError("missing remote IP required for GRE TAP device")
self.net_client.create_gretap(self.localname, remoteip, localip, ttl, key) self.net_client.create_gretap(self.localname, remoteip, localip, ttl, key)
self.net_client.device_up(self.localname) self.net_client.device_up(self.localname)
self.up = True self.up = True

6
daemon/core/nodes/network.py
View file

@ -618,7 +618,6 @@ class GreTapBridge(CoreNetwork):
:param localip: local address :param localip: local address
:param ttl: ttl value :param ttl: ttl value
:param key: gre tap key :param key: gre tap key
:param start: start flag
:param server: remote server node :param server: remote server node
will run on, default is None for localhost will run on, default is None for localhost
""" """
@ -857,9 +856,7 @@ class PtpNet(CoreNetwork):
:return: nothing :return: nothing
""" """
if len(self.ifaces) >= 2: if len(self.ifaces) >= 2:
raise ValueError( raise CoreError("ptp links support at most 2 network interfaces")
"Point-to-point links support at most 2 network interfaces"
)
super().attach(iface) super().attach(iface)
def all_link_data(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]: def all_link_data(self, flags: MessageFlags = MessageFlags.NONE) -> List[LinkData]:
@ -992,7 +989,6 @@ class WlanNode(CoreNetwork):
:param session: core session instance :param session: core session instance
:param _id: node id :param _id: node id
:param name: node name :param name: node name
:param start: start flag
:param server: remote server node :param server: remote server node
will run on, default is None for localhost will run on, default is None for localhost
:param policy: wlan policy :param policy: wlan policy