commit 0a28a74502393b5b1b26156730ca4f3e432d4d6b
author kelvin-onlab <kelvin@onlab.us> Mon May 18 16:03:13 2015 -0700
committer kelvin-onlab <kelvin@onlab.us> Mon May 18 16:03:13 2015 -0700
tree bf38d9f2291d572577a7a169ba97abe0e734dc0b
parent 033cc0f767e39cdbbb83d354b7227ed33ac3f71f
parent b29ccbe88627bc36c96f50747054d554c2ec6ac6

Fixed minor error in teston.py and some conflict issues with master

TestON/core/teston.py

diff --git a/TestON/core/teston.py b/TestON/core/teston.py
index b8025c3..1d41acf 100644
--- a/TestON/core/teston.py
+++ b/TestON/core/teston.py
@@ -165,13 +165,12 @@
         driverClass = getattr(driverModule, driverName)
         driverObject = driverClass()
 
-        if "OC" in self.componentDictionary[component]['host']:
-            try: 
-                self.componentDictionary[component]['host'] = os.environ[str( self.componentDictionary[component]['host'])]
-            except KeyError: 
-                self.log.error("Missing OC environment variable! Check your environment setup and retry")
-            except Exception as inst:
-                self.log.error("Uncaught exception: " + str(inst))
+        try:
+            self.componentDictionary[component]['host'] = os.environ[str( self.componentDictionary[component]['host'])]
+        except KeyError:
+            self.log.info("Missing OC environment variable! Using stored IPs")
+        except Exception as inst:
+            self.log.error("Uncaught exception: " + str(inst))
 
         connect_result = driverObject.connect(user_name = self.componentDictionary[component]['user'] if ('user' in self.componentDictionary[component].keys()) else getpass.getuser(),
                                               ip_address= self.componentDictionary[component]['host'] if ('host' in self.componentDictionary[component].keys()) else 'localhost',