Renamed mn_run.py -> mn, mn_clean.py -> mnclean; updated Makefle

It's possible that mn_clean is a bit easier to read; mnclean may be easier
to type, however.

Added variables to Makefile so that source files are listed in a single
location.
This commit is contained in:
Bob Lantz
2010-02-03 15:29:07 -08:00
parent 799242c617
commit ac9554d6dc
5 changed files with 14 additions and 9 deletions
+11 -6
View File
@@ -1,12 +1,17 @@
all: codecheck test
clean:
rm -rf build dist build *.egg-info *.pyc
rm -rf build dist *.egg-info *.pyc
codecheck: mininet/*.py mininet/test/*.py
pyflakes mininet/*.py mininet/test/*.py bin/*.py
pylint --rcfile=.pylint mininet/*.py mininet/test/*.py bin/*.py
pep8 --ignore=E251 mininet/*.py mininet/test/*.py bin/*.py
MININET = mininet/*.py
TEST = mininet/test/*.py
BIN = bin/mn bin/mnclean
PYSRC = $(MININET) $(TEST) $(BIN)
test: mininet/*.py mininet/test/*.py
codecheck: $(PYSRC)
pyflakes $(PYSRC)
pylint --rcfile=.pylint $(PYSRC)
pep8 --ignore=E251 $(PYSRC)
test: $(MININET) $(TEST)
mininet/test/test_nets.py
View File
View File
+2 -2
View File
@@ -1,9 +1,9 @@
This directory should hold configuration files for custom mininets.
See custom_example.py, which loads the default minimal topology. The advantage of defining a mininet in a separate file is that you then use the --custom option in mn_run.py to run the CLI or specific tests with it.
See custom_example.py, which loads the default minimal topology. The advantage of defining a mininet in a separate file is that you then use the --custom option in mn to run the CLI or specific tests with it.
Each custom file must define a Mininet object for an 'mn' variable.
To start up a mininet with this custom topology, do:
sudo mn_run.py --custom custom_example.py
sudo mn --custom custom_example.py
+1 -1
View File
@@ -5,7 +5,7 @@ from setuptools import setup, find_packages
from os.path import join
scripts = [join('bin', filename) for filename in
['mn_run.py', 'mn_clean.py']]
['mn', 'mnclean']]
modname = distname = 'mininet'