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

Jump to bottom

Removal of legacy services, updating config services to now be just services #823

Merged
merged 7 commits into from
Sep 27, 2023
Merged

Removal of legacy services, updating config services to now be just services #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1074b32
initial adjustments to remove legacy services
bharnden Sep 25, 2023
fdda30a
consolidated service protobuf messages into one file
bharnden Sep 25, 2023
c7dcb91
grpc: adjusting config services within grpc/proto to now be just serv…
bharnden Sep 26, 2023
11526b4
grpc: updated wrapper classes to reflect config service to just servi…
bharnden Sep 26, 2023
b0a6a73
daemon: updates to python package structure to reflect config service…
bharnden Sep 26, 2023
d16012e
daemon/docs: adjustments to update code, doc, and comment references …
bharnden Sep 26, 2023
245cc34
daemon/doc: adjustments to how services and their configurations are …
bharnden Sep 26, 2023
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
136 changes: 16 additions & 120 deletions daemon/core/api/grpc/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
import grpc

from core.api.grpc import core_pb2, core_pb2_grpc, emane_pb2, wrappers
from core.api.grpc.configservices_pb2 import (
GetConfigServiceDefaultsRequest,
GetConfigServiceRenderedRequest,
GetNodeConfigServiceRequest,
)
from core.api.grpc.core_pb2 import (
ExecuteScriptRequest,
GetConfigRequest,
Expand All @@ -39,12 +34,10 @@
SetMobilityConfigRequest,
)
from core.api.grpc.services_pb2 import (
GetNodeServiceFileRequest,
GetNodeServiceRequest,
GetServiceDefaultsRequest,
GetServiceRenderedRequest,
ServiceActionRequest,
ServiceDefaults,
SetServiceDefaultsRequest,
)
from core.api.grpc.wlan_pb2 import (
GetWlanConfigRequest,
Expand Down Expand Up @@ -725,79 +718,6 @@ def get_config(self) -> wrappers.CoreConfig:
response = self.stub.GetConfig(request)
return wrappers.CoreConfig.from_proto(response)

def get_service_defaults(self, session_id: int) -> list[wrappers.ServiceDefault]:
"""
Get default services for different default node models.

:param session_id: session id
:return: list of service defaults
:raises grpc.RpcError: when session doesn't exist
"""
request = GetServiceDefaultsRequest(session_id=session_id)
response = self.stub.GetServiceDefaults(request)
defaults = []
for default_proto in response.defaults:
default = wrappers.ServiceDefault.from_proto(default_proto)
defaults.append(default)
return defaults

def set_service_defaults(
self, session_id: int, service_defaults: dict[str, list[str]]
) -> bool:
"""
Set default services for node models.

:param session_id: session id
:param service_defaults: node models to lists of services
:return: True for success, False otherwise
:raises grpc.RpcError: when session doesn't exist
"""
defaults = []
for model in service_defaults:
services = service_defaults[model]
default = ServiceDefaults(model=model, services=services)
defaults.append(default)
request = SetServiceDefaultsRequest(session_id=session_id, defaults=defaults)
response = self.stub.SetServiceDefaults(request)
return response.result

def get_node_service(
self, session_id: int, node_id: int, service: str
) -> wrappers.NodeServiceData:
"""
Get service data for a node.

:param session_id: session id
:param node_id: node id
:param service: service name
:return: node service data
:raises grpc.RpcError: when session or node doesn't exist
"""
request = GetNodeServiceRequest(
session_id=session_id, node_id=node_id, service=service
)
response = self.stub.GetNodeService(request)
return wrappers.NodeServiceData.from_proto(response.service)

def get_node_service_file(
self, session_id: int, node_id: int, service: str, file_name: str
) -> str:
"""
Get a service file for a node.

:param session_id: session id
:param node_id: node id
:param service: service name
:param file_name: file name to get data for
:return: file data
:raises grpc.RpcError: when session or node doesn't exist
"""
request = GetNodeServiceFileRequest(
session_id=session_id, node_id=node_id, service=service, file=file_name
)
response = self.stub.GetNodeServiceFile(request)
return response.data

def service_action(
self,
session_id: int,
Expand All @@ -822,30 +742,6 @@ def service_action(
response = self.stub.ServiceAction(request)
return response.result

def config_service_action(
self,
session_id: int,
node_id: int,
service: str,
action: wrappers.ServiceAction,
) -> bool:
"""
Send an action to a config service for a node.

:param session_id: session id
:param node_id: node id
:param service: config service name
:param action: action for service (start, stop, restart,
validate)
:return: True for success, False otherwise
:raises grpc.RpcError: when session or node doesn't exist
"""
request = ServiceActionRequest(
session_id=session_id, node_id=node_id, service=service, action=action.value
)
response = self.stub.ConfigServiceAction(request)
return response.result

def get_wlan_config(
self, session_id: int, node_id: int
) -> dict[str, wrappers.ConfigOption]:
Expand Down Expand Up @@ -970,56 +866,56 @@ def get_ifaces(self) -> list[str]:
response = self.stub.GetInterfaces(request)
return list(response.ifaces)

def get_config_service_defaults(
def get_service_defaults(
self, session_id: int, node_id: int, name: str
) -> wrappers.ConfigServiceDefaults:
) -> wrappers.ServiceDefaults:
"""
Retrieves config service default values.
Retrieves service default values.

:param session_id: session id to get node from
:param node_id: node id to get service data from
:param name: name of service to get defaults for
:return: config service defaults
:return: service defaults
"""
request = GetConfigServiceDefaultsRequest(
request = GetServiceDefaultsRequest(
name=name, session_id=session_id, node_id=node_id
)
response = self.stub.GetConfigServiceDefaults(request)
return wrappers.ConfigServiceDefaults.from_proto(response)
response = self.stub.GetServiceDefaults(request)
return wrappers.ServiceDefaults.from_proto(response)

def get_node_config_service(
def get_node_service(
self, session_id: int, node_id: int, name: str
) -> dict[str, str]:
"""
Retrieves information for a specific config service on a node.
Retrieves information for a specific service on a node.

:param session_id: session node belongs to
:param node_id: id of node to get service information from
:param name: name of service
:return: config dict of names to values
:raises grpc.RpcError: when session or node doesn't exist
"""
request = GetNodeConfigServiceRequest(
request = GetNodeServiceRequest(
session_id=session_id, node_id=node_id, name=name
)
response = self.stub.GetNodeConfigService(request)
response = self.stub.GetNodeService(request)
return dict(response.config)

def get_config_service_rendered(
def get_service_rendered(
self, session_id: int, node_id: int, name: str
) -> dict[str, str]:
"""
Retrieve the rendered config service files for a node.
Retrieve the rendered service files for a node.

:param session_id: id of session
:param node_id: id of node
:param name: name of service
:return: dict mapping names of files to rendered data
"""
request = GetConfigServiceRenderedRequest(
request = GetServiceRenderedRequest(
session_id=session_id, node_id=node_id, name=name
)
response = self.stub.GetConfigServiceRendered(request)
response = self.stub.GetServiceRendered(request)
return dict(response.rendered)

def get_emane_event_channel(
Expand Down
Loading
Loading