rhtyd commented on a change in pull request #4269:
URL: https://github.com/apache/cloudstack/pull/4269#discussion_r471395495
##########
File path: tools/marvin/marvin/config/test_data.py
##########
@@ -1847,119 +1847,187 @@
},
},
"configurableData":
- {
- "portableIpRange": {
- "gateway": "10.223.59.1",
- "netmask": "255.255.255.0",
- "startip": "10.223.59.200",
- "endip": "10.223.59.240",
- "vlan": "1000"
- },
- "netscaler": {
- "ipaddress": "",
- "username": "",
- "password": "",
- "networkdevicetype": "",
- "publicinterface": "",
- "privateinterface": "",
- "numretries": "",
- "lbdevicededicated": "False",
- "lbdevicecapacity": 2,
- "port": 22
- },
- "iscsi": {
- "url": "",
- "name": "Primary iSCSI"
- },
- "host": {
- "publicport": 22,
- "username": "root",
- "password": "password",
- },
- "ldap_account": {
- "email": "",
- "firstname": "",
- "lastname": "",
- "username": "",
- "password": "",
- },
- "link_ldap_details": {
- "domain_name": "",
- "accounttype": "",
- "name": "",
- "type": "",
- "admin": "",
- "linkLdapUsername": "",
- "linkLdapPassword": "",
- "linkLdapNestedUser": "",
- "linkLdapNestedPassword": ""
+ {
+ "portableIpRange": {
+ "gateway": "10.223.59.1",
+ "netmask": "255.255.255.0",
+ "startip": "10.223.59.200",
+ "endip": "10.223.59.240",
+ "vlan": "1000"
+ },
+ "netscaler": {
+ "ipaddress": "",
+ "username": "",
+ "password": "",
+ "networkdevicetype": "",
+ "publicinterface": "",
+ "privateinterface": "",
+ "numretries": "",
+ "lbdevicededicated": "False",
+ "lbdevicecapacity": 2,
+ "port": 22
+ },
+ "iscsi": {
+ "url": "",
+ "name": "Primary iSCSI"
+ },
+ "host": {
+ "publicport": 22,
+ "username": "root",
+ "password": "password",
+ },
+ "ldap_account": {
+ "email": "",
+ "firstname": "",
+ "lastname": "",
+ "username": "",
+ "password": "",
+ },
+ "link_ldap_details": {
+ "domain_name": "",
+ "accounttype": "",
+ "name": "",
+ "type": "",
+ "admin": "",
+ "linkLdapUsername": "",
+ "linkLdapPassword": "",
+ "linkLdapNestedUser": "",
+ "linkLdapNestedPassword": ""
+ },
+ "ldap_configuration": {
+ "basedn": "",
+ "emailAttribute": "",
+ "userObject": "",
+ "usernameAttribute": "",
+ "hostname": "",
+ "port": "",
+ "ldapUsername": "",
+ "ldapPassword": ""
+ },
+ "systemVmDelay": 120,
+ "setUsageConfigurationThroughTestCase": True,
+ "vmware_cluster": {
+ "hypervisor": 'VMware',
+ "clustertype": 'ExternalManaged',
+ "username": '',
+ "password": '',
+ "url": '',
+ "clustername": 'VMWare Cluster with Space in DC name',
+ },
+ "upload_volume": {
+ "diskname": "UploadVol",
+ "format": "VHD",
+ "url":
"http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2";,
+ "checksum": "",
+ },
+ "bootableIso":
+ {
+ "displaytext": "Test Bootable ISO",
+ "name": "testISO",
+ "bootable": True,
+ "ispublic": False,
+ "url": "http://dl.openvm.eu/cloudstack/iso/TinyCore-8.0.iso";,
+ "ostype": 'Other Linux (64-bit)',
+ "mode": 'HTTP_DOWNLOAD'
},
- "ldap_configuration": {
- "basedn": "",
- "emailAttribute": "",
- "userObject": "",
- "usernameAttribute": "",
- "hostname": "",
- "port": "",
- "ldapUsername": "",
- "ldapPassword": ""
+ "setHostConfigurationForIngressRule": False,
+ "restartManagementServerThroughTestCase": False,
+ "vmxnet3template": {
+ "displaytext": "VMXNET3 Template",
+ "name": "VMXNET3 template",
+ "ostype": "CentOS 5.6 (64-bit)",
+ "isfeatured": True,
+ "ispublic": False,
+ "isextractable": True,
+ "mode": "HTTP_DOWNLOAD",
+ "templatefilter": "self",
+ "url":
"http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova";,
+ "hypervisor": "vmware",
+ "format": "OVA",
+ "nicadapter": "vmxnet3",
+ "kvm": {
+ "url": ""
},
- "systemVmDelay": 120,
- "setUsageConfigurationThroughTestCase": True,
- "vmware_cluster": {
- "hypervisor": 'VMware',
- "clustertype": 'ExternalManaged',
- "username": '',
- "password": '',
- "url": '',
- "clustername": 'VMWare Cluster with Space in DC name',
+ "vmware": {
+ "url": ""
},
- "upload_volume": {
- "diskname": "UploadVol",
- "format": "VHD",
- "url":
"http://download.cloudstack.org/releases/2.0.0/UbuntuServer-10-04-64bit.vhd.bz2";,
- "checksum": "",
+ "xenserver": {
+ "url": ""
},
- "bootableIso":
- {
- "displaytext": "Test Bootable ISO",
- "name": "testISO",
- "bootable": True,
- "ispublic": False,
- "url":
"http://dl.openvm.eu/cloudstack/iso/TinyCore-8.0.iso";,
- "ostype": 'Other Linux (64-bit)',
- "mode": 'HTTP_DOWNLOAD'
- },
- "setHostConfigurationForIngressRule": False,
- "restartManagementServerThroughTestCase": False,
- "vmxnet3template": {
- "displaytext": "VMXNET3 Template",
- "name": "VMXNET3 template",
- "ostype": "CentOS 5.6 (64-bit)",
- "isfeatured": True,
- "ispublic": False,
- "isextractable": True,
- "mode": "HTTP_DOWNLOAD",
- "templatefilter": "self",
- "url":
"http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova";,
- "hypervisor": "vmware",
- "format": "OVA",
- "nicadapter": "vmxnet3",
- "kvm": {
- "url": ""
- },
- "vmware": {
- "url": ""
- },
- "xenserver": {
- "url": ""
- },
- "hyperv": {
- "url": ""
- },
- "ostype": 'CentOS 5.3 (64-bit)',
- "mode": 'HTTP_DOWNLOAD'
- }
+ "hyperv": {
+ "url": ""
+ },
+ "ostype": 'CentOS 5.3 (64-bit)',
+ "mode": 'HTTP_DOWNLOAD'
+ }
+ },
+ "cks_kubernetes_versions": {
+ "1.14.9": {
+ "semanticversion": "1.14.9",
+ "url": "http://download.cloudstack.org/cks/setup-1.14.9.iso";,
+ "mincpunumber": 2,
+ "minmemory": 2048
+ },
+ "1.15.0": {
+ "semanticversion": "1.15.0",
+ "url": "http://download.cloudstack.org/cks/setup-1.15.0.iso";,
+ "mincpunumber": 2,
+ "minmemory": 2048
+ },
+ "1.16.0": {
+ "semanticversion": "1.16.0",
+ "url": "http://download.cloudstack.org/cks/setup-1.16.0.iso";,
+ "mincpunumber": 2,
+ "minmemory": 2048
+ },
+ "1.16.3": {
+ "semanticversion": "1.16.3",
+ "url": "http://download.cloudstack.org/cks/setup-1.16.3.iso";,
+ "mincpunumber": 2,
+ "minmemory": 2048
}
+ },
+ "cks_templates": {
Review comment:
@shwstppr you'll need to sync changes in test_data in trillian specific
test_data as well
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
