octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0.0rc1__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.0rc1.dist-info}/AUTHORS +6 -0
  286. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/METADATA +3 -5
  287. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/RECORD +302 -305
  288. octavia-15.0.0.0rc1.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.0rc1.data}/data/share/octavia/LICENSE +0 -0
  295. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/README.rst +0 -0
  296. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/README.rst +0 -0
  297. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/diskimage-create.sh +0 -0
  298. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/image-tests.sh +0 -0
  299. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/requirements.txt +0 -0
  300. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/test-requirements.txt +0 -0
  301. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/tox.ini +0 -0
  302. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/data/share/octavia/diskimage-create/version.txt +0 -0
  303. {octavia-14.0.0.0rc1.data → octavia-15.0.0.0rc1.data}/scripts/octavia-wsgi +0 -0
  304. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/LICENSE +0 -0
  305. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/WHEEL +0 -0
  306. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/entry_points.txt +0 -0
  307. {octavia-14.0.0.0rc1.dist-info → octavia-15.0.0.0rc1.dist-info}/top_level.txt +0 -0
@@ -32,16 +32,16 @@ down_revision = None
32
32
  def upgrade():
33
33
  # Create lookup tables
34
34
  op.create_table(
35
- u'health_monitor_type',
36
- sa.Column(u'name', sa.String(30), primary_key=True),
37
- sa.Column(u'description', sa.String(255), nullable=True)
35
+ 'health_monitor_type',
36
+ sa.Column('name', sa.String(30), 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'health_monitor_type',
43
- sql.column(u'name', sa.String),
44
- sql.column(u'description', sa.String)
42
+ 'health_monitor_type',
43
+ sql.column('name', sa.String),
44
+ sql.column('description', sa.String)
45
45
  )
46
46
 
47
47
  op.bulk_insert(
@@ -54,15 +54,15 @@ def upgrade():
54
54
  )
55
55
 
56
56
  op.create_table(
57
- u'protocol',
58
- sa.Column(u'name', sa.String(30), primary_key=True),
59
- sa.Column(u'description', sa.String(255), nullable=True)
57
+ 'protocol',
58
+ sa.Column('name', sa.String(30), primary_key=True),
59
+ sa.Column('description', sa.String(255), nullable=True)
60
60
  )
61
61
 
62
62
  insert_table = sql.table(
63
- u'protocol',
64
- sql.column(u'name', sa.String),
65
- sql.column(u'description', sa.String)
63
+ 'protocol',
64
+ sql.column('name', sa.String),
65
+ sql.column('description', sa.String)
66
66
  )
67
67
 
68
68
  op.bulk_insert(
@@ -75,15 +75,15 @@ def upgrade():
75
75
  )
76
76
 
77
77
  op.create_table(
78
- u'algorithm',
79
- sa.Column(u'name', sa.String(30), primary_key=True),
80
- sa.Column(u'description', sa.String(255), nullable=True)
78
+ 'algorithm',
79
+ sa.Column('name', sa.String(30), primary_key=True),
80
+ sa.Column('description', sa.String(255), nullable=True)
81
81
  )
82
82
 
83
83
  insert_table = sql.table(
84
- u'algorithm',
85
- sql.column(u'name', sa.String),
86
- sql.column(u'description', sa.String)
84
+ 'algorithm',
85
+ sql.column('name', sa.String),
86
+ sql.column('description', sa.String)
87
87
  )
88
88
 
89
89
  op.bulk_insert(
@@ -96,15 +96,15 @@ def upgrade():
96
96
  )
97
97
 
98
98
  op.create_table(
99
- u'session_persistence_type',
100
- sa.Column(u'name', sa.String(30), primary_key=True),
101
- sa.Column(u'description', sa.String(255), nullable=True)
99
+ 'session_persistence_type',
100
+ sa.Column('name', sa.String(30), primary_key=True),
101
+ sa.Column('description', sa.String(255), nullable=True)
102
102
  )
103
103
 
104
104
  insert_table = sql.table(
105
- u'session_persistence_type',
106
- sql.column(u'name', sa.String),
107
- sql.column(u'description', sa.String)
105
+ 'session_persistence_type',
106
+ sql.column('name', sa.String),
107
+ sql.column('description', sa.String)
108
108
  )
109
109
 
110
110
  op.bulk_insert(
@@ -117,15 +117,15 @@ def upgrade():
117
117
  )
118
118
 
119
119
  op.create_table(
120
- u'provisioning_status',
121
- sa.Column(u'name', sa.String(30), primary_key=True),
122
- sa.Column(u'description', sa.String(255), nullable=True)
120
+ 'provisioning_status',
121
+ sa.Column('name', sa.String(30), primary_key=True),
122
+ sa.Column('description', sa.String(255), nullable=True)
123
123
  )
124
124
 
125
125
  insert_table = sql.table(
126
- u'provisioning_status',
127
- sql.column(u'name', sa.String),
128
- sql.column(u'description', sa.String)
126
+ 'provisioning_status',
127
+ sql.column('name', sa.String),
128
+ sql.column('description', sa.String)
129
129
  )
130
130
 
131
131
  op.bulk_insert(
@@ -141,15 +141,15 @@ def upgrade():
141
141
  )
142
142
 
143
143
  op.create_table(
144
- u'operating_status',
145
- sa.Column(u'name', sa.String(30), primary_key=True),
146
- sa.Column(u'description', sa.String(255), nullable=True)
144
+ 'operating_status',
145
+ sa.Column('name', sa.String(30), primary_key=True),
146
+ sa.Column('description', sa.String(255), nullable=True)
147
147
  )
148
148
 
149
149
  insert_table = sql.table(
150
- u'operating_status',
151
- sql.column(u'name', sa.String),
152
- sql.column(u'description', sa.String)
150
+ 'operating_status',
151
+ sql.column('name', sa.String),
152
+ sql.column('description', sa.String)
153
153
  )
154
154
 
155
155
  op.bulk_insert(
@@ -163,190 +163,190 @@ def upgrade():
163
163
  )
164
164
 
165
165
  op.create_table(
166
- u'pool',
167
- sa.Column(u'tenant_id', sa.String(255), nullable=True),
168
- sa.Column(u'id', sa.String(36), nullable=False),
169
- sa.Column(u'name', sa.String(255), nullable=True),
170
- sa.Column(u'description', sa.String(255), nullable=True),
171
- sa.Column(u'protocol', sa.String(16), nullable=False),
172
- sa.Column(u'lb_algorithm', sa.String(16), nullable=False),
173
- sa.Column(u'operating_status', sa.String(16), nullable=False),
174
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
175
- sa.PrimaryKeyConstraint(u'id'),
176
- sa.ForeignKeyConstraint([u'protocol'],
177
- [u'protocol.name'],
178
- name=u'fk_pool_protocol_name'),
179
- sa.ForeignKeyConstraint([u'lb_algorithm'],
180
- [u'algorithm.name'],
181
- name=u'fk_pool_algorithm_name'),
182
- sa.ForeignKeyConstraint([u'operating_status'],
183
- [u'operating_status.name'],
184
- name=u'fk_pool_operating_status_name')
166
+ 'pool',
167
+ sa.Column('tenant_id', sa.String(255), nullable=True),
168
+ sa.Column('id', sa.String(36), nullable=False),
169
+ sa.Column('name', sa.String(255), nullable=True),
170
+ sa.Column('description', sa.String(255), nullable=True),
171
+ sa.Column('protocol', sa.String(16), nullable=False),
172
+ sa.Column('lb_algorithm', sa.String(16), nullable=False),
173
+ sa.Column('operating_status', sa.String(16), nullable=False),
174
+ sa.Column('enabled', sa.Boolean(), nullable=False),
175
+ sa.PrimaryKeyConstraint('id'),
176
+ sa.ForeignKeyConstraint(['protocol'],
177
+ ['protocol.name'],
178
+ name='fk_pool_protocol_name'),
179
+ sa.ForeignKeyConstraint(['lb_algorithm'],
180
+ ['algorithm.name'],
181
+ name='fk_pool_algorithm_name'),
182
+ sa.ForeignKeyConstraint(['operating_status'],
183
+ ['operating_status.name'],
184
+ name='fk_pool_operating_status_name')
185
185
  )
186
186
 
187
187
  op.create_table(
188
- u'health_monitor',
189
- sa.Column(u'pool_id', sa.String(36), nullable=False),
190
- sa.Column(u'type', sa.String(36), nullable=False),
191
- sa.Column(u'delay', sa.Integer(), nullable=False),
192
- sa.Column(u'timeout', sa.Integer(), nullable=False),
193
- sa.Column(u'fall_threshold', sa.Integer(), nullable=False),
194
- sa.Column(u'rise_threshold', sa.Integer(), nullable=False),
195
- sa.Column(u'http_method', sa.String(16), nullable=True),
196
- sa.Column(u'url_path', sa.String(255), nullable=True),
197
- sa.Column(u'expected_codes', sa.String(64), nullable=True),
198
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
199
- sa.PrimaryKeyConstraint(u'pool_id'),
200
- sa.ForeignKeyConstraint([u'pool_id'], [u'pool.id'],
201
- name=u'fk_health_monitor_pool_id'),
188
+ 'health_monitor',
189
+ sa.Column('pool_id', sa.String(36), nullable=False),
190
+ sa.Column('type', sa.String(36), nullable=False),
191
+ sa.Column('delay', sa.Integer(), nullable=False),
192
+ sa.Column('timeout', sa.Integer(), nullable=False),
193
+ sa.Column('fall_threshold', sa.Integer(), nullable=False),
194
+ sa.Column('rise_threshold', sa.Integer(), nullable=False),
195
+ sa.Column('http_method', sa.String(16), nullable=True),
196
+ sa.Column('url_path', sa.String(255), nullable=True),
197
+ sa.Column('expected_codes', sa.String(64), nullable=True),
198
+ sa.Column('enabled', sa.Boolean(), nullable=False),
199
+ sa.PrimaryKeyConstraint('pool_id'),
200
+ sa.ForeignKeyConstraint(['pool_id'], ['pool.id'],
201
+ name='fk_health_monitor_pool_id'),
202
202
  sa.ForeignKeyConstraint(
203
- [u'type'], [u'health_monitor_type.name'],
204
- name=u'fk_health_monitor_health_monitor_type_name')
203
+ ['type'], ['health_monitor_type.name'],
204
+ name='fk_health_monitor_health_monitor_type_name')
205
205
  )
