Skip to content

Commit 76c146f

Browse files
semariesemarie
committed
Add new abstractions for Bond, Network, and complete Host and PIF
Signed-off-by: Sebastien Marie <semarie@kapouay.eu.org>
1 parent 2cc6c47 commit 76c146f

4 files changed

Lines changed: 199 additions & 1 deletion

File tree

‎lib/bond.py‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
from __future__ import annotations
2+
3+
import logging
4+
5+
from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, safe_split
6+
from lib.pif import PIF
7+
8+
from typing import TYPE_CHECKING, Literal, overload
9+
10+
if TYPE_CHECKING:
11+
from lib.host import Host
12+
13+
class Bond:
14+
xe_prefix = "bond"
15+
16+
def __init__(self, host: Host, uuid: str):
17+
self.host = host
18+
self.uuid = uuid
19+
20+
@overload
21+
def param_get(self, param_name: str, key: str | None = ...,
22+
accept_unknown_key: Literal[False] = ...) -> str:
23+
...
24+
25+
@overload
26+
def param_get(self, param_name: str, key: str | None = ...,
27+
accept_unknown_key: Literal[True] = ...) -> str | None:
28+
...
29+
30+
def param_get(self, param_name: str, key: str | None = None, accept_unknown_key: bool = False) -> str | None:
31+
return _param_get(self.host, self.xe_prefix, self.uuid,
32+
param_name, key, accept_unknown_key)
33+
34+
def param_set(self, param_name: str, value: str, key: str | None = None) -> None:
35+
_param_set(self.host, self.xe_prefix, self.uuid,
36+
param_name, value, key)
37+
38+
def param_remove(self, param_name: str, key: str, accept_unknown_key: bool = False) -> None:
39+
_param_remove(self.host, self.xe_prefix, self.uuid,
40+
param_name, key, accept_unknown_key)
41+
42+
def param_add(self, param_name: str, value: str, key: str | None = None) -> None:
43+
_param_add(self.host, self.xe_prefix, self.uuid,
44+
param_name, value, key)
45+
46+
def param_clear(self, param_name: str) -> None:
47+
_param_clear(self.host, self.xe_prefix, self.uuid,
48+
param_name)
49+
50+
def destroy(self):
51+
logging.info(f"Destroying bond: {self.uuid}")
52+
self.host.xe('bond-destroy', {'uuid': self.uuid})
53+
54+
def master(self) -> PIF:
55+
uuid = self.param_get('master')
56+
assert uuid is not None, "no master on Bond"
57+
return PIF(uuid, self.host)
58+
59+
def slaves(self) -> list[str]:
60+
return safe_split(self.param_get('slaves'), sep='; ')
61+
62+
def mode(self) -> str | None:
63+
return self.param_get("mode")

‎lib/host.py‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
from packaging import version
1313

1414
import lib.commands as commands
15+
from lib.bond import Bond
1516
from lib.common import (
1617
_param_add,
1718
_param_clear,
@@ -26,6 +27,7 @@
2627
wait_for,
2728
)
2829
from lib.netutil import wrap_ip
30+
from lib.network import Network
2931
from lib.pif import PIF
3032
from lib.sr import SR
3133
from lib.vm import VM
@@ -951,3 +953,41 @@ def lvs(self, vgName: str | None = None, ignore_MGT: bool = True) -> list[str]:
951953
continue
952954
ret.append(line.strip())
953955
return ret
956+
957+
def pifs(self, device: str | None = None) -> list[PIF]:
958+
args: dict[str, str | bool | dict[str, str]] = {
959+
"host-uuid": self.uuid,
960+
}
961+
962+
if device is not None:
963+
args["device"] = device
964+
965+
return [PIF(uuid, self) for uuid in safe_split(self.xe("pif-list", args, minimal=True))]
966+
967+
def create_bond(self, network: Network, pifs: list[PIF], mode: str | None = None) -> Bond:
968+
args: dict[str, str | bool | dict[str, str]] = {
969+
'network-uuid': network.uuid,
970+
'pif-uuids': ','.join([pif.uuid for pif in pifs]),
971+
}
972+
973+
if mode is not None:
974+
args['mode'] = mode
975+
976+
uuid = self.xe("bond-create", args, minimal=True)
977+
logging.info(f"New Bond: {uuid}")
978+
979+
return Bond(self, uuid)
980+
981+
def create_network(self, label: str, description: str | None = None) -> Network:
982+
args: dict[str, str | bool | dict[str, str]] = {
983+
'name-label': label,
984+
}
985+
986+
if description is not None:
987+
args['name-description'] = description
988+
989+
logging.info(f"Creating network '{label}'")
990+
uuid = self.xe("network-create", args, minimal=True)
991+
logging.info(f"New Network: {uuid}")
992+
993+
return Network(self, uuid)

