mirror of https://github.com/apache/cloudstack.git
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 Conflicts: tools/marvin/marvin/config/test_data.py tools/marvin/marvin/lib/base.py
This commit is contained in:
SrikanteswaraRao Talluri
parent
63f6888588
commit
c42e9036f7
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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"
|
||||
}
|
||||
}
|
||||
|
|
@ -27,6 +27,7 @@ test_data = {
|
|||
"vdomain": {
|
||||
"name": "domain"
|
||||
},
|
||||
"domain": {"name": "domain"},
|
||||
"email": "test@test.com",
|
||||
"gateway": "172.1.1.1",
|
||||
"netmask": "255.255.255.0",
|
||||
|
|
@ -294,7 +295,7 @@ test_data = {
|
|||
"Dhcp": "VirtualRouter",
|
||||
"Dns": "VirtualRouter",
|
||||
"UserData": "VirtualRouter"
|
||||
}
|
||||
}
|
||||
},
|
||||
"shared_network_offering_all_services": {
|
||||
"name":"shaared network offering with services enabled",
|
||||
|
|
@ -418,6 +419,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',
|
||||
|
|
@ -448,6 +478,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',
|
||||
|
|
@ -541,7 +638,7 @@ test_data = {
|
|||
"bootable": False,
|
||||
"ispublic": False,
|
||||
"ostype": "CentOS 5.6 (64-bit)",
|
||||
},
|
||||
},
|
||||
"iso1": {
|
||||
"displaytext": "Test ISO 1",
|
||||
"name": "ISO 1",
|
||||
|
|
@ -727,7 +824,7 @@ test_data = {
|
|||
"disksize": 1
|
||||
},
|
||||
"host_anti_affinity": {
|
||||
"name": "hostantiaffinity",
|
||||
"type": "host anti-affinity",
|
||||
},
|
||||
"name": "hostantiaffinity",
|
||||
"type": "host anti-affinity",
|
||||
},
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -473,6 +473,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))
|
||||
|
||||
|
||||
|
|
@ -481,6 +483,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))
|
||||
|
||||
|
||||
|
|
@ -489,6 +493,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))
|
||||
|
||||
|
||||
|
|
@ -497,6 +503,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))
|
||||
|
||||
|
||||
|
|
@ -505,6 +513,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))
|
||||
|
||||
|
||||
|
|
@ -513,6 +523,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))
|
||||
|
||||
|
||||
|
|
@ -521,6 +533,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))
|
||||
|
||||
|
||||
|
|
@ -529,6 +543,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))
|
||||
|
||||
|
||||
|
|
@ -537,6 +553,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))
|
||||
|
||||
|
||||
|
|
@ -545,6 +563,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))
|
||||
|
||||
|
||||
|
|
@ -553,6 +573,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))
|
||||
|
||||
|
||||
|
|
@ -561,6 +583,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))
|
||||
|
||||
|
||||
|
|
@ -569,6 +593,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))
|
||||
|
||||
|
||||
|
|
@ -577,6 +603,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))
|
||||
|
||||
|
||||
|
|
@ -585,6 +613,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))
|
||||
|
||||
|
||||
|
|
@ -593,6 +623,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))
|
||||
|
||||
|
||||
|
|
@ -601,6 +633,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))
|
||||
|
||||
|
||||
|
|
@ -609,6 +643,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))
|
||||
|
||||
|
||||
|
|
@ -617,6 +653,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))
|
||||
|
||||
|
||||
|
|
@ -625,6 +663,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))
|
||||
|
||||
|
||||
|
|
@ -634,6 +674,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))
|
||||
|
||||
|
||||
|
|
@ -643,6 +685,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))
|
||||
|
||||
|
||||
|
|
@ -651,6 +695,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))
|
||||
|
||||
|
||||
|
|
@ -659,6 +705,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))
|
||||
|
||||
|
||||
|
|
@ -667,6 +715,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))
|
||||
|
||||
|
||||
|
|
@ -675,6 +725,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))
|
||||
|
||||
|
||||
|
|
@ -683,6 +735,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))
|
||||
|
||||
|
||||
|
|
@ -691,6 +745,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))
|
||||
|
||||
|
||||
|
|
@ -699,6 +755,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))
|
||||
|
||||
|
||||
|
|
@ -707,6 +765,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))
|
||||
|
||||
|
||||
|
|
@ -715,6 +775,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))
|
||||
|
||||
|
||||
|
|
@ -723,6 +785,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))
|
||||
|
||||
|
||||
|
|
@ -731,6 +795,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))
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue