← Back to branch summary

~ubuntu-branches/ubuntu/trusty/heat/trusty-security

« back to all changes in this revision

Viewing changes to heat/tests/test_neutron.py

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2013-10-12 16:53:03 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20131012165303-0sc41ujl3luuu56q
Tags: 2013.2~rc2-0ubuntu1
https://launchpad.net/bugs/1239156
New upstream release candidate (LP: #1239156).

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/test_neutron.py
289
289
 
290
290
        neutronclient.Client.show_network(
291
291
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
292
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
292
        ).AndRaise(qe.NetworkNotFoundClient())
293
293
 
294
294
        neutronclient.Client.show_network(
295
295
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
321
321
 
322
322
        neutronclient.Client.show_network(
323
323
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
324
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
324
        ).AndRaise(qe.NetworkNotFoundClient())
325
325
 
326
326
        neutronclient.Client.delete_network(
327
327
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
328
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
328
        ).AndRaise(qe.NetworkNotFoundClient())
329
329
 
330
330
        self.m.ReplayAll()
331
331
        t = template_format.parse(neutron_template)
903
903
        }})
904
904
        neutronclient.Client.show_port(
905
905
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
906
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
906
        ).AndRaise(qe.PortNotFoundClient())
907
907
        neutronclient.Client.show_port(
908
908
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
909
909
        ).MultipleTimes().AndReturn({'port': {
987
987
 
988
988
        neutronclient.Client.show_port(
989
989
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
990
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
990
        ).AndRaise(qe.PortNotFoundClient())
991
991
 
992
992
        neutronclient.Client.delete_floatingip(
993
993
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
1001
1001
 
1002
1002
        neutronclient.Client.delete_port(
1003
1003
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'
1004
 
        ).AndRaise(qe.NeutronClientException(status_code=404))
 
1004
        ).AndRaise(qe.PortNotFoundClient())
1005
1005
 
1006
1006
        neutronclient.Client.delete_floatingip(
1007
1007
            'fc68ea2c-b60b-4b4f-bd82-94ec81110766'