x
/
nova-lxd
Code Issues Proposed changes

Merge "[RFC] Add support for VIF_TYPE_TAP"

This commit is contained in:
Jenkins 2016-07-19 15:28:41 +00:00 committed by Gerrit Code Review
parent 93abdf521b 4a9c7356c0
commit c9b2950723
2 changed files with 44 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
nova/virt/lxd/driver.py
View File

@ -403,14 +403,24 @@ class LXDDriver(driver.ComputeDriver):
net_device = 'eth{}'.format(len(interfaces))
network_config = self.vif_driver.get_config(instance, vif)
config_update = {
net_device: {
'nictype': 'bridged',
'hwaddr': vif['address'],
'parent': network_config['bridge'],
'type': 'nic',
if 'bridge' in network_config:
config_update = {
net_device: {
'nictype': 'bridged',
'hwaddr': vif['address'],
'parent': network_config['bridge'],
'type': 'nic',
}
}
}
else:
config_update = {
net_device: {
'nictype': 'p2p',
'hwaddr': vif['address'],
'type': 'nic',
}
}
container.expanded_devices.update(config_update)
container.save(wait=True)
@ -1411,17 +1421,26 @@ class LXDDriver(driver.ComputeDriver):
for vifaddr in network_info:
cfg = self.vif_driver.get_config(instance, vifaddr)
network_devices[str(cfg['bridge'])] = \
{'nictype': 'bridged',
'hwaddr': str(cfg['mac_address']),
'parent': str(cfg['bridge']),
'type': 'nic'}
if 'bridge' in cfg:
key = str(cfg['bridge'])
network_devices[key] = {
'nictype': 'bridged',
'hwaddr': str(cfg['mac_address']),
'parent': str(cfg['bridge']),
'type': 'nic'
}
else:
key = 'unbridged'
network_devices[key] = {
'nictype': 'p2p',
'hwaddr': str(cfg['mac_address']),
'type': 'nic'
}
host_device = self.vif_driver.get_vif_devname(vifaddr)
if host_device:
network_devices[str(cfg['bridge'])]['host_name'] = \
host_device
network_devices[key]['host_name'] = host_device
# Set network device quotas
network_devices[str(cfg['bridge'])].update(
network_devices[key].update(
self.create_network_quota_config(instance)
)
return network_devices

10
nova/virt/lxd/vif.py
View File

@ -100,6 +100,10 @@ class LXDGenericDriver(object):
else:
return self.get_config_ovs_bridge(instance, vif)
def get_config_tap(self, instance, vif):
conf = {'mac_address': vif['address']}
return conf
def plug(self, instance, vif):
vif_type = vif['type']
@ -173,6 +177,9 @@ class LXDGenericDriver(object):
v2_name, iface_id,
vif['address'], instance.name)
def plug_tap(self, instance, vif):
pass
def unplug(self, instance, vif):
vif_type = vif['type']
@ -221,3 +228,6 @@ class LXDGenericDriver(object):
def unplug_bridge(self, instance, vif):
pass
def unplug_tap(self, instance, vif):
pass