Fix broken o2ims operator Flask setup (#1034)

Flask app fails to run. Fix needed.
Lots of other cleanup required.
Last change was not even tested.

Signed-off-by: Fiachra Corcoran <fiachra.corcoran@est.tech>

Author: efiacor

operators/o2ims-operator/api/app.py

@@ -1,10 +1,11 @@
-from flask import Flask, request, jsonify
-from kubernetes import client, config
-from kubernetes.client.rest import ApiException
-import os
 import logging
 from datetime import datetime
+
+from flask import Flask, request, jsonify
+from kubernetes import client, config
+
 from controllers.utils import validate_cluster_creation_request
+
 app = Flask(__name__)
 
 @app.route('/O2ims_infrastructureProvisioning/v1/provisioningRequests ', methods=['POST'])

operators/o2ims-operator/controllers/manager.py

@@ -14,18 +14,15 @@
 # limitations under the License.
 ##########################################################################
 
-from utils import LOG_LEVEL, CLUSTER_PROVISIONER, CREATION_TIMEOUT
-from provisioning_request_controller import *
-from provisioning_request_validation_controller import *
-from datetime import datetime
 import logging
+import threading
+
 import kopf
-import os
 
-from flask import Flask
-import threading
 from api import app  # Import the Flask app
-
+from controllers.utils import LOG_LEVEL, CLUSTER_PROVISIONER, CREATION_TIMEOUT
+from provisioning_request_controller import *
+from provisioning_request_validation_controller import *
 
 
 # Start Flask in a separate thread

operators/o2ims-operator/controllers/provisioning_request_controller.py

@@ -14,9 +14,12 @@
 # limitations under the License.
 ##########################################################################
 
-from utils import *
 import time
 import uuid
+from datetime import datetime
+
+from controllers.utils import check_o2ims_provisioning_request, UPSTREAM_PKG_REPO, create_package_variant, \
+    get_package_variant, get_capi_cluster, TIME_FORMAT
 
 
 def check_creation_request_status(

operators/o2ims-operator/controllers/utils.py

@@ -15,8 +15,7 @@
 ##########################################################################
 
 import os
-from datetime import datetime
-from dateutil.tz import tzutc
+
 import requests
 
 requests.packages.urllib3.disable_warnings()

operators/o2ims-operator/requirements.txt

@@ -1,6 +1,7 @@
-## requirements.txt
+Flask==3.1.2
+kopf==1.40.1
+kubernetes==35.0.0
+python_kubernetes==0.2
+Requests==2.32.5
+responses==0.25.8
 jinja2==3.1.6
-kopf==1.36.0
-requests==2.32.4
-python-dateutil==2.8.2
-flask==2.3.3

operators/o2ims-operator/tests/unit_test_requirements.txt

@@ -1,2 +1,2 @@
-responses
-pytest
+pytest==9.0.2
+responses