File tree 2 files changed +23
-1
lines changed
2 files changed +23
-1
lines changed Original file line number Diff line number Diff line change @@ -51,11 +51,13 @@ class IndexNameFrequency(Enum):
51
51
- Weekly indices
52
52
- Monthly indices
53
53
- Year indices
54
+ - Never expiring indices
54
55
"""
55
56
DAILY = 0
56
57
WEEKLY = 1
57
58
MONTHLY = 2
58
59
YEARLY = 3
60
+ NEVER = 4
59
61
60
62
# Defaults for the class
61
63
__DEFAULT_ELASTICSEARCH_HOST = [{'host' : 'localhost' , 'port' : 9200 }]
@@ -115,11 +117,20 @@ def _get_yearly_index_name(es_index_name):
115
117
"""
116
118
return "{0!s}-{1!s}" .format (es_index_name , datetime .datetime .now ().strftime ('%Y' ))
117
119
120
+ @staticmethod
121
+ def _get_never_index_name (es_index_name ):
122
+ """ Return elasticsearch index name
123
+ :param: index_name the prefix to be used in the index
124
+ :return: A srting containing the elasticsearch indexname used which should include just the index name
125
+ """
126
+ return "{0!s}" .format (es_index_name )
127
+
118
128
_INDEX_FREQUENCY_FUNCION_DICT = {
119
129
IndexNameFrequency .DAILY : _get_daily_index_name ,
120
130
IndexNameFrequency .WEEKLY : _get_weekly_index_name ,
121
131
IndexNameFrequency .MONTHLY : _get_monthly_index_name ,
122
- IndexNameFrequency .YEARLY : _get_yearly_index_name
132
+ IndexNameFrequency .YEARLY : _get_yearly_index_name ,
133
+ IndexNameFrequency .NEVER : _get_never_index_name ,
123
134
}
124
135
125
136
def __init__ (self ,
Original file line number Diff line number Diff line change @@ -169,6 +169,17 @@ def test_index_name_frequency_functions(self):
169
169
CMRESHandler ._get_yearly_index_name (index_name )
170
170
)
171
171
172
+ handler = CMRESHandler (hosts = [{'host' : self .getESHost (), 'port' : self .getESPort ()}],
173
+ auth_type = CMRESHandler .AuthType .NO_AUTH ,
174
+ es_index_name = index_name ,
175
+ use_ssl = False ,
176
+ index_name_frequency = CMRESHandler .IndexNameFrequency .NEVER ,
177
+ raise_on_indexing_exceptions = True )
178
+ self .assertEqual (
179
+ handler ._index_name_func .__func__ (index_name ),
180
+ CMRESHandler ._get_never_index_name (index_name )
181
+ )
182
+
172
183
173
184
if __name__ == '__main__' :
174
185
unittest .main ()
You can’t perform that action at this time.
0 commit comments