Skip to content

Inventory: Separate query_filters for devices and vms #140 #153

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
merged 10 commits into from
Apr 14, 2020
Merged

Inventory: Separate query_filters for devices and vms #140 #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b57ce54
Add separate device_query_filters and vm_query_filters options #140
DouglasHeriot Apr 2, 2020
0917d36
Start creating unit tests for inventory plugin #56
DouglasHeriot Apr 2, 2020
9c61f67
Report code coverage of unit tests #56
DouglasHeriot Apr 2, 2020
ac5c783
Remove unused test fixture #56
DouglasHeriot Apr 2, 2020
c2bd504
Raise exceptions if inventory options are not valid #140
DouglasHeriot Apr 2, 2020
d2743bc
Update ALLOWED_DEVICE_QUERY_PARAMETERS and ALLOWED_VM_QUERY_PARAMETER…
DouglasHeriot Apr 2, 2020
fafd265
Apply black python formatting
DouglasHeriot Apr 2, 2020
88d62d0
Inventory: Test validate_query_parameter against actualy parameters i…
DouglasHeriot Apr 14, 2020
738ea19
Inventory: don't check types of query_filters options - ansible handl…
DouglasHeriot Apr 14, 2020
54af4ed
Inventory: black formatting changes (#140)
DouglasHeriot Apr 14, 2020
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
12 changes: 8 additions & 4 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ jobs:
- docker-compose up -d
- cd ..
- pip install -U pip
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0
# coverage 5.0 is not compatible with ansible-test https://github.com/ansible/ansible/issues/65907
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
- pip install pynetbox cryptography codecov jmespath ansible

# Latest release of Netbox and Ansible
Expand All @@ -44,7 +45,7 @@ jobs:
- docker-compose up -d
- cd ..
- pip install -U pip
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
- pip install pynetbox cryptography codecov jmespath ansible

# Latest development versions of Netbox and Ansible, newest Python
Expand All @@ -62,7 +63,7 @@ jobs:
- docker-compose up -d
- cd ..
- pip install -U pip
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0
- pip install pytest==4.6.5 pytest-mock pytest-xdist jinja2 PyYAML black==19.10b0 "coverage<5"
- pip install pynetbox cryptography jmespath
- git clone https://github.com/ansible/ansible.git
- cd ansible
Expand All @@ -82,7 +83,7 @@ before_script:
script:
# Perform unit tests on collection from within the installed directory, not the source directory
# Required for imports of other collections (ie. ansible.netcommon) to work correctly
- (cd /home/travis/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME && ansible-test units --python $PYTHON_VER -v)
- (cd /home/travis/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME && ansible-test units --coverage --python $PYTHON_VER -v)

# Check python syntax
- black . --check --diff
Expand All @@ -98,6 +99,9 @@ script:
- ansible-playbook tests/integration/$VERSION/main.yml -vvvv
- ansible-inventory -i tests/integration/test-inventory.yml --list

# Report code coverage
- (cd /home/travis/.ansible/collections/ansible_collections/$COLLECTION_NAMESPACE/$COLLECTION_NAME && ansible-test coverage report)

deploy:
provider: script
skip_cleanup: true
Expand Down
Loading