You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ta...@apache.org on 2014/05/14 14:44:35 UTC
[2/2] git commit: updated refs/heads/master to c42e903
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
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c42e9036
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c42e9036
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c42e9036
Branch: refs/heads/master
Commit: c42e9036f723e39993134cabc6cce75d68503249
Parents: 63f6888
Author: SrikanteswaraRao Talluri <ta...@apache.org>
Authored: Thu May 1 23:14:34 2014 +0530
Committer: SrikanteswaraRao Talluri <ta...@apache.org>
Committed: Wed May 14 18:14:09 2014 +0530
----------------------------------------------------------------------
tools/marvin/marvin/cloudstackTestClient.py | 2 +-
tools/marvin/marvin/config/config.cfg | 457 ---------------------
tools/marvin/marvin/config/test_data.py | 107 ++++-
tools/marvin/marvin/lib/base.py | 502 ++++++++++++++++-------
tools/marvin/marvin/lib/common.py | 66 +++
5 files changed, 516 insertions(+), 618 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c42e9036/tools/marvin/marvin/cloudstackTestClient.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py
index 13d920e..2e9b49a 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/c42e9036/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/c42e9036/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 ebc1ab6..47230ef 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -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",
+ },
}