Skip to content
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

Jump to bottom

Merge 3.0 branch into develop #222

Merged
merged 149 commits into from
Jul 27, 2021
Merged

Merge 3.0 branch into develop #222

merged 149 commits into from
Jul 27, 2021

Conversation

dgarros
Copy link
Contributor

@dgarros dgarros commented Jul 19, 2021

No description provided.

jvanderaa and others added 30 commits April 28, 2021 21:11
@jvanderaa
Adds pynautobot
199ec21
@jvanderaa
Initial addition of Nautobot adapters
aeab8c7
@jvanderaa
tests for vlans
f308176
@jvanderaa
Updates for interface tests
41ed7f9
@jvanderaa
Updates ip address tests
1dbaf0d
@jvanderaa
Prefix tests updated; style update
6b91a9d
@jvanderaa
Removes unused imports
5ea7dab
@jvanderaa
Updates import order
aa22592
@jvanderaa
Updates import order
f2a6236
@jvanderaa
Merge pull request #204 from networktocode/nautobot_tests
69271f7 
Nautobot tests
@dgarros
Move inventory into adapter and upgrade Nornir to 3.x
9cdcde8
@dgarros
Refactor inventory settings to move everything to the adapter
761ebac
@dgarros
Add Nautobot Inventory and update adapter
85cbc36
@dgarros
format with black
6ff88bc
@dgarros
Cont refactoring of inventory and nornir 3.x
30c8110
@dgarros
Remvoe sot_params to settings
27487e8
@dgarros
Rename inventory params to inventory settings
92d99e2
@dgarros
Fix var name
05a992e
@dgarros
ensure settings is defined
d7130c1
@dgarros
simplify if else statement
caca44d
@dgarros
Update name of NetBox inventory class to match adapter name
5d00be7
@dgarros
Update NetBoxAPIInventory in unit tests
e657132
@dgarros @jvanderaa
Update network_importer/adapters/nautobot_api/inventory.py
91c9d64 
Co-authored-by: Josh VanDeraa <jv@networktocode.com>
@dgarros
Merge pull request #205 from networktocode/gda-nautobot-inventory
d5a1e5f 
Migrate to Nornir 3.x and refactor inventory to support multiple SOT
@jvanderaa
Adds nautobot inventory tests
bda9b27
@jvanderaa
Style updates
7c3ce37
@jvanderaa
Updates file names
1189f1e
@dgarros
Refactor inventory to pass netmiko_extras and napalm_extras
99f6d2f
@dgarros
Merge pull request #207 from networktocode/nautobot_inv_tests
0266286 
Adds nautobot inventory tests
@dgarros
Remove licences from some more unit tests files
b56a0ac
dgarros and others added 22 commits June 14, 2021 10:02
@dgarros
Merge pull request #218 from networktocode/dga-inventory-reacheable
65d7439 
Add check-connectivity option in inventory and pull configs before printing status
@jvanderaa
Adds unit tests for CircleCI, removes Travis
2993568
@jvanderaa
Update CircleCI workflows
26dec07
@jvanderaa
Slim down tests to only unit
8d14233
@jvanderaa
Sets proper flag
6be3c17
@jvanderaa
Moves to machine type
b415c1d
@jvanderaa
Adds switch to py3.7.0
fd1ff0f
@jvanderaa
Moves to using pyenv
31cb0bc
@jvanderaa
Move to Ubuntu 20, Py3.8.3
c6ae714
@jvanderaa
Move to default 3.9.4 py image
77397e5
@jvanderaa
Integration: Add Nautobot
ee7f78b
@jvanderaa
Integration Nautobot: add checkout
0a89d59
@jvanderaa
Updates to traditional nautobot test
a479673
@jvanderaa
Updates to full workflow
007f770
@jvanderaa
Adds pyenv switch to netbox tests
e6289f4
@jvanderaa
Adds dependencies
37c7ddc
@jvanderaa
Updates dependency order
871cd69
@dgarros
Add environment for all Batfish settings
074be1b
@dgarros
Change log level for unsupported vlans to debug
8b28a63
@dgarros
Merge pull request #221 from networktocode/dga-reduce-log-vlan
a613788 
Change log level for unsupported vlans to debug
@dgarros
Merge pull request #220 from networktocode/dga-batfish-envvar
24f3c62 
Support environment variables for all batfish related settings
@dgarros
Merge pull request #219 from networktocode/feature_setup_circle_ci
a75157c 
Feature: Test Out CircleCI Setup
@dgarros dgarros requested a review from jvanderaa July 19, 2021 21:33
jvanderaa
jvanderaa approved these changes Jul 27, 2021
View reviewed changes
Copy link
Contributor

@jvanderaa jvanderaa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@dgarros dgarros merged commit 115a8b1 into develop Jul 27, 2021
@dgarros dgarros deleted the develop-3.0 branch September 2, 2021 14:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jvanderaa jvanderaa jvanderaa approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dgarros @jvanderaa @nniehoff