updated remaining tests
This commit is contained in:
parent
b36556bb71
commit
d700800a78
165
evaluation.ipynb
165
evaluation.ipynb
@ -158,101 +158,16 @@
|
|||||||
"execution_count": null,
|
"execution_count": null,
|
||||||
"metadata": {
|
"metadata": {
|
||||||
"pycharm": {
|
"pycharm": {
|
||||||
"is_executing": true,
|
|
||||||
"name": "#%%\n"
|
"name": "#%%\n"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"with StandardEnvironment(2, runner, setup_params) as env:\n",
|
"with StandardEnvironment(2, runner, setup_params) as env:\n",
|
||||||
" run_and_save_test(env, StandardTest([1,1]))"
|
" run_and_save_test(env, StandardTest([1,1]))\n",
|
||||||
]
|
" run_and_save_test(env, StandardTest([1,2]))\n",
|
||||||
},
|
" run_and_save_test(env, StandardTest([2,2]))\n",
|
||||||
{
|
" run_and_save_test(env, StandardTest([2,2], events={10: (0,1), 15: (0,2)}, duration=30))\n"
|
||||||
"cell_type": "code",
|
|
||||||
"execution_count": null,
|
|
||||||
"metadata": {
|
|
||||||
"pycharm": {
|
|
||||||
"is_executing": true,
|
|
||||||
"name": "#%%\n"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"outputs": [],
|
|
||||||
"source": [
|
|
||||||
"from pprint import pprint\n",
|
|
||||||
"pprint(directionInbound[StandardTest([1,1]).name()].standard_deviation())"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"cell_type": "code",
|
|
||||||
"execution_count": null,
|
|
||||||
"metadata": {
|
|
||||||
"pycharm": {
|
|
||||||
"name": "#%%\n"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"outputs": [],
|
|
||||||
"source": [
|
|
||||||
"rp = RemotePortal([Interface(IpMethod.Auto4)], setup_params=setup_params)\n",
|
|
||||||
"\n",
|
|
||||||
"st = SpeedTestServer()\n",
|
|
||||||
"cl = SpeedTestServer(clone_interface=rp.get_interfaces()[0])\n",
|
|
||||||
"\n",
|
|
||||||
"lp = LocalPortal([\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
"], cl, setup_params=setup_params)\n",
|
|
||||||
"\n",
|
|
||||||
"rp.set_local_portal(lp)\n",
|
|
||||||
"lp.set_remote_portal(rp)\n",
|
|
||||||
"\n",
|
|
||||||
"top_level_bridge = Bridge(\n",
|
|
||||||
" st.get_interfaces()[0],\n",
|
|
||||||
" rp.get_interfaces()[0],\n",
|
|
||||||
" *lp.get_interfaces()[0:2],\n",
|
|
||||||
")\n",
|
|
||||||
"\n",
|
|
||||||
"try:\n",
|
|
||||||
" runner.build(top_level_bridge)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(1)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" directionInbound['Two1MBProxied'] = st.client(cl)\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" directionOutbound['Two1MBProxied'] = cl.client(st)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(2)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(2)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" directionInbound['Two2MBProxied'] = st.client(cl)\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" directionOutbound['Two2MBProxied'] = cl.client(st)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(2)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" directionInbound['One1MBOne2MBProxied'] = st.client(cl)\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" directionOutbound['One1MBOne2MBProxied'] = cl.client(st)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(2)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(2)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" threading.Timer(5+15, lambda: lp.get_interfaces()[1].set_rate(1)).start()\n",
|
|
||||||
" threading.Timer(5+30, lambda: lp.get_interfaces()[1].set_rate(2)).start()\n",
|
|
||||||
" directionInbound['One2MBOneYMBProxiedSlow15Return30'] = st.client(cl, time=60)\n",
|
|
||||||
"\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" threading.Timer(5+15, lambda: lp.get_interfaces()[1].set_rate(1)).start()\n",
|
|
||||||
" threading.Timer(5+30, lambda: lp.get_interfaces()[1].set_rate(2)).start()\n",
|
|
||||||
" directionOutbound['One2MBOneYMBProxiedSlow15Return30'] = cl.client(st, time=60)\n",
|
|
||||||
"finally:\n",
|
|
||||||
" runner.teardown()"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -274,39 +189,8 @@
|
|||||||
},
|
},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"rp = RemotePortal([Interface(IpMethod.Auto4)], setup_params=setup_params)\n",
|
"with StandardEnvironment(3, runner, setup_params) as env:\n",
|
||||||
"\n",
|
" run_and_save_test(env, StandardTest([1,1,1]))\n"
|
||||||
"st = SpeedTestServer()\n",
|
|
||||||
"cl = SpeedTestServer(clone_interface=rp.get_interfaces()[0])\n",
|
|
||||||
"\n",
|
|
||||||
"lp = LocalPortal([\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
"], cl, setup_params=setup_params)\n",
|
|
||||||
"\n",
|
|
||||||
"rp.set_local_portal(lp)\n",
|
|
||||||
"lp.set_remote_portal(rp)\n",
|
|
||||||
"\n",
|
|
||||||
"top_level_bridge = Bridge(\n",
|
|
||||||
" st.get_interfaces()[0],\n",
|
|
||||||
" rp.get_interfaces()[0],\n",
|
|
||||||
" *lp.get_interfaces()[0:3],\n",
|
|
||||||
")\n",
|
|
||||||
"\n",
|
|
||||||
"try:\n",
|
|
||||||
" runner.build(top_level_bridge)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[2].set_rate(1)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" directionInbound['Three1MBProxied'] = st.client(cl)\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" directionOutbound['Three1MBProxied'] = cl.client(st)\n",
|
|
||||||
"finally:\n",
|
|
||||||
" runner.teardown()"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@ -328,41 +212,8 @@
|
|||||||
},
|
},
|
||||||
"outputs": [],
|
"outputs": [],
|
||||||
"source": [
|
"source": [
|
||||||
"rp = RemotePortal([Interface(IpMethod.Auto4)], setup_params=setup_params)\n",
|
"with StandardEnvironment(4, runner, setup_params) as env:\n",
|
||||||
"\n",
|
" run_and_save_test(env, StandardTest([1,1,1,1]))"
|
||||||
"st = SpeedTestServer()\n",
|
|
||||||
"cl = SpeedTestServer(clone_interface=rp.get_interfaces()[0])\n",
|
|
||||||
"\n",
|
|
||||||
"lp = LocalPortal([\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
" Interface(IpMethod.Auto4),\n",
|
|
||||||
"], cl, setup_params=setup_params)\n",
|
|
||||||
"\n",
|
|
||||||
"rp.set_local_portal(lp)\n",
|
|
||||||
"lp.set_remote_portal(rp)\n",
|
|
||||||
"\n",
|
|
||||||
"top_level_bridge = Bridge(\n",
|
|
||||||
" st.get_interfaces()[0],\n",
|
|
||||||
" rp.get_interfaces()[0],\n",
|
|
||||||
" *lp.get_interfaces()[0:4],\n",
|
|
||||||
")\n",
|
|
||||||
"\n",
|
|
||||||
"try:\n",
|
|
||||||
" runner.build(top_level_bridge)\n",
|
|
||||||
"\n",
|
|
||||||
" lp.get_interfaces()[0].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[1].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[2].set_rate(1)\n",
|
|
||||||
" lp.get_interfaces()[3].set_rate(1)\n",
|
|
||||||
"\n",
|
|
||||||
" cl.server()\n",
|
|
||||||
" directionInbound['Four1MBProxied'] = st.client(cl)\n",
|
|
||||||
" st.server()\n",
|
|
||||||
" directionOutbound['Four1MBProxied'] = cl.client(st)\n",
|
|
||||||
"finally:\n",
|
|
||||||
" runner.teardown()\n"
|
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -347,10 +347,10 @@ class StandardTest:
|
|||||||
self,
|
self,
|
||||||
rates: List[int],
|
rates: List[int],
|
||||||
events: Dict[float, Tuple[int, int]] = None,
|
events: Dict[float, Tuple[int, int]] = None,
|
||||||
duration: int = 30,
|
duration: int = 10,
|
||||||
variation_target: float = 0.4,
|
variation_target: float = 0.4,
|
||||||
max_failures: int = 3,
|
max_failures: int = 3,
|
||||||
max_attempts: int = 30,
|
max_attempts: int = 60,
|
||||||
):
|
):
|
||||||
self.rates = rates
|
self.rates = rates
|
||||||
self.events = events if events is not None else dict()
|
self.events = events if events is not None else dict()
|
||||||
|
Loading…
Reference in New Issue
Block a user