commit 5194e89c4875bc7133b0b1a8c6fd5d8892f5b587
author sathishg <sathish.govindasamy@radisys.com> Fri Jun 30 16:46:26 2017 +0530
committer khenaidoo Nursimulu <knursimu@ciena.com> Fri Jun 30 12:59:27 2017 -0700
tree 247e1fa73d4e2b005cf5d5be7b3442a83d2be977
parent 89004ecb2921661e5a1079450b36195a782daffa

Patch for the OFAgent itests for new voltha which loads config from consul.
Edited ReadME accordingly.

Change-Id: Icf6cb1251b04d2c4d616c951c4a2c40db26fb749

compose/docker-compose-ofagent-test.yml

diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 836bfc6..4632cfc 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -1,18 +1,58 @@
 version: '2'
 services:
 
+  consul:
+    image: consul:latest
+    command: agent -server -bootstrap -client 0.0.0.0 -ui
+    ports:
+    - "8300:8300"
+    - "8400:8400"
+    - "8500:8500"
+    - "8600:8600/udp"
+    environment:
+      #SERVICE_53_IGNORE: "yes"
+      SERVICE_8300_IGNORE: "yes"
+      SERVICE_8400_IGNORE: "yes"
+      SERVICE_8500_NAME: "consul-rest"
+  #
+  # Registrator
+  #
+  registrator:
+    image: gliderlabs/registrator:latest
+    command: [
+      "-ip=${DOCKER_HOST_IP}",
+      "-retry-attempts", "100",
+      "-cleanup",
+      # "-internal",
+      "consul://consul:8500"
+    ]
+    links:
+    - consul
+    volumes:
+    - "/var/run/docker.sock:/tmp/docker.sock"
+  #
+  # Voltha server instance(s)
+  #
   voltha:
     image: cord/voltha
     command: [
       "/voltha/voltha/main.py",
+      "-v",
+      "--consul=${DOCKER_HOST_IP}:8500",
       "--rest-port=8880",
       "--grpc-port=50555",
-      "--instance-id-is-container-name"
+      "--backend=consul",
+      "-v"
     ]
+
     ports:
     - 8880:8880
     - 50055:50555
     - 18880
+    depends_on:
+    - consul
+    links:
+    - consul
     volumes:
     - "/var/run/docker.sock:/tmp/docker.sock"
   #