You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2016/04/15 19:24:40 UTC
[1/2] libcloud git commit: Add a test case for CloudStack list_nodes
with location filter
Repository: libcloud
Updated Branches:
refs/heads/trunk 921f24094 -> 57984aa5d
Add a test case for CloudStack list_nodes with location filter
Closes #754
Signed-off-by: Tomaz Muraus <to...@tomaz.me>
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/19925d8f
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/19925d8f
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/19925d8f
Branch: refs/heads/trunk
Commit: 19925d8ffd8d011bdba60ac62ceb8fa73feedb27
Parents: eaba891
Author: lionel <li...@sixsq.com>
Authored: Thu Apr 14 00:44:22 2016 +0200
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Fri Apr 15 16:24:39 2016 +0200
----------------------------------------------------------------------
libcloud/test/compute/test_cloudstack.py | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/19925d8f/libcloud/test/compute/test_cloudstack.py
----------------------------------------------------------------------
diff --git a/libcloud/test/compute/test_cloudstack.py b/libcloud/test/compute/test_cloudstack.py
index 9f6b939..1dfc2af 100644
--- a/libcloud/test/compute/test_cloudstack.py
+++ b/libcloud/test/compute/test_cloudstack.py
@@ -25,6 +25,7 @@ try:
except ImportError:
import json
+from libcloud.compute.base import NodeLocation
from libcloud.common.types import ProviderError
from libcloud.compute.drivers.cloudstack import CloudStackNodeDriver, \
CloudStackAffinityGroupType
@@ -595,6 +596,21 @@ class CloudStackCommonTestCase(TestCaseMixin):
self.assertEqual('bc7ea3ee-a2c3-4b86-a53f-01bdaa1b2e32',
nodes[0].extra['port_forwarding_rules'][0].id)
+ def test_list_nodes_location_filter(self):
+ def list_nodes_mock(self, **kwargs):
+ self.assertTrue('zoneid' in kwargs)
+ self.assertEqual('1', kwargs.get('zoneid'))
+
+ body, obj = self._load_fixture('listVirtualMachines_default.json')
+ return (httplib.OK, body, obj, httplib.responses[httplib.OK])
+
+ CloudStackMockHttp._cmd_listVirtualMachines = list_nodes_mock
+ try:
+ location = NodeLocation(1, 'Sydney', 'Unknown', self.driver)
+ self.driver.list_nodes(location=location)
+ finally:
+ del CloudStackMockHttp._cmd_listVirtualMachines
+
def test_ex_get_node(self):
node = self.driver.ex_get_node(2600)
self.assertEqual('test', node.name)
[2/2] libcloud git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Posted by to...@apache.org.
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/57984aa5
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/57984aa5
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/57984aa5
Branch: refs/heads/trunk
Commit: 57984aa5d91d3ea701aa6ab7ec1b0230d791961d
Parents: 19925d8 921f240
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Fri Apr 15 19:23:44 2016 +0200
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Fri Apr 15 19:23:44 2016 +0200
----------------------------------------------------------------------
libcloud/common/dimensiondata.py | 2 +-
libcloud/compute/drivers/dimensiondata.py | 17 ++
libcloud/loadbalancer/drivers/dimensiondata.py | 2 +-
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 49 ---
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 --
...ad52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml | 27 --
.../fixtures/dimensiondata/server_server.xml | 49 +++
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 ++
...ad52_692f_4314_8725_c8a4f4d13a87_DEFAULT.xml | 27 ++
libcloud/test/backup/test_dimensiondata.py | 24 +-
...8a_9cbc_8dabe5a7d0e4_image_customerImage.xml | 50 ----
...age_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml | 17 --
...age_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml | 17 --
...e5a7d0e4_image_customerImage_BAD_REQUEST.xml | 6 -
...745_4d8a_9cbc_8dabe5a7d0e4_image_osImage.xml | 34 ---
...age_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml | 11 -
...c_8dabe5a7d0e4_image_osImage_BAD_REQUEST.xml | 6 -
...age_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml | 12 -
...c_8dabe5a7d0e4_infrastructure_datacenter.xml | 188 ------------
...abe5a7d0e4_infrastructure_datacenter_NA9.xml | 54 ----
...bc_8dabe5a7d0e4_network_addPublicIpBlock.xml | 7 -
..._8dabe5a7d0e4_network_createFirewallRule.xml | 8 -
..._9cbc_8dabe5a7d0e4_network_createNatRule.xml | 9 -
..._8dabe5a7d0e4_network_deleteFirewallRule.xml | 8 -
..._9cbc_8dabe5a7d0e4_network_deleteNatRule.xml | 8 -
...8dabe5a7d0e4_network_deleteNetworkDomain.xml | 8 -
...d8a_9cbc_8dabe5a7d0e4_network_deleteVlan.xml | 8 -
...8dabe5a7d0e4_network_deployNetworkDomain.xml | 8 -
...d8a_9cbc_8dabe5a7d0e4_network_deployVlan.xml | 9 -
...bc_8dabe5a7d0e4_network_editFirewallRule.xml | 8 -
...c_8dabe5a7d0e4_network_editNetworkDomain.xml | 7 -
..._4d8a_9cbc_8dabe5a7d0e4_network_editVlan.xml | 7 -
...d8a_9cbc_8dabe5a7d0e4_network_expandVlan.xml | 8 -
...a_9cbc_8dabe5a7d0e4_network_firewallRule.xml | 273 -----------------
...ule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml | 18 --
...5_4d8a_9cbc_8dabe5a7d0e4_network_natRule.xml | 21 --
...ule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml | 9 -
..._9cbc_8dabe5a7d0e4_network_networkDomain.xml | 43 ---
...ain_8cdfd607_f429_4df6_9352_162cfc0891be.xml | 9 -
..._9cbc_8dabe5a7d0e4_network_publicIpBlock.xml | 10 -
...ock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml | 8 -
...ock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml | 8 -
...8dabe5a7d0e4_network_removePublicIpBlock.xml | 8 -
...2745_4d8a_9cbc_8dabe5a7d0e4_network_vlan.xml | 25 --
...lan_0e56433f_d808_4669_821d_812769517ff8.xml | 14 -
...9cbc_8dabe5a7d0e4_report_usageMonitoring.xml | 8 -
...745_4d8a_9cbc_8dabe5a7d0e4_server_addNic.xml | 9 -
...dabe5a7d0e4_server_antiAffinityRule_list.xml | 42 ---
...4_server_antiAffinityRule_list_PAGINATED.xml | 42 ---
...a7d0e4_server_changeServerMonitoringPlan.xml | 8 -
...8a_9cbc_8dabe5a7d0e4_server_deleteServer.xml | 9 -
...5a7d0e4_server_deleteServer_RESOURCEBUSY.xml | 8 -
...8a_9cbc_8dabe5a7d0e4_server_deployServer.xml | 8 -
...be5a7d0e4_server_disableServerMonitoring.xml | 8 -
...abe5a7d0e4_server_enableServerMonitoring.xml | 8 -
..._9cbc_8dabe5a7d0e4_server_powerOffServer.xml | 8 -
...5a7d0e4_server_powerOffServer_INPROGRESS.xml | 8 -
...8a_9cbc_8dabe5a7d0e4_server_rebootServer.xml | 8 -
...5a7d0e4_server_rebootServer_RESOURCEBUSY.xml | 7 -
...bc_8dabe5a7d0e4_server_reconfigureServer.xml | 5 -
..._4d8a_9cbc_8dabe5a7d0e4_server_removeNic.xml | 9 -
...d8a_9cbc_8dabe5a7d0e4_server_resetServer.xml | 8 -
...745_4d8a_9cbc_8dabe5a7d0e4_server_server.xml | 176 -----------
...4d8a_9cbc_8dabe5a7d0e4_server_server_NA3.xml | 50 ----
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 --
...cbc_8dabe5a7d0e4_server_server_paginated.xml | 50 ----
..._9cbc_8dabe5a7d0e4_server_shutdownServer.xml | 8 -
...5a7d0e4_server_shutdownServer_INPROGRESS.xml | 8 -
...d8a_9cbc_8dabe5a7d0e4_server_startServer.xml | 8 -
...abe5a7d0e4_server_startServer_INPROGRESS.xml | 8 -
...bc_8dabe5a7d0e4_server_updateVmwareTools.xml | 8 -
.../dimensiondata/image_customerImage.xml | 50 ++++
...age_2ffa36c8_1848_49eb_b4fa_9d908775f68c.xml | 17 ++
...age_5234e5c7_01de_4411_8b6e_baeb8d91cf5d.xml | 17 ++
.../image_customerImage_BAD_REQUEST.xml | 6 +
.../fixtures/dimensiondata/image_osImage.xml | 34 +++
...age_6b4fb0c7_a57b_4f58_b59c_9958f94f971a.xml | 11 +
.../dimensiondata/image_osImage_BAD_REQUEST.xml | 6 +
...age_c14b1a46_2428_44c1_9c1a_b20e6418d08c.xml | 12 +
.../dimensiondata/infrastructure_datacenter.xml | 188 ++++++++++++
.../infrastructure_datacenter_NA9.xml | 54 ++++
.../dimensiondata/network_addPublicIpBlock.xml | 7 +
.../network_createFirewallRule.xml | 8 +
.../dimensiondata/network_createNatRule.xml | 9 +
.../network_deleteFirewallRule.xml | 8 +
.../dimensiondata/network_deleteNatRule.xml | 8 +
.../network_deleteNetworkDomain.xml | 8 +
.../dimensiondata/network_deleteVlan.xml | 8 +
.../network_deployNetworkDomain.xml | 8 +
.../dimensiondata/network_deployVlan.xml | 9 +
.../dimensiondata/network_editFirewallRule.xml | 8 +
.../dimensiondata/network_editNetworkDomain.xml | 7 +
.../fixtures/dimensiondata/network_editVlan.xml | 7 +
.../dimensiondata/network_expandVlan.xml | 8 +
.../dimensiondata/network_firewallRule.xml | 273 +++++++++++++++++
...ule_d0a20f59_77b9_4f28_a63b_e58496b73a6c.xml | 18 ++
.../fixtures/dimensiondata/network_natRule.xml | 21 ++
...ule_2187a636_7ebb_49a1_a2ff_5d617f496dce.xml | 9 +
.../dimensiondata/network_networkDomain.xml | 43 +++
...ain_8cdfd607_f429_4df6_9352_162cfc0891be.xml | 9 +
.../dimensiondata/network_publicIpBlock.xml | 10 +
...ock_4487241a_f0ca_11e3_9315_d4bed9b167ba.xml | 8 +
...ock_9945dc4a_bdce_11e4_8c14_b8ca3a5d9ef8.xml | 8 +
.../network_removePublicIpBlock.xml | 8 +
.../fixtures/dimensiondata/network_vlan.xml | 25 ++
...lan_0e56433f_d808_4669_821d_812769517ff8.xml | 14 +
.../dimensiondata/report_usageMonitoring.xml | 8 +
.../fixtures/dimensiondata/server_addNic.xml | 9 +
.../server_antiAffinityRule_list.xml | 42 +++
.../server_antiAffinityRule_list_PAGINATED.xml | 42 +++
.../server_changeServerMonitoringPlan.xml | 8 +
.../dimensiondata/server_cleanServer.xml | 9 +
.../dimensiondata/server_deleteServer.xml | 9 +
.../server_deleteServer_RESOURCEBUSY.xml | 8 +
.../dimensiondata/server_deployServer.xml | 8 +
.../server_disableServerMonitoring.xml | 8 +
.../server_enableServerMonitoring.xml | 8 +
.../dimensiondata/server_powerOffServer.xml | 8 +
.../server_powerOffServer_INPROGRESS.xml | 8 +
.../dimensiondata/server_rebootServer.xml | 8 +
.../server_rebootServer_RESOURCEBUSY.xml | 7 +
.../dimensiondata/server_reconfigureServer.xml | 5 +
.../fixtures/dimensiondata/server_removeNic.xml | 9 +
.../dimensiondata/server_resetServer.xml | 8 +
.../fixtures/dimensiondata/server_server.xml | 176 +++++++++++
.../dimensiondata/server_server_NA3.xml | 50 ++++
...ver_e75ead52_692f_4314_8725_c8a4f4d13a87.xml | 27 ++
.../dimensiondata/server_server_paginated.xml | 50 ++++
.../dimensiondata/server_shutdownServer.xml | 8 +
.../server_shutdownServer_INPROGRESS.xml | 8 +
.../dimensiondata/server_startServer.xml | 8 +
.../server_startServer_INPROGRESS.xml | 8 +
.../dimensiondata/server_updateVmwareTools.xml | 8 +
libcloud/test/compute/test_dimensiondata.py | 300 ++++++++++---------
...be5a7d0e4_networkDomainVip_addPoolMember.xml | 9 -
...8dabe5a7d0e4_networkDomainVip_createNode.xml | 8 -
...8dabe5a7d0e4_networkDomainVip_createPool.xml | 9 -
...4_networkDomainVip_createVirtualListener.xml | 11 -
...e4_networkDomainVip_defaultHealthMonitor.xml | 35 ---
...abe5a7d0e4_networkDomainVip_defaultIrule.xml | 47 ---
...tworkDomainVip_defaultPersistenceProfile.xml | 47 ---
...8dabe5a7d0e4_networkDomainVip_deleteNode.xml | 9 -
...8dabe5a7d0e4_networkDomainVip_deletePool.xml | 9 -
...4_networkDomainVip_deleteVirtualListener.xml | 9 -
...c_8dabe5a7d0e4_networkDomainVip_editNode.xml | 8 -
...c_8dabe5a7d0e4_networkDomainVip_editPool.xml | 9 -
...e5a7d0e4_networkDomainVip_editPoolMember.xml | 8 -
..._9cbc_8dabe5a7d0e4_networkDomainVip_node.xml | 29 --
...ode_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml | 13 -
..._9cbc_8dabe5a7d0e4_networkDomainVip_pool.xml | 37 ---
...8dabe5a7d0e4_networkDomainVip_poolMember.xml | 29 --
...ber_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml | 13 -
...ool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml | 17 --
...a7d0e4_networkDomainVip_removePoolMember.xml | 7 -
...5a7d0e4_networkDomainVip_virtualListener.xml | 51 ----
...ner_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml | 44 ---
.../networkDomainVip_addPoolMember.xml | 9 +
.../networkDomainVip_createNode.xml | 8 +
.../networkDomainVip_createPool.xml | 9 +
.../networkDomainVip_createVirtualListener.xml | 11 +
.../networkDomainVip_defaultHealthMonitor.xml | 35 +++
.../networkDomainVip_defaultIrule.xml | 47 +++
...tworkDomainVip_defaultPersistenceProfile.xml | 47 +++
.../networkDomainVip_deleteNode.xml | 9 +
.../networkDomainVip_deletePool.xml | 9 +
.../networkDomainVip_deleteVirtualListener.xml | 9 +
.../dimensiondata/networkDomainVip_editNode.xml | 8 +
.../dimensiondata/networkDomainVip_editPool.xml | 9 +
.../networkDomainVip_editPoolMember.xml | 8 +
.../dimensiondata/networkDomainVip_node.xml | 29 ++
...ode_34de6ed6_46a4_4dae_a753_2f8d3840c6f9.xml | 13 +
.../dimensiondata/networkDomainVip_pool.xml | 37 +++
.../networkDomainVip_poolMember.xml | 29 ++
...ber_3dd806a2_c2c8_4c0c_9a4f_5219ea9266c0.xml | 13 +
...ool_4d360b1f_bc2c_4ab7_9884_1f03ba2768f7.xml | 17 ++
.../networkDomainVip_removePoolMember.xml | 7 +
.../networkDomainVip_virtualListener.xml | 51 ++++
...ner_6115469d_a8bb_445b_bb23_d23b5283f2b9.xml | 44 +++
.../test/loadbalancer/test_dimensiondata.py | 88 +++---
179 files changed, 2293 insertions(+), 2251 deletions(-)
----------------------------------------------------------------------