"version 1.8.0"

Author: Vibaswan

RELEASENOTES.md

@@ -1,4 +1,7 @@
 # Release Notes
+### July 2025
+* 1.8.0
+  * support for ixnetwork version 11.00.2407.67 (11.00 Update-1)
 ### May 2025
 * 1.7.0
   * support for ixnetwork version 11.00.2504.10 (11.00 EA)

ixnetwork_restpy/assistants/batch/batchadd.py

@@ -287,6 +287,8 @@ def _handle_multivalue_xpath(self, value, xpath):
                             xpath_dict["stepValue"] = pattern[3]
                         else:
                             xpath_dict["step"] = pattern[3]
+                    if packet_field and len(pattern) == 5:
+                        xpath_dict["countValue"] = pattern[4]
                 elif multivalue_name == "repeatableRandomRange":
                     if pattern[1] is not None:
                         xpath_dict["min"] = pattern[1]
@@ -384,6 +386,7 @@ def _insert_dirty_properties(self, dirty_values, xpath_dict):
     def _commit(self):
         with Timer(self._ixnetwork) as timer:
             self._process_cached_objects()
+            self._sort_traffic_fields()
             errs = self._ixnetwork.ResourceManager.ImportConfig(
                 json.dumps(self._config), False
             )
@@ -529,3 +532,19 @@ def __recursively_fill_hrefs(self, href_dict, ixn_object, ignore_list):
             for key in obj.keys():
                 if isinstance(obj[key], Base):
                     self.__recursively_fill_hrefs(href_dict, obj[key], ignore_list)
+
+    def _sort_traffic_fields(self):
+        tr_fields = {}
+        for item in self._config[::-1]:
+            if "stack[@alias" in item["xpath"]:
+                if len(item.keys()) > 1:
+                    tr_fields[item["xpath"]] = item
+                self._config.remove(item)
+        sorted_values = [
+            it[1]
+            for it in sorted(
+                tr_fields.items(),
+                key=lambda item: tuple(map(int, re.findall(r"-(\d+)", item[0]))),
+            )
+        ]
+        self._config += sorted_values

ixnetwork_restpy/multivalue.py

@@ -314,82 +314,56 @@ def Alternate(self, alternating_value):
         else:
             self._set_pattern("alternate", {"value": alternating_value})
 
-    def Increment(self, start_value=None, step_value=None):
+    def Increment(self, start_value=None, step_value=None, count_value=None):
         """Sets the multivalue to an incrementing pattern
 
         Args
         ----
         - start_value (str): The value at which to begin incrementing
         - step_value (str): The value to increment by
+        - count_value (str): The number of values after which the patter will .
+                             Please note count_value is only valid when used for traffic field in batch add mode.
         """
         if self._parent._mode[0] == "config":
-            # multivalue_dict = dict()
-            # if 'stack' in self._parent._properties['xpath']:
-            #     multivalue_dict['xpath'] = self._get_field_multivalue_xpath(self._href)
-            #     multivalue_dict['valueType'] = 'increment'
-            #     multivalue_dict['auto'] = False
-            #     multivalue_dict['optionalEnabled'] = True
-            #     if start_value is not None:
-            #         multivalue_dict['startValue'] = start_value
-            #     if step_value is not None:
-            #         multivalue_dict['stepValue'] = step_value
-            # else:
-            #     multivalue_dict['xpath'] = self._get_multivalue_xpath(self._href, 'counter')
-            #     multivalue_dict['direction'] = 'increment'
-            #     if start_value is not None:
-            #         multivalue_dict['start'] = start_value
-            #     if step_value is not None:
-            #         multivalue_dict['step'] = step_value
-            #
-            # self._xpathObj._config.append(multivalue_dict)
             attr_list = ["counter", "increment", start_value, step_value]
             if "stack_index" in self._parent._properties:
                 attr_list = ["field"] + attr_list
