diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 803f182f3b8..da1e23bd02a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -59,7 +59,7 @@ repos: - id: mixed-line-ending exclude: \.(cs|xml)$ - id: trailing-whitespace - files: \.(cs|bat|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$ + files: \.(bat|cfg|cs|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$ args: [--markdown-linebreak-ext=md] exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$ - repo: https://github.com/codespell-project/codespell diff --git a/setup/dev/advancedsg.cfg b/setup/dev/advancedsg.cfg index 5fbd02e6b14..3289598c698 100644 --- a/setup/dev/advancedsg.cfg +++ b/setup/dev/advancedsg.cfg @@ -18,80 +18,80 @@ { "zones": [ { - "name": "Sandbox-Simulator", - "dns1": "10.147.28.6", + "name": "Sandbox-Simulator", + "dns1": "10.147.28.6", "physical_networks": [ { - "name": "Sandbox-pnet", + "name": "Sandbox-pnet", "tags": [ "cloud-simulator-pnet" - ], - "broadcastdomainrange": "Zone", + ], + "broadcastdomainrange": "Zone", "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "SecurityGroupProvider" } - ], + ], "traffictypes": [ { "typ": "Guest" - }, + }, { - "typ": "Management", + "typ": "Management", "simulator": "cloud-simulator-mgmt" } - ], + ], "isolationmethods": [ "VLAN" ] } - ], - "securitygroupenabled": "true", + ], + "securitygroupenabled": "true", "ipranges": [ { - "startip": "10.147.31.150", - "endip": "10.147.31.159", - "netmask": "255.255.255.0", - "vlan": "31", + "startip": "10.147.31.150", + "endip": "10.147.31.159", + "netmask": "255.255.255.0", + "vlan": "31", "gateway": "10.147.31.1" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "10.147.29.159", - "name": "POD0", - "startip": "10.147.29.150", - "netmask": "255.255.255.0", + "endip": "10.147.29.159", + "name": "POD0", + "startip": "10.147.29.150", + "netmask": "255.255.255.0", "clusters": [ { - "clustername": "C0", - "hypervisor": "Simulator", + "clustername": "C0", + "hypervisor": "Simulator", "hosts": [ { - "username": "root", - "url": "http://simulator0", + "username": "root", + "url": "http://simulator0", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://10.147.28.6:/export/home/sandbox/primary", + "url": "nfs://10.147.28.6:/export/home/sandbox/primary", "name": "PS0" } ] } - ], + ], "gateway": "10.147.29.1" } - ], - "internaldns1": "10.147.28.6", + ], + "internaldns1": "10.147.28.6", "secondaryStorages": [ { "url": "nfs://10.147.28.6:/export/home/sandbox/sstor", @@ -99,81 +99,81 @@ } ] } - ], + ], "dbSvr": { - "dbSvr": "localhost", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "localhost", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" }, - "logger": + "logger": { "LogFolderPath": "/tmp" }, "globalConfig": [ { - "name": "storage.cleanup.interval", + "name": "storage.cleanup.interval", "value": "300" - }, + }, { - "name": "direct.agent.load.size", + "name": "direct.agent.load.size", "value": "1000" - }, + }, { - "name": "default.page.size", + "name": "default.page.size", "value": "10000" - }, + }, { - "name": "instance.name", + "name": "instance.name", "value": "QA" - }, + }, { - "name": "workers", + "name": "workers", "value": "10" - }, + }, { - "name": "vm.op.wait.interval", + "name": "vm.op.wait.interval", "value": "5" - }, + }, { - "name": "account.cleanup.interval", + "name": "account.cleanup.interval", "value": "600" - }, + }, { - "name": "guest.domain.suffix", + "name": "guest.domain.suffix", "value": "sandbox.simulator" - }, + }, { - "name": "expunge.delay", + "name": "expunge.delay", "value": "60" - }, + }, { - "name": "vm.allocation.algorithm", + "name": "vm.allocation.algorithm", "value": "random" - }, + }, { - "name": "expunge.interval", + "name": "expunge.interval", "value": "60" - }, + }, { - "name": "expunge.workers", + "name": "expunge.workers", "value": "3" - }, + }, { - "name": "secstorage.allowed.internal.sites", + "name": "secstorage.allowed.internal.sites", "value": "10.147.28.0/24" - }, + }, { - "name": "check.pod.cidrs", + "name": "check.pod.cidrs", "value": "true" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "localhost", - "passwd": "password", - "user": "root", + "mgtSvrIp": "localhost", + "passwd": "password", + "user": "root", "port": 8096 } ] diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg index b7f1486361a..a21119cd448 100644 --- a/setup/dev/basic.cfg +++ b/setup/dev/basic.cfg @@ -108,7 +108,7 @@ "port": 3306, "user": "cloud" }, - "logger": + "logger": { "LogFolderPath": "/tmp" }, diff --git a/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg b/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg index 2084417cbea..b1a3418e5d3 100644 --- a/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg +++ b/tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg @@ -5,9 +5,9 @@ # 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 @@ -20,32 +20,32 @@ { "zones": [ { - "localstorageenabled": "true", - "name": "testzone", - "guestcidraddress": "10.1.1.0/24", - "dns1": "8.8.8.8", + "localstorageenabled": "true", + "name": "testzone", + "guestcidraddress": "10.1.1.0/24", + "dns1": "8.8.8.8", "physical_networks": [ { - "broadcastdomainrange": "Zone", - "vlan": "3900-4000", + "broadcastdomainrange": "Zone", + "vlan": "3900-4000", "name": "eth0", "traffictypes": [ { - "kvm": "cloudbr0", + "kvm": "cloudbr0", "typ": "Management" - }, + }, { - "kvm": "cloudbr0", + "kvm": "cloudbr0", "typ": "Guest" } - ], + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VpcVirtualRouter" }, { @@ -53,58 +53,58 @@ "name": "InternalLbVm" } ] - }, + }, { - "broadcastdomainrange": "Zone", - "name": "eth1", + "broadcastdomainrange": "Zone", + "name": "eth1", "traffictypes": [ { - "kvm": "cloudbr1", + "kvm": "cloudbr1", "typ": "Public" } - ], + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" } ] } - ], + ], "ipranges": [ { - "startip": "192.168.100.100", - "endip": "192.168.100.199", - "netmask": "255.255.255.0", - "vlan": "untagged", + "startip": "192.168.100.100", + "endip": "192.168.100.199", + "netmask": "255.255.255.0", + "vlan": "untagged", "gateway": "192.168.100.2" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "172.17.10.199", - "name": "testpod", - "startip": "172.17.10.100", - "netmask": "255.255.255.0", + "endip": "172.17.10.199", + "name": "testpod", + "startip": "172.17.10.100", + "netmask": "255.255.255.0", "clusters": [ { - "clustername": "testcluster", - "hypervisor": "KVM", + "clustername": "testcluster", + "hypervisor": "KVM", "hosts": [ { - "username": "root", - "url": "http://172.17.10.10/", + "username": "root", + "url": "http://172.17.10.10/", "password": "password" } - ], + ], "clustertype": "CloudManaged" } - ], + ], "gateway": "172.17.10.2" } - ], - "internaldns1": "8.8.4.4", + ], + "internaldns1": "8.8.4.4", "secondaryStorages": [ { "url": "nfs://172.17.10.10:/nfs/secondary", @@ -112,20 +112,20 @@ } ] } - ], + ], "dbSvr": { - "dbSvr": "127.0.0.1", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "127.0.0.1", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" - }, + }, "logger": { "LogFolderPath": "/tmp/" }, "mgtSvr": [ { - "mgtSvrIp": "172.17.10.10", + "mgtSvrIp": "172.17.10.10", "port": 8096, "hypervisor": "kvm" } diff --git a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg index b2ed9911a58..a3a41da874f 100644 --- a/tools/devcloud-kvm/devcloud-kvm-advanced.cfg +++ b/tools/devcloud-kvm/devcloud-kvm-advanced.cfg @@ -5,9 +5,9 @@ # 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 @@ -20,32 +20,32 @@ { "zones": [ { - "localstorageenabled": "true", - "name": "testzone", - "guestcidraddress": "10.1.1.0/24", - "dns1": "8.8.8.8", + "localstorageenabled": "true", + "name": "testzone", + "guestcidraddress": "10.1.1.0/24", + "dns1": "8.8.8.8", "physical_networks": [ { - "broadcastdomainrange": "Zone", - "vlan": "3900-4000", + "broadcastdomainrange": "Zone", + "vlan": "3900-4000", "name": "eth0", "traffictypes": [ { - "kvm": "cloudbr0", + "kvm": "cloudbr0", "typ": "Management" - }, + }, { - "kvm": "cloudbr0", + "kvm": "cloudbr0", "typ": "Guest" } - ], + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VpcVirtualRouter" }, { @@ -53,58 +53,58 @@ "name": "InternalLbVm" } ] - }, + }, { - "broadcastdomainrange": "Zone", - "name": "eth1", + "broadcastdomainrange": "Zone", + "name": "eth1", "traffictypes": [ { - "kvm": "cloudbr1", + "kvm": "cloudbr1", "typ": "Public" } - ], + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" } ] } - ], + ], "ipranges": [ { - "startip": "192.168.100.100", - "endip": "192.168.100.199", - "netmask": "255.255.255.0", - "vlan": "untagged", + "startip": "192.168.100.100", + "endip": "192.168.100.199", + "netmask": "255.255.255.0", + "vlan": "untagged", "gateway": "192.168.100.1" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "172.17.10.199", - "name": "testpod", - "startip": "172.17.10.100", - "netmask": "255.255.255.0", + "endip": "172.17.10.199", + "name": "testpod", + "startip": "172.17.10.100", + "netmask": "255.255.255.0", "clusters": [ { - "clustername": "testcluster", - "hypervisor": "KVM", + "clustername": "testcluster", + "hypervisor": "KVM", "hosts": [ { - "username": "root", - "url": "http://172.17.10.10/", + "username": "root", + "url": "http://172.17.10.10/", "password": "password" } - ], + ], "clustertype": "CloudManaged" } - ], + ], "gateway": "172.17.10.1" } - ], - "internaldns1": "8.8.4.4", + ], + "internaldns1": "8.8.4.4", "secondaryStorages": [ { "url": "nfs://172.17.10.10:/nfs/secondary", @@ -112,27 +112,27 @@ } ] } - ], + ], "dbSvr": { - "dbSvr": "127.0.0.1", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "127.0.0.1", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" - }, + }, "logger": [ { - "name": "TestClient", + "name": "TestClient", "file": "/var/log/testclient.log" - }, + }, { - "name": "TestCase", + "name": "TestCase", "file": "/var/log/testcase.log" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "172.17.10.10", + "mgtSvrIp": "172.17.10.10", "port": 8096, "hypervisor": "kvm" } diff --git a/tools/devcloud-kvm/devcloud-kvm.cfg b/tools/devcloud-kvm/devcloud-kvm.cfg index ab7f9a52762..ffd23504ffe 100644 --- a/tools/devcloud-kvm/devcloud-kvm.cfg +++ b/tools/devcloud-kvm/devcloud-kvm.cfg @@ -5,9 +5,9 @@ # 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 @@ -21,22 +21,22 @@ { "zones": [ { - "name": "DevCloudKVM0", + "name": "DevCloudKVM0", "physical_networks": [ { - "broadcastdomainrange": "Zone", - "name": "test-network", + "broadcastdomainrange": "Zone", + "name": "test-network", "traffictypes": [ { "typ": "Guest" - }, + }, { "typ": "Management" - } - ], + } + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" }, { @@ -48,41 +48,41 @@ ], "dns2": "8.8.4.4", "dns1": "8.8.8.8", - "securitygroupenabled": "true", + "securitygroupenabled": "true", "localstorageenabled": "true", - "networktype": "Basic", + "networktype": "Basic", "pods": [ { - "endip": "192.168.100.250", - "name": "test00", - "startip": "192.168.100.200", + "endip": "192.168.100.250", + "name": "test00", + "startip": "192.168.100.200", "guestIpRanges": [ { - "startip": "192.168.100.100", - "endip": "192.168.100.199", - "netmask": "255.255.255.0", + "startip": "192.168.100.100", + "endip": "192.168.100.199", + "netmask": "255.255.255.0", "gateway": "192.168.100.1" } - ], - "netmask": "255.255.255.0", + ], + "netmask": "255.255.255.0", "clusters": [ { - "clustername": "test000", - "hypervisor": "KVM", + "clustername": "test000", + "hypervisor": "KVM", "hosts": [ { - "username": "root", - "url": "http://192.168.100.10/", + "username": "root", + "url": "http://192.168.100.10/", "password": "password" } - ], + ], "clustertype": "CloudManaged" } - ], + ], "gateway": "192.168.100.1" } - ], - "internaldns1": "192.168.100.10", + ], + "internaldns1": "192.168.100.10", "secondaryStorages": [ { "url": "nfs://192.168.100.10:/nfs/secondary", @@ -90,25 +90,25 @@ } ] } - ], + ], "logger": [ { - "name": "TestClient", + "name": "TestClient", "file": "/tmp/testclient.log" - }, + }, { - "name": "TestCase", + "name": "TestCase", "file": "/tmp/testcase.log" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "127.0.0.1", + "mgtSvrIp": "127.0.0.1", "port": 8096, "hypervisor": "kvm" } ], - "dbSvr": + "dbSvr": { "dbSvr": "127.0.0.1", "port": 3306, diff --git a/tools/devcloud4/advanced/marvin.cfg b/tools/devcloud4/advanced/marvin.cfg index 9e2ac563236..222dc65d045 100644 --- a/tools/devcloud4/advanced/marvin.cfg +++ b/tools/devcloud4/advanced/marvin.cfg @@ -6,9 +6,9 @@ # 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 diff --git a/tools/devcloud4/basic/marvin.cfg b/tools/devcloud4/basic/marvin.cfg index dcc1b8226a5..1c8ee547b26 100644 --- a/tools/devcloud4/basic/marvin.cfg +++ b/tools/devcloud4/basic/marvin.cfg @@ -6,9 +6,9 @@ # 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 diff --git a/tools/marvin/marvin/config/Baremetal_AdvZone_Vmware.cfg b/tools/marvin/marvin/config/Baremetal_AdvZone_Vmware.cfg index a382e33b8fd..d03fabce887 100644 --- a/tools/marvin/marvin/config/Baremetal_AdvZone_Vmware.cfg +++ b/tools/marvin/marvin/config/Baremetal_AdvZone_Vmware.cfg @@ -26,7 +26,7 @@ } ], "dns1": "10.x.x.x", - + "physical_networks": [ { "broadcastdomainrange": "Zone", @@ -137,7 +137,7 @@ "port": 3306, "user": "root" }, - + "globalConfig": [ { "name": "network.gc.wait", @@ -191,7 +191,7 @@ "name": "baremetal.internal.storage.server.ip", "value": "10.2.1.2" }, - { + { "name": "check.pod.cidrs", "value": "true" } diff --git a/tools/marvin/marvin/config/setup.cfg b/tools/marvin/marvin/config/setup.cfg index f694bbadaec..7a90e0b8f6f 100644 --- a/tools/marvin/marvin/config/setup.cfg +++ b/tools/marvin/marvin/config/setup.cfg @@ -137,7 +137,7 @@ "port": 3306, "user": "cloud" }, - "logger": + "logger": { "LogFolderPath": "/tmp/" }, diff --git a/tools/marvin/marvin/misc/build/asf_test.cfg b/tools/marvin/marvin/misc/build/asf_test.cfg index 658afee26b7..cb64293ee85 100644 --- a/tools/marvin/marvin/misc/build/asf_test.cfg +++ b/tools/marvin/marvin/misc/build/asf_test.cfg @@ -19,161 +19,161 @@ { "zones": [ { - "name": "Sandbox-XenServer", - "guestcidraddress": "10.1.1.0/24", - "dns1": "10.223.75.10", + "name": "Sandbox-XenServer", + "guestcidraddress": "10.1.1.0/24", + "dns1": "10.223.75.10", "physical_networks": [ { - "broadcastdomainrange": "Zone", - "name": "Sandbox-pnet", + "broadcastdomainrange": "Zone", + "name": "Sandbox-pnet", "traffictypes": [ { "typ": "Guest" - }, + }, { "typ": "Management" - }, + }, { "typ": "Public" } - ], + ], "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VpcVirtualRouter" } ] } - ], + ], "ipranges": [ { - "startip": "10.223.158.2", - "endip": "10.223.158.20", - "netmask": "255.255.255.128", - "vlan": "580", + "startip": "10.223.158.2", + "endip": "10.223.158.20", + "netmask": "255.255.255.128", + "vlan": "580", "gateway": "10.223.158.1" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "10.223.78.150", - "name": "POD0", - "startip": "10.223.78.130", - "netmask": "255.255.255.128", + "endip": "10.223.78.150", + "name": "POD0", + "startip": "10.223.78.130", + "netmask": "255.255.255.128", "clusters": [ { - "clustername": "C0", - "hypervisor": "XenServer", + "clustername": "C0", + "hypervisor": "XenServer", "hosts": [ { - "username": "root", - "url": "http://acs-qa-h20", + "username": "root", + "url": "http://acs-qa-h20", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://nfs2.lab.vmops.com/export/home/automation/asf/primary", + "url": "nfs://nfs2.lab.vmops.com/export/home/automation/asf/primary", "name": "PS0" } ] } - ], + ], "gateway": "10.223.78.129" } - ], - "internaldns1": "10.223.75.10", + ], + "internaldns1": "10.223.75.10", "secondaryStorages": [ { "url": "nfs://nfs2.lab.vmops.com/export/home/automation/asf/secondary" } ] } - ], + ], "dbSvr": { - "dbSvr": "10.223.75.41", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "10.223.75.41", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" - }, + }, "logger": [ { - "name": "TestClient", + "name": "TestClient", "file": "/var/log/testclient.log" - }, + }, { - "name": "TestCase", + "name": "TestCase", "file": "/var/log/testcase.log" } - ], + ], "globalConfig": [ { - "name": "storage.cleanup.interval", + "name": "storage.cleanup.interval", "value": "300" - }, + }, { - "name": "direct.agent.load.size", + "name": "direct.agent.load.size", "value": "1000" - }, + }, { - "name": "default.page.size", + "name": "default.page.size", "value": "10000" - }, + }, { - "name": "instance.name", + "name": "instance.name", "value": "QA" - }, + }, { - "name": "workers", + "name": "workers", "value": "10" - }, + }, { - "name": "vm.op.wait.interval", + "name": "vm.op.wait.interval", "value": "5" - }, + }, { - "name": "account.cleanup.interval", + "name": "account.cleanup.interval", "value": "600" - }, + }, { - "name": "guest.domain.suffix", + "name": "guest.domain.suffix", "value": "sandbox.xen" - }, + }, { - "name": "expunge.delay", + "name": "expunge.delay", "value": "60" - }, + }, { - "name": "vm.allocation.algorithm", + "name": "vm.allocation.algorithm", "value": "random" - }, + }, { - "name": "expunge.interval", + "name": "expunge.interval", "value": "60" - }, + }, { - "name": "expunge.workers", + "name": "expunge.workers", "value": "3" - }, + }, { - "name": "secstorage.allowed.internal.sites", + "name": "secstorage.allowed.internal.sites", "value": "10.223.0.0/16" - }, + }, { - "name": "check.pod.cidrs", + "name": "check.pod.cidrs", "value": "true" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "10.223.75.41", + "mgtSvrIp": "10.223.75.41", "port": 8096 } ] diff --git a/tools/marvin/marvin/misc/build/kvm.cfg b/tools/marvin/marvin/misc/build/kvm.cfg index 630ccba8a0f..cece16b05a9 100644 --- a/tools/marvin/marvin/misc/build/kvm.cfg +++ b/tools/marvin/marvin/misc/build/kvm.cfg @@ -19,224 +19,224 @@ { "zones": [ { - "name": "z0", - "guestcidraddress": "10.1.1.0/24", - "dns2": "8.8.8.8", - "dns1": "8.8.8.8", + "name": "z0", + "guestcidraddress": "10.1.1.0/24", + "dns2": "8.8.8.8", + "dns1": "8.8.8.8", "physical_networks": [ { - "name": "z0-pnet", + "name": "z0-pnet", "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VpcVirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "InternalLbVm" } - ], - "broadcastdomainrange": "Zone", - "vlan": "2001-2050", + ], + "broadcastdomainrange": "Zone", + "vlan": "2001-2050", "traffictypes": [ { "typ": "Guest" - }, + }, { "typ": "Management" - }, + }, { "typ": "Public" } - ], + ], "isolationmethods": [ "VLAN" ] } - ], - "securitygroupenabled": "false", + ], + "securitygroupenabled": "false", "ipranges": [ { - "startip": "10.208.10.10", - "endip": "10.208.10.62", - "netmask": "255.255.255.192", - "vlan": "100", + "startip": "10.208.10.10", + "endip": "10.208.10.62", + "netmask": "255.255.255.192", + "vlan": "100", "gateway": "10.208.10.1" - }, + }, { - "startip": "10.208.10.66", - "endip": "10.208.10.126", - "netmask": "255.255.255.192", - "vlan": "101", + "startip": "10.208.10.66", + "endip": "10.208.10.126", + "netmask": "255.255.255.192", + "vlan": "101", "gateway": "10.208.10.65" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "10.208.8.75", - "name": "z0p0", - "startip": "10.208.8.70", - "netmask": "255.255.255.192", + "endip": "10.208.8.75", + "name": "z0p0", + "startip": "10.208.8.70", + "netmask": "255.255.255.192", "clusters": [ { - "clustername": "z0p0c0", - "hypervisor": "KVM", + "clustername": "z0p0c0", + "hypervisor": "KVM", "hosts": [ { - "username": "root", - "url": "http://apache-81-3", + "username": "root", + "url": "http://apache-81-3", "password": "password" - }, + }, { - "username": "root", - "url": "http://apache-81-2", + "username": "root", + "url": "http://apache-81-2", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", "name": "z0p0c0ps0" - }, + }, { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", "name": "z0p0c0ps1" } ] } - ], + ], "gateway": "10.208.8.65" - }, + }, { - "endip": "10.208.8.205", - "name": "z0p1", - "startip": "10.208.8.200", - "netmask": "255.255.255.192", + "endip": "10.208.8.205", + "name": "z0p1", + "startip": "10.208.8.200", + "netmask": "255.255.255.192", "clusters": [ { - "clustername": "z0p1c0", - "hypervisor": "KVM", + "clustername": "z0p1c0", + "hypervisor": "KVM", "hosts": [ { - "username": "root", - "url": "http://apache-83-1", + "username": "root", + "url": "http://apache-83-1", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", "name": "z0p1c0ps0" } ] } - ], + ], "gateway": "10.208.8.193" } - ], - "internaldns1": "10.208.8.5", - "internaldns2": "10.208.8.5", + ], + "internaldns1": "10.208.8.5", + "internaldns2": "10.208.8.5", "secondaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", "provider": "NFS" } ] } - ], + ], "dbSvr": { - "dbSvr": "cloudstack-centos63", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "cloudstack-centos63", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" - }, + }, "logger": [ { - "name": "TestClient", + "name": "TestClient", "file": "/var/log/testclient.log" - }, + }, { - "name": "TestCase", + "name": "TestCase", "file": "/var/log/testcase.log" } - ], + ], "globalConfig": [ { - "name": "storage.cleanup.interval", + "name": "storage.cleanup.interval", "value": "120" - }, + }, { - "name": "direct.agent.load.size", + "name": "direct.agent.load.size", "value": "1000" - }, + }, { - "name": "default.page.size", + "name": "default.page.size", "value": "10000" - }, + }, { - "name": "account.cleanup.interval", + "name": "account.cleanup.interval", "value": "120" - }, + }, { - "name": "workers", + "name": "workers", "value": "10" - }, + }, { - "name": "vm.op.wait.interval", + "name": "vm.op.wait.interval", "value": "5" - }, + }, { - "name": "network.gc.interval", + "name": "network.gc.interval", "value": "120" - }, + }, { - "name": "guest.domain.suffix", + "name": "guest.domain.suffix", "value": "sandbox.kvm" - }, + }, { - "name": "expunge.delay", + "name": "expunge.delay", "value": "60" - }, + }, { - "name": "vm.allocation.algorithm", + "name": "vm.allocation.algorithm", "value": "random" - }, + }, { - "name": "expunge.interval", + "name": "expunge.interval", "value": "60" - }, + }, { - "name": "enable.dynamic.scale.vm", + "name": "enable.dynamic.scale.vm", "value": "true" - }, + }, { - "name": "instance.name", + "name": "instance.name", "value": "QA" - }, + }, { - "name": "expunge.workers", + "name": "expunge.workers", "value": "3" - }, + }, { - "name": "secstorage.allowed.internal.sites", + "name": "secstorage.allowed.internal.sites", "value": "10.208.8.0/26,10.208.8.65/26,10.208.8.128/26,10.208.8.192/26,10.208.13.194/32" - }, + }, { - "name": "check.pod.cidrs", + "name": "check.pod.cidrs", "value": "true" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "cloudstack-centos63", + "mgtSvrIp": "cloudstack-centos63", "port": 8096 } ] diff --git a/tools/marvin/marvin/misc/build/xen.cfg b/tools/marvin/marvin/misc/build/xen.cfg index 5e9464b4c9e..03be96158df 100644 --- a/tools/marvin/marvin/misc/build/xen.cfg +++ b/tools/marvin/marvin/misc/build/xen.cfg @@ -19,224 +19,224 @@ { "zones": [ { - "name": "z0", - "guestcidraddress": "10.1.1.0/24", - "dns2": "8.8.8.8", - "dns1": "8.8.8.8", + "name": "z0", + "guestcidraddress": "10.1.1.0/24", + "dns2": "8.8.8.8", + "dns1": "8.8.8.8", "physical_networks": [ { - "name": "z0-pnet", + "name": "z0-pnet", "providers": [ { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "VpcVirtualRouter" - }, + }, { - "broadcastdomainrange": "ZONE", + "broadcastdomainrange": "ZONE", "name": "InternalLbVm" } - ], - "broadcastdomainrange": "Zone", - "vlan": "2001-2050", + ], + "broadcastdomainrange": "Zone", + "vlan": "2001-2050", "traffictypes": [ { "typ": "Guest" - }, + }, { "typ": "Management" - }, + }, { "typ": "Public" } - ], + ], "isolationmethods": [ "VLAN" ] } - ], - "securitygroupenabled": "false", + ], + "securitygroupenabled": "false", "ipranges": [ { - "startip": "10.208.10.10", - "endip": "10.208.10.62", - "netmask": "255.255.255.192", - "vlan": "100", + "startip": "10.208.10.10", + "endip": "10.208.10.62", + "netmask": "255.255.255.192", + "vlan": "100", "gateway": "10.208.10.1" - }, + }, { - "startip": "10.208.10.66", - "endip": "10.208.10.126", - "netmask": "255.255.255.192", - "vlan": "101", + "startip": "10.208.10.66", + "endip": "10.208.10.126", + "netmask": "255.255.255.192", + "vlan": "101", "gateway": "10.208.10.65" } - ], - "networktype": "Advanced", + ], + "networktype": "Advanced", "pods": [ { - "endip": "10.208.8.75", - "name": "z0p0", - "startip": "10.208.8.70", - "netmask": "255.255.255.192", + "endip": "10.208.8.75", + "name": "z0p0", + "startip": "10.208.8.70", + "netmask": "255.255.255.192", "clusters": [ { - "clustername": "z0p0c0", - "hypervisor": "XenServer", + "clustername": "z0p0c0", + "hypervisor": "XenServer", "hosts": [ { - "username": "root", - "url": "http://apache-81-3", + "username": "root", + "url": "http://apache-81-3", "password": "password" - }, + }, { - "username": "root", - "url": "http://apache-81-2", + "username": "root", + "url": "http://apache-81-2", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", "name": "z0p0c0ps0" - }, + }, { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", "name": "z0p0c0ps1" } ] } - ], + ], "gateway": "10.208.8.65" - }, + }, { - "endip": "10.208.8.205", - "name": "z0p1", - "startip": "10.208.8.200", - "netmask": "255.255.255.192", + "endip": "10.208.8.205", + "name": "z0p1", + "startip": "10.208.8.200", + "netmask": "255.255.255.192", "clusters": [ { - "clustername": "z0p1c0", - "hypervisor": "XenServer", + "clustername": "z0p1c0", + "hypervisor": "XenServer", "hosts": [ { - "username": "root", - "url": "http://apache-83-1", + "username": "root", + "url": "http://apache-83-1", "password": "password" } - ], - "clustertype": "CloudManaged", + ], + "clustertype": "CloudManaged", "primaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", "name": "z0p1c0ps0" } ] } - ], + ], "gateway": "10.208.8.193" } - ], - "internaldns1": "10.208.8.5", - "internaldns2": "10.208.8.5", + ], + "internaldns1": "10.208.8.5", + "internaldns2": "10.208.8.5", "secondaryStorages": [ { - "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", + "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", "provider": "NFS" } ] } - ], + ], "dbSvr": { - "dbSvr": "cloudstack-centos63", - "passwd": "cloud", - "db": "cloud", - "port": 3306, + "dbSvr": "cloudstack-centos63", + "passwd": "cloud", + "db": "cloud", + "port": 3306, "user": "cloud" - }, + }, "logger": [ { - "name": "TestClient", + "name": "TestClient", "file": "/var/log/testclient.log" - }, + }, { - "name": "TestCase", + "name": "TestCase", "file": "/var/log/testcase.log" } - ], + ], "globalConfig": [ { - "name": "storage.cleanup.interval", + "name": "storage.cleanup.interval", "value": "120" - }, + }, { - "name": "direct.agent.load.size", + "name": "direct.agent.load.size", "value": "1000" - }, + }, { - "name": "default.page.size", + "name": "default.page.size", "value": "10000" - }, + }, { - "name": "account.cleanup.interval", + "name": "account.cleanup.interval", "value": "120" - }, + }, { - "name": "workers", + "name": "workers", "value": "10" - }, + }, { - "name": "vm.op.wait.interval", + "name": "vm.op.wait.interval", "value": "5" - }, + }, { - "name": "network.gc.interval", + "name": "network.gc.interval", "value": "120" - }, + }, { - "name": "guest.domain.suffix", + "name": "guest.domain.suffix", "value": "sandbox.xen" - }, + }, { - "name": "expunge.delay", + "name": "expunge.delay", "value": "60" - }, + }, { - "name": "vm.allocation.algorithm", + "name": "vm.allocation.algorithm", "value": "random" - }, + }, { - "name": "expunge.interval", + "name": "expunge.interval", "value": "60" - }, + }, { - "name": "enable.dynamic.scale.vm", + "name": "enable.dynamic.scale.vm", "value": "true" - }, + }, { - "name": "instance.name", + "name": "instance.name", "value": "QA" - }, + }, { - "name": "expunge.workers", + "name": "expunge.workers", "value": "3" - }, + }, { - "name": "secstorage.allowed.internal.sites", + "name": "secstorage.allowed.internal.sites", "value": "10.208.8.0/26,10.208.8.65/26,10.208.8.128/26,10.208.8.192/26,10.208.13.194/32" - }, + }, { - "name": "check.pod.cidrs", + "name": "check.pod.cidrs", "value": "true" } - ], + ], "mgtSvr": [ { - "mgtSvrIp": "cloudstack-centos63", + "mgtSvrIp": "cloudstack-centos63", "port": 8096 } ]