daemon: added initial podman node support
This commit is contained in:
parent
c76bc2ee8a
commit
a80796ac72
15 changed files with 310 additions and 35 deletions
|
@ -964,9 +964,7 @@ class CoreGrpcClient:
|
|||
:return: config service defaults
|
||||
"""
|
||||
request = GetConfigServiceDefaultsRequest(
|
||||
name=name,
|
||||
session_id=session_id,
|
||||
node_id=node_id,
|
||||
name=name, session_id=session_id, node_id=node_id
|
||||
)
|
||||
response = self.stub.GetConfigServiceDefaults(request)
|
||||
return wrappers.ConfigServiceDefaults.from_proto(response)
|
||||
|
|
|
@ -36,6 +36,7 @@ from core.nodes.docker import DockerNode, DockerOptions
|
|||
from core.nodes.interface import CoreInterface
|
||||
from core.nodes.lxd import LxcNode, LxcOptions
|
||||
from core.nodes.network import CoreNetwork, CtrlNet, PtpNet, WlanNode
|
||||
from core.nodes.podman import PodmanNode, PodmanOptions
|
||||
from core.nodes.wireless import WirelessNode
|
||||
from core.services.coreservices import CoreService
|
||||
|
||||
|
@ -81,7 +82,7 @@ def add_node_data(
|
|||
options.config_services = node_proto.config_services
|
||||
if isinstance(options, EmaneOptions):
|
||||
options.emane_model = node_proto.emane
|
||||
if isinstance(options, (DockerOptions, LxcOptions)):
|
||||
if isinstance(options, (DockerOptions, LxcOptions, PodmanOptions)):
|
||||
options.image = node_proto.image
|
||||
position = Position()
|
||||
position.set(node_proto.position.x, node_proto.position.y)
|
||||
|
@ -313,7 +314,7 @@ def get_node_proto(
|
|||
if isinstance(node, EmaneNet):
|
||||
emane_model = node.wireless_model.name
|
||||
image = None
|
||||
if isinstance(node, (DockerNode, LxcNode)):
|
||||
if isinstance(node, (DockerNode, LxcNode, PodmanNode)):
|
||||
image = node.image
|
||||
# check for wlan config
|
||||
wlan_config = session.mobility.get_configs(
|
||||
|
|
|
@ -68,6 +68,7 @@ class NodeType(Enum):
|
|||
DOCKER = 15
|
||||
LXC = 16
|
||||
WIRELESS = 17
|
||||
PODMAN = 18
|
||||
|
||||
|
||||
class LinkType(Enum):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue