| author | Laszlo Peter <laszlo.peter@oracle.com> |
| Wed, 07 Sep 2016 14:48:41 -0700 | |
| changeset 6849 | f9a2279efa0d |
| parent 5405 | 66fd59fecd68 |
| permissions | -rw-r--r-- |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to change the name of Neutron objects to use underscores |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
instead of hyphens on Solaris. This patch has not yet been submitted |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
upstream. |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
5 |
--- heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py.orig 2015-05-05 11:16:07.369538369 -0600 |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
6 |
+++ heat-2015.1.0/heat/engine/resources/openstack/neutron/neutron.py 2015-05-05 11:17:11.789570983 -0600 |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
7 |
@@ -13,6 +13,7 @@ |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
8 |
from oslo_utils import uuidutils |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
9 |
import six |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+import platform |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2025
diff
changeset
|
12 |
import warnings |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
|
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
from heat.common import exception |
|
3998
5bd484384122
PSARC 2015/110 OpenStack service updates for Juno
Danek Duvall <danek.duvall@oracle.com>
parents:
2025
diff
changeset
|
15 |
@@ -188,3 +189,10 @@ class NeutronResource(resource.Resource) |
|
5405
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
16 |
return True |
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
17 |
|
|
66fd59fecd68
PSARC 2015/535 OpenStack service updates for Kilo
Devjani Ray <devjani.ray@oracle.com>
parents:
3998
diff
changeset
|
18 |
return self._not_found_in_call(self._show_resource) |
|
2025
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ def physical_resource_name(self): |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ name = super(NeutronResource, self).physical_resource_name() |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ if platform.uname()[0] == "SunOS": |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
+ # EVS can not use hyphen characters |
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ name = name.replace("-", "_")
|
|
8dbf23e740f2
PSARC/2014/236 OpenStack Heat (OpenStack Orchestration Service)
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
+ return name |