Skip to content

Commit

Permalink
Add allocated interface details to topology
Browse files Browse the repository at this point in the history
  • Loading branch information
@maddn
maddn committed Jul 21, 2022
1 parent 44503bf commit 937aa61
Show file tree
Hide file tree
Showing 9 changed files with 261 additions and 140 deletions.
134 changes: 85 additions & 49 deletions packages/topology/python/virt/libvirt_action.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,12 +84,15 @@ class NetworkManager():
def __init__(self, topology):
self._devices = {device.device_name:int(device.id)
for device in topology.devices.device}
self._device_names = {int(device.id):device.device_name
for device in topology.devices.device}
self._max_device_id = max(self._devices.values())

self._network_ifaces = {
(self._devices[device], network.interface_id): network.name
(self._devices[device.name], network.interface_id): (
network.name, network._path)
for network in topology.networks.network
for device in network.devices}
for device in network.devices.device}
self._networks = {network.name:
f'{force_maagic_leaf_val2str(network, "ipv4-subnet-start")}.0'
for network in topology.networks.network}
Expand All @@ -100,24 +103,41 @@ def __init__(self, topology):
self._devices[link.a_end_device])) #z-end-interface-id
device_ids = sort_link_device_ids(iface_ids)
self._link_networks[device_ids] = (
generate_network_id(*device_ids),
iface_ids)
generate_network_id(*device_ids), link._path, iface_ids)

def _get_link_device_ids(self, link):
return sort_link_device_ids((self._devices[link.a_end_device],
self._devices[link.z_end_device]))

def get_link_network(self, link):
device_ids = self._get_link_device_ids(link)
return (*self._link_networks[device_ids], device_ids)
return (self._link_networks[device_ids][0], device_ids)

def get_network(self, network_id):
return self._networks[network_id]

def get_iface_network_id(self, device_id, iface_id):
return self._network_ifaces.get((device_id, iface_id),
self._link_networks.get(
sort_link_device_ids((device_id, iface_id)), [None])[0])
sort_link_device_ids((device_id, iface_id)), [None]))[0]

def write_iface_oper_data(self, device_id, iface_id, data):
(_, path) = self._network_ifaces.get(
(device_id, iface_id), (None, None))
if path:
path = f'{path}/devices' \
f'/device{{{self._device_names[device_id]}}}/interface'
else:
(_, path, link_iface_ids) = self._link_networks.get(
sort_link_device_ids((device_id, iface_id)),
(None, None, None))
if path:
if iface_id == link_iface_ids[0]:
path = f'{path}/a-end-interface'
else:
path = f'{path}/z-end-interface'
if path:
write_oper_data(path, data)

def get_num_device_ifaces(self):
return self._max_device_id + 1
Expand Down Expand Up @@ -288,10 +308,19 @@ def add_data_ifaces(self, include_null_interfaces):
self._device_id, iface_id)

if network_id is not None or include_null_interfaces:
iface_dev_name = self._generate_iface_dev_name(iface_id)
mac_address = self._generate_mac_address(iface_id)

self._domain_xml_devices.append(self._get_iface_xml(
network_id or generate_network_id(self._device_id, None),
self._generate_iface_dev_name(iface_id),
self._generate_mac_address(iface_id), 'virtio'))
iface_dev_name, mac_address, 'virtio'))

if network_id:
self._network_mgr.write_iface_oper_data(
self._device_id, iface_id, [
('id', iface_id),
('host-interface', iface_dev_name),
('mac-address', mac_address)])


class LibvirtObject(): #pylint: disable=too-few-public-methods
Expand Down Expand Up @@ -329,7 +358,8 @@ class Network(LibvirtObject): #pylint: disable=too-few-public-methods
def _load_templates(self):
self._templates.load_template('templates', 'network.xml')

def _define_network(self, network_id, mac_address, isolated=False):
def _define_network(self, network_id, mac_address, isolated=False,
path=None):
network_name = generate_network_name(network_id)
bridge_name = generate_bridge_name(network_id)
if network_name not in self._libvirt.networks:
Expand All @@ -345,10 +375,14 @@ def _define_network(self, network_id, mac_address, isolated=False):
self._log.info(network_xml_str)
self._libvirt.conn.networkDefineXML(network_xml_str)
self._output.networks.create(network_name)
return bridge_name

def _action(self, action, *args):
network_id, *_ = args
if path:
write_oper_data(path, [
('host-bridge', bridge_name),
('mac-address', mac_address)])

