aboutsummaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/vnf
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2018-03-12 14:42:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-03-12 14:42:23 +0000
commit42867b6f9bd8053b4d91ee0fc1fd127ae2919f15 (patch)
tree2f25590f0f9ca8719b3853ef873589c35760a8c3 /functest/opnfv_tests/vnf
parentaedd8d57351150bb97dc4d23bc5d0b3e5eb76db9 (diff)
parent1bdf68f6ed2d55d72d47c0ee4c7a7bc286c4ca3d (diff)
Merge changes from topic 'refactor_tempest'
* changes: Rewrite refstack testcase Fix many pylint warnings
Diffstat (limited to 'functest/opnfv_tests/vnf')
-rw-r--r--functest/opnfv_tests/vnf/ims/ixia/utils/IxLoadUtils.py3
-rw-r--r--functest/opnfv_tests/vnf/router/utilvnf.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/functest/opnfv_tests/vnf/ims/ixia/utils/IxLoadUtils.py b/functest/opnfv_tests/vnf/ims/ixia/utils/IxLoadUtils.py
index 50dfbc661..bc71a38cf 100644
--- a/functest/opnfv_tests/vnf/ims/ixia/utils/IxLoadUtils.py
+++ b/functest/opnfv_tests/vnf/ims/ixia/utils/IxLoadUtils.py
@@ -7,11 +7,12 @@
# which accompanies this distribution, and is available at
# http://www.apache.org/licenses/LICENSE-2.0
-import requests
import sys
import time
import logging
+import requests
+
from functest.opnfv_tests.vnf.ims.ixia.utils import IxRestUtils
diff --git a/functest/opnfv_tests/vnf/router/utilvnf.py b/functest/opnfv_tests/vnf/router/utilvnf.py
index 6861b3865..2865175b3 100644
--- a/functest/opnfv_tests/vnf/router/utilvnf.py
+++ b/functest/opnfv_tests/vnf/router/utilvnf.py
@@ -20,7 +20,6 @@ import yaml
from functest.utils import config
from git import Repo
-from requests.auth import HTTPBasicAuth
from snaps.openstack.utils import nova_utils
@@ -175,7 +174,7 @@ class Utilvnf(object): # pylint: disable=too-many-instance-attributes
response = requests.get(
url,
- auth=HTTPBasicAuth('admin', 'admin'),
+ auth=requests.auth.HTTPBasicAuth('admin', 'admin'),
headers={'Tenant': 'default_tenant'})
resp_data = response.json()