Merge pull request #108 from stevenvanrossem/master

fix monitor test scripts

diff --git a/utils/ci/test_sdk_monitor.sh b/utils/ci/test_sdk_monitor.sh
index 12cc44d..370ca80 100755 (executable)
--- a/utils/ci/test_sdk_monitor.sh
+++ b/utils/ci/test_sdk_monitor.sh
@@ -2,7 +2,7 @@
 # test if a vnf can be deployed and monitored
 
 #start test emulator topology
-python src/emuvim/examples/monitoring_demo_topology.py &
+#python src/emuvim/examples/monitoring_demo_topology.py &
 
 # start a vnf
 son-emu-cli compute start -d datacenter1 -n vnf1  --net '(id=input,ip=10.0.10.3/24),(id=output,ip=10.0.10.4/24)'

diff --git a/utils/docker/Dockerfile b/utils/docker/Dockerfile
index 27157d8..d0e94b1 100755 (executable)
--- a/utils/docker/Dockerfile
+++ b/utils/docker/Dockerfile
@@ -18,5 +18,5 @@ RUN cd /son-emu/ansible \
 
 ENTRYPOINT ["/son-emu/utils/docker/entrypoint.sh"]
 
-# dummy GK, zerorpc
-EXPOSE 5000 4242
+# dummy GK, zerorpc, DCNetwork zerorpc, cAdvisor
+EXPOSE 5000 4242 5151 8090