Updated test dependencies

Author: Alopalao

.github/workflows/main.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.9]
+        python-version: [3.11]
 
     steps:
     - uses: actions/checkout@v1

controllers/__init__.py

@@ -88,7 +88,7 @@ def upsert_evc(self, evc: Dict) -> Optional[Dict]:
                 **evc,
                 **{"_id": evc["id"]}
             }
-        ).dict(exclude={"inserted_at"}, exclude_none=True)
+        ).model_dump(exclude={"inserted_at"}, exclude_none=True)
         model.setdefault("queue_id", None)
         updated = self.db.evcs.find_one_and_update(
             {"_id": evc["id"]},

db/models.py

@@ -5,19 +5,19 @@
 from datetime import datetime
 from typing import Dict, List, Literal, Optional, Union
 
-from pydantic import BaseModel, Field, validator
+from pydantic import BaseModel, Field, field_validator
 
 
 class DocumentBaseModel(BaseModel):
     """Base model for Mongo documents"""
 
     id: str = Field(None, alias="_id")
-    inserted_at: Optional[datetime]
-    updated_at: Optional[datetime]
+    inserted_at: Optional[datetime] = None
+    updated_at: Optional[datetime] = None
 
-    def dict(self, **kwargs) -> Dict:
+    def model_dump(self, **kwargs) -> Dict:
         """Return a dictionary representation of the model"""
-        values = super().dict(**kwargs)
+        values = super().model_dump(**kwargs)
         if "id" in values and values["id"]:
             values["_id"] = values["id"]
         if "exclude" in kwargs and "_id" in kwargs["exclude"]:
@@ -29,19 +29,19 @@ class CircuitScheduleDoc(BaseModel):
     """EVC circuit schedule model"""
 
     id: str
-    date: Optional[str]
-    frequency: Optional[str]
-    interval: Optional[int]
+    date: Optional[str] = None
+    frequency: Optional[str] = None
+    interval: Optional[int] = None
     action: str
 
 
 class TAGDoc(BaseModel):
     """TAG model"""
     tag_type: str
-    value: Union[int, str, list[list[int]]]
-    mask_list: Optional[list[str, int]]
+    value: Union[int, str, List[List[int]]]
+    mask_list: Optional[List[Union[str, int]]] = None
 
-    @validator('value')
+    @field_validator('value')
     def validate_value(cls, value):
         """Validate value when is a string"""
         if isinstance(value, list):
@@ -56,56 +56,56 @@ def validate_value(cls, value):
 
 class UNIDoc(BaseModel):
     """UNI model"""
-    tag: Optional[TAGDoc]
+    tag: Optional[TAGDoc] = None
     interface_id: str
 
 
 class LinkConstraints(BaseModel):
     """LinkConstraints."""
-    bandwidth: Optional[float]
-    ownership: Optional[str]
-    reliability: Optional[float]
-    utilization: Optional[float]
-    delay: Optional[float]
-    priority: Optional[int]
-    not_ownership: Optional[List[str]]
+    bandwidth: Optional[float] = None
+    ownership: Optional[str] = None
+    reliability: Optional[float] = None
+    utilization: Optional[float] = None
+    delay: Optional[float] = None
+    priority: Optional[int] = None
+    not_ownership: Optional[List[str]] = None
 
 
 class PathConstraints(BaseModel):
     """Pathfinder Constraints."""
-    spf_attribute: Optional[Literal["hop", "delay", "priority"]]
-    spf_max_path_cost: Optional[float]
-    mandatory_metrics: Optional[LinkConstraints]
-    flexible_metrics: Optional[LinkConstraints]
-    minimum_flexible_hits: Optional[int]
-    undesired_links: Optional[List[str]]
+    spf_attribute: Optional[Literal["hop", "delay", "priority"]] = None
+    spf_max_path_cost: Optional[float] = None
+    mandatory_metrics: Optional[LinkConstraints] = None
+    flexible_metrics: Optional[LinkConstraints] = None
+    minimum_flexible_hits: Optional[int] = None
+    undesired_links: Optional[List[str]] = None
 
 
 class EVCUpdateDoc(DocumentBaseModel):
     """Base model when updating an EVC document"""
-    uni_a: Optional[UNIDoc]
-    uni_z: Optional[UNIDoc]
-    name: Optional[str]
-    request_time: Optional[datetime]
-    start_date: Optional[datetime]
-    end_date: Optional[datetime]
-    queue_id: Optional[int]
-    flow_removed_at: Optional[datetime]
-    execution_rounds: Optional[int]
-    bandwidth: Optional[int]
-    primary_path: Optional[List]
-    backup_path: Optional[List]
-    primary_links: Optional[List]
-    backup_links: Optional[List]
-    dynamic_backup_path: Optional[bool]
-    primary_constraints: Optional[PathConstraints]
-    secondary_constraints: Optional[PathConstraints]
-    owner: Optional[str]
-    sb_priority: Optional[int]
-    service_level: Optional[int]
-    circuit_scheduler: Optional[List[CircuitScheduleDoc]]
-    metadata: Optional[dict]
-    enabled: Optional[bool]
+    uni_a: Optional[UNIDoc] = None
+    uni_z: Optional[UNIDoc] = None
+    name: Optional[str] = None
+    request_time: Optional[datetime] = None
+    start_date: Optional[datetime] = None
+    end_date: Optional[datetime] = None
+    queue_id: Optional[int] = None
+    flow_removed_at: Optional[datetime] = None
+    execution_rounds: Optional[int] = None
+    bandwidth: Optional[int] = None
+    primary_path: Optional[List] = None
+    backup_path: Optional[List] = None
+    primary_links: Optional[List] = None
+    backup_links: Optional[List] = None
+    dynamic_backup_path: Optional[bool] = None
+    primary_constraints: Optional[PathConstraints] = None
+    secondary_constraints: Optional[PathConstraints] = None
+    owner: Optional[str] = None
+    sb_priority: Optional[int] = None
+    service_level: Optional[int] = None
+    circuit_scheduler: Optional[List[CircuitScheduleDoc]] = None
+    metadata: Optional[dict] = None
+    enabled: Optional[bool] = None
 
 
 class EVCBaseDoc(DocumentBaseModel):
@@ -114,25 +114,25 @@ class EVCBaseDoc(DocumentBaseModel):
     uni_a: UNIDoc
     uni_z: UNIDoc
     name: str
-    request_time: Optional[datetime]
-    start_date: Optional[datetime]
-    end_date: Optional[datetime]
-    queue_id: Optional[int]
-    flow_removed_at: Optional[datetime]
+    request_time: Optional[datetime] = None
+    start_date: Optional[datetime] = None
+    end_date: Optional[datetime] = None
+    queue_id: Optional[int] = None
+    flow_removed_at: Optional[datetime] = None
     execution_rounds: int = 0
     bandwidth: int = 0
-    primary_path: Optional[List]
-    backup_path: Optional[List]
-    current_path: Optional[List]
-    failover_path: Optional[List]
-    primary_links: Optional[List]
-    backup_links: Optional[List]
+    primary_path: Optional[List] = None
+    backup_path: Optional[List] = None
+    current_path: Optional[List] = None
+    failover_path: Optional[List] = None
+    primary_links: Optional[List] = None
+    backup_links: Optional[List] = None
     dynamic_backup_path: bool
-    primary_constraints: Optional[PathConstraints]
-    secondary_constraints: Optional[PathConstraints]
+    primary_constraints: Optional[PathConstraints] = None
+    secondary_constraints: Optional[PathConstraints] = None
     creation_time: datetime
-    owner: Optional[str]
-    sb_priority: Optional[int]
+    owner: Optional[str] = None
+    sb_priority: Optional[int] = None
     service_level: int = 0
     circuit_scheduler: List[CircuitScheduleDoc]
     archived: bool = False

requirements/dev.in

@@ -4,6 +4,6 @@
 #
 #    pip-compile --output-file requirements/dev.txt requirements/dev.in
 #
--e git+https://github.com/kytos-ng/python-openflow.git#egg=python-openflow
--e git+https://github.com/kytos-ng/kytos.git#egg=kytos[dev]
+-e git+https://github.com/kytos-ng/python-openflow.git@upgrade/python#egg=python-openflow
+-e git+https://github.com/kytos-ng/kytos.git@upgrade/python#egg=kytos[dev]
 -e .

requirements/run.in

@@ -1,3 +1,3 @@
 apscheduler==3.8.0
-requests==2.27.0
+requests==2.31.0
 glom==20.11.0

requirements/run.txt

@@ -1,38 +1,38 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile --output-file=requirements/run.txt requirements/run.in
 #
 apscheduler==3.8.0
     # via -r requirements/run.in
-attrs==21.4.0
+attrs==23.2.0
     # via glom
 boltons==21.0.0
     # via
     #   face
     #   glom
-certifi==2021.10.8
+certifi==2024.2.2
     # via requests
-charset-normalizer==2.0.10
+charset-normalizer==3.3.2
     # via requests
 face==20.1.1
     # via glom
 glom==20.11.0
     # via -r requirements/run.in
-idna==3.3
+idna==3.6
     # via requests
 pytz==2021.3
     # via
     #   apscheduler
     #   tzlocal
-requests==2.27.0
+requests==2.31.0
     # via -r requirements/run.in
 six==1.16.0
     # via apscheduler
 tzlocal==2.1
     # via apscheduler
-urllib3==1.26.7
+urllib3==1.26.18
     # via requests
 
 # The following packages are considered to be unsafe in a requirements file:

tests/unit/test_db_models.py

@@ -95,7 +95,7 @@ def test_document_base_model_dict(self):
         """test_document_base_model_dict."""
         self.evc_dict["_id"] = "some_id"
         model = DocumentBaseModel(**self.evc_dict)
-        assert "_id" not in model.dict(exclude={"_id"})
+        assert "_id" not in model.model_dump(exclude={"_id"})
 
     def test_tagdoc_value(self):
         """Test TAGDoc value restrictions"""