Merge "Remove unnecessary has_client() checks"

heat/engine/resources/openstack/barbican/order.py

@@ -16,7 +16,6 @@ import six
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import attributes
-from heat.engine import clients
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
@@ -199,10 +198,3 @@ def resource_mapping():
     return {
         'OS::Barbican::Order': Order,
     }
-
-
-def available_resource_mapping():
-    if not clients.has_client('barbican'):
-        return {}
-
-    return resource_mapping()

heat/engine/resources/openstack/barbican/secret.py

@@ -15,7 +15,6 @@ import six
 
 from heat.common.i18n import _
 from heat.engine import attributes
-from heat.engine import clients
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
@@ -141,10 +140,3 @@ def resource_mapping():
     return {
         'OS::Barbican::Secret': Secret,
     }
-
-
-def available_resource_mapping():
-    if not clients.has_client('barbican'):
-        return {}
-
-    return resource_mapping()

heat/engine/resources/openstack/heat/swiftsignal.py

@@ -339,7 +339,3 @@ class SwiftSignal(resource.Resource):
 def resource_mapping():
     return {'OS::Heat::SwiftSignal': SwiftSignal,
             'OS::Heat::SwiftSignalHandle': SwiftSignalHandle}
-
-
-def available_resource_mapping():
-    return resource_mapping()

heat/engine/resources/openstack/manila/security_service.py

@@ -12,7 +12,6 @@
 #    under the License.
 
 from heat.common.i18n import _
-from heat.engine import clients
 from heat.engine import constraints
 from heat.engine import properties
 from heat.engine import resource
@@ -110,10 +109,3 @@ def resource_mapping():
     return {
         'OS::Manila::SecurityService': SecurityService
     }
-
-
-def available_resource_mapping():
-    if not clients.has_client('manila'):
-        return {}
-
-    return resource_mapping()

heat/engine/resources/openstack/manila/share_type.py

@@ -12,7 +12,6 @@
 #    under the License.
 
 from heat.common.i18n import _
-from heat.engine import clients
 from heat.engine import properties
 from heat.engine import resource
 from heat.engine import support
@@ -100,10 +99,3 @@ def resource_mapping():
     return {
         'OS::Manila::ShareType': ManilaShareType
     }
-
-
-def available_resource_mapping():
-    if not clients.has_client('manila'):
-        return {}
-
-    return resource_mapping()

heat/engine/resources/openstack/zaqar/queue.py

@@ -14,7 +14,6 @@
 from heat.common import exception
 from heat.common.i18n import _
 from heat.engine import attributes
-from heat.engine import clients
 from heat.engine import properties
 from heat.engine import resource
 from heat.engine import support
@@ -131,9 +130,3 @@ def resource_mapping():
     return {
         'OS::Zaqar::Queue': ZaqarQueue,
     }
-
-
-def available_resource_mapping():
-    if not clients.has_client('zaqar'):
-        return {}
-    return resource_mapping()