commit 456e9cfd8f79767f52bfd295caf00f83bb84e446
author A R Karthick <kramanar@ciena.com> Mon Oct 03 14:37:44 2016 -0700
committer A R Karthick <kramanar@ciena.com> Mon Oct 03 14:37:44 2016 -0700
tree 5f14e13dc155c71a0141c6aba288038ac92483f6
parent 889d9651a564a5781cab14f39c3a9555e8a26055

Fix: import get_controller which is a function in OnosCtrl instead of a class method

Change-Id: I730c5940d22abe5b86cc25724ca83e5e672202e9

src/test/utils/ACL.py

diff --git a/src/test/utils/ACL.py b/src/test/utils/ACL.py
index ccae5d5..3a99a39 100644
--- a/src/test/utils/ACL.py
+++ b/src/test/utils/ACL.py
@@ -17,7 +17,7 @@
 import requests
 import os,sys,time
 from scapy.all import *
-from OnosCtrl import OnosCtrl, get_mac
+from OnosCtrl import OnosCtrl, get_mac, get_controller
 from OnosFlowCtrl import OnosFlowCtrl
 
 conf.verb = 0 # Disable Scapy verbosity
@@ -26,7 +26,7 @@
 class ACLTest:
 
     auth = ('karaf', 'karaf')
-    controller = OnosCtrl.get_controller()
+    controller = get_controller()
     add_acl_rule_url = 'http://%s:8181/onos/v1/acl/rules' %(controller)
     remove_acl_rule_url = 'http://%s:8181/onos/v1/acl/rules/%s' %(controller, id)
     clear_all_acl_rule_url = 'http://%s:8181/onos/v1/acl/rules' %(controller)

src/test/utils/OnosFlowCtrl.py

diff --git a/src/test/utils/OnosFlowCtrl.py b/src/test/utils/OnosFlowCtrl.py
index 5b2da52..aa5437e 100644
--- a/src/test/utils/OnosFlowCtrl.py
+++ b/src/test/utils/OnosFlowCtrl.py
@@ -18,12 +18,12 @@
 import os,sys,time
 from nose.tools import *
 from scapy.all import *
-from OnosCtrl import OnosCtrl
+from OnosCtrl import OnosCtrl, get_controller
 
 class OnosFlowCtrl:
 
     auth = ('karaf', 'karaf')
-    controller = OnosCtrl.get_controller()
+    controller = get_controller()
     cfg_url = 'http://%s:8181/onos/v1/flows/' %(controller)
 
     def __init__( self,