Commit cd923dd1 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

Merge branch 'staging' into OCF47-refactor-code-from-production-server-branch

parents 98203286 afa6fd2f

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/app.py

+2 −1
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ config = Config() 
jwt = JWTManager(app.app)

configure_logging(app.app)



if eval(os.environ.get("MONITORING").lower().capitalize()):

monitoring_value = os.environ.get("MONITORING", "").lower()

if monitoring_value == "true":

    configure_monitoring(app.app, config.get_config())



executor = Executor(app.app)

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/core/apiinvokerenrolmentdetails.py

+3 −3
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ class InvokerManagementOperations(Resource): 


        if old_values is None:

            current_app.logger.error("Not found api invoker id")

            return not_found_error(detail="Please provide an existing Netapp ID", cause= "Not exist NetappID" )

            return not_found_error(detail="Please provide an existing Network App ID", cause= "Not exist Network App ID" )



        return old_values
@@ -41,7 +41,7 @@ class InvokerManagementOperations(Resource): 
            'common_name': invoker_id

        }



        response = requests.request("POST", url, headers=headers, data=data, verify = False)

        response = requests.request("POST", url, headers=headers, data=data, verify = self.config["ca_factory"].get("verify", False))

        print(response)

        response_payload = json.loads(response.text)
@@ -156,7 +156,7 @@ class InvokerManagementOperations(Resource): 


            current_app.logger.debug("Invoker resource removed from database")

            current_app.logger.debug("Netapp offboarded sucessfuly")

            out =  "The Netapp matching onboardingId  " + onboard_id + " was offboarded."

            out =  "The Network App matching onboardingId  " + onboard_id + " was offboarded."

            res = make_response(out, status=204)

            if res.status_code == 204:

                current_app.logger.info("Invoker Removed")

services/TS29222_CAPIF_API_Invoker_Management_API/api_invoker_management/db/db.py

+2 −1
Original line number Diff line number Diff line
@@ -6,7 +6,8 @@ from bson.codec_options import CodecOptions 
import os

from opentelemetry.instrumentation.pymongo import PymongoInstrumentor



if eval(os.environ.get("MONITORING").lower().capitalize()):

monitoring_value = os.environ.get("MONITORING", "").lower()

if monitoring_value == "true":

    PymongoInstrumentor().instrument()



class MongoDatabse():

services/TS29222_CAPIF_API_Invoker_Management_API/config.yaml

+2 −1
Original line number Diff line number Diff line
@@ -12,7 +12,8 @@ mongo: { 
ca_factory: {

  "url": "vault",

  "port": "8200",

  "token": "dev-only-token"

  "token": "dev-only-token",

  "verify": False

}



monitoring: {

services/TS29222_CAPIF_API_Invoker_Management_API/requirements.txt

+7 −6
Original line number Diff line number Diff line 
connexion[swagger-ui] == 2.14.2; python_version>="3.6"

swagger-ui-bundle >= 0.0.2

python_dateutil >= 2.6.0

setuptools >= 21.0.0

setuptools == 68.2.2

Flask == 2.0.3

pymongo == 4.3.3

pymongo == 4.7.3

flask_jwt_extended == 4.4.4

pyopenssl == 23.0.0

cryptography == 42.0.8

rfc3987 == 1.3.8

redis ==  4.5.4

opentelemetry-instrumentation == 0.40b0
@@ -19,5 +19,6 @@ fluent-logger == 0.10.0 
opentelemetry-api == 1.19.0

opentelemetry-sdk == 1.19.0

flask_executor == 1.0.0

Werkzeug == 2.2.3

gunicorn == 22.0.0

packaging == 24.0