From 06d3b391fe17308f6cce2422866f163ff0491ec9 Mon Sep 17 00:00:00 2001
From: Eduardo Santos <eduardosantoshf@av.it.pt>
Date: Thu, 30 Jan 2025 16:08:00 +0000
Subject: [PATCH] Changed the aux directory to utils
---
QoDProvisioning/Makefile | 4 ++--
QoDProvisioning/QoDProvisioningAPI/API/src/main.py | 4 ++--
QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py | 6 +++---
.../API/src/routers/qod_provisioning_router.py | 4 ++--
.../QoDProvisioningAPI/API/src/{aux => utils}/constants.py | 0
.../QoDProvisioningAPI/API/src/{aux => utils}/mappers.py | 0
.../src/{aux => utils}/service_event_manager/__init__.py | 0
.../service_event_manager/camara_results_processor.py | 4 ++--
.../service_event_manager/service_event_manager.py | 0
9 files changed, 11 insertions(+), 11 deletions(-)
rename QoDProvisioning/QoDProvisioningAPI/API/src/{aux => utils}/constants.py (100%)
rename QoDProvisioning/QoDProvisioningAPI/API/src/{aux => utils}/mappers.py (100%)
rename QoDProvisioning/QoDProvisioningAPI/API/src/{aux => utils}/service_event_manager/__init__.py (100%)
rename QoDProvisioning/QoDProvisioningAPI/API/src/{aux => utils}/service_event_manager/camara_results_processor.py (96%)
rename QoDProvisioning/QoDProvisioningAPI/API/src/{aux => utils}/service_event_manager/service_event_manager.py (100%)
diff --git a/QoDProvisioning/Makefile b/QoDProvisioning/Makefile
index b109f48..848f348 100644
--- a/QoDProvisioning/Makefile
+++ b/QoDProvisioning/Makefile
@@ -36,7 +36,7 @@ describe-dummy-operator-cr:
# CAMARAaaS QoD Provisioning API
build-api-docker-image:
- docker build -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API
+ docker build --no-cache -t $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/API
tag-api-docker-image:
docker tag $(API_DOCKER_IMAGE_LOCAL_NAME):$(API_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(API_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(API_DOCKER_IMAGE_TAG_ON_REPOSITORY)
@@ -49,7 +49,7 @@ api-docker-image: build-api-docker-image tag-api-docker-image push-api-docker-im
# CAMARAaaS QoD Provisioning API Operator
build-operator-docker-image:
- docker build -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator
+ docker build --no-cache -t $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) ./QoDProvisioningAPI/Operator
tag-operator-docker-image:
docker tag $(OPERATOR_DOCKER_IMAGE_LOCAL_NAME):$(OPERATOR_DOCKER_IMAGE_LOCAL_TAG) $(REPOSITORY_HOST)/$(OPERATOR_DOCKER_IMAGE_NAME_ON_REPOSITORY):$(OPERATOR_DOCKER_IMAGE_TAG_ON_REPOSITORY)
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/main.py b/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
index e2a6fce..f401db3 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/main.py
@@ -29,8 +29,8 @@ from routers.qod_provisioning_router import router as QoDProvisioningApiRouter
from routers.osl import router as OSLRouter
from database.db import init_db, get_db
-from aux.service_event_manager.service_event_manager import ServiceEventManager
-from aux.service_event_manager.camara_results_processor import CamaraResultsProcessor
+from utils.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.camara_results_processor import CamaraResultsProcessor
from config import Config
# Set up logging
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
index d4e528f..60ec783 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py
@@ -40,13 +40,13 @@ from schemas.retrieve_provisioning_by_device import RetrieveProvisioningByDevice
from schemas.status import Status
from schemas.status_info import StatusInfo
from database import crud
-from aux import mappers
+from utils import mappers
from datetime import datetime
import logging
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
import json
from config import Config
-from aux.constants import Constants
+from utils.constants import Constants
# Set up logging
logger = Config.setup_logging()
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
index f199afb..8749f17 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py
@@ -41,10 +41,10 @@ from schemas.retrieve_provisioning_by_device import RetrieveProvisioningByDevice
from schemas.status import Status
from schemas.status_info import StatusInfo
from database import crud
-from aux import mappers
+from utils import mappers
from datetime import datetime
import logging
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
import json
from config import Config
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/constants.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/constants.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/constants.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/constants.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/mappers.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/mappers.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/mappers.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/mappers.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/__init__.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/__init__.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/__init__.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/__init__.py
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
similarity index 96%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
index ea22ca4..4dd7de0 100644
--- a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/camara_results_processor.py
+++ b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/camara_results_processor.py
@@ -10,12 +10,12 @@
import asyncio
-from aux.service_event_manager.service_event_manager import ServiceEventManager
+from utils.service_event_manager.service_event_manager import ServiceEventManager
from config import Config
import json
from database import crud
from database.db import get_db
-from aux.constants import Constants
+from utils.constants import Constants
# Set up logging
logger = Config.setup_logging()
diff --git a/QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/service_event_manager.py b/QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/service_event_manager.py
similarity index 100%
rename from QoDProvisioning/QoDProvisioningAPI/API/src/aux/service_event_manager/service_event_manager.py
rename to QoDProvisioning/QoDProvisioningAPI/API/src/utils/service_event_manager/service_event_manager.py
--
GitLab