Commit Graph

4 Commits

Author SHA1 Message Date
Marco Ceppi
a95adf68b6 Add plugin support + virtual-circuit plugin 2020-05-28 14:22:41 -04:00
Marco Ceppi
bb7191e953 Merge upstream v2.8.5 into develop
# Conflicts:
#	netbox/dcim/api/serializers.py
#	netbox/dcim/models/__init__.py
#	netbox/extras/constants.py
#	netbox/netbox/admin.py
#	netbox/templates/users/base.html
#	requirements.txt
2020-05-27 15:44:47 -04:00
Marco Ceppi
e05ab4a16c Merge upstream v2.7.8 into develop 2020-02-27 08:40:35 -05:00
Marco Ceppi
cca2c6b680 Vapor API Scaffold (#2)
* Updated README

* Start of Vapor Netbox Module

* Add api/vapor route

* Ignore virtualenv

* Query devices assigned to users

* Add vapor/interfaces route

* adds docker-compose file to manage postgres/redis

- Initial test suite for the vapor api module. (Django tests are kind of
  hard and slow)

* Init pipeline

 - Adds a tox harness to run the test suite
 - Test running in tox
 - Clone example config to config.py
 - Add the kubernetes agent + dependent services to complete tests in
   the podspec
 - some really hacky sed configuration on the fly

* Init Docker build

- Adds the dockerfile assets from vapor-ware/netbox-docker
- Slight changes to keep the root directory clean (nesting dirs in
  docker path)
- Adds a rudimentary job label to build on micro-k8s builder
- adds docker build/publish stages to the pipeline for branch builds.
- dockerignore the project dir as its fetching packages from GHAPI

* Cleanups

* More unittests
2019-09-24 13:53:58 -04:00