Fix jinja2 library break #215
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
abhijeetkaurav1st
added a commit
that referenced
this pull request
Mar 21, 2022
* Topic/m multivm snapshot changes calm 18417 (#57) Summary of changes - https://docs.google.com/document/d/1Ams2OqjtOf74LYf5IwTAnAsyCpcrft6ydPGi0DrZztE/edit?pli=1#heading=h.8n3rtdfbxnjx Conflicts: calm/dsl/api/handle.py calm/dsl/builtins/__init__.py calm/dsl/cli/__init__.py calm/dsl/db/table_config.py * Task/m calm 27024 runbook containing durga macros (#58) (#59) * Add runbbok containing all macros and test for it * minor fix * make black * Adding todo task * Substrate changes for sending account_uuid for ahv_substrates (#56) (#61) * Substrate changes, so that correct account_uuid is supplied while creating/compiling blueprint with ahv provider * Fixing logic to not use nic.compile() at substrate compile as it involves parent reference * Fixing tcs as per latest changes * Minor fix when cluster name is not same as cluster account name. * Fixing snapshot restore compile test * protection policy fixes (#60) (#62) - #CALM-27047, #CALM-27044 and #CALM-27046 * safety checks for protection rule expiry (#64) (#65) * safety checks for protection rule expiry * safety checks for protection rule expiry while updating cache * fix expiry type in cache (#66) (#67) * Fix template_id issue when there is no template for vmware create spec (#72) (#73) * Fix template_id issue when there is no template for vmware create spec * Reformatting * ignoring VPC subnets (#70) (#74) * Fixing groups helper for caps name and update project using cli switch * Using common helper for waiting for non-busy state (#71) * Using common helper for waiting for non-busy state * Minor fix * Skipping runbook test due to CALM-27162 * Task/m calm 20742 vm recovery point changes (#76) * recovery point changes for bps * Adding api changes * Adding get commands * Adding final validations and substrate fixes for vm_recovery_spec * Adding tests for recovery point bp launches * Minor fix * Minor fix in substrate * Fix serial_port_list for ahv_vm.py * Adding minor log * Added catch to check exception * Minor fix * Test fix * Test fix * Fixing network name in test blueprint * #CALM-28014 Fixing environment ref to pick correct environment * Add interface and implementations for aws provider specific api object for different calm versions. (#78) (#88) * 1. Add interface for aws provider specific api 2. Add/restructure implementation of aws api object for different calm versions * Reformatting files * Reformat import statements * Reformatting files(black) * Fix version number for aws provider spec object * snapshot-restore release notes for 3.3.0 (#75) (#91) * snapshot-restore release notes * add link to bp example * App edit DSL support (#43) (#92) * initial commit for app edit -> parts taken from ideadevice/calm-dsl#19 * lint fix * lint fix * lint fix * fixes * import fix * remove extra file * fix app edit dsl * add example * test * bring in some structure * del * remove extra * fixed example * revert extra changes * fixes * lint * minor change * cleanup 1 * cleanup 2 * cleanup 3 * lint * make patch run work * lint * list patches in app describe * review comments and fixes * fix * add patch handler * change to update config * some more fixes * some more fixes * make update like sys action * fixed nic example * fix disk add * added helper class * initial class structure * make nic del work * add for category and fixed some bugs * add min level * add min version in profile also * Add skip/modify/delete prompt * extract prompt function * Interactively modify patch payload for app edit * extract prompt functions * set min/max based on operation * exclude nics and disks in use while deleting * comment out (unnecessary?) parts * format changes * remove unnecessary comments * remove patch_editables parameter * change name for UpdateConfigAttrs to AhvUpdateConfigAttrs * fix * fix * fix * change compile to get_user_attrs * change validator * ipdb * fix * disk and nic * changes * fix * fix * parse patch editables from file input non-interactively * handle file editables for multiple attrs * fix delete operations * add disk and category addition logic * fix nic delete operation * Add logs for editables parsed through file * Fix mistakes in comments and logs * Add updating status to app describe command * Use global update command instead of overriding * Add ignore_runtime_variables flag * Add test for ahv patch editables * Change nic source from config file * Use nic name instead of cluster and nic name * move wait for states func to helper class * Add section headings while interactively editing variables * remove nic delete from bp in test * Add more information about editables during interaction * fix tests * Formatting changes * fix snapshot restore test * Run formatter * move logic to compile * add default values * fix * fix empty patch attrs * fix * fix * remove unwanted file * adding test cases for app edit feat * adding disk operations to the patach * adding validations to the test cases * Minor fix in tests * adding disk delete and disk modify operations to the patch * changeng nic value * add release notes * add release notes * removing breakpoints * add release notes Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> * Minor fixes regarding release-notes and some command name fixes * Black format * Fixing some brownfield and env fixes * Fixing links in release-notes * Fixing readme/examples for disk-delete in app-edit * Fixing the min_version on cache tables (#199) * Add uuid in env-creation payload (#201) * Add uuid in env-creation payload * black format * Fix for issue 187 (#202) * Fixing project update and adding account addition through cli switches * Adding test for accoun updation through cli switches * Fixing project update using dsl file and adding test for it * Added changes in readme * Use ASCENDING order for list_all query (#205) fixes #200 * Added support for get_runbook_action and macro in ahv-disk-images (#206) * Allow macro in image names * Adding example that shows macor usage in vm-disk-image and vm-nic * Adding helper get_runbook_action for getting action out of imported runbook * Adding exsiting machine example and minor improvements * minor fixes in models * Fixing runbook examples * Minor fixes for undefined attributes at profile model for version setup < 3.3.0. * Test for class * Sorry! Reverting demo change. * Allowing `-ws` flags for bp launch (#209) * Allowing `-ws` flags for bp launch * Minor fix for env list call for fetching policies * Fixing black version for github action (#210) * Sample fix * Sample fix * More minor fixes * fix ipython version to 7.16.3 due to ipython vulnerability GHSA-pq7m-3gw7-gq5x * Fix AHV subnet queries for >30 entities #CALM-29779 (#211) * Fix AHV subnet queries for >30 entities #CALM-29779 Resolves #207 * Fixed lint * Fixed subnet queries in another couple of places * use jinja2 3.0.3 library (#215) * Oncall/m oncall 12576 calm cache issue (#214) * added no cache flag * env create restricted with no cache update * black format the files * minor fix for subnet query * fixing test * update the readme for experimental behaviour. Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> Co-authored-by: Mayank Choudhary <44155446+mayank271@users.noreply.github.com> Co-authored-by: Pradeepsingh Bhati <88029526+bhati-pradeep@users.noreply.github.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> Co-authored-by: Mayank Choudhary <mayank.choudhary@nutanix.com> Co-authored-by: gaurav <gaurav.kumar1@nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: Mark <mlavi@drfirst.com> Co-authored-by: Kiran Shenoy <kiran.shenoy@nutanix.com> Co-authored-by: Utkarsh Bairolia <77147113+utkarshb07@users.noreply.github.com> (cherry picked from commit 69680c17170d2ae9b89c483d1be3634101b60f9c)
abhijeetkaurav1st
added a commit
that referenced
this pull request
Mar 21, 2022
* Topic/m multivm snapshot changes calm 18417 (#57) Summary of changes - https://docs.google.com/document/d/1Ams2OqjtOf74LYf5IwTAnAsyCpcrft6ydPGi0DrZztE/edit?pli=1#heading=h.8n3rtdfbxnjx Conflicts: calm/dsl/api/handle.py calm/dsl/builtins/__init__.py calm/dsl/cli/__init__.py calm/dsl/db/table_config.py * Task/m calm 27024 runbook containing durga macros (#58) (#59) * Add runbbok containing all macros and test for it * minor fix * make black * Adding todo task * Substrate changes for sending account_uuid for ahv_substrates (#56) (#61) * Substrate changes, so that correct account_uuid is supplied while creating/compiling blueprint with ahv provider * Fixing logic to not use nic.compile() at substrate compile as it involves parent reference * Fixing tcs as per latest changes * Minor fix when cluster name is not same as cluster account name. * Fixing snapshot restore compile test * protection policy fixes (#60) (#62) - #CALM-27047, #CALM-27044 and #CALM-27046 * safety checks for protection rule expiry (#64) (#65) * safety checks for protection rule expiry * safety checks for protection rule expiry while updating cache * fix expiry type in cache (#66) (#67) * Fix template_id issue when there is no template for vmware create spec (#72) (#73) * Fix template_id issue when there is no template for vmware create spec * Reformatting * ignoring VPC subnets (#70) (#74) * Fixing groups helper for caps name and update project using cli switch * Using common helper for waiting for non-busy state (#71) * Using common helper for waiting for non-busy state * Minor fix * Skipping runbook test due to CALM-27162 * Task/m calm 20742 vm recovery point changes (#76) * recovery point changes for bps * Adding api changes * Adding get commands * Adding final validations and substrate fixes for vm_recovery_spec * Adding tests for recovery point bp launches * Minor fix * Minor fix in substrate * Fix serial_port_list for ahv_vm.py * Adding minor log * Added catch to check exception * Minor fix * Test fix * Test fix * Fixing network name in test blueprint * #CALM-28014 Fixing environment ref to pick correct environment * Add interface and implementations for aws provider specific api object for different calm versions. (#78) (#88) * 1. Add interface for aws provider specific api 2. Add/restructure implementation of aws api object for different calm versions * Reformatting files * Reformat import statements * Reformatting files(black) * Fix version number for aws provider spec object * snapshot-restore release notes for 3.3.0 (#75) (#91) * snapshot-restore release notes * add link to bp example * App edit DSL support (#43) (#92) * initial commit for app edit -> parts taken from ideadevice/calm-dsl#19 * lint fix * lint fix * lint fix * fixes * import fix * remove extra file * fix app edit dsl * add example * test * bring in some structure * del * remove extra * fixed example * revert extra changes * fixes * lint * minor change * cleanup 1 * cleanup 2 * cleanup 3 * lint * make patch run work * lint * list patches in app describe * review comments and fixes * fix * add patch handler * change to update config * some more fixes * some more fixes * make update like sys action * fixed nic example * fix disk add * added helper class * initial class structure * make nic del work * add for category and fixed some bugs * add min level * add min version in profile also * Add skip/modify/delete prompt * extract prompt function * Interactively modify patch payload for app edit * extract prompt functions * set min/max based on operation * exclude nics and disks in use while deleting * comment out (unnecessary?) parts * format changes * remove unnecessary comments * remove patch_editables parameter * change name for UpdateConfigAttrs to AhvUpdateConfigAttrs * fix * fix * fix * change compile to get_user_attrs * change validator * ipdb * fix * disk and nic * changes * fix * fix * parse patch editables from file input non-interactively * handle file editables for multiple attrs * fix delete operations * add disk and category addition logic * fix nic delete operation * Add logs for editables parsed through file * Fix mistakes in comments and logs * Add updating status to app describe command * Use global update command instead of overriding * Add ignore_runtime_variables flag * Add test for ahv patch editables * Change nic source from config file * Use nic name instead of cluster and nic name * move wait for states func to helper class * Add section headings while interactively editing variables * remove nic delete from bp in test * Add more information about editables during interaction * fix tests * Formatting changes * fix snapshot restore test * Run formatter * move logic to compile * add default values * fix * fix empty patch attrs * fix * fix * remove unwanted file * adding test cases for app edit feat * adding disk operations to the patach * adding validations to the test cases * Minor fix in tests * adding disk delete and disk modify operations to the patch * changeng nic value * add release notes * add release notes * removing breakpoints * add release notes Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> * Minor fixes regarding release-notes and some command name fixes * Black format * Fixing some brownfield and env fixes * Fixing links in release-notes * Fixing readme/examples for disk-delete in app-edit * Fixing the min_version on cache tables (#199) * Add uuid in env-creation payload (#201) * Add uuid in env-creation payload * black format * Fix for issue 187 (#202) * Fixing project update and adding account addition through cli switches * Adding test for accoun updation through cli switches * Fixing project update using dsl file and adding test for it * Added changes in readme * Use ASCENDING order for list_all query (#205) fixes #200 * Added support for get_runbook_action and macro in ahv-disk-images (#206) * Allow macro in image names * Adding example that shows macor usage in vm-disk-image and vm-nic * Adding helper get_runbook_action for getting action out of imported runbook * Adding exsiting machine example and minor improvements * minor fixes in models * Fixing runbook examples * Minor fixes for undefined attributes at profile model for version setup < 3.3.0. * Test for class * Sorry! Reverting demo change. * Allowing `-ws` flags for bp launch (#209) * Allowing `-ws` flags for bp launch * Minor fix for env list call for fetching policies * Fixing black version for github action (#210) * Sample fix * Sample fix * More minor fixes * fix ipython version to 7.16.3 due to ipython vulnerability GHSA-pq7m-3gw7-gq5x * Fix AHV subnet queries for >30 entities #CALM-29779 (#211) * Fix AHV subnet queries for >30 entities #CALM-29779 Resolves #207 * Fixed lint * Fixed subnet queries in another couple of places * use jinja2 3.0.3 library (#215) * Oncall/m oncall 12576 calm cache issue (#214) * added no cache flag * env create restricted with no cache update * black format the files * minor fix for subnet query * fixing test * update the readme for experimental behaviour. Co-authored-by: abhijeetkaurav1st <abhijeet.kaurav@nutanix.com> * Minor fix for merge conflict in bp_commands Co-authored-by: Mayank Choudhary <44155446+mayank271@users.noreply.github.com> Co-authored-by: Pradeepsingh Bhati <88029526+bhati-pradeep@users.noreply.github.com> Co-authored-by: anilkumarkondeti <83686684+anilkumarkondeti@users.noreply.github.com> Co-authored-by: Mayank Choudhary <mayank.choudhary@nutanix.com> Co-authored-by: gaurav <gaurav.kumar1@nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@shreevari-sp.ubvm.nutanix.com> Co-authored-by: Shreevari SP <shreevari.sp@nutanix.com> Co-authored-by: anilkumarkondeti <anilkumar.kondeti@nutanix.com> Co-authored-by: Mark <mlavi@drfirst.com> Co-authored-by: Kiran Shenoy <kiran.shenoy@nutanix.com> Co-authored-by: Utkarsh Bairolia <77147113+utkarshb07@users.noreply.github.com> (cherry picked from commit 7b1762c0fc103904c2e434b7585d090281418eca)
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.
more context: pallets/jinja#1585