Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions operators/o2ims-operator/api/app.py
Original file line number Diff line number Diff line change
@@ -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'])
Expand Down
13 changes: 5 additions & 8 deletions operators/o2ims-operator/controllers/manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions operators/o2ims-operator/controllers/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@
##########################################################################

import os
from datetime import datetime
from dateutil.tz import tzutc

import requests

requests.packages.urllib3.disable_warnings()
Expand Down
11 changes: 6 additions & 5 deletions operators/o2ims-operator/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions operators/o2ims-operator/tests/unit_test_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
responses
pytest
pytest==9.0.2
responses