Release/v1.2.0

.clang-format

@@ -0,0 +1,8 @@
+# PEP 7
+BasedOnStyle: Google
+AlwaysBreakAfterReturnType: All
+ColumnLimit: 0
+IndentWidth: 4
+Language: Cpp
+PointerAlignment: Right
+SpaceAfterCStyleCast: false

.devcontainer/devcontainer.json

@@ -0,0 +1,38 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/python
+{
+	"name": "Python KEA Development",
+	// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"build": {
+		"dockerfile": "../containers/kea-python-dev/Dockerfile",
+		"context": "..",
+        "args": {
+            "BASE_OS_VERSION": "ubuntu-20.04",
+			"ARG PYTHON_VERSION": "3.8",
+			"ARG KEA_VERSION": "2.6.0"
+        }
+    },
+
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"ms-vscode.cpptools-extension-pack"
+			]
+		}
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "pip3 install --user -r requirements.txt",
+
+	// Configure tool-specific properties.
+	// "customizations": {},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	"remoteUser": "root"
+}

.pre-commit-config.yaml

@@ -0,0 +1,18 @@
+repos:
+
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.1.0
+    hooks:
+    -   id: check-added-large-files
+    -   id: check-merge-conflict
+    -   id: check-symlinks
+    -   id: check-yaml
+    -   id: detect-private-key
+    -   id: end-of-file-fixer
+    -   id: trailing-whitespace
+
+-   repo: https://github.com/pre-commit/mirrors-clang-format
+    rev: 'v18.1.8'  # Use the sha / tag you want to point at
+    hooks:
+    -   id: clang-format
+        types_or: [c++, c]

Makefile.am

@@ -7,28 +7,28 @@ AUTOMAKE_OPTIONS = foreign
 
 SUBDIRS = keahook keamodule
 
-KEA_VESION ?= 2.4.1
+KEA_VERSION ?= 2.6.0
 CONTAINER_RUNTIME ?= $(if $(shell command -v podman ;),podman,docker)
 
 .PHONY: build-kea-dev
 build-kea-dev:
-	$(CONTAINER_RUNTIME) build --build-arg KEA_VESION=$(KEA_VESION) -f DockerfileDev --tag kea-dev:$(KEA_VESION) .
+	$(CONTAINER_RUNTIME) build -f containers/kea-python-dev/Dockerfile --build-arg KEA_VERSION=$(KEA_VERSION) --tag kea-dev:$(KEA_VERSION) .
 
 .PHONY: build-kea
 build-kea:
-	$(CONTAINER_RUNTIME) build --build-arg KEA_VESION=$(KEA_VESION) --tag kea:$(KEA_VESION) .
+	$(CONTAINER_RUNTIME) build -f containers/kea-python/Dockerfile --build-arg KEA_VERSION=$(KEA_VERSION) --tag kea:$(KEA_VERSION) .
 
 .PHONY: build-dhtest
 build-dhtest:
-	cd dhtest && $(CONTAINER_RUNTIME) build --tag dhtest .
+	$(CONTAINER_RUNTIME) build -f containers/dhtest/Dockerfile --tag dhtest .
 
 .PHONY: run-kea-dev
 run-kea-dev: kea-network
-	$(CONTAINER_RUNTIME) run --rm -it --network kea -e LANG=C.UTF-8 --privileged -v`pwd`:/workdir --name kea-dev kea-dev:$(KEA_VESION) bash
+	$(CONTAINER_RUNTIME) run --rm -it --network kea -e LANG=C.UTF-8 --privileged -v`pwd`:/workdir --name kea-dev kea-dev:$(KEA_VERSION) bash
 
 .PHONY: run-kea
 run-kea: kea-network
-	$(CONTAINER_RUNTIME) run --rm -it --network kea -e LANG=C.UTF-8 --privileged -v`pwd`:/workdir --name kea kea:$(KEA_VESION) bash
+	$(CONTAINER_RUNTIME) run --rm -it --network kea -e LANG=C.UTF-8 --privileged -v`pwd`:/workdir --name kea kea:$(KEA_VERSION) bash
 
 .PHONY: run-mysql
 run-mysql: kea-network dhcpdb_create.mysql.sql
@@ -48,5 +48,8 @@ kea-network:
 
 .PHONY: dhcpdb_create.mysql.sql
 dhcpdb_create.mysql.sql:
-	tar xz --strip-components 6 -f kea-$(KEA_VESION).tar.gz kea-$(KEA_VESION)/src/share/database/scripts/mysql/dhcpdb_create.mysql
-	mv dhcpdb_create.mysql dhcpdb_create.mysql.sql
+	tar xz --strip-components 6 -f kea-$(KEA_VERSION).tar.gz kea-$(KEA_VERSION)/src/share/database/scripts/mysql/dhcpdb_create.mysql
+	mv dhcpdb_create.mysql dhcpdb_create.mysql.sql
+
+install-exec-hook:
+	cd $(srcdir)/keamodule && $(MAKE) install

