Merge pull request qca#1 from qca/master

Update to latest

Author: wwahammy

README.md

@@ -9,6 +9,15 @@ The simplest tests consist of commands to type expected output. These tests use
 
 Test suites are located in `testsuites.cfg` and are simply lists of test names.  Results of running a test suite are stored in a nicely formated html file that can be emailed to interested parties or sent to a database.
 
+Getting involved
+--------------
+Have a question about BoardFarm? Want to know the best way to get involved? Found a bug? Here are the BoardFarm communication channels:
+
+* Mailing List at [email protected] (sign up at http://lists.prplfoundation.org/cgi-bin/mailman/listinfo/boardfarm). Use this for general discussion or questions.
+* IRC at #boardfarm on Freenode. Use this for quick answers if someone is available (Sometimes no one is there)
+* Issue tracker at https://github.com/qca/boardfarm/issues. Use this for clear feature requests or bug reports. It's okay to also initially discuss a feature request on the mailing lists
+* Pull requests at https://github.com/qca/boardfarm. When you want to submit a change to Boardfarm!
+
 Software Setup
 --------------
 

devices/power.py

@@ -5,6 +5,12 @@
 # This file is distributed under the Clear BSD license.
 # The full text can be found in LICENSE in the root directory.
 
+try:
+    from urllib.request import urlopen
+    from urllib.error import HTTPError
+except:
+    from urllib2 import urlopen, HTTPError
+
 import pexpect
 import dlipower
 
@@ -17,23 +23,18 @@ def get_power_device(ip_address, username=None, password=None, outlet=None):
     '''
     if ip_address is None:
         return HumanButtonPusher()
-    p = pexpect.spawn('curl -L %s' % ip_address)
     try:
-        t = p.expect_exact(['<title>Power Controller </title>',
-                            'Sentry Switched CDU',
-                            '<title>APC | Log On</title>'], timeout=90)
-    except pexpect.EOF as e:
-        if hasattr(p, "before"):
-            print(p.before)
-        raise Exception("Unable to connect to %s." % ip_address)
+        data = urlopen("http://" + ip_address).read().decode()
+    except HTTPError as e:
+        data = e.read().decode()
     except Exception as e:
         print(e)
         raise Exception("\nError connecting to %s" % ip_address)
-    if t == 0:
+    if '<title>Power Controller' in data:
         return DLIPowerSwitch(ip_address, outlet=outlet, username=username, password=password)
-    elif t == 1:
+    if 'Sentry Switched CDU' in data:
         return SentrySwitchedCDU(ip_address, outlet=outlet)
-    elif t == 2:
+    if '<title>APC ' in data:
         return APCPower(ip_address, outlet=outlet)
     else:
         raise Exception("No code written to handle power device found at %s" % ip_address)