Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LIBCLOUD-590 - Reduce redundant API calls of CloudStack compute driver's... #641

Closed
wants to merge 1 commit into from
Closed

LIBCLOUD-590 - Reduce redundant API calls of CloudStack compute driver's... #641

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 13 additions & 9 deletions libcloud/compute/drivers/cloudstack.py
View file
Open in desktop
Expand Up @@ -1363,6 +1363,8 @@ def list_nodes(self, project=None):
args['projectid'] = project.id
vms = self._sync_request('listVirtualMachines', params=args)
addrs = self._sync_request('listPublicIpAddresses', params=args)
port_forwarding_rules = self._sync_request('listPortForwardingRules')
ip_forwarding_rules = self._sync_request('listIpForwardingRules')

public_ips_map = {}
for addr in addrs.get('publicipaddress', []):
Expand All @@ -1380,14 +1382,15 @@ def list_nodes(self, project=None):
public_ips = list(public_ips)
node = self._to_node(data=vm, public_ips=public_ips)

addresses = public_ips_map.get(vm['id'], {}).items()
addresses = [CloudStackAddress(node, v, k) for k, v in addresses]
addresses = public_ips_map.get(str(vm['id']), {}).items()
addresses = [CloudStackAddress(id=address_id, address=address,
driver=node.driver) for
address, address_id in addresses]
node.extra['ip_addresses'] = addresses

rules = []
for addr in addresses:
result = self._sync_request('listIpForwardingRules')
for r in result.get('ipforwardingrule', []):
for r in ip_forwarding_rules.get('ipforwardingrule', []):
if str(r['virtualmachineid']) == node.id:
rule = CloudStackIPForwardingRule(node, r['id'],
addr,
Expand All @@ -1399,12 +1402,13 @@ def list_nodes(self, project=None):
node.extra['ip_forwarding_rules'] = rules

rules = []
public_ips = self.ex_list_public_ips()
result = self._sync_request('listPortForwardingRules')
for r in result.get('portforwardingrule', []):
for r in port_forwarding_rules.get('portforwardingrule', []):
if str(r['virtualmachineid']) == node.id:
addr = [a for a in public_ips if
a.address == r['ipaddress']]
addr = [CloudStackAddress(id=a['id'],
address=a['ipaddress'],
driver=node.driver)
for a in addrs.get('publicipaddress', [])
if a['ipaddress'] == r['ipaddress']]
rule = CloudStackPortForwardingRule(node, r['id'],
addr[0],
r['protocol'].upper(),
Expand Down
1 change: 1 addition & 0 deletions libcloud/test/compute/fixtures/ktucloud/listIpForwardingRules_default.json
View file
Open in desktop
@@ -0,0 +1 @@
{ "listipforwardingrulesresponse" : { "count":1 ,"ipforwardingrule" : [ {"id":"772fd410-6649-43ed-befa-77be986b8906","protocol":"tcp","virtualmachineid":"2600","virtualmachinename":"test","virtualmachinedisplayname":"test","ipaddressid":34000,"ipaddress":"1.1.1.116","startport":33,"endport":34,"state":"Active"} ] } }
9 changes: 9 additions & 0 deletions libcloud/test/compute/test_cloudstack.py
View file
Open in desktop
Expand Up @@ -581,10 +581,19 @@ def test_list_nodes(self):
self.assertEqual(2, len(nodes))
self.assertEqual('test', nodes[0].name)
self.assertEqual('2600', nodes[0].id)
self.assertEqual(0, len(nodes[0].private_ips))
self.assertEqual([], nodes[0].extra['security_group'])
self.assertEqual(None, nodes[0].extra['key_name'])
self.assertEqual(1, len(nodes[0].public_ips))
self.assertEqual('1.1.1.116', nodes[0].public_ips[0])
self.assertEqual(1, len(nodes[0].extra['ip_addresses']))
self.assertEqual(34000, nodes[0].extra['ip_addresses'][0].id)
self.assertEqual(1, len(nodes[0].extra['ip_forwarding_rules']))
self.assertEqual('772fd410-6649-43ed-befa-77be986b8906',
nodes[0].extra['ip_forwarding_rules'][0].id)
self.assertEqual(1, len(nodes[0].extra['port_forwarding_rules']))
self.assertEqual('bc7ea3ee-a2c3-4b86-a53f-01bdaa1b2e32',
nodes[0].extra['port_forwarding_rules'][0].id)

def test_ex_get_node(self):
node = self.driver.ex_get_node(2600)
Expand Down