From 2fd340a188a942d87882eee269ad720a72a12852 Mon Sep 17 00:00:00 2001 From: peusterm Date: Thu, 14 Jul 2016 12:33:47 +0200 Subject: [PATCH] Cleanup for 0.9 release --- misc/vnfs/build_push.sh | 14 -------------- misc/vnfs/firewall/Dockerfile | 22 ---------------------- misc/vnfs/firewall/start.sh | 26 -------------------------- misc/vnfs/iperf/Dockerfile | 16 ---------------- misc/vnfs/iperf/start.sh | 6 ------ misc/vnfs/tcpdump/Dockerfile | 16 ---------------- misc/vnfs/tcpdump/start.sh | 7 ------- setup.cfg | 2 -- setup.py | 2 +- utils/start_example_chain.sh | 15 --------------- utils/start_example_topology.sh | 7 ------- utils/vagrant/motd | 2 +- 12 files changed, 2 insertions(+), 133 deletions(-) delete mode 100755 misc/vnfs/build_push.sh delete mode 100644 misc/vnfs/firewall/Dockerfile delete mode 100644 misc/vnfs/firewall/start.sh delete mode 100644 misc/vnfs/iperf/Dockerfile delete mode 100644 misc/vnfs/iperf/start.sh delete mode 100644 misc/vnfs/tcpdump/Dockerfile delete mode 100644 misc/vnfs/tcpdump/start.sh delete mode 100755 setup.cfg delete mode 100755 utils/start_example_chain.sh delete mode 100755 utils/start_example_topology.sh diff --git a/misc/vnfs/build_push.sh b/misc/vnfs/build_push.sh deleted file mode 100755 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 100644 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 100644 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 100644 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 100644 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 100644 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 100644 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 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 d64279c..b8fad8a 100755 --- 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 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 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 100644 --- 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 -- 2.17.1