Merge "Move integration tests to python-saharaclient 0.6.0"
This commit is contained in:
commit
5d17bf43f7
@ -21,7 +21,7 @@ import uuid
|
|||||||
|
|
||||||
from neutronclient.v2_0 import client as neutron_client
|
from neutronclient.v2_0 import client as neutron_client
|
||||||
from novaclient.v1_1 import client as nova_client
|
from novaclient.v1_1 import client as nova_client
|
||||||
import savannaclient.client as savanna_client
|
import saharaclient.client as sahara_client
|
||||||
from swiftclient import client as swift_client
|
from swiftclient import client as swift_client
|
||||||
import unittest2
|
import unittest2
|
||||||
|
|
||||||
@ -64,13 +64,13 @@ class ITestCase(unittest2.TestCase):
|
|||||||
self.common_config.SAHARA_HOST, self.common_config.SAHARA_PORT
|
self.common_config.SAHARA_HOST, self.common_config.SAHARA_PORT
|
||||||
)
|
)
|
||||||
|
|
||||||
self.sahara = savanna_client.Client(
|
self.sahara = sahara_client.Client(
|
||||||
self.common_config.SAHARA_API_VERSION,
|
version=self.common_config.SAHARA_API_VERSION,
|
||||||
username=self.common_config.OS_USERNAME,
|
username=self.common_config.OS_USERNAME,
|
||||||
api_key=self.common_config.OS_PASSWORD,
|
api_key=self.common_config.OS_PASSWORD,
|
||||||
project_name=self.common_config.OS_TENANT_NAME,
|
project_name=self.common_config.OS_TENANT_NAME,
|
||||||
auth_url=self.common_config.OS_AUTH_URL,
|
auth_url=self.common_config.OS_AUTH_URL,
|
||||||
savanna_url='http://%s:%s/v%s/%s' % (
|
sahara_url='http://%s:%s/v%s/%s' % (
|
||||||
self.common_config.SAHARA_HOST,
|
self.common_config.SAHARA_HOST,
|
||||||
self.common_config.SAHARA_PORT,
|
self.common_config.SAHARA_PORT,
|
||||||
self.common_config.SAHARA_API_VERSION,
|
self.common_config.SAHARA_API_VERSION,
|
||||||
|
@ -17,4 +17,4 @@ testscenarios>=0.4
|
|||||||
testtools>=0.9.34
|
testtools>=0.9.34
|
||||||
unittest2
|
unittest2
|
||||||
|
|
||||||
python-savannaclient>=0.5.0
|
python-saharaclient>=0.6.0
|
||||||
|
Loading…
Reference in New Issue
Block a user