From 206e6e65fc57ec71164ce8e49b84cb34ea29ef12 Mon Sep 17 00:00:00 2001 From: Bin Yang Date: Thu, 2 Sep 2021 14:04:16 +0800 Subject: Upgrade dependency Issue-ID: MULTICLOUD-1344 Signed-off-by: Bin Yang Change-Id: I39cf2fedb651a3cfc3601c5ccb01a1b67f564655 --- fcaps/requirements.txt | 8 ++++---- pike/requirements.txt | 10 +++++----- share/newton_base/proxy/identityV3.py | 2 +- share/starlingx_base/registration/registration.py | 4 ++-- starlingx/requirements.txt | 10 +++++----- starlingx/starlingx/settings.py | 15 +++++++++++++++ starlingx/test-requirements.txt | 6 +++--- starlingx/tox.ini | 4 ++-- windriver/requirements.txt | 10 +++++----- 9 files changed, 42 insertions(+), 27 deletions(-) diff --git a/fcaps/requirements.txt b/fcaps/requirements.txt index 9db93b23..e1708e22 100644 --- a/fcaps/requirements.txt +++ b/fcaps/requirements.txt @@ -1,9 +1,9 @@ # rest framework -Django>=2.2.3 -djangorestframework>=3.9.4 +Django==3.2.7 +djangorestframework==3.12.4 # for call rest api -httplib2==0.9.2 +httplib2==0.19.1 # for call openstack auth and transport api keystoneauth1==2.18.0 @@ -19,7 +19,7 @@ python-memcached # mock==2.0.0 # unittest_xml_reporting==1.12.0 -PyYAML==5.3.1 +PyYAML==5.4.1 # for background tasks celery >= 4.0 diff --git a/pike/requirements.txt b/pike/requirements.txt index 850a52e6..594b581d 100644 --- a/pike/requirements.txt +++ b/pike/requirements.txt @@ -13,11 +13,11 @@ # limitations under the License. # rest framework -Django==2.2.3 -djangorestframework==3.9.4 +Django==3.2.7 +djangorestframework==3.12.4 # for call rest api -httplib2==0.13.0 +httplib2==0.19.1 # for call openstack auth and transport api keystoneauth1==2.18.0 @@ -25,7 +25,7 @@ keystoneauth1==2.18.0 # python-memcached python-memcached -ruamel.yaml==0.16.10 +ruamel.yaml==0.17.1 # uwsgi for parallel processing # uwsgi @@ -35,6 +35,6 @@ ruamel.yaml==0.16.10 # mock==2.0.0 # unittest_xml_reporting==1.12.0 -PyYAML==5.3.1 +PyYAML==5.4.1 onaphpadriver>=1.0 diff --git a/share/newton_base/proxy/identityV3.py b/share/newton_base/proxy/identityV3.py index 6539943b..ab53d889 100644 --- a/share/newton_base/proxy/identityV3.py +++ b/share/newton_base/proxy/identityV3.py @@ -213,7 +213,7 @@ class TokensV2(Tokens): try: resp = super(TokensV2,self).post(request, vimid) - self._logger.debug("Token(v3)returns> headers:%s, data:%s" % (resp._headers, resp.data)) + # self._logger.debug("Token(v3)returns> headers:%s, data:%s" % (resp._headers, resp.data)) if resp.status_code == status.HTTP_201_CREATED: v3_content = resp.data v3_token = v3_content['token'] diff --git a/share/starlingx_base/registration/registration.py b/share/starlingx_base/registration/registration.py index 58d1c12d..7b9ba59d 100644 --- a/share/starlingx_base/registration/registration.py +++ b/share/starlingx_base/registration/registration.py @@ -442,14 +442,14 @@ class RegistryHelper(newton_registration.RegistryHelper): "/regions", "identity", session, viminfo, vimid, "regions") - for region in openstackregions: + for region in openstackregions or []: if region['id'] == 'SystemController': isDistributedCloud = True break else: continue - for region in openstackregions: + for region in openstackregions or []: if region['id'] == 'SystemController': continue elif region['id'] == 'RegionOne' and isDistributedCloud: diff --git a/starlingx/requirements.txt b/starlingx/requirements.txt index 3623b817..2787a5b2 100644 --- a/starlingx/requirements.txt +++ b/starlingx/requirements.txt @@ -13,11 +13,11 @@ # limitations under the License. # rest framework -Django==2.2.3 -djangorestframework==3.9.4 +Django==3.2.7 +djangorestframework==3.12.4 # for call rest api -httplib2==0.13.0 +httplib2==0.19.1 # for call openstack auth and transport api keystoneauth1==2.18.0 @@ -25,7 +25,7 @@ keystoneauth1==2.18.0 # python-memcached python-memcached -ruamel.yaml==0.16.10 +ruamel.yaml==0.17.1 # uwsgi for parallel processing # uwsgi @@ -35,4 +35,4 @@ ruamel.yaml==0.16.10 # mock==2.0.0 # unittest_xml_reporting==1.12.0 -PyYAML==5.3.1 \ No newline at end of file +PyYAML==5.4.1 diff --git a/starlingx/starlingx/settings.py b/starlingx/starlingx/settings.py index d0eafd59..d5362e4b 100644 --- a/starlingx/starlingx/settings.py +++ b/starlingx/starlingx/settings.py @@ -146,6 +146,21 @@ if platform.system() == 'Windows' or 'test' in sys.argv: }, 'loggers': { + 'starlingx': { + 'handlers': ['file_handler'], + 'level': 'DEBUG', + 'propagate': False + }, + 'starlingx_base': { + 'handlers': ['file_handler'], + 'level': 'DEBUG', + 'propagate': False + }, + 'newton_base': { + 'handlers': ['file_handler'], + 'level': 'DEBUG', + 'propagate': False + }, 'common': { 'handlers': ['file_handler'], 'level': 'DEBUG', diff --git a/starlingx/test-requirements.txt b/starlingx/test-requirements.txt index d91d31db..a30dcff9 100644 --- a/starlingx/test-requirements.txt +++ b/starlingx/test-requirements.txt @@ -1,6 +1,6 @@ # for unit test -coverage==4.2 -mock==3.0.5 -unittest_xml_reporting==1.12.0 +coverage==5.5 +mock==4.0.3 +unittest_xml_reporting==3.0.4 pylint # GPLv2 diff --git a/starlingx/tox.ini b/starlingx/tox.ini index 72c4b46d..fe3f5551 100644 --- a/starlingx/tox.ini +++ b/starlingx/tox.ini @@ -13,7 +13,7 @@ # limitations under the License. [tox] -envlist = py36,cov,pylint +envlist = py38,cov,pylint skipsdist = true [tox:jenkins] @@ -26,7 +26,7 @@ max-complexity = 27 [testenv] basepython = - py36: python3 + py38: python3 cov: python3 pylint: python3 setenv = diff --git a/windriver/requirements.txt b/windriver/requirements.txt index 72bcb961..c8d77572 100644 --- a/windriver/requirements.txt +++ b/windriver/requirements.txt @@ -1,9 +1,9 @@ # rest framework -Django==2.2.3 -djangorestframework==3.9.4 +Django==3.2.7 +djangorestframework==3.12.4 # for call rest api -httplib2==0.13.0 +httplib2==0.19.1 # for call openstack auth and transport api keystoneauth1==2.18.0 @@ -11,7 +11,7 @@ keystoneauth1==2.18.0 # python-memcached python-memcached -ruamel.yaml==0.16.10 +ruamel.yaml==0.17.1 # uwsgi for parallel processing # uwsgi @@ -21,7 +21,7 @@ ruamel.yaml==0.16.10 # mock==2.0.0 # unittest_xml_reporting==1.12.0 -PyYAML==5.3.1 +PyYAML==5.4.1 # for background tasks # celery >= 4.0 -- cgit 1.2.3-korg