aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDeepak S <deepak.s@linux.intel.com>2017-08-31 01:08:41 -0700
committerMaciej Skrocki <maciej.skrocki@intel.com>2017-08-31 13:57:06 -0700
commitea9c974d0951bbdce8ae584606c566a83868cb19 (patch)
tree093fcd87241bdcea2ce8ae85eace5d554f3094f3
parentad748320c73587fd09ef7204f03ba3d74567ba78 (diff)
Enable update ip headers for given testcase
Change-Id: I008b3f09695f5e3f484b39d4e70b83e5942de863 Signed-off-by: Deepak S <deepak.s@linux.intel.com> Signed-off-by: Maciej Skrocki <maciej.skrocki@intel.com>
-rw-r--r--tests/unit/network_services/libs/ixia_libs/test_IxNet.py24
-rw-r--r--yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py4
-rw-r--r--yardstick/network_services/traffic_profile/ixia_rfc2544.py2
3 files changed, 15 insertions, 15 deletions
diff --git a/tests/unit/network_services/libs/ixia_libs/test_IxNet.py b/tests/unit/network_services/libs/ixia_libs/test_IxNet.py
index ae4c58de1..7fe83406a 100644
--- a/tests/unit/network_services/libs/ixia_libs/test_IxNet.py
+++ b/tests/unit/network_services/libs/ixia_libs/test_IxNet.py
@@ -268,7 +268,7 @@ class TestIxNextgen(unittest.TestCase):
def test_add_ip_header_v4(self):
static_traffic_params = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -308,7 +308,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
@@ -366,7 +366,7 @@ class TestIxNextgen(unittest.TestCase):
def test_add_ip_header_v4_nothing_to_do(self):
static_traffic_params = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -406,7 +406,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
@@ -464,7 +464,7 @@ class TestIxNextgen(unittest.TestCase):
def test_add_ip_header_v6(self):
static_traffic_profile = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -497,7 +497,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
@@ -547,7 +547,7 @@ class TestIxNextgen(unittest.TestCase):
def test_add_ip_header_v6_nothing_to_do(self):
static_traffic_params = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -579,7 +579,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
@@ -684,7 +684,7 @@ class TestIxNextgen(unittest.TestCase):
def test_ix_update_ether(self):
static_traffic_params = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -723,7 +723,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
@@ -787,7 +787,7 @@ class TestIxNextgen(unittest.TestCase):
def test_ix_update_ether_nothing_to_do(self):
static_traffic_params = {
- "private": {
+ "private_1": {
"id": 1,
"bidir": "False",
"duration": 60,
@@ -820,7 +820,7 @@ class TestIxNextgen(unittest.TestCase):
},
"traffic_type": "continuous"
},
- "public": {
+ "public_1": {
"id": 2,
"bidir": "False",
"duration": 60,
diff --git a/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py b/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
index 2b8905b4f..38831ee86 100644
--- a/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
+++ b/yardstick/network_services/libs/ixia_libs/IxNet/IxNet.py
@@ -113,10 +113,10 @@ class IxNextgen(object):
}
MODE_SEEDS_MAP = {
- 0: ('private', ['256', '2048']),
+ 0: ('private_1', ['256', '2048']),
}
- MODE_SEEDS_DEFAULT = 'public', ['2048', '256']
+ MODE_SEEDS_DEFAULT = 'public_1', ['2048', '256']
@staticmethod
def find_view_obj(view_name, views):
diff --git a/yardstick/network_services/traffic_profile/ixia_rfc2544.py b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
index 5ba00180b..ba532b820 100644
--- a/yardstick/network_services/traffic_profile/ixia_rfc2544.py
+++ b/yardstick/network_services/traffic_profile/ixia_rfc2544.py
@@ -74,7 +74,7 @@ class IXIARFC2544Profile(TrexProfile):
traffic[key]["iload"] = str(self.rate)
ixia_obj.ix_update_frame(traffic)
ixia_obj.ix_update_ether(traffic)
- # ixia_obj.ix_update_ipv4(traffic)
+ ixia_obj.add_ip_header(traffic, 4)
ixia_obj.ix_start_traffic()
self.tmp_drop = 0
self.tmp_throughput = 0