Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify Configuration. #45

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Unify Configuration. #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion detd/ipc.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ message StreamQosRequest {
bool hints_preemption = 15;
bool hints_launch_time_control = 16;
bool talker = 17;
string maddress = 18;
}


Expand Down
2 changes: 1 addition & 1 deletion detd/manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ def add_listener(self, config):

# Configure the system
try:
self.interface.setup_listener(self.mapping, self.scheduler, config.stream, config.maddress, self.hints)
self.interface.setup_listener(self.mapping, self.scheduler, config.stream, config.stream.addr, self.hints)
except RuntimeError:
logger.error("Error applying the configuration on the system")
raise
Expand Down
1 change: 0 additions & 1 deletion detd/proxy.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,6 @@ def send_qos_listener_request(self, configuration, setup_socket):
request.txmin = configuration.stream.txoffset
request.txmax = configuration.stream.txoffset
request.setup_socket = setup_socket
request.maddress = configuration.maddress
request.talker = False
request.hints_available = False

Expand Down
10 changes: 0 additions & 10 deletions detd/scheduler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,6 @@ def __init__(self, interface, stream, traffic, hints = None):
self.traffic = traffic
self.hints = hints

class ListenerConfiguration:

def __init__(self, interface, stream, traffic, maddress, hints = None):

self.interface = interface
self.stream = stream
self.traffic = traffic
self.maddress = maddress
self.hints = hints

class StreamConfiguration:

def __init__(self, addr, vid, pcp, txoffset, base_time=None):
Expand Down
4 changes: 1 addition & 3 deletions detd/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@

from .scheduler import Configuration
from .scheduler import StreamConfiguration
from .scheduler import ListenerConfiguration
from .scheduler import TrafficSpecification
from .scheduler import Hints

Expand Down Expand Up @@ -343,15 +342,14 @@ def _add_listener(self, request):
txoffset = request.txmin
interval = request.period
size = request.size
maddress = request.maddress
interface_name = request.interface
hints = None

interface = Interface(interface_name)
stream = StreamConfiguration(addr, vid, pcp, txoffset)
traffic = TrafficSpecification(interval, size)

config = ListenerConfiguration(interface, stream, traffic, maddress, hints)
config = Configuration(interface, stream, traffic, hints)

vlan_interface, soprio = self.server.manager.add_listener(config)

Expand Down