diff --git a/bin/mininet-vm-init.sh b/bin/mininet-vm-init.sh index aa9d7123..6f42bed8 100644 --- a/bin/mininet-vm-init.sh +++ b/bin/mininet-vm-init.sh @@ -1,6 +1,6 @@ #!/bin/bash -# TODO: if not installed as module add minicps soft link to /usr/lib/python2.7 +# TODO: if not installed as module add minicps soft link to /usr/lib/python3.10 # TODO: add parametric installation # mininet vm is running Ubuntu diff --git a/docs/contributing.rst b/docs/contributing.rst index f9210489..fb507ca6 100644 --- a/docs/contributing.rst +++ b/docs/contributing.rst @@ -18,9 +18,7 @@ How to start General design principles ------------------------- -MiniCPS follows an object-oriented design pattern. It is using ``python2.x`` -for compatibility reasons with ``mininet``. We are trying to lower the number -of external dependencies, and eventually move to ``python3.x``. +MiniCPS follows an object-oriented design pattern. It is using ``python3.x``. * Design points: @@ -67,7 +65,7 @@ Add ``minicps`` to the python path, for example using a soft link: .. code-block:: console - ln -s ~/minicps/minicps /usr/lib/python2.7/minicps + ln -s ~/minicps/minicps /usr/lib/python3.7/minicps Install the requirements using: diff --git a/docs/misc.rst b/docs/misc.rst index b8817179..4635c848 100644 --- a/docs/misc.rst +++ b/docs/misc.rst @@ -16,7 +16,7 @@ Links Python 2.X and modules ----------------------- -* `python tutorial `_. +* `python tutorial `_. * `pip `_ * `networkx `_ * `matplotlib `_ diff --git a/docs/swat-tutorial.rst b/docs/swat-tutorial.rst index 26f614e3..7fa6703c 100644 --- a/docs/swat-tutorial.rst +++ b/docs/swat-tutorial.rst @@ -20,8 +20,7 @@ now provide: Prerequisites ============= -This tutorial assumes that the reader has a basic understanding of ``python -2.x``, has familiarly with Linux OS, ``bash``, Mininet +This tutorial assumes that the reader has a basic understanding of ``python 3.x``, has familiarly with Linux OS, ``bash``, Mininet and has a basic understanding of networking tools such as: ``wireshark``, ``ifconfig`` and ``nmap``. diff --git a/docs/userguide.rst b/docs/userguide.rst index 8f20e2a1..3b4f5f16 100644 --- a/docs/userguide.rst +++ b/docs/userguide.rst @@ -55,11 +55,11 @@ Mininet relies on openvswitch-controller as basic SDN controller (unless you ins sudo apt install openvswitch-testcontroller -Then, you need to patch the minicps source (e.g., /usr/lib/python2.7/dist-packages/mininet/clean.py and /usr/lib/python2.7/dist-packages/mininet/node.py) to use the updated binary name (change occurances of openvswitch-controller to openvswitch-testcontroller). +Then, you need to patch the minicps source (e.g., /usr/lib/python3.7/dist-packages/mininet/clean.py and /usr/lib/python3.7/dist-packages/mininet/node.py) to use the updated binary name (change occurances of openvswitch-controller to openvswitch-testcontroller). .. code-block:: console - find /usr/lib/python2.7/dist-packages/mininet/ -type f -exec sudo sed -i 's/ovs-controller/ovs-testcontroller/' {} \; + find /usr/lib/python3.7/dist-packages/mininet/ -type f -exec sudo sed -i 's/ovs-controller/ovs-testcontroller/' {} \; Ensure the corresponding service is running, e.g., by using