octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (307) hide show
  1. octavia/amphorae/backends/agent/agent_jinja_cfg.py +1 -4
  2. octavia/amphorae/backends/agent/api_server/amphora_info.py +5 -5
  3. octavia/amphorae/backends/agent/api_server/keepalived.py +26 -53
  4. octavia/amphorae/backends/agent/api_server/keepalivedlvs.py +44 -83
  5. octavia/amphorae/backends/agent/api_server/loadbalancer.py +94 -112
  6. octavia/amphorae/backends/agent/api_server/lvs_listener_base.py +1 -1
  7. octavia/amphorae/backends/agent/api_server/osutils.py +11 -8
  8. octavia/amphorae/backends/agent/api_server/plug.py +12 -13
  9. octavia/amphorae/backends/agent/api_server/server.py +4 -3
  10. octavia/amphorae/backends/agent/api_server/templates/keepalived_lvs_check_script.sh.j2 +0 -4
  11. octavia/amphorae/backends/agent/api_server/util.py +23 -68
  12. octavia/amphorae/backends/agent/templates/amphora_agent_conf.template +0 -3
  13. octavia/amphorae/backends/health_daemon/health_daemon.py +6 -7
  14. octavia/amphorae/backends/health_daemon/health_sender.py +2 -2
  15. octavia/amphorae/backends/utils/haproxy_query.py +3 -6
  16. octavia/amphorae/backends/utils/interface.py +11 -50
  17. octavia/amphorae/backends/utils/interface_file.py +29 -16
  18. octavia/amphorae/backends/utils/ip_advertisement.py +1 -1
  19. octavia/amphorae/backends/utils/keepalivedlvs_query.py +7 -8
  20. octavia/amphorae/backends/utils/network_namespace.py +3 -3
  21. octavia/amphorae/backends/utils/nftable_utils.py +33 -11
  22. octavia/amphorae/drivers/driver_base.py +2 -2
  23. octavia/amphorae/drivers/haproxy/rest_api_driver.py +26 -38
  24. octavia/amphorae/drivers/health/heartbeat_udp.py +1 -1
  25. octavia/amphorae/drivers/keepalived/jinja/jinja_cfg.py +1 -2
  26. octavia/amphorae/drivers/keepalived/jinja/templates/keepalived_base.template +0 -1
  27. octavia/amphorae/drivers/noop_driver/driver.py +1 -1
  28. octavia/api/app.py +1 -2
  29. octavia/api/common/pagination.py +16 -22
  30. octavia/api/common/types.py +1 -1
  31. octavia/api/drivers/amphora_driver/v2/driver.py +6 -6
  32. octavia/api/drivers/driver_agent/driver_listener.py +3 -3
  33. octavia/api/drivers/driver_agent/driver_updater.py +1 -1
  34. octavia/api/drivers/noop_driver/driver.py +1 -1
  35. octavia/api/root_controller.py +2 -2
  36. octavia/api/v2/controllers/base.py +2 -4
  37. octavia/api/v2/controllers/health_monitor.py +5 -3
  38. octavia/api/v2/controllers/listener.py +2 -2
  39. octavia/api/v2/controllers/load_balancer.py +7 -0
  40. octavia/api/v2/controllers/member.py +12 -2
  41. octavia/api/v2/types/amphora.py +1 -1
  42. octavia/api/v2/types/availability_zone_profile.py +1 -2
  43. octavia/api/v2/types/availability_zones.py +1 -2
  44. octavia/api/v2/types/flavor_profile.py +1 -1
  45. octavia/api/v2/types/flavors.py +1 -1
  46. octavia/api/v2/types/health_monitor.py +1 -1
  47. octavia/api/v2/types/l7policy.py +1 -1
  48. octavia/api/v2/types/l7rule.py +1 -1
  49. octavia/api/v2/types/listener.py +3 -3
  50. octavia/api/v2/types/load_balancer.py +3 -3
  51. octavia/api/v2/types/member.py +2 -2
  52. octavia/api/v2/types/pool.py +2 -2
  53. octavia/api/v2/types/quotas.py +2 -2
  54. octavia/certificates/common/barbican.py +1 -1
  55. octavia/certificates/common/cert.py +1 -1
  56. octavia/certificates/generator/cert_gen.py +1 -1
  57. octavia/certificates/generator/local.py +5 -5
  58. octavia/certificates/manager/cert_mgr.py +1 -1
  59. octavia/certificates/manager/local.py +20 -20
  60. octavia/cmd/agent.py +3 -3
  61. octavia/cmd/driver_agent.py +2 -3
  62. octavia/cmd/health_checker.py +4 -4
  63. octavia/cmd/interface.py +4 -4
  64. octavia/cmd/prometheus_proxy.py +11 -13
  65. octavia/common/base_taskflow.py +3 -3
  66. octavia/common/clients.py +4 -4
  67. octavia/common/config.py +18 -24
  68. octavia/common/constants.py +28 -35
  69. octavia/common/data_models.py +2 -2
  70. octavia/common/jinja/haproxy/combined_listeners/jinja_cfg.py +5 -5
  71. octavia/common/jinja/logging/logging_jinja_cfg.py +1 -1
  72. octavia/common/jinja/lvs/jinja_cfg.py +1 -1
  73. octavia/common/jinja/user_data_jinja_cfg.py +1 -1
  74. octavia/common/keystone.py +1 -1
  75. octavia/common/policy.py +2 -3
  76. octavia/common/stats.py +1 -1
  77. octavia/common/tls_utils/cert_parser.py +2 -1
  78. octavia/common/utils.py +3 -3
  79. octavia/common/validate.py +9 -13
  80. octavia/compute/compute_base.py +1 -1
  81. octavia/compute/drivers/noop_driver/driver.py +1 -1
  82. octavia/compute/drivers/nova_driver.py +1 -1
  83. octavia/controller/healthmanager/health_manager.py +1 -1
  84. octavia/controller/housekeeping/house_keeping.py +2 -2
  85. octavia/controller/queue/v2/consumer.py +1 -2
  86. octavia/controller/queue/v2/endpoints.py +1 -1
  87. octavia/controller/worker/amphora_rate_limit.py +6 -6
  88. octavia/controller/worker/task_utils.py +1 -1
  89. octavia/controller/worker/v2/controller_worker.py +3 -3
  90. octavia/controller/worker/v2/flows/amphora_flows.py +15 -4
  91. octavia/controller/worker/v2/flows/flow_utils.py +6 -5
  92. octavia/controller/worker/v2/flows/health_monitor_flows.py +1 -1
  93. octavia/controller/worker/v2/flows/l7policy_flows.py +1 -1
  94. octavia/controller/worker/v2/flows/l7rule_flows.py +1 -1
  95. octavia/controller/worker/v2/flows/listener_flows.py +18 -6
  96. octavia/controller/worker/v2/flows/load_balancer_flows.py +1 -1
  97. octavia/controller/worker/v2/flows/member_flows.py +12 -19
  98. octavia/controller/worker/v2/flows/pool_flows.py +1 -1
  99. octavia/controller/worker/v2/taskflow_jobboard_driver.py +17 -3
  100. octavia/controller/worker/v2/tasks/compute_tasks.py +1 -3
  101. octavia/controller/worker/v2/tasks/network_tasks.py +3 -4
  102. octavia/db/base_models.py +21 -9
  103. octavia/db/migration/alembic_migrations/versions/034756a182a2_amphora_add_image_id.py +2 -2
  104. octavia/db/migration/alembic_migrations/versions/034b2dc2f3e0_modernize_l7policy_fields.py +31 -31
  105. octavia/db/migration/alembic_migrations/versions/0f242cf02c74_add_provider_column.py +2 -2
  106. octavia/db/migration/alembic_migrations/versions/10d38216ad34_add_timestamps_to_amphora.py +4 -4
  107. octavia/db/migration/alembic_migrations/versions/11e4bb2bb8ef_fix_ipv6_vip.py +1 -1
  108. octavia/db/migration/alembic_migrations/versions/13500e2e978d_update_url_and_name_size.py +6 -6
  109. octavia/db/migration/alembic_migrations/versions/14892634e228_update_vip.py +5 -5
  110. octavia/db/migration/alembic_migrations/versions/186509101b9b_add_server_group_id_to_loadbalancer.py +2 -2
  111. octavia/db/migration/alembic_migrations/versions/1afc932f1ca2_l7rule_support_client_cert.py +3 -3
  112. octavia/db/migration/alembic_migrations/versions/1e4c1d83044c_keepalived_configuration_datamodel.py +26 -26
  113. octavia/db/migration/alembic_migrations/versions/2351ea316465_adding_terminate_https_tls_ref_support.py +4 -4
  114. octavia/db/migration/alembic_migrations/versions/256852d5ff7c_add_lb_network_ip_to_amphora.py +2 -2
  115. octavia/db/migration/alembic_migrations/versions/27e54d00c3cd_add_monitor_address_and_port_to_member.py +4 -4
  116. octavia/db/migration/alembic_migrations/versions/298eac0640a7_add_amphora_vrrp_port_id_and_ha_port_id.py +4 -4
  117. octavia/db/migration/alembic_migrations/versions/29ff921a6eb_shared_pools.py +3 -3
  118. octavia/db/migration/alembic_migrations/versions/2ad093f6353f_add_listener_client_ca_tls_certificate_.py +2 -2
  119. octavia/db/migration/alembic_migrations/versions/31f7653ded67_allow_multiple_vips_per_loadbalancer.py +10 -10
  120. octavia/db/migration/alembic_migrations/versions/32e5c35b26a8_add_l7policy_and_l7rule_quota.py +4 -4
  121. octavia/db/migration/alembic_migrations/versions/357d17a6d5ac_update_lb_and_amphora_data_model_for_.py +20 -20
  122. octavia/db/migration/alembic_migrations/versions/35dee79d5865_initial_create.py +185 -185
  123. octavia/db/migration/alembic_migrations/versions/36b94648fef8_add_timestamp.py +2 -2
  124. octavia/db/migration/alembic_migrations/versions/392fb85b4419_add_primary_key_to_spares_pool.py +1 -1
  125. octavia/db/migration/alembic_migrations/versions/3a1e1cdb7b27_rename_amphora_host_id.py +1 -1
  126. octavia/db/migration/alembic_migrations/versions/3b199c848b96_create_no_monitor_operational_status.py +1 -1
  127. octavia/db/migration/alembic_migrations/versions/3e5b37a0bdb9_add_vrrp_ip_and_ha_ip_to_amphora.py +4 -4
  128. octavia/db/migration/alembic_migrations/versions/3f8ff3be828e_create_quotas_table.py +12 -12
  129. octavia/db/migration/alembic_migrations/versions/43287cd10fef_make_pool_lb_algorithm_larger.py +6 -6
  130. octavia/db/migration/alembic_migrations/versions/443fe6676637_add_network_id_to_vip.py +2 -2
  131. octavia/db/migration/alembic_migrations/versions/44a2414dd683_adding_name_column_to_member_and_health_.py +1 -1
  132. octavia/db/migration/alembic_migrations/versions/458c9ee2a011_l7_policies_and_rules.py +57 -57
  133. octavia/db/migration/alembic_migrations/versions/46d914b2a5e5_seed_the_spares_pool_table.py +2 -2
  134. octavia/db/migration/alembic_migrations/versions/48660b6643f0_add_new_states_for_amphora.py +3 -3
  135. octavia/db/migration/alembic_migrations/versions/4aeb9e23ad43_add_draining_operating_status.py +1 -1
  136. octavia/db/migration/alembic_migrations/versions/4c094013699a_update_load_balancer_amphora.py +9 -9
  137. octavia/db/migration/alembic_migrations/versions/4f65b4f91c39_amphora_add_flavor_id.py +2 -2
  138. octavia/db/migration/alembic_migrations/versions/4faaa983e7a9_update_member_address_column.py +1 -1
  139. octavia/db/migration/alembic_migrations/versions/4fe8240425b4_update_vip_add_subnet_id.py +2 -2
  140. octavia/db/migration/alembic_migrations/versions/52377704420e_add_timestamps_to_healthmonitor.py +9 -9
  141. octavia/db/migration/alembic_migrations/versions/5309960964f8_add_proxy_protocol_for_pool.py +3 -3
  142. octavia/db/migration/alembic_migrations/versions/543f5d8e4e56_add_a_column_busy_in_table_amphora_health.py +2 -2
  143. octavia/db/migration/alembic_migrations/versions/55874a4ceed6_add_l7policy_action_redirect_prefix.py +5 -5
  144. octavia/db/migration/alembic_migrations/versions/5a3ee5472c31_add_cert_expiration__infor_in_amphora_table.py +4 -4
  145. octavia/db/migration/alembic_migrations/versions/62816c232310_fix_migration_for_mysql_5_7.py +1 -1
  146. octavia/db/migration/alembic_migrations/versions/6742ca1b27c2_add_l7policy_redirect_http_code.py +2 -2
  147. octavia/db/migration/alembic_migrations/versions/6ac558d7fc21_add_prometheus_listener_protocol.py +3 -3
  148. octavia/db/migration/alembic_migrations/versions/6ffc710674ef_spares_pool_table.py +2 -2
  149. octavia/db/migration/alembic_migrations/versions/7432f1d4ea83_add_http_host_head_inject_for_http_health_check.py +4 -4
  150. octavia/db/migration/alembic_migrations/versions/74aae261694c_extend_pool_for_backend_ca_and_crl.py +4 -4
  151. octavia/db/migration/alembic_migrations/versions/76aacf2e176c_extend_support_udp_protocol.py +3 -3
  152. octavia/db/migration/alembic_migrations/versions/80dba23a159f_tags_support.py +3 -3
  153. octavia/db/migration/alembic_migrations/versions/82b9402e71fd_update_vip_address_size.py +1 -1
  154. octavia/db/migration/alembic_migrations/versions/8ac4ed24df3a_add_availability_zone_to_lb.py +4 -4
  155. octavia/db/migration/alembic_migrations/versions/8b47b2546312_sctp_support.py +2 -2
  156. octavia/db/migration/alembic_migrations/versions/8c0851bdf6c3_change_tls_container_id_length_in_sni_.py +1 -1
  157. octavia/db/migration/alembic_migrations/versions/92fe9857279_create_healthmanager_table.py +3 -3
  158. octavia/db/migration/alembic_migrations/versions/9b5473976d6d_add_provisioning_status_to_objects.py +10 -10
  159. octavia/db/migration/alembic_migrations/versions/a1f689aecc1d_extend_pool_for_support_backend_reencryption.py +2 -2
  160. octavia/db/migration/alembic_migrations/versions/a7f187cd221f_add_tls_boolean_type_for_reencryption.py +2 -2
  161. octavia/db/migration/alembic_migrations/versions/b9c703669314_add_flavor_and_flavor_profile_table.py +18 -18
  162. octavia/db/migration/alembic_migrations/versions/ba35e0fb88e1_add_backup_field_to_member.py +2 -2
  163. octavia/db/migration/alembic_migrations/versions/bf171d0d91c3_amphora_add_cached_zone.py +2 -2
  164. octavia/db/migration/alembic_migrations/versions/c761c8a71579_add_availability_zone_table.py +15 -15
  165. octavia/db/migration/alembic_migrations/versions/d85ca7258d21_modernize_l7rule.py +13 -13
  166. octavia/db/migration/alembic_migrations/versions/da371b422669_allowed_cidr_for_listeners.py +7 -7
  167. octavia/db/migration/alembic_migrations/versions/dcf88e59aae4_add_lb_algorithm_source_ip_port.py +3 -3
  168. octavia/db/migration/alembic_migrations/versions/e37941b010db_add_lb_flavor_constraint.py +11 -11
  169. octavia/db/migration/alembic_migrations/versions/e6672bda93bf_add_ping_and_tlshello_monitor_types.py +3 -3
  170. octavia/db/migration/alembic_migrations/versions/e6ee84f0abf3_add_proxy_v2_pool_protocol.py +3 -3
  171. octavia/db/migration/alembic_migrations/versions/ebbcc72b4e5e_add_octavia_owned_vip_column_to_vip_.py +2 -2
  172. octavia/db/migration/alembic_migrations/versions/f21ae3f21adc_add_client_auth_option.py +6 -6
  173. octavia/db/migration/alembic_migrations/versions/fc5582da7d8a_create_amphora_build_rate_limit_tables.py +11 -11
  174. octavia/db/migration/alembic_migrations/versions/ffad172e98c1_add_certificate_revoke_list_option.py +2 -2
  175. octavia/db/models.py +1 -1
  176. octavia/db/repositories.py +3 -3
  177. octavia/distributor/drivers/driver_base.py +1 -1
  178. octavia/distributor/drivers/noop_driver/driver.py +1 -1
  179. octavia/hacking/checks.py +4 -4
  180. octavia/image/drivers/noop_driver/driver.py +1 -1
  181. octavia/image/image_base.py +1 -1
  182. octavia/network/base.py +1 -1
  183. octavia/network/drivers/neutron/allowed_address_pairs.py +11 -9
  184. octavia/network/drivers/neutron/base.py +3 -3
  185. octavia/network/drivers/noop_driver/driver.py +1 -1
  186. octavia/policies/amphora.py +6 -12
  187. octavia/policies/availability_zone.py +5 -10
  188. octavia/policies/availability_zone_profile.py +5 -15
  189. octavia/policies/base.py +1 -20
  190. octavia/policies/flavor.py +5 -10
  191. octavia/policies/flavor_profile.py +5 -10
  192. octavia/policies/healthmonitor.py +6 -12
  193. octavia/policies/l7policy.py +6 -12
  194. octavia/policies/l7rule.py +5 -10
  195. octavia/policies/listener.py +7 -14
  196. octavia/policies/loadbalancer.py +9 -18
  197. octavia/policies/member.py +5 -10
  198. octavia/policies/pool.py +6 -12
  199. octavia/policies/provider.py +1 -2
  200. octavia/policies/provider_availability_zone.py +1 -3
  201. octavia/policies/provider_flavor.py +1 -2
  202. octavia/policies/quota.py +6 -12
  203. octavia/statistics/stats_base.py +1 -1
  204. octavia/tests/common/constants.py +1 -1
  205. octavia/tests/common/data_model_helpers.py +10 -10
  206. octavia/tests/common/sample_data_models.py +1 -1
  207. octavia/tests/common/sample_haproxy_prometheus +17 -17
  208. octavia/tests/common/sample_octavia_prometheus +6 -6
  209. octavia/tests/common/utils.py +2 -2
  210. octavia/tests/functional/amphorae/backend/agent/api_server/test_keepalivedlvs.py +36 -62
  211. octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py +135 -296
  212. octavia/tests/functional/api/drivers/driver_agent/test_driver_agent.py +10 -11
  213. octavia/tests/functional/api/v2/base.py +2 -3
  214. octavia/tests/functional/api/v2/test_amphora.py +6 -6
  215. octavia/tests/functional/api/v2/test_availability_zone_profiles.py +13 -14
  216. octavia/tests/functional/api/v2/test_availability_zones.py +19 -19
  217. octavia/tests/functional/api/v2/test_flavor_profiles.py +19 -20
  218. octavia/tests/functional/api/v2/test_flavors.py +25 -25
  219. octavia/tests/functional/api/v2/test_health_monitor.py +35 -18
  220. octavia/tests/functional/api/v2/test_l7policy.py +11 -11
  221. octavia/tests/functional/api/v2/test_l7rule.py +19 -20
  222. octavia/tests/functional/api/v2/test_listener.py +26 -28
  223. octavia/tests/functional/api/v2/test_load_balancer.py +17 -17
  224. octavia/tests/functional/api/v2/test_member.py +53 -21
  225. octavia/tests/functional/api/v2/test_pool.py +11 -11
  226. octavia/tests/functional/api/v2/test_provider.py +7 -7
  227. octavia/tests/functional/api/v2/test_quotas.py +9 -9
  228. octavia/tests/functional/db/test_models.py +1 -1
  229. octavia/tests/functional/db/test_repositories.py +2 -2
  230. octavia/tests/unit/amphorae/backends/agent/api_server/test_amphora_info.py +60 -61
  231. octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalived.py +3 -3
  232. octavia/tests/unit/amphorae/backends/agent/api_server/test_keepalivedlvs.py +1 -19
  233. octavia/tests/unit/amphorae/backends/agent/api_server/test_loadbalancer.py +94 -34
  234. octavia/tests/unit/amphorae/backends/agent/api_server/test_osutils.py +19 -21
  235. octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py +9 -11
  236. octavia/tests/unit/amphorae/backends/agent/api_server/test_util.py +11 -25
  237. octavia/tests/unit/amphorae/backends/agent/test_agent_jinja_cfg.py +0 -13
  238. octavia/tests/unit/amphorae/backends/health_daemon/test_health_daemon.py +10 -10
  239. octavia/tests/unit/amphorae/backends/utils/test_haproxy_query.py +1 -1
  240. octavia/tests/unit/amphorae/backends/utils/test_interface.py +33 -94
  241. octavia/tests/unit/amphorae/backends/utils/test_interface_file.py +32 -32
  242. octavia/tests/unit/amphorae/backends/utils/test_network_namespace.py +4 -6
  243. octavia/tests/unit/amphorae/backends/utils/test_nftable_utils.py +28 -22
  244. octavia/tests/unit/amphorae/drivers/haproxy/test_rest_api_driver_1_0.py +77 -118
  245. octavia/tests/unit/amphorae/drivers/health/test_heartbeat_udp.py +8 -8
  246. octavia/tests/unit/amphorae/drivers/keepalived/jinja/test_jinja_cfg.py +0 -4
  247. octavia/tests/unit/api/common/test_pagination.py +84 -14
  248. octavia/tests/unit/api/v2/types/test_availability_zone_profile.py +1 -1
  249. octavia/tests/unit/api/v2/types/test_availability_zones.py +1 -1
  250. octavia/tests/unit/api/v2/types/test_flavor_profile.py +1 -1
  251. octavia/tests/unit/api/v2/types/test_flavors.py +1 -1
  252. octavia/tests/unit/api/v2/types/test_health_monitor.py +1 -1
  253. octavia/tests/unit/api/v2/types/test_listener.py +1 -1
  254. octavia/tests/unit/api/v2/types/test_load_balancer.py +1 -1
  255. octavia/tests/unit/api/v2/types/test_pool.py +1 -1
  256. octavia/tests/unit/base.py +1 -0
  257. octavia/tests/unit/certificates/generator/local_csr.py +1 -1
  258. octavia/tests/unit/certificates/generator/test_local.py +5 -5
  259. octavia/tests/unit/certificates/manager/test_barbican.py +2 -3
  260. octavia/tests/unit/certificates/manager/test_barbican_legacy.py +1 -1
  261. octavia/tests/unit/certificates/manager/test_local.py +13 -14
  262. octavia/tests/unit/cmd/test_health_checker.py +1 -1
  263. octavia/tests/unit/cmd/test_prometheus_proxy.py +8 -1
  264. octavia/tests/unit/common/jinja/haproxy/combined_listeners/test_jinja_cfg.py +171 -216
  265. octavia/tests/unit/common/jinja/logging/test_logging_jinja_cfg.py +1 -1
  266. octavia/tests/unit/common/sample_configs/sample_configs_combined.py +1 -2
  267. octavia/tests/unit/common/test_base_taskflow.py +1 -1
  268. octavia/tests/unit/common/test_decorators.py +2 -2
  269. octavia/tests/unit/common/test_policy.py +3 -6
  270. octavia/tests/unit/common/tls_utils/test_cert_parser.py +4 -1
  271. octavia/tests/unit/controller/worker/v2/flows/test_listener_flows.py +10 -15
  272. octavia/tests/unit/controller/worker/v2/flows/test_load_balancer_flows.py +4 -6
  273. octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py +6 -2
  274. octavia/tests/unit/controller/worker/v2/tasks/test_retry_tasks.py +1 -1
  275. octavia/tests/unit/controller/worker/v2/test_controller_worker.py +56 -1
  276. octavia/tests/unit/controller/worker/v2/test_taskflow_jobboard_driver.py +348 -0
  277. octavia/tests/unit/hacking/test_checks.py +3 -3
  278. octavia/tests/unit/image/drivers/noop_driver/test_driver.py +1 -1
  279. octavia/tests/unit/image/drivers/test_glance_driver.py +1 -1
  280. octavia/tests/unit/network/drivers/neutron/test_base.py +1 -1
  281. octavia/tests/unit/statistics/drivers/test_update_db.py +1 -1
  282. octavia/tests/unit/statistics/test_stats_base.py +1 -1
  283. octavia/volume/drivers/noop_driver/driver.py +1 -1
  284. octavia/volume/volume_base.py +1 -1
  285. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/AUTHORS +6 -0
  286. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/METADATA +3 -5
  287. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/RECORD +302 -305
  288. octavia-15.0.0.dist-info/pbr.json +1 -0
  289. octavia/amphorae/backends/agent/api_server/templates/keepalived.sysvinit.j2 +0 -87
  290. octavia/amphorae/backends/agent/api_server/templates/keepalived.upstart.j2 +0 -29
  291. octavia/amphorae/backends/agent/api_server/templates/sysvinit.conf.j2 +0 -232
  292. octavia/amphorae/backends/agent/api_server/templates/upstart.conf.j2 +0 -71
  293. octavia-14.0.0.0rc1.dist-info/pbr.json +0 -1
  294. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/LICENSE +0 -0
  295. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/README.rst +0 -0
  296. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/README.rst +0 -0
  297. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/diskimage-create.sh +0 -0
  298. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/image-tests.sh +0 -0
  299. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/requirements.txt +0 -0
  300. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/test-requirements.txt +0 -0
  301. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/tox.ini +0 -0
  302. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/data/share/octavia/diskimage-create/version.txt +0 -0
  303. {octavia-14.0.0.0rc1.data → octavia-15.0.0.data}/scripts/octavia-wsgi +0 -0
  304. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/LICENSE +0 -0
  305. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/WHEEL +0 -0
  306. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/entry_points.txt +0 -0
  307. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.dist-info}/top_level.txt +0 -0
