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

updates to layout core module packages in a more logical way, including renaming methods from objects to nodes and nodes.objid to nodes.id

Browse source
This commit is contained in:
bharnden 2019-04-29 23:31:47 -07:00
parent 9517740704
commit 66e603906a
100 changed files with 10283 additions and 3489 deletions
Download patch file Download diff file Expand all files Collapse all files

44
daemon/tests/conftest.py
View file

@ -9,30 +9,30 @@ import time
import pytest
from mock.mock import MagicMock
from core.api.coreapi import CoreConfMessage
from core.api.coreapi import CoreEventMessage
from core.api.coreapi import CoreExecMessage
from core.api.coreapi import CoreLinkMessage
from core.api.coreapi import CoreNodeMessage
from core.corehandlers import CoreHandler
from core.coreserver import CoreServer
from core.api.tlv.coreapi import CoreConfMessage
from core.api.tlv.coreapi import CoreEventMessage
from core.api.tlv.coreapi import CoreExecMessage
from core.api.tlv.coreapi import CoreLinkMessage
from core.api.tlv.coreapi import CoreNodeMessage
from core.api.tlv.corehandlers import CoreHandler
from core.api.tlv.coreserver import CoreServer
from core.emulator.coreemu import CoreEmu
from core.emulator.emudata import IpPrefixes
from core.enumerations import CORE_API_PORT
from core.enumerations import ConfigTlvs
from core.enumerations import EventTlvs
from core.enumerations import EventTypes
from core.enumerations import ExecuteTlvs
from core.enumerations import LinkTlvs
from core.enumerations import LinkTypes
from core.enumerations import MessageFlags
from core.enumerations import NodeTlvs
from core.enumerations import NodeTypes
from core.grpc.client import InterfaceHelper
from core.grpc.server import CoreGrpcServer
from core.misc import ipaddress
from core.misc.ipaddress import MacAddress
from core.service import ServiceManager
from core.emulator.enumerations import CORE_API_PORT
from core.emulator.enumerations import ConfigTlvs
from core.emulator.enumerations import EventTlvs
from core.emulator.enumerations import EventTypes
from core.emulator.enumerations import ExecuteTlvs
from core.emulator.enumerations import LinkTlvs
from core.emulator.enumerations import LinkTypes
from core.emulator.enumerations import MessageFlags
from core.emulator.enumerations import NodeTlvs
from core.emulator.enumerations import NodeTypes
from core.api.grpc.client import InterfaceHelper
from core.api.grpc.server import CoreGrpcServer
from core.nodes import ipaddress
from core.nodes.ipaddress import MacAddress
from core.services.coreservices import ServiceManager
EMANE_SERVICES = "zebra|OSPFv3MDR|IPForward"

16
daemon/tests/distributed/test_distributed.py
View file

@ -4,12 +4,12 @@ Unit tests for testing CORE with distributed networks.
import conftest
from core.api.coreapi import CoreExecMessage
from core.enumerations import EventTypes
from core.enumerations import ExecuteTlvs
from core.enumerations import MessageFlags
from core.enumerations import NodeTypes
from core.misc.ipaddress import IpAddress
from core.api.tlv.coreapi import CoreExecMessage
from core.emulator.enumerations import EventTypes
from core.emulator.enumerations import ExecuteTlvs
from core.emulator.enumerations import MessageFlags
from core.emulator.enumerations import NodeTypes
from core.nodes.ipaddress import IpAddress
def validate_response(replies, _):
@ -89,7 +89,7 @@ class TestDistributed:
cored.request_handler.handle_message(message)
# test a ping command
node_one = cored.session.get_object(1)
node_one = cored.session.get_node(1)
message = conftest.command_message(node_one, "ping -c 5 %s" % ip4_address)
cored.request_handler.dispatch_replies = validate_response
cored.request_handler.handle_message(message)
@ -155,7 +155,7 @@ class TestDistributed:
cored.request_handler.handle_message(message)
# test a ping command
node_one = cored.session.get_object(1)
node_one = cored.session.get_node(1)
message = conftest.command_message(node_one, "ping -c 5 %s" % ip4_address)
cored.request_handler.dispatch_replies = validate_response
cored.request_handler.handle_message(message)

2
daemon/tests/myservices/sample.py
View file

