x/nova-docker
Code Issues Proposed changes

add active_migrations attribute to DockerDriver

Browse Source 
1. For passing the nova unit tests about the active_migrations attribute.
2. Fix test_get_dns_entries DNS IPs that changed from nova.
3. Add conf path to netconf that changed from nova.

Closes-Bug: #1584741
Closes-Bug: #1582615

Change-Id: Iaab7e695055f042b9060f07e31681c66197b8c79
This commit is contained in:
zhangguoqing
2016-05-23 12:17:07 +00:00
parent e4da579759
commit 034a4842fc
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
novadocker/tests/virt/docker/test_driver.py
View File

@@ -552,7 +552,7 @@ class DockerDriverTestCase(test_virt_drivers._VirtDriverTestCase,
def test_get_dns_entries(self): def test_get_dns_entries(self):
driver = docker_driver.DockerDriver(object) driver = docker_driver.DockerDriver(object)
network_info = utils.get_test_network_info() network_info = utils.get_test_network_info()
self.assertEqual(['0.0.0.0', '0.0.0.0'], self.assertEqual(['192.168.122.1', '192.168.122.2'],
driver._extract_dns_entries(network_info)) driver._extract_dns_entries(network_info))
@mock.patch.object(os.path, 'exists', return_value=True) @mock.patch.object(os.path, 'exists', return_value=True)

4
novadocker/virt/docker/driver.py
View File

@@ -56,7 +56,7 @@ from novadocker.virt.docker import network
from novadocker.virt import hostutils from novadocker.virt import hostutils
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('my_ip', 'nova.netconf') CONF.import_opt('my_ip', 'nova.conf.netconf')
CONF.import_opt('instances_path', 'nova.compute.manager') CONF.import_opt('instances_path', 'nova.compute.manager')
docker_opts = [ docker_opts = [
@@ -113,6 +113,8 @@ class DockerDriver(driver.ComputeDriver):
self.vif_driver = vif_class() self.vif_driver = vif_class()
self.firewall_driver = firewall.load_driver( self.firewall_driver = firewall.load_driver(
default='nova.virt.firewall.NoopFirewallDriver') default='nova.virt.firewall.NoopFirewallDriver')
# NOTE(zhangguoqing): For passing the nova unit tests
self.active_migrations = {}
@property @property
def docker(self): def docker(self):

2
novadocker/virt/docker/vifs.py
View File

@@ -32,7 +32,7 @@ import random
assert manager assert manager
CONF = cfg.CONF CONF = cfg.CONF
CONF.import_opt('my_ip', 'nova.netconf') CONF.import_opt('my_ip', 'nova.conf.netconf')
CONF.import_opt('vlan_interface', 'nova.manager') CONF.import_opt('vlan_interface', 'nova.manager')
CONF.import_opt('flat_interface', 'nova.manager') CONF.import_opt('flat_interface', 'nova.manager')
CONF.import_opt('network_device_mtu', 'nova.objects.network') CONF.import_opt('network_device_mtu', 'nova.objects.network')