commit a46677351efd5e468535637817e740e694851990
author A R Karthick <kramanar@ciena.com> Mon Jan 09 14:51:16 2017 -0800
committer Karthick Ramanarayanan <kramanar@ciena.com> Fri Jan 20 11:59:59 2017 -0800
tree 4aef7f18876c637b34973112f07012a139049a8d
parent ce125f81cbcc011519d68ec01d47e171b95c2105

Add manifest option to cord-tester cleanup

Change-Id: I7b1a2aac2fd272b277ec72354626661fbb3b2de2
(cherry picked from commit 757eb4d4dd4babab4ed96cc64af8d793cfb57b3e)

src/test/utils/TestManifest.py

diff --git a/src/test/utils/TestManifest.py b/src/test/utils/TestManifest.py
index de7c72a..b8ca881 100644
--- a/src/test/utils/TestManifest.py
+++ b/src/test/utils/TestManifest.py
@@ -17,6 +17,7 @@
 import os
 import shutil
 import platform
+from CordTestServer import CORD_TEST_HOST, CORD_TEST_PORT
 
 class TestManifest(object):
 
@@ -34,6 +35,7 @@
             self.start_switch = args.start_switch
             self.image_prefix = args.prefix
             self.onos_image = args.onos
+            self.server = '{}:{}'.format(CORD_TEST_HOST, CORD_TEST_PORT)
         else:
             with open(self.manifest, 'r') as fd:
                 data = json.load(fd)
@@ -48,3 +50,4 @@
             self.start_switch = data.get('start_switch', self.olt)
             self.image_prefix = data.get('image_prefix', '')
             self.onos_image = data.get('onos_image', 'onosproject/onos:latest')
+            self.server = data.get('test_server', '{}:{}'.format(CORD_TEST_HOST, CORD_TEST_PORT))