‎lib/network.py‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
from __future__ import annotations
2+
3+
import logging
4+
5+
from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, safe_split
6+
7+
from typing import TYPE_CHECKING, Literal, overload
8+
9+
if TYPE_CHECKING:
10+
from lib.host import Host
11+
12+
class Network:
13+
xe_prefix = "network"
14+
15+
def __init__(self, host: Host, uuid: str):
16+
self.host = host
17+
self.uuid = uuid
18+
19+
@overload
20+
def param_get(self, param_name: str, key: str | None = ...,
21+
accept_unknown_key: Literal[False] = ...) -> str:
22+
...
23+
24+
@overload
25+
def param_get(self, param_name: str, key: str | None = ...,
26+
accept_unknown_key: Literal[True] = ...) -> str | None:
27+
...
28+
29+
def param_get(self, param_name: str, key: str | None = None, accept_unknown_key: bool = False) -> str | None:
30+
return _param_get(self.host, self.xe_prefix, self.uuid,
31+
param_name, key, accept_unknown_key)
32+
33+
def param_set(self, param_name: str, value: str, key: str | None = None) -> None:
34+
_param_set(self.host, self.xe_prefix, self.uuid,
35+
param_name, value, key)
36+
37+
def param_remove(self, param_name: str, key: str, accept_unknown_key: bool = False) -> None:
38+
_param_remove(self.host, self.xe_prefix, self.uuid,
39+
param_name, key, accept_unknown_key)
40+
41+
def param_add(self, param_name: str, value: str, key: str | None = None) -> None:
42+
_param_add(self.host, self.xe_prefix, self.uuid,
43+
param_name, value, key)
44+
45+
def param_clear(self, param_name: str) -> None:
46+
_param_clear(self.host, self.xe_prefix, self.uuid,
47+
param_name)
48+
49+
def destroy(self):
50+
logging.info(f"Destroying network '{self.param_get('name-label')}': {self.uuid}")
51+
self.host.xe('network-destroy', {'uuid': self.uuid})
52+
53+
def pif_uuids(self) -> list[str]:
54+
return safe_split(self.param_get('PIF-uuids'), '; ')
55+
56+
def vif_uuids(self) -> list[str]:
57+
return safe_split(self.param_get('VIF-uuids'), '; ')
58+
59+
def is_private(self) -> bool:
60+
return len(self.pif_uuids()) == 0
61+
62+
def managed(self) -> bool:
63+
return self.param_get('managed') == 'true'
64+
65+
def MTU(self) -> int:
66+
return int(self.param_get('MTU') or '0')

‎lib/pif.py‎

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from __future__ import annotations
22

3-
from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set
3+
from lib.common import _param_add, _param_clear, _param_get, _param_remove, _param_set, strtobool
44

55
from typing import TYPE_CHECKING, Literal, overload
66

@@ -43,3 +43,32 @@ def param_add(self, param_name: str, value: str, key: str | None = None) -> None
4343
def param_clear(self, param_name: str) -> None:
4444
_param_clear(self.host, self.xe_prefix, self.uuid,
4545
param_name)
46+
47+
def is_managed(self) -> bool:
48+
return strtobool(self.param_get("managed"))
49+
50+
def is_physical(self) -> bool:
51+
return strtobool(self.param_get("physical"))
52+
53+
def is_currently_attached(self) -> bool:
54+
return strtobool(self.param_get("currently-attached"))
55+
56+
def is_management(self) -> bool:
57+
return strtobool(self.param_get("management"))
58+
59+
def network_uuid(self) -> str:
60+
uuid = self.param_get("network-uuid")
61+
assert uuid is not None, "unexpected PIF without network-uuid"
62+
return uuid
63+
64+
def reconfigure_ip(self, mode: str) -> None:
65+
self.host.xe("pif-reconfigure-ip", {
66+
"uuid": self.uuid,
67+
"mode": mode,
68+
})
69+
70+
def reconfigure_ipv6(self, mode: str) -> None:
71+
self.host.xe("pif-reconfigure-ipv6", {
72+
"uuid": self.uuid,
73+
"mode": mode,
74+
})

0 commit comments

Comments
 (0)