@@ -32,16 +32,16 @@ down_revision = '29ff921a6eb'
32
32
  def upgrade():
33
33
  # L7 Rule Types
34
34
  op.create_table(
35
- u'l7rule_type',
36
- sa.Column(u'name', sa.String(36), primary_key=True),
37
- sa.Column(u'description', sa.String(255), nullable=True)
35
+ 'l7rule_type',
36
+ sa.Column('name', sa.String(36), primary_key=True),
37
+ sa.Column('description', sa.String(255), nullable=True)
38
38
  )
39
39
 
40
40
  # Create temporary table for table data seeding
41
41
  insert_table = sql.table(
42
- u'l7rule_type',
43
- sql.column(u'name', sa.String),
44
- sql.column(u'description', sa.String)
42
+ 'l7rule_type',
43
+ sql.column('name', sa.String),
44
+ sql.column('description', sa.String)
45
45
  )
46
46
 
47
47
  op.bulk_insert(
@@ -57,15 +57,15 @@ def upgrade():
57
57
 
58
58
  # L7 Rule Compare Types
59
59
  op.create_table(
60
- u'l7rule_compare_type',
61
- sa.Column(u'name', sa.String(36), primary_key=True),
62
- sa.Column(u'description', sa.String(255), nullable=True)
60
+ 'l7rule_compare_type',
61
+ sa.Column('name', sa.String(36), primary_key=True),
62
+ sa.Column('description', sa.String(255), nullable=True)
63
63
  )
64
64
 
65
65
  insert_table = sql.table(
66
- u'l7rule_compare_type',
67
- sql.column(u'name', sa.String),
68
- sql.column(u'description', sa.String)
66
+ 'l7rule_compare_type',
67
+ sql.column('name', sa.String),
68
+ sql.column('description', sa.String)
69
69
  )
70
70
 
71
71
  op.bulk_insert(
@@ -81,15 +81,15 @@ def upgrade():
81
81
 
82
82
  # L7 Policy Actions
83
83
  op.create_table(
84
- u'l7policy_action',
85
- sa.Column(u'name', sa.String(36), primary_key=True),
86
- sa.Column(u'description', sa.String(255), nullable=True)
84
+ 'l7policy_action',
85
+ sa.Column('name', sa.String(36), primary_key=True),
86
+ sa.Column('description', sa.String(255), nullable=True)
87
87
  )
88
88
 
89
89
  insert_table = sql.table(
90
- u'l7policy_action',
91
- sql.column(u'name', sa.String),
92
- sql.column(u'description', sa.String)
90
+ 'l7policy_action',
91
+ sql.column('name', sa.String),
92
+ sql.column('description', sa.String)
93
93
  )
94
94
 
95
95
  op.bulk_insert(
@@ -103,47 +103,47 @@ def upgrade():
103
103
 
104
104
  # L7 Policies
105
105
  op.create_table(
106
- u'l7policy',
107
- sa.Column(u'id', sa.String(36), nullable=False),
108
- sa.Column(u'name', sa.String(255), nullable=True),
109
- sa.Column(u'description', sa.String(255), nullable=True),
110
- sa.Column(u'listener_id', sa.String(36), nullable=False),
111
- sa.Column(u'action', sa.String(36), nullable=False),
112
- sa.Column(u'redirect_pool_id', sa.String(36), nullable=True),
113
- sa.Column(u'redirect_url', sa.String(255), nullable=True),
114
- sa.Column(u'position', sa.Integer, nullable=False),
115
- sa.Column(u'enabled', sa.Boolean(), default=True, nullable=False),
116
-
117
- sa.PrimaryKeyConstraint(u'id'),
118
- sa.ForeignKeyConstraint([u'listener_id'],
119
- [u'listener.id'],
120
- name=u'fk_l7policy_listener_id'),
121
- sa.ForeignKeyConstraint([u'redirect_pool_id'],
122
- [u'pool.id'],
123
- name=u'fk_l7policy_pool_id'),
124
- sa.ForeignKeyConstraint([u'action'],
125
- [u'l7policy_action.name'],
126
- name=u'fk_l7policy_l7policy_action_name')
106
+ 'l7policy',
107
+ sa.Column('id', sa.String(36), nullable=False),
108
+ sa.Column('name', sa.String(255), nullable=True),
109
+ sa.Column('description', sa.String(255), nullable=True),
110
+ sa.Column('listener_id', sa.String(36), nullable=False),
111
+ sa.Column('action', sa.String(36), nullable=False),
112
+ sa.Column('redirect_pool_id', sa.String(36), nullable=True),
113
+ sa.Column('redirect_url', sa.String(255), nullable=True),
114
+ sa.Column('position', sa.Integer, nullable=False),
115
+ sa.Column('enabled', sa.Boolean(), default=True, nullable=False),
116
+
117
+ sa.PrimaryKeyConstraint('id'),
118
+ sa.ForeignKeyConstraint(['listener_id'],
119
+ ['listener.id'],
120
+ name='fk_l7policy_listener_id'),
121
+ sa.ForeignKeyConstraint(['redirect_pool_id'],
122
+ ['pool.id'],
123
+ name='fk_l7policy_pool_id'),
124
+ sa.ForeignKeyConstraint(['action'],
125
+ ['l7policy_action.name'],
126
+ name='fk_l7policy_l7policy_action_name')
127
127
  )
128
128
 
129
129
  # L7 Rules
130
130
  op.create_table(
131
- u'l7rule',
132
- sa.Column(u'id', sa.String(36), nullable=False),
133
- sa.Column(u'l7policy_id', sa.String(36), nullable=False),
134
- sa.Column(u'type', sa.String(36), nullable=False),
135
- sa.Column(u'compare_type', sa.String(36), nullable=False),
136
- sa.Column(u'key', sa.String(255), nullable=True),
137
- sa.Column(u'value', sa.String(255), nullable=False),
138
- sa.Column(u'invert', sa.Boolean(), default=False, nullable=False),
139
- sa.PrimaryKeyConstraint(u'id'),
140
- sa.ForeignKeyConstraint([u'l7policy_id'],
141
- [u'l7policy.id'],
142
- name=u'fk_l7rule_l7policy_id'),
143
- sa.ForeignKeyConstraint([u'type'],
144
- [u'l7rule_type.name'],
145
- name=u'fk_l7rule_l7rule_type_name'),
146
- sa.ForeignKeyConstraint([u'compare_type'],
147
- [u'l7rule_compare_type.name'],
148
- name=u'fk_l7rule_l7rule_compare_type_name')
131
+ 'l7rule',
132
+ sa.Column('id', sa.String(36), nullable=False),
133
+ sa.Column('l7policy_id', sa.String(36), nullable=False),
134
+ sa.Column('type', sa.String(36), nullable=False),
135
+ sa.Column('compare_type', sa.String(36), nullable=False),
136
+ sa.Column('key', sa.String(255), nullable=True),
137
+ sa.Column('value', sa.String(255), nullable=False),
138
+ sa.Column('invert', sa.Boolean(), default=False, nullable=False),
139
+ sa.PrimaryKeyConstraint('id'),
140
+ sa.ForeignKeyConstraint(['l7policy_id'],
141
+ ['l7policy.id'],
142
+ name='fk_l7rule_l7policy_id'),
143
+ sa.ForeignKeyConstraint(['type'],
144
+ ['l7rule_type.name'],
145
+ name='fk_l7rule_l7rule_type_name'),
146
+ sa.ForeignKeyConstraint(['compare_type'],
147
+ ['l7rule_compare_type.name'],
148
+ name='fk_l7rule_l7rule_compare_type_name')
149
149
  )
@@ -34,8 +34,8 @@ down_revision = '6ffc710674ef'
34
34
  def upgrade():
35
35
  # Create temporary table for table data seeding
36
36
  insert_table = sa.table(
37
- u'spares_pool',
38
- sa.column(u'updated_at', sa.DateTime),
37
+ 'spares_pool',
38
+ sa.column('updated_at', sa.DateTime),
39
39
  )
40
40
 
41
41
  # Note: The date/time doesn't matter, we just need to seed the table.
@@ -32,9 +32,9 @@ down_revision = '3e5b37a0bdb9'
32
32
 
33
33
  def upgrade():
34
34
  insert_table = sql.table(
35
- u'provisioning_status',
36
- sql.column(u'name', sa.String),
37
- sql.column(u'description', sa.String)
35
+ 'provisioning_status',
36
+ sql.column('name', sa.String),
37
+ sql.column('description', sa.String)
38
38
  )
39
39
 
40
40
  op.bulk_insert(
@@ -30,5 +30,5 @@ down_revision = 'e6672bda93bf'
30
30
  def upgrade():
31
31
  bind = op.get_bind()
32
32
  md = sa.MetaData()
33
- sa.Table('operating_status', md, autoload=True, autoload_with=bind)
33
+ sa.Table('operating_status', md, autoload_with=bind)
34
34
  op.bulk_insert(md.tables['operating_status'], [{'name': 'DRAINING'}])
@@ -30,18 +30,18 @@ down_revision = '35dee79d5865'
30
30
 
31
31
  def upgrade():
32
32
  op.add_column(
33
- u'amphora',
34
- sa.Column(u'load_balancer_id', sa.String(36),
35
- sa.ForeignKey(u'load_balancer.id',
36
- name=u'fk_amphora_load_balancer_id'),
33
+ 'amphora',
34
+ sa.Column('load_balancer_id', sa.String(36),
35
+ sa.ForeignKey('load_balancer.id',
36
+ name='fk_amphora_load_balancer_id'),
37
37
  nullable=True)
38
38
  )
39
- op.drop_table(u'load_balancer_amphora')
39
+ op.drop_table('load_balancer_amphora')
40
40
  op.drop_constraint(
41
- u'fk_container_provisioning_status_name', u'amphora',
42
- type_=u'foreignkey'
41
+ 'fk_container_provisioning_status_name', 'amphora',
42
+ type_='foreignkey'
43
43
  )
44
44
  op.create_foreign_key(
45
- u'fk_amphora_provisioning_status_name', u'amphora',
46
- u'provisioning_status', [u'status'], [u'name']
45
+ 'fk_amphora_provisioning_status_name', 'amphora',
46
+ 'provisioning_status', ['status'], ['name']
47
47
  )
@@ -31,6 +31,6 @@ down_revision = '80dba23a159f'
31
31
 
32
32
  def upgrade():
33
33
  op.add_column(
34
- u'amphora',
35
- sa.Column(u'compute_flavor', sa.String(255), nullable=True)
34
+ 'amphora',
35
+ sa.Column('compute_flavor', sa.String(255), nullable=True)
36
36
  )
@@ -29,5 +29,5 @@ down_revision = '13500e2e978d'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.alter_column(u'member', u'address', new_column_name=u'ip_address',
32
+ op.alter_column('member', 'address', new_column_name='ip_address',
33
33
  existing_type=sa.String(64))
@@ -28,6 +28,6 @@ down_revision = '48660b6643f0'
28
28
 
29
29
 
30
30
  def upgrade():
31
- with op.batch_alter_table(u'vip') as batch_op:
32
- batch_op.alter_column(u'network_id', new_column_name=u'subnet_id',
31
+ with op.batch_alter_table('vip') as batch_op:
32
+ batch_op.alter_column('network_id', new_column_name='subnet_id',
33
33
  existing_type=sa.String(36))
@@ -32,24 +32,24 @@ down_revision = 'd85ca7258d21'
32
32
 
33
33
  def upgrade():
34
34
  op.add_column(
35
- u'health_monitor',
36
- sa.Column(u'created_at', sa.DateTime(), nullable=True)
35
+ 'health_monitor',
36
+ sa.Column('created_at', sa.DateTime(), nullable=True)
37
37
  )
38
38
  op.add_column(
39
- u'health_monitor',
40
- sa.Column(u'updated_at', sa.DateTime(), nullable=True)
39
+ 'health_monitor',
40
+ sa.Column('updated_at', sa.DateTime(), nullable=True)
41
41
  )
42
42
 
43
- op.add_column(u'health_monitor',
44
- sa.Column(u'operating_status',
43
+ op.add_column('health_monitor',
44
+ sa.Column('operating_status',
45
45
  sa.String(16),
46
46
  nullable=False,
47
47
  server_default=constants.ONLINE)
48
48
  )
49
- op.alter_column(u'health_monitor', u'operating_status',
49
+ op.alter_column('health_monitor', 'operating_status',
50
50
  existing_type=sa.String(16), server_default=None)
51
51
 
52
52
  op.create_foreign_key(
53
- u'fk_health_monitor_operating_status_name', u'health_monitor',
54
- u'operating_status', [u'operating_status'], [u'name']
53
+ 'fk_health_monitor_operating_status_name', 'health_monitor',
54
+ 'operating_status', ['operating_status'], ['name']
55
55
  )
@@ -33,9 +33,9 @@ new_protocol = 'PROXY'
33
33
 
34
34
  def upgrade():
35
35
  insert_table = sql.table(
36
- u'protocol',
37
- sql.column(u'name', sa.String),
38
- sql.column(u'description', sa.String)
36
+ 'protocol',
37
+ sql.column('name', sa.String),
38
+ sql.column('description', sa.String)
39
39
  )
40
40
 
41
41
  op.bulk_insert(
@@ -28,5 +28,5 @@ down_revision = '2351ea316465'
28
28
 
29
29
 
30
30
  def upgrade():
31
- op.add_column(u'amphora_health',
32
- sa.Column(u'busy', sa.Boolean(), nullable=False))
31
+ op.add_column('amphora_health',
32
+ sa.Column('busy', sa.Boolean(), nullable=False))
@@ -32,13 +32,13 @@ down_revision = '76aacf2e176c'
32
32
  def upgrade():
33
33
  # Add column redirect_prefix
34
34
  op.add_column(
35
- u'l7policy',
36
- sa.Column(u'redirect_prefix', sa.String(255), nullable=True)
35
+ 'l7policy',
36
+ sa.Column('redirect_prefix', sa.String(255), nullable=True)
37
37
  )
38
38
  insert_table = sql.table(
39
- u'l7policy_action',
40
- sql.column(u'name', sa.String),
41
- sql.column(u'description', sa.String)
39
+ 'l7policy_action',
40
+ sql.column('name', sa.String),
41
+ sql.column('description', sa.String)
42
42
  )
43
43
 
44
44
  op.bulk_insert(
@@ -28,10 +28,10 @@ down_revision = '3b199c848b96'
28
28
 
29
29
 
30
30
  def upgrade():
31
- op.add_column(u'amphora',
32
- sa.Column(u'cert_expiration', sa.DateTime(timezone=True),
31
+ op.add_column('amphora',
32
+ sa.Column('cert_expiration', sa.DateTime(timezone=True),
33
33
  nullable=True)
34
34
  )
35
35
 
36
- op.add_column(u'amphora', sa.Column(u'cert_busy', sa.Boolean(),
37
- nullable=False, default=False))
36
+ op.add_column('amphora', sa.Column('cert_busy', sa.Boolean(),
37
+ nullable=False, default=False))
@@ -29,5 +29,5 @@ down_revision = '36b94648fef8'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.alter_column(u'sni', u'tls_container_id', type_=sa.String(128),
32
+ op.alter_column('sni', 'tls_container_id', type_=sa.String(128),
33
33
  existing_type=sa.String(36), nullable=False)
@@ -31,6 +31,6 @@ down_revision = 'a7f187cd221f'
31
31
  def upgrade():
32
32
  # Add column redirect_prefix
33
33
  op.add_column(
34
- u'l7policy',
35
- sa.Column(u'redirect_http_code', sa.Integer(), nullable=True)
34
+ 'l7policy',
35
+ sa.Column('redirect_http_code', sa.Integer(), nullable=True)
36
36
  )
@@ -32,9 +32,9 @@ new_protocol = 'PROMETHEUS'
32
32
 
33
33
  def upgrade():
34
34
  insert_table = sql.table(
35
- u'protocol',
36
- sql.column(u'name', sa.String),
37
- sql.column(u'description', sa.String)
35
+ 'protocol',
36
+ sql.column('name', sa.String),
37
+ sql.column('description', sa.String)
38
38
  )
39
39
 
40
40
  op.bulk_insert(
@@ -30,6 +30,6 @@ down_revision = '7432f1d4ea83'
30
30
 
31
31
  def upgrade():
32
32
  op.create_table(
33
- u'spares_pool',
34
- sa.Column(u'updated_at', sa.DateTime(), primary_key=True,
33
+ 'spares_pool',
34
+ sa.Column('updated_at', sa.DateTime(), primary_key=True,
35
35
  server_default=sa.func.current_timestamp()))
@@ -30,10 +30,10 @@ down_revision = '6742ca1b27c2'
30
30
 
31
31
  def upgrade():
32
32
  op.add_column(
33
- u'health_monitor',
34
- sa.Column(u'http_version', sa.Float(), nullable=True)
33
+ 'health_monitor',
34
+ sa.Column('http_version', sa.Float(), nullable=True)
35
35
  )
36
36
  op.add_column(
37
- u'health_monitor',
38
- sa.Column(u'domain_name', sa.String(255), nullable=True)
37
+ 'health_monitor',
38
+ sa.Column('domain_name', sa.String(255), nullable=True)
39
39
  )
@@ -30,7 +30,7 @@ down_revision = 'a1f689aecc1d'
30
30
 
31
31
 
32
32
  def upgrade():
33
- op.add_column(u'pool', sa.Column(u'ca_tls_certificate_id', sa.String(255),
34
- nullable=True))
35
- op.add_column(u'pool', sa.Column(u'crl_container_id', sa.String(255),
36
- nullable=True))
33
+ op.add_column('pool', sa.Column('ca_tls_certificate_id', sa.String(255),
34
+ nullable=True))
35
+ op.add_column('pool', sa.Column('crl_container_id', sa.String(255),
36
+ nullable=True))
@@ -30,7 +30,7 @@ from sqlalchemy import sql
30
30
  revision = '76aacf2e176c'
31
31
  down_revision = 'ebbcc72b4e5e'
32
32
 
33
- tables = [u'protocol', u'health_monitor_type']
33
+ tables = ['protocol', 'health_monitor_type']
34
34
  new_fields = ['UDP', 'UDP-CONNECT']
35
35
 
36
36
 
@@ -40,8 +40,8 @@ def upgrade():
40
40
  for table, new_field in zip(tables, new_fields):
41
41
  insert_table = sql.table(
42
42
  table,
43
- sql.column(u'name', sa.String),
44
- sql.column(u'description', sa.String)
43
+ sql.column('name', sa.String),
44
+ sql.column('description', sa.String)
45
45
  )
46
46
 
47
47
  op.bulk_insert(
@@ -29,9 +29,9 @@ down_revision = '55874a4ceed6'
29
29
 
30
30
  def upgrade():
31
31
  op.create_table(
32
- u'tags',
33
- sa.Column(u'resource_id', sa.String(36), primary_key=True,
32
+ 'tags',
33
+ sa.Column('resource_id', sa.String(36), primary_key=True,
34
34
  nullable=False),
35
- sa.Column(u'tag', sa.String(255), primary_key=True, nullable=False,
35
+ sa.Column('tag', sa.String(255), primary_key=True, nullable=False,
36
36
  index=True),
37
37
  )
@@ -29,5 +29,5 @@ down_revision = '4a6ec0ab7284'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.alter_column(u'vip', u'ip_address',
32
+ op.alter_column('vip', 'ip_address',
33
33
  existing_type=sa.String(64))
@@ -29,13 +29,13 @@ down_revision = 'c761c8a71579'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.add_column(u'load_balancer',
33
- sa.Column(u'availability_zone',
32
+ op.add_column('load_balancer',
33
+ sa.Column('availability_zone',
34
34
  sa.String(255),
35
35
  nullable=True)
36
36
  )
37
37
 
38
38
  op.create_foreign_key(
39
- u'fk_load_balancer_availability_zone_name', u'load_balancer',
40
- u'availability_zone', [u'availability_zone'], [u'name']
39
+ 'fk_load_balancer_availability_zone_name', 'load_balancer',
40
+ 'availability_zone', ['availability_zone'], ['name']
41
41
  )
@@ -34,8 +34,8 @@ def upgrade():
34
34
  for table in ['protocol', 'health_monitor_type']:
35
35
  insert_table = sql.table(
36
36
  table,
37
- sql.column(u'name', sa.String),
38
- sql.column(u'description', sa.String)
37
+ sql.column('name', sa.String),
38
+ sql.column('description', sa.String)
39
39
  )
40
40
 
41
41
  op.bulk_insert(
@@ -29,5 +29,5 @@ down_revision = '186509101b9b'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.alter_column(u'sni', u'tls_container_id', type_=sa.String(128),
32
+ op.alter_column('sni', 'tls_container_id', type_=sa.String(128),
33
33
  existing_type=sa.String(36), nullable=False)
@@ -29,10 +29,10 @@ down_revision = '256852d5ff7c'
29
29
 
30
30
  def upgrade():
31
31
  op.create_table(
32
- u'amphora_health',
33
- sa.Column(u'amphora_id', sa.String(36), nullable=False,
32
+ 'amphora_health',
33
+ sa.Column('amphora_id', sa.String(36), nullable=False,
34
34
  primary_key=True),
35
- sa.Column(u'last_update', sa.DateTime(timezone=True),
35
+ sa.Column('last_update', sa.DateTime(timezone=True),
36
36
  nullable=False)
37
37
 
38
38
  )
@@ -36,8 +36,8 @@ def upgrade():
36
36
  nullable=True)
37
37
  )
38
38
  op.create_foreign_key(
39
- u'fk_health_monitor_provisioning_status_name', u'health_monitor',
40
- u'provisioning_status', [u'provisioning_status'], [u'name']
39
+ 'fk_health_monitor_provisioning_status_name', 'health_monitor',
40
+ 'provisioning_status', ['provisioning_status'], ['name']
41
41
  )
42
42
 
43
43
  op.add_column('l7policy',
@@ -46,8 +46,8 @@ def upgrade():
46
46
  nullable=True)
47
47
  )
48
48
  op.create_foreign_key(
49
- u'fk_l7policy_provisioning_status_name', u'l7policy',
50
- u'provisioning_status', [u'provisioning_status'], [u'name']
49
+ 'fk_l7policy_provisioning_status_name', 'l7policy',
50
+ 'provisioning_status', ['provisioning_status'], ['name']
51
51
  )
52
52
 
53
53
  op.add_column('l7rule',
@@ -56,8 +56,8 @@ def upgrade():
56
56
  nullable=True)
57
57
  )
58
58
  op.create_foreign_key(
59
- u'fk_l7rule_provisioning_status_name', u'l7rule',
60
- u'provisioning_status', [u'provisioning_status'], [u'name']
59
+ 'fk_l7rule_provisioning_status_name', 'l7rule',
60
+ 'provisioning_status', ['provisioning_status'], ['name']
61
61
  )
62
62
 
63
63
  op.add_column('member',
@@ -66,8 +66,8 @@ def upgrade():
66
66
  nullable=True)
67
67
  )
68
68
  op.create_foreign_key(
69
- u'fk_member_provisioning_status_name', u'member',
70
- u'provisioning_status', [u'provisioning_status'], [u'name']
69
+ 'fk_member_provisioning_status_name', 'member',
70
+ 'provisioning_status', ['provisioning_status'], ['name']
71
71
  )
72
72
 
73
73
  op.add_column('pool',
@@ -76,6 +76,6 @@ def upgrade():
76
76
  nullable=True)
77
77
  )
78
78
  op.create_foreign_key(
79
- u'fk_pool_provisioning_status_name', u'pool',
80
- u'provisioning_status', [u'provisioning_status'], [u'name']
79
+ 'fk_pool_provisioning_status_name', 'pool',
80
+ 'provisioning_status', ['provisioning_status'], ['name']
81
81
  )
@@ -31,5 +31,5 @@ down_revision = '1afc932f1ca2'
31
31
 
32
32
 
33
33
  def upgrade():
34
- op.add_column(u'pool', sa.Column(u'tls_certificate_id', sa.String(255),
35
- nullable=True))
34
+ op.add_column('pool', sa.Column('tls_certificate_id', sa.String(255),
35
+ nullable=True))
@@ -31,7 +31,7 @@ down_revision = '74aae261694c'
31
31
 
32
32
 
33
33
  def upgrade():
34
- op.add_column(u'pool',
35
- sa.Column(u'tls_enabled', sa.Boolean(),
34
+ op.add_column('pool',
35
+ sa.Column('tls_enabled', sa.Boolean(),
36
36
  server_default=sa.sql.expression.false(),
37
37
  nullable=False))
@@ -31,23 +31,23 @@ down_revision = '4f65b4f91c39'
31
31
  def upgrade():
32
32
 
33
33
  op.create_table(
34
- u'flavor_profile',
35
- sa.Column(u'id', sa.String(36), nullable=False),
36
- sa.Column(u'name', sa.String(255), nullable=False),
37
- sa.Column(u'provider_name', sa.String(255), nullable=False),
38
- sa.Column(u'flavor_data', sa.String(4096), nullable=False),
39
- sa.PrimaryKeyConstraint(u'id'))
34
+ 'flavor_profile',
35
+ sa.Column('id', sa.String(36), nullable=False),
36
+ sa.Column('name', sa.String(255), nullable=False),
37
+ sa.Column('provider_name', sa.String(255), nullable=False),
38
+ sa.Column('flavor_data', sa.String(4096), nullable=False),
39
+ sa.PrimaryKeyConstraint('id'))
40
40
 
41
41
  op.create_table(
42
- u'flavor',
43
- sa.Column(u'id', sa.String(36), nullable=False),
44
- sa.Column(u'name', sa.String(255), nullable=False),
45
- sa.Column(u'description', sa.String(255), nullable=True),
46
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
47
- sa.Column(u'flavor_profile_id', sa.String(36), nullable=False),
48
- sa.ForeignKeyConstraint([u'flavor_profile_id'],
49
- [u'flavor_profile.id'],
50
- name=u'fk_flavor_flavor_profile_id'),
51
- sa.PrimaryKeyConstraint(u'id'),
52
- sa.UniqueConstraint(u'name',
53
- name=u'uq_flavor_name'),)
42
+ 'flavor',
43
+ sa.Column('id', sa.String(36), nullable=False),
44
+ sa.Column('name', sa.String(255), nullable=False),
45
+ sa.Column('description', sa.String(255), nullable=True),
46
+ sa.Column('enabled', sa.Boolean(), nullable=False),
47
+ sa.Column('flavor_profile_id', sa.String(36), nullable=False),
48
+ sa.ForeignKeyConstraint(['flavor_profile_id'],
49
+ ['flavor_profile.id'],
50
+ name='fk_flavor_flavor_profile_id'),
51
+ sa.PrimaryKeyConstraint('id'),
52
+ sa.UniqueConstraint('name',
53
+ name='uq_flavor_name'),)
@@ -30,5 +30,5 @@ down_revision = '034756a182a2'
30
30
 
31
31
 
32
32
  def upgrade():
33
- op.add_column(u'member', sa.Column(u'backup', sa.Boolean(),
34
- nullable=False, default=False))
33
+ op.add_column('member', sa.Column('backup', sa.Boolean(),
34
+ nullable=False, default=False))