diff options
| -rw-r--r-- | nova/tests/fake_network.py | 3 | ||||
| -rwxr-xr-x | nova/virt/libvirt/driver.py | 3 | ||||
| -rw-r--r-- | nova/virt/libvirt/vif.py | 18 |
3 files changed, 8 insertions, 16 deletions
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py index a51a40f16..42ce71ded 100644 --- a/nova/tests/fake_network.py +++ b/nova/tests/fake_network.py @@ -54,8 +54,7 @@ class FakeVIFDriver(object): def setattr(self, key, val): self.__setattr__(key, val) - def get_config(self, instance, network, mapping, image_meta, - inst_type=None): + def get_config(self, instance, network, mapping, image_meta): conf = libvirt_config.LibvirtConfigGuestInterface() for attr, val in conf.__dict__.iteritems(): diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py index 4ad7f2619..eabe75c73 100755 --- a/nova/virt/libvirt/driver.py +++ b/nova/virt/libvirt/driver.py @@ -2247,8 +2247,7 @@ class LibvirtDriver(driver.ComputeDriver): for (network, mapping) in network_info: cfg = self.vif_driver.get_config(instance, network, mapping, - image_meta, - inst_type) + image_meta) guest.add_device(cfg) if CONF.libvirt_type == "qemu" or CONF.libvirt_type == "kvm": diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py index 1fe7385e1..68b0505aa 100644 --- a/nova/virt/libvirt/vif.py +++ b/nova/virt/libvirt/vif.py @@ -92,8 +92,7 @@ class LibvirtBaseVIFDriver(object): return mapping['vif_devname'] return ("nic" + mapping['vif_uuid'])[:network_model.NIC_NAME_LEN] - def get_config(self, instance, network, mapping, image_meta, - inst_type=None): + def get_config(self, instance, network, mapping, image_meta): conf = vconfig.LibvirtConfigGuestInterface() # Default to letting libvirt / the hypervisor choose the model model = None @@ -160,15 +159,13 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): return True return False - def get_config_bridge(self, instance, network, mapping, image_meta, - inst_type=None): + def get_config_bridge(self, instance, network, mapping, image_meta): """Get VIF configurations for bridge type.""" conf = super(LibvirtGenericVIFDriver, self).get_config(instance, network, mapping, - image_meta, - inst_type) + image_meta) designer.set_vif_host_backend_bridge_config( conf, self.get_bridge_name(network), @@ -178,8 +175,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): name = "nova-instance-" + instance['name'] + "-" + mac_id if self.get_firewall_required(): conf.filtername = name - if inst_type and inst_type.get('extra_specs') is not None: - designer.set_vif_bandwidth_config(conf, inst_type['extra_specs']) + designer.set_vif_bandwidth_config(conf, instance) return conf @@ -262,8 +258,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): return conf - def get_config(self, instance, network, mapping, image_meta, - inst_type=None): + def get_config(self, instance, network, mapping, image_meta): vif_type = mapping.get('vif_type') LOG.debug(_("vif_type=%(vif_type)s instance=%(instance)s " @@ -278,8 +273,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver): if vif_type == network_model.VIF_TYPE_BRIDGE: return self.get_config_bridge(instance, network, mapping, - image_meta, - inst_type) + image_meta) elif vif_type == network_model.VIF_TYPE_OVS: return self.get_config_ovs(instance, network, mapping, |