commit 8e04cc7dd21d22a56b055501a3b13ba5ed7795ed
author A R Karthick <kramanar@ciena.com> Thu Apr 26 16:14:37 2018 -0700
committer A R Karthick <kramanar@ciena.com> Thu Apr 26 16:17:15 2018 -0700
tree 6ee145cbd94d487c06447c7c9f0d0519bba49064
parent 7dbf03c69bc27b066c2501905e531acb18cd7931

Changes to run with latest voltha

Change-Id: Id4fd1a72dbeafd0781500fb51276aa30d7455b48

src/test/utils/CordContainer.py

diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index 341a4eb..4f7287a 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -1027,7 +1027,7 @@
             app_version = '3.0-SNAPSHOT'
         elif major == 1 and minor >= 10:
             app_version = '3.0-SNAPSHOT'
-            if patch < 3:
+            if minor == 10 and patch < 3:
                 app_version = '1.2-SNAPSHOT'
         for apps in cls.onos_cord_apps:
             apps[1] = app_version

src/test/utils/VolthaCtrl.py

diff --git a/src/test/utils/VolthaCtrl.py b/src/test/utils/VolthaCtrl.py
index d1ee967..5d9993a 100644
--- a/src/test/utils/VolthaCtrl.py
+++ b/src/test/utils/VolthaCtrl.py
@@ -25,8 +25,8 @@
 from OltConfig import OltConfig
 
 class VolthaService(object):
-    services = ('consul', 'kafka', 'zookeeper', 'registrator', 'fluentd')
-    standalone_services = ('envoy', 'voltha', 'ofagent', 'vcli',)
+    services = ('vconsul', 'kafka', 'zookeeper', 'registrator', 'fluentd')
+    standalone_services = ('envoy', 'voltha', 'ofagent', 'cli',)
     compose_file = 'docker-compose-system-test.yml'
     service_map = {}
     PROJECT = 'cordtester'