mreg-cli 1.2.1__tar.gz → 1.2.3__tar.gz

{mreg_cli-1.2.1 → mreg_cli-1.2.3}/.github/workflows/test.yml

@@ -14,20 +14,15 @@ jobs:
         python-version:
           - '3.11'
           - '3.12'
+          - '3.13'
     env:
       # Disable colors and formatting in Rich console output
       TERM: dumb
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Install uv
-        uses: astral-sh/setup-uv@v2
-      - name: Set up Python ${{ matrix.python-version }}
-        run: uv python install ${{ matrix.python-version }}
-      - name: Install mreg-cli
-        run: uv sync
       - name: Test and compare api calls
-        run: uv run ci/run_testsuite_and_record.sh
+        run: ci/run_testsuite_and_record_V2.sh ${{ matrix.python-version }}
 
   tox:
     name: tox
@@ -68,6 +63,7 @@ jobs:
         python-version:
           - "3.11"
           - "3.12"
+          - '3.13'
     steps:
       - uses: actions/checkout@v4
       - name: Install uv
@@ -77,4 +73,4 @@ jobs:
       - name: Install dependencies
         run: uv sync
       - name: Run unittest
-        run: uv run pytest
+        run: uv run pytest

{mreg_cli-1.2.1 → mreg_cli-1.2.3}/CHANGELOG.md

@@ -7,6 +7,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 <!-- ## Unreleased -->
 
+## [1.2.3](https://github.com/unioslo/mreg-cli/releases/tag/1.2.3) - 2024-12-16
+
+### Added
+
+- `a_add` & `aaaa_add` `-force` option to force use an IP from a network that cannot be found in MREG.
+
+### Fixed
+
+- Commands that try to find networks by IP raising a 404 error instead of a proper error message when no network can be found with the given IP.
+
+## [1.2.2](https://github.com/unioslo/mreg-cli/releases/tag/1.2.2) - 2024-12-09
+
+### Fixed
+
+- `dhcp assoc` and `host add` commands displaying unique constraint error instead of a proper error message when a MAC is already associated with an IP.
+- Validation errors causing the application to crash instead of displaying a proper error message.
+
 ## [1.2.1](https://github.com/unioslo/mreg-cli/releases/tag/1.2.1) - 2024-12-02
 
 ### Fixed

{mreg_cli-1.2.1 → mreg_cli-1.2.3}/CONTRIBUTING

@@ -9,6 +9,10 @@ If you would like to contribute to this project, please follow these steps:
 5. Push to the branch (`git push origin feature/branch-name`)
 6. Create a Pull Request
 
+## Testing
+
+To run tests locally, just run the script `ci/run_testsuite_and_record_V2.sh` from anywhere. The only prerequisite is a working installation of docker or podman.
+
 ## Publishing
 
 Publishing new versions is automatically handled by GitHub actions for versions tagged with `x.y.z[.prerelease]` (`1.2.3`, `1.2.3.rc1`, etc.). If you are a maintainer, you can create a new release by following these steps:

