Fix: Install ONOS cord apps when ONOS is running externally and tester started with "-e" option.
Also set the ONOS restart disabled flag based on whether running the tester under olt with ONOS on another node.
Change-Id: I12402cb15f321d8e97c44f7677f589af10498343
diff --git a/src/test/utils/CordContainer.py b/src/test/utils/CordContainer.py
index f22dbfd..e5f7526 100644
--- a/src/test/utils/CordContainer.py
+++ b/src/test/utils/CordContainer.py
@@ -240,13 +240,11 @@
print('Waiting %d seconds for ONOS to boot' %(boot_delay))
time.sleep(boot_delay)
- self.install_cord_apps()
-
@classmethod
- def install_cord_apps(cls):
+ def install_cord_apps(cls, onos_ip = None):
for app, version in cls.onos_cord_apps:
app_file = '{}/{}-{}.oar'.format(cls.cord_apps_dir, app, version)
- ok, code = OnosCtrl.install_app(app_file)
+ ok, code = OnosCtrl.install_app(app_file, onos_ip = onos_ip)
##app already installed (conflicts)
if code in [ 409 ]:
ok = True