openstack
/
heat
Code Issues Proposed changes

Merge "Change Nova::FloatingIPAssociation resource's id"

This commit is contained in:
Jenkins 2015-02-16 03:47:34 +00:00 committed by Gerrit Code Review
parent d36c63d764 f5d2b935ed
commit a63bd7e87f
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
heat/engine/resources/nova_floatingip.py
View File

@ -10,6 +10,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from heat.common import exception
from oslo.utils import excutils
import six
@ -134,7 +135,10 @@ class NovaFloatingIpAssociation(resource.Resource):
fl_ip = self.nova().floating_ips.get(self.properties[self.FLOATING_IP])
self.nova().servers.add_floating_ip(server, fl_ip.ip)
self.resource_id_set('%s-%s' % (fl_ip.id, fl_ip.ip))
if self.id is not None:
self.resource_id_set(self.id)
else:
raise exception.ResourceNotAvailable(resource_name=self.name)
def handle_delete(self):
if self.resource_id is None:
@ -167,7 +171,10 @@ class NovaFloatingIpAssociation(resource.Resource):
fl_ip = self.nova().floating_ips.get(fl_ip_id)
self.nova().servers.add_floating_ip(server, fl_ip.ip)
self.resource_id_set('%s-%s' % (fl_ip.id, fl_ip.ip))
if self.id is not None:
self.resource_id_set(self.id)
else:
raise exception.ResourceNotAvailable(resource_name=self.name)
def resource_mapping():

3
heat/tests/test_nova_floatingip.py
View File

@ -173,6 +173,9 @@ class NovaFloatingIPTest(common.HeatTestCase):
self.assertEqual((rsrc.CREATE, rsrc.COMPLETE), rsrc.state)
self.assertIsNotNone(rsrc.id)
self.assertEqual(rsrc.id, rsrc.resource_id)
self.m.VerifyAll()
def test_floating_ip_assoc_delete(self):