def _action(self, action, *args): #network_id, path
network_id, *args = args
path = args[0] if args else None
if action in ['undefine', 'create', 'destroy']:
network_name = generate_network_name(network_id)
if network_name in self._libvirt.networks:
Expand All @@ -357,35 +391,25 @@ def _action(self, action, *args):
self._log.info(f'Running {action} on network {network_name}')
network_action_method = getattr(network, action)
network_action_method()
if action == 'undefine' and path:
write_oper_data(path, [
('host-bridge', None),
('mac-address', None)])
self._output.networks.create(network_name)
return True
return False


class LinkNetwork(Network):
def define(self, link):
(network_id, (a_end_iface_id, z_end_iface_id), device_ids
) = self._network_mgr.get_link_network(link)
(network_id, device_ids) = self._network_mgr.get_link_network(link)
mac_address = self._resource_mgr.generate_mac_address(*device_ids)
host_bridge = self._define_network(network_id, mac_address)
write_oper_data(link._path, [
('host-bridge', host_bridge),
('mac-address', mac_address),
('a-end-interface-id', a_end_iface_id),
('z-end-interface-id', z_end_iface_id)])

def undefine(self, link):
if self._action('undefine', link):
write_oper_data(link._path, [
('host-bridge', None),
('mac-address', None),
('a-end-interface-id', None),
('z-end-interface-id', None)])
self._define_network(network_id, mac_address, path=link._path)

def _action(self, action, *args):
link, = args
(network_id, _, _) = self._network_mgr.get_link_network(link)
return super()._action(action, network_id)
(network_id, _) = self._network_mgr.get_link_network(link)
return super()._action(action, network_id, link._path)


class IsolatedNetwork(Network):
Expand All @@ -401,9 +425,9 @@ def _action(self, action, *args):


class ExtraNetwork(Network):
def define(self, network_id, mac_octets):
def define(self, network_id, path, mac_octets):
mac_address = self._resource_mgr.generate_mac_address(*mac_octets)
self._define_network(network_id, mac_address)
self._define_network(network_id, mac_address, path=path)


class Volume(LibvirtObject):
Expand Down Expand Up @@ -519,19 +543,23 @@ def _get_cloud_init_ethernets(self, device_id):
network_id = self._network_mgr.get_iface_network_id(
device_id, iface_id)

if network_id is not None:
ip_address_start = self._network_mgr.get_network(network_id)

if ip_address_start is not None:
network_config += self._templates.apply_template(
'ethernet.yaml', {
'iface-id': iface_id,
'ip-address': generate_ip_address(
ip_address_start, device_id),
'mac-address': self._resource_mgr.\
generate_mac_address(
device_id, iface_id, True)
})
if network_id is None:
continue

ip_address_start = self._network_mgr.get_network(network_id)
if ip_address_start is None:
continue

ip_address = generate_ip_address(ip_address_start, device_id)
network_config += self._templates.apply_template(
'ethernet.yaml', {
'iface-id': iface_id,
'ip-address': ip_address,
'mac-address': self._resource_mgr.\
generate_mac_address(device_id, iface_id, True)
})
self._network_mgr.write_iface_oper_data(device_id, iface_id, [
('ip-address', ip_address)])
return network_config

def _create_cloud_init_iso_image(self, device_id, file_name, variables):
Expand Down Expand Up @@ -715,6 +743,14 @@ def undefine(self, device):
('mac-address', None),
('host-interface', None)])

for iface_id in range(self._network_mgr.get_num_device_ifaces()):
self._network_mgr.write_iface_oper_data(
device.id, iface_id, [
('id', None),
('ip-address', None),
('host-interface', None),
('mac-address', None)])

def is_active(self, device):
device_name = device.device_name
if device_name in self._libvirt.domains:
Expand Down Expand Up @@ -763,11 +799,11 @@ def action(self, action, device_name=None):
for device in self._topology.devices.device):
for (idx, network_id) in enumerate(XRV9K_EXTRA_MGMT_NETWORKS):
self._extra_network.action(
action, output, network_id, (0xff, 0xff-idx))
action, output, network_id, None, (0xff, 0xff-idx))

for (idx, network) in enumerate(self._topology.networks.network):
self._extra_network.action(
action, output, network.name, (0xfe, 0xff-idx))
self._extra_network.action(action, output, network.name,
network._path, (0xfe, 0xff-idx))