@ -2,7 +2,7 @@
Sample user-defined services for testing.
"""
from core.service import CoreService
from core.services.coreservices import CoreService
class MyService(CoreService):

14
daemon/tests/test_conf.py
View file

@ -1,13 +1,13 @@
import pytest
from core.conf import ConfigurableManager
from core.conf import ConfigurableOptions
from core.conf import Configuration
from core.conf import ModelManager
from core.config import ConfigurableManager
from core.config import ConfigurableOptions
from core.config import Configuration
from core.config import ModelManager
from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.enumerations import ConfigDataTypes
from core.enumerations import NodeTypes
from core.mobility import BasicRangeModel
from core.emulator.enumerations import ConfigDataTypes
from core.emulator.enumerations import NodeTypes
from core.location.mobility import BasicRangeModel
class TestConfigurableOptions(ConfigurableOptions):

10
daemon/tests/test_core.py
View file

@ -10,11 +10,11 @@ import pytest
from mock import MagicMock
from core.emulator.emudata import NodeOptions
from core.enumerations import MessageFlags
from core.enumerations import NodeTypes
from core.mobility import BasicRangeModel
from core.mobility import Ns2ScriptedMobility
from core.netns.vnodeclient import VnodeClient
from core.emulator.enumerations import MessageFlags
from core.emulator.enumerations import NodeTypes
from core.location.mobility import BasicRangeModel
from core.location.mobility import Ns2ScriptedMobility
from core.nodes.client import VnodeClient
_PATH = os.path.abspath(os.path.dirname(__file__))
_MOBILITY_FILE = os.path.join(_PATH, "mobility.scen")

20
daemon/tests/test_grpc.py
View file

@ -5,13 +5,13 @@ from Queue import Queue
import grpc
import pytest
from core.conf import ConfigShim
from core.data import EventData
from core.config import ConfigShim
from core.emulator.data import EventData
from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.enumerations import NodeTypes, EventTypes, ConfigFlags, ExceptionLevels
from core.grpc import core_pb2
from core.grpc.client import CoreGrpcClient
from core.mobility import BasicRangeModel, Ns2ScriptedMobility
from core.emulator.enumerations import NodeTypes, EventTypes, ConfigFlags, ExceptionLevels
from core.api.grpc import core_pb2
from core.api.grpc.client import CoreGrpcClient
from core.location.mobility import BasicRangeModel, Ns2ScriptedMobility
class TestGrpc:
@ -182,7 +182,7 @@ class TestGrpc:
# then
assert response.id is not None
assert session.get_object(response.id) is not None
assert session.get_node(response.id) is not None
def test_get_node(self, grpc_server):
# given
@ -237,7 +237,7 @@ class TestGrpc:
assert response.result is expected
if expected is True:
with pytest.raises(KeyError):
assert session.get_object(node.id)
assert session.get_node(node.id)
def test_get_hooks(self, grpc_server):
# given
@ -390,8 +390,8 @@ class TestGrpc:
interface_two = ip_prefixes.create_interface(node_two)
session.add_link(node_one.id, node_two.id, interface_one, interface_two)
link_node = None
for node_id in session.objects:
node = session.objects[node_id]
for node_id in session.nodes:
node = session.nodes[node_id]
if node.id not in {node_one.id, node_two.id}:
link_node = node
break

22
daemon/tests/test_gui.py
View file

@ -4,17 +4,17 @@ Unit tests for testing with a CORE switch.
import threading
from core.api import coreapi, dataconversion
from core.api.coreapi import CoreExecuteTlv
from core.enumerations import CORE_API_PORT, NodeTypes
from core.enumerations import EventTlvs
from core.enumerations import EventTypes
from core.enumerations import ExecuteTlvs
from core.enumerations import LinkTlvs
from core.enumerations import LinkTypes
from core.enumerations import MessageFlags
from core.enumerations import MessageTypes
from core.misc import ipaddress
from core.api.tlv import coreapi, dataconversion
from core.api.tlv.coreapi import CoreExecuteTlv
from core.emulator.enumerations import CORE_API_PORT, NodeTypes
from core.emulator.enumerations import EventTlvs
from core.emulator.enumerations import EventTypes
from core.emulator.enumerations import ExecuteTlvs
from core.emulator.enumerations import LinkTlvs
from core.emulator.enumerations import LinkTypes
from core.emulator.enumerations import MessageFlags
from core.emulator.enumerations import MessageTypes
from core.nodes import ipaddress
def command_message(node, command):

4
daemon/tests/test_links.py
View file

@ -1,6 +1,6 @@
from core.emulator.emudata import LinkOptions
from core.enumerations import NodeTypes
from core.misc import utils
from core.emulator.enumerations import NodeTypes
from core import utils
def create_ptp_network(session, ip_prefixes):

6
daemon/tests/test_nodes.py
View file

@ -4,8 +4,8 @@ import time
import pytest
from core.emulator.emudata import NodeOptions
from core.enumerations import NodeTypes
from core.misc import utils
from core.emulator.enumerations import NodeTypes
from core import utils
MODELS = [
"router",
@ -63,7 +63,7 @@ class TestNodes:
# then
with pytest.raises(KeyError):
session.get_object(node.id)
session.get_node(node.id)
@pytest.mark.parametrize("net_type", NET_TYPES)
def test_net(self, session, net_type):

6
daemon/tests/test_services.py
View file

@ -2,9 +2,9 @@ import os
import pytest
from core.service import CoreService
from core.service import ServiceDependencies
from core.service import ServiceManager
from core.services.coreservices import CoreService
from core.services.coreservices import ServiceDependencies
from core.services.coreservices import ServiceManager
_PATH = os.path.abspath(os.path.dirname(__file__))
_SERVICES_PATH = os.path.join(_PATH, "myservices")

2
daemon/tests/test_utils.py
View file

@ -1,4 +1,4 @@
from core.misc import utils
from core import utils
class TestUtils:

40
daemon/tests/test_xml.py
View file

@ -4,8 +4,8 @@ import pytest
from core.emane.ieee80211abg import EmaneIeee80211abgModel
from core.emulator.emudata import NodeOptions
from core.enumerations import NodeTypes
from core.mobility import BasicRangeModel
from core.emulator.enumerations import NodeTypes
from core.location.mobility import BasicRangeModel
from core.services.utility import SshService
@ -87,16 +87,16 @@ class TestXml:
# verify nodes have been removed from session
with pytest.raises(KeyError):
assert not session.get_object(n1_id)
assert not session.get_node(n1_id)
with pytest.raises(KeyError):
assert not session.get_object(n2_id)
assert not session.get_node(n2_id)
# load saved xml
session.open_xml(file_path, start=True)
# verify nodes have been recreated
assert session.get_object(n1_id)
assert session.get_object(n2_id)
assert session.get_node(n1_id)
assert session.get_node(n2_id)
def test_xml_ptp_services(self, session, tmpdir, ip_prefixes):
"""
@ -147,9 +147,9 @@ class TestXml:
# verify nodes have been removed from session
with pytest.raises(KeyError):
assert not session.get_object(n1_id)
assert not session.get_node(n1_id)
with pytest.raises(KeyError):
assert not session.get_object(n2_id)
assert not session.get_node(n2_id)
# load saved xml
session.open_xml(file_path, start=True)
@ -158,8 +158,8 @@ class TestXml:
service = session.services.get_service(node_one.id, SshService.name)
# verify nodes have been recreated
assert session.get_object(n1_id)
assert session.get_object(n2_id)
assert session.get_node(n1_id)
assert session.get_node(n2_id)
assert service.config_data.get(service_file) == file_data
def test_xml_mobility(self, session, tmpdir, ip_prefixes):
@ -208,9 +208,9 @@ class TestXml:
# verify nodes have been removed from session
with pytest.raises(KeyError):
assert not session.get_object(n1_id)
assert not session.get_node(n1_id)
with pytest.raises(KeyError):
assert not session.get_object(n2_id)
assert not session.get_node(n2_id)
# load saved xml
session.open_xml(file_path, start=True)
@ -219,9 +219,9 @@ class TestXml:
value = str(session.mobility.get_config("test", wlan_id, BasicRangeModel.name))
# verify nodes and configuration were restored
assert session.get_object(n1_id)
assert session.get_object(n2_id)
assert session.get_object(wlan_id)
assert session.get_node(n1_id)
assert session.get_node(n2_id)
assert session.get_node(wlan_id)
assert value == "1"
def test_xml_emane(self, session, tmpdir, ip_prefixes):
@ -275,9 +275,9 @@ class TestXml:
# verify nodes have been removed from session
with pytest.raises(KeyError):
assert not session.get_object(n1_id)
assert not session.get_node(n1_id)
with pytest.raises(KeyError):
assert not session.get_object(n2_id)
assert not session.get_node(n2_id)
# load saved xml
session.open_xml(file_path, start=True)
@ -286,7 +286,7 @@ class TestXml:
value = str(session.emane.get_config("test", emane_id, EmaneIeee80211abgModel.name))
# verify nodes and configuration were restored
assert session.get_object(n1_id)
assert session.get_object(n2_id)
assert session.get_object(emane_id)
assert session.get_node(n1_id)
assert session.get_node(n2_id)
assert session.get_node(emane_id)
assert value == "1"