Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CSI-5277/organize directories #657

Open
wants to merge 4 commits into
base: task/CSI-5277_separate_addons_code_from_controller_server
Choose a base branch
from
Open

CSI-5277/organize directories #657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e7c6f53
organize directories
matancarmeli7 Feb 5, 2023
8076903
Merge branch 'task/CSI-5277_separate_addons_code_from_controller_serv…
matancarmeli7 Feb 15, 2023
09a7d53
Merge branch 'task/CSI-5277_separate_addons_code_from_controller_serv…
matancarmeli7 Feb 15, 2023
dcda4dc
Merge branch 'task/CSI-5277_separate_addons_code_from_controller_serv…
matancarmeli7 Jun 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file added controllers/servers/csi/controller_server/__init__.py
View file
Open in desktop
Empty file.
0 ...lers/servers/csi/csi_controller_server.py → ...ontroller_server/csi_controller_server.py
View file
Open in desktop
File renamed without changes.
0 ...ollers/servers/csi/volume_group_server.py → .../controller_server/volume_group_server.py
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions controllers/servers/csi/main.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
from controllers.common.csi_logger import set_log_level
from controllers.common.settings import CSI_CONTROLLER_SERVER_WORKERS
from controllers.servers.csi.server_manager import ServerManager
from controllers.servers.csi.csi_controller_server import CSIControllerServicer
from controllers.servers.csi.volume_group_server import VolumeGroupControllerServicer
from controllers.servers.csi.controller_server.csi_controller_server import CSIControllerServicer
from controllers.servers.csi.controller_server.volume_group_server import VolumeGroupControllerServicer
from controllers.servers.csi.csi_addons_server.replication_controller_servicer import ReplicationControllerServicer


Expand Down
Empty file added controllers/tests/controller_server/controller_server/__init__.py
View file
Open in desktop
Empty file.
6 changes: 3 additions & 3 deletions ...ller_server/csi_controller_server_test.py → ...ller_server/csi_controller_server_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import controllers.servers.settings as servers_settings
from controllers.array_action.array_action_types import ObjectIds
from controllers.array_action.array_mediator_xiv import XIVArrayMediator
from controllers.servers.csi.csi_controller_server import CSIControllerServicer
from controllers.servers.csi.controller_server.csi_controller_server import CSIControllerServicer
from controllers.servers.csi.sync_lock import SyncLock
from controllers.tests import utils
from controllers.tests.common.test_settings import (CLONE_VOLUME_NAME,
Expand All @@ -30,7 +30,7 @@
from controllers.tests.controller_server.common import mock_get_agent, mock_array_type, mock_mediator
from controllers.tests.utils import ProtoBufMock

CONTROLLER_SERVER_PATH = "controllers.servers.csi.csi_controller_server"
CONTROLLER_SERVER_PATH = "controllers.servers.csi.controller_server.csi_controller_server"


class BaseControllerSetUp(unittest.TestCase):
Expand Down Expand Up @@ -916,7 +916,7 @@ def test_delete_volume_invalid_volume_id(self):

self.assertEqual(self.context.code, grpc.StatusCode.OK)

@patch("controllers.servers.csi.csi_controller_server.get_agent")
@patch("controllers.servers.csi.controller_server.csi_controller_server.get_agent")
def test_delete_volume_with_array_connection_exception(self, storage_agent):
storage_agent.side_effect = [Exception("a_enter error")]

Expand Down
6 changes: 3 additions & 3 deletions ...roller_server/volume_group_server_test.py → ...roller_server/volume_group_server_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@

from controllers.array_action import errors as array_errors
from controllers.servers import settings as servers_settings
from controllers.servers.csi.volume_group_server import VolumeGroupControllerServicer
from controllers.servers.csi.controller_server.volume_group_server import VolumeGroupControllerServicer
from controllers.tests import utils
from controllers.tests.common.test_settings import SECRET, VOLUME_GROUP_NAME, NAME_PREFIX, REQUEST_VOLUME_GROUP_ID, \
VOLUME_GROUP_UID, REQUEST_VOLUME_ID, VOLUME_UID, REQUEST_REAL_VOLUME_ID, REAL_NGUID
from controllers.tests.controller_server.common import mock_array_type, mock_mediator, mock_get_agent
from controllers.tests.controller_server.csi_controller_server_test import CommonControllerTest
from controllers.tests.controller_server.controller_server.csi_controller_server_test import CommonControllerTest
from controllers.tests.utils import ProtoBufMock

VG_CONTROLLER_SERVER_PATH = "controllers.servers.csi.volume_group_server"
VG_CONTROLLER_SERVER_PATH = "controllers.servers.csi.controller_server.volume_group_server"


class BaseVgControllerSetUp(unittest.TestCase):
Expand Down
Empty file added controllers/tests/controller_server/csi_addons/__init__.py
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion ...s/controller_server/addons_server_test.py → ...r_server/csi_addons/addons_server_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
OTHER_OBJECT_INTERNAL_ID, REPLICATION_NAME, SYSTEM_ID, COPY_TYPE, SECRET_USERNAME_VALUE, SECRET_PASSWORD_VALUE, \
SECRET_MANAGEMENT_ADDRESS_VALUE, DUMMY_VOLUME_GROUP
from controllers.tests.controller_server.common import mock_get_agent
from controllers.tests.controller_server.csi_controller_server_test import (CommonControllerTest)
from controllers.tests.controller_server.controller_server.csi_controller_server_test import (CommonControllerTest)
from controllers.tests.utils import ProtoBufMock

ADDON_SERVER_PATH = "controllers.servers.csi.csi_addons_server.replication_controller_servicer"
Expand Down
4 changes: 2 additions & 2 deletions controllers/tests/controller_server/utils_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
from controllers.common.settings import SPACE_EFFICIENCY_DEDUPLICATED_COMPRESSED, SPACE_EFFICIENCY_NONE, \
SPACE_EFFICIENCY_DEDUPLICATED, SPACE_EFFICIENCY_THIN
from controllers.servers import settings as controller_config
from controllers.servers.csi.csi_controller_server import CSIControllerServicer
from controllers.servers.csi.controller_server.csi_controller_server import CSIControllerServicer
from controllers.servers.errors import ObjectIdError, ValidationException, InvalidNodeId
from controllers.tests import utils as test_utils
from controllers.tests.common.test_settings import DUMMY_POOL1, SECRET_USERNAME_VALUE, SECRET_PASSWORD_VALUE, ARRAY
from controllers.tests.controller_server.csi_controller_server_test import ProtoBufMock
from controllers.tests.controller_server.controller_server.csi_controller_server_test import ProtoBufMock
from controllers.tests.utils import get_fake_secret_config


Expand Down