206
206
 
207
207
  op.create_table(
208
- u'session_persistence',
209
- sa.Column(u'pool_id', sa.String(36), nullable=False),
210
- sa.Column(u'type', sa.String(16), nullable=False),
211
- sa.Column(u'cookie_name', sa.String(255), nullable=True),
208
+ 'session_persistence',
209
+ sa.Column('pool_id', sa.String(36), nullable=False),
210
+ sa.Column('type', sa.String(16), nullable=False),
211
+ sa.Column('cookie_name', sa.String(255), nullable=True),
212
212
  sa.ForeignKeyConstraint(
213
- [u'type'], [u'session_persistence_type.name'],
214
- name=u'fk_session_persistence_session_persistence_type_name'),
215
- sa.ForeignKeyConstraint([u'pool_id'], [u'pool.id'],
216
- name=u'fk_session_persistence_pool_id'),
217
- sa.PrimaryKeyConstraint(u'pool_id')
213
+ ['type'], ['session_persistence_type.name'],
214
+ name='fk_session_persistence_session_persistence_type_name'),
215
+ sa.ForeignKeyConstraint(['pool_id'], ['pool.id'],
216
+ name='fk_session_persistence_pool_id'),
217
+ sa.PrimaryKeyConstraint('pool_id')
218
218
  )