{mreg_cli-1.2.1 → mreg_cli-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mreg-cli
-Version: 1.2.1
+Version: 1.2.3
 Summary: MREG interactive command line client
 Author: Others (see AUTHORS)
 Author-email: Øyvind Kolbu <oyvind.kolbu@usit.uio.no>, Safet A <amedov@usit.uio.no>, Magnus Hirth <mhmorgan42@gmail.com>, Nico <nicolaydmohebi@gmail.com>, Marius Bakke <marius.bakke@usit.uio.no>, Fredrik Larsen <fredrik.larsen@usit.uio.no>, Paal Braathen <paal.braathen@usit.uio.no>, Nils Hiorth <nils@nls.me>, Dmytro Karpenko <dmytrok@usit.uio.no>

mreg_cli-1.2.3/ci/Dockerfile

@@ -0,0 +1,13 @@
+# This container image is only used temporarily for testing during a CI process.
+FROM ubuntu:latest
+ARG python_version=3.12
+
+RUN apt-get -qq update
+RUN apt-get -y install curl git >/dev/null
+RUN curl -LsSf https://astral.sh/uv/0.5.6/install.sh | sh
+RUN /root/.local/bin/uv self update -q
+RUN /root/.local/bin/uv python install ${python_version}
+COPY . /build
+RUN cd /build; /root/.local/bin/uv sync -q
+
+CMD cd /build/ci; /root/.local/bin/uv run bash -c 'echo "test" | mreg-cli -u test -d example.org --url http://127.0.0.1:8000 --source testsuite --record new_testsuite_log.json --record-without-timestamps -v ERROR >/dev/null'

{mreg_cli-1.2.1 → mreg_cli-1.2.3}/ci/diff.py

@@ -126,7 +126,7 @@ def preprocess_json(s: str) -> str:
 
     # Replace all non-deterministic values with placeholders
     s = timestamp_pattern.sub("<TIME>", s)
-    s = datetime_str_pattern.sub("<TIME>", s)
+    s = datetime_str_pattern.sub("<DATETIME>", s)
     s = serial_pattern.sub("Serial: <NUMBER>", s)
     s = mac_pattern.sub("<macaddress>", s)
     s = ipv4_pattern.sub("<IPv4>", s)
@@ -290,8 +290,8 @@ class CommandDiffer:
                     new_testsuite_results.append(expected.original)
                     self.diff_unresolved += 1
             else:
-                # No diff, keep new line
-                new_testsuite_results.append(result.original)
+                # No diff, keep old line
+                new_testsuite_results.append(expected.original)
 
         # Only write back changes if we are in review mode and there are changes
         if self.review and self.diff_resolved > 0:

mreg_cli-1.2.3/ci/run_testsuite_and_record_V2.sh

@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# exit immediately on error
+set -e
+
+# check if we have docker or podman
+if command -v docker >/dev/null 2>&1 && ! docker 2>&1 | grep -q podman; then
+	echo "Using Docker"
+	GH_PARAMS="--ansi=never"
+elif command -v podman >/dev/null 2>&1; then
+	echo "Using Podman"
+	GH_PARAMS="--no-ansi"
+	PODMAN=1
+	alias docker=podman
+else
+	echo "Found neither docker nor podman."
+	exit 1
+fi
+
+# clean up on exit, even if something fails
+function cleanup {
+	set +e
+	if [[ -n "$GITHUB_ACTIONS" ]]; then
+		docker compose $GH_PARAMS down
+	else
+		docker compose down
+	fi
+	docker ps -a | grep "mreg-" | awk '{print $1}' | xargs -r docker stop
+	docker ps -a | grep "mreg-" | awk '{print $1}' | xargs -r docker rm
+	docker images | grep "mreg-" | awk '{print $1}' | xargs -r docker rmi
+	rm -f new_testsuite_log.json
+	echo "cleanup done."
+}
+trap cleanup EXIT
+
+# chdir to where this script is
+cd `dirname $0`
+
+# get Python version from argument
+PYTHON_VERSION=3.12
+if [ ! -z "$1" ]; then
+	PYTHON_VERSION=$1
+fi
+echo "Python version $PYTHON_VERSION"
+
+# build a container image for mreg-cli
+docker build -f Dockerfile -t mreg-cli --build-arg python_version=$PYTHON_VERSION ..
+
+# start mreg+postgres in containers
+if [[ -n "$GITHUB_ACTIONS" ]]; then
+	if [[ "$PODMAN" == "1" ]]; then
+		docker compose $GH_PARAMS pull >/dev/null 2>&1
+	else
+		docker compose $GH_PARAMS pull --quiet
+	fi
+	docker compose $GH_PARAMS up -d
+else
+	docker compose up -d
+fi
+
+# give mreg some time to create the database schema and start up
+sleep 5s
+
+# create a superuser
+if docker exec -t mreg uv version >/dev/null; then
+	docker exec -t mreg uv run /app/manage.py create_mreg_superuser --username test --password test
+else
+	docker exec -t mreg /app/manage.py create_mreg_superuser --username test --password test
+fi
+
+# test connectivity
+#docker run --rm --tty --network host --entrypoint curl mreg-cli --head http://127.0.0.1:8000/admin/login/
+
+# start the mreg-cli container, which will automatically run the test suite
+echo "Running the tests..."
+docker run --name mreg-cli --network host --tty mreg-cli
+docker commit mreg-cli finished-mreg-tests # because inside is the file new_testsuite_log.json which we want to look at
+
+# show a detailed diff (and review if running locally)
+if [[ -n "$GITHUB_ACTIONS" ]]; then
+	docker run --rm --tty --entrypoint bash finished-mreg-tests -c 'cd /build/ci; /root/.local/bin/uv run diff.py testsuite-result.json new_testsuite_log.json'
+	exit $?
+else
+	docker run -it --name finished-mreg-tests --entrypoint bash finished-mreg-tests -c 'cd /build/ci; /root/.local/bin/uv run diff.py testsuite-result.json new_testsuite_log.json --review'
+	EXITCODE=$?
+	docker cp finished-mreg-tests:/build/ci/testsuite-result.json .
+	exit $EXITCODE
+fi