Skip to content

Ronerez/edge mapping #311

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

Merged
saimonation merged 6 commits into from
Jul 7, 2025
Merged

Ronerez/edge mapping #311

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
26638f6
Fix advanced mapping merge behavior and add comprehensive test
ronier83 Jul 7, 2025
1d75485
Merge branch 'master' into ronerez/edge-mapping
saimonation Jul 7, 2025
8baecb0
revert implementation, remove redundant call to retrieve mappings
saimonation Jul 7, 2025
426758c
update docs
saimonation Jul 7, 2025
eac892e
update changelog
saimonation Jul 7, 2025
73236f7
update changelog
saimonation Jul 7, 2025
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
1 change: 0 additions & 1 deletion cterasdk/edge/directoryservice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ def set_advanced_mapping(self, mappings):
raise CTERAException('Failed to configure advanced mapping. Not connected to directory services.')

domains = self.domains()
advanced_mapping = self._edge.api.get('/config/fileservices/cifs/idMapping/map')
advanced_mapping = []
for mapping in mappings:
if mapping.domainFlatName in domains:
Expand Down
2 changes: 2 additions & 0 deletions docs/source/UserGuides/Edge/Configuration.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,8 @@ Active Directory

edge.directoryservice.set_advanced_mapping(advanced_mapping) # this function will skip domains that are not found

.. note:: This method sets the advanced mapping of domains and requires the full list of mappings.
It does not append to the existing configuration—any existing mappings will be overwritten.
.. note:: to retrieve a list of domain flat names, use :py:func:`cterasdk.edge.directoryservice.domains()`

.. automethod:: cterasdk.edge.directoryservice.DirectoryService.disconnect
Expand Down
8 changes: 7 additions & 1 deletion docs/source/UserGuides/Miscellaneous/Changelog.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,13 @@ Improvements

* Added support for enabling or disabling Direct Mode on CTERA Portal Storage Nodes.

Related issues and pull requests on GitHub: `#310 <https://github.com/ctera/ctera-python-sdk/pull/310>`_
Bug Fixes
^^^^^^^^^

* Removed redundant call when retrieving the list of domain mappings.

Related issues and pull requests on GitHub: `#310 <https://github.com/ctera/ctera-python-sdk/pull/310>`_,
`#311 <https://github.com/ctera/ctera-python-sdk/pull/311>`_

2.20.15
-------
Expand Down
5 changes: 1 addition & 4 deletions tests/ut/edge/test_directory_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,7 @@ def test_set_advanced_mapping(self):
]
self._init_filer(get_response=0, execute_response=execute_response)
directoryservice.DirectoryService(self._filer).set_advanced_mapping(advanced_mapping)
self._filer.api.get.assert_has_calls([
mock.call('/status/fileservices/cifs/joinStatus'),
mock.call('/config/fileservices/cifs/idMapping/map')
])
self._filer.api.get.assert_called_once_with('/status/fileservices/cifs/joinStatus')
self._filer.api.execute.assert_called_once_with('/status/fileservices/cifs', 'enumDiscoveredDomains')
self._filer.api.put.assert_called_once_with('/config/fileservices/cifs/idMapping/map', mock.ANY)
actual_param = self._filer.api.put.call_args[0][1]
Expand Down