From 258d16b0f3dd9ebb8c4466108709911192507b69 Mon Sep 17 00:00:00 2001 From: Oleg Gelbukh Date: Thu, 26 May 2016 11:05:04 +0000 Subject: [PATCH] Move disk.py module to util module Current location for disk.py modules is inconsistent with the usage of utils for basic operations on disks, not only their metadata. Non-metadata operations must be implemented by util module. Change-Id: Ia53b831f4b4d5c31da8801a8561b4721fd35d511 Related-bug: 1585938 Related-bug: 1575054 --- octane/handlers/install/compute.py | 2 +- octane/handlers/upgrade/compute.py | 2 +- octane/{helpers => util}/disk.py | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename octane/{helpers => util}/disk.py (100%) diff --git a/octane/handlers/install/compute.py b/octane/handlers/install/compute.py index dfd62544..ac63ab36 100644 --- a/octane/handlers/install/compute.py +++ b/octane/handlers/install/compute.py @@ -14,8 +14,8 @@ import logging import os.path from octane.handlers import install -from octane.helpers import disk from octane import magic_consts +from octane.util import disk from octane.util import node as node_util from octane.util import plugin from octane.util import ssh diff --git a/octane/handlers/upgrade/compute.py b/octane/handlers/upgrade/compute.py index 278174fd..79785f8f 100644 --- a/octane/handlers/upgrade/compute.py +++ b/octane/handlers/upgrade/compute.py @@ -16,8 +16,8 @@ import stat import subprocess from octane.handlers import upgrade -from octane.helpers import disk from octane import magic_consts +from octane.util import disk from octane.util import env as env_util from octane.util import node as node_util from octane.util import plugin diff --git a/octane/helpers/disk.py b/octane/util/disk.py similarity index 100% rename from octane/helpers/disk.py rename to octane/util/disk.py