Fix rest_client import for Tempest based tests
Tempest master has been changed and since Murano test jobs use tempest master, this change is critical to merge. Change-Id: Ia6d90914484b7f6e51172e3ae7505838c5f65eac
This commit is contained in:
committed by
Ekaterina Chernova
parent
2ea56d5b0e
commit
3a5b0ec76c
@@ -14,16 +14,18 @@
|
||||
|
||||
import json
|
||||
import os
|
||||
import requests
|
||||
import time
|
||||
import uuid
|
||||
|
||||
import requests
|
||||
|
||||
from tempest import clients
|
||||
from tempest.common import isolated_creds
|
||||
from tempest.common import rest_client
|
||||
from tempest import config
|
||||
from tempest import exceptions
|
||||
import tempest.test
|
||||
from tempest import test
|
||||
from tempest_lib.common import rest_client
|
||||
from tempest_lib import exceptions
|
||||
|
||||
|
||||
CONF = config.CONF
|
||||
|
||||
@@ -222,7 +224,7 @@ class MuranoClient(rest_client.RestClient):
|
||||
return resp, json.loads(body)
|
||||
|
||||
|
||||
class TestCase(tempest.test.BaseTestCase):
|
||||
class TestCase(test.BaseTestCase):
|
||||
@classmethod
|
||||
def setUpClass(cls):
|
||||
super(TestCase, cls).setUpClass()
|
||||
|
||||
@@ -12,8 +12,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from tempest import exceptions
|
||||
from tempest.test import attr
|
||||
from tempest_lib import exceptions
|
||||
|
||||
from murano.tests.functional.api import base
|
||||
|
||||
|
||||
@@ -17,8 +17,7 @@ import uuid
|
||||
import zipfile
|
||||
|
||||
from tempest.test import attr
|
||||
|
||||
from tempest import exceptions
|
||||
from tempest_lib import exceptions
|
||||
|
||||
from murano.tests.functional.api import base
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
import testtools
|
||||
|
||||
from tempest import exceptions
|
||||
from tempest.test import attr
|
||||
from tempest_lib import exceptions
|
||||
|
||||
from murano.tests.functional.api import base
|
||||
|
||||
|
||||
@@ -14,8 +14,8 @@
|
||||
|
||||
import testtools
|
||||
|
||||
from tempest import exceptions
|
||||
from tempest.test import attr
|
||||
from tempest_lib import exceptions
|
||||
|
||||
from murano.tests.functional.api import base
|
||||
|
||||
|
||||
Reference in New Issue
Block a user