Upgrade dependency

Issue-ID: MULTICLOUD-1344

Signed-off-by: Bin Yang <bin.yang@windriver.com>
Change-Id: I39cf2fedb651a3cfc3601c5ccb01a1b67f564655

diff --git a/fcaps/requirements.txt b/fcaps/requirements.txt
index 9db93b2..e1708e2 100644 (file)
--- 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 850a52e..594b581 100644 (file)
--- 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 6539943..ab53d88 100644 (file)
--- 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 58d1c12..7b9ba59 100644 (file)
--- 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 3623b81..2787a5b 100644 (file)
--- 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 d0eafd5..d5362e4 100644 (file)
--- 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 d91d31d..a30dcff 100644 (file)
--- 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 72c4b46..fe3f555 100644 (file)
--- 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 72bcb96..c8d7757 100644 (file)
--- 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