Expand LXD driver functionality #1436
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -710,6 +710,85 @@ def pre_validate_base_schema(env, keep_string): | |
| }, | ||
| } | ||
|
|
||
| platforms_lxd_schema = { | ||
| 'platforms': { | ||
| 'type': 'list', | ||
| 'schema': { | ||
| 'type': 'dict', | ||
| 'schema': { | ||
| 'name': { | ||
| 'type': 'string', | ||
| }, | ||
| 'url': { | ||
| 'type': 'string', | ||
| }, | ||
| 'cert_file': { | ||
| 'type': 'string', | ||
| }, | ||
| 'key_file': { | ||
| 'type': 'string', | ||
| }, | ||
| 'trust_password': { | ||
| 'type': 'string', | ||
| }, | ||
| 'source': { | ||
| 'type': 'dict', | ||
| 'schema': { | ||
| 'type': { | ||
| 'type': 'string', | ||
| }, | ||
| 'mode': { | ||
| 'type': 'string', | ||
| 'allowed': [ | ||
| 'pull', | ||
| 'local', | ||
| ], | ||
| }, | ||
| 'server': { | ||
| 'type': 'string', | ||
| }, | ||
| 'protocol': { | ||
| 'type': 'string', | ||
| 'allowed': [ | ||
|
There was a problem hiding this comment. I made the schema as specific as possible, these are the only values valid for the LXD api. There are now allowed values (source). |
||
| 'lxd', | ||
| 'simplestreams', | ||
| ], | ||
| }, | ||
| 'alias': { | ||
| 'type': 'string', | ||
| }, | ||
| }, | ||
| }, | ||
| 'architecture': { | ||
| 'type': 'string', | ||
| 'allowed': [ | ||
|
There was a problem hiding this comment. Same here (source) |
||
| 'x86_64', | ||
| 'i686', | ||
| ], | ||
| }, | ||
| 'devices': { | ||
|
There was a problem hiding this comment. Please take a good look at the devices schema, that is the one I struggled with since I am not familiar with the markup. Might be not 100% correct |
||
| 'type': 'dict', | ||
| 'schema': { | ||
| 'type': 'dict', | ||
| 'keyschema': { | ||
| 'type': 'string', | ||
| }, | ||
| }, | ||
| }, | ||
| 'profiles': { | ||
| 'type': 'list', | ||
| 'schema': { | ||
| 'type': 'string' | ||
| } | ||
| }, | ||
| 'force_stop': { | ||
| 'type': 'boolean', | ||
| }, | ||
| } | ||
| } | ||
| }, | ||
| } | ||
|
|
||
| dependency_command_nullable_schema = { | ||
| 'dependency': { | ||
| 'type': 'dict', | ||
|
|
@@ -863,6 +942,8 @@ def validate(c): | |
| elif c['driver']['name'] == 'vagrant': | ||
| util.merge_dicts(schema, driver_vagrant_provider_section_schema) | ||
| util.merge_dicts(schema, platforms_vagrant_schema) | ||
| elif c['driver']['name'] == 'lxd': | ||
| util.merge_dicts(schema, platforms_lxd_schema) | ||
| else: | ||
| util.merge_dicts(schema, platforms_base_schema) | ||
|
|
||
|
|
||
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you have implemented this API for molecule.yml we need to validate the schema. Can you update the v2 schema similar to what we did with dockder and vagrant.
https://github.com/metacloud/molecule/blob/master/molecule/model/schema_v2.py#L596
https://github.com/metacloud/molecule/blob/master/molecule/model/schema_v2.py#L862
And we will need to update tests with working and failing tests:
https://github.com/metacloud/molecule/blob/master/test/unit/model/v2/test_platforms_section.py