219
219
 
220
220
  op.create_table(
221
- u'member',
222
- sa.Column(u'tenant_id', sa.String(255), nullable=True),
223
- sa.Column(u'id', sa.String(36), nullable=False),
224
- sa.Column(u'pool_id', sa.String(36), nullable=False),
225
- sa.Column(u'subnet_id', sa.String(36), nullable=True),
226
- sa.Column(u'address', sa.String(64), nullable=False),
227
- sa.Column(u'protocol_port', sa.Integer(), nullable=False),
228
- sa.Column(u'weight', sa.Integer(), nullable=True),
229
- sa.Column(u'operating_status', sa.String(16), nullable=False),
230
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
231
- sa.PrimaryKeyConstraint(u'id'),
232
- sa.ForeignKeyConstraint([u'pool_id'], [u'pool.id'],
233
- name=u'fk_member_pool_id'),
234
- sa.ForeignKeyConstraint([u'operating_status'],
235
- [u'operating_status.name'],
236
- name=u'fk_member_operating_status_name'),
237
- sa.UniqueConstraint(u'pool_id', u'address', u'protocol_port',
238
- name=u'uq_member_pool_id_address_protocol_port')
221
+ 'member',
222
+ sa.Column('tenant_id', sa.String(255), nullable=True),
223
+ sa.Column('id', sa.String(36), nullable=False),
224
+ sa.Column('pool_id', sa.String(36), nullable=False),
225
+ sa.Column('subnet_id', sa.String(36), nullable=True),
226
+ sa.Column('address', sa.String(64), nullable=False),
227
+ sa.Column('protocol_port', sa.Integer(), nullable=False),
228
+ sa.Column('weight', sa.Integer(), nullable=True),
229
+ sa.Column('operating_status', sa.String(16), nullable=False),
230
+ sa.Column('enabled', sa.Boolean(), nullable=False),
231
+ sa.PrimaryKeyConstraint('id'),
232
+ sa.ForeignKeyConstraint(['pool_id'], ['pool.id'],
233
+ name='fk_member_pool_id'),
234
+ sa.ForeignKeyConstraint(['operating_status'],
235
+ ['operating_status.name'],
236
+ name='fk_member_operating_status_name'),
237
+ sa.UniqueConstraint('pool_id', 'address', 'protocol_port',
238
+ name='uq_member_pool_id_address_protocol_port')
239
239
  )
