From 74b29b8c5c6e50e78c26e38036bb0a8dcc4f63a8 Mon Sep 17 00:00:00 2001 From: Boxiang Zhu Date: Wed, 24 Aug 2022 11:54:11 +0800 Subject: [PATCH] refactor: Move all wrapper into wrapper folder Move all wrapper into wrapper folder Change-Id: I3f809a15bebdd3284a07acfde4dc887efc0fe36e --- skyline_apiserver/api/v1/extension.py | 4 ++-- skyline_apiserver/api/{v1/openstack => wrapper}/__init__.py | 0 .../api/{v1/openstack/base.py => wrapper/openstack.py} | 0 skyline_apiserver/api/{v1/utils.py => wrapper/skyline.py} | 0 4 files changed, 2 insertions(+), 2 deletions(-) rename skyline_apiserver/api/{v1/openstack => wrapper}/__init__.py (100%) rename skyline_apiserver/api/{v1/openstack/base.py => wrapper/openstack.py} (100%) rename skyline_apiserver/api/{v1/utils.py => wrapper/skyline.py} (100%) diff --git a/skyline_apiserver/api/v1/extension.py b/skyline_apiserver/api/v1/extension.py index 1a3642e..13709b8 100644 --- a/skyline_apiserver/api/v1/extension.py +++ b/skyline_apiserver/api/v1/extension.py @@ -28,8 +28,8 @@ from novaclient.v2.servers import Server as NovaServer from skyline_apiserver import schemas from skyline_apiserver.api import deps -from skyline_apiserver.api.v1.openstack.base import OSPort, OSServer, OSVolume, OSVolumeSnapshot -from skyline_apiserver.api.v1.utils import Port, Server, Service, Volume, VolumeSnapshot +from skyline_apiserver.api.wrapper.openstack import OSPort, OSServer, OSVolume, OSVolumeSnapshot +from skyline_apiserver.api.wrapper.skyline import Port, Server, Service, Volume, VolumeSnapshot from skyline_apiserver.client import utils from skyline_apiserver.client.openstack import cinder, glance, keystone, neutron, nova from skyline_apiserver.client.utils import generate_session, get_system_session diff --git a/skyline_apiserver/api/v1/openstack/__init__.py b/skyline_apiserver/api/wrapper/__init__.py similarity index 100% rename from skyline_apiserver/api/v1/openstack/__init__.py rename to skyline_apiserver/api/wrapper/__init__.py diff --git a/skyline_apiserver/api/v1/openstack/base.py b/skyline_apiserver/api/wrapper/openstack.py similarity index 100% rename from skyline_apiserver/api/v1/openstack/base.py rename to skyline_apiserver/api/wrapper/openstack.py diff --git a/skyline_apiserver/api/v1/utils.py b/skyline_apiserver/api/wrapper/skyline.py similarity index 100% rename from skyline_apiserver/api/v1/utils.py rename to skyline_apiserver/api/wrapper/skyline.py