RIC-1059: dms_cli to use flask-restx
Change-Id: Ifd035922f502a2fad7cdb351fac1426ce6073f93
Signed-off-by: Abdulwahid W <abdulwahid.w@nokia.com>
diff --git a/xapp_orchestrater/dev/xapp_onboarder/requirements.txt b/xapp_orchestrater/dev/xapp_onboarder/requirements.txt
index bd8c85a..e23537b 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/requirements.txt
+++ b/xapp_orchestrater/dev/xapp_onboarder/requirements.txt
@@ -5,7 +5,7 @@
Click==7.0
fire==0.2.1
Flask==1.1.1
-flask-restplus==0.13.0
+flask-restx==1.1.0
idna==2.9
importlib-metadata==1.5.0
itsdangerous==1.1.0
@@ -15,9 +15,9 @@
pyrsistent==0.15.7
pytz==2019.3
PyYAML==5.3
-requests==2.23.0
-six==1.14.0
+requests==2.31.0
+six==1.16.0
termcolor==1.1.0
urllib3==1.25.8
Werkzeug==0.16.1
-zipp==3.0.0
+zipp==3.1.0
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py
index 1f288e0..9e6cf32 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/api_reference.py
@@ -16,7 +16,7 @@
import logging
-from flask_restplus import Api
+from flask_restx import Api
from xapp_onboarder.server import settings
log = logging.getLogger(__name__)
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py
index 16fbec7..dd2eb3b 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/charts_ep.py
@@ -16,7 +16,7 @@
import logging
from flask import make_response
-from flask_restplus import Resource
+from flask_restx import Resource
from xapp_onboarder.api.api_reference import api
from xapp_onboarder.api.charts import get_charts_list, download_chart_package, download_values_yaml
from xapp_onboarder.api.models.response_models import error_message_model
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py
index 23e8b5c..1a51e37 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/health_check_ep.py
@@ -16,7 +16,7 @@
import logging
-from flask_restplus import Resource
+from flask_restx import Resource
from xapp_onboarder.api.api_reference import api
from xapp_onboarder.api.models.response_models import status_message_model, error_message_model, response
from xapp_onboarder.repo_manager.repo_manager import repo_manager
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py
index 6806bbf..bfcff31 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/endpoints/onboard_ep.py
@@ -16,7 +16,7 @@
import logging
from flask import request
-from flask_restplus import Resource
+from flask_restx import Resource
from xapp_onboarder.api.models import request_models
from xapp_onboarder.api.api_reference import api
from xapp_onboarder.api.models.response_models import status_message_model, error_message_model
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py
index a7865a8..69ed631 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/request_models.py
@@ -14,7 +14,7 @@
# limitations under the License. #
################################################################################
-from flask_restplus import fields
+from flask_restx import fields
from xapp_onboarder.api.api_reference import api
xapp_descriptor_post = api.model('descriptor', {
diff --git a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py
index 156b120..7d67e0f 100644
--- a/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py
+++ b/xapp_orchestrater/dev/xapp_onboarder/xapp_onboarder/api/models/response_models.py
@@ -14,7 +14,7 @@
# limitations under the License. #
################################################################################
-from flask_restplus import fields, marshal
+from flask_restx import fields, marshal
from xapp_onboarder.api.api_reference import api
error_message_model = api.model('error_message', {
@@ -38,4 +38,4 @@
self.error_message = error_message
def get_return(self):
- return marshal(self, self.model), self.status_code
\ No newline at end of file
+ return marshal(self, self.model), self.status_code