Fixed issue with setup.py and fix typo

This commit is contained in:
Timur Nurlygayanov 2013-09-26 14:59:05 +04:00
parent e3570113bf
commit 8d41a50c46
3 changed files with 9 additions and 13 deletions

View File

@ -56,6 +56,9 @@ class MuranoTest(fuel_health.nmanager.OfficialClientTest):
if not hasattr(element, attribute):
self.fail(msg)
def is_keypair_available(self, keyname):
return keyname in [k.id for k in self.compute_client.keypairs.list()]
def list_environments(self):
"""
This method allows to get the list of environments.

View File

@ -15,12 +15,14 @@
# under the License.
from fuel_health import murano
from fuel_health import heatmanager
class MuranoBaseSmokeTests(heatmanager.HeatBaseTest):
class MuranoDeploymentSmokeTests(murano.MuranoTest):
"""
TestClass contains tests that check core Murano functionality.
TestClass contains verifications of full Murano functionality.
Special requirements:
1. Murano component should be installed.
2. Windows image with metadata should be imported.
"""
def test_check_default_key_pair(self):
@ -65,15 +67,6 @@ class MuranoBaseSmokeTests(heatmanager.HeatBaseTest):
"checking if Windows image with Murano tag is available",
exp_key, exp_value)
class MuranoDeploymentSmokeTests(murano.MuranoTest):
"""
TestClass contains verifications of full Murano functionality.
Special requirements:
1. Murano component should be installed.
2. Windows image with metadata should be imported.
"""
def test_deploy_ad(self):
"""Check Murano API Service: Deploy AD
Test checks that user can deploy AD.

View File

@ -23,7 +23,7 @@ fuel_health_reqs = [
'python-keystoneclient>=0.3.1',
'python-novaclient>=2.13.0',
'python-heatclient==0.2.2',
'python-muranoclient=>0.2',
'python-muranoclient>=0.2',
'paramiko>=1.10.1',
'requests>=1.1,<1.2.3',
'unittest2>=0.5.1',