Merge pull request #18 from netboxlabs/develop

🚚 release

Author: mfiedorowicz

Makefile

@@ -14,10 +14,10 @@ docker-compose-netbox-plugin-down:
 
 .PHONY: docker-compose-netbox-plugin-test
 docker-compose-netbox-plugin-test:
-	-@$(DOCKER_COMPOSE) -f docker/docker-compose.yaml -f docker/docker-compose.test.yaml run -u root --rm netbox ./manage.py test --keepdb netbox_diode_plugin
+	-@$(DOCKER_COMPOSE) -f docker/docker-compose.yaml run -u root --rm netbox ./manage.py test --keepdb netbox_diode_plugin
 	@$(MAKE) docker-compose-netbox-plugin-down
 
 .PHONY: docker-compose-netbox-plugin-test-cover
 docker-compose-netbox-plugin-test-cover:
-	-@$(DOCKER_COMPOSE) -f docker/docker-compose.yaml -f docker/docker-compose.test.yaml run --rm -u root -e COVERAGE_FILE=/opt/netbox/netbox/coverage/.coverage netbox sh -c "coverage run --source=netbox_diode_plugin ./manage.py test --keepdb netbox_diode_plugin && coverage xml -o /opt/netbox/netbox/coverage/report.xml && coverage report -m | tee /opt/netbox/netbox/coverage/report.txt"
+	-@$(DOCKER_COMPOSE) -f docker/docker-compose.yaml run --rm -u root -e COVERAGE_FILE=/opt/netbox/netbox/coverage/.coverage netbox sh -c "coverage run --source=netbox_diode_plugin ./manage.py test --keepdb netbox_diode_plugin && coverage xml -o /opt/netbox/netbox/coverage/report.xml && coverage report -m | tee /opt/netbox/netbox/coverage/report.txt"
 	@$(MAKE) docker-compose-netbox-plugin-down

README.md

@@ -68,11 +68,11 @@ export DIODE_API_KEY=$(head -c20 </dev/urandom|xxd -p); env | grep DIODE_API_KEY
 
 **Note:** store these API key strings in a safe place as they will be needed later to configure the Diode server
 
-Configure the plugin to use the previously generated API keys:
+Run migrations to create all necessary resources:
 
 ```shell
 cd /opt/netbox/netbox
-./manage.py configurediodeplugin
+./manage.py migrate netbox_diode_plugin
 ```
 
 ## Running Tests

docker/Dockerfile-diode-netbox-plugin

@@ -4,7 +4,5 @@ COPY ./netbox/configuration/ /etc/netbox/config/
 RUN chmod 755 /etc/netbox/config/* && \
     chown unit:root /etc/netbox/config/*
 
-COPY ./netbox/enable-diode-plugin.sh /opt/netbox/enable-diode-plugin.sh
-
 COPY ./requirements-diode-netbox-plugin.txt /opt/netbox/
 RUN /opt/netbox/venv/bin/pip install  --no-warn-script-location -r /opt/netbox/requirements-diode-netbox-plugin.txt

docker/docker-compose.test.yaml

@@ -4,7 +4,7 @@
 # To learn how to build images with your required plugins
 # See https://github.com/netbox-community/netbox-docker/wiki/Using-Netbox-Plugins
 
-# PLUGINS = ["netbox_diode_plugin"]
+PLUGINS = ["netbox_diode_plugin"]
 
 # PLUGINS_CONFIG = {
 #     "netbox_diode_plugin": {

docker/netbox/configuration-test/plugins.py

@@ -62,8 +62,6 @@ reload_netbox() {
 
 load_configuration &
 
-sh /opt/netbox/enable-diode-plugin.sh &
-
 reload_netbox &
 
 exec unitd \