From 84b5114027dc2d3ce378d2b79026b6b0c21600ec Mon Sep 17 00:00:00 2001 From: Douglas Henrique Koerich Date: Wed, 22 Jun 2022 17:34:42 -0300 Subject: [PATCH] Images of ptp-notification containers for Debian This change reorganizes the source directories of the ptp-notification's containers: locationservice; notificationservice; notificationclient, to be reused by both CentOS and Debian Dockerfiles to build the images having the corresponding OS-specific base, together with the new files used to build images for Debian. Tests: PASS: Build images of the 3 containers for Debian PASS: Upload and apply changed ptp-notification application to pull Debian images from private repository (since final tag is not possible yet) in a Debian AIO-SX environment Regression: PASS: Build images of the 3 containers for CentOS Story: 2009831 Task: 45658 Signed-off-by: Douglas Henrique Koerich Change-Id: I4aa9650dbebe5ba68cd4d104ee0995e79681cfa4 --- debian_stable_docker_images.inc | 3 +++ .../centos/{docker => }/Dockerfile | 2 +- .../locationservice-base.stable_docker_image | 4 ++- locationservice-base/debian/Dockerfile | 23 +++++++++++++++++ .../locationservice-base.stable_docker_image | 4 +++ .../docker/locationservice/LICENSE | 0 .../locationservice/apiserver/__init__.py | 0 .../docker/locationservice/apiserver/app.py | 0 .../apiserver/controllers/__init__.py | 0 .../apiserver/controllers/root.py | 0 .../apiserver/model/__init__.py | 0 .../apiserver/repository/__init__.py | 0 .../repository/notification_control.py | 0 .../apiserver/templates/layout.html | 0 .../apiserver/tests/__init__.py | 0 .../locationservice/apiserver/tests/config.py | 0 .../apiserver/tests/test_functional.py | 0 .../apiserver/tests/test_units.py | 0 .../docker/locationservice/config.py | 0 .../locationservice.egg-info/PKG-INFO | 0 .../locationservice.egg-info/SOURCES.txt | 0 .../dependency_links.txt | 0 .../locationservice.egg-info/not-zip-safe | 0 .../locationservice.egg-info/requires.txt | 0 .../locationservice.egg-info/top_level.txt | 0 .../locationservicesdk/__init__.py | 0 .../locationservicesdk/client/base.py | 0 .../client/locationproducer.py | 0 .../common/helpers/log_helper.py | 0 .../common/helpers/rpc_helper.py | 0 .../locationservicesdk/model/__init__.py | 0 .../locationservicesdk/model/dto/__init__.py | 0 .../locationservicesdk/model/dto/location.py | 0 .../model/dto/resourcetype.py | 0 .../model/dto/rpc_endpoint.py | 0 .../locationservicesdk/services/__init__.py | 0 .../locationservicesdk/services/daemon.py | 0 .../locationservice/public/css/style.css | 0 .../locationservice/public/images/logo.png | Bin .../docker/locationservice/setup.cfg | 0 .../docker/locationservice/setup.py | 0 .../centos/{docker => }/Dockerfile | 2 +- ...otificationclient-base.stable_docker_image | 4 ++- notificationclient-base/debian/Dockerfile | 24 ++++++++++++++++++ ...otificationclient-base.stable_docker_image | 4 +++ .../docker/notificationclient-sidecar/LICENSE | 0 .../notificationclient-sidecar/MANIFEST.in | 0 .../notificationclient-sidecar/config.py | 0 .../notificationclientsdk/__init__.py | 0 .../notificationclientsdk/client/base.py | 0 .../client/locationservice.py | 0 .../client/notificationservice.py | 0 .../common/helpers/hostfile_helper.py | 0 .../common/helpers/log_helper.py | 0 .../common/helpers/nodeinfo_helper.py | 0 .../common/helpers/patcher.py | 0 .../common/helpers/rpc_helper.py | 0 .../common/helpers/subscription_helper.py | 0 .../exception/__init__.py | 0 .../exception/client_exception.py | 0 .../notificationclientsdk/model/__init__.py | 0 .../model/dto/__init__.py | 0 .../model/dto/broker_state.py | 0 .../model/dto/location.py | 0 .../model/dto/resourcetype.py | 0 .../model/dto/rpc_endpoint.py | 0 .../model/dto/subscription.py | 0 .../model/orm/__init__.py | 0 .../notificationclientsdk/model/orm/base.py | 0 .../notificationclientsdk/model/orm/node.py | 0 .../model/orm/subscription.py | 0 .../repository/__init__.py | 0 .../repository/dbcontext.py | 0 .../repository/node_repo.py | 0 .../repository/subscription_repo.py | 0 .../services/__init__.py | 0 .../services/broker_connection_manager.py | 0 .../services/broker_state_manager.py | 0 .../notificationclientsdk/services/daemon.py | 0 .../services/notification_handler.py | 0 .../services/notification_worker.py | 0 .../notificationclientsdk/services/ptp.py | 0 .../public/css/style.css | 0 .../public/images/logo.png | Bin .../notificationclient-sidecar/setup.cfg | 0 .../notificationclient-sidecar/setup.py | 0 .../sidecar.egg-info/PKG-INFO | 0 .../sidecar.egg-info/SOURCES.txt | 0 .../sidecar.egg-info/dependency_links.txt | 0 .../sidecar.egg-info/not-zip-safe | 0 .../sidecar.egg-info/requires.txt | 0 .../sidecar.egg-info/top_level.txt | 0 .../sidecar/__init__.py | 0 .../notificationclient-sidecar/sidecar/app.py | 0 .../sidecar/controllers/__init__.py | 0 .../sidecar/controllers/root.py | 0 .../sidecar/controllers/v1/__init__.py | 0 .../controllers/v1/resource/__init__.py | 0 .../sidecar/controllers/v1/resource/ptp.py | 0 .../sidecar/controllers/v1/subscriptions.py | 0 .../sidecar/model/__init__.py | 0 .../sidecar/model/jsonify.py | 0 .../sidecar/repository/__init__.py | 0 .../sidecar/repository/dbcontext_default.py | 0 .../repository/notification_control.py | 0 .../sidecar/tests/__init__.py | 0 .../sidecar/tests/config.py | 0 .../sidecar/tests/test_functional.py | 0 .../sidecar/tests/test_units.py | 0 .../centos/{docker => }/Dockerfile | 2 +- ...tificationservice-base.stable_docker_image | 4 ++- notificationservice-base/debian/Dockerfile | 23 +++++++++++++++++ ...tificationservice-base.stable_docker_image | 4 +++ .../docker/ptptrackingfunction/LICENSE | 0 .../docker/ptptrackingfunction/setup.cfg | 0 .../docker/ptptrackingfunction/setup.py | 0 .../trackingfunctionsdk/__init__.py | 0 .../trackingfunctionsdk/client/base.py | 0 .../client/ptpeventproducer.py | 0 .../trackingfunctionsdk/common/__init__.py | 0 .../common/helpers/__init__.py | 0 .../common/helpers/cgu_handler.py | 0 .../common/helpers/constants.py | 0 .../common/helpers/dmesg_watcher.py | 0 .../common/helpers/gnss_monitor.py | 0 .../common/helpers/log_helper.py | 0 .../common/helpers/os_clock_monitor.py | 0 .../common/helpers/ptpsync.py | 0 .../common/helpers/rpc_helper.py | 0 .../trackingfunctionsdk/model/__init__.py | 0 .../trackingfunctionsdk/model/dto/__init__.py | 0 .../model/dto/gnssstate.py | 0 .../model/dto/osclockstate.py | 0 .../trackingfunctionsdk/model/dto/ptpstate.py | 0 .../model/dto/ptpstatus.py | 0 .../model/dto/resourcetype.py | 0 .../model/dto/rpc_endpoint.py | 0 .../trackingfunctionsdk/services/__init__.py | 0 .../trackingfunctionsdk/services/daemon.py | 0 .../trackingfunctionsdk/tests/__init__.py | 0 .../tests/test_cgu_handler.py | 0 .../tests/test_dmesg_watcher.py | 0 .../tests/test_input_files/mock_cgu_output | 0 .../tests/test_input_files/mock_dmesg | 0 .../tests/test_input_files/mock_kern.log | 0 .../tests/test_input_files/phc2sys-test.conf | 0 .../test_input_files/ts2phc_invalid.conf | 0 .../tests/test_input_files/ts2phc_valid.conf | 0 .../tests/test_os_clock_monitor.py | 0 tox.ini | 4 +-- 150 files changed, 99 insertions(+), 8 deletions(-) create mode 100644 debian_stable_docker_images.inc rename locationservice-base/centos/{docker => }/Dockerfile (94%) create mode 100644 locationservice-base/debian/Dockerfile create mode 100644 locationservice-base/debian/locationservice-base.stable_docker_image rename locationservice-base/{centos => }/docker/locationservice/LICENSE (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/app.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/controllers/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/controllers/root.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/model/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/repository/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/repository/notification_control.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/templates/layout.html (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/tests/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/tests/config.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/tests/test_functional.py (100%) rename locationservice-base/{centos => }/docker/locationservice/apiserver/tests/test_units.py (100%) rename locationservice-base/{centos => }/docker/locationservice/config.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/PKG-INFO (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/SOURCES.txt (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/dependency_links.txt (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/not-zip-safe (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/requires.txt (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservice.egg-info/top_level.txt (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/client/base.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/client/locationproducer.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/common/helpers/log_helper.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/common/helpers/rpc_helper.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/model/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/model/dto/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/model/dto/location.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/model/dto/resourcetype.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/model/dto/rpc_endpoint.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/services/__init__.py (100%) rename locationservice-base/{centos => }/docker/locationservice/locationservicesdk/services/daemon.py (100%) rename locationservice-base/{centos => }/docker/locationservice/public/css/style.css (100%) rename locationservice-base/{centos => }/docker/locationservice/public/images/logo.png (100%) rename locationservice-base/{centos => }/docker/locationservice/setup.cfg (100%) rename locationservice-base/{centos => }/docker/locationservice/setup.py (100%) rename notificationclient-base/centos/{docker => }/Dockerfile (94%) create mode 100644 notificationclient-base/debian/Dockerfile create mode 100644 notificationclient-base/debian/notificationclient-base.stable_docker_image rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/LICENSE (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/MANIFEST.in (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/config.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/client/base.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/client/locationservice.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/client/notificationservice.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/hostfile_helper.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/log_helper.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/nodeinfo_helper.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/patcher.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/rpc_helper.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/subscription_helper.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/exception/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/exception/client_exception.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/broker_state.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/location.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/resourcetype.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/rpc_endpoint.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/dto/subscription.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/orm/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/orm/base.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/orm/node.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/model/orm/subscription.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/repository/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/repository/dbcontext.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/repository/node_repo.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/repository/subscription_repo.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/broker_connection_manager.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/broker_state_manager.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/daemon.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/notification_handler.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/notification_worker.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/notificationclientsdk/services/ptp.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/public/css/style.css (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/public/images/logo.png (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/setup.cfg (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/setup.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/PKG-INFO (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/SOURCES.txt (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/dependency_links.txt (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/not-zip-safe (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/requires.txt (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar.egg-info/top_level.txt (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/app.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/root.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/v1/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/ptp.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/controllers/v1/subscriptions.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/model/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/model/jsonify.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/repository/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/repository/dbcontext_default.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/repository/notification_control.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/tests/__init__.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/tests/config.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/tests/test_functional.py (100%) rename notificationclient-base/{centos => }/docker/notificationclient-sidecar/sidecar/tests/test_units.py (100%) rename notificationservice-base/centos/{docker => }/Dockerfile (90%) create mode 100644 notificationservice-base/debian/Dockerfile create mode 100644 notificationservice-base/debian/notificationservice-base.stable_docker_image rename notificationservice-base/{centos => }/docker/ptptrackingfunction/LICENSE (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/setup.cfg (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/setup.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/client/base.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/client/ptpeventproducer.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/cgu_handler.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/dmesg_watcher.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/gnss_monitor.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/log_helper.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/os_clock_monitor.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/rpc_helper.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/gnssstate.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/osclockstate.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstate.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstatus.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/resourcetype.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/rpc_endpoint.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/services/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/services/daemon.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/__init__.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_cgu_handler.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_dmesg_watcher.py (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_cgu_output (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_dmesg (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_kern.log (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/phc2sys-test.conf (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_invalid.conf (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_valid.conf (100%) rename notificationservice-base/{centos => }/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_os_clock_monitor.py (100%) diff --git a/debian_stable_docker_images.inc b/debian_stable_docker_images.inc new file mode 100644 index 0000000..ff7bc4f --- /dev/null +++ b/debian_stable_docker_images.inc @@ -0,0 +1,3 @@ +notificationservice-base +locationservice-base +notificationclient-base diff --git a/locationservice-base/centos/docker/Dockerfile b/locationservice-base/centos/Dockerfile similarity index 94% rename from locationservice-base/centos/docker/Dockerfile rename to locationservice-base/centos/Dockerfile index a91644a..bae0a55 100644 --- a/locationservice-base/centos/docker/Dockerfile +++ b/locationservice-base/centos/Dockerfile @@ -3,7 +3,7 @@ FROM ${BASE} ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo -ENV KUBE_LATEST_VERSION="v1.18.3" +ENV KUBE_LATEST_VERSION="v1.23.1" RUN set -ex ;\ yum install --disablerepo=* \ diff --git a/locationservice-base/centos/locationservice-base.stable_docker_image b/locationservice-base/centos/locationservice-base.stable_docker_image index fe18da2..14a7c07 100644 --- a/locationservice-base/centos/locationservice-base.stable_docker_image +++ b/locationservice-base/centos/locationservice-base.stable_docker_image @@ -1,2 +1,4 @@ BUILDER=docker -LABEL=locationservice-base \ No newline at end of file +LABEL=locationservice-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/locationservice-base/debian/Dockerfile b/locationservice-base/debian/Dockerfile new file mode 100644 index 0000000..2b794df --- /dev/null +++ b/locationservice-base/debian/Dockerfile @@ -0,0 +1,23 @@ +ARG BASE +FROM ${BASE} + +ENV DEBIAN_FRONTEND=noninteractive +ENV KUBE_LATEST_VERSION="v1.23.1" + +RUN apt-get -y update \ + && apt-get -y install \ + gcc \ + python3-dev \ + python3 \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* +RUN pip3 install --user pecan \ + && pip3 install oslo-config \ + && pip3 install oslo-messaging \ + && pip3 install WSME + +WORKDIR /opt/ +COPY ./locationservice /opt/locationservice +RUN cd /opt/locationservice && python3 setup.py develop + +CMD ["bash"] diff --git a/locationservice-base/debian/locationservice-base.stable_docker_image b/locationservice-base/debian/locationservice-base.stable_docker_image new file mode 100644 index 0000000..14a7c07 --- /dev/null +++ b/locationservice-base/debian/locationservice-base.stable_docker_image @@ -0,0 +1,4 @@ +BUILDER=docker +LABEL=locationservice-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/locationservice-base/centos/docker/locationservice/LICENSE b/locationservice-base/docker/locationservice/LICENSE similarity index 100% rename from locationservice-base/centos/docker/locationservice/LICENSE rename to locationservice-base/docker/locationservice/LICENSE diff --git a/locationservice-base/centos/docker/locationservice/apiserver/__init__.py b/locationservice-base/docker/locationservice/apiserver/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/__init__.py rename to locationservice-base/docker/locationservice/apiserver/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/app.py b/locationservice-base/docker/locationservice/apiserver/app.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/app.py rename to locationservice-base/docker/locationservice/apiserver/app.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/controllers/__init__.py b/locationservice-base/docker/locationservice/apiserver/controllers/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/controllers/__init__.py rename to locationservice-base/docker/locationservice/apiserver/controllers/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/controllers/root.py b/locationservice-base/docker/locationservice/apiserver/controllers/root.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/controllers/root.py rename to locationservice-base/docker/locationservice/apiserver/controllers/root.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/model/__init__.py b/locationservice-base/docker/locationservice/apiserver/model/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/model/__init__.py rename to locationservice-base/docker/locationservice/apiserver/model/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/repository/__init__.py b/locationservice-base/docker/locationservice/apiserver/repository/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/repository/__init__.py rename to locationservice-base/docker/locationservice/apiserver/repository/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/repository/notification_control.py b/locationservice-base/docker/locationservice/apiserver/repository/notification_control.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/repository/notification_control.py rename to locationservice-base/docker/locationservice/apiserver/repository/notification_control.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/templates/layout.html b/locationservice-base/docker/locationservice/apiserver/templates/layout.html similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/templates/layout.html rename to locationservice-base/docker/locationservice/apiserver/templates/layout.html diff --git a/locationservice-base/centos/docker/locationservice/apiserver/tests/__init__.py b/locationservice-base/docker/locationservice/apiserver/tests/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/tests/__init__.py rename to locationservice-base/docker/locationservice/apiserver/tests/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/tests/config.py b/locationservice-base/docker/locationservice/apiserver/tests/config.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/tests/config.py rename to locationservice-base/docker/locationservice/apiserver/tests/config.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/tests/test_functional.py b/locationservice-base/docker/locationservice/apiserver/tests/test_functional.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/tests/test_functional.py rename to locationservice-base/docker/locationservice/apiserver/tests/test_functional.py diff --git a/locationservice-base/centos/docker/locationservice/apiserver/tests/test_units.py b/locationservice-base/docker/locationservice/apiserver/tests/test_units.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/apiserver/tests/test_units.py rename to locationservice-base/docker/locationservice/apiserver/tests/test_units.py diff --git a/locationservice-base/centos/docker/locationservice/config.py b/locationservice-base/docker/locationservice/config.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/config.py rename to locationservice-base/docker/locationservice/config.py diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/PKG-INFO b/locationservice-base/docker/locationservice/locationservice.egg-info/PKG-INFO similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/PKG-INFO rename to locationservice-base/docker/locationservice/locationservice.egg-info/PKG-INFO diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/SOURCES.txt b/locationservice-base/docker/locationservice/locationservice.egg-info/SOURCES.txt similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/SOURCES.txt rename to locationservice-base/docker/locationservice/locationservice.egg-info/SOURCES.txt diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/dependency_links.txt b/locationservice-base/docker/locationservice/locationservice.egg-info/dependency_links.txt similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/dependency_links.txt rename to locationservice-base/docker/locationservice/locationservice.egg-info/dependency_links.txt diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/not-zip-safe b/locationservice-base/docker/locationservice/locationservice.egg-info/not-zip-safe similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/not-zip-safe rename to locationservice-base/docker/locationservice/locationservice.egg-info/not-zip-safe diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/requires.txt b/locationservice-base/docker/locationservice/locationservice.egg-info/requires.txt similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/requires.txt rename to locationservice-base/docker/locationservice/locationservice.egg-info/requires.txt diff --git a/locationservice-base/centos/docker/locationservice/locationservice.egg-info/top_level.txt b/locationservice-base/docker/locationservice/locationservice.egg-info/top_level.txt similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservice.egg-info/top_level.txt rename to locationservice-base/docker/locationservice/locationservice.egg-info/top_level.txt diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/__init__.py b/locationservice-base/docker/locationservice/locationservicesdk/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/__init__.py rename to locationservice-base/docker/locationservice/locationservicesdk/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/client/base.py b/locationservice-base/docker/locationservice/locationservicesdk/client/base.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/client/base.py rename to locationservice-base/docker/locationservice/locationservicesdk/client/base.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/client/locationproducer.py b/locationservice-base/docker/locationservice/locationservicesdk/client/locationproducer.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/client/locationproducer.py rename to locationservice-base/docker/locationservice/locationservicesdk/client/locationproducer.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/common/helpers/log_helper.py b/locationservice-base/docker/locationservice/locationservicesdk/common/helpers/log_helper.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/common/helpers/log_helper.py rename to locationservice-base/docker/locationservice/locationservicesdk/common/helpers/log_helper.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/common/helpers/rpc_helper.py b/locationservice-base/docker/locationservice/locationservicesdk/common/helpers/rpc_helper.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/common/helpers/rpc_helper.py rename to locationservice-base/docker/locationservice/locationservicesdk/common/helpers/rpc_helper.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/model/__init__.py b/locationservice-base/docker/locationservice/locationservicesdk/model/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/model/__init__.py rename to locationservice-base/docker/locationservice/locationservicesdk/model/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/__init__.py b/locationservice-base/docker/locationservice/locationservicesdk/model/dto/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/__init__.py rename to locationservice-base/docker/locationservice/locationservicesdk/model/dto/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/location.py b/locationservice-base/docker/locationservice/locationservicesdk/model/dto/location.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/location.py rename to locationservice-base/docker/locationservice/locationservicesdk/model/dto/location.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/resourcetype.py b/locationservice-base/docker/locationservice/locationservicesdk/model/dto/resourcetype.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/resourcetype.py rename to locationservice-base/docker/locationservice/locationservicesdk/model/dto/resourcetype.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/rpc_endpoint.py b/locationservice-base/docker/locationservice/locationservicesdk/model/dto/rpc_endpoint.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/model/dto/rpc_endpoint.py rename to locationservice-base/docker/locationservice/locationservicesdk/model/dto/rpc_endpoint.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/services/__init__.py b/locationservice-base/docker/locationservice/locationservicesdk/services/__init__.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/services/__init__.py rename to locationservice-base/docker/locationservice/locationservicesdk/services/__init__.py diff --git a/locationservice-base/centos/docker/locationservice/locationservicesdk/services/daemon.py b/locationservice-base/docker/locationservice/locationservicesdk/services/daemon.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/locationservicesdk/services/daemon.py rename to locationservice-base/docker/locationservice/locationservicesdk/services/daemon.py diff --git a/locationservice-base/centos/docker/locationservice/public/css/style.css b/locationservice-base/docker/locationservice/public/css/style.css similarity index 100% rename from locationservice-base/centos/docker/locationservice/public/css/style.css rename to locationservice-base/docker/locationservice/public/css/style.css diff --git a/locationservice-base/centos/docker/locationservice/public/images/logo.png b/locationservice-base/docker/locationservice/public/images/logo.png similarity index 100% rename from locationservice-base/centos/docker/locationservice/public/images/logo.png rename to locationservice-base/docker/locationservice/public/images/logo.png diff --git a/locationservice-base/centos/docker/locationservice/setup.cfg b/locationservice-base/docker/locationservice/setup.cfg similarity index 100% rename from locationservice-base/centos/docker/locationservice/setup.cfg rename to locationservice-base/docker/locationservice/setup.cfg diff --git a/locationservice-base/centos/docker/locationservice/setup.py b/locationservice-base/docker/locationservice/setup.py similarity index 100% rename from locationservice-base/centos/docker/locationservice/setup.py rename to locationservice-base/docker/locationservice/setup.py diff --git a/notificationclient-base/centos/docker/Dockerfile b/notificationclient-base/centos/Dockerfile similarity index 94% rename from notificationclient-base/centos/docker/Dockerfile rename to notificationclient-base/centos/Dockerfile index 0c0addf..00d36ae 100644 --- a/notificationclient-base/centos/docker/Dockerfile +++ b/notificationclient-base/centos/Dockerfile @@ -3,7 +3,7 @@ FROM ${BASE} ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo -ENV KUBE_LATEST_VERSION="v1.18.3" +ENV KUBE_LATEST_VERSION="v1.23.1" RUN set -ex ;\ yum install --disablerepo=* \ diff --git a/notificationclient-base/centos/notificationclient-base.stable_docker_image b/notificationclient-base/centos/notificationclient-base.stable_docker_image index 8bc8e33..1b019d1 100644 --- a/notificationclient-base/centos/notificationclient-base.stable_docker_image +++ b/notificationclient-base/centos/notificationclient-base.stable_docker_image @@ -1,2 +1,4 @@ BUILDER=docker -LABEL=notificationclient-base \ No newline at end of file +LABEL=notificationclient-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationclient-base/debian/Dockerfile b/notificationclient-base/debian/Dockerfile new file mode 100644 index 0000000..04f99a5 --- /dev/null +++ b/notificationclient-base/debian/Dockerfile @@ -0,0 +1,24 @@ +ARG BASE +FROM ${BASE} + +ENV DEBIAN_FRONTEND=noninteractive +ENV KUBE_LATEST_VERSION="v1.23.1" + +RUN apt-get -y update \ + && apt-get -y install \ + gcc \ + python3-dev \ + python3 \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* +RUN pip3 install --user pecan \ + && pip3 install oslo-config \ + && pip3 install oslo-messaging \ + && pip3 install WSME \ + && pip3 install sqlalchemy + +WORKDIR /opt/ +COPY ./notificationclient-sidecar /opt/notificationclient +RUN cd /opt/notificationclient && python3 setup.py develop + +CMD ["bash"] diff --git a/notificationclient-base/debian/notificationclient-base.stable_docker_image b/notificationclient-base/debian/notificationclient-base.stable_docker_image new file mode 100644 index 0000000..1b019d1 --- /dev/null +++ b/notificationclient-base/debian/notificationclient-base.stable_docker_image @@ -0,0 +1,4 @@ +BUILDER=docker +LABEL=notificationclient-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/LICENSE b/notificationclient-base/docker/notificationclient-sidecar/LICENSE similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/LICENSE rename to notificationclient-base/docker/notificationclient-sidecar/LICENSE diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/MANIFEST.in b/notificationclient-base/docker/notificationclient-sidecar/MANIFEST.in similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/MANIFEST.in rename to notificationclient-base/docker/notificationclient-sidecar/MANIFEST.in diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/config.py b/notificationclient-base/docker/notificationclient-sidecar/config.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/config.py rename to notificationclient-base/docker/notificationclient-sidecar/config.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/base.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/base.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/base.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/base.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/locationservice.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/locationservice.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/locationservice.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/locationservice.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/notificationservice.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/notificationservice.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/client/notificationservice.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/client/notificationservice.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/hostfile_helper.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/hostfile_helper.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/hostfile_helper.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/hostfile_helper.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/log_helper.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/log_helper.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/log_helper.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/log_helper.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/nodeinfo_helper.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/nodeinfo_helper.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/nodeinfo_helper.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/nodeinfo_helper.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/patcher.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/patcher.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/patcher.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/patcher.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/rpc_helper.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/rpc_helper.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/rpc_helper.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/rpc_helper.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/subscription_helper.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/subscription_helper.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/subscription_helper.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/common/helpers/subscription_helper.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/exception/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/exception/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/exception/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/exception/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/exception/client_exception.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/exception/client_exception.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/exception/client_exception.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/exception/client_exception.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/broker_state.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/broker_state.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/broker_state.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/broker_state.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/location.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/location.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/location.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/location.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/resourcetype.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/resourcetype.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/resourcetype.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/resourcetype.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/rpc_endpoint.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/rpc_endpoint.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/rpc_endpoint.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/rpc_endpoint.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/subscription.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/subscription.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/dto/subscription.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/dto/subscription.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/base.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/base.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/base.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/base.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/node.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/node.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/node.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/node.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/subscription.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/subscription.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/model/orm/subscription.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/model/orm/subscription.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/dbcontext.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/dbcontext.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/dbcontext.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/dbcontext.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/node_repo.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/node_repo.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/node_repo.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/node_repo.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/subscription_repo.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/subscription_repo.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/repository/subscription_repo.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/repository/subscription_repo.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/broker_connection_manager.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/broker_connection_manager.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/broker_connection_manager.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/broker_connection_manager.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/broker_state_manager.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/broker_state_manager.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/broker_state_manager.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/broker_state_manager.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/daemon.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/daemon.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/daemon.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/daemon.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/notification_handler.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/notification_handler.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/notification_handler.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/notification_handler.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/notification_worker.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/notification_worker.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/notification_worker.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/notification_worker.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/ptp.py b/notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/ptp.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/notificationclientsdk/services/ptp.py rename to notificationclient-base/docker/notificationclient-sidecar/notificationclientsdk/services/ptp.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/public/css/style.css b/notificationclient-base/docker/notificationclient-sidecar/public/css/style.css similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/public/css/style.css rename to notificationclient-base/docker/notificationclient-sidecar/public/css/style.css diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/public/images/logo.png b/notificationclient-base/docker/notificationclient-sidecar/public/images/logo.png similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/public/images/logo.png rename to notificationclient-base/docker/notificationclient-sidecar/public/images/logo.png diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/setup.cfg b/notificationclient-base/docker/notificationclient-sidecar/setup.cfg similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/setup.cfg rename to notificationclient-base/docker/notificationclient-sidecar/setup.cfg diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/setup.py b/notificationclient-base/docker/notificationclient-sidecar/setup.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/setup.py rename to notificationclient-base/docker/notificationclient-sidecar/setup.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/PKG-INFO b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/PKG-INFO similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/PKG-INFO rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/PKG-INFO diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/SOURCES.txt b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/SOURCES.txt similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/SOURCES.txt rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/SOURCES.txt diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/dependency_links.txt b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/dependency_links.txt similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/dependency_links.txt rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/dependency_links.txt diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/not-zip-safe b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/not-zip-safe similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/not-zip-safe rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/not-zip-safe diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/requires.txt b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/requires.txt similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/requires.txt rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/requires.txt diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/top_level.txt b/notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/top_level.txt similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar.egg-info/top_level.txt rename to notificationclient-base/docker/notificationclient-sidecar/sidecar.egg-info/top_level.txt diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/app.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/app.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/app.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/app.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/root.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/root.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/root.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/root.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/ptp.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/ptp.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/ptp.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/resource/ptp.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/subscriptions.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/subscriptions.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/controllers/v1/subscriptions.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/controllers/v1/subscriptions.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/model/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/model/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/model/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/model/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/model/jsonify.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/model/jsonify.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/model/jsonify.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/model/jsonify.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/dbcontext_default.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/dbcontext_default.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/dbcontext_default.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/dbcontext_default.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/notification_control.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/notification_control.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/repository/notification_control.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/repository/notification_control.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/__init__.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/__init__.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/__init__.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/__init__.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/config.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/config.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/config.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/config.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/test_functional.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/test_functional.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/test_functional.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/test_functional.py diff --git a/notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/test_units.py b/notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/test_units.py similarity index 100% rename from notificationclient-base/centos/docker/notificationclient-sidecar/sidecar/tests/test_units.py rename to notificationclient-base/docker/notificationclient-sidecar/sidecar/tests/test_units.py diff --git a/notificationservice-base/centos/docker/Dockerfile b/notificationservice-base/centos/Dockerfile similarity index 90% rename from notificationservice-base/centos/docker/Dockerfile rename to notificationservice-base/centos/Dockerfile index 6e7cec9..a138932 100644 --- a/notificationservice-base/centos/docker/Dockerfile +++ b/notificationservice-base/centos/Dockerfile @@ -3,7 +3,7 @@ FROM ${BASE} ARG STX_REPO_FILE=/etc/yum.repos.d/stx.repo -ENV KUBE_LATEST_VERSION="v1.18.3" +ENV KUBE_LATEST_VERSION="v1.23.1" RUN set -ex ;\ yum install --disablerepo=* \ diff --git a/notificationservice-base/centos/notificationservice-base.stable_docker_image b/notificationservice-base/centos/notificationservice-base.stable_docker_image index 2bd26d6..e028c69 100644 --- a/notificationservice-base/centos/notificationservice-base.stable_docker_image +++ b/notificationservice-base/centos/notificationservice-base.stable_docker_image @@ -1,2 +1,4 @@ BUILDER=docker -LABEL=notificationservice-base \ No newline at end of file +LABEL=notificationservice-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationservice-base/debian/Dockerfile b/notificationservice-base/debian/Dockerfile new file mode 100644 index 0000000..f60fc39 --- /dev/null +++ b/notificationservice-base/debian/Dockerfile @@ -0,0 +1,23 @@ +ARG BASE +FROM ${BASE} + +ENV DEBIAN_FRONTEND=noninteractive +ENV KUBE_LATEST_VERSION="v1.23.1" + +RUN apt-get -y update \ + && apt-get -y install \ + gcc \ + python3-dev \ + python3 \ + && apt-get -y clean \ + && rm -rf /var/lib/apt/lists/* +RUN pip3 install --user pecan \ + && pip3 install oslo-config \ + && pip3 install oslo-messaging \ + && pip3 install WSME + +WORKDIR /opt/ +COPY ./ptptrackingfunction /opt/ptptrackingfunction +RUN cd /opt/ptptrackingfunction && python3 setup.py develop + +CMD ["bash"] diff --git a/notificationservice-base/debian/notificationservice-base.stable_docker_image b/notificationservice-base/debian/notificationservice-base.stable_docker_image new file mode 100644 index 0000000..e028c69 --- /dev/null +++ b/notificationservice-base/debian/notificationservice-base.stable_docker_image @@ -0,0 +1,4 @@ +BUILDER=docker +LABEL=notificationservice-base +DOCKER_CONTEXT=../docker +DOCKER_FILE=./Dockerfile \ No newline at end of file diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/LICENSE b/notificationservice-base/docker/ptptrackingfunction/LICENSE similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/LICENSE rename to notificationservice-base/docker/ptptrackingfunction/LICENSE diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/setup.cfg b/notificationservice-base/docker/ptptrackingfunction/setup.cfg similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/setup.cfg rename to notificationservice-base/docker/ptptrackingfunction/setup.cfg diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/setup.py b/notificationservice-base/docker/ptptrackingfunction/setup.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/setup.py rename to notificationservice-base/docker/ptptrackingfunction/setup.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/client/base.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/client/base.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/client/base.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/client/base.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/client/ptpeventproducer.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/client/ptpeventproducer.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/client/ptpeventproducer.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/client/ptpeventproducer.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/cgu_handler.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/cgu_handler.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/cgu_handler.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/cgu_handler.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/constants.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/dmesg_watcher.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/dmesg_watcher.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/dmesg_watcher.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/dmesg_watcher.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/gnss_monitor.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/gnss_monitor.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/gnss_monitor.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/gnss_monitor.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/log_helper.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/log_helper.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/log_helper.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/log_helper.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/os_clock_monitor.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/os_clock_monitor.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/os_clock_monitor.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/os_clock_monitor.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/ptpsync.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/rpc_helper.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/rpc_helper.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/rpc_helper.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/common/helpers/rpc_helper.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/gnssstate.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/gnssstate.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/gnssstate.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/gnssstate.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/osclockstate.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/osclockstate.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/osclockstate.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/osclockstate.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstate.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstate.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstate.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstate.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstatus.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstatus.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstatus.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/ptpstatus.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/resourcetype.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/resourcetype.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/resourcetype.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/resourcetype.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/rpc_endpoint.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/rpc_endpoint.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/rpc_endpoint.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/model/dto/rpc_endpoint.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/services/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/services/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/services/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/services/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/services/daemon.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/services/daemon.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/services/daemon.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/services/daemon.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/__init__.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/__init__.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/__init__.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/__init__.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_cgu_handler.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_cgu_handler.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_cgu_handler.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_cgu_handler.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_dmesg_watcher.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_dmesg_watcher.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_dmesg_watcher.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_dmesg_watcher.py diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_cgu_output b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_cgu_output similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_cgu_output rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_cgu_output diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_dmesg b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_dmesg similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_dmesg rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_dmesg diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_kern.log b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_kern.log similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_kern.log rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/mock_kern.log diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/phc2sys-test.conf b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/phc2sys-test.conf similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/phc2sys-test.conf rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/phc2sys-test.conf diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_invalid.conf b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_invalid.conf similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_invalid.conf rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_invalid.conf diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_valid.conf b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_valid.conf similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_valid.conf rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_input_files/ts2phc_valid.conf diff --git a/notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_os_clock_monitor.py b/notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_os_clock_monitor.py similarity index 100% rename from notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_os_clock_monitor.py rename to notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/test_os_clock_monitor.py diff --git a/tox.ini b/tox.ini index 69d2b7f..9789b30 100644 --- a/tox.ini +++ b/tox.ini @@ -21,9 +21,9 @@ whitelist_externals = [testenv:py36] basepython = python3.6 setenv = - TESTPATH=./notificationservice-base/centos/docker/ptptrackingfunction/trackingfunctionsdk/tests/ + TESTPATH=./notificationservice-base/docker/ptptrackingfunction/trackingfunctionsdk/tests/ commands = - unit2 discover -s ./notificationservice-base/centos/docker/ptptrackingfunction + unit2 discover -s ./notificationservice-base/docker/ptptrackingfunction deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt