modernize

.dockerignore

@@ -4,7 +4,12 @@
 .idea
 .vscode
 venv
+.venv
+__pycache__
+*.pyc
+.tox
+.mypy_cache
+.ruff_cache
 backend/plugins/extensibles/ntc-templates
 static
-docker-compose*.yml
-dockerfiles
+docker-compose*.yml

.github/workflows/testrun.yml

@@ -1,51 +1,49 @@
-# This workflow will install Python dependencies, run tests and lint with a single version of Python
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
-
 name: tests
 
-on: [ push, pull_request ]
+on: [push, pull_request]
 
 jobs:
-  build:
+  lint-and-typecheck:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
 
+      - name: Build CI checks container
+        run: docker compose -f docker-compose.ci.yml --profile checks build ci-checks
+
+      - name: Run lint and type checks
+        run: docker compose -f docker-compose.ci.yml --profile checks run --rm ci-checks
+
+  unit:
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - run: pip install tox
+      - run: tox -e unit
 
+  integration:
+    runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
+
+      - name: Build the stack
+        run: docker compose -f docker-compose.ci.yml build --parallel
 
-      #      - run: docker-compose -f docker-compose.ci.yml pull  # don't cache this
+      - name: Start the stack
+        run: docker compose -f docker-compose.ci.yml up -d
 
-      #      - run: docker-compose -f docker-compose.ci.yml build cisgo redis  # don't cache this
+      - name: Wait for API server to be ready
+        run: docker compose -f docker-compose.ci.yml exec -T netpalm-api-server python -m netpalm.wait_ready
 
-      - run: docker pull python:3.8-slim
-      - run: docker pull apcela/cisshgo:v0.1.0
-      - run: docker pull redis:6.0.7-alpine
+      - name: Integration tests
+        run: docker compose -f docker-compose.ci.yml exec -T netpalm-api-server pytest -m "not fulllab" -vv tests/integration
 
-      - uses: satackey/action-docker-layer-caching@v0.0.11
-        continue-on-error: true
-        with:
-          key: ci-tests-{hash}
-          restore-keys: |
-            ci-tests-
+      - name: Unit tests (in container)
+        run: docker compose -f docker-compose.ci.yml exec -T netpalm-api-server pytest -vv tests/unit
 
-      - name: Build the stack
-        #      run: docker-compose -f ./docker-compose.dev.yml up -d
-        run: docker-compose -f docker-compose.ci.yml build --parallel
-
-      - run: docker-compose -f docker-compose.ci.yml up -d
-
-      - id: test_nolab
-        name: integration tests
-        run: docker-compose -f docker-compose.ci.yml exec -T netpalm-controller pytest -m "not fulllab" -vv tests/integration
-
-      - id: test_cisgo
-        name: unit tests
-        run: docker-compose -f docker-compose.ci.yml exec -T netpalm-controller pytest -vv tests/unit
-#      run: docker-compose -f ./docker-compose.dev.yml run controller echo "asdf"
-#    - name: notify slack
-#      if:  ${{ always() }}
-#      env:
-#        SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
-#      uses: abinoda/slack-action@master
-#      with:
-#        args: '{\"channel\":\"CUCQA382D\",\"blocks\": [ { \"type\": \"section\", \"text\": { \"type\": \"mrkdwn\", \"text\": \"Hey! ${{ github.actor }} just pushed to ${{ github.base_ref }} @ ${{ github.repositoryUrl }}.  The Job status is ${{ job.status }}, the step outcome is ${{ steps.test.outcome }}, and the step conclusion is ${{ steps.test.conclusion }}!\" } } ]}'
+      - name: Teardown
+        if: always()
+        run: docker compose -f docker-compose.ci.yml down -v

.gitignore

@@ -5,3 +5,4 @@
 venv
 backend/plugins/extensibles/ntc-templates/
 backend/plugins/extensibles/ntc-templates
+config/.env

.kiro/specs/netpalm-modernisation/.config.kiro

@@ -0,0 +1 @@
+{"specId": "7e206233-ed16-40fb-8ff6-7ff570006e60", "workflowType": "design-first", "specType": "feature"}