1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
|
Description: Fix lease dates not enough in the future
Author: Thomas Goirand <zigo@debian.org>
Bug: https://bugs.launchpad.net/blazar/+bug/2110472
Bug-Debian: https://bugs.debian.org/1104885
Forwarded: no
Last-Update: 2025-05-12
--- blazar-15.0.0.orig/blazar/tests/manager/test_service.py
+++ blazar-15.0.0/blazar/tests/manager/test_service.py
@@ -189,8 +189,8 @@ class ServiceTestCase(tests.DBTestCase):
'resource_id': '111',
'resource_type': 'virtual:instance',
'status': 'FAKE PROGRESS'}],
- 'start_date': '2026-11-13 13:13',
- 'end_date': '2026-12-13 13:13',
+ 'start_date': '2046-11-13 13:13',
+ 'end_date': '2046-12-13 13:13',
'trust_id': 'exxee111qwwwwe'}
self.good_date = datetime.datetime.strptime('2012-12-13 13:13',
@@ -505,7 +505,7 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_some_time(self):
lease_values = self.lease_values.copy()
- self.lease['start_date'] = '2026-11-13 13:13'
+ self.lease['start_date'] = '2046-11-13 13:13'
lease = self.manager.create_lease(lease_values)
@@ -515,11 +515,11 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_validate_created_events(self):
lease_values = self.lease_values.copy()
- self.lease['start_date'] = '2026-11-13 13:13:00'
- self.lease['end_date'] = '2026-12-13 13:13:00'
- self.lease['events'][0]['time'] = '2026-11-13 13:13:00'
- self.lease['events'][1]['time'] = '2026-12-13 13:13:00'
- self.lease['events'][2]['time'] = '2026-12-13 12:13:00'
+ self.lease['start_date'] = '2046-11-13 13:13:00'
+ self.lease['end_date'] = '2046-12-13 13:13:00'
+ self.lease['events'][0]['time'] = '2046-11-13 13:13:00'
+ self.lease['events'][1]['time'] = '2046-12-13 13:13:00'
+ self.lease['events'][2]['time'] = '2046-12-13 12:13:00'
lease = self.manager.create_lease(lease_values)
@@ -550,11 +550,11 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_before_end_event_is_before_lease_start(self):
lease_values = self.lease_values.copy()
- self.lease['start_date'] = '2026-11-13 13:13:00'
- self.lease['end_date'] = '2026-12-13 13:13:00'
- self.lease['events'][0]['time'] = '2026-11-13 13:13:00'
- self.lease['events'][1]['time'] = '2026-12-13 13:13:00'
- self.lease['events'][2]['time'] = '2026-11-13 13:13:00'
+ self.lease['start_date'] = '2046-11-13 13:13:00'
+ self.lease['end_date'] = '2046-12-13 13:13:00'
+ self.lease['events'][0]['time'] = '2046-11-13 13:13:00'
+ self.lease['events'][1]['time'] = '2046-12-13 13:13:00'
+ self.lease['events'][2]['time'] = '2046-11-13 13:13:00'
self.cfg.CONF.set_override('minutes_before_end_lease', 120,
group='manager')
@@ -586,7 +586,7 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_before_end_event_before_start_without_lease_id(self):
lease_values = self.lease_values.copy()
- self.lease['start_date'] = '2026-11-13 13:13'
+ self.lease['start_date'] = '2046-11-13 13:13'
self.cfg.CONF.set_override('minutes_before_end_lease', 120,
group='manager')
@@ -599,30 +599,30 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_before_end_param_is_before_lease_start(self):
lease_values = self.lease_values.copy()
- lease_values['before_end_date'] = '2026-11-11 13:13'
- lease_values['start_date'] = '2026-11-13 13:13'
+ lease_values['before_end_date'] = '2046-11-11 13:13'
+ lease_values['start_date'] = '2046-11-13 13:13'
- self.lease['start_date'] = '2026-11-13 13:13'
+ self.lease['start_date'] = '2046-11-13 13:13'
self.assertRaises(
exceptions.NotAuthorized, self.manager.create_lease, lease_values)
def test_create_lease_before_end_param_is_past_lease_ending(self):
lease_values = self.lease_values.copy()
- lease_values['start_date'] = '2026-11-13 13:13'
- lease_values['end_date'] = '2026-11-14 13:13'
- lease_values['before_end_date'] = '2026-11-15 13:13'
- self.lease['start_date'] = '2026-11-13 13:13'
+ lease_values['start_date'] = '2046-11-13 13:13'
+ lease_values['end_date'] = '2046-11-14 13:13'
+ lease_values['before_end_date'] = '2046-11-15 13:13'
+ self.lease['start_date'] = '2046-11-13 13:13'
self.assertRaises(
exceptions.NotAuthorized, self.manager.create_lease, lease_values)
def test_create_lease_no_before_end_event(self):
lease_values = self.lease_values.copy()
- self.lease['start_date'] = '2026-11-13 13:13:00'
- self.lease['end_date'] = '2026-11-14 13:13:00'
- self.lease['events'][0]['time'] = '2026-11-13 13:13:00'
- self.lease['events'][1]['time'] = '2026-11-14 13:13:00'
+ self.lease['start_date'] = '2046-11-13 13:13:00'
+ self.lease['end_date'] = '2046-11-14 13:13:00'
+ self.lease['events'][0]['time'] = '2046-11-13 13:13:00'
+ self.lease['events'][1]['time'] = '2046-11-14 13:13:00'
self.lease['events'].pop()
self.cfg.CONF.set_override('minutes_before_end_lease', 0,
@@ -648,13 +648,13 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_with_before_end_date_param(self):
lease_values = self.lease_values.copy()
- lease_values['before_end_date'] = '2026-11-14 10:13'
+ lease_values['before_end_date'] = '2046-11-14 10:13'
- self.lease['start_date'] = '2026-11-13 13:13:00'
- self.lease['end_date'] = '2026-11-14 13:13:00'
- self.lease['events'][0]['time'] = '2026-11-13 13:13:00'
- self.lease['events'][1]['time'] = '2026-11-14 13:13:00'
- self.lease['events'][2]['time'] = '2026-11-14 10:13:00'
+ self.lease['start_date'] = '2046-11-13 13:13:00'
+ self.lease['end_date'] = '2046-11-14 13:13:00'
+ self.lease['events'][0]['time'] = '2046-11-13 13:13:00'
+ self.lease['events'][1]['time'] = '2046-11-14 13:13:00'
+ self.lease['events'][2]['time'] = '2046-11-14 10:13:00'
lease = self.manager.create_lease(lease_values)
@@ -692,7 +692,7 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_wrong_format_before_end_date(self):
lease_values = self.lease_values.copy()
- lease_values['before_end_date'] = '2026-14 10:13'
+ lease_values['before_end_date'] = '2046-14 10:13'
self.assertRaises(
manager_ex.InvalidDate, self.manager.create_lease, lease_values)
@@ -708,8 +708,8 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_end_before_start(self):
lease_values = self.lease_values.copy()
- lease_values['start_date'] = '2026-11-13 13:13'
- lease_values['end_date'] = '2026-11-13 12:13'
+ lease_values['start_date'] = '2046-11-13 13:13'
+ lease_values['end_date'] = '2046-11-13 12:13'
self.assertRaises(
exceptions.InvalidInput, self.manager.create_lease, lease_values)
@@ -742,21 +742,21 @@ class ServiceTestCase(tests.DBTestCase):
def test_create_lease_without_required_params(self):
name_missing_values = {
- 'start_date': '2026-11-13 13:13',
- 'end_date': '2026-12-13 13:13',
+ 'start_date': '2046-11-13 13:13',
+ 'end_date': '2046-12-13 13:13',
'trust_id': 'trust1'}
start_missing_values = {
'name': 'name',
- 'end_date': '2026-12-13 13:13',
+ 'end_date': '2046-12-13 13:13',
'trust_id': 'trust1'}
end_missing_values = {
'name': 'name',
- 'start_date': '2026-11-13 13:13',
+ 'start_date': '2046-11-13 13:13',
'trust_id': 'trust1'}
resource_type_missing_value = {
'name': 'name',
- 'start_date': '2026-11-13 13:13',
- 'end_date': '2026-12-13 13:13',
+ 'start_date': '2046-11-13 13:13',
+ 'end_date': '2046-12-13 13:13',
'reservations': [{'min': 1, 'max': 3}],
'trust_id': 'trust1'
}
|
