reordered notebook

This commit is contained in:
Jake Hillion 2020-12-12 18:55:05 +00:00
parent 23e13ad43c
commit 71849ff60d

View File

@ -2,7 +2,9 @@
"cells": [
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"# Project Evaluation\n",
"\n",
@ -12,7 +14,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"## Setup\n",
"This section sets up the required variables for the Proxmox server."
@ -42,7 +46,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"## Testing\n",
"This section gathers the required data from the different structures for later graphs."
@ -116,7 +122,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Direct Server to Server"
]
@ -143,7 +151,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Local Portal with 2 Interfaces"
]
@ -175,7 +185,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Local Portal with 3 Interfaces"
]
@ -200,7 +212,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Local Portal with 4 Interfaces"
]
@ -225,7 +239,9 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"## Graphs\n",
"This section produces graphs from the collected data."
@ -253,12 +269,12 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Section 4.2: Graphs\n",
"#### Subsection 4.2.2 Line Graphs\n",
"\n",
"Figure 4.1 Line graphs produced with varying error bars enabled"
"#### Subsection 4.2.2 Line Graphs"
]
},
{
@ -332,9 +348,12 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### More than 2 connections evaluation"
"### Section 4.3: Success Criteria\n",
"#### Subsection 4.3.2: Bidirectional Performance Gains"
]
},
{
@ -349,58 +368,9 @@
"source": [
"plot_iperf_results(test_store,\n",
" {\n",
" '4x1MB Connections\\n(proxied)': StandardTest([1,1,1,1]),\n",
" '3x1MB Connections\\n(proxied)': StandardTest([1,1,1]),\n",
" '2x1MB Connections\\n(proxied)': StandardTest([1,1]),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"plot_iperf_results(test_store,\n",
" {\n",
" '4x2MB Connections\\n(proxied)': StandardTest([2,2,2,2]),\n",
" '3x2MB Connections\\n(proxied)': StandardTest([2,2,2]),\n",
" '2x2MB Connections\\n(proxied)': StandardTest([2,2]),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Mixed Performance Evaluation"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"plot_iperf_results(test_store,\n",
" {\n",
" '2x2MB Connections (proxied)': StandardTest([2,2]),\n",
" '1x1MB + 1x2MB\\nConnections (proxied)': StandardTest([1,2]),\n",
" '2x1MB Connections (proxied)': StandardTest([1,1]),\n",
" '1x1MB + 1x2MB\\nConnections (proxied)': StandardTest([1,2]),\n",
" '2x2MB Connections (proxied)': StandardTest([2,2]),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
@ -409,35 +379,11 @@
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Eventful Evaluation"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
"collapsed": false
},
"outputs": [],
"source": [
"plot_iperf_results_time(test_store,\n",
" {\n",
" 'Varied Connection': StandardTest([2,2], events={10: (0,1), 15: (0,2)}, duration=30),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Comparisons to a Direct Connection"
"#### Subsection 4.3.5: More Bandwidth over Two Equal Connections"
]
},
{
@ -452,9 +398,9 @@
"source": [
"plot_iperf_results(test_store,\n",
" {\n",
" '1x2MB Connection\\n(direct)': DirectTest(2),\n",
" '2x1MB Connections\\n(proxied)': StandardTest([1,1]),\n",
" '1x1MB Connection\\n(direct)': DirectTest(1),\n",
" '2x1MB Connections\\n(proxied)': StandardTest([1,1]),\n",
" '1x2MB Connection\\n(direct)': DirectTest(2),\n",
"\n",
" },\n",
" fast_tests,\n",
@ -462,6 +408,16 @@
")"
]
},
{
"cell_type": "markdown",
"metadata": {
"collapsed": false
},
"source": [
"### Section 4.4: Extended Goals\n",
"#### Subsection 4.4.1: More Bandwidth over Unequal Connections"
]
},
{
"cell_type": "code",
"execution_count": null,
@ -474,16 +430,24 @@
"source": [
"plot_iperf_results(test_store,\n",
" {\n",
" '1x4MB Connection\\n(direct)': DirectTest(4),\n",
" '2x2MB Connections\\n(proxied)': StandardTest([2,2]),\n",
" '1x2MB Connection\\n(direct)': DirectTest(2),\n",
"\n",
" '1x1MB + 1x2MB\\nConnections (proxied)': StandardTest([1,2]),\n",
" '2x1MB Connections\\n(proxied)': StandardTest([1,1]),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "markdown",
"metadata": {
"collapsed": false
},
"source": [
"#### Subsection 4.4.2: More Bandwidth over Four Equal Connections"
]
},
{
"cell_type": "code",
"execution_count": null,
@ -528,9 +492,11 @@
},
{
"cell_type": "markdown",
"metadata": {},
"metadata": {
"collapsed": false
},
"source": [
"### Mixed Performance Evaluation"
"#### Subsection 4.4.3: Bandwidth Variation"
]
},
{
@ -545,86 +511,7 @@
"source": [
"plot_iperf_results_time(test_store,\n",
" {\n",
" '2x2MB Connections\\n(proxied)': StandardTest([2,2]),\n",
" '1x1MB + 1x2MB\\nConnections (proxied)': StandardTest([1,2]),\n",
" '2x1MB Connections\\n(proxied)': StandardTest([1,1]),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Eventful Evaluation"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"plot_iperf_results_time(test_store,\n",
" {\n",
" 'Varied Connection': StandardTest([2,2], events={10: (0,1), 15: (0,2)}, duration=30),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "markdown",
"metadata": {},
"source": [
"### Comparisons to a Direct Connection"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"plot_iperf_results_time(test_store,\n",
" {\n",
" '1x2MB Connection (not proxied)': DirectTest(2),\n",
" '2x1MB Connections (proxied)': StandardTest([1,1]),\n",
" '1x1MB Connection (not proxied)': DirectTest(1),\n",
"\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",
")"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {
"pycharm": {
"name": "#%%\n"
}
},
"outputs": [],
"source": [
"plot_iperf_results_time(test_store,\n",
" {\n",
" '1x4MB Connection (not proxied)': DirectTest(4),\n",
" '2x2MB Connections (proxied)': StandardTest([2,2]),\n",
" '1x2MB Connection (not proxied)': DirectTest(2),\n",
"\n",
" 'Varied Connection': StandardTest([2,2], events={10: (0,1), 20: (0,2)}, duration=30),\n",
" },\n",
" fast_tests,\n",
" filename='png',\n",