sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move blockdevicesetupexception.py into blockdevice.py

Browse Source 
Less is more when it comes to code :)

Change-Id: I925ed62bdc808f0e07862f6e0905e80b50fbe942
This commit is contained in:
Ian Wienand 2017-05-02 15:32:47 +10:00
parent fae8484e6b
commit 47140293b6
4 changed files with 8 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
diskimage_builder/block_device/blockdevice.py
View File

@ -22,14 +22,16 @@ 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__)
class BlockDeviceSetupException(Exception):
pass
class BlockDevice(object):
"""Handles block devices.

17
diskimage_builder/block_device/blockdevicesetupexception.py
View File

@ -1,17 +0,0 @@
# Copyright 2016 Andreas Florath (andreas@florath.net)
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
class BlockDeviceSetupException(Exception):
pass

4
diskimage_builder/block_device/level0/localloop.py
View File

@ -16,8 +16,8 @@ import logging
import os
import subprocess
from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException
from diskimage_builder.block_device.blockdevice 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

4
diskimage_builder/block_device/level1/partitioning.py
View File

@ -17,8 +17,8 @@ import os
from subprocess import CalledProcessError
from diskimage_builder.block_device.blockdevicesetupexception \
import BlockDeviceSetupException
from diskimage_builder.block_device.blockdevice import \
BlockDeviceSetupException
from diskimage_builder.block_device.level1.mbr import MBR
from diskimage_builder.block_device.plugin_base import PluginBase
from diskimage_builder.block_device.tree_config import TreeConfig