API tools faq
paste
Guest User

autogenerationtableszaqar.diff

a guest
Jan 4th, 2016
25
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 6.21 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/zaqar/bench/config.py b/zaqar/bench/config.py
  2. index b3a476d..7b22cea 100644
  3. --- a/zaqar/bench/config.py
  4. +++ b/zaqar/bench/config.py
  5. @@ -70,4 +70,4 @@ _CLI_OPTIONS = (
  6.                  help=('Do not reset queues before running'
  7.                        'the performance test')),
  8.  )
  9. -conf.register_cli_opts(_CLI_OPTIONS)
  10. +# conf.register_cli_opts(_CLI_OPTIONS)
  11. diff --git a/zaqar/common/configs.py b/zaqar/common/configs.py
  12. index af49b0a..7e1eb34 100644
  13. --- a/zaqar/common/configs.py
  14. +++ b/zaqar/common/configs.py
  15. @@ -68,3 +68,10 @@ def _config_options():
  16.              (_DRIVER_GROUP, _DRIVER_OPTIONS),
  17.              (_SIGNED_URL_GROUP, _SIGNED_URL_OPTIONS),
  18.              (_NOTIFICATION_GROUP, _NOTIFICATION_OPTIONS)]
  19. +
  20. +for group, options in _config_options():
  21. +    for opt in options:
  22. +        try:
  23. +            cfg.CONF.register_opt(opt, group=group)
  24. +        except cfg.DuplicateOptError:
  25. +            pass
  26. \ No newline at end of file
  27. diff --git a/zaqar/storage/mongodb/options.py b/zaqar/storage/mongodb/options.py
  28. index 627d9b5..8f9063d 100644
  29. --- a/zaqar/storage/mongodb/options.py
  30. +++ b/zaqar/storage/mongodb/options.py
  31. @@ -145,3 +145,10 @@ def _config_options():
  32.      """
  33.      return [(MANAGEMENT_MONGODB_GROUP, MANAGEMENT_MONGODB_OPTIONS),
  34.              (MESSAGE_MONGODB_GROUP, MESSAGE_MONGODB_OPTIONS)]
  35. +
  36. +for group, options in _config_options():
  37. +    for opt in options:
  38. +        try:
  39. +            cfg.CONF.register_opt(opt, group=group)
  40. +        except cfg.DuplicateOptError:
  41. +            pass
  42. \ No newline at end of file
  43. diff --git a/zaqar/storage/pipeline.py b/zaqar/storage/pipeline.py
  44. index d7df0fa..70110da 100644
  45. --- a/zaqar/storage/pipeline.py
  46. +++ b/zaqar/storage/pipeline.py
  47. @@ -41,6 +41,13 @@ _PIPELINE_GROUP = 'storage'
  48.  def _config_options():
  49.      return [(_PIPELINE_GROUP, _PIPELINE_CONFIGS)]
  50.  
  51. +for group, options in _config_options():
  52. +    for opt in options:
  53. +        try:
  54. +            cfg.CONF.register_opt(opt, group=group)
  55. +        except cfg.DuplicateOptError:
  56. +            pass
  57. +
  58.  
  59.  def _get_storage_pipeline(resource_name, conf, *args, **kwargs):
  60.      """Constructs and returns a storage resource pipeline.
  61. diff --git a/zaqar/storage/pooling.py b/zaqar/storage/pooling.py
  62. index b53f05c..2456690 100644
  63. --- a/zaqar/storage/pooling.py
  64. +++ b/zaqar/storage/pooling.py
  65. @@ -52,6 +52,12 @@ _POOL_CACHE_TTL = 10
  66.  def _config_options():
  67.      return [(_CATALOG_GROUP, _CATALOG_OPTIONS)]
  68.  
  69. +for group, options in _config_options():
  70. +    for opt in options:
  71. +        try:
  72. +            cfg.CONF.register_opt(opt, group=group)
  73. +        except cfg.DuplicateOptError:
  74. +            pass
  75.  
  76.  def _pool_cache_key(queue, project=None):
  77.      # NOTE(kgriffs): Use string concatenation for performance,
  78. diff --git a/zaqar/storage/redis/options.py b/zaqar/storage/redis/options.py
  79. index fff9908..93a1ccf 100644
  80. --- a/zaqar/storage/redis/options.py
  81. +++ b/zaqar/storage/redis/options.py
  82. @@ -69,3 +69,10 @@ MESSAGE_REDIS_GROUP = 'drivers:message_store:redis'
  83.  def _config_options():
  84.      return [(MANAGEMENT_REDIS_GROUP, MANAGEMENT_REDIS_OPTIONS),
  85.              (MESSAGE_REDIS_GROUP, MESSAGE_REDIS_OPTIONS)]
  86. +
  87. +for group, options in _config_options():
  88. +    for opt in options:
  89. +        try:
  90. +            cfg.CONF.register_opt(opt, group=group)
  91. +        except cfg.DuplicateOptError:
  92. +            pass
  93. \ No newline at end of file
  94. diff --git a/zaqar/storage/sqlalchemy/options.py b/zaqar/storage/sqlalchemy/options.py
  95. index 55603d9..4d31aeb 100644
  96. --- a/zaqar/storage/sqlalchemy/options.py
  97. +++ b/zaqar/storage/sqlalchemy/options.py
  98. @@ -32,3 +32,10 @@ MANAGEMENT_SQLALCHEMY_GROUP = 'drivers:management_store:sqlalchemy'
  99.  
  100.  def _config_options():
  101.      return [(MANAGEMENT_SQLALCHEMY_GROUP, MANAGEMENT_SQLALCHEMY_OPTIONS)]
  102. +
  103. +for group, options in _config_options():
  104. +    for opt in options:
  105. +        try:
  106. +            cfg.CONF.register_opt(opt, group=group)
  107. +        except cfg.DuplicateOptError:
  108. +            pass
  109. \ No newline at end of file
  110. diff --git a/zaqar/transport/base.py b/zaqar/transport/base.py
  111. index 8c847fa..38be9b8 100644
  112. --- a/zaqar/transport/base.py
  113. +++ b/zaqar/transport/base.py
  114. @@ -45,6 +45,13 @@ def _config_options():
  115.          (_TRANSPORT_GROUP, _RESOURCE_DEFAULTS),
  116.      ]
  117.  
  118. +for group, options in _config_options():
  119. +    for opt in options:
  120. +        try:
  121. +            cfg.CONF.register_opt(opt, group=group)
  122. +        except cfg.DuplicateOptError:
  123. +            pass
  124. +
  125.  
  126.  class ResourceDefaults(object):
  127.      """Registers and exposes defaults for resource fields."""
  128. diff --git a/zaqar/transport/validation.py b/zaqar/transport/validation.py
  129. index 40cfc68..3b8ef75 100644
  130. --- a/zaqar/transport/validation.py
  131. +++ b/zaqar/transport/validation.py
  132. @@ -88,6 +88,13 @@ PROJECT_ID_MAX_LEN = 256
  133.  def _config_options():
  134.      return [(_TRANSPORT_LIMITS_GROUP, _TRANSPORT_LIMITS_OPTIONS)]
  135.  
  136. +for group, options in _config_options():
  137. +    for opt in options:
  138. +        try:
  139. +            cfg.CONF.register_opt(opt, group=group)
  140. +        except cfg.DuplicateOptError:
  141. +            pass
  142. +
  143.  
  144.  class ValidationFailed(ValueError):
  145.      """User input did not follow API restrictions."""
  146. diff --git a/zaqar/transport/websocket/driver.py b/zaqar/transport/websocket/driver.py
  147. index 1838d24..96807fa 100644
  148. --- a/zaqar/transport/websocket/driver.py
  149. +++ b/zaqar/transport/websocket/driver.py
  150. @@ -50,6 +50,13 @@ LOG = logging.getLogger(__name__)
  151.  def _config_options():
  152.      return [(_WS_GROUP, _WS_OPTIONS)]
  153.  
  154. +for group, options in _config_options():
  155. +    for opt in options:
  156. +        try:
  157. +            cfg.CONF.register_opt(opt, group=group)
  158. +        except cfg.DuplicateOptError:
  159. +            pass
  160. +
  161.  
  162.  class Driver(base.DriverBase):
  163.  
  164. diff --git a/zaqar/transport/wsgi/driver.py b/zaqar/transport/wsgi/driver.py
  165. index aa7575f..c734b3c 100644
  166. --- a/zaqar/transport/wsgi/driver.py
  167. +++ b/zaqar/transport/wsgi/driver.py
  168. @@ -48,6 +48,13 @@ LOG = logging.getLogger(__name__)
  169.  def _config_options():
  170.      return [(_WSGI_GROUP, _WSGI_OPTIONS)]
  171.  
  172. +for group, options in _config_options():
  173. +    for opt in options:
  174. +        try:
  175. +            cfg.CONF.register_opt(opt, group=group)
  176. +        except cfg.DuplicateOptError:
  177. +            pass
  178. +
  179.  
  180.  class Driver(transport.DriverBase):
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!