Fix imports so that we can use resources with Kilo

Change-Id: I890e3fd7e5d8c5ab9179310a05aba4aee1365799
Closes-Bug: #1493048

contrail_heat/resources/attach_policy.py

@@ -1,10 +1,20 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.common import exception
-from heat.engine.resources.neutron import neutron
+try:
+    from heat.engine.resources.neutron import neutron
+except ImportError:
+    from heat.engine.resources.openstack.neutron import neutron
 from heat.engine import properties
 
 from neutronclient.common.exceptions import NeutronClientException
 from neutronclient.neutron import v2_0 as neutronV20
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 
 logger = logging.getLogger(__name__)
 

contrail_heat/resources/contrail.py

@@ -3,7 +3,10 @@
 from cfgm_common import exceptions as cfgm_exp
 from heat.engine import resource
 from heat.engine.properties import Properties
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 from vnc_api import vnc_api
 
 LOG = logging.getLogger(__name__)

contrail_heat/resources/network_ipam.py

@@ -1,3 +1,7 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import properties
 from vnc_api import vnc_api
 from contrail_heat.resources import contrail

contrail_heat/resources/network_policy.py

@@ -1,10 +1,18 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
+
 from heat.engine import constraints
 from heat.engine import clients
 from heat.engine import properties
 from vnc_api import vnc_api
 from contrail_heat.resources.contrail import ContrailResource
 
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 import uuid
 import copy
 

contrail_heat/resources/physical_interface.py

@@ -1,3 +1,8 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
+
 from heat.engine import properties
 from vnc_api import vnc_api
 from contrail_heat.resources import contrail

contrail_heat/resources/physical_router.py

@@ -1,3 +1,8 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
+
 from heat.engine import properties
 from vnc_api import vnc_api
 from contrail_heat.resources import contrail

contrail_heat/resources/service_instance.py

@@ -1,6 +1,13 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import constraints
 from heat.engine import properties
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 from vnc_api import vnc_api
 from contrail_heat.resources.contrail import ContrailResource
 import uuid

contrail_heat/resources/service_template.py

@@ -1,6 +1,13 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import constraints
 from heat.engine import properties
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 from vnc_api import vnc_api
 from contrail_heat.resources.contrail import ContrailResource
 

contrail_heat/resources/virtual_machine_interface.py

@@ -1,3 +1,7 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import properties
 from heat.engine import constraints
 from vnc_api import vnc_api

contrail_heat/resources/virtual_network.py

@@ -1,9 +1,16 @@
 import uuid
 
 from contrail_heat.resources import contrail
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import constraints
 from heat.engine import properties
-from heat.openstack.common import log as logging
+try:
+    from heat.openstack.common import log as logging
+except ImportError:
+    from oslo_log import log as logging
 from vnc_api import vnc_api
 
 LOG = logging.getLogger(__name__)

contrail_heat/resources/vn_subnet.py

@@ -1,3 +1,7 @@
+try:
+    from heat.common.i18n import _
+except ImportError:
+    pass
 from heat.engine import constraints
 from heat.engine import properties
 from vnc_api import vnc_api