diff options
| author |   Alexander Mazuruk <a.mazuruk@samsung.com> | 2021-04-07 03:46:39 +0200 |
|---|---|---|
| committer | Alexander Mazuruk <a.mazuruk@samsung.com> | 2021-04-09 12:22:20 +0200 |
| commit | 031694bad1802a75918b9b97d5c34faac729f0c6 (patch) | |
| tree | 3469725d292dfa65e1e530614599ce89dd5599b3 | |
| parent | 355969bee808b698a7600d69221ec44235459142 (diff) | |
Dependencies update: PyYAML to 5.4
PyYAML changelog:
https://github.com/yaml/pyyaml/blob/master/CHANGES
Additionally resolved deprecation warnings from PyYAML.
Issue-ID: DCAEGEN2-2720
Signed-off-by: Alexander Mazuruk <a.mazuruk@samsung.com>
Change-Id: Ifb06a8a32417e7b4d8fad2b509bc76cbcbc20c55
| -rw-r--r-- | miss_htbt_service/config_notif.py | 3 | ||||
| -rw-r--r-- | miss_htbt_service/misshtbtd.py | 3 | ||||
| -rw-r--r-- | miss_htbt_service/mod/trapd_vnf_table.py | 3 | ||||
| -rw-r--r-- | requirements.txt | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/miss_htbt_service/config_notif.py b/miss_htbt_service/config_notif.py index b420dc2..284584a 100644 --- a/miss_htbt_service/config_notif.py +++ b/miss_htbt_service/config_notif.py @@ -2,6 +2,7 @@ # Copyright 2018-2020 AT&T Intellectual Property, Inc. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. +# Copyright 2021 Samsung Electronics. All rights reserved. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -85,7 +86,7 @@ def commit_and_close_db(connection_db): def read_hb_properties_default(): #Read the hbproperties.yaml for postgress and CBS related data s=open(hb_properties_file, 'r') - a=yaml.load(s) + a=yaml.full_load(s) if((os.getenv('pg_ipAddress') is None) or (os.getenv('pg_portNum') is None) or (os.getenv('pg_userName') is None) or (os.getenv('pg_passwd') is None)): ip_address = a['pg_ipAddress'] port_num = a['pg_portNum'] diff --git a/miss_htbt_service/misshtbtd.py b/miss_htbt_service/misshtbtd.py index 0edc76e..f131cd1 100644 --- a/miss_htbt_service/misshtbtd.py +++ b/miss_htbt_service/misshtbtd.py @@ -3,6 +3,7 @@ # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. +# Copyright 2021 Samsung Electronics. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -225,7 +226,7 @@ def db_monitoring_process(current_pid,jsfile): def read_hb_properties_default(): #Read the hbproperties.yaml for postgress and CBS related data s=open(hb_properties_file, 'r') - a=yaml.load(s) + a=yaml.full_load(s) if((os.getenv('pg_ipAddress') is None) or (os.getenv('pg_portNum') is None) or (os.getenv('pg_userName') is None) or (os.getenv('pg_passwd') is None)): ip_address = a['pg_ipAddress'] diff --git a/miss_htbt_service/mod/trapd_vnf_table.py b/miss_htbt_service/mod/trapd_vnf_table.py index 6b883af..b1691ba 100644 --- a/miss_htbt_service/mod/trapd_vnf_table.py +++ b/miss_htbt_service/mod/trapd_vnf_table.py @@ -4,6 +4,7 @@ # Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved. # Copyright (c) 2019 Pantheon.tech. All rights reserved. # Copyright 2020 Deutsche Telekom. All rights reserved. +# Copyright 2021 Samsung Electronics. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -51,7 +52,7 @@ _logger = get_logger.get_logger(__name__) def hb_properties(): #Read the hbproperties.yaml for postgress and CBS related data s=open(hb_properties_file, 'r') - a=yaml.load(s) + a=yaml.full_load(s) ip_address = a['pg_ipAddress'] port_num = a['pg_portNum'] user_name = a['pg_userName'] diff --git a/requirements.txt b/requirements.txt index 84cfbb0..d72592f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ requests==2.23.0 onap_dcae_cbs_docker_client==1.0.1 six==1.15.0 -PyYAML==3.13 +PyYAML==5.4 httplib2==0.19.0 HTTPretty==1.0.5 pyOpenSSL==20.0.1 @@ -42,7 +42,7 @@ setup( "requests==2.23.0", "onap_dcae_cbs_docker_client==1.0.1", "six==1.15.0", -"PyYAML==3.13", +"PyYAML==5.4", "httplib2==0.19.0", "HTTPretty==1.0.5", "pyOpenSSL==20.0.1", |