Update CAmp to use the new ACE release #3
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
BrianSipos
reviewed
Aug 14, 2024
src/camp/generators/create_sql.py
Outdated
| version = val_or_none(self.admset.get_child(self.adm, models.Mdat, 'version')) | ||
| org = val_or_none(self.admset.get_child(self.adm, models.Mdat, 'organization')) | ||
| desc = escape_description_sql(val_or_none(self.admset.get_child(self.adm, models.Mdat, 'namespace'), 'description')) | ||
| name = val_or_none(self.admset.get_child(self.adm, models.Ident, 'name')) |
There was a problem hiding this comment.
The notion of "Mdat" (metadata) is replaced by alternatives:
- name is direct
self.adm.name - ns is no longer a separate concept; the ADM name is the text form of namespace
- Others are named from keys of
MOD_META_KYWDS
src/camp/tools/camp.py
Outdated
Comment on lines
125
to
128
| for mdat in ('name', 'namespace', 'enum'): | ||
| if admset.get_child(adm, ace.models.Mdat, mdat) is None: | ||
| if admset.get_child(adm, ace.models.Ident, mdat) is None: | ||
| LOGGER.error('The ADM is missing an "%s" metadata item', mdat) | ||
| return 2 |
There was a problem hiding this comment.
This check doesn't need to be performed by CAMP directly. ACE should check minimum content conditions.
pull updates from ep2-dev
also had to change one ADM enum)
This was
linked to
issues
Aug 28, 2024
karenhaining
commented
Aug 29, 2024
There was a problem hiding this comment.
Although this test passes right now, it currently doesn't validate the camp-generated output, as the camp-generated files from YANG ADMs aren't listed in the relevant CMakeLists.txt of dtnma-tools, so they don't get compiled in ./build.sh check.
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.
Closes #4, #5, #6