Merge "block_device: reorder imports"
This commit is contained in:
commit
fae8484e6b
@ -13,9 +13,10 @@
|
||||
# under the License.
|
||||
|
||||
import argparse
|
||||
import logging
|
||||
|
||||
from diskimage_builder.block_device.blockdevice import BlockDevice
|
||||
from diskimage_builder import logging_config
|
||||
import logging
|
||||
|
||||
|
||||
def generate_phase_doc():
|
||||
|
@ -13,17 +13,19 @@
|
||||
# under the License.
|
||||
|
||||
import codecs
|
||||
from diskimage_builder.block_device.blockdevicesetupexception \
|
||||
import BlockDeviceSetupException
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import shutil
|
||||
from stevedore import extension
|
||||
import sys
|
||||
import yaml
|
||||
|
||||
from stevedore import extension
|
||||
|
||||
from diskimage_builder.block_device.blockdevicesetupexception \
|
||||
import BlockDeviceSetupException
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -12,15 +12,16 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
from diskimage_builder.block_device.blockdevicesetupexception \
|
||||
import BlockDeviceSetupException
|
||||
from diskimage_builder.block_device.plugin_base import NodePluginBase
|
||||
from diskimage_builder.block_device.tree_config import TreeConfig
|
||||
from diskimage_builder.block_device.utils import parse_abs_size_spec
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
import logging
|
||||
import os
|
||||
import subprocess
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
@ -13,6 +13,8 @@
|
||||
# under the License.
|
||||
import logging
|
||||
import random
|
||||
|
||||
|
||||
from struct import pack
|
||||
|
||||
|
||||
|
@ -12,6 +12,11 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import logging
|
||||
import os
|
||||
|
||||
from subprocess import CalledProcessError
|
||||
|
||||
from diskimage_builder.block_device.blockdevicesetupexception \
|
||||
import BlockDeviceSetupException
|
||||
from diskimage_builder.block_device.level1.mbr import MBR
|
||||
@ -21,9 +26,7 @@ from diskimage_builder.block_device.utils import exec_sudo
|
||||
from diskimage_builder.block_device.utils import parse_abs_size_spec
|
||||
from diskimage_builder.block_device.utils import parse_rel_size_spec
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
import logging
|
||||
import os
|
||||
from subprocess import CalledProcessError
|
||||
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
|
@ -13,9 +13,10 @@
|
||||
# under the License.
|
||||
|
||||
import abc
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
import six
|
||||
|
||||
from diskimage_builder.graph.digraph import Digraph
|
||||
|
||||
|
||||
@six.add_metaclass(abc.ABCMeta)
|
||||
class PluginBase(object):
|
||||
|
@ -12,9 +12,10 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from diskimage_builder.block_device.utils import parse_abs_size_spec
|
||||
import testtools
|
||||
|
||||
from diskimage_builder.block_device.utils import parse_abs_size_spec
|
||||
|
||||
|
||||
class TestLoggingConfig(testtools.TestCase):
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user