Make resource registration conditional

If client libraries are not present for Swift or Quantum, don't register
the corresponding resource types.

Change-Id: I95a42973775b7f4c1d82caa47dc0660dfe54bb21
Signed-off-by: Zane Bitter <zbitter@redhat.com>

diff --git a/heat/engine/resources/quantum/floatingip.py b/heat/engine/resources/quantum/floatingip.py
index 3dbe08d5a1788d052d903eaaaf2410e6f6bd3a8a..298a5a727a36f79c18d6fe7f843c4b7ecabc897e 100644 (file)
--- a/heat/engine/resources/quantum/floatingip.py
+++ b/heat/engine/resources/quantum/floatingip.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.engine import clients
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
@@ -72,6 +73,9 @@ class FloatingIPAssociation(quantum.QuantumResource):
 
 
 def resource_mapping():
+    if clients.quantumclient is None:
+        return {}
+
     return {
         'OS::Quantum::FloatingIP': FloatingIP,
         'OS::Quantum::FloatingIPAssociation': FloatingIPAssociation,

diff --git a/heat/engine/resources/quantum/net.py b/heat/engine/resources/quantum/net.py
index d6efc6e6a7d9386be5da83093729e6193fdd8445..d592f5c884a0cb31f4cdb1fb43efa0129cac3c1a 100644 (file)
--- a/heat/engine/resources/quantum/net.py
+++ b/heat/engine/resources/quantum/net.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.engine import clients
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
@@ -46,6 +47,9 @@ class Net(quantum.QuantumResource):
 
 
 def resource_mapping():
+    if clients.quantumclient is None:
+        return {}
+
     return {
         'OS::Quantum::Net': Net,
     }

diff --git a/heat/engine/resources/quantum/port.py b/heat/engine/resources/quantum/port.py
index a6d65511b6125cfb9332094a2557981924fae06f..abceb95ed3c0b8e801411daab8a94caf3423a789 100644 (file)
--- a/heat/engine/resources/quantum/port.py
+++ b/heat/engine/resources/quantum/port.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.engine import clients
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
@@ -59,6 +60,9 @@ class Port(quantum.QuantumResource):
 
 
 def resource_mapping():
+    if clients.quantumclient is None:
+        return {}
+
     return {
         'OS::Quantum::Port': Port,
     }

diff --git a/heat/engine/resources/quantum/router.py b/heat/engine/resources/quantum/router.py
index bebe388d3f6f324dc83b37291a4698bb4b67d2af..d7184183f674c5c743fa9c40a2a32a87d723f4ef 100644 (file)
--- a/heat/engine/resources/quantum/router.py
+++ b/heat/engine/resources/quantum/router.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.engine import clients
 from heat.engine.resources.quantum import quantum
 
 from heat.openstack.common import log as logging
@@ -94,6 +95,9 @@ class RouterGateway(quantum.QuantumResource):
 
 
 def resource_mapping():
+    if clients.quantumclient is None:
+        return {}
+
     return {
         'OS::Quantum::Router': Router,
         'OS::Quantum::RouterInterface': RouterInterface,

diff --git a/heat/engine/resources/quantum/subnet.py b/heat/engine/resources/quantum/subnet.py
index ab88241995d127f60de6c5adaf121ecfc3bd40d0..e00ba2f1239c044bcba93bdbb93368aca5c26bae 100644 (file)
--- a/heat/engine/resources/quantum/subnet.py
+++ b/heat/engine/resources/quantum/subnet.py
@@ -13,6 +13,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from heat.engine import clients
 from heat.openstack.common import log as logging
 from heat.engine.resources.quantum import quantum
 
@@ -65,6 +66,9 @@ class Subnet(quantum.QuantumResource):
 
 
 def resource_mapping():
+    if clients.quantumclient is None:
+        return {}
+
     return {
         'OS::Quantum::Subnet': Subnet,
     }

diff --git a/heat/engine/resources/s3.py b/heat/engine/resources/s3.py
index 97bd847e493d1d3dc6138888b890ee69b5d0d1ac..4ca070f58eb3a90579439440a40ae90662146cbf 100644 (file)
--- a/heat/engine/resources/s3.py
+++ b/heat/engine/resources/s3.py
@@ -123,6 +123,9 @@ class S3Bucket(resource.Resource):
 
 
 def resource_mapping():
+    if clients.swiftclient is None:
+        return {}
+
     return {
         'AWS::S3::Bucket': S3Bucket,
     }