commit b0d7058766cc1d67eff98c2e27ea15d92e40b774
author Ayaka Koshibe <ayaka@onlab.us> Fri Sep 11 11:29:36 2015 -0700
committer Ray Milkey <ray@onlab.us> Tue Sep 15 17:19:57 2015 +0000
tree d049ccb35266995a9e6382472028dede135b96ca
parent ab2cf25a016e20d9daa55b1b77b64aa2c883ee7f

REST authentication in opticalUtil

Environment variables are checked before falling back on and exporting
tentatively chosen defaults.

Change-Id: If378127a2cc757b55024aeb89cb1964f8641d5a6

tools/test/topos/opticalUtils.py

diff --git a/tools/test/topos/opticalUtils.py b/tools/test/topos/opticalUtils.py
index bef9dec..6fc3c1e 100644
--- a/tools/test/topos/opticalUtils.py
+++ b/tools/test/topos/opticalUtils.py
@@ -70,9 +70,6 @@
 SLEEP_TIME = 2
 TIMEOUT = 60
 
-REST_USER = 'onos'
-REST_PW = 'rocks'
-
 class OpticalSwitch(Switch):
     """
     For now, same as Switch class.
@@ -152,6 +149,17 @@
             error('Please set ONOS_ROOT environment variable!\n')
         else:
             os.environ[ 'ONOS_ROOT' ] = onosDir
+    ### REST USER/PASS ###
+    try:
+        restUser = os.environ[ 'ONOS_WEB_USER' ]
+        restPass = os.environ[ 'ONOS_WEB_PASS' ]
+    except:
+        error('***WARNING: $ONOS_WEB_USER and $ONOS_WEB_PASS aren\'t set!\n')
+        error('***WARNING: Setting (probably) sane WEB user/pass values\n')
+        restUser = 'onos'
+        restPass = 'rocks'
+        os.environ[ 'ONOS_WEB_USER' ] = restUser
+        os.environ[ 'ONOS_WEB_PASS' ] = restPass
     ### LINC-directory
     lincDir = findDir.__func__('linc-oe', user)
     if not lincDir:
@@ -433,7 +441,7 @@
         time = 0
         # Set up password authentication
         pw_mgr = urllib2.HTTPPasswordMgrWithDefaultRealm()
-        pw_mgr.add_password(None, url, REST_USER, REST_PW)
+        pw_mgr.add_password(None, url, LINCSwitch.restUser, LINCSwitch.restPass)
         handler = urllib2.HTTPBasicAuthHandler(pw_mgr)
         opener = urllib2.build_opener(handler)
         opener.open(url)