240
240
 
241
241
  op.create_table(
242
- u'load_balancer',
243
- sa.Column(u'tenant_id', sa.String(255), nullable=True),
244
- sa.Column(u'id', sa.String(36), nullable=False),
245
- sa.Column(u'name', sa.String(255), nullable=True),
246
- sa.Column(u'description', sa.String(255), nullable=True),
247
- sa.Column(u'provisioning_status', sa.String(16), nullable=False),
248
- sa.Column(u'operating_status', sa.String(16), nullable=False),
249
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
250
- sa.PrimaryKeyConstraint(u'id'),
242
+ 'load_balancer',
243
+ sa.Column('tenant_id', sa.String(255), nullable=True),
244
+ sa.Column('id', sa.String(36), nullable=False),
245
+ sa.Column('name', sa.String(255), nullable=True),
246
+ sa.Column('description', sa.String(255), nullable=True),
247
+ sa.Column('provisioning_status', sa.String(16), nullable=False),
248
+ sa.Column('operating_status', sa.String(16), nullable=False),
249
+ sa.Column('enabled', sa.Boolean(), nullable=False),
250
+ sa.PrimaryKeyConstraint('id'),
251
251
  sa.ForeignKeyConstraint(
252
- [u'provisioning_status'], [u'provisioning_status.name'],
253
- name=u'fk_load_balancer_provisioning_status_name'),
254
- sa.ForeignKeyConstraint([u'operating_status'],
255
- [u'operating_status.name'],
256
- name=u'fk_load_balancer_operating_status_name')
252
+ ['provisioning_status'], ['provisioning_status.name'],
253
+ name='fk_load_balancer_provisioning_status_name'),
254
+ sa.ForeignKeyConstraint(['operating_status'],
255
+ ['operating_status.name'],
256
+ name='fk_load_balancer_operating_status_name')
257
257
  )
258
258
 
