Merge "Clean imports in code"
This commit is contained in:
Jenkins
Gerrit Code Review
commit
5acbe3cf7d
|
|
@ -24,7 +24,7 @@ from six.moves.urllib.parse import urlparse
|
|||
from six.moves.urllib.parse import urlsplit
|
||||
import yaml
|
||||
|
||||
from fuel_agent.drivers.base import BaseDataDriver
|
||||
from fuel_agent.drivers import base
|
||||
from fuel_agent.drivers import ks_spaces_validator
|
||||
from fuel_agent import errors
|
||||
from fuel_agent import objects
|
||||
|
|
@ -71,7 +71,7 @@ def match_device(hu_disk, ks_disk):
|
|||
return False
|
||||
|
||||
|
||||
class Nailgun(BaseDataDriver):
|
||||
class Nailgun(base.BaseDataDriver):
|
||||
"""Driver for parsing regular volumes metadata from Nailgun."""
|
||||
|
||||
def __init__(self, data):
|
||||
|
|
@ -701,7 +701,7 @@ class Ironic(Nailgun):
|
|||
pass
|
||||
|
||||
|
||||
class NailgunBuildImage(BaseDataDriver):
|
||||
class NailgunBuildImage(base.BaseDataDriver):
|
||||
|
||||
# TODO(kozhukalov):
|
||||
# This list of packages is used by default only if another
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@ import os
|
|||
from oslo_log import log as logging
|
||||
|
||||
from fuel_agent import errors
|
||||
from fuel_agent.objects.partition.fs import FileSystem
|
||||
from fuel_agent.objects.partition.lv import LogicalVolume
|
||||
from fuel_agent.objects.partition.md import MultipleDevice
|
||||
from fuel_agent.objects.partition.parted import Parted
|
||||
from fuel_agent.objects.partition.pv import PhysicalVolume
|
||||
from fuel_agent.objects.partition.vg import VolumeGroup
|
||||
from fuel_agent.objects.partition import fs as f_fs
|
||||
from fuel_agent.objects.partition import lv as f_lv
|
||||
from fuel_agent.objects.partition import md as f_md
|
||||
from fuel_agent.objects.partition import parted as f_parted
|
||||
from fuel_agent.objects.partition import pv as f_pv
|
||||
from fuel_agent.objects.partition import vg as f_vg
|
||||
|
||||
|
||||
LOG = logging.getLogger(__name__)
|
||||
|
|
@ -39,27 +39,27 @@ class PartitionScheme(object):
|
|||
self.fss = []
|
||||
|
||||
def add_parted(self, **kwargs):
|
||||
parted = Parted(**kwargs)
|
||||
parted = f_parted.Parted(**kwargs)
|
||||
self.parteds.append(parted)
|
||||
return parted
|
||||
|
||||
def add_pv(self, **kwargs):
|
||||
pv = PhysicalVolume(**kwargs)
|
||||
pv = f_pv.PhysicalVolume(**kwargs)
|
||||
self.pvs.append(pv)
|
||||
return pv
|
||||
|
||||
def add_vg(self, **kwargs):
|
||||
vg = VolumeGroup(**kwargs)
|
||||
vg = f_vg.VolumeGroup(**kwargs)
|
||||
self.vgs.append(vg)
|
||||
return vg
|
||||
|
||||
def add_lv(self, **kwargs):
|
||||
lv = LogicalVolume(**kwargs)
|
||||
lv = f_lv.LogicalVolume(**kwargs)
|
||||
self.lvs.append(lv)
|
||||
return lv
|
||||
|
||||
def add_fs(self, **kwargs):
|
||||
fs = FileSystem(**kwargs)
|
||||
fs = f_fs.FileSystem(**kwargs)
|
||||
if not os.path.isabs(fs.mount) and fs.mount != 'swap':
|
||||
raise errors.WrongFSMount(
|
||||
'Incorrect mount point %s' % fs.mount)
|
||||
|
|
@ -71,7 +71,7 @@ class PartitionScheme(object):
|
|||
mdkwargs['name'] = kwargs.get('name') or self.md_next_name()
|
||||
mdkwargs['level'] = kwargs.get('level') or 'mirror'
|
||||
mdkwargs['metadata'] = kwargs.get('metadata') or 'default'
|
||||
md = MultipleDevice(**mdkwargs)
|
||||
md = f_md.MultipleDevice(**mdkwargs)
|
||||
self.mds.append(md)
|
||||
return md
|
||||
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@
|
|||
import io
|
||||
|
||||
import mock
|
||||
from six import StringIO
|
||||
import six
|
||||
import unittest2
|
||||
|
||||
from fuel_agent import errors
|
||||
|
|
@ -473,7 +473,7 @@ GRUB_RECORDFAIL_TIMEOUT=10
|
|||
create=True) as mock_open:
|
||||
mock_open.return_value = mock.MagicMock(spec=io.IOBase)
|
||||
handle = mock_open.return_value.__enter__.return_value
|
||||
handle.__iter__.return_value = StringIO(orig_content)
|
||||
handle.__iter__.return_value = six.StringIO(orig_content)
|
||||
gu.grub2_cfg(kernel_params='kernel-params-new', chroot='/target',
|
||||
grub_timeout=10)
|
||||
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import six
|
|||
from six.moves.urllib.parse import urlsplit
|
||||
import unittest2
|
||||
|
||||
from fuel_agent.drivers.nailgun import NailgunBuildImage
|
||||
from fuel_agent.drivers import nailgun
|
||||
from fuel_agent import objects
|
||||
|
||||
DEFAULT_TRUSTY_PACKAGES = [
|
||||
|
|
@ -104,12 +104,12 @@ IMAGE_DATA_SAMPLE = {
|
|||
class TestNailgunBuildImage(unittest2.TestCase):
|
||||
|
||||
def test_default_trusty_packages(self):
|
||||
self.assertEqual(NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
self.assertEqual(nailgun.NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
DEFAULT_TRUSTY_PACKAGES)
|
||||
|
||||
@mock.patch('fuel_agent.objects.RepoProxies')
|
||||
@mock.patch('fuel_agent.objects.Ubuntu')
|
||||
@mock.patch.object(NailgunBuildImage, 'parse_schemes')
|
||||
@mock.patch.object(nailgun.NailgunBuildImage, 'parse_schemes')
|
||||
def test_parse_operating_system_packages_given(self, mock_parse_schemes,
|
||||
mock_ub, mock_proxies):
|
||||
data = {
|
||||
|
|
@ -119,7 +119,7 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
}
|
||||
mock_ub_instance = mock_ub.return_value
|
||||
mock_ub_instance.packages = data['packages']
|
||||
driver = NailgunBuildImage(data)
|
||||
driver = nailgun.NailgunBuildImage(data)
|
||||
mock_ub.assert_called_once_with(repos=[], packages=data['packages'],
|
||||
major=14, minor=4,
|
||||
proxies=mock_proxies.return_value)
|
||||
|
|
@ -127,7 +127,7 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
|
||||
@mock.patch('fuel_agent.objects.RepoProxies')
|
||||
@mock.patch('fuel_agent.objects.Ubuntu')
|
||||
@mock.patch.object(NailgunBuildImage, 'parse_schemes')
|
||||
@mock.patch.object(nailgun.NailgunBuildImage, 'parse_schemes')
|
||||
def test_parse_operating_system_packages_not_given(
|
||||
self, mock_parse_schemes, mock_ub, mock_proxies):
|
||||
data = {
|
||||
|
|
@ -135,18 +135,20 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
'codename': 'trusty'
|
||||
}
|
||||
mock_ub_instance = mock_ub.return_value
|
||||
mock_ub_instance.packages = NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES
|
||||
driver = NailgunBuildImage(data)
|
||||
mock_ub_instance.packages = \
|
||||
nailgun.NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES
|
||||
driver = nailgun.NailgunBuildImage(data)
|
||||
mock_ub.assert_called_once_with(
|
||||
repos=[], packages=NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
repos=[],
|
||||
packages=nailgun.NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
major=14, minor=4, proxies=mock_proxies.return_value)
|
||||
self.assertEqual(driver.operating_system.packages,
|
||||
NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES)
|
||||
nailgun.NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES)
|
||||
|
||||
@mock.patch('fuel_agent.objects.RepoProxies')
|
||||
@mock.patch('fuel_agent.objects.DEBRepo')
|
||||
@mock.patch('fuel_agent.objects.Ubuntu')
|
||||
@mock.patch.object(NailgunBuildImage, 'parse_schemes')
|
||||
@mock.patch.object(nailgun.NailgunBuildImage, 'parse_schemes')
|
||||
def test_parse_operating_system_repos(self, mock_parse_schemes, mock_ub,
|
||||
mock_deb, mock_proxies):
|
||||
data = {
|
||||
|
|
@ -166,11 +168,12 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
}
|
||||
mock_deb_expected_calls.append(mock.call(**kwargs))
|
||||
repos.append(objects.DEBRepo(**kwargs))
|
||||
driver = NailgunBuildImage(data)
|
||||
driver = nailgun.NailgunBuildImage(data)
|
||||
mock_ub_instance = mock_ub.return_value
|
||||
mock_ub_instance.repos = repos
|
||||
mock_ub.assert_called_once_with(
|
||||
repos=repos, packages=NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
repos=repos,
|
||||
packages=nailgun.NailgunBuildImage.DEFAULT_TRUSTY_PACKAGES,
|
||||
major=14, minor=4, proxies=mock_proxies.return_value)
|
||||
self.assertEqual(mock_deb_expected_calls,
|
||||
mock_deb.call_args_list[:len(REPOS_SAMPLE)])
|
||||
|
|
@ -181,7 +184,7 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
@mock.patch('fuel_agent.objects.FS')
|
||||
@mock.patch('fuel_agent.objects.PartitionScheme')
|
||||
@mock.patch('fuel_agent.objects.ImageScheme')
|
||||
@mock.patch.object(NailgunBuildImage, 'parse_operating_system')
|
||||
@mock.patch.object(nailgun.NailgunBuildImage, 'parse_operating_system')
|
||||
def test_parse_schemes(
|
||||
self, mock_parse_os, mock_imgsch, mock_partsch,
|
||||
mock_fs, mock_img, mock_loop):
|
||||
|
|
@ -189,7 +192,7 @@ class TestNailgunBuildImage(unittest2.TestCase):
|
|||
'image_data': IMAGE_DATA_SAMPLE,
|
||||
'output': '/some/local/path',
|
||||
}
|
||||
driver = NailgunBuildImage(data)
|
||||
driver = nailgun.NailgunBuildImage(data)
|
||||
|
||||
mock_fs_expected_calls = []
|
||||
mock_img_expected_calls = []
|
||||
|
|
|
|||
Loading…
Reference in New Issue