openstack
/
neutron-lbaas
Code Issues Proposed changes

nlbaas2octavia: Escape 'key' field calls 

The word "key" is reserved in SQL. lbaas_l7rules table has a field
name "key" which using it unescaped raises a mysql exception.

Change-Id: Ic0ddc86fe361014972f2a728beb3e8a3ed20e785
This commit is contained in:
Kobi Samoray 2018-08-15 14:22:50 +03:00
parent 0f9dc4f0a2
commit 82032ec987
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/nlbaas2octavia/nlbaas2octavia.py
View File

@ -264,7 +264,7 @@ def process_L7policies(LOG, n_session, o_session, listener_id, project_id):
'database.')) 'database.'))
# Handle L7 rules # Handle L7 rules
l7rules = n_session.execute( l7rules = n_session.execute(
"SELECT id, type, compare_type, invert, key, value, " "SELECT id, type, compare_type, invert, `key`, value, "
"provisioning_status, admin_state_up FROM lbaas_l7rules WHERE " "provisioning_status, admin_state_up FROM lbaas_l7rules WHERE "
"l7policy_id = :l7policy_id AND provisioning_status = 'ACTIVE';", "l7policy_id = :l7policy_id AND provisioning_status = 'ACTIVE';",
{'l7policy_id': l7policy[0]}).fetchall() {'l7policy_id': l7policy[0]}).fetchall()
@ -281,7 +281,7 @@ def process_L7policies(LOG, n_session, o_session, listener_id, project_id):
result = o_session.execute( result = o_session.execute(
"INSERT INTO l7rule (id, l7policy_id, type, compare_type, " "INSERT INTO l7rule (id, l7policy_id, type, compare_type, "
"key, value, invert, provisioning_status, created_at, " "`key`, value, invert, provisioning_status, created_at, "
"updated_at, project_id, enabled, operating_status) VALUES " "updated_at, project_id, enabled, operating_status) VALUES "
"(:id, :l7policy_id, :type, :compare_type, :key, :value, " "(:id, :l7policy_id, :type, :compare_type, :key, :value, "
":invert, :provisioning_status, :created_at, :updated_at, " ":invert, :provisioning_status, :created_at, :updated_at, "