+                if count_value:
+                    attr_list.append(count_value)
             if self._dirty:
                 self._multiValueObj["multiValue"].append({self._href: attr_list})
             else:
                 self._parent._properties["multiValue"].append({self._href: attr_list})
         else:
+            if count_value is not None:
+                raise Exception("count_value is not valid when used without batch add")
             payload = {"direction": "increment"}
             if start_value is not None:
                 payload["start"] = start_value
             if step_value is not None:
                 payload["step"] = step_value
             self._set_pattern("counter", payload)
 
-    def Decrement(self, start_value=None, step_value=None):
+    def Decrement(self, start_value=None, step_value=None, count_value=None):
         """Sets the multivalue to a decrementing pattern
 
         Args
         ----
         - start_value (str): The value at which to begin decrementing
         - step_value (str): The value to decrement by
+        - count_value (str): The number of values after which the patter will .
+                             Please note count_value is only valid when used for traffic field in batch add mode.
         """
         if self._parent._mode[0] == "config":
-            # multivalue_dict = dict()
-            # if 'stack' in self._parent._properties['xpath']:
-            #     multivalue_dict['xpath'] = self._get_field_multivalue_xpath(self._href)
-            #     multivalue_dict['valueType'] = 'decrement'
-            #     multivalue_dict['auto'] = False
-            #     multivalue_dict['optionalEnabled'] = True
-            #     if start_value is not None:
-            #         multivalue_dict['startValue'] = start_value
-            #     if step_value is not None:
-            #         multivalue_dict['stepValue'] = step_value
-            # else:
-            #     multivalue_dict['xpath'] = self._get_multivalue_xpath(self._href, 'counter')
-            #     multivalue_dict['direction'] = 'decrement'
-            #     if start_value is not None:
-            #         multivalue_dict['start'] = start_value
-            #     if step_value is not None:
-            #         multivalue_dict['step'] = step_value
-            #
-            # self._xpathObj._config.append(multivalue_dict)
             attr_list = ["counter", "decrement", start_value, step_value]
             if "stack_index" in self._parent._properties:
                 attr_list = ["field"] + attr_list
+                if count_value:
+                    attr_list.append(count_value)
             self._parent._properties["multiValue"].append({self._href: attr_list})
         else:
+            if count_value is not None:
+                raise Exception("count_value is not valid when used without batch add")
             payload = {"direction": "decrement"}
             if start_value is not None:
                 payload["start"] = start_value

ixnetwork_restpy/pytest_tests/tests/batch/batch_add/test_batch_add_traffic.py

@@ -313,5 +313,127 @@ def test_batch_add_traffic_for_non_active_fields(ixnetwork):
             assert field.SingleValue == "1.1.1.1"
 
 
