1 In-house patch to change the name of Neutron objects to use underscores |
1 In-house patch to change the name of Neutron objects to use underscores |
2 instead of hyphens on Solaris. This patch has not yet been submitted |
2 instead of hyphens on Solaris. This patch has not yet been submitted |
3 upstream. |
3 upstream. |
4 |
4 |
5 --- heat-2014.2.2/heat/engine/resources/neutron/neutron.py.orig 2014-07-22 18:07:26.583195123 -0600 |
5 --- heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py.orig 2015-05-05 11:16:07.369538369 -0600 |
6 +++ heat-2014.2.2/heat/engine/resources/neutron/neutron.py 2014-07-22 18:08:49.115350165 -0600 |
6 +++ heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py 2015-05-05 11:17:11.789570983 -0600 |
7 @@ -11,6 +11,7 @@ |
7 @@ -13,6 +13,7 @@ |
8 # License for the specific language governing permissions and limitations |
8 from oslo_utils import uuidutils |
9 # under the License. |
9 import six |
10 |
10 |
11 +import platform |
11 +import platform |
12 import warnings |
12 import warnings |
13 |
13 |
14 from heat.common import exception |
14 from heat.common import exception |
15 @@ -188,3 +189,10 @@ class NeutronResource(resource.Resource) |
15 @@ -188,3 +189,10 @@ class NeutronResource(resource.Resource) |
16 def check_delete_complete(self, delete_task): |
16 return True |
17 # if the resource was already deleted, delete_task will be None |
17 |
18 return delete_task is None or delete_task.step() |
18 return self._not_found_in_call(self._show_resource) |
19 + |
19 + |
20 + def physical_resource_name(self): |
20 + def physical_resource_name(self): |
21 + name = super(NeutronResource, self).physical_resource_name() |
21 + name = super(NeutronResource, self).physical_resource_name() |
22 + if platform.uname()[0] == "SunOS": |
22 + if platform.uname()[0] == "SunOS": |
23 + # EVS can not use hyphen characters |
23 + # EVS can not use hyphen characters |