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

removed session.create_emane_network, removed unused node types

Browse source
This commit is contained in:
bharnden 2019-10-22 21:27:31 -07:00
parent 14d759667c
commit 945f3cce5b
7 changed files with 40 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
daemon/core/emulator/enumerations.py
View file

@ -73,18 +73,15 @@ class NodeTypes(Enum):
DEFAULT = 0 DEFAULT = 0
PHYSICAL = 1 PHYSICAL = 1
TBD = 3
SWITCH = 4 SWITCH = 4
HUB = 5 HUB = 5
WIRELESS_LAN = 6 WIRELESS_LAN = 6
RJ45 = 7 RJ45 = 7
TUNNEL = 8 TUNNEL = 8
KTUNNEL = 9
EMANE = 10 EMANE = 10
TAP_BRIDGE = 11 TAP_BRIDGE = 11
PEER_TO_PEER = 12 PEER_TO_PEER = 12
CONTROL_NET = 13 CONTROL_NET = 13
EMANE_NET = 14
DOCKER = 15 DOCKER = 15
LXC = 16 LXC = 16

31
daemon/core/emulator/session.py
View file

@ -55,15 +55,12 @@ from core.xml.corexml import CoreXmlReader, CoreXmlWriter
NODES = { NODES = {
NodeTypes.DEFAULT: CoreNode, NodeTypes.DEFAULT: CoreNode,
NodeTypes.PHYSICAL: PhysicalNode, NodeTypes.PHYSICAL: PhysicalNode,
NodeTypes.TBD: None,
NodeTypes.SWITCH: SwitchNode, NodeTypes.SWITCH: SwitchNode,
NodeTypes.HUB: HubNode, NodeTypes.HUB: HubNode,
NodeTypes.WIRELESS_LAN: WlanNode, NodeTypes.WIRELESS_LAN: WlanNode,
NodeTypes.RJ45: Rj45Node, NodeTypes.RJ45: Rj45Node,
NodeTypes.TUNNEL: TunnelNode, NodeTypes.TUNNEL: TunnelNode,
NodeTypes.KTUNNEL: None,
NodeTypes.EMANE: EmaneNet, NodeTypes.EMANE: EmaneNet,
NodeTypes.EMANE_NET: None,
NodeTypes.TAP_BRIDGE: GreTapBridge, NodeTypes.TAP_BRIDGE: GreTapBridge,
NodeTypes.PEER_TO_PEER: PtpNet, NodeTypes.PEER_TO_PEER: PtpNet,
NodeTypes.CONTROL_NET: CtrlNet, NodeTypes.CONTROL_NET: CtrlNet,
@ -906,28 +903,18 @@ class Session(object):
""" """
self.mobility.handleevent(event_data) self.mobility.handleevent(event_data)
def create_emane_network( def set_location(self, lat, lon, alt, scale):
self, model, geo_reference, geo_scale=None, options=NodeOptions(), config=None
):
""" """
Convenience method for creating an emane network. Set session geospatial location.
:param model: emane model to use for emane network :param float lat: latitude
:param geo_reference: geo reference point to use for emane node locations :param float lon: longitude
:param geo_scale: geo scale to use for emane node locations, defaults to 1.0 :param float alt: altitude
:param core.emulator.emudata.NodeOptions options: options for emane node being created :param float scale: reference scale
:param dict config: emane model configuration :return: nothing
:return: create emane network
""" """
# required to be set for emane to function properly self.location.setrefgeo(lat, lon, alt)
self.location.setrefgeo(*geo_reference) self.location.refscale = scale
if geo_scale:
self.location.refscale = geo_scale
# create and return network
emane_network = self.add_node(_type=NodeTypes.EMANE, options=options)
self.emane.set_model(emane_network, model, config)
return emane_network
def shutdown(self): def shutdown(self):
""" """

11
daemon/examples/python/emane80211.py
View file

@ -5,7 +5,7 @@ import parser
from core.emane.ieee80211abg import EmaneIeee80211abgModel from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.emulator.coreemu import CoreEmu from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes, NodeOptions from core.emulator.emudata import IpPrefixes, NodeOptions
from core.emulator.enumerations import EventTypes from core.emulator.enumerations import EventTypes, NodeTypes
def example(args): def example(args):
@ -20,10 +20,11 @@ def example(args):
session.set_state(EventTypes.CONFIGURATION_STATE) session.set_state(EventTypes.CONFIGURATION_STATE)
# create emane network node # create emane network node
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model=EmaneIeee80211abgModel, geo_reference=(47.57917, -122.13232, 2.00000) options = NodeOptions()
) options.set_position(80, 50)
emane_network.setposition(x=80, y=50) emane_network = session.add_node(_type=NodeTypes.EMANE, options=options)
session.emane.set_model(emane_network, EmaneIeee80211abgModel)
# create nodes # create nodes
options = NodeOptions(model="mdr") options = NodeOptions(model="mdr")

3
daemon/proto/core/api/grpc/core.proto
View file

@ -695,18 +695,15 @@ message NodeType {
enum Enum { enum Enum {
DEFAULT = 0; DEFAULT = 0;
PHYSICAL = 1; PHYSICAL = 1;
TBD = 3;
SWITCH = 4; SWITCH = 4;
HUB = 5; HUB = 5;
WIRELESS_LAN = 6; WIRELESS_LAN = 6;
RJ45 = 7; RJ45 = 7;
TUNNEL = 8; TUNNEL = 8;
KTUNNEL = 9;
EMANE = 10; EMANE = 10;
TAP_BRIDGE = 11; TAP_BRIDGE = 11;
PEER_TO_PEER = 12; PEER_TO_PEER = 12;
CONTROL_NET = 13; CONTROL_NET = 13;
EMANE_NET = 14;
DOCKER = 15; DOCKER = 15;
LXC = 16; LXC = 16;
} }

21
daemon/tests/emane/test_emane.py
View file

@ -12,6 +12,7 @@ from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.emane.rfpipe import EmaneRfPipeModel from core.emane.rfpipe import EmaneRfPipeModel
from core.emane.tdma import EmaneTdmaModel from core.emane.tdma import EmaneTdmaModel
from core.emulator.emudata import NodeOptions from core.emulator.emudata import NodeOptions
from core.emulator.enumerations import NodeTypes
from core.errors import CoreCommandError, CoreError from core.errors import CoreCommandError, CoreError
_EMANE_MODELS = [ _EMANE_MODELS = [
@ -46,10 +47,11 @@ class TestEmane:
""" """
# create emane node for networking the core nodes # create emane node for networking the core nodes
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model, geo_reference=(47.57917, -122.13232, 2.00000) options = NodeOptions()
) options.set_position(80, 50)
emane_network.setposition(x=80, y=50) emane_network = session.add_node(_type=NodeTypes.EMANE, options=options)
session.emane.set_model(emane_network, model)
# configure tdma # configure tdma
if model == EmaneTdmaModel: if model == EmaneTdmaModel:
@ -87,12 +89,11 @@ class TestEmane:
:param ip_prefixes: generates ip addresses for nodes :param ip_prefixes: generates ip addresses for nodes
""" """
# create emane node for networking the core nodes # create emane node for networking the core nodes
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
EmaneIeee80211abgModel, options = NodeOptions()
geo_reference=(47.57917, -122.13232, 2.00000), options.set_position(80, 50)
config={"test": "1"}, emane_network = session.add_node(_type=NodeTypes.EMANE, options=options)
) session.emane.set_model(emane_network, EmaneIeee80211abgModel, {"test": "1"})
emane_network.setposition(x=80, y=50)
# create nodes # create nodes
options = NodeOptions(model="mdr") options = NodeOptions(model="mdr")

18
daemon/tests/test_grpc.py
View file

@ -524,9 +524,9 @@ class TestGrpc:
# given # given
client = CoreGrpcClient() client = CoreGrpcClient()
session = grpc_server.coreemu.create_session() session = grpc_server.coreemu.create_session()
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model=EmaneIeee80211abgModel, geo_reference=(47.57917, -122.13232, 2.00000) emane_network = session.add_node(_type=NodeTypes.EMANE)
) session.emane.set_model(emane_network, EmaneIeee80211abgModel)
config_key = "platform_id_start" config_key = "platform_id_start"
config_value = "2" config_value = "2"
session.emane.set_model_config( session.emane.set_model_config(
@ -548,9 +548,9 @@ class TestGrpc:
# given # given
client = CoreGrpcClient() client = CoreGrpcClient()
session = grpc_server.coreemu.create_session() session = grpc_server.coreemu.create_session()
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model=EmaneIeee80211abgModel, geo_reference=(47.57917, -122.13232, 2.00000) emane_network = session.add_node(_type=NodeTypes.EMANE)
) session.emane.set_model(emane_network, EmaneIeee80211abgModel)
config_key = "bandwidth" config_key = "bandwidth"
config_value = "900000" config_value = "900000"
@ -574,9 +574,9 @@ class TestGrpc:
# given # given
client = CoreGrpcClient() client = CoreGrpcClient()
session = grpc_server.coreemu.create_session() session = grpc_server.coreemu.create_session()
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model=EmaneIeee80211abgModel, geo_reference=(47.57917, -122.13232, 2.00000) emane_network = session.add_node(_type=NodeTypes.EMANE)
) session.emane.set_model(emane_network, EmaneIeee80211abgModel)
# then # then
with client.context_connect(): with client.context_connect():

11
docs/scripting.md
View file

@ -108,13 +108,12 @@ Examples for configuring custom emane model settings.
# create session and emane network # create session and emane network
coreemu = CoreEmu() coreemu = CoreEmu()
session = coreemu.create_session() session = coreemu.create_session()
emane_network = session.create_emane_network( session.set_location(47.57917, -122.13232, 2.00000, 1.0)
model=EmaneIeee80211abgModel, options = NodeOptions()
geo_reference=(47.57917, -122.13232, 2.00000) options.set_position(80, 50)
) emane_network = session.add_node(_type=NodeTypes.EMANE, options=options)
emane_network.setposition(x=80, y=50)
# set custom emane model config # set custom emane model config
config = {} config = {}
session.emane.set_model_config(emane_network.id, EmaneIeee80211abgModel.name, config) session.emane.set_model(emane_network, EmaneIeee80211abgModel, config)
``` ```