Fix any issues tests didn't pick up on
Project: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/commit/1fc107a5 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/tree/1fc107a5 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/diff/1fc107a5 Branch: refs/heads/master Commit: 1fc107a54f8cf1402815b5283001bfcc1ac07ff5 Parents: f6f5e4e Author: BroganD1993 <darrenbro...@hotmail.com> Authored: Fri Jun 20 19:13:22 2014 +0100 Committer: BroganD1993 <darrenbro...@hotmail.com> Committed: Fri Jun 20 19:13:22 2014 +0100 ---------------------------------------------------------------------- gstack/controllers/networks.py | 4 ++-- gstack/controllers/regions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/blob/1fc107a5/gstack/controllers/networks.py ---------------------------------------------------------------------- diff --git a/gstack/controllers/networks.py b/gstack/controllers/networks.py index b8a0726..d2b5fd4 100644 --- a/gstack/controllers/networks.py +++ b/gstack/controllers/networks.py @@ -28,7 +28,7 @@ from gstack.controllers import errors def get_network_by_name(authorization, network): - args = {'command': 'SecurityGroups'} + args = {'command': 'listSecurityGroups'} return controllers.get_item_with_name(authorization, network, args, 'securitygroup') @@ -48,7 +48,7 @@ def _add_network(authorization, args=None): def _delete_network(authorization, projectid, network): - args = {'command': 'SecurityGroups'} + args = {'command': 'listSecurityGroups'} network_response = controllers.get_item_with_name(authorization, network, args, 'securitygroup') if not network_response: return None http://git-wip-us.apache.org/repos/asf/cloudstack-gcestack/blob/1fc107a5/gstack/controllers/regions.py ---------------------------------------------------------------------- diff --git a/gstack/controllers/regions.py b/gstack/controllers/regions.py index 136e5e0..2ceda7f 100755 --- a/gstack/controllers/regions.py +++ b/gstack/controllers/regions.py @@ -41,7 +41,7 @@ def listregions(projectid, authorization): args = {'command': 'listAccounts'} kwargs = {} items = controllers.describe_items( - authorization, args, 'region', + authorization, args, 'account', _cloudstack_account_to_gce, **kwargs) populated_response = { @@ -59,5 +59,5 @@ def getregion(projectid, authorization, region): func_route = url_for('getregion', projectid=projectid, region=region) args = {'command': 'listAccounts'} return controllers.get_item_with_name_or_error( - authorization, region, args, 'region', func_route, + authorization, region, args, 'account', func_route, _cloudstack_account_to_gce, **{})
