Merge "Fix INF-352 Add aggregate resource types"

diff --git a/Dockerfile b/Dockerfile
index e837ed4..ff9a4e7 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,58 +1,86 @@
-FROM python:3.10-slim-buster
-
-RUN apt-get update && apt-get install -y git gcc procps vim curl ssh
-
-# in case git repo is not accessable
-# RUN mkdir -p /cgtsclient
-# COPY temp/config /cgtsclient/
-RUN git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/config.git /cgtsclient
-RUN pip install -e /cgtsclient/sysinv/cgts-client/cgts-client/
-
-# RUN mkdir -p /distcloud-client
-# COPY temp/distcloud-client /distcloud-client/
-RUN git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/distcloud-client.git /distcloud-client/
-RUN pip install -e /distcloud-client/distributedcloud-client
-# in case git repo is not accessable
-
-# RUN git clone --depth 1 --branch master https://github.com/cloudify-incubator/cloudify-helm-plugin.git /helmsdk
-RUN git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/fault.git /faultclient
-RUN pip install -e /faultclient/python-fmclient/fmclient/
-
+FROM nexus3.onap.org:10001/onap/integration-python:10.1.0
+# https://nexus3.onap.org/#browse/search=keyword%3Dintegration-python:d406d405e4cfbf1186265b01088caf9a
+# https://git.onap.org/integration/docker/onap-python/tree/Dockerfile
+
+USER root
+
+ARG user=orano2
+ARG group=orano2
+# Create a group and user
+RUN addgroup -S $group && adduser -S -D -h /home/$user $user $group && \
+    chown -R $user:$group /home/$user &&  \
+    mkdir /var/log/$user && \
+    mkdir -p /src && \
+    mkdir -p /configs/ && \
+    mkdir -p /src/o2app/ && \
+    mkdir -p /src/helm_sdk/ && \
+    mkdir -p /etc/o2/ && \
+    chown -R $user:$group /var/log/$user && \
+    chown -R $user:$group /src && \
+    chown -R $user:$group /configs && \
+    chown -R $user:$group /etc/o2/
 
 COPY requirements.txt /tmp/
 COPY requirements-stx.txt /tmp/
 COPY constraints.txt /tmp/
 
-RUN  pip install -r /tmp/requirements.txt -c /tmp/constraints.txt
 
-# RUN  pip install -r /tmp/requirements-stx.txt
-
-COPY requirements-test.txt /tmp/
-RUN pip install -r /tmp/requirements-test.txt
-
-
-RUN mkdir -p /src
 COPY o2ims/ /src/o2ims/
 COPY o2dms/ /src/o2dms/
 COPY o2common/ /src/o2common/
-
-RUN mkdir -p /src/helm_sdk/
-COPY helm_sdk/ /src/helm_sdk/
-
-RUN mkdir -p /configs/
-COPY configs/ /configs/
-
-RUN mkdir -p /src/o2app/
 COPY o2app/ /src/o2app/
 COPY setup.py /src/
 
-RUN pip install -e /src
+COPY helm_sdk/ /src/helm_sdk/
 
 COPY configs/ /etc/o2/
+COPY configs/ /configs/
 
-COPY tests/ /tests/
-
-RUN curl -O https://get.helm.sh/helm-v3.3.1-linux-amd64.tar.gz;
-RUN tar -zxvf helm-v3.3.1-linux-amd64.tar.gz; cp linux-amd64/helm /usr/local/bin
+RUN set -ex \
+    && apk add --no-cache bash \
+       && apk add --no-cache --virtual .fetch2-deps \
+        git curl \
+    && apk add --no-cache --virtual .build2-deps  \
+               bluez-dev \
+               bzip2-dev \
+               dpkg-dev dpkg \
+               expat-dev \
+               gcc \
+               libc-dev \
+               libffi-dev \
+               libnsl-dev \
+               libtirpc-dev \
+               linux-headers \
+               make \
+               ncurses-dev \
+               openssl-dev \
+               pax-utils \
+               sqlite-dev \
+               tcl-dev \
+               tk \
+               tk-dev \
+               util-linux-dev \
+               xz-dev \
+               zlib-dev \
+    && pip install -r /tmp/requirements.txt -r /tmp/requirements-stx.txt -c /tmp/constraints.txt \
+    && curl -O https://get.helm.sh/helm-v3.3.1-linux-amd64.tar.gz; \
+        tar -zxvf helm-v3.3.1-linux-amd64.tar.gz; \
+        cp linux-amd64/helm /usr/local/bin; \
+        rm -f helm-v3.3.1-linux-amd64.tar.gz \
+    && pip install -e /src \
+    && apk del --no-network .fetch2-deps \
+    && apk del --no-network .build2-deps
+
+# && pip install -r /tmp/requirements.txt -r /tmp/requirements-stx.txt -c /tmp/constraints.txt
+# RUN apt-get update && apt-get install -y git gcc procps vim curl ssh
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/config.git /cgtsclient \
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/distcloud-client.git /distcloud-client/ \
+# && git clone --depth 1 --branch r/stx.7.0 https://opendev.org/starlingx/fault.git /faultclient \
+# && pip install -e /cgtsclient/sysinv/cgts-client/cgts-client \
+# && pip install -e /distcloud-client/distributedcloud-client \
+# && pip install -e /faultclient/python-fmclient/fmclient \
+# && rm -rf /cgtsclient /distcloud-client /faultclient
 
 WORKDIR /src
