You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by gi...@apache.org on 2014/05/06 12:01:02 UTC
[28/32] git commit: updated refs/heads/4.4-forward to 8546f76
1. list* calls are modified to take listall=True when
account and domainid is passed to conform to recent IAM
related changes in 4.4-forward
2. fixed typo passd to passwd in cloudstackTestClient.py
3. added few missing data required for tests in test_data.py
4. removed config.cfg
mend
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/948b81fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/948b81fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/948b81fb
Branch: refs/heads/4.4-forward
Commit: 948b81fb51206b516caf1ff92a1a3dddc9f67a9b
Parents: 9bba248
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Thu May 1 23:14:34 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Fri May 2 00:51:00 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackTestClient.py | 2 +-
tools/marvin/marvin/config/config.cfg | 457 -----------------------
tools/marvin/marvin/config/test_data.py | 108 +++++-
tools/marvin/marvin/lib/base.py | 132 +++++++
tools/marvin/marvin/lib/common.py | 66 ++++
5 files changed, 301 insertions(+), 464 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948b81fb/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 53d48ab..d3a6b94 100644
--- a/tools/marvin/marvin/cloudstackTestClient.py
+++ b/tools/marvin/marvin/cloudstackTestClient.py
@@ -190,7 +190,7 @@ class CSTestClient(object):
else self.__dbSvrDetails.port
user = "cloud" if self.__dbSvrDetails.user is None \
else self.__dbSvrDetails.user
- passwd = 'cloud' if self.__dbSvrDetails.passd is None \
+ passwd = 'cloud' if self.__dbSvrDetails.passwd is None \
else self.__dbSvrDetails.passd
db = 'cloud' if self.__dbSvrDetails.db is None \
else self.__dbSvrDetails.db
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948b81fb/tools/marvin/marvin/config/config.cfg
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/config.cfg b/tools/marvin/marvin/config/config.cfg
deleted file mode 100644
index a4bbe9d..0000000
--- a/tools/marvin/marvin/config/config.cfg
+++ /dev/null
@@ -1,457 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-# Use the common configs added such as account, network_offerings, domain, project,
-# or add your own data if required separately for any test case
-{
- "domain":
- {
- "name": "domain"
- }
- ,
- "project":
- {
- "name": "Project",
- "displaytext": "Test project"
- },
- "account": {
- "email": "test-account@test.com",
- "firstname": "test",
- "lastname": "test",
- "username": "test-account",
- "password": "password"
- },
- "user": {
- "email": "user@test.com",
- "firstname": "User",
- "lastname": "User",
- "username": "User",
- # Random characters are appended for unique
- # username
- "password": "fr3sca",
- },
- "service_offering": {
- "name": "Tiny Instance",
- "displaytext": "Tiny Instance",
- "cpunumber": 1,
- "cpuspeed": 100,
- "memory": 128
- },
- "isolated_network_offering": {
- "name": "Isolated Network offering",
- "displaytext": "Isolated Network offering",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional'",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "isolated_network": {
- "name": "Isolated Network",
- "displaytext": "Isolated Network"
- },
- "virtual_machine": {
- "displayname": "Test VM",
- "username": "root",
- "password": "password",
- "ssh_port": 22,
- "privateport": 22,
- "publicport": 22,
- "protocol": "TCP"
- },
- "template": {
- "displaytext": "Public Template",
- "name": "Public template",
- "ostype": 'CentOS 5.3 (64-bit)',
- "url": "",
- "hypervisor": '',
- "format": '',
- "isfeatured": True,
- "ispublic": True,
- "isextractable": True,
- "templatefilter": "self"
- },
- "shared_network": {
- "name": "Test Shared Network",
- "displaytext": "Test Shared Network",
- "vlan" : "",
- "gateway" :"",
- "netmask" :"",
- "startip" :"",
- "endip" :"",
- "acltype" : "Domain",
- "scope":"all"
- },
- "shared_network_offering_sg": {
- "name": "SharedNwOffering-sg",
- "displaytext": "SharedNwOffering-sg",
- "guestiptype": "Shared",
- "supportedservices": "Dhcp,Dns,UserData,SecurityGroup",
- "specifyVlan" : "False",
- "specifyIpRanges" : "False",
- "traffictype": "GUEST",
- "serviceProviderList" : {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "UserData": "VirtualRouter",
- "SecurityGroup": "SecurityGroupProvider"
- }
- },
- "shared_network_sg": {
- "name": "Shared-Network-SG-Test",
- "displaytext": "Shared-Network_SG-Test",
- "networkofferingid":"",
- "vlan" : "",
- "gateway" :"",
- "netmask" :"255.255.255.0",
- "startip" :"",
- "endip" :"",
- "acltype" : "Domain",
- "scope":"all"
- },
- "vpc_offering": {
- "name": "VPC off",
- "displaytext": "VPC off",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL"
- },
- "vpc": {
- "name": "TestVPC",
- "displaytext": "TestVPC",
- "cidr": "10.0.0.1/24"
- },
- "shared_network_offering": {
- "name": "SharedNwOffering",
- "displaytext": "SharedNwOffering",
- "guestiptype": "Shared",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "specifyVlan" : "False",
- "specifyIpRanges" : "False",
- "traffictype": "GUEST",
- "serviceProviderList" : {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "security_group" : { "name": "custom_Sec_Grp" },
- "natrule": {
- "publicport": 22,
- "privateport": 22,
- "protocol": 'TCP',
- },
- "ingress_rule": {
- "protocol": "TCP",
- "startport": "22",
- "endport": "22",
- "cidrlist": "0.0.0.0/0"
- },
- "ostype": "CentOS 5.3 (64-bit)",
- "sleep": 90,
- "timeout": 10,
- "netscaler_VPX": {
- "ipaddress": "10.223.240.174",
- "username": "nsroot",
- "password": "nsroot",
- "networkdevicetype": "NetscalerVPXLoadBalancer",
- "publicinterface": "1/1",
- "privateinterface": "1/2",
- "numretries": 2,
- "lbdevicededicated": "True",
- "lbdevicecapacity": 2,
- "port": 22
- },
- "nw_offering_shared_persistent": {
- "name": "Network offering for Shared Persistent Network",
- "displaytext": "Network offering-DA services",
- "guestiptype": "Shared",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "True",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "nw_off_isolated_persistent": {
- "name": "Network offering for Isolated Persistent Network",
- "displaytext": "Network Offering for Isolated Persistent Network",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype":"GUEST",
- "availability":"Optional",
- "ispersistent": "True",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "nw_off_isolated_persistent_netscaler": {
- "name": "Network offering for Isolated Persistent Network",
- "displaytext": "Network Offering for Isolated Persistent Network",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "True",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "Netscaler",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "nw_offering_isolated": {
- "name": "Network offering for Isolated Persistent Network",
- "displaytext": "Network offering-DA services",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "nw_off_isolated_netscaler": {
- "name": "Network offering for Isolated Persistent Network",
- "displaytext": "Network offering-DA services",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "serviceProviderList": {
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Vpn": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "Netscaler",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- }
- },
- "nw_off_isolated_RVR": {
- "name": "Network offering-RVR services",
- "displaytext": "Network off-RVR services",
- "guestiptype": "Isolated",
- "supportedservices": "Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "False",
- "serviceProviderList": {
- "Vpn": "VirtualRouter",
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- },
- "serviceCapabilityList": {
- "SourceNat": {
- "SupportedSourceNatTypes": "peraccount",
- "RedundantRouter": "true"
- },
- "lb": {
- "SupportedLbIsolation": "dedicated"
- }
- }
- },
- "nw_off_persistent_RVR": {
- "name": "Network offering-RVR services",
- "displaytext": "Network off-RVR services",
- "guestiptype": "Isolated",
- "supportedservices": "Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "True",
- "serviceProviderList": {
- "Vpn": "VirtualRouter",
- "Dhcp": "VirtualRouter",
- "Dns": "VirtualRouter",
- "SourceNat": "VirtualRouter",
- "PortForwarding": "VirtualRouter",
- "Firewall": "VirtualRouter",
- "Lb": "VirtualRouter",
- "UserData": "VirtualRouter",
- "StaticNat": "VirtualRouter"
- },
- "serviceCapabilityList": {
- "SourceNat": {
- "SupportedSourceNatTypes": "peraccount",
- "RedundantRouter": "true"
- },
- "lb": {
- "SupportedLbIsolation": "dedicated"
- }
- }
- },
- "nw_off_persistent_VPCVR_NoLB": {
- "name": "Persistent Network VPC No LB",
- "displaytext": "Persistent Network VPC No LB",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "False",
- "useVpc": "on",
- "serviceProviderList": {
- "Dhcp": "VpcVirtualRouter",
- "Dns": "VpcVirtualRouter",
- "SourceNat": "VpcVirtualRouter",
- "PortForwarding": "VpcVirtualRouter",
- "Vpn": "VpcVirtualRouter",
- "UserData": "VpcVirtualRouter",
- "StaticNat": "VpcVirtualRouter",
- "NetworkACL": "VpcVirtualRouter"
- }
- },
- "nw_off_persistent_VPCVR_LB": {
- "name": "Persistent Network VPC with LB",
- "displaytext": "Persistent Network VPC No LB",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "False",
- "useVpc": "on",
- "serviceProviderList": {
- "Dhcp": "VpcVirtualRouter",
- "Dns": "VpcVirtualRouter",
- "SourceNat": "VpcVirtualRouter",
- "PortForwarding": "VpcVirtualRouter",
- "Vpn": "VpcVirtualRouter",
- "Lb": "VpcVirtualRouter",
- "UserData": "VpcVirtualRouter",
- "StaticNat": "VpcVirtualRouter",
- "NetworkACL": "VpcVirtualRouter"
- }
- },
- "nw_offering_isolated_vpc": {
- "name": "Isolated Network for VPC",
- "displaytext": "Isolated Network for VPC",
- "guestiptype": "Isolated",
- "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
- "traffictype": "GUEST",
- "availability": "Optional",
- "ispersistent": "False",
- "useVpc": "on",
- "serviceProviderList": {
- "Dhcp": "VpcVirtualRouter",
- "Dns": "VpcVirtualRouter",
- "SourceNat": "VpcVirtualRouter",
- "PortForwarding": "VpcVirtualRouter",
- "Vpn": "VpcVirtualRouter",
- "UserData": "VpcVirtualRouter",
- "StaticNat": "VpcVirtualRouter",
- "NetworkACL": "VpcVirtualRouter"
- }
- },
- "natrule": {
- "privateport": 22,
- "publicport": 22,
- "startport": 22,
- "endport": 22,
- "protocol": "TCP",
- "cidrlist": "0.0.0.0/0"
- },
- "fwrule": {
- "startport": 22,
- "endport": 22,
- "cidr": "0.0.0.0/0",
- "protocol": "TCP"
- },
- "lbrule": {
- "name": "SSH",
- "alg": "leastconn",
- # Algorithm used for load balancing
- "privateport": 22,
- "publicport": 22,
- "openfirewall": "False",
- "startport": 22,
- "endport": 22,
- "protocol": "TCP",
- "cidrlist": "0.0.0.0/0"
- },
- "icmprule": {
- "icmptype": -1,
- "icmpcode": -1,
- "cidrlist": "0.0.0.0/0",
- "protocol": "ICMP"
- },
- "host_password": "password",
- "advanced_sg": {
- "zone": {
- "name": "",
- "dns1": "8.8.8.8",
- "internaldns1": "192.168.100.1",
- "networktype": "Advanced",
- "securitygroupenabled": "true"
- },
- "securitygroupenabled": "true"
- },
- "host_anti_affinity": {
- "name": "",
- "type": "host anti-affinity"
- }
-}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948b81fb/tools/marvin/marvin/config/test_data.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py
index 9a9e4ae..4e8cd50 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -27,7 +27,7 @@ test_data = {
"vdomain": {
"name": "domain"
},
- "domain": { "name": "domain" },
+ "domain": {"name": "domain"},
"email": "test@test.com",
"gateway": "172.1.1.1",
"netmask": "255.255.255.0",
@@ -263,7 +263,7 @@ test_data = {
"Dhcp": "VirtualRouter",
"Dns": "VirtualRouter",
"UserData": "VirtualRouter"
- }
+ }
},
"shared_network_offering_sg": {
"name": "MySharedOffering-sg",
@@ -360,6 +360,35 @@ test_data = {
"UserData": 'VirtualRouter',
},
},
+ "nw_off_isolated_RVR": {
+ "name": "Network offering-RVR services",
+ "displaytext": "Network off-RVR services",
+ "guestiptype": "Isolated",
+ "supportedservices": "Vpn,Dhcp,Dns,SourceNat,PortForwarding,Firewall,Lb,UserData,StaticNat",
+ "traffictype": "GUEST",
+ "availability": "Optional",
+ "ispersistent": "False",
+ "serviceProviderList": {
+ "Vpn": "VirtualRouter",
+ "Dhcp": "VirtualRouter",
+ "Dns": "VirtualRouter",
+ "SourceNat": "VirtualRouter",
+ "PortForwarding": "VirtualRouter",
+ "Firewall": "VirtualRouter",
+ "Lb": "VirtualRouter",
+ "UserData": "VirtualRouter",
+ "StaticNat": "VirtualRouter"
+ },
+ "serviceCapabilityList": {
+ "SourceNat": {
+ "SupportedSourceNatTypes": "peraccount",
+ "RedundantRouter": "true"
+ },
+ "lb": {
+ "SupportedLbIsolation": "dedicated"
+ }
+ }
+ },
"nw_off_persistent_RVR": {
"name": 'Network offering-RVR services',
"displaytext": 'Network off-RVR services',
@@ -390,6 +419,73 @@ test_data = {
},
},
},
+ "nw_offering_isolated_vpc": {
+ "name": "Isolated Network for VPC",
+ "displaytext": "Isolated Network for VPC",
+ "guestiptype": "Isolated",
+ "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
+ "traffictype": "GUEST",
+ "availability": "Optional",
+ "ispersistent": "False",
+ "useVpc": "on",
+ "serviceProviderList": {
+ "Dhcp": "VpcVirtualRouter",
+ "Dns": "VpcVirtualRouter",
+ "SourceNat": "VpcVirtualRouter",
+ "PortForwarding": "VpcVirtualRouter",
+ "Vpn": "VpcVirtualRouter",
+ "UserData": "VpcVirtualRouter",
+ "StaticNat": "VpcVirtualRouter",
+ "NetworkACL": "VpcVirtualRouter"
+ }
+ },
+ "nw_off_persistent_VPCVR_LB": {
+ "name": "Persistent Network VPC with LB",
+ "displaytext": "Persistent Network VPC No LB",
+ "guestiptype": "Isolated",
+ "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,Lb,UserData,StaticNat,NetworkACL",
+ "traffictype": "GUEST",
+ "availability": "Optional",
+ "ispersistent": "False",
+ "useVpc": "on",
+ "serviceProviderList": {
+ "Dhcp": "VpcVirtualRouter",
+ "Dns": "VpcVirtualRouter",
+ "SourceNat": "VpcVirtualRouter",
+ "PortForwarding": "VpcVirtualRouter",
+ "Vpn": "VpcVirtualRouter",
+ "Lb": "VpcVirtualRouter",
+ "UserData": "VpcVirtualRouter",
+ "StaticNat": "VpcVirtualRouter",
+ "NetworkACL": "VpcVirtualRouter"
+ }
+ },
+ "nw_off_persistent_VPCVR_NoLB": {
+ "name": "Persistent Network VPC No LB",
+ "displaytext": "Persistent Network VPC No LB",
+ "guestiptype": "Isolated",
+ "supportedservices": "Dhcp,Dns,SourceNat,PortForwarding,Vpn,UserData,StaticNat,NetworkACL",
+ "traffictype": "GUEST",
+ "availability": "Optional",
+ "ispersistent": "False",
+ "useVpc": "on",
+ "serviceProviderList": {
+ "Dhcp": "VpcVirtualRouter",
+ "Dns": "VpcVirtualRouter",
+ "SourceNat": "VpcVirtualRouter",
+ "PortForwarding": "VpcVirtualRouter",
+ "Vpn": "VpcVirtualRouter",
+ "UserData": "VpcVirtualRouter",
+ "StaticNat": "VpcVirtualRouter",
+ "NetworkACL": "VpcVirtualRouter"
+ }
+ },
+ "fwrule": {
+ "startport": 22,
+ "endport": 22,
+ "cidr": "0.0.0.0/0",
+ "protocol": "TCP"
+ },
"nw_off_isolated_persistent_netscaler": {
"name": 'Netscaler',
"displaytext": 'Netscaler',
@@ -476,7 +572,7 @@ test_data = {
"bootable": False,
"ispublic": False,
"ostype": "CentOS 5.6 (64-bit)",
- },
+ },
"iso1": {
"displaytext": "Test ISO 1",
"name": "ISO 1",
@@ -662,7 +758,7 @@ test_data = {
"disksize": 1
},
"host_anti_affinity": {
- "name": "hostantiaffinity",
- "type": "host anti-affinity",
- },
+ "name": "hostantiaffinity",
+ "type": "host anti-affinity",
+ },
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948b81fb/tools/marvin/marvin/lib/base.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 1d485c9..95a3aa5 100644
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -81,6 +81,8 @@ class Domain:
"""Lists domains"""
cmd = listDomains.listDomainsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listDomains(cmd))
@@ -135,6 +137,8 @@ class Account:
cmd = listAccounts.listAccountsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listAccounts(cmd))
def disable(self, apiclient, lock=False):
@@ -185,6 +189,8 @@ class User:
cmd = listUsers.listUsersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listUsers(cmd))
@classmethod
@@ -644,6 +650,8 @@ class VirtualMachine:
cmd = listVirtualMachines.listVirtualMachinesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVirtualMachines(cmd))
def resetPassword(self, apiclient):
@@ -799,6 +807,8 @@ class Volume:
cmd = listVolumes.listVolumesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVolumes(cmd))
def resize(self, apiclient, **kwargs):
@@ -914,6 +924,8 @@ class Snapshot:
cmd = listSnapshots.listSnapshotsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSnapshots(cmd))
@@ -1149,6 +1161,8 @@ class Template:
cmd = listTemplates.listTemplatesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listTemplates(cmd))
@@ -1279,6 +1293,8 @@ class Iso:
cmd = listIsos.listIsosCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listIsos(cmd))
@@ -1337,6 +1353,8 @@ class PublicIPAddress:
cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPublicIpAddresses(cmd))
@@ -1398,6 +1416,8 @@ class NATRule:
cmd = listPortForwardingRules.listPortForwardingRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPortForwardingRules(cmd))
@@ -1448,6 +1468,8 @@ class StaticNATRule:
cmd = listIpForwardingRules.listIpForwardingRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listIpForwardingRules(cmd))
@classmethod
@@ -1513,6 +1535,8 @@ class EgressFireWallRule:
cmd = listEgressFirewallRules.listEgressFirewallRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listEgressFirewallRules(cmd))
@@ -1558,6 +1582,8 @@ class FireWallRule:
cmd = listFirewallRules.listFirewallRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listFirewallRules(cmd))
@@ -1625,6 +1651,8 @@ class ServiceOffering:
cmd = listServiceOfferings.listServiceOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listServiceOfferings(cmd))
@@ -1667,6 +1695,8 @@ class DiskOffering:
cmd = listDiskOfferings.listDiskOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listDiskOfferings(cmd))
@@ -1745,6 +1775,8 @@ class NetworkOffering:
cmd = listNetworkOfferings.listNetworkOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkOfferings(cmd))
@@ -1779,6 +1811,8 @@ class SnapshotPolicy:
cmd = listSnapshotPolicies.listSnapshotPoliciesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSnapshotPolicies(cmd))
@@ -1795,6 +1829,8 @@ class Hypervisor:
cmd = listHypervisors.listHypervisorsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listHypervisors(cmd))
@@ -1910,6 +1946,8 @@ class LoadBalancerRule:
cmd = listLBStickinessPolicies.listLBStickinessPoliciesCmd()
cmd.lbruleid = lbruleid
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listLBStickinessPolicies(cmd)
@classmethod
@@ -1918,6 +1956,8 @@ class LoadBalancerRule:
cmd = listLoadBalancerRules.listLoadBalancerRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listLoadBalancerRules(cmd))
@@ -1970,6 +2010,8 @@ class Cluster:
cmd = listClusters.listClustersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listClusters(cmd))
@@ -2087,6 +2129,8 @@ class Host:
cmd = listHosts.listHostsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listHosts(cmd))
@classmethod
@@ -2095,6 +2139,8 @@ class Host:
cmd = findHostsForMigration.findHostsForMigrationCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.findHostsForMigration(cmd))
@classmethod
@@ -2165,6 +2211,8 @@ class StoragePool:
cmd = listStoragePools.listStoragePoolsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listStoragePools(cmd))
@classmethod
@@ -2173,6 +2221,8 @@ class StoragePool:
cmd = findStoragePoolsForMigration.findStoragePoolsForMigrationCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.findStoragePoolsForMigration(cmd))
@@ -2265,6 +2315,8 @@ class Network:
cmd = listNetworks.listNetworksCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworks(cmd))
@@ -2341,6 +2393,8 @@ class NetworkACL:
cmd = listNetworkACLs.listNetworkACLsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkACLs(cmd))
@@ -2387,6 +2441,8 @@ class NetworkACLList:
cmd = listNetworkACLLists.listNetworkACLListsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkACLLists(cmd))
@@ -2428,6 +2484,8 @@ class Vpn:
cmd = listRemoteAccessVpns.listRemoteAccessVpnsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listRemoteAccessVpns(cmd))
@@ -2473,6 +2531,8 @@ class VpnUser:
cmd = listVpnUsers.listVpnUsersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVpnUsers(cmd))
@@ -2524,6 +2584,8 @@ class Zone:
cmd = listZones.listZonesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listZones(cmd))
@@ -2560,6 +2622,8 @@ class Pod:
cmd = listPods.listPodsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listPods(cmd)
@@ -2600,6 +2664,8 @@ class PublicIpRange:
cmd = listVlanIpRanges.listVlanIpRangesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVlanIpRanges(cmd))
@classmethod
@@ -2659,6 +2725,8 @@ class PortablePublicIpRange:
cmd = listPortableIpRanges.listPortableIpRangesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPortableIpRanges(cmd))
@@ -2696,6 +2764,8 @@ class SecondaryStagingStore:
def list(cls, apiclient, **kwargs):
cmd = listSecondaryStagingStores.listSecondaryStagingStoresCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSecondaryStagingStores(cmd))
@@ -2732,6 +2802,8 @@ class ImageStore:
def list(cls, apiclient, **kwargs):
cmd = listImageStores.listImageStoresCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listImageStores(cmd))
@@ -2803,6 +2875,8 @@ class PhysicalNetwork:
cmd = listDedicatedGuestVlanRanges.listDedicatedGuestVlanRangesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listDedicatedGuestVlanRanges(cmd)
@classmethod
@@ -2811,6 +2885,8 @@ class PhysicalNetwork:
cmd = listPhysicalNetworks.listPhysicalNetworksCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return map(lambda pn: PhysicalNetwork(
pn.__dict__), apiclient.listPhysicalNetworks(cmd))
@@ -2927,6 +3003,8 @@ class SecurityGroup:
cmd = listSecurityGroups.listSecurityGroupsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSecurityGroups(cmd))
@@ -2999,6 +3077,8 @@ class VpnCustomerGateway:
cmd = listVpnCustomerGateways.listVpnCustomerGatewaysCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVpnCustomerGateways(cmd))
@@ -3077,6 +3157,8 @@ class Project:
cmd = listProjectAccounts.listProjectAccountsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listProjectAccounts(cmd))
@classmethod
@@ -3085,6 +3167,8 @@ class Project:
cmd = listProjects.listProjectsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listProjects(cmd))
@@ -3122,6 +3206,8 @@ class ProjectInvitation:
cmd = listProjectInvitations.listProjectInvitationsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listProjectInvitations(cmd))
@@ -3144,6 +3230,8 @@ class Configurations:
cmd = listConfigurations.listConfigurationsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listConfigurations(cmd))
@@ -3213,6 +3301,8 @@ class NetScaler:
cmd = listNetscalerLoadBalancers.listNetscalerLoadBalancersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetscalerLoadBalancers(cmd))
@@ -3264,6 +3354,8 @@ class NetworkServiceProvider:
cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkServiceProviders(cmd))
@@ -3318,6 +3410,8 @@ class Router:
cmd = listRouters.listRoutersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listRouters(cmd))
@@ -3363,6 +3457,8 @@ class Tag:
cmd = listTags.listTagsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listTags(cmd))
@@ -3418,6 +3514,8 @@ class VpcOffering:
cmd = listVPCOfferings.listVPCOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVPCOfferings(cmd))
def delete(self, apiclient):
@@ -3488,6 +3586,8 @@ class VPC:
cmd = listVPCs.listVPCsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVPCs(cmd))
@@ -3527,6 +3627,8 @@ class PrivateGateway:
cmd = listPrivateGateways.listPrivateGatewaysCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPrivateGateways(cmd))
@@ -3559,6 +3661,8 @@ class AffinityGroup:
def list(cls, apiclient, **kwargs):
cmd = listAffinityGroups.listAffinityGroupsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listAffinityGroups(cmd)
@@ -3591,6 +3695,8 @@ class StaticRoute:
cmd = listStaticRoutes.listStaticRoutesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listStaticRoutes(cmd))
@@ -3625,6 +3731,8 @@ class VNMC:
cmd = listCiscoVnmcResources.listCiscoVnmcResourcesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listCiscoVnmcResources(cmd))
@@ -3668,6 +3776,8 @@ class SSHKeyPair:
"""List all SSH key pairs"""
cmd = listSSHKeyPairs.listSSHKeyPairsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSSHKeyPairs(cmd))
@@ -3681,6 +3791,8 @@ class Capacities:
cmd = listCapacity.listCapacityCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listCapacity(cmd))
@@ -3694,6 +3806,8 @@ class Alert:
cmd = listAlerts.listAlertsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listAlerts(cmd))
@@ -3739,6 +3853,8 @@ class InstanceGroup:
"""List all instance groups"""
cmd = listInstanceGroups.listInstanceGroupsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return (apiclient.listInstanceGroups(cmd))
def startInstances(self, apiclient):
@@ -3812,6 +3928,8 @@ class ASA1000V:
cmd = listCiscoAsa1000vResources.listCiscoAsa1000vResourcesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listCiscoAsa1000vResources(cmd))
@@ -3840,6 +3958,8 @@ class VmSnapshot:
def list(cls, apiclient, **kwargs):
cmd = listVMSnapshot.listVMSnapshotCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVMSnapshot(cmd))
@classmethod
@@ -3881,6 +4001,8 @@ class Region:
def list(cls, apiclient, **kwargs):
cmd = listRegions.listRegionsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
region = apiclient.listRegions(cmd)
return region
@@ -3980,6 +4102,8 @@ class ApplicationLoadBalancer:
"""List all appln load balancers"""
cmd = listLoadBalancers.listLoadBalancersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listLoadBalancerRules(cmd))
@@ -3996,6 +4120,8 @@ class Resources:
cmd = listResourceLimits.listResourceLimitsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listResourceLimits(cmd))
@classmethod
@@ -4044,6 +4170,8 @@ class NIC:
cmd = listNics.listNicsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNics(cmd))
@@ -4075,6 +4203,8 @@ class IAMGroup:
def list(cls, apiclient, **kwargs):
cmd = listIAMGroups.listIAMGroupsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listIAMGroupsCmd(cmd)
def addAccount(self, apiclient, accts):
@@ -4138,6 +4268,8 @@ class IAMPolicy:
def list(cls, apiclient, **kwargs):
cmd = listIAMPolicies.listIAMPoliciesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return apiclient.listIAMPoliciesCmd(cmd)
def addPermission(self, apiclient, permission):
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/948b81fb/tools/marvin/marvin/lib/common.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/lib/common.py b/tools/marvin/marvin/lib/common.py
index 0a82f93..ad79588 100644
--- a/tools/marvin/marvin/lib/common.py
+++ b/tools/marvin/marvin/lib/common.py
@@ -475,6 +475,8 @@ def list_os_types(apiclient, **kwargs):
cmd = listOsTypes.listOsTypesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listOsTypes(cmd))
@@ -483,6 +485,8 @@ def list_routers(apiclient, **kwargs):
cmd = listRouters.listRoutersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listRouters(cmd))
@@ -491,6 +495,8 @@ def list_zones(apiclient, **kwargs):
cmd = listZones.listZonesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listZones(cmd))
@@ -499,6 +505,8 @@ def list_networks(apiclient, **kwargs):
cmd = listNetworks.listNetworksCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworks(cmd))
@@ -507,6 +515,8 @@ def list_clusters(apiclient, **kwargs):
cmd = listClusters.listClustersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listClusters(cmd))
@@ -515,6 +525,8 @@ def list_ssvms(apiclient, **kwargs):
cmd = listSystemVms.listSystemVmsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSystemVms(cmd))
@@ -523,6 +535,8 @@ def list_storage_pools(apiclient, **kwargs):
cmd = listStoragePools.listStoragePoolsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listStoragePools(cmd))
@@ -531,6 +545,8 @@ def list_virtual_machines(apiclient, **kwargs):
cmd = listVirtualMachines.listVirtualMachinesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVirtualMachines(cmd))
@@ -539,6 +555,8 @@ def list_hosts(apiclient, **kwargs):
cmd = listHosts.listHostsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listHosts(cmd))
@@ -547,6 +565,8 @@ def list_configurations(apiclient, **kwargs):
cmd = listConfigurations.listConfigurationsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listConfigurations(cmd))
@@ -555,6 +575,8 @@ def list_publicIP(apiclient, **kwargs):
cmd = listPublicIpAddresses.listPublicIpAddressesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPublicIpAddresses(cmd))
@@ -563,6 +585,8 @@ def list_nat_rules(apiclient, **kwargs):
cmd = listPortForwardingRules.listPortForwardingRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listPortForwardingRules(cmd))
@@ -571,6 +595,8 @@ def list_lb_rules(apiclient, **kwargs):
cmd = listLoadBalancerRules.listLoadBalancerRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listLoadBalancerRules(cmd))
@@ -579,6 +605,8 @@ def list_lb_instances(apiclient, **kwargs):
cmd = listLoadBalancerRuleInstances.listLoadBalancerRuleInstancesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listLoadBalancerRuleInstances(cmd))
@@ -587,6 +615,8 @@ def list_firewall_rules(apiclient, **kwargs):
cmd = listFirewallRules.listFirewallRulesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listFirewallRules(cmd))
@@ -595,6 +625,8 @@ def list_volumes(apiclient, **kwargs):
cmd = listVolumes.listVolumesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVolumes(cmd))
@@ -603,6 +635,8 @@ def list_isos(apiclient, **kwargs):
cmd = listIsos.listIsosCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listIsos(cmd))
@@ -611,6 +645,8 @@ def list_snapshots(apiclient, **kwargs):
cmd = listSnapshots.listSnapshotsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSnapshots(cmd))
@@ -619,6 +655,8 @@ def list_templates(apiclient, **kwargs):
cmd = listTemplates.listTemplatesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listTemplates(cmd))
@@ -627,6 +665,8 @@ def list_domains(apiclient, **kwargs):
cmd = listDomains.listDomainsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listDomains(cmd))
@@ -636,6 +676,8 @@ def list_accounts(apiclient, **kwargs):
cmd = listAccounts.listAccountsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listAccounts(cmd))
@@ -645,6 +687,8 @@ def list_users(apiclient, **kwargs):
cmd = listUsers.listUsersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listUsers(cmd))
@@ -653,6 +697,8 @@ def list_snapshot_policy(apiclient, **kwargs):
cmd = listSnapshotPolicies.listSnapshotPoliciesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listSnapshotPolicies(cmd))
@@ -661,6 +707,8 @@ def list_events(apiclient, **kwargs):
cmd = listEvents.listEventsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listEvents(cmd))
@@ -669,6 +717,8 @@ def list_disk_offering(apiclient, **kwargs):
cmd = listDiskOfferings.listDiskOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listDiskOfferings(cmd))
@@ -677,6 +727,8 @@ def list_service_offering(apiclient, **kwargs):
cmd = listServiceOfferings.listServiceOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listServiceOfferings(cmd))
@@ -685,6 +737,8 @@ def list_vlan_ipranges(apiclient, **kwargs):
cmd = listVlanIpRanges.listVlanIpRangesCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVlanIpRanges(cmd))
@@ -693,6 +747,8 @@ def list_usage_records(apiclient, **kwargs):
cmd = listUsageRecords.listUsageRecordsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listUsageRecords(cmd))
@@ -701,6 +757,8 @@ def list_nw_service_prividers(apiclient, **kwargs):
cmd = listNetworkServiceProviders.listNetworkServiceProvidersCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkServiceProviders(cmd))
@@ -709,6 +767,8 @@ def list_virtual_router_elements(apiclient, **kwargs):
cmd = listVirtualRouterElements.listVirtualRouterElementsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVirtualRouterElements(cmd))
@@ -717,6 +777,8 @@ def list_network_offerings(apiclient, **kwargs):
cmd = listNetworkOfferings.listNetworkOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listNetworkOfferings(cmd))
@@ -725,6 +787,8 @@ def list_resource_limits(apiclient, **kwargs):
cmd = listResourceLimits.listResourceLimitsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listResourceLimits(cmd))
@@ -733,6 +797,8 @@ def list_vpc_offerings(apiclient, **kwargs):
cmd = listVPCOfferings.listVPCOfferingsCmd()
[setattr(cmd, k, v) for k, v in kwargs.items()]
+ if 'account' in kwargs.keys() and 'domainid' in kwargs.keys():
+ cmd.listall=True
return(apiclient.listVPCOfferings(cmd))