commit 9b485fb6348b2c331f121b74ff09c1ec70b763ef
author Zsolt Haraszti <zharaszt@ciena.com> Mon Dec 26 23:11:15 2016 -0800
committer Zsolt Haraszti <zharaszt@ciena.com> Tue Dec 27 10:48:03 2016 -0800
tree c424709602056a8ba4b63cca302afadfbd4b9069
parent 31c3696d27ef1035e87d0c6f215244498f13c96c

Prep for docker-only tests

Chnages to support more production-like tests where all
components are running as Docker containers. Specific
changes:
- Expanded Vagrant memory to 6G to have room
- Chameleon to cope with premature service lookup before
  Voltha is self-registered (can happen when docker-compose
  starts the "world"
- Add missing termcolor package
- Allow CLI to use Consul for endpoints
- 2nd external ponmgmt bridge for Voltha

Change-Id: Ib2471784a5aafbfd9c611ebf293d7f81f61dd75b

compose/docker-compose-system-test.yml

diff --git a/compose/docker-compose-system-test.yml b/compose/docker-compose-system-test.yml
index 443fc01..c6038cb 100644
--- a/compose/docker-compose-system-test.yml
+++ b/compose/docker-compose-system-test.yml
@@ -129,11 +129,13 @@
       "--grpc-port=50555",
       "--kafka=@kafka",
       "--instance-id-is-container-name",
+      "--interface=eth1",
       "-v"
     ]
     ports:
     - 8880
     - 50555
+    - 18880
     depends_on:
     - consul
     links:
@@ -145,8 +147,12 @@
       SERVICE_8880_CHECK_INTERVAL: "5s"
       SERVICE_8880_CHECK_TIMEOUT: "1s"
       SERVICE_50555_NAME: "voltha-grpc"
+      SERVICE_18880_NAME: "voltha-sim-rest"
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
+    networks:
+    - default
+    - ponmgmt
 
 #############################################
 # Item below this line will soon be removed.#
@@ -230,3 +236,10 @@
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
 
+networks:
+  default:
+    driver: bridge
+  ponmgmt:
+    driver: bridge
+    driver_opts:
+      com.docker.network.bridge.name: "ponmgmt"