x
/
kloudbuster
Code Issues Proposed changes

Fix compability issue for adding floating ip to VM 

Change-Id: I4dd7603f044499185c5d870f4dc7771c8fdf6769
This commit is contained in:
Yichen Wang 2019-05-09 15:11:32 -07:00
parent 1d7e405274
commit de38fad996
5 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kloudbuster/base_network.py
View File

@ -35,17 +35,18 @@ class KBGetExtNetException(Exception):
class KBGetProvNetException(Exception):
pass
def create_floating_ip(neutron_client, ext_net):
def create_floating_ip(neutron_client, ext_net, port_id):
"""
Function that creates a floating ip and returns it
Accepts the neutron client and ext_net
Accepts the neutron client, ext_net, and port_id
Module level function since this is not associated with a
specific network instance
"""
body = {
"floatingip": {
"floating_network_id": ext_net['id']
"floating_network_id": ext_net['id'],
"port_id": port_id
}
}
fip = neutron_client.create_floatingip(body)

2
kloudbuster/cfg.scale.yaml
View File

@ -62,7 +62,7 @@ vm_creation_concurrency: 5
public_key_file:
# Name of Provider network used for multicast tests or storage tests.
provider_network_name:
provider_network:
# TSDB connectors are optional and can be used to retrieve CPU usage information and attach them
# to the results.

14
kloudbuster/kloudbuster.py
View File

@ -255,20 +255,16 @@ class Kloud(object):
instance.fip = None
elif instance.vm_name == "KB-PROXY" and not u_fip and not self.multicast_mode:
neutron_client = instance.network.router.user.neutron_client
external_network = base_network.find_external_network(neutron_client)
instance.fip = base_network.create_floating_ip(neutron_client, external_network)
ext_net = base_network.find_external_network(neutron_client)
port_id = instance.instance.interface_list()[0].id
# Associate the floating ip with this instance
instance.fip = base_network.create_floating_ip(neutron_client, ext_net, port_id)
instance.fip_ip = instance.fip['floatingip']['floating_ip_address']
self.res_logger.log('floating_ips',
instance.fip['floatingip']['floating_ip_address'],
instance.fip['floatingip']['id'])
if instance.fip:
# Associate the floating ip with this instance
instance.instance.add_floating_ip(instance.fip_ip)
instance.ssh_ip = instance.fip_ip
else:
# Store the fixed ip as ssh ip since there is no floating ip
instance.ssh_ip = instance.fixed_ip
instance.ssh_ip = instance.fip_ip if instance.fip else instance.fixed_ip
if not instance.vm_name == "KB-PROXY" and self.multicast_mode:
nc = instance.network.router.user.neutron_client

2
kloudbuster/users.py
View File

@ -146,7 +146,7 @@ class User(object):
if self.tenant.kloud.multicast_mode or (
self.tenant.kloud.storage_mode and config_scale.provider_network):
router_instance = base_network.Router(
self, provider_network=config_scale.provider_network_name)
self, provider_network=config_scale.provider_network)
self.router_list.append(router_instance)
router_instance.create_network_resources(config_scale)
else:

2
test-requirements.txt
View File

@ -7,7 +7,7 @@ hacking<0.11,>=0.10.0
coverage>=3.6
discover
python-subunit>=0.0.18
sphinx>=1.4.0
sphinx>=1.4.0,<2.0
sphinx_rtd_theme>=0.1.9
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0