259
259
  op.create_table(
260
- u'vip',
261
- sa.Column(u'load_balancer_id', sa.String(36), nullable=False),
262
- sa.Column(u'ip_address', sa.String(36), nullable=True),
263
- sa.Column(u'net_port_id', sa.String(36), nullable=True),
264
- sa.Column(u'subnet_id', sa.String(36), nullable=True),
265
- sa.Column(u'floating_ip_id', sa.String(36), nullable=True),
266
- sa.Column(u'floating_ip_network_id', sa.String(36), nullable=True),
267
- sa.PrimaryKeyConstraint(u'load_balancer_id'),
268
- sa.ForeignKeyConstraint([u'load_balancer_id'], [u'load_balancer.id'],
269
- name=u'fk_vip_load_balancer_id')
260
+ 'vip',
261
+ sa.Column('load_balancer_id', sa.String(36), nullable=False),
262
+ sa.Column('ip_address', sa.String(36), nullable=True),
263
+ sa.Column('net_port_id', sa.String(36), nullable=True),
264
+ sa.Column('subnet_id', sa.String(36), nullable=True),
265
+ sa.Column('floating_ip_id', sa.String(36), nullable=True),
266
+ sa.Column('floating_ip_network_id', sa.String(36), nullable=True),
267
+ sa.PrimaryKeyConstraint('load_balancer_id'),
268
+ sa.ForeignKeyConstraint(['load_balancer_id'], ['load_balancer.id'],
269
+ name='fk_vip_load_balancer_id')
270
270
  )
271
271
 
272
272
  op.create_table(
273
- u'listener',
274
- sa.Column(u'tenant_id', sa.String(255), nullable=True),
275
- sa.Column(u'id', sa.String(36), nullable=False),
276
- sa.Column(u'name', sa.String(255), nullable=True),
277
- sa.Column(u'description', sa.String(255), nullable=True),
278
- sa.Column(u'protocol', sa.String(16), nullable=False),
279
- sa.Column(u'protocol_port', sa.Integer(), nullable=False),
280
- sa.Column(u'connection_limit', sa.Integer(), nullable=True),
281
- sa.Column(u'load_balancer_id', sa.String(36), nullable=True),
282
- sa.Column(u'tls_certificate_id', sa.String(36), nullable=True),
283
- sa.Column(u'default_pool_id', sa.String(36), nullable=True),
284
- sa.Column(u'provisioning_status', sa.String(16), nullable=False),
285
- sa.Column(u'operating_status', sa.String(16), nullable=False),
286
- sa.Column(u'enabled', sa.Boolean(), nullable=False),
287
- sa.ForeignKeyConstraint([u'load_balancer_id'], [u'load_balancer.id'],
288
- name=u'fk_listener_load_balancer_id'),
289
- sa.ForeignKeyConstraint([u'default_pool_id'], [u'pool.id'],
290
- name=u'fk_listener_pool_id'),
291
- sa.ForeignKeyConstraint([u'protocol'], [u'protocol.name'],
292
- name=u'fk_listener_protocol_name'),
293
- sa.ForeignKeyConstraint([u'provisioning_status'],
294
- [u'provisioning_status.name'],
295
- name=u'fk_listener_provisioning_status_name'),
296
- sa.ForeignKeyConstraint([u'operating_status'],
297
- [u'operating_status.name'],
298
- name=u'fk_listener_operating_status_name'),
299
- sa.UniqueConstraint(u'default_pool_id',
300
- name=u'uq_listener_default_pool_id'),
273
+ 'listener',
274
+ sa.Column('tenant_id', sa.String(255), nullable=True),
275
+ sa.Column('id', sa.String(36), nullable=False),
276
+ sa.Column('name', sa.String(255), nullable=True),
277
+ sa.Column('description', sa.String(255), nullable=True),
278
+ sa.Column('protocol', sa.String(16), nullable=False),
279
+ sa.Column('protocol_port', sa.Integer(), nullable=False),
280
+ sa.Column('connection_limit', sa.Integer(), nullable=True),
281
+ sa.Column('load_balancer_id', sa.String(36), nullable=True),
282
+ sa.Column('tls_certificate_id', sa.String(36), nullable=True),
283
+ sa.Column('default_pool_id', sa.String(36), nullable=True),
284
+ sa.Column('provisioning_status', sa.String(16), nullable=False),
285
+ sa.Column('operating_status', sa.String(16), nullable=False),
286
+ sa.Column('enabled', sa.Boolean(), nullable=False),
287
+ sa.ForeignKeyConstraint(['load_balancer_id'], ['load_balancer.id'],
288
+ name='fk_listener_load_balancer_id'),
289
+ sa.ForeignKeyConstraint(['default_pool_id'], ['pool.id'],
290
+ name='fk_listener_pool_id'),
291
+ sa.ForeignKeyConstraint(['protocol'], ['protocol.name'],
292
+ name='fk_listener_protocol_name'),
293
+ sa.ForeignKeyConstraint(['provisioning_status'],
294
+ ['provisioning_status.name'],
295
+ name='fk_listener_provisioning_status_name'),
296
+ sa.ForeignKeyConstraint(['operating_status'],
297
+ ['operating_status.name'],
298
+ name='fk_listener_operating_status_name'),
299
+ sa.UniqueConstraint('default_pool_id',
300
+ name='uq_listener_default_pool_id'),
301
301
  sa.UniqueConstraint(
302
- u'load_balancer_id', u'protocol_port',
303
- name=u'uq_listener_load_balancer_id_protocol_port'),
304
- sa.PrimaryKeyConstraint(u'id')
302
+ 'load_balancer_id', 'protocol_port',
303
+ name='uq_listener_load_balancer_id_protocol_port'),
304
+ sa.PrimaryKeyConstraint('id')
305
305
  )
