From 74c40221f883b7f455ca067bd5cef3b8a40c0972 Mon Sep 17 00:00:00 2001 From: Mark Beierl Date: Fri, 21 Jul 2023 17:13:52 +0000 Subject: [PATCH 01/16] Update version of PyYAML Change-Id: Ib65a9712db84ea4346fdea11c5554845dc2d52ec Signed-off-by: Mark Beierl --- requirements-dev.txt | 2 +- requirements.in | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 46fdb1f..9f8bd6d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -44,5 +44,5 @@ pymongo==4.3.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor -pyyaml==5.4.1 +pyyaml==6.0.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master diff --git a/requirements.in b/requirements.in index c083f65..6cdf466 100644 --- a/requirements.in +++ b/requirements.in @@ -16,7 +16,7 @@ aiokafka peewee jsonschema -pyyaml==5.4.1 +pyyaml>6 pymysql peewee-migrate requests diff --git a/requirements.txt b/requirements.txt index 1690bf4..1cc0804 100644 --- a/requirements.txt +++ b/requirements.txt @@ -44,7 +44,7 @@ pymysql==1.0.3 # via -r requirements.in pyrsistent==0.19.3 # via jsonschema -pyyaml==5.4.1 +pyyaml==6.0.1 # via -r requirements.in requests==2.30.0 # via -r requirements.in -- 2.25.1 From 0d4d67da510e7f9c1169ba36178e8f699bb81b42 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 16 May 2023 18:12:11 +0200 Subject: [PATCH 02/16] Update notifications service to enable certificate validation Change-Id: I6b9ad03f0ba42dcf9bf0c65b3b90caf307dbf0a8 Signed-off-by: garciadeblas --- osm_policy_module/alarming/service.py | 1 - 1 file changed, 1 deletion(-) diff --git a/osm_policy_module/alarming/service.py b/osm_policy_module/alarming/service.py index fceffda..f5a5d9e 100644 --- a/osm_policy_module/alarming/service.py +++ b/osm_policy_module/alarming/service.py @@ -290,7 +290,6 @@ class AlarmingService: url=action.url, data=json.dumps(payload), headers=headers, - verify=False, timeout=alert_timeout, ) log.info("Response %s", resp) -- 2.25.1 From 4f56632acd3bcb32a3b0981c26cc02f2b9bdc4ae Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Thu, 28 Sep 2023 23:44:19 +0200 Subject: [PATCH 03/16] Update pip requirements to pass stage2 and stage3 in all modules Change-Id: I8089c3b333a16400ff99b0564300dd97dd88ac5e Signed-off-by: garciadeblas --- requirements-dev.txt | 12 ++++++------ requirements-test.txt | 4 ++-- requirements.txt | 38 ++++++++++++++++++++++++-------------- tox.ini | 4 ++-- 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 9f8bd6d..cc6daf0 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,15 +14,15 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.0 +aiokafka==0.8.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -async-timeout==4.0.2 +async-timeout==4.0.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -dnspython==2.3.0 +dnspython==2.4.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # pymongo @@ -30,7 +30,7 @@ kafka-python==2.0.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka -motor==3.1.2 +motor==3.3.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in @@ -38,9 +38,9 @@ packaging==23.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka -pycryptodome==3.17 +pycryptodome==3.19.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -pymongo==4.3.3 +pymongo==4.5.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor diff --git a/requirements-test.txt b/requirements-test.txt index 295394e..5392e8e 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.2.5 +coverage==7.3.1 # via -r requirements-test.in -mock==5.0.2 +mock==5.1.0 # via -r requirements-test.in nose2==0.13.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 1cc0804..4323fdf 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,39 +14,49 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.0 +aiokafka==0.8.1 # via -r requirements.in -async-timeout==4.0.2 +async-timeout==4.0.3 # via aiokafka attrs==23.1.0 - # via jsonschema -certifi==2023.5.7 + # via + # jsonschema + # referencing +certifi==2023.7.22 # via requests -charset-normalizer==3.1.0 +charset-normalizer==3.2.0 # via requests -click==8.1.3 +click==8.1.7 # via peewee-migrate idna==3.4 # via requests -jsonschema==4.17.3 +jsonschema==4.19.1 # via -r requirements.in +jsonschema-specifications==2023.7.1 + # via jsonschema kafka-python==2.0.2 # via aiokafka packaging==23.1 # via aiokafka -peewee==3.16.2 +peewee==3.16.3 # via # -r requirements.in # peewee-migrate -peewee-migrate==1.7.1 +peewee-migrate==1.12.2 # via -r requirements.in -pymysql==1.0.3 +pymysql==1.1.0 # via -r requirements.in -pyrsistent==0.19.3 - # via jsonschema pyyaml==6.0.1 # via -r requirements.in -requests==2.30.0 +referencing==0.30.2 + # via + # jsonschema + # jsonschema-specifications +requests==2.31.0 # via -r requirements.in -urllib3==2.0.2 +rpds-py==0.10.3 + # via + # jsonschema + # referencing +urllib3==2.0.5 # via requests diff --git a/tox.ini b/tox.ini index caddd6d..33d241e 100644 --- a/tox.ini +++ b/tox.ini @@ -78,7 +78,7 @@ commands = ####################################################################################### [testenv:pip-compile] -deps = pip-tools==6.6.2 +deps = pip-tools==6.13.0 skip_install = true allowlist_externals = bash [ @@ -86,7 +86,7 @@ commands = - bash -c "for file in requirements*.in ; do \ UNSAFE="" ; \ if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \ - pip-compile -rU --no-header $UNSAFE $file ;\ + pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\ out=`echo $file | sed 's/.in/.txt/'` ; \ sed -i -e '1 e head -16 tox.ini' $out ;\ done" -- 2.25.1 From f3fc17d1e617b499fcbad9ad056aa8c124f1590b Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 29 Sep 2023 14:06:52 +0200 Subject: [PATCH 04/16] Update tests to take into account code changes in certificate validation Change-Id: Icc77c98d1513ca12d53ba55571eab27fd3b77fd9 Signed-off-by: garciadeblas --- osm_policy_module/tests/unit/alarming/test_alarming_service.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/osm_policy_module/tests/unit/alarming/test_alarming_service.py b/osm_policy_module/tests/unit/alarming/test_alarming_service.py index 65025e5..20e98ea 100644 --- a/osm_policy_module/tests/unit/alarming/test_alarming_service.py +++ b/osm_policy_module/tests/unit/alarming/test_alarming_service.py @@ -55,7 +55,6 @@ class TestAlarmingService(TestCase): url="http://alarm-url/", data='{"notify_details": {"alarm_number": 1}}', headers={"content-type": "application/json"}, - verify=False, timeout=alert_timeout, ) else: @@ -78,7 +77,6 @@ class TestAlarmingService(TestCase): url="http://ok-url/", data='{"notify_details": {"alarm_number": 0}}', headers={"content-type": "application/json"}, - verify=False, timeout=alert_timeout, ) else: @@ -103,7 +101,6 @@ class TestAlarmingService(TestCase): url="http://insufficient-data-url/", data='{"notify_details": {"alarm_number": 0}}', headers={"content-type": "application/json"}, - verify=False, timeout=alert_timeout, ) else: -- 2.25.1 From bb6bdfab64270428f29dfa0f03d9b7c35c9faa90 Mon Sep 17 00:00:00 2001 From: Rahul Kumar Date: Thu, 9 Nov 2023 08:45:38 +0000 Subject: [PATCH 05/16] Bug Fix - 2305: Automated scaling of Vnf is not happening through metrics collected by feature Service KPI of VNF using exporter endpoint Change-Id: I5cbb13919539d8727aba2519a50be47f618f24c2 Signed-off-by: Rahul Kumar --- osm_policy_module/alarming/service.py | 2 ++ osm_policy_module/autoscaling/service.py | 4 +++ osm_policy_module/common/mon_client.py | 29 +++++++++++++++---- .../tests/integration/test_policy_agent.py | 12 ++++++++ 4 files changed, 42 insertions(+), 5 deletions(-) diff --git a/osm_policy_module/alarming/service.py b/osm_policy_module/alarming/service.py index f5a5d9e..6466e13 100644 --- a/osm_policy_module/alarming/service.py +++ b/osm_policy_module/alarming/service.py @@ -128,6 +128,8 @@ class AlarmingService: threshold=alarm_descriptor["value"], operation=alarm_descriptor["operation"], action=str(alarm_action), + vnfr=vnfr, + vnfd=vnfd, ) alarm = VnfAlarmRepository.create( alarm_id=alarm_descriptor["alarm-id"], diff --git a/osm_policy_module/autoscaling/service.py b/osm_policy_module/autoscaling/service.py index 5869785..bad3ea0 100644 --- a/osm_policy_module/autoscaling/service.py +++ b/osm_policy_module/autoscaling/service.py @@ -195,6 +195,8 @@ class AutoscalingService: "scale-in-relational-operation" ], action="scale_in", + vnfr=vnfr, + vnfd=vnfd, ) ) alarm = ScalingAlarmRepository.create( @@ -221,6 +223,8 @@ class AutoscalingService: "scale-out-relational-operation" ], action="scale_out", + vnfr=vnfr, + vnfd=vnfd, ) alarm = ScalingAlarmRepository.create( alarm_uuid=alarm_uuid, diff --git a/osm_policy_module/common/mon_client.py b/osm_policy_module/common/mon_client.py index d5e8dfc..e9216aa 100644 --- a/osm_policy_module/common/mon_client.py +++ b/osm_policy_module/common/mon_client.py @@ -50,6 +50,8 @@ class MonClient: operation: str, statistic: str = "AVERAGE", action: str = "", + vnfr: object = None, + vnfd: object = None, ): cor_id = random.randint(1, 10e7) msg = self._build_create_alarm_payload( @@ -62,6 +64,8 @@ class MonClient: statistic, operation, action, + vnfr, + vnfd, ) log.debug("Sending create_alarm_request %s", msg) producer = AIOKafkaProducer( @@ -165,7 +169,26 @@ class MonClient: statistic: str, operation: str, action: str, + vnfr=None, + vnfd=None, ): + tags = { + "ns_id": ns_id, + "vdu_name": vdu_name, + "vnf_member_index": vnf_member_index, + } + if vnfr and vnfd: + # TODO: Change for multiple DF support + df = vnfd.get("df", [{}])[0] + if "exporters-endpoints" in df: + metric_port = df["exporters-endpoints"].get("metric-port", 9100) + if metric_name.startswith("kpi_"): + metric_name = metric_name.replace("kpi_", "") + metric_name.strip() + for vdu in vnfr["vdur"]: + if vdu["name"] == vdu_name: + vdu_ip = vdu["ip-address"] + tags = {"instance": vdu_ip + ":" + str(metric_port)} alarm_create_request = { "correlation_id": cor_id, "alarm_name": "osm_alarm_{}_{}_{}_{}".format( @@ -177,11 +200,7 @@ class MonClient: "threshold_value": threshold, "statistic": statistic, "action": action, - "tags": { - "ns_id": ns_id, - "vdu_name": vdu_name, - "vnf_member_index": vnf_member_index, - }, + "tags": tags, } msg = { "alarm_create_request": alarm_create_request, diff --git a/osm_policy_module/tests/integration/test_policy_agent.py b/osm_policy_module/tests/integration/test_policy_agent.py index e96c7e6..54b4e79 100644 --- a/osm_policy_module/tests/integration/test_policy_agent.py +++ b/osm_policy_module/tests/integration/test_policy_agent.py @@ -525,6 +525,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-1-cirros_vnfd-VM-1", vnf_member_index="1", action="scale_out", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_not_called_with( metric_name="average_memory_utilization", @@ -534,6 +536,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-1-cirros_vnfd-VM-1", vnf_member_index="1", action="scale_out", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_any_call( metric_name="average_memory_utilization", @@ -543,6 +547,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-2-cirros_vnfd-VM-1", vnf_member_index="2", action="scale_out", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) create_alarm.assert_not_called_with( metric_name="average_memory_utilization", @@ -552,6 +558,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-2-cirros_vnfd-VM-1", vnf_member_index="2", action="scale_out", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) scaling_record = ScalingGroup.get() self.assertEqual(scaling_record.name, "scale_cirros_vnfd-VM") @@ -593,6 +601,8 @@ class PolicyModuleAgentTest(unittest.TestCase): threshold=20.0, operation="LT", action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_any_call( metric_name="average_memory_utilization", @@ -602,6 +612,8 @@ class PolicyModuleAgentTest(unittest.TestCase): threshold=20.0, operation="LT", action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) @patch.object(DbMongo, "db_connect", Mock()) -- 2.25.1 From 055c4ee00f83647e7e807aa3d44c3384d9d79aa2 Mon Sep 17 00:00:00 2001 From: elumalai Date: Tue, 14 Nov 2023 21:03:34 +0530 Subject: [PATCH 06/16] Bug 2315: Fix for Unable to update healing policy using NS Update Change-Id: I63d71756392eba12eec9feb688cc1ccdda57f7bf Signed-off-by: elumalai --- osm_policy_module/core/agent.py | 4 +++ osm_policy_module/healing/service.py | 27 ++++++++++++++----- .../tests/unit/core/test_policy_agent.py | 18 +++++++++++++ 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/osm_policy_module/core/agent.py b/osm_policy_module/core/agent.py index 696f69c..4a20527 100644 --- a/osm_policy_module/core/agent.py +++ b/osm_policy_module/core/agent.py @@ -184,10 +184,14 @@ class PolicyModuleAgent: nsr_id, vnf_member_index ) await self.alarming_service.delete_vnf_alarms(nsr_id, vnf_member_index) + await self.healing_service.delete_healing_alarms(nsr_id, vnf_member_index) await self.autoscaling_service.configure_scaling_groups( nsr_id, vnf_member_index ) await self.alarming_service.configure_vnf_alarms(nsr_id, vnf_member_index) + await self.healing_service.configure_healing_alarms( + nsr_id, vnf_member_index + ) else: log.info( "Network service is not in COMPLETED or PARTIALLY_COMPLETED state. " diff --git a/osm_policy_module/healing/service.py b/osm_policy_module/healing/service.py index 4376852..b36f867 100644 --- a/osm_policy_module/healing/service.py +++ b/osm_policy_module/healing/service.py @@ -24,6 +24,8 @@ ## import logging import datetime +import functools +import operator from osm_policy_module.common.common_db_client import CommonDbClient from osm_policy_module.common.lcm_client import LcmClient @@ -51,17 +53,23 @@ class HealingService: self.lcm_client = LcmClient(config) log.info("Constructor created for HealingService") - async def configure_healing_alarms(self, nsr_id: str): + async def configure_healing_alarms(self, nsr_id: str, vnf_member_index=None): """ Configuring the Healing alarms :param nsr_id: Network service record id + :param vnf_member_index: Member VNF Index of VNF """ log.info("Configuring Healing alarm for NS %s", nsr_id) alarms_created = [] database.db.connect() try: with database.db.atomic(): - vnfrs = self.db_client.get_vnfrs(nsr_id) + if vnf_member_index is None: + vnfrs = self.db_client.get_vnfrs(nsr_id) + else: + vnfrs = [] + vnfr = self.db_client.get_vnfr(nsr_id, vnf_member_index) + vnfrs.append(vnfr) for vnfr in vnfrs: vnfd = self.db_client.get_vnfd(vnfr["vnfd-id"]) df = vnfd.get("df", [{}])[0] @@ -178,18 +186,25 @@ class HealingService: finally: database.db.close() - async def delete_healing_alarms(self, nsr_id): + async def delete_healing_alarms(self, nsr_id, vnf_member_index=None): """ Deleting the healing alarms :param nsr_id: Network service record id + :param vnf_member_index: Member VNF Index of VNF """ log.info("Deleting healing vnf alarms for network service %s", nsr_id) database.db.connect() try: with database.db.atomic(): - for alarm in HealingActionRepository.list( - HealingAction.nsr_id == nsr_id - ): + if vnf_member_index is None: + heal_conditions = HealingAction.nsr_id == nsr_id + else: + query_list = [ + HealingAction.nsr_id == nsr_id, + HealingAction.vnf_member_index == vnf_member_index, + ] + heal_conditions = functools.reduce(operator.and_, query_list) + for alarm in HealingActionRepository.list(heal_conditions): try: await self.mon_client.delete_alarm( alarm.nsr_id, diff --git a/osm_policy_module/tests/unit/core/test_policy_agent.py b/osm_policy_module/tests/unit/core/test_policy_agent.py index 32d88a2..7aab928 100644 --- a/osm_policy_module/tests/unit/core/test_policy_agent.py +++ b/osm_policy_module/tests/unit/core/test_policy_agent.py @@ -110,16 +110,24 @@ class PolicyAgentTest(unittest.TestCase): @mock.patch("osm_policy_module.alarming.service.LcmClient") @mock.patch("osm_policy_module.autoscaling.service.MonClient") @mock.patch("osm_policy_module.autoscaling.service.LcmClient") + @mock.patch("osm_policy_module.healing.service.MonClient") + @mock.patch("osm_policy_module.healing.service.LcmClient") + @mock.patch.object(HealingService, "configure_healing_alarms") @mock.patch.object(AutoscalingService, "configure_scaling_groups") @mock.patch.object(AlarmingService, "configure_vnf_alarms") + @mock.patch.object(HealingService, "delete_healing_alarms") @mock.patch.object(AutoscalingService, "delete_scaling_groups") @mock.patch.object(AlarmingService, "delete_vnf_alarms") def test_handle_policy_update( self, delete_vnf_alarms, delete_scaling_groups, + delete_healing_alarms, configure_vnf_alarms, configure_scaling_groups, + configure_healing_alarms, + healing_lcm_client, + healing_mon_client, autoscaling_lcm_client, autoscaling_mon_client, alarming_lcm_client, @@ -131,18 +139,26 @@ class PolicyAgentTest(unittest.TestCase): async def mock_delete_vnf_alarms(nsr_id, vnf_member_index): pass + async def mock_delete_healing_alarms(nsr_id, vnf_member_index): + pass + async def mock_configure_scaling_groups(nsr_id, vnf_member_index): pass async def mock_configure_vnf_alarms(nsr_id, vnf_member_index): pass + async def mock_configure_healing_alarms(nsr_id, vnf_member_index): + pass + config = Config() agent = PolicyModuleAgent(config) assert autoscaling_lcm_client.called assert autoscaling_mon_client.called assert alarming_lcm_client.called assert alarming_mon_client.called + assert healing_lcm_client.called + assert healing_mon_client.called content = { "nsr_id": "test_nsr_id", "vnf_member_index": "1", @@ -155,8 +171,10 @@ class PolicyAgentTest(unittest.TestCase): } configure_scaling_groups.side_effect = mock_configure_scaling_groups configure_vnf_alarms.side_effect = mock_configure_vnf_alarms + configure_healing_alarms.side_effect = mock_configure_healing_alarms delete_scaling_groups.side_effect = mock_delete_scaling_groups delete_vnf_alarms.side_effect = mock_delete_vnf_alarms + delete_healing_alarms.side_effect = mock_delete_healing_alarms self.loop.run_until_complete(agent._handle_policy_update(content)) configure_scaling_groups.assert_called_with("test_nsr_id", "1") -- 2.25.1 From 31ded24b16ff6996cd97e7ecb7f7f144f42a2ef5 Mon Sep 17 00:00:00 2001 From: 37178 Date: Tue, 26 Mar 2024 05:32:43 +0000 Subject: [PATCH 07/16] Bug 2358 Fix for Alarm Number for Alarm notification is getting started from 0 when metric value is increased just after instantiation. Change-Id: I393ae8e5044126cd3108ecd195131c74ae8ef822 Signed-off-by: 37178 --- osm_policy_module/alarming/service.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/osm_policy_module/alarming/service.py b/osm_policy_module/alarming/service.py index 6466e13..f3a316d 100644 --- a/osm_policy_module/alarming/service.py +++ b/osm_policy_module/alarming/service.py @@ -273,7 +273,14 @@ class AlarmingService: status, ) try: - if status == "alarm" and alarm.last_action == "ok": + if ( + status == "alarm" + and alarm.last_action == "ok" + or ( + status == "alarm" + and alarm.last_action == "insufficient-data" + ) + ): alarm.id_suffix += 1 alarm.ok_ack = False if status == "ok" and alarm.last_action == "alarm": -- 2.25.1 From ecf3f132b696fb51f22320a17477fa7b0a3001f1 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 22 May 2024 23:34:07 +0200 Subject: [PATCH 08/16] Fix pylint issues appeared with version 3.2.0 of pylint Change-Id: I633edb9975747f0c9c4009eaf8fa3ebf0f36452d Signed-off-by: garciadeblas --- osm_policy_module/common/mon_client.py | 1 + 1 file changed, 1 insertion(+) diff --git a/osm_policy_module/common/mon_client.py b/osm_policy_module/common/mon_client.py index e9216aa..0142096 100644 --- a/osm_policy_module/common/mon_client.py +++ b/osm_policy_module/common/mon_client.py @@ -180,6 +180,7 @@ class MonClient: if vnfr and vnfd: # TODO: Change for multiple DF support df = vnfd.get("df", [{}])[0] + metric_port = 9100 if "exporters-endpoints" in df: metric_port = df["exporters-endpoints"].get("metric-port", 9100) if metric_name.startswith("kpi_"): -- 2.25.1 From bfe6988e8ec5ad9283200f46134529cac10e006c Mon Sep 17 00:00:00 2001 From: "k4.rahul" Date: Thu, 27 Apr 2023 12:25:59 +0530 Subject: [PATCH 09/16] Coverity-CWE 330: Use of Insufficiently Random Values (137944 Cryptographically weak PRNG) Added fix for CWE 330: Use of Insufficiently Random Value (Cryptographically weak PRNG) use SystemRandom().randint() instead of randint() to generate Cryptographically secure random values Change-Id: I02b5ce9bf1826f60a183d6e793cb0661dc120a43 Signed-off-by: k4.rahul --- osm_policy_module/common/mon_client.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/osm_policy_module/common/mon_client.py b/osm_policy_module/common/mon_client.py index 0142096..e4f7533 100644 --- a/osm_policy_module/common/mon_client.py +++ b/osm_policy_module/common/mon_client.py @@ -23,7 +23,7 @@ ## import json import logging -import random +from random import SystemRandom from json import JSONDecodeError import yaml @@ -53,7 +53,7 @@ class MonClient: vnfr: object = None, vnfd: object = None, ): - cor_id = random.randint(1, 10e7) + cor_id = SystemRandom().randint(1, 10e7) msg = self._build_create_alarm_payload( cor_id, metric_name, @@ -111,7 +111,7 @@ class MonClient: async def delete_alarm( self, ns_id: str, vnf_member_index: str, vdu_name: str, alarm_uuid: str ): - cor_id = random.randint(1, 10e7) + cor_id = SystemRandom().randint(1, 10e7) msg = self._build_delete_alarm_payload( cor_id, ns_id, vdu_name, vnf_member_index, alarm_uuid ) -- 2.25.1 From 45584630042c4557658826bda393dc93650c0063 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 7 Aug 2024 01:47:27 +0200 Subject: [PATCH 10/16] Update pip dependencies Change-Id: If3dff656cf1155834bc51cb2cae573f285fcaabe Signed-off-by: garciadeblas --- requirements-dev.txt | 22 +++++++++++----------- requirements-test.txt | 4 ++-- requirements.txt | 36 ++++++++++++++++++------------------ 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index cc6daf0..02b04cb 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.1 +aiokafka==0.11.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master async-timeout==4.0.3 # via @@ -22,27 +22,27 @@ async-timeout==4.0.3 # aiokafka dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -dnspython==2.4.2 +dnspython==2.6.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # pymongo -kafka-python==2.0.2 - # via - # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master - # aiokafka -motor==3.3.1 +motor==3.5.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in -packaging==23.1 +packaging==24.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka -pycryptodome==3.19.0 +pycryptodome==3.20.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -pymongo==4.5.0 +pymongo==4.8.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor -pyyaml==6.0.1 +pyyaml==6.0.2 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master +typing-extensions==4.12.2 + # via + # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master + # aiokafka diff --git a/requirements-test.txt b/requirements-test.txt index 5392e8e..1a6c1bd 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.3.1 +coverage==7.6.1 # via -r requirements-test.in mock==5.1.0 # via -r requirements-test.in -nose2==0.13.0 +nose2==0.15.1 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 4323fdf..8575f22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,49 +14,49 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.8.1 +aiokafka==0.11.0 # via -r requirements.in async-timeout==4.0.3 # via aiokafka -attrs==23.1.0 +attrs==24.2.0 # via # jsonschema # referencing -certifi==2023.7.22 +certifi==2024.7.4 # via requests -charset-normalizer==3.2.0 +charset-normalizer==3.3.2 # via requests click==8.1.7 # via peewee-migrate -idna==3.4 +idna==3.7 # via requests -jsonschema==4.19.1 +jsonschema==4.23.0 # via -r requirements.in -jsonschema-specifications==2023.7.1 +jsonschema-specifications==2023.12.1 # via jsonschema -kafka-python==2.0.2 +packaging==24.1 # via aiokafka -packaging==23.1 - # via aiokafka -peewee==3.16.3 +peewee==3.17.6 # via # -r requirements.in # peewee-migrate -peewee-migrate==1.12.2 +peewee-migrate==1.13.0 # via -r requirements.in -pymysql==1.1.0 +pymysql==1.1.1 # via -r requirements.in -pyyaml==6.0.1 +pyyaml==6.0.2 # via -r requirements.in -referencing==0.30.2 +referencing==0.35.1 # via # jsonschema # jsonschema-specifications -requests==2.31.0 +requests==2.32.3 # via -r requirements.in -rpds-py==0.10.3 +rpds-py==0.20.0 # via # jsonschema # referencing -urllib3==2.0.5 +typing-extensions==4.12.2 + # via aiokafka +urllib3==2.2.2 # via requests -- 2.25.1 From 0aea5eae0053a25dba3d8a21a20ffed241ad0177 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 7 Aug 2024 02:00:53 +0200 Subject: [PATCH 11/16] Fix coverage and pylint test after updating pip dependencies Change-Id: Iacc83ea3c4fdf94ff13f5a793e973a7f8366a44e Signed-off-by: garciadeblas --- .../tests/integration/test_kafka_messages.py | 2 +- osm_policy_module/tests/integration/test_policy_agent.py | 8 ++++---- tox.ini | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/osm_policy_module/tests/integration/test_kafka_messages.py b/osm_policy_module/tests/integration/test_kafka_messages.py index 725cc3f..4a55d6e 100644 --- a/osm_policy_module/tests/integration/test_kafka_messages.py +++ b/osm_policy_module/tests/integration/test_kafka_messages.py @@ -29,7 +29,7 @@ import sys import unittest from aiokafka import AIOKafkaProducer, AIOKafkaConsumer -from kafka.errors import KafkaError +from aiokafka.errors import KafkaError from osm_policy_module.core.config import Config diff --git a/osm_policy_module/tests/integration/test_policy_agent.py b/osm_policy_module/tests/integration/test_policy_agent.py index 54b4e79..46f0b32 100644 --- a/osm_policy_module/tests/integration/test_policy_agent.py +++ b/osm_policy_module/tests/integration/test_policy_agent.py @@ -29,7 +29,7 @@ import unittest import uuid from unittest.mock import patch, Mock -from kafka import KafkaProducer +from aiokafka import AIOKafkaProducer from osm_common.dbmongo import DbMongo from playhouse.db_url import connect @@ -482,7 +482,7 @@ class PolicyModuleAgentTest(unittest.TestCase): os.remove("test_db.sqlite") @patch.object(DbMongo, "db_connect", Mock()) - @patch.object(KafkaProducer, "__init__") + @patch.object(AIOKafkaProducer, "__init__") @patch.object(MonClient, "create_alarm") @patch.object(CommonDbClient, "get_vnfd") @patch.object(CommonDbClient, "get_nsr") @@ -566,7 +566,7 @@ class PolicyModuleAgentTest(unittest.TestCase): self.assertEqual(scaling_record.nsr_id, "test_nsr_id") @patch.object(DbMongo, "db_connect", Mock()) - @patch.object(KafkaProducer, "__init__") + @patch.object(AIOKafkaProducer, "__init__") @patch.object(MonClient, "create_alarm") @patch.object(CommonDbClient, "get_vnfd") @patch.object(CommonDbClient, "get_nsr") @@ -617,7 +617,7 @@ class PolicyModuleAgentTest(unittest.TestCase): ) @patch.object(DbMongo, "db_connect", Mock()) - @patch.object(KafkaProducer, "__init__") + @patch.object(AIOKafkaProducer, "__init__") @patch.object(MonClient, "create_alarm") @patch.object(CommonDbClient, "get_vnfd") @patch.object(CommonDbClient, "get_nsr") diff --git a/tox.ini b/tox.ini index 33d241e..ffbc713 100644 --- a/tox.ini +++ b/tox.ini @@ -62,7 +62,7 @@ commands = deps = {[testenv]deps} -r{toxinidir}/requirements-dev.txt -r{toxinidir}/requirements-test.txt - pylint + pylint==3.2.2 commands = pylint -E osm_policy_module -- 2.25.1 From cb4bcd51a5cc6777363b8ababfebe750f44ba607 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Sun, 15 Dec 2024 10:46:44 +0100 Subject: [PATCH 12/16] Update pip dependencies Change-Id: I899aa85398a4822497e0b9afec4ee8e56b001115 Signed-off-by: garciadeblas --- requirements-dev.txt | 14 +++++++------- requirements-test.txt | 2 +- requirements.txt | 20 ++++++++++---------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 02b04cb..fdf39d4 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -14,29 +14,29 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.11.0 +aiokafka==0.12.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -async-timeout==4.0.3 +async-timeout==5.0.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka dataclasses==0.6 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -dnspython==2.6.1 +dnspython==2.7.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # pymongo -motor==3.5.1 +motor==3.6.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in -packaging==24.1 +packaging==24.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka -pycryptodome==3.20.0 +pycryptodome==3.21.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -pymongo==4.8.0 +pymongo==4.9.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor diff --git a/requirements-test.txt b/requirements-test.txt index 1a6c1bd..b743b63 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.6.1 +coverage==7.6.9 # via -r requirements-test.in mock==5.1.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 8575f22..d088c63 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,29 +14,29 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -aiokafka==0.11.0 +aiokafka==0.12.0 # via -r requirements.in -async-timeout==4.0.3 +async-timeout==5.0.1 # via aiokafka attrs==24.2.0 # via # jsonschema # referencing -certifi==2024.7.4 +certifi==2024.12.14 # via requests -charset-normalizer==3.3.2 +charset-normalizer==3.4.0 # via requests click==8.1.7 # via peewee-migrate -idna==3.7 +idna==3.10 # via requests jsonschema==4.23.0 # via -r requirements.in -jsonschema-specifications==2023.12.1 +jsonschema-specifications==2024.10.1 # via jsonschema -packaging==24.1 +packaging==24.2 # via aiokafka -peewee==3.17.6 +peewee==3.17.8 # via # -r requirements.in # peewee-migrate @@ -52,11 +52,11 @@ referencing==0.35.1 # jsonschema-specifications requests==2.32.3 # via -r requirements.in -rpds-py==0.20.0 +rpds-py==0.22.3 # via # jsonschema # referencing typing-extensions==4.12.2 # via aiokafka -urllib3==2.2.2 +urllib3==2.2.3 # via requests -- 2.25.1 From 029051a3e6c1da939ac4fd12dcc3e4d1130ba556 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 16 Dec 2024 15:42:39 +0100 Subject: [PATCH 13/16] Pin async-timeout to 4.0.3 and update pip dependencies Change-Id: I1f0df0d86433988bf6b3d5b36b9e88a3aeb61485 Signed-off-by: garciadeblas --- requirements-dev.txt | 2 +- requirements.in | 1 + requirements.txt | 8 +++++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index fdf39d4..45195ee 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -16,7 +16,7 @@ ####################################################################################### aiokafka==0.12.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -async-timeout==5.0.1 +async-timeout==4.0.3 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka diff --git a/requirements.in b/requirements.in index 6cdf466..49dc5b4 100644 --- a/requirements.in +++ b/requirements.in @@ -14,6 +14,7 @@ # limitations under the License. aiokafka +async-timeout==4.0.3 peewee jsonschema pyyaml>6 diff --git a/requirements.txt b/requirements.txt index d088c63..b823caa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,9 +16,11 @@ ####################################################################################### aiokafka==0.12.0 # via -r requirements.in -async-timeout==5.0.1 - # via aiokafka -attrs==24.2.0 +async-timeout==4.0.3 + # via + # -r requirements.in + # aiokafka +attrs==24.3.0 # via # jsonschema # referencing -- 2.25.1 From f061458b72000be86f0bd4f76c97dac30a72888a Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 11 Mar 2025 23:39:39 +0100 Subject: [PATCH 14/16] Update pip dependencies Change-Id: Ib4563f37606b4f5d7cde04a45d78f50b0213d82e Signed-off-by: garciadeblas --- requirements-dev.txt | 4 ++-- requirements-test.txt | 4 ++-- requirements.txt | 20 +++++++++++--------- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 45195ee..533e333 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -26,7 +26,7 @@ dnspython==2.7.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # pymongo -motor==3.6.0 +motor==3.7.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in @@ -36,7 +36,7 @@ packaging==24.2 # aiokafka pycryptodome==3.21.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -pymongo==4.9.2 +pymongo==4.11.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor diff --git a/requirements-test.txt b/requirements-test.txt index b743b63..77923bb 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,9 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.6.9 +coverage==7.6.12 # via -r requirements-test.in -mock==5.1.0 +mock==5.2.0 # via -r requirements-test.in nose2==0.15.1 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index b823caa..1bf742c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,15 +20,15 @@ async-timeout==4.0.3 # via # -r requirements.in # aiokafka -attrs==24.3.0 +attrs==25.1.0 # via # jsonschema # referencing -certifi==2024.12.14 +certifi==2025.1.31 # via requests -charset-normalizer==3.4.0 +charset-normalizer==3.4.1 # via requests -click==8.1.7 +click==8.1.8 # via peewee-migrate idna==3.10 # via requests @@ -38,7 +38,7 @@ jsonschema-specifications==2024.10.1 # via jsonschema packaging==24.2 # via aiokafka -peewee==3.17.8 +peewee==3.17.9 # via # -r requirements.in # peewee-migrate @@ -48,17 +48,19 @@ pymysql==1.1.1 # via -r requirements.in pyyaml==6.0.2 # via -r requirements.in -referencing==0.35.1 +referencing==0.36.2 # via # jsonschema # jsonschema-specifications requests==2.32.3 # via -r requirements.in -rpds-py==0.22.3 +rpds-py==0.23.1 # via # jsonschema # referencing typing-extensions==4.12.2 - # via aiokafka -urllib3==2.2.3 + # via + # aiokafka + # referencing +urllib3==2.3.0 # via requests -- 2.25.1 From 0e814ddb6f1bf595ceeb5857a1749e7a2968a402 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 24 Jun 2025 20:04:23 +0200 Subject: [PATCH 15/16] Update pip dependencies Change-Id: I2f79fecd35c9459a20c6e7a4ccc9bbb6e7f2f796 Signed-off-by: garciadeblas --- requirements-dev.txt | 10 +++++----- requirements-test.txt | 2 +- requirements.txt | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 533e333..2330a8d 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -26,23 +26,23 @@ dnspython==2.7.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # pymongo -motor==3.7.0 +motor==3.7.1 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master osm-common @ git+https://osm.etsi.org/gerrit/osm/common.git@master # via -r requirements-dev.in -packaging==24.2 +packaging==25.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka -pycryptodome==3.21.0 +pycryptodome==3.23.0 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -pymongo==4.11.2 +pymongo==4.13.2 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # motor pyyaml==6.0.2 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -typing-extensions==4.12.2 +typing-extensions==4.14.0 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka diff --git a/requirements-test.txt b/requirements-test.txt index 77923bb..c1c64b7 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.6.12 +coverage==7.9.1 # via -r requirements-test.in mock==5.2.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 1bf742c..4bec980 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,25 +20,25 @@ async-timeout==4.0.3 # via # -r requirements.in # aiokafka -attrs==25.1.0 +attrs==25.3.0 # via # jsonschema # referencing -certifi==2025.1.31 +certifi==2025.6.15 # via requests -charset-normalizer==3.4.1 +charset-normalizer==3.4.2 # via requests -click==8.1.8 +click==8.2.1 # via peewee-migrate idna==3.10 # via requests -jsonschema==4.23.0 +jsonschema==4.24.0 # via -r requirements.in -jsonschema-specifications==2024.10.1 +jsonschema-specifications==2025.4.1 # via jsonschema -packaging==24.2 +packaging==25.0 # via aiokafka -peewee==3.17.9 +peewee==3.18.1 # via # -r requirements.in # peewee-migrate @@ -52,15 +52,15 @@ referencing==0.36.2 # via # jsonschema # jsonschema-specifications -requests==2.32.3 +requests==2.32.4 # via -r requirements.in -rpds-py==0.23.1 +rpds-py==0.25.1 # via # jsonschema # referencing -typing-extensions==4.12.2 +typing-extensions==4.14.0 # via # aiokafka # referencing -urllib3==2.3.0 +urllib3==2.5.0 # via requests -- 2.25.1 From 8e3f3d184236e87be38e0fd213745afc464f06d0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 1 Aug 2025 17:13:12 +0200 Subject: [PATCH 16/16] Update pip dependencies Signed-off-by: garciadeblas --- requirements-dev.txt | 2 +- requirements-dist.txt | 2 +- requirements-test.txt | 2 +- requirements.txt | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements-dev.txt b/requirements-dev.txt index 2330a8d..7195b6a 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -42,7 +42,7 @@ pymongo==4.13.2 # motor pyyaml==6.0.2 # via -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master -typing-extensions==4.14.0 +typing-extensions==4.14.1 # via # -r https://osm.etsi.org/gitweb/?p=osm/common.git;a=blob_plain;f=requirements.txt;hb=master # aiokafka diff --git a/requirements-dist.txt b/requirements-dist.txt index 8192b48..9fb8953 100644 --- a/requirements-dist.txt +++ b/requirements-dist.txt @@ -16,7 +16,7 @@ ####################################################################################### setuptools-version-command==99.9 # via -r requirements-dist.in -stdeb==0.10.0 +stdeb==0.10.2 # via -r requirements-dist.in # The following packages are considered to be unsafe in a requirements file: diff --git a/requirements-test.txt b/requirements-test.txt index c1c64b7..b400561 100644 --- a/requirements-test.txt +++ b/requirements-test.txt @@ -14,7 +14,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ####################################################################################### -coverage==7.9.1 +coverage==7.10.1 # via -r requirements-test.in mock==5.2.0 # via -r requirements-test.in diff --git a/requirements.txt b/requirements.txt index 4bec980..a240853 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,7 +24,7 @@ attrs==25.3.0 # via # jsonschema # referencing -certifi==2025.6.15 +certifi==2025.7.14 # via requests charset-normalizer==3.4.2 # via requests @@ -32,13 +32,13 @@ click==8.2.1 # via peewee-migrate idna==3.10 # via requests -jsonschema==4.24.0 +jsonschema==4.25.0 # via -r requirements.in jsonschema-specifications==2025.4.1 # via jsonschema packaging==25.0 # via aiokafka -peewee==3.18.1 +peewee==3.18.2 # via # -r requirements.in # peewee-migrate @@ -54,11 +54,11 @@ referencing==0.36.2 # jsonschema-specifications requests==2.32.4 # via -r requirements.in -rpds-py==0.25.1 +rpds-py==0.26.0 # via # jsonschema # referencing -typing-extensions==4.14.0 +typing-extensions==4.14.1 # via # aiokafka # referencing -- 2.25.1