Merge "Remove unique_key field from floating IPs"
This commit is contained in:
commit
418763eebf
|
@ -52,7 +52,7 @@ class LogicalRouter(mf.ModelBase, mixins.Name, mixins.Version, mixins.Topic,
|
||||||
@mf.register_model
|
@mf.register_model
|
||||||
@mf.construct_nb_db_model(indexes={'lport': 'lport.id'})
|
@mf.construct_nb_db_model(indexes={'lport': 'lport.id'})
|
||||||
class FloatingIp(mf.ModelBase, mixins.Version, mixins.Topic,
|
class FloatingIp(mf.ModelBase, mixins.Version, mixins.Topic,
|
||||||
mixins.UniqueKey, mixins.Name, mixins.BasicEvents):
|
mixins.Name, mixins.BasicEvents):
|
||||||
table_name = 'floatingip'
|
table_name = 'floatingip'
|
||||||
|
|
||||||
floating_ip_address = df_fields.IpAddressField()
|
floating_ip_address = df_fields.IpAddressField()
|
||||||
|
|
|
@ -292,7 +292,6 @@ fake_floatingip1 = l3.FloatingIp(
|
||||||
id='fake_floatingip_id1',
|
id='fake_floatingip_id1',
|
||||||
topic='fake_tenant1',
|
topic='fake_tenant1',
|
||||||
name='no_fip_name',
|
name='no_fip_name',
|
||||||
unique_key=4444,
|
|
||||||
version=7,
|
version=7,
|
||||||
floating_ip_address='172.24.4.2',
|
floating_ip_address='172.24.4.2',
|
||||||
fixed_ip_address='10.0.0.6',
|
fixed_ip_address='10.0.0.6',
|
||||||
|
|
Loading…
Reference in New Issue