for link in self._topology.links.link:
self._link_network.action(action, output, link)
Expand Down
25 changes: 17 additions & 8 deletions packages/topology/src/yang/topology-base.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ submodule topology-base {
path "../../../devices/device/device-name";
}
}
leaf a-end-interface-id {
type uint8;
container a-end-interface {
leaf id {
type uint8;
}
}
leaf z-end-device {
type string;
Expand All @@ -62,8 +64,10 @@ submodule topology-base {
path "../../../devices/device/device-name";
}
}
leaf z-end-interface-id {
type uint8;
container z-end-interface {
leaf id {
type uint8;
}
}
leaf igp-metric {
type uint32;
Expand Down Expand Up @@ -91,10 +95,15 @@ submodule topology-base {
}
default '10.11.12';
}
leaf-list devices {
type string;
tailf:non-strict-leafref {
path "../../../devices/device/device-name";
container devices {
list device {
key name;
leaf name {
type string;
tailf:non-strict-leafref {
path "../../../../../devices/device/device-name";
}
}
}
}
}
Expand Down
12 changes: 12 additions & 0 deletions packages/topology/src/yang/topology-libvirt-subgroupings.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,18 @@ submodule topology-libvirt-subgroupings {
}
}

grouping libvirt-interface-grouping {
leaf host-interface {
type string;
}
leaf mac-address {
type yang:mac-address;
}
leaf ip-address {
type inet:ipv4-address;
}
}

grouping libvirt-device-grouping {
leaf definition {
type leafref {
Expand Down
24 changes: 22 additions & 2 deletions packages/topology/src/yang/topology-libvirt.yang
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,19 +13,39 @@ submodule topology-libvirt {

grouping topology-libvirt-grouping {
uses topology-base-grouping {
refine "topology/links/link/a-end-interface-id" {
refine "topology/links/link/a-end-interface" {
config false;
tailf:cdb-oper {
tailf:persistent true;
}
}
refine "topology/links/link/z-end-interface-id" {
refine "topology/links/link/z-end-interface" {
config false;
tailf:cdb-oper {
tailf:persistent true;
}
}

augment "topology/links/link/a-end-interface" {
uses libvirt-interface-grouping;
}
augment "topology/links/link/z-end-interface" {
uses libvirt-interface-grouping;
}

augment "topology/networks/network/devices/device" {
container interface {
config false;
tailf:cdb-oper {
tailf:persistent true;
}
leaf id {
type uint8;
}
uses libvirt-interface-grouping;
}
}

augment "topology" {
container libvirt {
leaf hypervisor {
Expand Down
10 changes: 5 additions & 5 deletions packages/topology/templates/base-config-template.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<config>
<interface xmlns="http://tail-f.com/ned/cisco-ios-xr">
<GigabitEthernet tags="merge">
<id>0/0/0/{$interface_id}</id>
<id>0/0/0/{string($interface_id)}</id>
<bandwidth>{/interface-bandwidth}</bandwidth>
<lldp when="{/lldp}"/>
<load-interval>30</load-interval>
Expand Down Expand Up @@ -216,18 +216,18 @@
<?foreach {deref(topology)/../links/link}?>
<?expand InterfaceBaseConfig
device_name=a-end-device
interface_id=a-end-interface-id
interface_id=a-end-interface/id
?>
<?expand InterfaceBaseConfig
device_name=z-end-device
interface_id=z-end-interface-id
interface_id=z-end-interface/id
?>
<?end?>
<?foreach {deref(topology)/../networks/network}?>
<?foreach {devices}?>
<?foreach {devices/device}?>
<?expand InterfaceBaseConfig
device_name=.
interface_id=../interface-id
interface_id=../../interface-id
?>
<?end?>
<?end?>
Expand Down
6 changes: 3 additions & 3 deletions packages/topology/templates/igp-template.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<tag>
<name>{string(/name)}</name>
<interface>
<name>GigabitEthernet0/0/0/{$interface_id}</name>
<name>GigabitEthernet0/0/0/{string($interface_id)}</name>
<circuit-type>level-2-only</circuit-type>
<point-to-point/>
<address-family>
Expand All @@ -37,8 +37,8 @@

<?foreach {deref(topology)/../links/link}?>
<?if {count(/devices[.=current()/a-end-device]) > 0 and count(/devices[.=current()/z-end-device]) > 0}?>
<?expand LinkEndpointIGP device_name=a-end-device interface_id=a-end-interface-id?>
<?expand LinkEndpointIGP device_name=z-end-device interface_id=z-end-interface-id?>
<?expand LinkEndpointIGP device_name=a-end-device interface_id=a-end-interface/id?>
<?expand LinkEndpointIGP device_name=z-end-device interface_id=z-end-interface/id?>
<?end?>
<?end?>

Expand Down
Loading

0 comments on commit 937aa61

Please sign in to comment.