+def test_add_multiple_same_traffic_stacks(ixnetwork):
+    with BatchAdd(ixnetwork):
+        vport = ixnetwork.Vport.add().add()
+        vport[0].Name = "myVport_1"
+        vport[0].RxMode = "captureAndMeasure"
+        vport[1].Name = "myVport_2"
+        traffic = ixnetwork.Traffic.TrafficItem
+        tr1 = traffic.add(
+            Name="RAW TCP",
+            BiDirectional=False,
+            TrafficType="raw",
+            TrafficItemType="l2L3",
+        )
+        tr1.EndpointSet.add(
+            Sources=vport[0].Protocols.add(), Destinations=vport[1].Protocols.add()
+        )
+
+        stack = tr1.ConfigElement.add().Stack.add()
+        eth_st = stack.Ethernet.add()
+        eth_st.SourceAddress.Single("00:11:00:00:22:00")
+        eth_st.DestinationAddress.Single("00:33:00:11:22:00")
+
+        vlan_st = stack.Vlan.add()
+        vlan_st.VlanTagVlanID.Single(2)
+        vlan_st.VlanTagVlanUserPriority.Single(7)
+        vlan_st.VlanTagCfi.Single(1)
+
+        vlan_st2 = stack.Vlan.add()[-1]
+        vlan_st2.VlanTagVlanID.Single(1)
+        vlan_st2.VlanTagVlanUserPriority.Single(5)
+        vlan_st2.VlanTagCfi.Single(0)
+
+        ipv4_st = stack.Ipv4.add()
+        ipv4_st.SrcIp.Increment("1.1.1.1", "0.1.1.1", 3)
+
+        tcp_st = stack.Tcp.add()
+        tcp_st.Reserved.Single(1)
+
+        ipv4_st2 = stack.Ipv4.add()[-1]
+        ipv4_st2.Ttl.Decrement("60", "1", 5)
+
+    # finding all stacks now
+    stacks = ixnetwork.Traffic.TrafficItem.find().ConfigElement.find().Stack.find()
+    assert len(stacks) == 7
+    assert stacks[0].StackTypeId == "ethernet"
+    assert stacks[1].StackTypeId == "vlan"
+    assert stacks[2].StackTypeId == "vlan"
+    assert stacks[3].StackTypeId == "ipv4"
+    assert stacks[5].StackTypeId == "ipv4"
+
+    p1 = stacks[1].Field.find(FieldTypeId="^vlan.header.vlanTag.vlanUserPriority$")
+    p2 = stacks[2].Field.find(FieldTypeId="^vlan.header.vlanTag.vlanUserPriority$")
+    p3 = stacks[3].Field.find(FieldTypeId="^ipv4.header.srcIp$")
+    p4 = stacks[5].Field.find(FieldTypeId="^ipv4.header.ttl$")
+    assert p1.SingleValue == "7"
+    assert p2.SingleValue == "5"
+    assert p3.ValueType == "increment"
+    assert p3.StartValue == "1.1.1.1"
+    assert p3.StepValue == "0.1.1.1"
+    assert p3.CountValue == "3"
+    assert p4.ValueType == "decrement"
+    assert p4.StartValue == "60"
+    assert p4.StepValue == "1"
+    assert p4.CountValue == "5"
+
+
+def test_add_multiple_custom_traffic_stacks(ixnetwork):
+    with BatchAdd(ixnetwork):
+        vport = ixnetwork.Vport.add().add()
+        vport[0].Name = "myVport_1"
+        vport[0].RxMode = "captureAndMeasure"
+        vport[1].Name = "myVport_2"
+        traffic = ixnetwork.Traffic.TrafficItem
+        tr1 = traffic.add(
+            Name="RAW TCP",
+            BiDirectional=False,
+            TrafficType="raw",
+            TrafficItemType="l2L3",
+        )
+        tr1.EndpointSet.add(
+            Sources=vport[0].Protocols.add(), Destinations=vport[1].Protocols.add()
+        )
+
+        stack = tr1.ConfigElement.add().Stack.add()
+        eth_st = stack.Ethernet.add()
+        eth_st.SourceAddress.Single("00:11:00:00:22:00")
+        eth_st.DestinationAddress.Single("00:33:00:11:22:00")
+
+        custom1 = stack.Custom.add()
+        custom1.HeaderLength.Single(20)
+        custom1.HeaderData.Single("a")
+
+        custom2 = stack.Customv2.add()
+        custom2.HeaderLength.Single(20)
+        custom2.HeaderData.Single("4aec")
+
+        custom3 = stack.Custom.add()[-1]
+        custom3.HeaderLength.Single(20)
+        custom3.HeaderData.Single("5ecff")
+
+        custom4 = stack.Customv2.add()[-1]
+        custom4.HeaderLength.Single(20)
+        custom4.HeaderData.Single("abc")
+
+    stacks = ixnetwork.Traffic.TrafficItem.find().ConfigElement.find().Stack.find()
+    assert len(stacks) == 6
+    assert stacks[0].StackTypeId == "ethernet"
+    assert stacks[1].StackTypeId == "custom"
+    assert stacks[2].StackTypeId == "custom_v2"
+    assert stacks[3].StackTypeId == "custom"
+    assert stacks[4].StackTypeId == "custom_v2"
+
+    p1 = stacks[1].Field.find(FieldTypeId="^custom.header.data$")
+    p2 = stacks[2].Field.find(FieldTypeId="^custom_v2.header.data$")
+    p3 = stacks[3].Field.find(FieldTypeId="^custom.header.data$")
+    p4 = stacks[4].Field.find(FieldTypeId="^custom_v2.header.data$")
+    assert p1.SingleValue == "a"
+    assert p2.SingleValue == "4AEC"
+    assert p3.SingleValue == "5ecff"
+    assert p4.SingleValue == "0ABC"
+
+
 if __name__ == "__main__":
     pytest.main(["-v", "-s", "--server", "localhost:11009:windows", __file__])

