create simbricks.orchestration python package (#14)

I basically did the following:
`mkdir experiments/simbricks/orchestration`
`mv experiments/simbricks/* experiments/simbricks/orchestration/`

Additionally, imports and paths had to be adjusted.

.pre-commit-config.yaml

-exclude: ^experiments/simbricks/utils/graphlib.py$
+exclude: ^experiments/simbricks/orchestration/utils/graphlib.py$
 repos:
   - repo: local
     hooks:

Makefile

@@ -73,22 +73,22 @@ lint-clang-format:
 
 lint-yapf:
 	yapf --recursive --diff \
-		--exclude experiments/simbricks/utils/graphlib.py \
+		--exclude experiments/simbricks/orchestration/utils/graphlib.py \
 		-- results/ experiments/
 
 format-yapf:
 	yapf --recursive --in-place \
-		--exclude experiments/simbricks/utils/graphlib.py \
+		--exclude experiments/simbricks/orchestration/utils/graphlib.py \
 		-- results/ experiments/
 
 lint-isort:
 	isort --diff \
-		--skip experiments/simbricks/utils/graphlib.py \
+		--skip experiments/simbricks/orchestration/utils/graphlib.py \
 		results/ experiments/
 
 format-isort:
 	isort --overwrite-in-place \
-		--skip experiments/simbricks/utils/graphlib.py \
+		--skip experiments/simbricks/orchestration/utils/graphlib.py \
 		results/ experiments/
 
 lint: lint-cpplint lint-clang-format lint-python

README.md

@@ -200,7 +200,7 @@ for more interactive discussions or to answer quick questions.
     - `sims/net/menshen`: RTL simulation with verilator for the
       [Menshen RMT Pipeline](https://isolation.quest/).
 - `experiments/`: Python Orchestration scripts for running simulations.
-  - `experiments/simbricks/`: Orchestration framework implementation.
+  - `experiments/simbricks/orchestration/`: Orchestration framework implementation.
   - `experiments/run.py`: Main script for running a simulation.
   - `experiments/pyexps/`: Example simulation configurations.
 - `images/`: Infrastructure to build disk images for hosts in SimBricks.

experiments/pyexps/ae/corundum_pcilat.py

@@ -37,10 +37,10 @@
 
 from functools import partial
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 pci_latency = [1000]
 experiments = []

experiments/pyexps/ae/determ.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['gt']
 nic_types = ['ib']

experiments/pyexps/ae/f1_dctcp.py

@@ -41,10 +41,10 @@ The command to run all the experiments is:
 $: python3 run.py pyexps/ae/f1_dctcp.py --filter gt-ib-* --force --verbose
 """
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_dctcp_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_dctcp_hosts
 
 types_of_host = ['gt']
 types_of_nic = ['ib']

experiments/pyexps/ae/f7_scale.py

@@ -42,10 +42,10 @@
 # $: python3 run.py pyexps/ae/f7_scale.py --filter host-gt-ib-sw-* --verbose
 ########################################################################
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['gt']
 nic_types = ['ib']

experiments/pyexps/ae/f9_latency.py

@@ -36,10 +36,10 @@
 
 from functools import partial
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 pci_latency = [10, 50, 100, 500, 1000]
 experiments = []

experiments/pyexps/ae/no_simbricks.py

@@ -20,9 +20,9 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
 
 app_types = ['sleep', 'busy']
 

experiments/pyexps/ae/no_traffic.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['gt']
 nic_types = ['ib']

experiments/pyexps/ae/nopaxos.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_configs = ['qt']
 seq_configs = ['swseq', 'ehseq', 'tofino']

experiments/pyexps/ae/t1_netperf.py

@@ -40,10 +40,10 @@
 # $: python3 run.py pyexps/ae/t1_combination.py --filter nf-* --verbose
 ########################################################################
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['qemu', 'gt', 'qt']
 nic_types = ['ib', 'cb', 'cv']

experiments/pyexps/dctcp.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_dctcp_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_dctcp_hosts
 
 # iperf TCP_multi_client test
 # naming convention following host-nic-net-app

experiments/pyexps/dist_memcache.py

@@ -23,11 +23,11 @@
 import math
 import random
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks import proxy
-from simbricks.simulator_utils import create_multinic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration import proxy
+from simbricks.orchestration.simulator_utils import create_multinic_hosts
 
 host_types = ['qemu', 'gem5', 'qt']
 n_nets = [1, 2, 3, 4, 8, 16, 32]

experiments/pyexps/dist_multinet.py

@@ -20,11 +20,11 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks import proxy
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration import proxy
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['qemu', 'gem5', 'qt']
 n_nets = [1, 2, 3, 4]

experiments/pyexps/dist_netperf.py

@@ -20,11 +20,11 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks import proxy
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration import proxy
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 host_types = ['qemu', 'gem5', 'qt']
 nic_types = ['i40e', 'cd_bm', 'cd_verilator']

experiments/pyexps/femutest.py

@@ -20,9 +20,9 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
 
 experiments = []
 

experiments/pyexps/gem5_i40e_pair.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 e = exp.Experiment('gem5-i40e-pair')
 #e.timeout = 5 * 60

experiments/pyexps/gt_tcp_multi.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 # iperf TCP_multi_client test
 # naming convention following host-nic-net-app

experiments/pyexps/gt_tcp_single.py

@@ -20,10 +20,10 @@
 # TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-import simbricks.experiments as exp
-import simbricks.nodeconfig as node
-import simbricks.simulators as sim
-from simbricks.simulator_utils import create_basic_hosts
+import simbricks.orchestration.experiments as exp
+import simbricks.orchestration.nodeconfig as node
+import simbricks.orchestration.simulators as sim
+from simbricks.orchestration.simulator_utils import create_basic_hosts
 
 # iperf TCP_single test
 # naming convention following host-nic-net-app