306
306
 
307
307
  op.create_table(
308
- u'sni',
309
- sa.Column(u'listener_id', sa.String(36), nullable=False),
310
- sa.Column(u'tls_container_id', sa.String(36), nullable=False),
311
- sa.Column(u'position', sa.Integer, nullable=True),
312
- sa.ForeignKeyConstraint([u'listener_id'], [u'listener.id'],
313
- name=u'fk_sni_listener_id'),
314
- sa.PrimaryKeyConstraint(u'listener_id', u'tls_container_id')
308
+ 'sni',
309
+ sa.Column('listener_id', sa.String(36), nullable=False),
310
+ sa.Column('tls_container_id', sa.String(36), nullable=False),
311
+ sa.Column('position', sa.Integer, nullable=True),
312
+ sa.ForeignKeyConstraint(['listener_id'], ['listener.id'],
313
+ name='fk_sni_listener_id'),
314
+ sa.PrimaryKeyConstraint('listener_id', 'tls_container_id')
315
315
  )
316
316
 
317
317
  op.create_table(
318
- u'listener_statistics',
319
- sa.Column(u'listener_id', sa.String(36), nullable=False),
320
- sa.Column(u'bytes_in', sa.BigInteger(), nullable=False),
321
- sa.Column(u'bytes_out', sa.BigInteger(), nullable=False),
322
- sa.Column(u'active_connections', sa.Integer(), nullable=False),
323
- sa.Column(u'total_connections', sa.BigInteger(), nullable=False),
324
- sa.PrimaryKeyConstraint(u'listener_id'),
325
- sa.ForeignKeyConstraint([u'listener_id'], [u'listener.id'],
326
- name=u'fk_listener_statistics_listener_id')
318
+ 'listener_statistics',
319
+ sa.Column('listener_id', sa.String(36), nullable=False),
320
+ sa.Column('bytes_in', sa.BigInteger(), nullable=False),
321
+ sa.Column('bytes_out', sa.BigInteger(), nullable=False),
322
+ sa.Column('active_connections', sa.Integer(), nullable=False),
323
+ sa.Column('total_connections', sa.BigInteger(), nullable=False),
324
+ sa.PrimaryKeyConstraint('listener_id'),
325
+ sa.ForeignKeyConstraint(['listener_id'], ['listener.id'],
326
+ name='fk_listener_statistics_listener_id')
327
327
  )
328
328
 
