Merge pull request #582 from yandex/release

Fixes from release
yandex · May 3, 2018 · c17bc47 · c17bc47
2 parents 85a1c81 + 7261191
commit c17bc47
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/yandextank/validator/docs_gen.py b/yandextank/validator/docs_gen.py
@@ -17,6 +17,7 @@
 EXAMPLES = 'examples'
 ANYOF = 'anyof'
 NO_DSC = '(no description)'
+VALIDATOR = 'validator'
 
 
 class TextBlock(object):
@@ -306,14 +307,14 @@ def scalar_formatter(self, renderer, header=True):
         hdr = renderer.subtitle(renderer.mono(self.option_name) + ' ' + '({})'.format(self.option_kwargs.get(TYPE))) \
             if header else ''
         dsc = self.format_dsc(renderer)
-        body = render_body(renderer, self.option_kwargs, [TYPE, DESCRIPTION, DEFAULT, REQUIRED], {'allowed': allowed})
+        body = render_body(renderer, self.option_kwargs, [VALIDATOR, TYPE, DESCRIPTION, DEFAULT, REQUIRED], {'allowed': allowed})
         return '\n'.join([_ for _ in [hdr, dsc, body] if _])
 
     def scalar_with_values_description(self, renderer, header=True):
         hdr = renderer.subtitle(renderer.mono(self.option_name) + ' ' + '({})'.format(self.option_kwargs.get(TYPE))) \
             if header else ''
         dsc = self.format_dsc(renderer)
-        body = render_body(renderer, self.option_kwargs, [TYPE, DESCRIPTION, DEFAULT, REQUIRED, ALLOWED, VALUES_DSC])
+        body = render_body(renderer, self.option_kwargs, [VALIDATOR, TYPE, DESCRIPTION, DEFAULT, REQUIRED, ALLOWED, VALUES_DSC])
         values_description_block = render_values_description(renderer, self.option_kwargs)
         return '\n'.join([_ for _ in [hdr, dsc, body, values_description_block] if _])
 
@@ -327,7 +328,7 @@ def dict_formatter(self, renderer, header=True):
         schema_block = renderer.field_list({
             '{} ({})'.format(renderer.mono(key), dict_schema[key][TYPE]): get_formatter({key: value})(renderer, header=False)
             for key, value in dict_schema.items()})
-        body = render_body(renderer, self.option_kwargs, [TYPE, DESCRIPTION, DEFAULT, REQUIRED, SCHEMA])
+        body = render_body(renderer, self.option_kwargs, [VALIDATOR, TYPE, DESCRIPTION, DEFAULT, REQUIRED, SCHEMA])
         return '\n'.join([_ for _ in [hdr, dsc, schema_block, body] if _])
 
     def anyof_formatter(self, renderer, header=True):
@@ -337,7 +338,7 @@ def anyof_formatter(self, renderer, header=True):
         dsc = self.format_dsc(renderer)
         values_description_block = render_values_description(renderer, self.option_kwargs) \
             if VALUES_DSC in self.option_kwargs else ''
-        body = render_body(renderer, self.option_kwargs, [TYPE, DESCRIPTION, DEFAULT, REQUIRED, ANYOF, VALUES_DSC])
+        body = render_body(renderer, self.option_kwargs, [VALIDATOR, TYPE, DESCRIPTION, DEFAULT, REQUIRED, ANYOF, VALUES_DSC])
 
         return '\n'.join([_ for _ in [hdr, dsc, values_description_block, body] if _])
 
@@ -347,7 +348,7 @@ def list_formatter(self, renderer, header=True):
                                 ' ' +
                                 '({} of {})'.format(self.option_kwargs.get(TYPE, LIST), schema.get(TYPE, '')))
         dsc = self.format_dsc(renderer)
-        body = render_body(renderer, self.option_kwargs, [TYPE, DEFAULT, REQUIRED, DESCRIPTION, SCHEMA])
+        body = render_body(renderer, self.option_kwargs, [VALIDATOR, TYPE, DEFAULT, REQUIRED, DESCRIPTION, SCHEMA])
         if set(schema.keys()) - {TYPE}:
             schema_block = renderer.field_list({
                 '[list_element] ({})'.format(schema.get(TYPE, '')):