From 8d41a50c46c448f7eddf66afdea51cb73e420382 Mon Sep 17 00:00:00 2001
From: Timur Nurlygayanov <tnurlygayanov@mirantis.com>
Date: Thu, 26 Sep 2013 14:59:05 +0400
Subject: [PATCH] Fixed issue with setup.py and fix typo

---
 fuel_health/murano.py                           |  3 +++
 .../platform_smoke_tests/test_smoke_murano.py   | 17 +++++------------
 setup.py                                        |  2 +-
 3 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/fuel_health/murano.py b/fuel_health/murano.py
index c3240f54..2f9e1d2a 100644
--- a/fuel_health/murano.py
+++ b/fuel_health/murano.py
@@ -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.
diff --git a/fuel_health/tests/platform_smoke_tests/test_smoke_murano.py b/fuel_health/tests/platform_smoke_tests/test_smoke_murano.py
index 0620ac0c..6bb6ad02 100644
--- a/fuel_health/tests/platform_smoke_tests/test_smoke_murano.py
+++ b/fuel_health/tests/platform_smoke_tests/test_smoke_murano.py
@@ -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.
diff --git a/setup.py b/setup.py
index 304735ad..7ef49b63 100644
--- a/setup.py
+++ b/setup.py
@@ -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',