329
329
  op.create_table(
330
- u'amphora',
330
+ 'amphora',
331
331
  # id should come from the service providing the amphora (i.e. nova)
332
- sa.Column(u'id', sa.String(36), nullable=False, autoincrement=False),
333
- sa.Column(u'host_id', sa.String(36), nullable=False),
334
- sa.Column(u'status', sa.String(36), nullable=False),
335
- sa.PrimaryKeyConstraint(u'id'),
332
+ sa.Column('id', sa.String(36), nullable=False, autoincrement=False),
333
+ sa.Column('host_id', sa.String(36), nullable=False),
334
+ sa.Column('status', sa.String(36), nullable=False),
335
+ sa.PrimaryKeyConstraint('id'),
336
336
  sa.ForeignKeyConstraint(
337
- [u'status'], [u'provisioning_status.name'],
338
- name=u'fk_container_provisioning_status_name')
337
+ ['status'], ['provisioning_status.name'],
338
+ name='fk_container_provisioning_status_name')
339
339
  )
340
340
 
341
341
  op.create_table(
342
- u'load_balancer_amphora',
343
- sa.Column(u'amphora_id', sa.String(36), nullable=False),
344
- sa.Column(u'load_balancer_id', sa.String(36), nullable=False),
342
+ 'load_balancer_amphora',
343
+ sa.Column('amphora_id', sa.String(36), nullable=False),
344
+ sa.Column('load_balancer_id', sa.String(36), nullable=False),
345
345
  sa.ForeignKeyConstraint(
346
- [u'load_balancer_id'], [u'load_balancer.id'],
347
- name=u'fk_load_balancer_amphora_load_balancer_id'),
348
- sa.ForeignKeyConstraint([u'amphora_id'],
349
- [u'amphora.id'],
350
- name=u'fk_load_balancer_amphora_id'),
351
- sa.PrimaryKeyConstraint(u'amphora_id', u'load_balancer_id')
346
+ ['load_balancer_id'], ['load_balancer.id'],
347
+ name='fk_load_balancer_amphora_load_balancer_id'),
348
+ sa.ForeignKeyConstraint(['amphora_id'],
349
+ ['amphora.id'],
350
+ name='fk_load_balancer_amphora_id'),
351
+ sa.PrimaryKeyConstraint('amphora_id', 'load_balancer_id')
352
352
  )
@@ -34,9 +34,9 @@ def upgrade():
34
34
  for table in tables:
35
35
  op.add_column(
36
36
  table,
37
- sa.Column(u'created_at', sa.DateTime(), nullable=True)
37
+ sa.Column('created_at', sa.DateTime(), nullable=True)
38
38
  )
39
39
  op.add_column(
40
40
  table,
41
- sa.Column(u'updated_at', sa.DateTime(), nullable=True)
41
+ sa.Column('updated_at', sa.DateTime(), nullable=True)
42
42
  )
@@ -39,7 +39,7 @@ def upgrade():
39
39
  pk = inspector.get_pk_constraint('spares_pool')
40
40
  if not pk['constrained_columns']:
41
41
  op.create_primary_key(
42
- u'pk_spares_pool', u'spares_pool', [u'updated_at'])
42
+ 'pk_spares_pool', 'spares_pool', ['updated_at'])
43
43
  else:
44
44
  # Revision '46d914b2a5e5' has been updated to create the
45
45
  # missing PK. Depending whether the env is already deployed or