ixnetwork_restpy/testplatform/sessions/ixnetwork/globals/porttestoptions/porttestoptions.py

@@ -36,8 +36,11 @@ class PortTestOptions(Base):
     _SDM_NAME = "portTestOptions"
     _SDM_ATT_MAP = {
         "EnableDpdkPerformanceAcceleration": "enableDpdkPerformanceAcceleration",
+        "PortLldpOperation": "portLldpOperation",
+    }
+    _SDM_ENUM_MAP = {
+        "portLldpOperation": ["noOp", "enablePortLldp", "disablePortLldp"],
     }
-    _SDM_ENUM_MAP = {}
 
     def __init__(self, parent, list_op=False):
         super(PortTestOptions, self).__init__(parent, list_op)
@@ -61,22 +64,38 @@ def EnableDpdkPerformanceAcceleration(self, value):
             self._SDM_ATT_MAP["EnableDpdkPerformanceAcceleration"], value
         )
 
-    def update(self, EnableDpdkPerformanceAcceleration=None):
-        # type: (bool) -> PortTestOptions
+    @property
+    def PortLldpOperation(self):
+        # type: () -> str
+        """
+        Returns
+        -------
+        - str(noOp | enablePortLldp | disablePortLldp): Port LLDP operation performed during port connect/reboot. Please reconnect or reboot the port(s) for this to take effect.
+        """
+        return self._get_attribute(self._SDM_ATT_MAP["PortLldpOperation"])
+
+    @PortLldpOperation.setter
+    def PortLldpOperation(self, value):
+        # type: (str) -> None
+        self._set_attribute(self._SDM_ATT_MAP["PortLldpOperation"], value)
+
+    def update(self, EnableDpdkPerformanceAcceleration=None, PortLldpOperation=None):
+        # type: (bool, str) -> PortTestOptions
         """Updates portTestOptions resource on the server.
 
         Args
         ----
         - EnableDpdkPerformanceAcceleration (bool): Enable DPDK traffic engine mode for performance acceleration in data plane.
+        - PortLldpOperation (str(noOp | enablePortLldp | disablePortLldp)): Port LLDP operation performed during port connect/reboot. Please reconnect or reboot the port(s) for this to take effect.
 
         Raises
         ------
         - ServerError: The server has encountered an uncategorized error condition
         """
         return self._update(self._map_locals(self._SDM_ATT_MAP, locals()))
 
-    def find(self, EnableDpdkPerformanceAcceleration=None):
-        # type: (bool) -> PortTestOptions
+    def find(self, EnableDpdkPerformanceAcceleration=None, PortLldpOperation=None):
+        # type: (bool, str) -> PortTestOptions
         """Finds and retrieves portTestOptions resources from the server.
 
         All named parameters are evaluated on the server using regex. The named parameters can be used to selectively retrieve portTestOptions resources from the server.
@@ -86,6 +105,7 @@ def find(self, EnableDpdkPerformanceAcceleration=None):
         Args
         ----
         - EnableDpdkPerformanceAcceleration (bool): Enable DPDK traffic engine mode for performance acceleration in data plane.
+        - PortLldpOperation (str(noOp | enablePortLldp | disablePortLldp)): Port LLDP operation performed during port connect/reboot. Please reconnect or reboot the port(s) for this to take effect.
 
         Returns
         -------