configure.ac

@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT(kea_python, 1.1)
+AC_INIT([kea-python], [1.2.0], [jgomez@phicus.es], [kea-python])
 
 AM_INIT_AUTOMAKE(foreign)
 

containers/kea-python-dev/Dockerfile

@@ -0,0 +1,49 @@
+# SPDX-License-Identifier: MPL-2.0
+
+ARG BASE_OS_VERSION=ubuntu-20.04
+FROM mcr.microsoft.com/vscode/devcontainers/cpp:${BASE_OS_VERSION}
+
+ARG PYTHON_VERSION=3.8
+ARG KEA_VERSION=2.6.0
+
+LABEL org.opencontainers.image.authors="Juan Gomez <jgomez@phicus.es>"
+
+ENV DEBIAN_FRONTEND=noninteractive \
+    BASE_OS_VERSION=${BASE_OS_VERSION} \
+    PYTHON_VERSION=${PYTHON_VERSION} \
+    KEA_VERSION=${KEA_VERSION}
+
+
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install --no-install-recommends -y \
+        software-properties-common \
+        apt-transport-https \
+        apt-utils \
+        bash \
+        ca-certificates \
+        curl \
+        gnupg \
+    && add-apt-repository -y ppa:deadsnakes/ppa \
+    && curl -1sLf "https://dl.cloudsmith.io/public/isc/kea-$(echo "${KEA_VERSION}" | cut -c1;)-$(echo "${KEA_VERSION}" | cut -c3;)/setup.deb.sh" | bash \
+    && apt-get update \
+    && apt-get install --no-install-recommends -y \
+        autoconf \
+        automake \
+        autoconf-archive \
+        libtool \
+        libffi-dev \
+        libboost-dev \
+        libboost-system-dev \
+        make \
+        g++ \
+        python${PYTHON_VERSION} \
+        python${PYTHON_VERSION}-dev \
+        python3-pip \
+        isc-kea-dev \
+        isc-kea-hooks \
+        isc-kea-dhcp4 \
+    # Clean up to reduce image size
+    && apt-get clean \
+    && rm -rf /etc/apt/sources.list.d/isc-kea-* /var/lib/apt/lists/* /tmp/* /var/tmp/* \
+    && update-alternatives --install /usr/bin/python3 python3 /usr/bin/python${PYTHON_VERSION} 1

containers/kea-python/Dockerfile

@@ -0,0 +1,38 @@
+ARG KEA_VERSION=2.6.0
+
+FROM kea-dev:$KEA_VERSION AS build
+
+WORKDIR /source
+COPY . .
+
+# RUN make clean install \
+#     && mkdir /dist \
+#     && cd /usr/local \
+#     && find lib -name \*.so\* | tar cf - -T - | (cd /dist; tar xf -) \
+#     && tar cf - etc share/man bin sbin var | (cd /dist; tar xf -)
+
+RUN autoreconf -i && \
+    ./configure --prefix=/usr --libdir=${prefix}/lib/x86_64-linux-gnu --libexecdir=${prefix}/lib/x86_64-linux-gnu && \
+    make install
+
+# FROM ubuntu:21.04
+# ENV DEBIAN_FRONTEND noninteractive
+
+# RUN apt-get update -y \
+#     && apt-get -y install \
+#         procps \
+#         socat \
+#         python3 \
+#         libpython3.9 \
+#         liblog4cplus-2.0.5 \
+#         libboost-system1.74.0 \
+#         libffi8ubuntu1 \
+#         libpq5 \
+#         libmariadb3
+
+# COPY --from=build /dist /usr/local
+
+# RUN ldconfig
+
+
+# podman build  -f ./containers/kea-python/Dockerfile --build-arg KEA_VERSION=2.6.0 -t kea-python:2.6.0 -t kea-python . && podman run -it kea-python bash

keamodule/Makefile.am

@@ -1,3 +1,14 @@
 
-install:
-	$(PYTHON) setup.py install
+
+EXTRA_DIST = setup.py
+
+install: setup.py
+	$(PYTHON) setup.py install
+
+all-local: setup.py
+	$(PYTHON) setup.py build
+
+clean-local: setup.py
+	-$(PYTHON) setup.py clean --all
+	-find $(srcdir) \( -name "build" -o -name "dist" -o -name "*.pyc" \
+		-o -name "*.egg-info" \) -exec rm -rf '{}' \+