Merge remote-tracking branch 'upstream/master'

diff --git a/README.md b/README.md
index 963aec1..a6b1de5 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -159,6 +159,12 @@ The following lead developers are responsible for this repository and have admin
 * Manuel Peuster (https://github.com/mpeuster)
 * Steven Van Rossem (https://github.com/stevenvanrossem)
 
+#### Contributors
+
+* Hadi Razzaghi Kouchaksaraei (https://github.com/hadik3r)
+* Wouter Tavernier (https://github.com/wtaverni)
+* Geoffroy Chollon (https://github.com/cgeoffroy)
+
 #### Feedback-Chanel
 
 * You may use the mailing list [sonata-dev@lists.atosresearch.eu](mailto:sonata-dev@lists.atosresearch.eu)

diff --git a/misc/vnfs/build_push.sh b/misc/vnfs/build_push.sh
deleted file mode 100755 (executable)
index df5e66e..0000000
--- a/misc/vnfs/build_push.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# build
-cd firewall; docker build -t mpeuster/firewall-vnf .
-cd ..
-cd iperf; docker build -t mpeuster/iperf-vnf .
-cd ..
-cd tcpdump; docker build -t mpeuster/tcpdump-vnf .
-cd ..
-
-# push
-docker push mpeuster/firewall-vnf
-docker push mpeuster/iperf-vnf
-docker push mpeuster/tcpdump-vnf
\ No newline at end of file

diff --git a/misc/vnfs/firewall/Dockerfile b/misc/vnfs/firewall/Dockerfile
deleted file mode 100755 (executable)
index 971ab19..0000000
--- a/misc/vnfs/firewall/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM      ubuntu
-MAINTAINER iMinds
-
-RUN apt-get update && apt-get install -y \
-       iptables \
-       arptables \
-       ebtables \
-       bridge-utils \
-       tcpdump \
-       openvswitch-switch \
-       openvswitch-common
-       
-RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump
-
-ADD start.sh start.sh
-RUN chmod +x start.sh
-
-# emulator specific entrypoint
-ENV SON_EMU_CMD ./start.sh
-
-# always use bash as defauld command
-CMD /bin/bash
\ No newline at end of file

diff --git a/misc/vnfs/firewall/start.sh b/misc/vnfs/firewall/start.sh
deleted file mode 100755 (executable)
index 5b9c4c3..0000000
--- a/misc/vnfs/firewall/start.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/bash
-
-#This gives time to the Dockernet to configure the network namespace of the container
-sleep 3
-
-echo "Ubuntu started"
-echo "start ovs"
-service openvswitch-switch start
-
-NAME='fw'
-
-#echo "setup ovs bridge"
-ovs-vsctl add-br $NAME
-#ovs-vsctl set bridge $NAME datapath_type=netdev
-ovs-vsctl set bridge $NAME protocols=OpenFlow10,OpenFlow12,OpenFlow13
-#ovs-vsctl set-fail-mode $NAME secure
-#ovs-vsctl set bridge $NAME other_config:disable-in-band=true
-
-ovs-vsctl add-port $NAME ${NAME}-eth0
-
-#send out through same interface, on single port
-ovs-ofctl add-flow $NAME 'in_port=1,action=in_port'
-
-# iptables -I FORWARD -m physdev --physdev-in eth0 --physdev-out eth1 -d 8.8.8.8 -j DROP
-
-echo "Firewall started"

diff --git a/misc/vnfs/iperf/Dockerfile b/misc/vnfs/iperf/Dockerfile
deleted file mode 100755 (executable)
index 6696f64..0000000
--- a/misc/vnfs/iperf/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM      ubuntu
-MAINTAINER iMinds
-
-RUN apt-get update && apt-get install -y \
-       mz \
-       iperf
-
-
-ADD start.sh start.sh
-RUN chmod +x start.sh
-
-# emulator specific entrypoint
-ENV SON_EMU_CMD ./start.sh
-
-# always use bash as defauld command
-CMD /bin/bash
\ No newline at end of file

diff --git a/misc/vnfs/iperf/start.sh b/misc/vnfs/iperf/start.sh
deleted file mode 100755 (executable)
index d252976..0000000
--- a/misc/vnfs/iperf/start.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/bash
-
-#This gives time to the Dockernet to configure the network namespace of the container
-sleep 3
-
-echo "Traffic sink started"

diff --git a/misc/vnfs/tcpdump/Dockerfile b/misc/vnfs/tcpdump/Dockerfile
deleted file mode 100755 (executable)
index e14570f..0000000
--- a/misc/vnfs/tcpdump/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM      ubuntu
-MAINTAINER iMinds
-
-RUN apt-get update && apt-get install -y \
-       tcpdump
-
-RUN mv /usr/sbin/tcpdump /usr/bin/tcpdump
-
-ADD start.sh start.sh
-RUN chmod +x start.sh
-
-# emulator specific entrypoint
-ENV SON_EMU_CMD ./start.sh
-
-# always use bash as defauld command
-CMD /bin/bash
\ No newline at end of file

diff --git a/misc/vnfs/tcpdump/start.sh b/misc/vnfs/tcpdump/start.sh
deleted file mode 100755 (executable)
index e3ffe66..0000000
--- a/misc/vnfs/tcpdump/start.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#! /bin/bash
-
-#This gives time to the Dockernet to configure the network namespace of the container
-sleep 3
-
-
-echo "Traffic sink started"
\ No newline at end of file

diff --git a/setup.cfg b/setup.cfg
deleted file mode 100755 (executable)
index 9af7e6f..0000000
--- a/setup.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-[aliases]
-test=pytest
\ No newline at end of file

diff --git a/setup.py b/setup.py
index fbd8650..d23ea68 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -28,7 +28,7 @@ partner consortium (www.sonata-nfv.eu).
 from setuptools import setup, find_packages
 
 setup(name='emuvim',
-      version='0.0.1',
+      version='0.9',
       license='Apache 2.0',
       description='emuvim is a VIM for the SONATA platform',
       url='http://github.com/sonata-emu',

diff --git a/utils/start_example_chain.sh b/utils/start_example_chain.sh
deleted file mode 100755 (executable)
index 9a130a6..0000000
--- a/utils/start_example_chain.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-
-# deploy VNFs
-son-emu-cli compute start -d datacenter1 -n tsrc -i traffic_source -c ./start.sh
-son-emu-cli compute start -d datacenter2 -n fw -i firewall -c ./start.sh
-son-emu-cli compute start -d long_data_center_name3 -n tsink -i traffic_sink -c ./start.sh
-
-# setup links in the chain
-son-emu-cli network add -src tsrc -dst fw
-son-emu-cli network add -src fw -dst tsink
-son-emu-cli network add -src tsink -dst tsrc
-
-
-

diff --git a/utils/start_example_topology.sh b/utils/start_example_topology.sh
deleted file mode 100755 (executable)
index eca74e1..0000000
--- a/utils/start_example_topology.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-# start DC Network
-python ../src/emuvim/examples/simple_topology.py
-
-
-

diff --git a/utils/vagrant/motd b/utils/vagrant/motd
index ea9e8ca..df6b388 100755 (executable)
--- a/utils/vagrant/motd
+++ b/utils/vagrant/motd
@@ -12,6 +12,6 @@
 ** - sudo python sonata_y1_demo_topology_1.py             **
 **                                                        **
 ** The emulator will be started and the fake-gatekeeper   **
-** API will be accessible on port 5000 from both, the     **
+** API will be accessible on port 5000 from both the      **
 ** VM and your host machine.                              **
 ************************************************************
\ No newline at end of file