Merge "Fix unit tests for floating IP creation"
This commit is contained in:
commit
c7849e1434
@ -776,8 +776,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
fixed_port_data)
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -830,8 +828,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
fixed_port_data)
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -896,8 +892,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
'test-host')
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -963,8 +957,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
'test-host')
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -1021,8 +1013,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
'test-host')
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -1069,8 +1059,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
fixed_port_data)
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': fixed_port['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_prefix = fip['floating_ip_address'] + '/32'
|
||||
@ -1155,8 +1143,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
for port_id in port_ids:
|
||||
fip_data = {'floatingip': {'floating_network_id': ext_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': port_id}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fips.append(fip)
|
||||
@ -1299,8 +1285,6 @@ class BgpTests(BgpEntityCreationMixin):
|
||||
dvr_gw_ip = fip_gw['fixed_ips'][0]['ip_address']
|
||||
fip_data = {'floatingip': {'floating_network_id': gw_net_id,
|
||||
'tenant_id': tenant_id,
|
||||
'subnet_id': None,
|
||||
'floating_ip_address': None,
|
||||
'port_id': ports[0]['id']}}
|
||||
fip = self.l3plugin.create_floatingip(self.context, fip_data)
|
||||
fip_address = fip['floating_ip_address']
|
||||
|
Loading…
Reference in New Issue
Block a user