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 "update docker version to 16.04"
[yardstick.git]
/
tests
/
unit
/
network_services
/
vnf_generic
/
vnf
/
test_udp_replay.py
diff --git
a/tests/unit/network_services/vnf_generic/vnf/test_udp_replay.py
b/tests/unit/network_services/vnf_generic/vnf/test_udp_replay.py
index
95bc08b
..
d4d3439
100644
(file)
--- a/
tests/unit/network_services/vnf_generic/vnf/test_udp_replay.py
+++ b/
tests/unit/network_services/vnf_generic/vnf/test_udp_replay.py
@@
-78,7
+78,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
'netmask': '255.255.255.0',
'dst_ip': '152.16.100.20',
'type': 'PCI-PASSTHROUGH',
'netmask': '255.255.255.0',
'dst_ip': '152.16.100.20',
'type': 'PCI-PASSTHROUGH',
- 'vld_id': '
private
_0',
+ 'vld_id': '
uplink
_0',
'ifname': 'xe0',
},
'vnfd-connection-point-ref': 'xe0',
'ifname': 'xe0',
},
'vnfd-connection-point-ref': 'xe0',
@@
-97,7
+97,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
'netmask': '255.255.255.0',
'dst_ip': '152.16.40.20',
'type': 'PCI-PASSTHROUGH',
'netmask': '255.255.255.0',
'dst_ip': '152.16.40.20',
'type': 'PCI-PASSTHROUGH',
- 'vld_id': '
public
_0',
+ 'vld_id': '
downlink
_0',
'ifname': 'xe1',
},
'vnfd-connection-point-ref': 'xe1',
'ifname': 'xe1',
},
'vnfd-connection-point-ref': 'xe1',
@@
-200,7
+200,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
"interfaces": {
"xe0": {
"local_iface_name": "ens786f0",
"interfaces": {
"xe0": {
"local_iface_name": "ens786f0",
- "vld_id":
"private"
,
+ "vld_id":
UdpReplayApproxVnf.UPLINK
,
"netmask": "255.255.255.0",
"vpci": "0000:05:00.0",
"local_ip": "152.16.100.19",
"netmask": "255.255.255.0",
"vpci": "0000:05:00.0",
"local_ip": "152.16.100.19",
@@
-212,7
+212,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
},
"xe1": {
"local_iface_name": "ens786f1",
},
"xe1": {
"local_iface_name": "ens786f1",
- "vld_id":
"public"
,
+ "vld_id":
UdpReplayApproxVnf.DOWNLINK
,
"netmask": "255.255.255.0",
"vpci": "0000:05:00.1",
"local_ip": "152.16.40.19",
"netmask": "255.255.255.0",
"vpci": "0000:05:00.1",
"local_ip": "152.16.40.19",
@@
-268,7
+268,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
"interfaces": {
"xe0": {
"local_iface_name": "ens513f0",
"interfaces": {
"xe0": {
"local_iface_name": "ens513f0",
- "vld_id":
"public"
,
+ "vld_id":
UdpReplayApproxVnf.DOWNLINK
,
"netmask": "255.255.255.0",
"vpci": "0000:02:00.0",
"local_ip": "152.16.40.20",
"netmask": "255.255.255.0",
"vpci": "0000:02:00.0",
"local_ip": "152.16.40.20",
@@
-302,7
+302,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
"interfaces": {
"xe0": {
"local_iface_name": "ens785f0",
"interfaces": {
"xe0": {
"local_iface_name": "ens785f0",
- "vld_id":
"private"
,
+ "vld_id":
UdpReplayApproxVnf.UPLINK
,
"netmask": "255.255.255.0",
"vpci": "0000:05:00.0",
"local_ip": "152.16.100.20",
"netmask": "255.255.255.0",
"vpci": "0000:05:00.0",
"local_ip": "152.16.100.20",
@@
-426,6
+426,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
udp_replay_approx_vnf = UdpReplayApproxVnf(NAME, self.VNFD_0)
udp_replay_approx_vnf._build_config = mock.MagicMock()
udp_replay_approx_vnf.queue_wrapper = mock.MagicMock()
udp_replay_approx_vnf = UdpReplayApproxVnf(NAME, self.VNFD_0)
udp_replay_approx_vnf._build_config = mock.MagicMock()
udp_replay_approx_vnf.queue_wrapper = mock.MagicMock()
+ udp_replay_approx_vnf.scenario_helper = mock.MagicMock()
udp_replay_approx_vnf._run()
udp_replay_approx_vnf._run()
@@
-443,6
+444,8
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
udp_replay_approx_vnf.WAIT_TIME = 0
udp_replay_approx_vnf.setup_helper.setup_vnf_environment = mock.Mock()
udp_replay_approx_vnf.WAIT_TIME = 0
udp_replay_approx_vnf.setup_helper.setup_vnf_environment = mock.Mock()
+ udp_replay_approx_vnf.deploy_helper = mock.MagicMock()
+ udp_replay_approx_vnf.deploy_vnfs = mock.MagicMock()
self.assertIsNone(udp_replay_approx_vnf.instantiate(self.SCENARIO_CFG, self.CONTEXT_CFG))
udp_replay_approx_vnf._vnf_process.is_alive = mock.Mock(return_value=1)
self.assertIsNone(udp_replay_approx_vnf.instantiate(self.SCENARIO_CFG, self.CONTEXT_CFG))
udp_replay_approx_vnf._vnf_process.is_alive = mock.Mock(return_value=1)
@@
-459,6
+462,7
@@
class TestUdpReplayApproxVnf(unittest.TestCase):
udp_replay_approx_vnf.q_out.put("some text PANIC some text")
udp_replay_approx_vnf.setup_helper.setup_vnf_environment = mock.Mock()
udp_replay_approx_vnf.q_out.put("some text PANIC some text")
udp_replay_approx_vnf.setup_helper.setup_vnf_environment = mock.Mock()
+ udp_replay_approx_vnf.deploy_helper = mock.MagicMock()
self.assertIsNone(udp_replay_approx_vnf.instantiate(self.SCENARIO_CFG, self.CONTEXT_CFG))
with self.assertRaises(RuntimeError):
udp_replay_approx_vnf.wait_for_instantiate()
self.assertIsNone(udp_replay_approx_vnf.instantiate(self.SCENARIO_CFG, self.CONTEXT_CFG))
with self.assertRaises(RuntimeError):
udp_replay_approx_vnf.wait_for_instantiate()