Skip to content

Add accessible_topology to created volumes, closes #828 #845

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

Open
bh-tt wants to merge 1 commit into
base: release-1.13.1
Choose a base branch
from
Open

Add accessible_topology to created volumes, closes #828 #845

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion controllers/servers/csi/csi_controller_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ def CreateVolume(self, request, context):
volume.source_id = source_id

response = utils.generate_csi_create_volume_response(volume, array_connection_info.system_id,
source_type)
source_type, topologies)
return response
except (array_errors.InvalidArgumentError, array_errors.ExpectedSnapshotButFoundVolumeError) as ex:
return handle_exception(ex, context, grpc.StatusCode.INVALID_ARGUMENT, csi_pb2.CreateVolumeResponse)
Expand Down
9 changes: 5 additions & 4 deletions controllers/servers/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ def _generate_volumes_response(new_volumes):
return volumes


def _generate_volume_response(new_volume, system_id=None, source_type=None):
def _generate_volume_response(new_volume, system_id=None, source_type=None, topologies=None):
content_source = None
if new_volume.source_id:
if source_type == servers_settings.SNAPSHOT_TYPE_NAME:
Expand All @@ -403,7 +403,8 @@ def _generate_volume_response(new_volume, system_id=None, source_type=None):
return csi_pb2.Volume(
capacity_bytes=new_volume.capacity_bytes,
volume_id=get_volume_id(new_volume, system_id),
content_source=content_source)
content_source=content_source,
accessible_topology=[csi_pb2.Topology(segments=topologies)])


def _generate_volumegroup_volume_response(new_volume, system_id=None):
Expand All @@ -418,10 +419,10 @@ def _generate_volumegroup_volume_response(new_volume, system_id=None):
content_source=content_source)


def generate_csi_create_volume_response(new_volume, system_id=None, source_type=None):
def generate_csi_create_volume_response(new_volume, system_id=None, source_type=None, topologies=None):
logger.debug("creating create volume response for volume : {0}".format(new_volume))

response = csi_pb2.CreateVolumeResponse(volume=_generate_volume_response(new_volume, system_id, source_type))
response = csi_pb2.CreateVolumeResponse(volume=_generate_volume_response(new_volume, system_id, source_type, topologies))

logger.debug("finished creating volume response : {0}".format(response))
return response
Expand Down