Code Review
/
yardstick.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Add "os_cloud_config" as a new context flag parameter"
[yardstick.git]
/
tests
/
unit
/
network_services
/
traffic_profile
/
test_trex_traffic_profile.py
diff --git
a/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
b/tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
index
c34b975
..
d1009a5
100644
(file)
--- a/
tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
+++ b/
tests/unit/network_services/traffic_profile/test_trex_traffic_profile.py
@@
-1,5
+1,3
@@
-#!/usr/bin/env python
-
# Copyright (c) 2016-2017 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Copyright (c) 2016-2017 Intel Corporation
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@
-153,11
+151,11
@@
class TestTrexProfile(unittest.TestCase):
trex_profile = \
TrexProfile(TrafficProfile)
trex_profile = \
TrexProfile(TrafficProfile)
- self.assert
Equal(None,
trex_profile.set_qinq(qinq))
+ self.assert
IsNone(
trex_profile.set_qinq(qinq))
qinq = {"S-VLAN": {"id": "128-130", "priority": 0, "cfi": 0},
"C-VLAN": {"id": "512-515", "priority": 0, "cfi": 0}}
qinq = {"S-VLAN": {"id": "128-130", "priority": 0, "cfi": 0},
"C-VLAN": {"id": "512-515", "priority": 0, "cfi": 0}}
- self.assert
Equal(None,
trex_profile.set_qinq(qinq))
+ self.assert
IsNone(
trex_profile.set_qinq(qinq))
def test__set_outer_l2_fields(self):
trex_profile = \
def test__set_outer_l2_fields(self):
trex_profile = \
@@
-166,14
+164,14
@@
class TestTrexProfile(unittest.TestCase):
"C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
outer_l2 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l2']
outer_l2['QinQ'] = qinq
"C-VLAN": {"id": 512, "priority": 0, "cfi": 0}}
outer_l2 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l2']
outer_l2['QinQ'] = qinq
- self.assert
Equal(None,
trex_profile._set_outer_l2_fields(outer_l2))
+ self.assert
IsNone(
trex_profile._set_outer_l2_fields(outer_l2))
def test__set_outer_l3v4_fields(self):
trex_profile = \
TrexProfile(TrafficProfile)
outer_l3v4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l3v4']
outer_l3v4['proto'] = 'tcp'
def test__set_outer_l3v4_fields(self):
trex_profile = \
TrexProfile(TrafficProfile)
outer_l3v4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l3v4']
outer_l3v4['proto'] = 'tcp'
- self.assert
Equal(None,
trex_profile._set_outer_l3v4_fields(outer_l3v4))
+ self.assert
IsNone(
trex_profile._set_outer_l3v4_fields(outer_l3v4))
def test__set_outer_l3v6_fields(self):
trex_profile = \
def test__set_outer_l3v6_fields(self):
trex_profile = \
@@
-182,13
+180,13
@@
class TestTrexProfile(unittest.TestCase):
outer_l3v6['proto'] = 'tcp'
outer_l3v6['tc'] = 1
outer_l3v6['hlim'] = 10
outer_l3v6['proto'] = 'tcp'
outer_l3v6['tc'] = 1
outer_l3v6['hlim'] = 10
- self.assert
Equal(None,
trex_profile._set_outer_l3v6_fields(outer_l3v6))
+ self.assert
IsNone(
trex_profile._set_outer_l3v6_fields(outer_l3v6))
def test__set_outer_l4_fields(self):
trex_profile = \
TrexProfile(TrafficProfile)
outer_l4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l4']
def test__set_outer_l4_fields(self):
trex_profile = \
TrexProfile(TrafficProfile)
outer_l4 = self.PROFILE[TrafficProfile.UPLINK]['ipv4']['outer_l4']
- self.assert
Equal(None,
trex_profile._set_outer_l4_fields(outer_l4))
+ self.assert
IsNone(
trex_profile._set_outer_l4_fields(outer_l4))
def test_get_streams(self):
trex_profile = \
def test_get_streams(self):
trex_profile = \