From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Wed, 2 Aug 2017 19:18:46 +0000 (+0200)
Subject: Fix import and docstrings in onos/teston
X-Git-Tag: 0.2~455^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=0160f156d74cd811f139cc01d1dd69f1c972ec5d;p=functest-xtesting.git

Fix import and docstrings in onos/teston

Change-Id: Ie38f3b0ab8805cd7ca3e946533be37598be9434e
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---

diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
index dfaa5cc1..a6d192ee 100644
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/connection.py
@@ -64,7 +64,7 @@ class Connection(Foundation):
         """
         os.getenv only returns current user value
         GetEnvValue returns a environment value of
-            current handle
+        current handle
         eg: GetEnvValue(handle,'HOME')
         """
         envhandle = handle
diff --git a/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
index cb75b5c3..875a2dc9 100644
--- a/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
+++ b/functest/opnfv_tests/sdn/onos/teston/adapters/environment.py
@@ -1,11 +1,11 @@
 """
 Description:
-    This file is used to setup the running environment
-    Include Download code,setup environment variable
-            Set onos running config
-            Set user name/password
-            Onos-push-keys and so on
-    lanqinglong@huawei.com
+This file is used to setup the running environment
+Include Download code,setup environment variable
+Set onos running config
+Set user name/password
+Onos-push-keys and so on
+lanqinglong@huawei.com
 
 #
 # All rights reserved. This program and the accompanying materials
@@ -17,7 +17,7 @@ Description:
 
 import logging
 import pexpect
-import pxssh
+from pexpect import pxssh
 import re
 import os
 import sys
@@ -196,10 +196,10 @@ class Environment(Connection):
 
     def ChangeTestCasePara(self, testcase, user, password):
         """
-        When running test script, there's something need
-        to change in every test folder's *.param & *.topo files
-        user: onos&compute node user
-        password: onos&compute node password
+        When running test script, there\'s something need
+        to change in every test folder\'s \*.param & \*.topo files
+        user: onos\&compute node user
+        password: onos\&compute node password
         """
         self.logger.info("Now Changing " + testcase + " name&password")
         if self.masterusername == 'root':