Merge "Align usage of test skipping."

diff --cc heat/tests/test_quantum.py
index 045b75a7b3450d495af06d517fbeb9200b71c214,fb41f0691a2ccff52b1f9c6093ee54610c99fcac..f8a22c1293b3aa2d1a617091c04dc6da5b454c76
--- 1/heat/tests/test_quantum.py
--- 2/heat/tests/test_quantum.py
+++ b/heat/tests/test_quantum.py
@@@ -316,37 -328,21 +316,38 @@@ class QuantumSubnetTest(HeatTestCase)
          self.m.VerifyAll()
  
  
 +@skipIf(quantumclient is None, 'quantumclient unavailable')
  class QuantumFloatingIPTest(HeatTestCase):
+     @skipIf(net.clients.quantumclient is None, "Missing Quantum Client")
      def setUp(self):
          super(QuantumFloatingIPTest, self).setUp()
 -        self.m.StubOutWithMock(floatingip.FloatingIP, 'quantum')
 -        self.m.StubOutWithMock(floatingip.FloatingIPAssociation, 'quantum')
 -        self.m.StubOutWithMock(port.Port, 'quantum')
 +        self.m.StubOutWithMock(quantumclient.Client, 'create_floatingip')
 +        self.m.StubOutWithMock(quantumclient.Client, 'delete_floatingip')
 +        self.m.StubOutWithMock(quantumclient.Client, 'show_floatingip')
 +        self.m.StubOutWithMock(quantumclient.Client, 'update_floatingip')
 +        self.m.StubOutWithMock(quantumclient.Client, 'create_port')
 +        self.m.StubOutWithMock(quantumclient.Client, 'delete_port')
 +        self.m.StubOutWithMock(quantumclient.Client, 'show_port')
          setup_dummy_db()
  
 -    @skipIf(net.clients.quantumclient is None, 'quantumclient unavailable')
      def test_floating_ip(self):
  
 -        fq = FakeQuantum()
 -        floatingip.FloatingIP.quantum().MultipleTimes().AndReturn(fq)
 +        quantumclient.Client.create_floatingip({
 +            'floatingip': {'floating_network_id': u'abcd1234'}
 +        }).AndReturn({'floatingip': {
 +            "status": "ACTIVE",
 +            "id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766"
 +        }})
 +
 +        quantumclient.Client.show_floatingip(
 +            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
 +        ).MultipleTimes().AndReturn({'floatingip': {
 +            "status": "ACTIVE",
 +            "id": "fc68ea2c-b60b-4b4f-bd82-94ec81110766"
 +        }})
  
 +        quantumclient.Client.delete_floatingip(
 +            'fc68ea2c-b60b-4b4f-bd82-94ec81110766').AndReturn(None)
          self.m.ReplayAll()
  
          t = template_format.parse(quantum_floating_template)