Skip to content

Docupdate python3 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
noleti wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Docupdate python3 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a95730
First pass on updating/removing references to Python 2.7 now that we …
noleti Jun 23, 2023
3d17086
Minor update to Python3
noleti Jun 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/mininet-vm-init.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 2 additions & 4 deletions docs/contributing.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion docs/misc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ Links
Python 2.X and modules
-----------------------

* `python tutorial <https://docs.python.org/2/tutorial/index.html>`_.
* `python tutorial <https://docs.python.org/3/tutorial/index.html>`_.
* `pip <https://pip.pypa.io/en/stable/>`_
* `networkx <http://networkx.github.io/>`_
* `matplotlib <http://matplotlib.org/>`_
Expand Down
3 changes: 1 addition & 2 deletions docs/swat-tutorial.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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``.

Expand Down
4 changes: 2 additions & 2 deletions docs/userguide.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down