From db40ac891f7af0788d9fa8404402d9c6bceb800c Mon Sep 17 00:00:00 2001
From: Sanghun Lee <sanghun@lablup.com>
Date: Tue, 11 Feb 2025 23:36:13 +0900
Subject: [PATCH] resolve conflict

---
 src/ai/backend/storage/context.py                     | 1 +
 src/ai/backend/storage/{ => volumes}/noop/BUILD       | 0
 src/ai/backend/storage/{ => volumes}/noop/__init__.py | 4 ++--
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename src/ai/backend/storage/{ => volumes}/noop/BUILD (100%)
 rename src/ai/backend/storage/{ => volumes}/noop/__init__.py (99%)

diff --git a/src/ai/backend/storage/context.py b/src/ai/backend/storage/context.py
index 6471e22fe3a..e8f10ce69ee 100644
--- a/src/ai/backend/storage/context.py
+++ b/src/ai/backend/storage/context.py
@@ -40,6 +40,7 @@
 from .volumes.dellemc import DellEMCOneFSVolume
 from .volumes.gpfs import GPFSVolume
 from .volumes.netapp import NetAppVolume
+from .volumes.noop import NoopVolume
 from .volumes.purestorage import FlashBladeVolume
 from .volumes.vast import VASTVolume
 from .volumes.vfs import BaseVolume
diff --git a/src/ai/backend/storage/noop/BUILD b/src/ai/backend/storage/volumes/noop/BUILD
similarity index 100%
rename from src/ai/backend/storage/noop/BUILD
rename to src/ai/backend/storage/volumes/noop/BUILD
diff --git a/src/ai/backend/storage/noop/__init__.py b/src/ai/backend/storage/volumes/noop/__init__.py
similarity index 99%
rename from src/ai/backend/storage/noop/__init__.py
rename to src/ai/backend/storage/volumes/noop/__init__.py
index b587e5b7cd6..0f3a8725f60 100644
--- a/src/ai/backend/storage/noop/__init__.py
+++ b/src/ai/backend/storage/volumes/noop/__init__.py
@@ -5,8 +5,7 @@
 from ai.backend.common.defs import DEFAULT_VFOLDER_PERMISSION_MODE, NOOP_STORAGE_BACKEND_TYPE
 from ai.backend.common.types import BinarySize, HardwareMetadata, QuotaScopeID
 
-from ..abc import AbstractFSOpModel, AbstractQuotaModel, AbstractVolume
-from ..types import (
+from ...types import (
     CapacityUsage,
     DirEntry,
     FSPerfMetric,
@@ -15,6 +14,7 @@
     TreeUsage,
     VFolderID,
 )
+from ..abc import AbstractFSOpModel, AbstractQuotaModel, AbstractVolume
 
 
 class NoopQuotaModel(AbstractQuotaModel):