Add makefile for o2ims

operators/o2ims-operator/Dockerfile

@@ -23,17 +23,17 @@ RUN addgroup --gid 65535 o2ims && \
 # Set working directory
 WORKDIR /usr/o2ims
 
+# Copy requirements first and install dependencies
+COPY --chown=o2ims:o2ims /operators/o2ims-operator/requirements.txt requirements.txt
+RUN python -m venv /home/o2ims/venv && \
+    /home/o2ims/venv/bin/pip install --no-cache-dir -r requirements.txt
+
 # Copy application files
-COPY --chown=o2ims:o2ims controllers/ src/
-COPY --chown=o2ims:o2ims requirements.txt requirements.txt
+COPY --chown=o2ims:o2ims /operators/o2ims-operator/controllers/ src/
 
 # Switch to non-root user
 USER o2ims
 
-# Create a virtual environment and install dependencies
-RUN python -m venv /home/o2ims/venv && \
-    /home/o2ims/venv/bin/pip install --no-cache-dir -r requirements.txt
-
 # Set environment variables
 ENV PATH="/home/o2ims/venv/bin:${PATH}" \
     VIRTUAL_ENV="/home/o2ims/venv"

operators/o2ims-operator/Makefile

@@ -0,0 +1,10 @@
+IMAGE_TAG ?= latest
+REGISTRY ?= docker.io/nephio
+IMAGE_NAME ?= o2ims-operator
+IMG ?= $(REGISTRY)/$(IMAGE_NAME):$(IMAGE_TAG)
+
+# This includes the following targets:
+#   docker-build, docker-push
+include ../../default-docker.mk
+
+

operators/o2ims-operator/README.md

@@ -6,7 +6,7 @@ This operator implements O-RAN O2 IMS for K8s based cloud management.
 
 ### Development Requirements:
 
-- Python3.11
+- >= Python3.11
 - requirements.txt installed in development environment
 
 ### Nephio Management Cluster Requirements:
@@ -73,13 +73,14 @@ nohup kubectl proxy --port 8080 &>/dev/null &
 Build a Docker image: 
 
 ```bash
-docker build -t o2ims-operator:latest -f Dockerfile .
+cd operators/o2ims-operator/
+make docker-build
 ```
 
 Push this image in your cluster, here we are using a `kind` cluster so we will push using the below command:
 
 ```bash
-kind load docker-image o2ims-operator:latest -n o2ims-mgmt
+kind load docker-image nephio/o2ims-operator:latest -n o2ims-mgmt
 ```
 
 `NOTE`: `o2ims-mgmt` is the name of the kind cluster. It is good to mention cluster name if you have multiple clusters.
@@ -176,34 +177,34 @@ status:
 
 Unit tests are contained in the `tests` directory, and are intended to test pieces of the O2IMS Operator in the `controllers` directory. Currently unit tests are not comprehensive, but provide expected coverage of core utility components.
 
-Prior to running the tests, install the requirements:
+Prior to running the tests, install tox in your environment:
 ```bash
-pip3 install -r ./tests/unit_test_requirements.txt
+pip install tox
 ```
 
-To run all tests in `test_utils.py` with abridged output:
+To run all tests in `test_utils.py` targeting a specific python version:
  ```bash
-pytest ./tests/test_utils.py
+tox -e py312
 ```
 
 Output:
 ```bash
-==================================================================== test session starts ====================================================================
-platform linux -- Python 3.13.0, pytest-8.3.4, pluggy-1.5.0
-rootdir: /home/dkosteck/Documents/nephio/operators/o2ims-operator
-collected 61 items
+py312: commands[0]> pytest --maxfail=1 --disable-warnings -q -v
+=========================================================================================== test session starts ===========================================================================================
+platform linux -- Python 3.12.3, pytest-8.3.4, pluggy-1.5.0
+cachedir: .tox/py312/.pytest_cache
+rootdir: /home/fiachra/git/nordix_github/nephio/operators/o2ims-operator
+plugins: cov-6.0.0
+collected 39 items                                                                                                                                                                                        
 
-tests/test_utils.py .............................................................                                                                     [100%]
+tests/test_utils.py .......................................                                                                                                                                         [100%]
 
-==================================================================== 61 passed in 0.14s =====================================================================
+=========================================================================================== 39 passed in 0.12s ============================================================================================
+  py312: OK (0.27=setup[0.02]+cmd[0.25] seconds)
+  congratulations :) (0.30 seconds)
 
 ```
 
-To run with verbose output (showing individual test results):
- ```bash
-pytest -v ./tests/test_utils.py
-```
-
 ## Known issues
 
 ### Porch Endpoints and Stuck Deployments

operators/o2ims-operator/tox.ini

@@ -1,13 +1,13 @@
 [tox]
-envlist = py311, lint
+envlist = py311, py312, lint
 
-[testenv:py311]
+[testenv:py311,py312]
 deps =
     -r requirements.txt
     -r tests/unit_test_requirements.txt
     pytest-cov
 commands =
-    pytest --maxfail=1 --disable-warnings -q
+    pytest --maxfail=1 --disable-warnings -q -v
 
 # Lint environment for running code style checks
 [testenv:lint]