qarnot 2.18.0__tar.gz → 2.19.0__tar.gz

{qarnot-2.18.0/qarnot.egg-info → qarnot-2.19.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qarnot
-Version: 2.18.0
+Version: 2.19.0
 Summary: Qarnot Computing SDK
 Home-page: https://computing.qarnot.com
 Author: Qarnot computing

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot/_version.py

@@ -8,11 +8,11 @@ import json
 
 version_json = '''
 {
- "date": "2025-05-22T14:41:22+0200",
+ "date": "2025-09-04T17:06:17+0200",
  "dirty": false,
  "error": null,
- "full-revisionid": "9361585630d3dbcc8fa50ecbb9d20d592234a808",
- "version": "v2.18.0"
+ "full-revisionid": "2436d80006a87be548b2235b12f0a6f041ef66c1",
+ "version": "v2.19.0"
 }
 '''  # END VERSION_JSON
 

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot/computing_quotas.py

@@ -70,7 +70,7 @@ class UserReservedSchedulingQuota(UserSchedulingQuota):
     """Describes a reserved scheduling quota for the user.
     """
 
-    def __init__(self, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+    def __init__(self, reservation_name: str, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
         """Create a new UserReservedSchedulingQuota object describing a reserved scheduling quota for the user.
 
         :param str machine_key: Machine key of the reservation.
@@ -86,6 +86,11 @@ class UserReservedSchedulingQuota(UserSchedulingQuota):
 
         Machine key of the reservation.
         """
+        self.reservation_name = reservation_name
+        """:type: :class:`str`
+
+        Name of the reservation.
+        """
 
     @classmethod
     def from_json(cls, json: Dict[str, Any]):
@@ -97,6 +102,7 @@ class UserReservedSchedulingQuota(UserSchedulingQuota):
         if json is None:
             return None
         return cls(
+            json.get('reservationName'),
             json.get('machineKey'),
             json.get('maxCores'),
             json.get('runningCoresCount'),
@@ -142,7 +148,7 @@ class UserComputingQuotas(object):
         return cls(
             UserSchedulingQuota.from_json(json.get('flex')),
             UserSchedulingQuota.from_json(json.get('onDemand')),
-            [UserReservedSchedulingQuota.from_json(v) for v in json.get('reserved', []) if v is not None]
+            [UserReservedSchedulingQuota.from_json(v) for v in (json.get('reserved') if json.get('reserved') is not None else []) if v is not None]
         )
 
 
@@ -201,7 +207,7 @@ class OrganizationReservedSchedulingQuota(OrganizationSchedulingQuota):
     """Describes a reserved scheduling quota for the organization.
     """
 
-    def __init__(self, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
+    def __init__(self, reservation_name: str, machine_key: str, max_cores: int, running_cores_count: int, max_instances: int, running_instances_count: int):
         """Create a new OrganizationReservedSchedulingQuota object describing a reserved scheduling quota for the organization.
 
         :param str machine_key: Machine key of the reservation.
@@ -217,6 +223,11 @@ class OrganizationReservedSchedulingQuota(OrganizationSchedulingQuota):
 
         Machine key of the reservation.
         """
+        self.reservation_name = reservation_name
+        """:type: :class:`str`
+
+        Name of the reservation.
+        """
 
     @classmethod
     def from_json(cls, json: Dict[str, Any]):
@@ -228,6 +239,7 @@ class OrganizationReservedSchedulingQuota(OrganizationSchedulingQuota):
         if json is None:
             return None
         return cls(
+            json.get('reservationName'),
             json.get('machineKey'),
             json.get('maxCores'),
             json.get('runningCoresCount'),
@@ -279,7 +291,7 @@ class OrganizationComputingQuotas(object):
             json.get('name'),
             OrganizationSchedulingQuota.from_json(json.get('flex')),
             OrganizationSchedulingQuota.from_json(json.get('onDemand')),
-            [OrganizationReservedSchedulingQuota.from_json(v) for v in json.get('reserved', []) if v is not None]
+            [OrganizationReservedSchedulingQuota.from_json(v) for v in (json.get('reserved') if json.get('reserved') is not None else []) if v is not None]
         )
 
 

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot/forced_network_rule.py

@@ -20,7 +20,18 @@ class ForcedNetworkRule(object):
             priority: str = None,
             description: str = None,
             to_qbox: Optional[bool] = None,
-            to_payload: Optional[bool] = None):
+            to_payload: Optional[bool] = None,
+            name: str = None,
+            application_type: str = None):
+
+        self.name = name
+        """:type: :class:`str`
+
+        Name of the associated rule."""
+        self.application_type = application_type
+        """:type: :class:`str`
+
+        Application layer protocol used / hint about it (e.g. ssh, http, https...)."""
         self.inbound = inbound
         """:type: :class:`bool`
 
@@ -84,6 +95,14 @@ class ForcedNetworkRule(object):
         :returns: The created :class:`~qarnot.forced_network_rule.ForcedNetworkRule`
         """
 
+        name: str = None
+        if 'name' in json:
+            name = str(json.get("name"))
+
+        application_type: str = None
+        if 'applicationType' in json:
+            application_type = str(json.get("applicationType"))
+
         inbound: bool = bool(json.get("inbound"))
         proto: str = str(json.get("proto"))
 
@@ -96,12 +115,12 @@ class ForcedNetworkRule(object):
             to = str(json.get("to"))
 
         public_host: str = None
-        if 'public_host' in json:
-            public_host = str(json.get("public_host"))
+        if 'publicHost' in json:
+            public_host = str(json.get("publicHost"))
 
         public_port: str = None
-        if 'public_port' in json:
-            public_port = str(json.get("public_port"))
+        if 'publicPort' in json:
+            public_port = str(json.get("publicPort"))
 
         forwarder: str = None
         if 'forwarder' in json:
@@ -116,12 +135,12 @@ class ForcedNetworkRule(object):
             description = str(json.get("description"))
 
         to_qbox: Optional[bool] = None
-        if 'to_qbox' in json:
-            to_qbox = bool(json.get("to_qbox"))
+        if 'toQBox' in json:
+            to_qbox = bool(json.get("toQBox"))
 
         to_payload: Optional[bool] = None
-        if 'to_payload' in json:
-            to_payload = bool(json.get("to_payload"))
+        if 'toPayload' in json:
+            to_payload = bool(json.get("toPayload"))
 
         return ForcedNetworkRule(
             inbound,
@@ -134,7 +153,9 @@ class ForcedNetworkRule(object):
             priority,
             description,
             to_qbox,
-            to_payload)
+            to_payload,
+            name,
+            application_type)
 
     def to_json(self):
         result: Dict[str, Union[str, bool]] = {
@@ -142,6 +163,12 @@ class ForcedNetworkRule(object):
             "proto": self.proto,
         }
 
+        if self.name is not None:
+            result["name"] = self.name
+
+        if self.application_type is not None:
+            result["applicationType"] = self.application_type
+
         if self.port is not None:
             result["port"] = self.port
 
@@ -149,10 +176,10 @@ class ForcedNetworkRule(object):
             result["to"] = self.to
 
         if self.public_host is not None:
-            result["public_host"] = self.public_host
+            result["publicHost"] = self.public_host
 
         if self.public_port is not None:
-            result["public_port"] = self.public_port
+            result["publicPort"] = self.public_port
 
         if self.forwarder is not None:
             result["forwarder"] = self.forwarder
@@ -164,9 +191,9 @@ class ForcedNetworkRule(object):
             result["description"] = self.description
 
         if self.to_qbox is not None:
-            result["to_qbox"] = self.to_qbox
+            result["toQBox"] = self.to_qbox
 
         if self.to_payload is not None:
-            result["to_payload"] = self.to_payload
+            result["toPayload"] = self.to_payload
 
         return result

qarnot-2.19.0/qarnot/multi_slots_settings.py

@@ -0,0 +1,48 @@
+"""Multi Slots Settings that can be used when creating a pool"""
+
+from typing import Dict
+
+
+class MultiSlotsSettings(object):
+    """Represents task multi slots settings."""
+
+    _slotsPerNode: int = None
+
+    def __init__(self, slotsPerNode: int = None):
+        """Create a new :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`.
+
+        :param slotsPerNode: slots per node
+        :type slotsPerNode: int
+        """
+        self._slotsPerNode = slotsPerNode
+
+    @classmethod
+    def from_json(cls, json: Dict[str, int]):
+        """Create the multi slots settings from json.
+
+        :param dict json: Dictionary representing the multi slots settings
+        :returns: The created :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`
+        """
+        slotsPerNode: int = json.get("slotsPerNode")
+        return MultiSlotsSettings(slotsPerNode)
+
+    def to_json(self) -> Dict[str, int]:
+        """Get a dict ready to be json packed.
+
+        :return: the json elements of the class.
+        :rtype: `dict`
+        """
+        return {
+            "slotsPerNode": self._slotsPerNode
+        }
+
+    def __eq__(self, other):
+        if other is None or not isinstance(other, MultiSlotsSettings):
+            return False
+        return self._slotsPerNode == other._slotsPerNode
+
+    def __str__(self) -> str:
+        return "multi slots settings: slotsPerNode {}.".format(self._slotsPerNode)
+
+    def __repr__(self) -> str:
+        return "multi_slots_settings.MultiSlotsSettings(slotsPerNode: {})".format(self._slotsPerNode)

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot/pool.py

@@ -19,6 +19,7 @@ from typing import Dict, List, Optional
 
 from qarnot.carbon_facts import CarbonClient, CarbonFacts
 from qarnot.retry_settings import RetrySettings
+from qarnot.multi_slots_settings import MultiSlotsSettings
 from qarnot.forced_network_rule import ForcedNetworkRule
 from qarnot.secrets import SecretsAccessRights
 
@@ -86,6 +87,7 @@ class Pool(object):
         self._update_cache_time = 5
         self._scheduling_type = scheduling_type
         self._targeted_reserved_machine_key: str = None
+        self._targeted_reservation_name: str = None
 
         self._last_cache = time.time()
         self._instancecount = instancecount
@@ -128,6 +130,7 @@ class Pool(object):
         self._default_resources_cache_ttl_sec: Optional[int] = None
         self._privileges: Privileges = Privileges()
         self._default_retry_settings: RetrySettings = RetrySettings()
+        self._multi_slots_settings: Optional[MultiSlotsSettings] = None
         self._forced_network_rules: List[ForcedNetworkRule] = []
         self._secrets_access_rights: SecretsAccessRights = SecretsAccessRights()
 
@@ -238,10 +241,13 @@ class Pool(object):
         self._hardware_constraints = [HardwareConstraint.from_json(hw_constraint_dict) for hw_constraint_dict in json_pool.get("hardwareConstraints", [])]
         self._default_resources_cache_ttl_sec = json_pool.get("defaultResourcesCacheTTLSec", None)
         self._targeted_reserved_machine_key = json_pool.get("targetedReservedMachineKey", None)
+        self._targeted_reservation_name = json_pool.get("targetedReservationName", None)
         if 'privileges' in json_pool:
             self._privileges = Privileges.from_json(json_pool.get("privileges"))
         if 'defaultRetrySettings' in json_pool:
             self._default_retry_settings = RetrySettings.from_json(json_pool.get("defaultRetrySettings"))
+        if 'multiSlotsSettings' in json_pool:
+            self._multi_slots_settings = MultiSlotsSettings.from_json(json_pool.get("multiSlotsSettings"))
         if 'schedulingType' in json_pool:
             self._scheduling_type = SchedulingType.from_string(json_pool.get("schedulingType"))
         self._forced_network_rules = [ForcedNetworkRule.from_json(forced_network_dict) for forced_network_dict in json_pool.get("forcedNetworkRules", [])]
@@ -309,12 +315,18 @@ class Pool(object):
         if self._targeted_reserved_machine_key is not None:
             json_pool['targetedReservedMachineKey'] = self._targeted_reserved_machine_key
 
+        if self._targeted_reservation_name is not None:
+            json_pool['targetedReservationName'] = self._targeted_reservation_name
+
         if self._forced_network_rules is not None:
             json_pool['forcedNetworkRules'] = [x.to_json() for x in self._forced_network_rules]
 
         if self._secrets_access_rights:
             json_pool['secretsAccessRights'] = self._secrets_access_rights.to_json()
 
+        if self._multi_slots_settings:
+            json_pool['multiSlotsSettings'] = self._multi_slots_settings.to_json()
+
         return json_pool
 
     def submit(self):
@@ -1279,6 +1291,24 @@ class Pool(object):
             raise AttributeError("can't set attribute on a submitted job")
         self._completion_time_to_live = _util.parse_to_timespan_string(value)
 
+    @property
+    def multi_slots_settings(self):
+        """
+        :getter:  Returns this pool's multi slots settings.
+        :type: :class:`~qarnot.multi_slots_settings.MultiSlotsSettings`
+        :default_value: None
+        """
+        self._update_if_summary()
+        return self._multi_slots_settings
+
+    @multi_slots_settings.setter
+    def multi_slots_settings(self, value):
+        """Setter for multi_slots_settings, this can only be set before pool's submission"""
+        self._update_if_summary()
+        if self._multi_slots_settings is not None:
+            raise AttributeError("can't set attribute on a submitted pool")
+        self._multi_slots_settings = value
+
     @property
     def previous_state(self):
         """
@@ -1497,6 +1527,9 @@ class Pool(object):
 
         :getter: The reserved machine key when using the "reserved" scheduling type
 
+        .. deprecated:: v2.19.0
+           Use `self.targeted_reservation_name` instead.
+
         :raises AttributeError: trying to set this after the pool is submitted
         """
         return self._targeted_reserved_machine_key
@@ -1510,6 +1543,25 @@ class Pool(object):
 
         self._targeted_reserved_machine_key = value
 
+    @property
+    def targeted_reservation_name(self) -> str:
+        """:type: :class:`str`
+
+        :getter: The name of the reservation that describes the targeted machines when using the "reserved" scheduling type
+
+        :raises AttributeError: trying to set this after the task is submitted
+        """
+        return self._targeted_reservation_name
+
+    @targeted_reservation_name.setter
+    def targeted_reservation_name(self, value: str):
+        """Setted for targeted_reservation_name
+        """
+        if self.uuid is not None:
+            raise AttributeError("can't set attribute on a launched task")
+
+        self._targeted_reservation_name = value
+
     def __repr__(self):
         return '{0} - {1} - {2} - {3} - {5} - InstanceCount : {4} - Resources : {6} '\
             'Tag {7} - IsElastic {8} - ElasticMin {9} - ElasticMax {10} - ElasticMinIdle {11} -'\

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot/task.py

@@ -132,6 +132,7 @@ class Task(object):
         self._secrets_access_rights: SecretsAccessRights = SecretsAccessRights()
         self._scheduling_type = scheduling_type
         self._targeted_reserved_machine_key: str = None
+        self._targeted_reservation_name: str = None
         self._dependentOn: List[Uuid] = []
 
         self._auto_update = True
@@ -521,6 +522,7 @@ class Task(object):
         self._hardware_constraints = [HardwareConstraint.from_json(hw_constraint_dict) for hw_constraint_dict in json_task.get("hardwareConstraints", [])]
         self._default_resources_cache_ttl_sec = json_task.get("defaultResourcesCacheTTLSec", None)
         self._targeted_reserved_machine_key = json_task.get("targetedReservedMachineKey", None)
+        self._targeted_reservation_name = json_task.get("targetedReservationName", None)
         if 'privileges' in json_task:
             self._privileges = Privileges.from_json(json_task.get("privileges"))
         if 'retrySettings' in json_task:
@@ -1641,6 +1643,9 @@ class Task(object):
 
         :getter: The reserved machine key when using the "reserved" scheduling type
 
+        .. deprecated:: v2.19.0
+           Use `self.targeted_reservation_name` instead.
+
         :raises AttributeError: trying to set this after the task is submitted
         """
         return self._targeted_reserved_machine_key
@@ -1654,6 +1659,25 @@ class Task(object):
 
         self._targeted_reserved_machine_key = value
 
+    @property
+    def targeted_reservation_name(self) -> str:
+        """:type: :class:`str`
+
+        :getter: The name of the reservation that describes the targeted machines when using the "reserved" scheduling type
+
+        :raises AttributeError: trying to set this after the task is submitted
+        """
+        return self._targeted_reservation_name
+
+    @targeted_reservation_name.setter
+    def targeted_reservation_name(self, value: str):
+        """Setted for targeted_reservation_name
+        """
+        if self.uuid is not None:
+            raise AttributeError("can't set attribute on a launched task")
+
+        self._targeted_reservation_name = value
+
     @property
     def auto_delete(self):
         """Autodelete this Task if it is finished and your max number of task is reach
@@ -1892,6 +1916,9 @@ class Task(object):
         if self._targeted_reserved_machine_key is not None:
             json_task["targetedReservedMachineKey"] = self._targeted_reserved_machine_key
 
+        if self._targeted_reservation_name is not None:
+            json_task["targetedReservationName"] = self._targeted_reservation_name
+
         if self._forced_network_rules is not None:
             json_task['forcedNetworkRules'] = [x.to_json() for x in self._forced_network_rules]
 

{qarnot-2.18.0 → qarnot-2.19.0/qarnot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qarnot
-Version: 2.18.0
+Version: 2.19.0
 Summary: Qarnot Computing SDK
 Home-page: https://computing.qarnot.com
 Author: Qarnot computing

{qarnot-2.18.0 → qarnot-2.19.0}/qarnot.egg-info/SOURCES.txt

@@ -55,6 +55,7 @@ qarnot/forced_network_rule.py
 qarnot/hardware_constraint.py
 qarnot/helper.py
 qarnot/job.py
+qarnot/multi_slots_settings.py
 qarnot/paginate.py
 qarnot/pool.py
 qarnot/privileges.py

{qarnot-2.18.0 → qarnot-2.19.0}/requirements.txt

@@ -1,6 +1,6 @@
-requests==2.32.3
-boto3==1.38.18
+requests==2.32.5
+boto3==1.40.21
 wheel==0.45.1
 deprecation==2.1.0
 simplejson==3.20.1
-setuptools==80.7.1
+setuptools==80.9.0

{qarnot-2.18.0 → qarnot-2.19.0}/test/test_pool.py

@@ -3,6 +3,7 @@ import uuid
 import pytest
 import qarnot
 from qarnot.forced_network_rule import ForcedNetworkRule
+from qarnot.multi_slots_settings import MultiSlotsSettings
 from qarnot.pool import Pool
 from qarnot.privileges import Privileges
 from qarnot.bucket import Bucket
@@ -263,6 +264,19 @@ class TestPoolProperties:
         assert {"prefix": "another/prefix"} in json_pool['secretsAccessRights']["byPrefix"]
 
 
+    def test_pool_multi_slots_settings_deserialization(self):
+        pool = Pool(self.conn, "pool-multi-slots-deserialization", "profile")
+        pool._update(default_json_pool)
+        assert MultiSlotsSettings(4) == pool.multi_slots_settings
+
+    def test_pool_multi_slots_settings_deserialization_none(self):
+        pool = Pool(self.conn, "pool-multi-slots-deserialization-none", "profile")
+
+        pool_json = copy.deepcopy(default_json_pool)
+        del pool_json["multiSlotsSettings"]
+        pool._update(pool_json)
+        assert None == pool.multi_slots_settings
+
     @pytest.mark.parametrize("json", [
         {
             "bySecret": [
@@ -388,6 +402,7 @@ class TestPoolProperties:
     def test_pool_reserved_scheduling_serialization(self):
         pool = Pool(self.conn, "pool-with-reserved-scheduling", "profile", scheduling_type=ReservedScheduling())
         pool.targeted_reserved_machine_key = "reservedMachine"
+        pool.targeted_reservation_name = "my-reservation"
         assert pool.scheduling_type is not None
         print(pool.scheduling_type)
         assert isinstance(pool.scheduling_type, ReservedScheduling)
@@ -412,10 +427,24 @@ class TestPoolProperties:
         assert isinstance(pool_from_json.scheduling_type, ReservedScheduling)
         assert pool_from_json.scheduling_type.schedulingType == ReservedScheduling.schedulingType
         assert pool.targeted_reserved_machine_key == "reservedMachine"
+        assert pool.targeted_reservation_name == "my-reservation"
+
+    def test_pool_multi_slots_settings_serialization(self):
+        pool = Pool(self.conn, "pool-test-multi-slots-settings-serialization", "profile")
+        pool.multi_slots_settings = MultiSlotsSettings(4)
+
+        json_pool = pool._to_json()
+        assert json_pool["multiSlotsSettings"]["slotsPerNode"] == 4
+
+    def test_pool_no_multi_slots_settings_serialization(self):
+        pool = Pool(self.conn, "pool-test-no-multi-slots-settings-serialization", "profile")
+
+        json_pool = pool._to_json()
+        assert "multiSlotsSettings" not in json_pool
 
     def test_pool_forced_network_rules_serialization(self):
         pool = Pool(self.conn, "pool-with-forced-network-rules", "profile")
-        inbound_rule = ForcedNetworkRule(True, "tcp", "1234", "bound-to-be-alive", priority="1000", description="Inbound test")
+        inbound_rule = ForcedNetworkRule(True, "tcp", "1234", "bound-to-be-alive", priority="1000", description="Inbound test", name="my-living-network", application_type="https")
         outbound_rule = ForcedNetworkRule(False, "tcp", public_port="666", public_host="bound-to-the-devil", priority="1000", description="Outbound test")
         rules = [
             inbound_rule,
@@ -435,11 +464,17 @@ class TestPoolProperties:
         assert json_inbound_rule["to"] == inbound_rule.to
         assert json_inbound_rule["priority"] == inbound_rule.priority
         assert json_inbound_rule["description"] == inbound_rule.description
+        assert json_inbound_rule["name"] == inbound_rule.name
+        assert json_inbound_rule["applicationType"] == inbound_rule.application_type
         json_outbound_rule = json_pool['forcedNetworkRules'][1]
         assert json_outbound_rule["inbound"] == outbound_rule.inbound
         assert json_outbound_rule["proto"] == outbound_rule.proto
         assert json_outbound_rule["priority"] == outbound_rule.priority
         assert json_outbound_rule["description"] == outbound_rule.description
+        assert json_outbound_rule["publicHost"] == outbound_rule.public_host
+        assert json_outbound_rule["publicPort"] == outbound_rule.public_port
+        assert json_outbound_rule.get("name") is None
+        assert json_outbound_rule.get("applicationType") is None
 
         # fields that need to be non null for the deserialization to not fail
         json_pool['creationDate'] = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -459,8 +494,12 @@ class TestPoolProperties:
         assert inbound_from_json.to == inbound_rule.to
         assert inbound_from_json.priority == inbound_rule.priority
         assert inbound_from_json.description == inbound_rule.description
+        assert inbound_from_json.name == inbound_rule.name
+        assert inbound_from_json.application_type == inbound_rule.application_type
         outbound_from_json = pool_from_json.forced_network_rules[1]
         assert outbound_from_json.inbound == outbound_rule.inbound
         assert outbound_from_json.proto == outbound_rule.proto
         assert outbound_from_json.priority == outbound_rule.priority
         assert outbound_from_json.description == outbound_rule.description
+        assert outbound_from_json.public_host == outbound_rule.public_host
+        assert outbound_from_json.public_port == outbound_rule.public_port

{qarnot-2.18.0 → qarnot-2.19.0}/test/test_task.py

@@ -368,6 +368,7 @@ class TestTaskProperties:
     def test_task_reserved_scheduling_serialization(self, mock_conn):
         task = Task(mock_conn, "task-with-reserved-scheduling", scheduling_type=ReservedScheduling())
         task.targeted_reserved_machine_key = "reservedMachine"
+        task.targeted_reservation_name = "my-reservation"
         assert task.scheduling_type is not None
         print(task.scheduling_type)
         assert isinstance(task.scheduling_type, ReservedScheduling)
@@ -392,6 +393,7 @@ class TestTaskProperties:
         assert isinstance(task_from_json.scheduling_type, ReservedScheduling)
         assert task_from_json.scheduling_type.schedulingType == ReservedScheduling.schedulingType
         assert task.targeted_reserved_machine_key == "reservedMachine"
+        assert task.targeted_reservation_name == "my-reservation"
 
     def test_task_secrets_access_rights_are_serialized_correctly(self, mock_conn):
         task = Task(mock_conn, "task-secrets-access-rights-serialization")
@@ -464,7 +466,7 @@ class TestTaskProperties:
 
     def test_task_forced_network_rules_serialization(self, mock_conn):
         task = Task(mock_conn, "task-with-forced-network-rules")
-        inbound_rule = ForcedNetworkRule(True, "tcp", "1234", "bound-to-be-alive", priority="1000", description="Inbound test")
+        inbound_rule = ForcedNetworkRule(True, "tcp", "1234", "bound-to-be-alive", priority="1000", description="Inbound test", name="my-living-network", application_type="https")
         outbound_rule = ForcedNetworkRule(False, "tcp", public_port="666", public_host="bound-to-the-devil", priority="1000", description="Outbound test")
         rules = [
             inbound_rule,
@@ -484,11 +486,17 @@ class TestTaskProperties:
         assert json_inbound_rule["to"] == inbound_rule.to
         assert json_inbound_rule["priority"] == inbound_rule.priority
         assert json_inbound_rule["description"] == inbound_rule.description
+        assert json_inbound_rule["name"] == inbound_rule.name
+        assert json_inbound_rule["applicationType"] == inbound_rule.application_type
         json_outbound_rule = json_task['forcedNetworkRules'][1]
         assert json_outbound_rule["inbound"] == outbound_rule.inbound
         assert json_outbound_rule["proto"] == outbound_rule.proto
         assert json_outbound_rule["priority"] == outbound_rule.priority
         assert json_outbound_rule["description"] == outbound_rule.description
+        assert json_outbound_rule["publicHost"] == outbound_rule.public_host
+        assert json_outbound_rule["publicPort"] == outbound_rule.public_port
+        assert json_outbound_rule.get("name") is None
+        assert json_outbound_rule.get("applicationType") is None
 
         # fields that need to be non null for the deserialization to not fail
         json_task['creationDate'] = datetime.datetime.utcnow().strftime("%Y-%m-%dT%H:%M:%SZ")
@@ -508,11 +516,15 @@ class TestTaskProperties:
         assert inbound_from_json.to == inbound_rule.to
         assert inbound_from_json.priority == inbound_rule.priority
         assert inbound_from_json.description == inbound_rule.description
+        assert inbound_from_json.name == inbound_rule.name
+        assert inbound_from_json.application_type == inbound_rule.application_type
         outbound_from_json = task_from_json.forced_network_rules[1]
         assert outbound_from_json.inbound == outbound_rule.inbound
         assert outbound_from_json.proto == outbound_rule.proto
         assert outbound_from_json.priority == outbound_rule.priority
         assert outbound_from_json.description == outbound_rule.description
+        assert outbound_from_json.public_host == outbound_rule.public_host
+        assert outbound_from_json.public_port == outbound_rule.public_port
 
     # WARNING: this test last at least 80s because task.wait() wait for 10s between each update calls and the task go through 8 different states
     # To make the test faster some states can be removed (the 7 first states are all the states that correspond to a non complete task and keep