5 files changed, 50 insertions, 13 deletions
diff --git a/build/test/nms-collector-test.Dockerfile b/build/test/nms-collector-test.Dockerfile
index 04f7a59..be6cb23 100644
--- a/build/test/nms-collector-test.Dockerfile
+++ b/build/test/nms-collector-test.Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:jessie
-RUN apt-get update && apt-get install -y git-core
+RUN apt-get update
 RUN apt-get -y install          \
     libdata-dumper-simple-perl  \
     libdbd-pg-perl              \
@@ -13,5 +13,7 @@ RUN apt-get -y install          \
     libjson-perl                \
     perl-base                   \
     perl-modules 
-RUN git clone https://github.com/tech-server/tgnms /opt/nms
+RUN mkdir -p /opt/nms
+ADD collectors /opt/nms/collectors
+ADD include /opt/nms/include
 CMD /opt/nms/collectors/ping.pl
diff --git a/build/test/nms-db-test.Dockerfile b/build/test/nms-db-test.Dockerfile
index a182040..2e0e0ce 100644
--- a/build/test/nms-db-test.Dockerfile
+++ b/build/test/nms-db-test.Dockerfile
@@ -1,9 +1,9 @@
 FROM debian:jessie
 RUN apt-get update && apt-get install -y postgresql-9.4
-ADD test/pg_hba.tail /pg_hba.tail
+ADD build/test/pg_hba.tail /pg_hba.tail
 RUN cat /pg_hba.tail >> /etc/postgresql/9.4/main/pg_hba.conf
 RUN service postgresql start && su postgres -c "psql --command=\"CREATE ROLE nms PASSWORD 'risbrod' NOSUPERUSER NOCREATEDB NOCREATEROLE INHERIT LOGIN;\"" && su postgres -c "createdb -O nms nms" && service postgresql stop
-ADD schema.sql /schema.sql
+ADD build/schema.sql /schema.sql
 RUN service postgresql start && su postgres -c "cat /schema.sql | psql nms" && service postgresql stop
 RUN echo "listen_addresses = '*'" >> /etc/postgresql/9.4/main/postgresql.conf
 CMD pg_ctlcluster --foreground 9.4 main start
diff --git a/build/test/nms-front-test.Dockerfile b/build/test/nms-front-test.Dockerfile
index 363ae97..256083a 100644
--- a/build/test/nms-front-test.Dockerfile
+++ b/build/test/nms-front-test.Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:jessie
-RUN apt-get update && apt-get install -y git-core
+RUN apt-get update
 RUN apt-get -y install          \
     libcapture-tiny-perl        \
     libcommon-sense-perl        \
@@ -29,7 +29,10 @@ RUN apt-get -y install          \
     libfreezethaw-perl		\
     apache2
 
-RUN git clone https://github.com/tech-server/tgnms /opt/nms
+RUN mkdir -p /opt/nms
+ADD web /opt/nms/web
+ADD include /opt/nms/include
+ADD extras /opt/nms/extras
 
 RUN a2dissite 000-default
 RUN a2enmod cgi
@@ -37,7 +40,7 @@ RUN cp /opt/nms/extras/misc/apache2.conf /etc/apache2/sites-enabled/nms.conf
 RUN mkdir -p /opt/nms/etc
 RUN echo 'demo:$apr1$IKrQYF6x$0zmRciLR7Clc2tEEosyHV.' > /opt/nms/etc/htpasswd-read
 RUN echo 'demo:$apr1$IKrQYF6x$0zmRciLR7Clc2tEEosyHV.' > /opt/nms/etc/htpasswd-write
-ADD test/dummy-apache2.start /
+ADD build/test/dummy-apache2.start /
 RUN chmod 0755 /dummy-apache2.start
 CMD /dummy-apache2.start
 EXPOSE 80
diff --git a/build/test/nms-varnish-test.Dockerfile b/build/test/nms-varnish-test.Dockerfile
index 45fea79..7e75b86 100644
--- a/build/test/nms-varnish-test.Dockerfile
+++ b/build/test/nms-varnish-test.Dockerfile
@@ -1,10 +1,8 @@
 FROM debian:jessie
-RUN apt-get update && apt-get install -y git-core
+RUN apt-get update
 RUN apt-get -y install varnish
 
-RUN git clone https://github.com/tech-server/tgnms /opt/nms
-
 RUN rm /etc/varnish/default.vcl
-RUN cp /opt/nms/extras/misc/varnish.vcl /etc/varnish/default.vcl
+ADD extras/misc/varnish.vcl /etc/varnish/default.vcl
 CMD varnishd -a :80 -f /etc/varnish/default.vcl -F
 EXPOSE 80
diff --git a/build/test/playbook-test.yml b/build/test/playbook-test.yml
index b0e2c10..82df8ce 100644
--- a/build/test/playbook-test.yml
+++ b/build/test/playbook-test.yml
@@ -11,6 +11,17 @@
       links: [ "nms-front-test:nms-front" ]
     - name: "nms-collector-test"
       links: [ "nms-db-test:db" ]
+  - simple_urls:
+     - "/api/public/switches"
+     - "/api/public/switch-state"
+     - "/api/public/ping"
+     - "/api/public/location"
+     - "/api/public/dhcp"
+     - "/api/public/dhcp-summary"
+  - read_urls:
+     - "/api/read/comments"
+     - "/api/read/snmp"
+     - "/api/read/switches-management"
 
   tasks:
   - name: make all
@@ -18,8 +29,8 @@
         state: build
         name: "{{ item.name }}"
         docker_api_version: 1.18
-        dockerfile: test/{{ item.name }}.Dockerfile
-        path: "src/tgnms/build/"
+        dockerfile: build/test/{{ item.name }}.Dockerfile
+        path: "src/tgnms/"
     with_items: "{{ images }}"
 
   - name: stop all
@@ -28,6 +39,7 @@
         state: stopped
         image: "{{ item.name }}"
         docker_api_version: 1.18
+        stop_timeout: 2
     with_items: "{{ images }}"
 
   - name: start all
@@ -40,4 +52,26 @@
         links: "{{ item.links  }}"
     with_items: "{{ images }}"
 
+  - name: workaround to get nms-varnish-front-ip
+    shell: "docker inspect nms-varnish-test | grep IPAddress | sed 's/[^0-9.]//g'"
+    register: ip
 
+  - name: Display IP
+    debug:
+      msg: "Front is available at http://{{ ip.stdout }}/"
+
+  - name: test index
+    uri: url="http://{{ ip.stdout }}/"
+
+  - name: test public api without data
+    uri: 
+       url: "http://{{ ip.stdout }}{{ item }}"
+    with_items: "{{ simple_urls }}"
+
+  - name: test read api without data
+    uri: 
+      url: http://{{ ip.stdout }}{{ item }}
+      user: demo
+      password: demo
+    with_items: "{{ read_urls }}"
+