Provider Improvements and Fixes #1249
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The typo has been in the class name since its introduction. The documentation contains the correct name "NFSProviderDriver" already. Signed-off-by: Bastian Krause <[email protected]>
This allows the user to import these resources from labgrid.resource directly. Signed-off-by: Bastian Krause <[email protected]>
The TFTPProvider, HTTPProvider and NFSProvider don't have a host property unlike the remote variants. Fix the `get_export_vars()` method by distinguishing local and remote resources: use the provider's host attribute for remote resources, otherwise return "localhost". Signed-off-by: Bastian Krause <[email protected]>
There is no need to overwrite this method to only call the same method on super(). This is the default. Signed-off-by: Bastian Krause <[email protected]>
This path will be used by the NFSProviderDriver in a future commit. Signed-off-by: Bastian Krause <[email protected]>
During the introduction of the provider drivers, it was assumed all provider drivers work the same way: by relying on the `internal`/`external` attributes of their corresponding provider resource and symlinking the required file (either from /var/cache/labgrid/$USER/$HASH/file or the given path, in case it's locally available) to the `internal` path. For the target, the file is now expected to be available below `external` as returned by `stage()`. This, however, does not work for NFS: all NFS servers known to me don't touch the symlinks, meaning in our case that they point to a location not exported via NFS. Exporting and mounting these destinations to the same location is impractical at best or does not work at all. On top of that, the `internal`/`external` lingo does not fit the NFS mount use case. To improve this situation, introduce a custom `stage()` method for the NFSProviderDriver: assume that /var/cache/labgrid is exported via NFS, always copy the file to be staged there (even if it would be locally available) and return an NFSFile object containing the information required to mount and access the NFS share: host, export and the file path relative to the export. Signed-off-by: Bastian Krause <[email protected]>
…vider Now that the NFSProviderDriver no longer relies on the `internal`/`external` attributes of the (Remote)NFSProvider resource, let the NFSProvider inherit from Resource directly, so specifying these obsolete attributes is no longer required. The same applies to the RemoteNFSProvider which now inherits from NetworkResource directly. Signed-off-by: Bastian Krause <[email protected]>
…mples Signed-off-by: Bastian Krause <[email protected]>
Codecov ReportPatch coverage:
Additional details and impacted files@@ Coverage Diff @@
## master #1249 +/- ##
========================================
- Coverage 62.9% 62.9% -0.1%
========================================
Files 161 161
Lines 11861 11882 +21
========================================
+ Hits 7471 7482 +11
- Misses 4390 4400 +10
☔ View full report in Codecov by Sentry. |
|
@Bastian-Krause did you test this with a local NFS Server? |
Yes, I've tested this with an NFS server and I have a customer strategy using this that runs successfully with this PR. |
Emantor
approved these changes
Oct 12, 2023
This was referenced Oct 12, 2023
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Collection of various provider fixes and improvements:
Contains breaking changes mentioned in CHANGES.rst.
Checklist
Fixes #762