Revision 3768eb67 snf-cyclades-app/synnefo/logic/tests/servers.py

b/snf-cyclades-app/synnefo/logic/tests/servers.py
34 34
from synnefo.logic import servers
35 35
from synnefo import quotas
36 36
from synnefo.db import models_factory as mfactory, models
37
from mock import patch
37
from mock import patch, Mock
38 38

  
39 39
from snf_django.lib.api import faults
40 40
from snf_django.utils.testing import mocked_quotaholder, override_settings
41 41
from django.conf import settings
42 42
from copy import deepcopy
43 43

  
44
fixed_image = Mock()
45
fixed_image.return_value = {'location': 'pithos://foo',
46
                            'checksum': 'test_checksum',
47
                            "id": 1,
48
                            "name": "test_image",
49
                            "size": 1024,
50
                            "is_snapshot": False,
51
                            'disk_format': 'diskdump'}
44 52

  
53

  
54
@patch('synnefo.api.util.get_image', fixed_image)
45 55
@patch("synnefo.logic.rapi_pool.GanetiRapiClient")
46 56
class ServerCreationTest(TransactionTestCase):
47 57
    def test_create(self, mrapi):
......
51 61
            "name": "test_vm",
52 62
            "password": "1234",
53 63
            "flavor": flavor,
54
            "image": {"id": "foo", "backend_id": "foo", "format": "diskdump",
55
                      "checksum": "test_checksum",
56
                      "metadata": "{}"},
64
            "image_id": "safs",
57 65
            "networks": [],
58 66
            "metadata": {"foo": "bar"},
59 67
            "personality": [],
......
103 111
            with override_settings(settings, **osettings):
104 112
                vm = servers.create(**req)
105 113
        name, args, kwargs = mrapi().CreateInstance.mock_calls[-1]
106
        self.assertEqual(kwargs["disks"][0], {"provider": "archipelago",
107
                                              "origin": "test_checksum",
108
                                              "foo": "mpaz",
109
                                              "lala": "lolo",
110
                                              "size": 1024})
114
        self.assertEqual(kwargs["disks"][0],
115
                         {"provider": "archipelago",
116
                          "origin": "pithos:test_checksum",
117
                          "name": vm.volumes.all()[0].backend_volume_uuid,
118
                          "foo": "mpaz",
119
                          "lala": "lolo",
120
                          "size": 1024})
111 121

  
112 122

  
113 123
@patch("synnefo.logic.rapi_pool.GanetiRapiClient")

Also available in: Unified diff