← Back to branch summary

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

« back to all changes in this revision

Viewing changes to heat/tests/test_volume.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_volume.py
23
23
from heat.common import template_format
24
24
from heat.engine import scheduler
25
25
from heat.engine.resources import instance
 
26
from heat.engine.resources import nova_utils
26
27
from heat.engine.resources import volume as vol
27
28
from heat.engine import clients
28
29
from heat.engine import resource
85
86
        self.m.StubOutWithMock(self.cinder_fc.volumes, 'delete')
86
87
        self.m.StubOutWithMock(self.fc.volumes, 'create_server_volume')
87
88
        self.m.StubOutWithMock(self.fc.volumes, 'delete_server_volume')
 
89
        self.m.StubOutWithMock(nova_utils, 'get_image_id')
88
90
        utils.setup_dummy_db()
89
91
 
90
92
    def create_volume(self, t, stack, resource_name):
304
306
 
305
307
        self.fc.volumes.delete_server_volume(
306
308
            'WikiDatabase', 'vol-123').AndRaise(
 
309
                clients.novaclient.exceptions.BadRequest('Already detached'))
 
310
 
 
311
        self.fc.volumes.delete_server_volume(
 
312
            'WikiDatabase', 'vol-123').AndRaise(
307
313
                clients.novaclient.exceptions.NotFound('Not found'))
308
314
 
309
315
        self.fc.volumes.delete_server_volume(
590
596
            size=u'1', availability_zone='nova',
591
597
            display_description='CustomDescription',
592
598
            display_name='CustomName',
593
 
            imageRef='Image1',
 
599
            imageRef='46988116-6703-4623-9dbc-2bc6d284021b',
594
600
            snapshot_id='snap-123',
595
601
            metadata={'key': 'value'},
596
602
            source_volid='vol-012',
609
615
            # Note that specifying all these arguments doesn't work in
610
616
            # practice, as they are conflicting, but we just want to check they
611
617
            # are sent to the backend.
612
 
            'imageRef': 'Image1',
 
618
            'imageRef': '46988116-6703-4623-9dbc-2bc6d284021b',
613
619
            'snapshot_id': 'snap-123',
614
620
            'source_volid': 'vol-012',
615
621
        }
631
637
 
632
638
        clients.OpenStackClients.cinder().MultipleTimes().AndReturn(
633
639
            self.cinder_fc)
 
640
        clients.OpenStackClients.nova('compute').AndReturn(self.fc)
 
641
        nova_utils.get_image_id(
 
642
            self.fc, '46988116-6703-4623-9dbc-2bc6d284021b').AndReturn(
 
643
                '46988116-6703-4623-9dbc-2bc6d284021b')
634
644
        self.cinder_fc.volumes.create(
635
645
            size=u'1', availability_zone='nova',
636
646
            display_description='ImageVolumeDescription',
637
647
            display_name='ImageVolume',
638
 
            imageRef='Image1').AndReturn(fv)
 
648
            imageRef='46988116-6703-4623-9dbc-2bc6d284021b').AndReturn(fv)
639
649
 
640
650
        self.m.ReplayAll()
641
651
 
645
655
            'name': 'ImageVolume',
646
656
            'description': 'ImageVolumeDescription',
647
657
            'availability_zone': 'nova',
648
 
            'imageRef': 'Image1',
 
658
            'image': '46988116-6703-4623-9dbc-2bc6d284021b',
649
659
        }
650
660
        stack = utils.parse_stack(t, stack_name=stack_name)
651
661