--- a/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py Fri May 15 11:39:39 2015 -0700
+++ b/components/openstack/neutron/files/evs/migrate/evs-neutron-migration.py Fri Jul 17 17:41:34 2015 -0700
@@ -141,10 +141,6 @@
evs_contr = rc.get_object(evsc.EVSController())
except:
raise SystemExit(_("Could not retrieve EVS info from EVS Controller"))
- evsinfo = evs_contr.getEVSInfo()
- if not evsinfo:
- print "No data to migrate"
- return
config.readfp(open("/etc/neutron/neutron.conf"))
if config.has_option("database", 'connection'):
@@ -161,6 +157,7 @@
neutron_engine = sa.create_engine(SQL_CONNECTION)
router_port_ids = {}
+ evsinfo = evs_contr.getEVSInfo()
for e in evsinfo:
ext_ro = False
for p in e.props:
@@ -368,7 +365,8 @@
for t in meta.tables.values():
for fk in t.foreign_keys:
if fk.column.table.name == "routers":
- engine.execute(DropConstraint(fk.constraint))
+ if fk.constraint.name:
+ engine.execute(DropConstraint(fk.constraint))
for t in meta.tables.values():
if t.name == "routers":
t.drop(bind=conn)
@@ -378,7 +376,8 @@
for t in meta.tables.values():
for fk in t.foreign_keys:
if fk.column.table.name == "floatingips":
- engine.execute(DropConstraint(fk.constraint))
+ if fk.constraint.name:
+ engine.execute(DropConstraint(fk.constraint))
for t in meta.tables.values():
if t.name == "floatingips":
t.drop(bind=conn)