@@ -29,5 +29,5 @@ down_revision = '4faaa983e7a9'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.alter_column(u'amphora', u'host_id', new_column_name='compute_id',
32
+ op.alter_column('amphora', 'host_id', new_column_name='compute_id',
33
33
  existing_type=sa.String(36), nullable=True)
@@ -30,5 +30,5 @@ down_revision = '543f5d8e4e56'
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': 'NO_MONITOR'}])
@@ -29,7 +29,7 @@ down_revision = '92fe9857279'
29
29
 
30
30
 
31
31
  def upgrade():
32
- op.add_column(u'amphora',
33
- sa.Column(u'vrrp_ip', sa.String(64), nullable=True))
34
- op.add_column(u'amphora',
35
- sa.Column(u'ha_ip', sa.String(64), nullable=True))
32
+ op.add_column('amphora',
33
+ sa.Column('vrrp_ip', sa.String(64), nullable=True))
34
+ op.add_column('amphora',
35
+ sa.Column('ha_ip', sa.String(64), nullable=True))
@@ -29,17 +29,17 @@ down_revision = '44a2414dd683'
29
29
 
30
30
  def upgrade():
31
31
  op.create_table(
32
- u'quotas',
33
- sa.Column(u'project_id', sa.String(36), primary_key=True,
32
+ 'quotas',
33
+ sa.Column('project_id', sa.String(36), primary_key=True,
34
34
  nullable=False),
35
- sa.Column(u'health_monitor', sa.Integer(), nullable=True),
36
- sa.Column(u'load_balancer', sa.Integer(), nullable=True),
37
- sa.Column(u'listener', sa.Integer(), nullable=True),
38
- sa.Column(u'member', sa.Integer(), nullable=True),
39
- sa.Column(u'pool', sa.Integer(), nullable=True),
40
- sa.Column(u'in_use_health_monitor', sa.Integer(), nullable=True),
41
- sa.Column(u'in_use_load_balancer', sa.Integer(), nullable=True),
42
- sa.Column(u'in_use_listener', sa.Integer(), nullable=True),
43
- sa.Column(u'in_use_member', sa.Integer(), nullable=True),
44
- sa.Column(u'in_use_pool', sa.Integer(), nullable=True),
35
+ sa.Column('health_monitor', sa.Integer(), nullable=True),
36
+ sa.Column('load_balancer', sa.Integer(), nullable=True),
37
+ sa.Column('listener', sa.Integer(), nullable=True),
38
+ sa.Column('member', sa.Integer(), nullable=True),
39
+ sa.Column('pool', sa.Integer(), nullable=True),
40
+ sa.Column('in_use_health_monitor', sa.Integer(), nullable=True),
41
+ sa.Column('in_use_load_balancer', sa.Integer(), nullable=True),
42
+ sa.Column('in_use_listener', sa.Integer(), nullable=True),
43
+ sa.Column('in_use_member', sa.Integer(), nullable=True),
44
+ sa.Column('in_use_pool', sa.Integer(), nullable=True),
45
45
  )
@@ -30,14 +30,14 @@ down_revision = '6abb04f24c5'
30
30
 
31
31
  def upgrade():
32
32
  op.drop_constraint(
33
- u'fk_pool_algorithm_name', u'pool',
34
- type_=u'foreignkey'
33
+ 'fk_pool_algorithm_name', 'pool',
34
+ type_='foreignkey'
35
35
  )
36
- op.alter_column(u'algorithm', u'name', nullable=False,
36
+ op.alter_column('algorithm', 'name', nullable=False,
37
37
  existing_type=sa.String(255))
38
- op.alter_column(u'pool', u'lb_algorithm', nullable=False,
38
+ op.alter_column('pool', 'lb_algorithm', nullable=False,
39
39
  existing_type=sa.String(255))
40
40
  op.create_foreign_key(
41
- u'fk_pool_algorithm_name', u'pool',
42
- u'algorithm', [u'lb_algorithm'], [u'name']
41
+ 'fk_pool_algorithm_name', 'pool',
42
+ 'algorithm', ['lb_algorithm'], ['name']
43
43
  )
@@ -28,5 +28,5 @@ down_revision = '3f8ff3be828e'
28
28
 
29
29
 
30
30
  def upgrade():
31
- op.add_column(u'vip',
32
- sa.Column(u'network_id', sa.String(36), nullable=True))
31
+ op.add_column('vip',
32
+ sa.Column('network_id', sa.String(36), nullable=True))
@@ -35,5 +35,5 @@ def upgrade():
35
35
  for table in tables:
36
36
  op.add_column(
37
37
  table,
38
- sa.Column(u'name', sa.String(255), nullable=True)
38
+ sa.Column('name', sa.String(255), nullable=True)
39
39
  )