Merge remote-tracking branch 'upstream/master'

diff --combined Vagrantfile
index 395757e,2efc999..8d9b971
--- 1/Vagrantfile
--- 2/Vagrantfile
+++ b/Vagrantfile
@@@ -60,7 -60,7 +60,7 @@@ Vagrant.configure(2) do |config
    # accessing "localhost:8080" will access port 80 on the guest machine.
    config.vm.network "forwarded_port", guest: 5000, host: 5000 # dummy gatekeeper
    config.vm.network "forwarded_port", guest: 5001, host: 5001 # REST API
-   config.vm.network "forwarded_port", guest: 8080, host: 8080 # cAdvisor
+   config.vm.network "forwarded_port", guest: 8081, host: 8081 # cAdvisor
    config.vm.network "forwarded_port", guest: 9091, host: 9091 # push gateway
  
    # Create a private network, which allows host-only access to the machine
@@@ -125,35 -125,9 +125,35 @@@
       echo "Running son-emu unit tests to validate installation"
       cd /home/vagrant/son-emu
       sudo python setup.py develop
 -     sudo py.test -v
 +     sudo py.test -v src/emuvim/test/unittests
 +
 +     # install son-cli
 +     sudo apt-get install -y python-pip python-dev
 +     sudo apt-get install -y python3.4 python3-dev libffi-dev libssl-dev libyaml-dev build-essential
 +     sudo pip install virtualenv 
 +     cd /home/vagrant
 +     git clone https://github.com/sonata-nfv/son-cli.git
 +     cd son-cli
 +     virtualenv -p /usr/bin/python3.4 venv
 +     source venv/bin/activate
 +     python bootstrap.py
 +     bin/buildout
 +
 +     # clone son-examples (disabled until repo goes public)
 +     #cd /home/vagrant
 +     #git clone https://github.com/sonata-nfv/son-examples.git
 +
 +     # pre-fetch sonata example vnfs from DockerHub
 +     echo "Fetching SONATA example VNF container from DockerHub/sonatanfv"
 +     sudo docker pull sonatanfv/sonata-empty-vnf 
 +     sudo docker pull sonatanfv/sonata-iperf3-vnf 
 +     sudo docker pull sonatanfv/sonata-snort-ids-vnf
 +     sudo docker pull sonatanfv/sonata-ovs1-vnf
 +     sudo docker pull sonatanfv/sonata-ryu-vnf
 +     sudo docker pull sonatanfv/sonata-vtc-vnf
  
       # place motd
 +     cd /home/vagrant/son-emu
       sudo cp utils/vagrant/motd /etc/motd
    SHELL