+
+# USER $user

diff --git a/charts/resources/scripts/init/o2api_start.sh b/charts/resources/scripts/init/o2api_start.sh
index 9b376f4..6c7ebbf 100644 (file)
--- a/charts/resources/scripts/init/o2api_start.sh
+++ b/charts/resources/scripts/init/o2api_start.sh
@@ -22,7 +22,7 @@
 # pip install retry
 
 # pip install -e /root/o2
-pip install -e /src
+# pip install -e /src
 
 cat <<EOF>>/etc/hosts
 127.0.0.1  api

diff --git a/configs/log.yaml b/configs/log.yaml
index 39b923d..d6fa592 100644 (file)
--- a/configs/log.yaml
+++ b/configs/log.yaml
@@ -40,7 +40,7 @@ handlers:
     file_handler:
       level: "DEBUG"
       class: "logging.handlers.RotatingFileHandler"
-      filename: "/var/log/o2.log"
+      filename: "/var/log/orano2/o2.log"
       formatter: "standard"
       maxBytes: 52428800
       backupCount: 10

diff --git a/o2common/config/config.py b/o2common/config/config.py
index f488b71..d4e7107 100644 (file)
--- a/o2common/config/config.py
+++ b/o2common/config/config.py
@@ -36,15 +36,18 @@ def get_smo_ca_config_path():
 
 
 def get_postgres_uri():
-    host = os.environ.get("DB_HOST", "localhost")
-    port = 54321 if host == "localhost" else 5432
+    # host = os.environ.get("DB_HOST", "localhost")
+    # port = 54321 if host == "localhost" else 5432
+    host = "localhost"
+    port = 5432
     password = os.environ.get("DB_PASSWORD", "o2ims123")
     user, db_name = "o2ims", "o2ims"
     return f"postgresql://{user}:{password}@{host}:{port}/{db_name}"
 
 
 def get_api_url():
-    host_interal = os.environ.get("API_HOST", "localhost")
+    # host_interal = os.environ.get("API_HOST", "localhost")
+    host_interal = "localhost"
     host_external = os.environ.get("API_HOST_EXTERNAL_FLOATING")
     if config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING is not None and \
             config.conf.OCLOUD.API_HOST_EXTERNAL_FLOATING != '':
@@ -76,8 +79,10 @@ def get_o2dms_api_base():
 
 
 def get_redis_host_and_port():
-    host = os.environ.get("REDIS_HOST", "localhost")
-    port = 63791 if host == "localhost" else 6379
+    # host = os.environ.get("REDIS_HOST", "localhost")
+    # port = 63791 if host == "localhost" else 6379
+    host = "localhost"
+    port = 6379
     return dict(host=host, port=port)
 
 

diff --git a/requirements-stx.txt b/requirements-stx.txt
index 31b4dab..77555c6 100644 (file)
--- a/requirements-stx.txt
+++ b/requirements-stx.txt
@@ -1,4 +1,7 @@
--e git+https://opendev.org/starlingx/distcloud-client.git@master#egg=distributedcloud-client&subdirectory=distributedcloud-client
--e git+https://opendev.org/starlingx/config.git@master#egg=cgtsclient&subdirectory=sysinv/cgts-client/cgts-client
-# -e git+https://github.com/cloudify-incubator/cloudify-helm-plugin.git@master#egg=helmsdk&subdirectory=helm_sdk
--e git+https://opendev.org/starlingx/fault.git@master#egg=fmclient&subdirectory=python-fmclient/fmclient
+# -e git+https://opendev.org/starlingx/distcloud-client.git@master#egg=distributedcloud-client&subdirectory=distributedcloud-client
+# -e git+https://opendev.org/starlingx/config.git@master#egg=cgtsclient&subdirectory=sysinv/cgts-client/cgts-client
+# -e git+https://opendev.org/starlingx/fault.git@master#egg=fmclient&subdirectory=python-fmclient/fmclient
+
+-e git+https://opendev.org/starlingx/distcloud-client.git@r/stx.7.0#egg=distributedcloud-client&subdirectory=distributedcloud-client
+-e git+https://opendev.org/starlingx/config.git@r/stx.7.0#egg=cgtsclient&subdirectory=sysinv/cgts-client/cgts-client
+-e git+https://opendev.org/starlingx/fault.git@r/stx.7.0#egg=fmclient&subdirectory=python-fmclient/fmclient

diff --git a/requirements.txt b/requirements.txt
index 3d03fdd..33350d5 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -17,4 +17,6 @@ ruamel.yaml==0.17.17
 
 # https://github.com/python-restx/flask-restx/issues/460
 # Workaround for this issue
-werkzeug<=2.1.2
\ No newline at end of file
+werkzeug<=2.1.2
+
+pyOpenSSL