osism 0.20250219.0__tar.gz → 0.20250314.0__tar.gz

osism-0.20250314.0/AUTHORS

@@ -0,0 +1 @@
+janhorstmann <horstmann@osism.tech>

osism-0.20250314.0/ChangeLog

@@ -0,0 +1,7 @@
+CHANGES
+=======
+
+v0.20250314.0
+-------------
+
+* Replace netbox subcommands with netbox-manager (#1214)

{osism-0.20250219.0 → osism-0.20250314.0}/Containerfile

@@ -20,11 +20,12 @@ apt-get install -y --no-install-recommends \
 
 # install python packages
 mkdir /wheels
-python3 -m pip --no-cache-dir install -U 'pip==25.0'
+python3 -m pip --no-cache-dir install -U 'pip==25.0.1'
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.ansible.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-image-manager.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-flavor-manager.txt
+python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.netbox-manager.txt
 
 # install openstack-project-manager
 git clone --depth 1 https://github.com/osism/openstack-project-manager.git /openstack-project-manager
@@ -54,6 +55,8 @@ ENV CLUSTERSHELL_CFGDIR=/etc/clustershell/
 COPY files/clustershell/clush.conf /etc/clustershell/clush.conf
 COPY files/clustershell/groups.conf /etc/clustershell/groups.conf
 
+COPY files/netbox-manager/settings.toml /usr/local/config/settings.toml
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN <<EOF
@@ -70,11 +73,12 @@ apt-get install -y --no-install-recommends \
   tini
 
 # install python packages
-python3 -m pip --no-cache-dir install -U 'pip==25.0'
+python3 -m pip --no-cache-dir install -U 'pip==25.0.1'
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.ansible.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-image-manager.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-flavor-manager.txt
+python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.netbox-manager.txt
 
 # install python-osism
 python3 -m pip --no-cache-dir install --no-index /src
@@ -82,6 +86,7 @@ python3 -m pip --no-cache-dir install --no-index /src
 # install ansible collections
 mkdir -p /ansible/logs
 ansible-galaxy collection install -v -f -r /ansible/requirements.yml -p /usr/share/ansible/collections
+ansible-galaxy collection install -v -f -r /usr/local/lib/python*/site-packages/netbox_manager/requirements.yml -p /usr/share/ansible/collections
 ln -s /usr/share/ansible/collections /ansible/collections
 
 # copy image definitions for the openstack-image-manager
@@ -128,35 +133,3 @@ pip3 uninstall -y pyclean
 EOF
 
 ENTRYPOINT ["/usr/bin/tini", "--"]
-
-FROM osism AS osism-netbox
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN <<EOF
-set -e
-set -x
-
-apt-get update
-apt-get install -y --no-install-recommends \
-  git \
-  tini
-
-mkdir -p /import
-git clone --depth 1 https://github.com/netbox-community/devicetype-library /devicetype-library
-rm -rf /devicetype-library/.git
-rm -rf /devicetype-library/elevation-images
-
-apt-get clean
-rm -rf \
-  /tmp/* \
-  /var/cache/apt \
-  /var/lib/apt/lists/* \
-  /var/tmp/*
-
-pip3 install --no-cache-dir pyclean==3.0.0
-pyclean /usr
-pip3 uninstall -y pyclean
-EOF
-
-COPY files/import/* /import

{osism-0.20250219.0 → osism-0.20250314.0}/Dockerfile

@@ -20,11 +20,12 @@ apt-get install -y --no-install-recommends \
 
 # install python packages
 mkdir /wheels
-python3 -m pip --no-cache-dir install -U 'pip==25.0'
+python3 -m pip --no-cache-dir install -U 'pip==25.0.1'
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.ansible.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-image-manager.txt
 python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.openstack-flavor-manager.txt
+python3 -m pip wheel --no-cache-dir --wheel-dir=/wheels -r /src/requirements.netbox-manager.txt
 
 # install openstack-project-manager
 git clone --depth 1 https://github.com/osism/openstack-project-manager.git /openstack-project-manager
@@ -54,6 +55,8 @@ ENV CLUSTERSHELL_CFGDIR=/etc/clustershell/
 COPY files/clustershell/clush.conf /etc/clustershell/clush.conf
 COPY files/clustershell/groups.conf /etc/clustershell/groups.conf
 
+COPY files/netbox-manager/settings.toml /usr/local/config/settings.toml
+
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
 RUN <<EOF
@@ -70,11 +73,12 @@ apt-get install -y --no-install-recommends \
   tini
 
 # install python packages
-python3 -m pip --no-cache-dir install -U 'pip==25.0'
+python3 -m pip --no-cache-dir install -U 'pip==25.0.1'
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.ansible.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-image-manager.txt
 python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.openstack-flavor-manager.txt
+python3 -m pip --no-cache-dir install --no-index --find-links=/wheels -r /src/requirements.netbox-manager.txt
 
 # install python-osism
 python3 -m pip --no-cache-dir install --no-index /src
@@ -82,6 +86,7 @@ python3 -m pip --no-cache-dir install --no-index /src
 # install ansible collections
 mkdir -p /ansible/logs
 ansible-galaxy collection install -v -f -r /ansible/requirements.yml -p /usr/share/ansible/collections
+ansible-galaxy collection install -v -f -r /usr/local/lib/python*/site-packages/netbox_manager/requirements.yml -p /usr/share/ansible/collections
 ln -s /usr/share/ansible/collections /ansible/collections
 
 # copy image definitions for the openstack-image-manager
@@ -128,35 +133,3 @@ pip3 uninstall -y pyclean
 EOF
 
 ENTRYPOINT ["/usr/bin/tini", "--"]
-
-FROM osism AS osism-netbox
-
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
-RUN <<EOF
-set -e
-set -x
-
-apt-get update
-apt-get install -y --no-install-recommends \
-  git \
-  tini
-
-mkdir -p /import
-git clone --depth 1 https://github.com/netbox-community/devicetype-library /devicetype-library
-rm -rf /devicetype-library/.git
-rm -rf /devicetype-library/elevation-images
-
-apt-get clean
-rm -rf \
-  /tmp/* \
-  /var/cache/apt \
-  /var/lib/apt/lists/* \
-  /var/tmp/*
-
-pip3 install --no-cache-dir pyclean==3.0.0
-pyclean /usr
-pip3 uninstall -y pyclean
-EOF
-
-COPY files/import/* /import

{osism-0.20250219.0/osism.egg-info → osism-0.20250314.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: osism
-Version: 0.20250219.0
+Version: 0.20250314.0
 Summary: OSISM manager interface
 Home-page: https://github.com/osism/python-osism
 Author: OSISM GmbH
@@ -23,44 +23,44 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: ClusterShell==1.9.3
 Requires-Dist: GitPython==3.1.44
-Requires-Dist: Jinja2==3.1.5
+Requires-Dist: Jinja2==3.1.6
 Requires-Dist: PyYAML==6.0.2
 Requires-Dist: ara==1.7.2
 Requires-Dist: celery[redis]==5.4.0
-Requires-Dist: cliff==4.8.0
-Requires-Dist: deepdiff==8.2.0
+Requires-Dist: cliff==4.9.1
+Requires-Dist: deepdiff==8.3.0
 Requires-Dist: docker==7.1.0
 Requires-Dist: dtrack-auditor==1.5.0
-Requires-Dist: fastapi==0.115.7
+Requires-Dist: fastapi==0.115.11
 Requires-Dist: flower==2.0.1
 Requires-Dist: hiredis==3.1.0
 Requires-Dist: jc==1.25.4
-Requires-Dist: keystoneauth1==5.9.1
-Requires-Dist: kombu==5.4.2
-Requires-Dist: kubernetes==32.0.0
+Requires-Dist: keystoneauth1==5.10.0
+Requires-Dist: kombu==5.5.0
+Requires-Dist: kubernetes==32.0.1
 Requires-Dist: loguru==0.7.3
 Requires-Dist: netmiko==4.5.0
 Requires-Dist: nornir-ansible==2023.12.28
 Requires-Dist: nornir==3.5.0
-Requires-Dist: openstacksdk==4.2.0
+Requires-Dist: openstacksdk==4.4.0
 Requires-Dist: pottery==3.0.0
 Requires-Dist: prompt-toolkit==3.0.50
 Requires-Dist: pydantic==1.10.21
 Requires-Dist: pynetbox==7.4.1
 Requires-Dist: pytest-testinfra==10.1.1
 Requires-Dist: python-dateutil==2.9.0.post0
-Requires-Dist: setuptools==75.8.0
-Requires-Dist: sqlmodel==0.0.22
-Requires-Dist: sushy==5.4.0
+Requires-Dist: setuptools==76.0.0
+Requires-Dist: sqlmodel==0.0.24
+Requires-Dist: sushy==5.5.0
 Requires-Dist: tabulate==0.9.0
 Requires-Dist: transitions==0.9.2
 Requires-Dist: uvicorn[standard]==0.34.0
 Requires-Dist: watchdog==6.0.0
 Provides-Extra: ansible
 Requires-Dist: ansible-runner==2.4.0; extra == "ansible"
-Requires-Dist: ansible-core==2.18.2; extra == "ansible"
+Requires-Dist: ansible-core==2.18.3; extra == "ansible"
 Provides-Extra: openstack-image-manager
-Requires-Dist: openstack-image-manager==0.20241216.0; extra == "openstack-image-manager"
+Requires-Dist: openstack-image-manager==0.20250314.0; extra == "openstack-image-manager"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{osism-0.20250219.0 → osism-0.20250314.0}/Pipfile

@@ -6,35 +6,35 @@ name = "pypi"
 [packages]
 ClusterShell = "==1.9.3"
 GitPython = "==3.1.44"
-Jinja2 = "==3.1.5"
+Jinja2 = "==3.1.6"
 PyYAML = "==6.0.2"
 ansible-runner = "==2.4.0"
 ara = "==1.7.2"
 celery = {version = "==5.4.0", extras = ["redis"]}
-cliff = "==4.8.0"
-deepdiff = "==8.2.0"
+cliff = "==4.9.1"
+deepdiff = "==8.3.0"
 docker = "==7.1.0"
 dtrack-auditor = "==1.5.0"
 flower = "==2.0.1"
 hiredis = "==3.1.0"
 huey = "==2.5.2"
 jc = "==1.25.4"
-keystoneauth1 = "==5.9.1"
-kombu = "==5.4.2"
-kubernetes = "==32.0.0"
+keystoneauth1 = "==5.10.0"
+kombu = "==5.5.0"
+kubernetes = "==32.0.1"
 loguru = "==0.7.3"
 netmiko = "==4.5.0"
 nornir = "==3.5.0"
 nornir-ansible = "==2023.12.28"
-openstacksdk = "==4.2.0"
+openstacksdk = "==4.4.0"
 pottery = "==3.0.0"
 prompt-toolkit = "==3.0.50"
 pydantic = "==1.10.21"
 pynetbox = "==7.4.1"
 pytest-testinfra = "==10.1.1"
 python-dateutil = "==2.9.0.post0"
-setuptools = "==75.8.0"
-sqlmodel = "==0.0.22"
-sushy = "==5.4.0"
+setuptools = "==76.0.0"
+sqlmodel = "==0.0.24"
+sushy = "==5.5.0"
 transitions = "==0.9.2"
 watchdog = "==6.0.0"