From: Steve Baker <sbaker@redhat.com>
Date: Thu, 14 Feb 2013 00:10:24 +0000 (+1300)
Subject: Complete tests for NetworkInterface
X-Git-Tag: 2014.1~900
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=6f330aed62e2d199efdd3d0defa4f717b2f84f59;p=openstack-build%2Fheat-build.git

Complete tests for NetworkInterface

Previous test was lacking some coverage, and had a hidden error.

Change-Id: I7cd3c98a3b89eef4f84f0e52701ab7f7fccc61f2
---

diff --git a/heat/engine/resources/network_interface.py b/heat/engine/resources/network_interface.py
index 3a2117e3..e3683a39 100644
--- a/heat/engine/resources/network_interface.py
+++ b/heat/engine/resources/network_interface.py
@@ -79,11 +79,6 @@ class NetworkInterface(resource.Resource):
     def handle_update(self, json_snippet):
         return self.UPDATE_REPLACE
 
-    def FnGetAtt(self, key):
-        if key == 'AvailabilityZone':
-            return self.properties.get(key, '')
-        raise exception.InvalidTemplateAttribute(resource=self.name, key=key)
-
 
 def resource_mapping():
     return {
diff --git a/heat/tests/test_vpc.py b/heat/tests/test_vpc.py
index 1b6b103b..c2d40d19 100644
--- a/heat/tests/test_vpc.py
+++ b/heat/tests/test_vpc.py
@@ -164,18 +164,12 @@ class VPCTestBase(unittest.TestCase):
         })
         quantumclient.Client.create_port({
             'port': {
-                'status': 'ACTIVE',
-                'device_owner': '',
-                'name': 'test_stack.the_nic',
-                'admin_state_up': True,
-                'network_id': 'aaaa',
-                'tenant_id': 'c1210485b2424d48804aad5d39c61b8f',
-                'mac_address': 'fa:16:3e:25:32:5d',
-                'fixed_ips': [{
-                    'subnet_id': 'cccc',
-                    'ip_address': '10.0.0.100'}],
-                'id': 'dddd',
-                'device_id': ''
+                'network_id': 'aaaa', 'fixed_ips': [{
+                    'subnet_id': u'cccc',
+                    'ip_address': u'10.0.0.100'
+                }],
+                'name': u'test_stack.the_nic',
+                'admin_state_up': True
             }}).AndReturn({
                 'port': {
                     'admin_state_up': True,
@@ -283,9 +277,9 @@ class NetworkInterfaceTest(VPCTestBase):
         self.mock_create_network()
         self.mock_create_subnet()
         self.mock_create_network_interface()
-        #self.mock_delete_network_interface()
-        #self.mock_delete_subnet()
-        #self.mock_delete_network()
+        self.mock_delete_network_interface()
+        self.mock_delete_subnet()
+        self.mock_delete_network()
 
         self.m.ReplayAll()
 
@@ -293,8 +287,11 @@ class NetworkInterfaceTest(VPCTestBase):
         resource = stack['the_nic']
 
         resource.validate()
-#
-#        ref_id = resource.FnGetRefId()
-#        self.assertEqual('dddd', ref_id)
 
+        ref_id = resource.FnGetRefId()
+        self.assertEqual('dddd', ref_id)
+
+        self.assertEqual(vpc.VPC.UPDATE_REPLACE, resource.handle_update({}))
+
+        stack.delete()
         self.m.VerifyAll()