Commit 588bfd11 authored by Kostis Trantzas's avatar Kostis Trantzas
Browse files

Merge branch 'bugfix-1' into 'develop' 

Changed the aux directory to utils to avoid Windows directory naming conflict

See merge request !4
parents 98c9a60b 06d3b391

QoDProvisioning/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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)

QoDProvisioning/QoDProvisioningAPI/API/src/main.py

+2 −2
Original line number Diff line number Diff line
@@ -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

QoDProvisioning/QoDProvisioningAPI/API/src/routers/osl.py

+3 −3
Original line number Diff line number Diff line
@@ -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()

QoDProvisioning/QoDProvisioningAPI/API/src/routers/qod_provisioning_router.py

+2 −2
Original line number Diff line number Diff line
@@ -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