x/vmware-nsx
Code Issues Proposed changes

Merge "use TRUE in SQL for boolean var"

Browse Source
This commit is contained in:
Jenkins 2014-09-15 17:32:36 +00:00 committed by Gerrit Code Review
commit 893bc994c4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
neutron/db/migration/migrate_to_ml2.py
View File

@ -171,7 +171,7 @@ class BaseMigrateToMl2_Icehouse(object):
INSERT INTO ml2_vlan_allocations INSERT INTO ml2_vlan_allocations
SELECT physical_network, vlan_id, allocated SELECT physical_network, vlan_id, allocated
FROM %(source_table)s FROM %(source_table)s
WHERE allocated = 1 WHERE allocated = TRUE
""") % {'source_table': self.vlan_allocation_table_name}) """) % {'source_table': self.vlan_allocation_table_name})
def get_port_segment_map(self, engine): def get_port_segment_map(self, engine):
@ -390,7 +390,7 @@ class MigrateOpenvswitchToMl2_Icehouse(BaseMigrateToMl2_Icehouse):
INSERT INTO ml2_gre_allocations INSERT INTO ml2_gre_allocations
SELECT tunnel_id as gre_id, allocated SELECT tunnel_id as gre_id, allocated
FROM ovs_tunnel_allocations FROM ovs_tunnel_allocations
WHERE allocated = 1 WHERE allocated = TRUE
""") """)
engine.execute(""" engine.execute("""
INSERT INTO ml2_gre_endpoints INSERT INTO ml2_gre_endpoints
@ -404,7 +404,7 @@ class MigrateOpenvswitchToMl2_Icehouse(BaseMigrateToMl2_Icehouse):
INSERT INTO ml2_vxlan_allocations INSERT INTO ml2_vxlan_allocations
SELECT tunnel_id as vxlan_vni, allocated SELECT tunnel_id as vxlan_vni, allocated
FROM ovs_tunnel_allocations FROM ovs_tunnel_allocations
WHERE allocated = 1 WHERE allocated = TRUE
""") """)
engine.execute(sa.text(""" engine.execute(sa.text("""
INSERT INTO ml2_vxlan_endpoints INSERT INTO ml2_vxlan_endpoints