Option to run cord-tester setup in foreground.
Delete relay configuration instead of restarting onos after tests.
Make sure prerequisites can be run on other ubuntu distros
Change-Id: Ic04a5dab41b013088cda651afe32abae8030c8d8
diff --git a/src/test/utils/OnosCtrl.py b/src/test/utils/OnosCtrl.py
index 5e6dcdf..83cdedc 100644
--- a/src/test/utils/OnosCtrl.py
+++ b/src/test/utils/OnosCtrl.py
@@ -56,7 +56,7 @@
self.auth = ('karaf', 'karaf')
@classmethod
- def config(cls, config,controller=None):
+ def config(cls, config, controller=None):
if config is not None:
json_data = json.dumps(config)
if controller is None:
@@ -69,6 +69,20 @@
return resp.ok, resp.status_code
return False, 400
+ @classmethod
+ def delete(cls, config, controller=None):
+ if config:
+ json_data = json.dumps(config)
+ if controller is None:
+ print('default Onos config url is %s'%cls.cfg_url)
+ resp = requests.delete(cls.cfg_url, auth = cls.auth, data = json_data)
+ else:
+ cfg_url = 'http://%s:8181/onos/v1/network/configuration/' %(controller)
+ print('non-default Onos config url is %s'%cfg_url)
+ resp = requests.delete(cfg_url, auth = cls.auth, data = json_data)
+ return resp.ok, resp.status_code
+ return False, 400
+
def activate(self):
resp = requests.post(self.app_url + '/active', auth = self.auth)
return resp.ok, resp.status_code