1
=== modified file 'nova/tests/test_instance_types.py'
2
--- nova/tests/test_instance_types.py	2011-04-27 21:03:05 +0000
3
+++ nova/tests/test_instance_types.py	2011-08-24 23:05:28 +0000
4
@@ -47,6 +47,29 @@
5
47
        self.id = max_id["id"] + 1
47
        self.id = max_id["id"] + 1
6
48
        self.name = str(int(time.time()))
48
        self.name = str(int(time.time()))
7
49
49
8
50
    def _nonexistent_flavor_name(self):
9
51
        """return an instance type name not in the DB"""
10
52
        nonexistent_flavor = "sdfsfsdf"
11
53
        flavors = instance_types.get_all_types()
12
54
        while nonexistent_flavor in flavors:
13
55
            nonexistent_flavor += "z"
14
56
        else:
15
57
            return nonexistent_flavor
16
58
17
59
    def _nonexistent_flavor_id(self):
18
60
        """return an instance type ID not in the DB"""
19
61
        nonexistent_flavor = 2700
20
62
        flavor_ids = [value["id"] for key, value in\
21
63
                    instance_types.get_all_types().iteritems()]
22
64
        while nonexistent_flavor in flavor_ids:
23
65
            nonexistent_flavor += 1
24
66
        else:
25
67
            return nonexistent_flavor
26
68
27
69
    def _existing_flavor(self):
28
70
        """return first instance type name"""
29
71
        return instance_types.get_all_types().keys()[0]
30
72
31
50
    def test_instance_type_create_then_delete(self):
73
    def test_instance_type_create_then_delete(self):
32
51
        """Ensure instance types can be created"""
74
        """Ensure instance types can be created"""
33
52
        starting_inst_list = instance_types.get_all_types()
75
        starting_inst_list = instance_types.get_all_types()
34
@@ -84,10 +107,11 @@
35
84
                exception.InvalidInput,
107
                exception.InvalidInput,
36
85
                instance_types.create, self.name, 256, 1, "aa", self.flavorid)
108
                instance_types.create, self.name, 256, 1, "aa", self.flavorid)
37
86
109
39
87
    def test_non_existant_inst_type_shouldnt_delete(self):
110
    def test_non_existent_inst_type_shouldnt_delete(self):
40
88
        """Ensures that instance type creation fails with invalid args"""
111
        """Ensures that instance type creation fails with invalid args"""
41
89
        self.assertRaises(exception.ApiError,
112
        self.assertRaises(exception.ApiError,
43
90
                          instance_types.destroy, "sfsfsdfdfs")
113
                          instance_types.destroy,
44
114
                          self._nonexistent_flavor_name())
45
91
115
46
92
    def test_repeated_inst_types_should_raise_api_error(self):
116
    def test_repeated_inst_types_should_raise_api_error(self):
47
93
        """Ensures that instance duplicates raises ApiError"""
117
        """Ensures that instance duplicates raises ApiError"""
48
@@ -97,3 +121,43 @@
49
97
        self.assertRaises(
121
        self.assertRaises(
50
98
                exception.ApiError,
122
                exception.ApiError,
51
99
                instance_types.create, new_name, 256, 1, 120, self.flavorid)
123
                instance_types.create, new_name, 256, 1, 120, self.flavorid)
52
124
53
125
    def test_will_not_destroy_with_no_name(self):
54
126
        """Ensure destroy sad path of no name raises error"""
55
127
        self.assertRaises(exception.ApiError,
56
128
                          instance_types.destroy,
57
129
                          self._nonexistent_flavor_name())
58
130
59
131
    def test_will_not_purge_without_name(self):
60
132
        """Ensure purge without a name raises error"""
61
133
        self.assertRaises(exception.InvalidInstanceType,
62
134
                          instance_types.purge, None)
63
135
64
136
    def test_will_not_purge_with_wrong_name(self):
65
137
        """Ensure purge without correct name raises error"""
66
138
        self.assertRaises(exception.ApiError,
67
139
                          instance_types.purge,
68
140
                          self._nonexistent_flavor_name())
69
141
70
142
    def test_will_not_get_bad_default_instance_type(self):
71
143
        """ensures error raised on bad default instance type"""
72
144
        FLAGS.default_instance_type = self._nonexistent_flavor_name()
73
145
        self.assertRaises(exception.InstanceTypeNotFoundByName,
74
146
                          instance_types.get_default_instance_type)
75
147
76
148
    def test_will_not_get_instance_type_by_name_with_no_name(self):
77
149
        """Ensure get by name returns default flavor with no name"""
78
150
        self.assertEqual(instance_types.get_default_instance_type(),
79
151
                              instance_types.get_instance_type_by_name(None))
80
152
81
153
    def test_will_not_get_instance_type_with_bad_name(self):
82
154
        """Ensure get by name returns default flavor with bad name"""
83
155
        self.assertRaises(exception.InstanceTypeNotFound,
84
156
                          instance_types.get_instance_type,
85
157
                          self._nonexistent_flavor_name())
86
158
87
159
    def test_will_not_get_flavor_by_bad_flavor_id(self):
88
160
        """Ensure get by flavor raises error with wrong flavorid"""
89
161
        self.assertRaises(exception.InstanceTypeNotFound,
90
162
                          instance_types.get_instance_type_by_name,
91
163
                          self._nonexistent_flavor_id())
Reviewer	Review Type	Date Requested	Status
Ed Leafe (community)			Approve on 2011-08-24
Mandell (community)	community		Needs Fixing on 2011-08-24
Alex Meade (community)			Approve on 2011-08-22
Brian Waldon (community)			Approve on 2011-08-22
Jay Pipes (community)			Approve on 2011-08-21
Soren Hansen		2011-08-20	Pending
Review via email: mp+72310@code.launchpad.net