Merge branch 'master' of https://bitbucket.org/corddesign/voltha
diff --git a/.gitignore b/.gitignore
index f49da55..ad272e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,6 +8,10 @@
# PyCharm
.idea
+# Emacs
+*~
+.#*
+
# Vagrant
.vagrant
diff --git a/BUILD.md b/BUILD.md
index a8b8cb9..6f7d2a3 100644
--- a/BUILD.md
+++ b/BUILD.md
@@ -314,10 +314,16 @@
1. 'make venv' exits with error 'openssl/opensslv.h': file not found.
Resolution: install openssl-dev and add a CFLAGS to make venv:
+ MAC OS:
```
brew install openssl
```
+ Linux:
+ ```
+ sudo apt-get install libssl-dev
+ ```
+
Note the version that it installed. For example, '1.0.2h_1'.
Rerun ```make venv``` as:
diff --git a/Makefile b/Makefile
index 02fb5f1..b0455d3 100644
--- a/Makefile
+++ b/Makefile
@@ -63,6 +63,7 @@
@echo
@echo "build : Build the Voltha docker image (default target)"
@echo "clean : Remove files created by the build and tests"
+ @echo "distclean : Remove venv directory"
@echo "fetch : Pre-fetch artifacts for subsequent local builds"
@echo "flake8 : Run specifically flake8 tests"
@echo "help : Print this help"
@@ -83,6 +84,9 @@
clean:
find voltha -name '*.pyc' | xargs rm -f
+distclean: clean
+ rm -rf ${VENVDIR}
+
fetch:
docker pull consul:latest
docker pull fluent/fluentd:latest
diff --git a/requirements.txt b/requirements.txt
index 17bb0d7..d06bb09 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,7 @@
pep8-naming>=0.3.3
pyflakes>=1.0.0
pylint>=1.5.2
+pypcap>=1.1.5
pyOpenSSL>=0.13
PyYAML>=3.10
requests
diff --git a/voltha/adapters/tibit/README.md b/voltha/adapters/tibit/README.md
index c9a40c2..e112292 100644
--- a/voltha/adapters/tibit/README.md
+++ b/voltha/adapters/tibit/README.md
@@ -3,8 +3,12 @@
command was used in the shell to launch the olt-test.
NOTE: This command should soon be eliminated as the adapter should
-be started by VOLTHA.
+be started by VOLTHA. By running the commands as listed below, then
+the olt-test can take advantage of the virtual environment.
```
-sudo PYTHONPATH=$HOME/dev/voltha/voltha/adapters/tibit ./oftest/oft --test-dir=olt-oftest/ -i 1@enp1s0f0 -i 2@enp1s0f1 --port 6633 -V 1.3 -t "olt_port=1;onu_port=2;in_out_port=1;device_type='tibit'" olt-complex.TestScenario1SingleOnu
+$ cd <LOCATION_OF_VOLTHA>
+$ sudo -s
+# . ./env.sh
+(venv-linux) # PYTHONPATH=$HOME/dev/voltha/voltha/adapters/tibit ./oftest/oft --test-dir=olt-oftest/ -i 1@enp1s0f0 -i 2@enp1s0f1 --port 6633 -V 1.3 -t "olt_port=1;onu_port=2;in_out_port=1;device_type='tibit'" olt-complex.TestScenario1SingleOnu
```
diff --git a/voltha/northbound/openflow/README.md b/voltha/northbound/openflow/README.md
index 5ca5670..2a185b9 100644
--- a/voltha/northbound/openflow/README.md
+++ b/voltha/northbound/openflow/README.md
@@ -6,7 +6,10 @@
be started by VOLTHA.
```
-cd /voltha/voltha/northbound/openflow
-sudo python agent/main.py -v --in-out-iface=enp1s0f0 --in-out-stag=4004
+$ cd <LOCATION_OF_VOLTHA>
+$ sudo -s
+# . ./env.sh
+# cd <LOCATION_OF_VOLTHA>/voltha/northbound/openflow
+(venv-linux) # python agent/main.py -v --in-out-iface=enp1s0f0 --in-out-stag=4004
```