From 2dc74e1c0e56bea115b3b0a7a86dcbab2f93be6e Mon Sep 17 00:00:00 2001 From: Luis Carlos Matos Date: Fri, 8 Mar 2024 15:13:09 +0000 Subject: [PATCH 1/4] Update backend.py fix pool spec mapping --- nipap/nipap/backend.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nipap/nipap/backend.py b/nipap/nipap/backend.py index a3d64e523..dff0223e6 100644 --- a/nipap/nipap/backend.py +++ b/nipap/nipap/backend.py @@ -264,7 +264,7 @@ 'ro': False, }, 'member_prefixes_v6': { - 'column': 'po.member_prefixes_v', + 'column': 'po.member_prefixes_v6', 'ro': False, }, 'name': { From 8e59f3fe3ec38b9a1cf18597dc43e2f6332dc432 Mon Sep 17 00:00:00 2001 From: Bruno Lagarinhos <101254371+bruno-m-lagarinhos-alb@users.noreply.github.com> Date: Thu, 8 May 2025 13:59:36 +0100 Subject: [PATCH 2/4] SMARTMPTP-34203 Drift detections --- .idea/.gitignore | 10 ++++++++++ .idea/NIPAP.iml | 9 +++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ Dockerfile.nipapd | 6 +++++- Dockerfile.www | 4 ++++ nipap/entrypoint.sh | 2 +- nipap/sql/triggers.plsql | 7 ++++--- 9 files changed, 53 insertions(+), 5 deletions(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/NIPAP.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..7bc07ec21 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,10 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Environment-dependent path to Maven home directory +/mavenHomeManager.xml +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/NIPAP.iml b/.idea/NIPAP.iml new file mode 100644 index 000000000..d6ebd4805 --- /dev/null +++ b/.idea/NIPAP.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..f1b270321 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Dockerfile.nipapd b/Dockerfile.nipapd index a47f3318e..1a392a3b3 100644 --- a/Dockerfile.nipapd +++ b/Dockerfile.nipapd @@ -71,4 +71,8 @@ RUN pip3 --no-input install --break-system-packages --no-cache-dir envtpl==0.7.2 EXPOSE 1337 ENV LISTEN_ADDRESS=0.0.0.0 LISTEN_PORT=1337 SYSLOG=false DB_PORT=5432 DB_SSLMODE=disable DB_NAME=nipap -ENTRYPOINT ["/nipap/entrypoint.sh"] +RUN mkdir -p /etc/nipap/ + +VOLUME /etc/nipap/ + +ENTRYPOINT ["/nipap/entrypoint.sh"] \ No newline at end of file diff --git a/Dockerfile.www b/Dockerfile.www index aca28e7d6..8cf63f71e 100644 --- a/Dockerfile.www +++ b/Dockerfile.www @@ -72,4 +72,8 @@ RUN cd /pynipap && pip3 --no-input install --break-system-packages --no-cache-di EXPOSE 80 VOLUME [ "/var/log/apache2" ] +VOLUME /run/apache2 +VOLUME /etc/apache2 +VOLUME /etc/nipap + ENTRYPOINT [ "/nipap-www/entrypoint.sh" ] diff --git a/nipap/entrypoint.sh b/nipap/entrypoint.sh index 0b093558a..c3066abac 100755 --- a/nipap/entrypoint.sh +++ b/nipap/entrypoint.sh @@ -2,7 +2,7 @@ mkdir -p /etc/nipap/ envtpl --allow-missing --keep-template /usr/local/share/nipap/nipap.conf.dist -o /etc/nipap/nipap.conf -/bin/bash /nipap/wait-for-it.sh -t 60 $DB_HOST:$DB_PORT -- sleep 5 +#/bin/bash /nipap/wait-for-it.sh -t 60 $DB_HOST:$DB_PORT -- sleep 5 /usr/local/bin/nipap-passwd create-database if [ -n "$NIPAP_USERNAME" -a -n "$NIPAP_PASSWORD" ]; then diff --git a/nipap/sql/triggers.plsql b/nipap/sql/triggers.plsql index 0e7bf34d8..9c6eb34d9 100644 --- a/nipap/sql/triggers.plsql +++ b/nipap/sql/triggers.plsql @@ -311,7 +311,7 @@ BEGIN -- free addresses NEW.free_addresses := NEW.total_addresses - NEW.used_addresses; - +/* -- ---- Inherited Tags -------------------------------------------------------- -- Update inherited tags @@ -322,7 +322,7 @@ BEGIN IF TG_OP = 'INSERT' OR TG_OP = 'UPDATE' THEN NEW.inherited_tags := array_undup(array_cat(new_parent.inherited_tags, new_parent.tags)); END IF; - +*/ -- all is well, return RETURN NEW; @@ -762,6 +762,7 @@ BEGIN END IF; END IF; +/* -- ---- Inherited Tags -------------------------------------------------------- -- Update inherited tags @@ -788,7 +789,7 @@ BEGIN PERFORM calc_tags(OLD.vrf_id, OLD.prefix); PERFORM calc_tags(NEW.vrf_id, NEW.prefix); END IF; - +*/ -- all is well, return RETURN NEW; From 8ea6a6dc7153beeeaa037eee7928e8077d4ce410 Mon Sep 17 00:00:00 2001 From: Bruno Lagarinhos <101254371+bruno-m-lagarinhos-alb@users.noreply.github.com> Date: Thu, 8 May 2025 14:24:48 +0100 Subject: [PATCH 3/4] SMARTMPTP-34203 Drift detections --- .gitignore | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index 7d48fab57..a7225d151 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,14 @@ docs/sphinx/_build/ nipap-www/nipap_www.egg-info nipap/nipap.egg-info + +/.idea/ +*.idea/ +/**/target +*/target/* +*/target/** +*.iml +**dependency-reduced-pom.xml +*.project +*.classpath +*.settings \ No newline at end of file From d1facea918daa2ab5f04753e4471089ed5e6f0ff Mon Sep 17 00:00:00 2001 From: Filipe Delgado Date: Thu, 8 May 2025 15:43:32 +0100 Subject: [PATCH 4/4] Delete .idea directory --- .idea/.gitignore | 10 ---------- .idea/NIPAP.iml | 9 --------- .idea/misc.xml | 6 ------ .idea/modules.xml | 8 -------- .idea/vcs.xml | 6 ------ 5 files changed, 39 deletions(-) delete mode 100644 .idea/.gitignore delete mode 100644 .idea/NIPAP.iml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 7bc07ec21..000000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,10 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Environment-dependent path to Maven home directory -/mavenHomeManager.xml -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/NIPAP.iml b/.idea/NIPAP.iml deleted file mode 100644 index d6ebd4805..000000000 --- a/.idea/NIPAP.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 639900d13..000000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index f1b270321..000000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 35eb1ddfb..000000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file