apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

pre-commit check .cfg files with the trailing whitespace hook (#10151)

Browse Source 
https://github.com/pre-commit/pre-commit-hooks?tab=readme-ov-file#trailing-whitespace

This hook auto trims trailing whitespace
This commit is contained in:
John Bampton 2025-01-03 18:39:16 +10:00 committed by GitHub
parent fd24509ba7
commit 2b070880c1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 496 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.pre-commit-config.yaml
View File

@ -59,7 +59,7 @@ repos:
- id: mixed-line-ending - id: mixed-line-ending
exclude: \.(cs|xml)$ exclude: \.(cs|xml)$
- id: trailing-whitespace - 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] args: [--markdown-linebreak-ext=md]
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$ exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
- repo: https://github.com/codespell-project/codespell - repo: https://github.com/codespell-project/codespell

142
setup/dev/advancedsg.cfg
View File

@ -18,80 +18,80 @@
{ {
"zones": [ "zones": [
{ {
"name": "Sandbox-Simulator", "name": "Sandbox-Simulator",
"dns1": "10.147.28.6", "dns1": "10.147.28.6",
"physical_networks": [ "physical_networks": [
{ {
"name": "Sandbox-pnet", "name": "Sandbox-pnet",
"tags": [ "tags": [
"cloud-simulator-pnet" "cloud-simulator-pnet"
], ],
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "SecurityGroupProvider" "name": "SecurityGroupProvider"
} }
], ],
"traffictypes": [ "traffictypes": [
{ {
"typ": "Guest" "typ": "Guest"
}, },
{ {
"typ": "Management", "typ": "Management",
"simulator": "cloud-simulator-mgmt" "simulator": "cloud-simulator-mgmt"
} }
], ],
"isolationmethods": [ "isolationmethods": [
"VLAN" "VLAN"
] ]
} }
], ],
"securitygroupenabled": "true", "securitygroupenabled": "true",
"ipranges": [ "ipranges": [
{ {
"startip": "10.147.31.150", "startip": "10.147.31.150",
"endip": "10.147.31.159", "endip": "10.147.31.159",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"vlan": "31", "vlan": "31",
"gateway": "10.147.31.1" "gateway": "10.147.31.1"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "10.147.29.159", "endip": "10.147.29.159",
"name": "POD0", "name": "POD0",
"startip": "10.147.29.150", "startip": "10.147.29.150",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"clusters": [ "clusters": [
{ {
"clustername": "C0", "clustername": "C0",
"hypervisor": "Simulator", "hypervisor": "Simulator",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://simulator0", "url": "http://simulator0",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "primaryStorages": [
{ {
"url": "nfs://10.147.28.6:/export/home/sandbox/primary", "url": "nfs://10.147.28.6:/export/home/sandbox/primary",
"name": "PS0" "name": "PS0"
} }
] ]
} }
], ],
"gateway": "10.147.29.1" "gateway": "10.147.29.1"
} }
], ],
"internaldns1": "10.147.28.6", "internaldns1": "10.147.28.6",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://10.147.28.6:/export/home/sandbox/sstor", "url": "nfs://10.147.28.6:/export/home/sandbox/sstor",
@ -99,81 +99,81 @@
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "localhost", "dbSvr": "localhost",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": "logger":
{ {
"LogFolderPath": "/tmp" "LogFolderPath": "/tmp"
}, },
"globalConfig": [ "globalConfig": [
{ {
"name": "storage.cleanup.interval", "name": "storage.cleanup.interval",
"value": "300" "value": "300"
}, },
{ {
"name": "direct.agent.load.size", "name": "direct.agent.load.size",
"value": "1000" "value": "1000"
}, },
{ {
"name": "default.page.size", "name": "default.page.size",
"value": "10000" "value": "10000"
}, },
{ {
"name": "instance.name", "name": "instance.name",
"value": "QA" "value": "QA"
}, },
{ {
"name": "workers", "name": "workers",
"value": "10" "value": "10"
}, },
{ {
"name": "vm.op.wait.interval", "name": "vm.op.wait.interval",
"value": "5" "value": "5"
}, },
{ {
"name": "account.cleanup.interval", "name": "account.cleanup.interval",
"value": "600" "value": "600"
}, },
{ {
"name": "guest.domain.suffix", "name": "guest.domain.suffix",
"value": "sandbox.simulator" "value": "sandbox.simulator"
}, },
{ {
"name": "expunge.delay", "name": "expunge.delay",
"value": "60" "value": "60"
}, },
{ {
"name": "vm.allocation.algorithm", "name": "vm.allocation.algorithm",
"value": "random" "value": "random"
}, },
{ {
"name": "expunge.interval", "name": "expunge.interval",
"value": "60" "value": "60"
}, },
{ {
"name": "expunge.workers", "name": "expunge.workers",
"value": "3" "value": "3"
}, },
{ {
"name": "secstorage.allowed.internal.sites", "name": "secstorage.allowed.internal.sites",
"value": "10.147.28.0/24" "value": "10.147.28.0/24"
}, },
{ {
"name": "check.pod.cidrs", "name": "check.pod.cidrs",
"value": "true" "value": "true"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "localhost", "mgtSvrIp": "localhost",
"passwd": "password", "passwd": "password",
"user": "root", "user": "root",
"port": 8096 "port": 8096
} }
] ]

2
setup/dev/basic.cfg
View File

@ -108,7 +108,7 @@
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": "logger":
{ {
"LogFolderPath": "/tmp" "LogFolderPath": "/tmp"
}, },

94
tools/devcloud-kvm/devcloud-kvm-advanced-fusion.cfg
View File

@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,32 +20,32 @@
{ {
"zones": [ "zones": [
{ {
"localstorageenabled": "true", "localstorageenabled": "true",
"name": "testzone", "name": "testzone",
"guestcidraddress": "10.1.1.0/24", "guestcidraddress": "10.1.1.0/24",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"physical_networks": [ "physical_networks": [
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"vlan": "3900-4000", "vlan": "3900-4000",
"name": "eth0", "name": "eth0",
"traffictypes": [ "traffictypes": [
{ {
"kvm": "cloudbr0", "kvm": "cloudbr0",
"typ": "Management" "typ": "Management"
}, },
{ {
"kvm": "cloudbr0", "kvm": "cloudbr0",
"typ": "Guest" "typ": "Guest"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter" "name": "VpcVirtualRouter"
}, },
{ {
@ -53,58 +53,58 @@
"name": "InternalLbVm" "name": "InternalLbVm"
} }
] ]
}, },
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"name": "eth1", "name": "eth1",
"traffictypes": [ "traffictypes": [
{ {
"kvm": "cloudbr1", "kvm": "cloudbr1",
"typ": "Public" "typ": "Public"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
} }
] ]
} }
], ],
"ipranges": [ "ipranges": [
{ {
"startip": "192.168.100.100", "startip": "192.168.100.100",
"endip": "192.168.100.199", "endip": "192.168.100.199",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"vlan": "untagged", "vlan": "untagged",
"gateway": "192.168.100.2" "gateway": "192.168.100.2"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "172.17.10.199", "endip": "172.17.10.199",
"name": "testpod", "name": "testpod",
"startip": "172.17.10.100", "startip": "172.17.10.100",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"clusters": [ "clusters": [
{ {
"clustername": "testcluster", "clustername": "testcluster",
"hypervisor": "KVM", "hypervisor": "KVM",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://172.17.10.10/", "url": "http://172.17.10.10/",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged" "clustertype": "CloudManaged"
} }
], ],
"gateway": "172.17.10.2" "gateway": "172.17.10.2"
} }
], ],
"internaldns1": "8.8.4.4", "internaldns1": "8.8.4.4",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://172.17.10.10:/nfs/secondary", "url": "nfs://172.17.10.10:/nfs/secondary",
@ -112,20 +112,20 @@
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "127.0.0.1", "dbSvr": "127.0.0.1",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": { "logger": {
"LogFolderPath": "/tmp/" "LogFolderPath": "/tmp/"
}, },
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "172.17.10.10", "mgtSvrIp": "172.17.10.10",
"port": 8096, "port": 8096,
"hypervisor": "kvm" "hypervisor": "kvm"
} }

102
tools/devcloud-kvm/devcloud-kvm-advanced.cfg
View File

@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -20,32 +20,32 @@
{ {
"zones": [ "zones": [
{ {
"localstorageenabled": "true", "localstorageenabled": "true",
"name": "testzone", "name": "testzone",
"guestcidraddress": "10.1.1.0/24", "guestcidraddress": "10.1.1.0/24",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"physical_networks": [ "physical_networks": [
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"vlan": "3900-4000", "vlan": "3900-4000",
"name": "eth0", "name": "eth0",
"traffictypes": [ "traffictypes": [
{ {
"kvm": "cloudbr0", "kvm": "cloudbr0",
"typ": "Management" "typ": "Management"
}, },
{ {
"kvm": "cloudbr0", "kvm": "cloudbr0",
"typ": "Guest" "typ": "Guest"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter" "name": "VpcVirtualRouter"
}, },
{ {
@ -53,58 +53,58 @@
"name": "InternalLbVm" "name": "InternalLbVm"
} }
] ]
}, },
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"name": "eth1", "name": "eth1",
"traffictypes": [ "traffictypes": [
{ {
"kvm": "cloudbr1", "kvm": "cloudbr1",
"typ": "Public" "typ": "Public"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
} }
] ]
} }
], ],
"ipranges": [ "ipranges": [
{ {
"startip": "192.168.100.100", "startip": "192.168.100.100",
"endip": "192.168.100.199", "endip": "192.168.100.199",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"vlan": "untagged", "vlan": "untagged",
"gateway": "192.168.100.1" "gateway": "192.168.100.1"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "172.17.10.199", "endip": "172.17.10.199",
"name": "testpod", "name": "testpod",
"startip": "172.17.10.100", "startip": "172.17.10.100",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"clusters": [ "clusters": [
{ {
"clustername": "testcluster", "clustername": "testcluster",
"hypervisor": "KVM", "hypervisor": "KVM",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://172.17.10.10/", "url": "http://172.17.10.10/",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged" "clustertype": "CloudManaged"
} }
], ],
"gateway": "172.17.10.1" "gateway": "172.17.10.1"
} }
], ],
"internaldns1": "8.8.4.4", "internaldns1": "8.8.4.4",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://172.17.10.10:/nfs/secondary", "url": "nfs://172.17.10.10:/nfs/secondary",
@ -112,27 +112,27 @@
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "127.0.0.1", "dbSvr": "127.0.0.1",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": [ "logger": [
{ {
"name": "TestClient", "name": "TestClient",
"file": "/var/log/testclient.log" "file": "/var/log/testclient.log"
}, },
{ {
"name": "TestCase", "name": "TestCase",
"file": "/var/log/testcase.log" "file": "/var/log/testcase.log"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "172.17.10.10", "mgtSvrIp": "172.17.10.10",
"port": 8096, "port": 8096,
"hypervisor": "kvm" "hypervisor": "kvm"
} }

68
tools/devcloud-kvm/devcloud-kvm.cfg
View File

@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@ -21,22 +21,22 @@
{ {
"zones": [ "zones": [
{ {
"name": "DevCloudKVM0", "name": "DevCloudKVM0",
"physical_networks": [ "physical_networks": [
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"name": "test-network", "name": "test-network",
"traffictypes": [ "traffictypes": [
{ {
"typ": "Guest" "typ": "Guest"
}, },
{ {
"typ": "Management" "typ": "Management"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
@ -48,41 +48,41 @@
], ],
"dns2": "8.8.4.4", "dns2": "8.8.4.4",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"securitygroupenabled": "true", "securitygroupenabled": "true",
"localstorageenabled": "true", "localstorageenabled": "true",
"networktype": "Basic", "networktype": "Basic",
"pods": [ "pods": [
{ {
"endip": "192.168.100.250", "endip": "192.168.100.250",
"name": "test00", "name": "test00",
"startip": "192.168.100.200", "startip": "192.168.100.200",
"guestIpRanges": [ "guestIpRanges": [
{ {
"startip": "192.168.100.100", "startip": "192.168.100.100",
"endip": "192.168.100.199", "endip": "192.168.100.199",
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"gateway": "192.168.100.1" "gateway": "192.168.100.1"
} }
], ],
"netmask": "255.255.255.0", "netmask": "255.255.255.0",
"clusters": [ "clusters": [
{ {
"clustername": "test000", "clustername": "test000",
"hypervisor": "KVM", "hypervisor": "KVM",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://192.168.100.10/", "url": "http://192.168.100.10/",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged" "clustertype": "CloudManaged"
} }
], ],
"gateway": "192.168.100.1" "gateway": "192.168.100.1"
} }
], ],
"internaldns1": "192.168.100.10", "internaldns1": "192.168.100.10",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://192.168.100.10:/nfs/secondary", "url": "nfs://192.168.100.10:/nfs/secondary",
@ -90,25 +90,25 @@
} }
] ]
} }
], ],
"logger": [ "logger": [
{ {
"name": "TestClient", "name": "TestClient",
"file": "/tmp/testclient.log" "file": "/tmp/testclient.log"
}, },
{ {
"name": "TestCase", "name": "TestCase",
"file": "/tmp/testcase.log" "file": "/tmp/testcase.log"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "127.0.0.1", "mgtSvrIp": "127.0.0.1",
"port": 8096, "port": 8096,
"hypervisor": "kvm" "hypervisor": "kvm"
} }
], ],
"dbSvr": "dbSvr":
{ {
"dbSvr": "127.0.0.1", "dbSvr": "127.0.0.1",
"port": 3306, "port": 3306,

4
tools/devcloud4/advanced/marvin.cfg
View File

@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

4
tools/devcloud4/basic/marvin.cfg
View File

@ -6,9 +6,9 @@
# to you under the Apache License, Version 2.0 (the # to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance # "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at # with the License. You may obtain a copy of the License at
# #
# http://www.apache.org/licenses/LICENSE-2.0 # http://www.apache.org/licenses/LICENSE-2.0
# #
# Unless required by applicable law or agreed to in writing, # Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an # software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

6
tools/marvin/marvin/config/Baremetal_AdvZone_Vmware.cfg
View File

@ -26,7 +26,7 @@
} }
], ],
"dns1": "10.x.x.x", "dns1": "10.x.x.x",
"physical_networks": [ "physical_networks": [
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
@ -137,7 +137,7 @@
"port": 3306, "port": 3306,
"user": "root" "user": "root"
}, },
"globalConfig": [ "globalConfig": [
{ {
"name": "network.gc.wait", "name": "network.gc.wait",
@ -191,7 +191,7 @@
"name": "baremetal.internal.storage.server.ip", "name": "baremetal.internal.storage.server.ip",
"value": "10.2.1.2" "value": "10.2.1.2"
}, },
{ {
"name": "check.pod.cidrs", "name": "check.pod.cidrs",
"value": "true" "value": "true"
} }

2
tools/marvin/marvin/config/setup.cfg
View File

@ -137,7 +137,7 @@
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": "logger":
{ {
"LogFolderPath": "/tmp/" "LogFolderPath": "/tmp/"
}, },

142
tools/marvin/marvin/misc/build/asf_test.cfg
View File

@ -19,161 +19,161 @@
{ {
"zones": [ "zones": [
{ {
"name": "Sandbox-XenServer", "name": "Sandbox-XenServer",
"guestcidraddress": "10.1.1.0/24", "guestcidraddress": "10.1.1.0/24",
"dns1": "10.223.75.10", "dns1": "10.223.75.10",
"physical_networks": [ "physical_networks": [
{ {
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"name": "Sandbox-pnet", "name": "Sandbox-pnet",
"traffictypes": [ "traffictypes": [
{ {
"typ": "Guest" "typ": "Guest"
}, },
{ {
"typ": "Management" "typ": "Management"
}, },
{ {
"typ": "Public" "typ": "Public"
} }
], ],
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter" "name": "VpcVirtualRouter"
} }
] ]
} }
], ],
"ipranges": [ "ipranges": [
{ {
"startip": "10.223.158.2", "startip": "10.223.158.2",
"endip": "10.223.158.20", "endip": "10.223.158.20",
"netmask": "255.255.255.128", "netmask": "255.255.255.128",
"vlan": "580", "vlan": "580",
"gateway": "10.223.158.1" "gateway": "10.223.158.1"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "10.223.78.150", "endip": "10.223.78.150",
"name": "POD0", "name": "POD0",
"startip": "10.223.78.130", "startip": "10.223.78.130",
"netmask": "255.255.255.128", "netmask": "255.255.255.128",
"clusters": [ "clusters": [
{ {
"clustername": "C0", "clustername": "C0",
"hypervisor": "XenServer", "hypervisor": "XenServer",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://acs-qa-h20", "url": "http://acs-qa-h20",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "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" "name": "PS0"
} }
] ]
} }
], ],
"gateway": "10.223.78.129" "gateway": "10.223.78.129"
} }
], ],
"internaldns1": "10.223.75.10", "internaldns1": "10.223.75.10",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://nfs2.lab.vmops.com/export/home/automation/asf/secondary" "url": "nfs://nfs2.lab.vmops.com/export/home/automation/asf/secondary"
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "10.223.75.41", "dbSvr": "10.223.75.41",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": [ "logger": [
{ {
"name": "TestClient", "name": "TestClient",
"file": "/var/log/testclient.log" "file": "/var/log/testclient.log"
}, },
{ {
"name": "TestCase", "name": "TestCase",
"file": "/var/log/testcase.log" "file": "/var/log/testcase.log"
} }
], ],
"globalConfig": [ "globalConfig": [
{ {
"name": "storage.cleanup.interval", "name": "storage.cleanup.interval",
"value": "300" "value": "300"
}, },
{ {
"name": "direct.agent.load.size", "name": "direct.agent.load.size",
"value": "1000" "value": "1000"
}, },
{ {
"name": "default.page.size", "name": "default.page.size",
"value": "10000" "value": "10000"
}, },
{ {
"name": "instance.name", "name": "instance.name",
"value": "QA" "value": "QA"
}, },
{ {
"name": "workers", "name": "workers",
"value": "10" "value": "10"
}, },
{ {
"name": "vm.op.wait.interval", "name": "vm.op.wait.interval",
"value": "5" "value": "5"
}, },
{ {
"name": "account.cleanup.interval", "name": "account.cleanup.interval",
"value": "600" "value": "600"
}, },
{ {
"name": "guest.domain.suffix", "name": "guest.domain.suffix",
"value": "sandbox.xen" "value": "sandbox.xen"
}, },
{ {
"name": "expunge.delay", "name": "expunge.delay",
"value": "60" "value": "60"
}, },
{ {
"name": "vm.allocation.algorithm", "name": "vm.allocation.algorithm",
"value": "random" "value": "random"
}, },
{ {
"name": "expunge.interval", "name": "expunge.interval",
"value": "60" "value": "60"
}, },
{ {
"name": "expunge.workers", "name": "expunge.workers",
"value": "3" "value": "3"
}, },
{ {
"name": "secstorage.allowed.internal.sites", "name": "secstorage.allowed.internal.sites",
"value": "10.223.0.0/16" "value": "10.223.0.0/16"
}, },
{ {
"name": "check.pod.cidrs", "name": "check.pod.cidrs",
"value": "true" "value": "true"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "10.223.75.41", "mgtSvrIp": "10.223.75.41",
"port": 8096 "port": 8096
} }
] ]

212
tools/marvin/marvin/misc/build/kvm.cfg
View File

@ -19,224 +19,224 @@
{ {
"zones": [ "zones": [
{ {
"name": "z0", "name": "z0",
"guestcidraddress": "10.1.1.0/24", "guestcidraddress": "10.1.1.0/24",
"dns2": "8.8.8.8", "dns2": "8.8.8.8",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"physical_networks": [ "physical_networks": [
{ {
"name": "z0-pnet", "name": "z0-pnet",
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter" "name": "VpcVirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "InternalLbVm" "name": "InternalLbVm"
} }
], ],
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"vlan": "2001-2050", "vlan": "2001-2050",
"traffictypes": [ "traffictypes": [
{ {
"typ": "Guest" "typ": "Guest"
}, },
{ {
"typ": "Management" "typ": "Management"
}, },
{ {
"typ": "Public" "typ": "Public"
} }
], ],
"isolationmethods": [ "isolationmethods": [
"VLAN" "VLAN"
] ]
} }
], ],
"securitygroupenabled": "false", "securitygroupenabled": "false",
"ipranges": [ "ipranges": [
{ {
"startip": "10.208.10.10", "startip": "10.208.10.10",
"endip": "10.208.10.62", "endip": "10.208.10.62",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"vlan": "100", "vlan": "100",
"gateway": "10.208.10.1" "gateway": "10.208.10.1"
}, },
{ {
"startip": "10.208.10.66", "startip": "10.208.10.66",
"endip": "10.208.10.126", "endip": "10.208.10.126",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"vlan": "101", "vlan": "101",
"gateway": "10.208.10.65" "gateway": "10.208.10.65"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "10.208.8.75", "endip": "10.208.8.75",
"name": "z0p0", "name": "z0p0",
"startip": "10.208.8.70", "startip": "10.208.8.70",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"clusters": [ "clusters": [
{ {
"clustername": "z0p0c0", "clustername": "z0p0c0",
"hypervisor": "KVM", "hypervisor": "KVM",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://apache-81-3", "url": "http://apache-81-3",
"password": "password" "password": "password"
}, },
{ {
"username": "root", "username": "root",
"url": "http://apache-81-2", "url": "http://apache-81-2",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "primaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary",
"name": "z0p0c0ps0" "name": "z0p0c0ps0"
}, },
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1",
"name": "z0p0c0ps1" "name": "z0p0c0ps1"
} }
] ]
} }
], ],
"gateway": "10.208.8.65" "gateway": "10.208.8.65"
}, },
{ {
"endip": "10.208.8.205", "endip": "10.208.8.205",
"name": "z0p1", "name": "z0p1",
"startip": "10.208.8.200", "startip": "10.208.8.200",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"clusters": [ "clusters": [
{ {
"clustername": "z0p1c0", "clustername": "z0p1c0",
"hypervisor": "KVM", "hypervisor": "KVM",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://apache-83-1", "url": "http://apache-83-1",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "primaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2",
"name": "z0p1c0ps0" "name": "z0p1c0ps0"
} }
] ]
} }
], ],
"gateway": "10.208.8.193" "gateway": "10.208.8.193"
} }
], ],
"internaldns1": "10.208.8.5", "internaldns1": "10.208.8.5",
"internaldns2": "10.208.8.5", "internaldns2": "10.208.8.5",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary",
"provider": "NFS" "provider": "NFS"
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "cloudstack-centos63", "dbSvr": "cloudstack-centos63",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": [ "logger": [
{ {
"name": "TestClient", "name": "TestClient",
"file": "/var/log/testclient.log" "file": "/var/log/testclient.log"
}, },
{ {
"name": "TestCase", "name": "TestCase",
"file": "/var/log/testcase.log" "file": "/var/log/testcase.log"
} }
], ],
"globalConfig": [ "globalConfig": [
{ {
"name": "storage.cleanup.interval", "name": "storage.cleanup.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "direct.agent.load.size", "name": "direct.agent.load.size",
"value": "1000" "value": "1000"
}, },
{ {
"name": "default.page.size", "name": "default.page.size",
"value": "10000" "value": "10000"
}, },
{ {
"name": "account.cleanup.interval", "name": "account.cleanup.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "workers", "name": "workers",
"value": "10" "value": "10"
}, },
{ {
"name": "vm.op.wait.interval", "name": "vm.op.wait.interval",
"value": "5" "value": "5"
}, },
{ {
"name": "network.gc.interval", "name": "network.gc.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "guest.domain.suffix", "name": "guest.domain.suffix",
"value": "sandbox.kvm" "value": "sandbox.kvm"
}, },
{ {
"name": "expunge.delay", "name": "expunge.delay",
"value": "60" "value": "60"
}, },
{ {
"name": "vm.allocation.algorithm", "name": "vm.allocation.algorithm",
"value": "random" "value": "random"
}, },
{ {
"name": "expunge.interval", "name": "expunge.interval",
"value": "60" "value": "60"
}, },
{ {
"name": "enable.dynamic.scale.vm", "name": "enable.dynamic.scale.vm",
"value": "true" "value": "true"
}, },
{ {
"name": "instance.name", "name": "instance.name",
"value": "QA" "value": "QA"
}, },
{ {
"name": "expunge.workers", "name": "expunge.workers",
"value": "3" "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" "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" "value": "true"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "cloudstack-centos63", "mgtSvrIp": "cloudstack-centos63",
"port": 8096 "port": 8096
} }
] ]

212
tools/marvin/marvin/misc/build/xen.cfg
View File

@ -19,224 +19,224 @@
{ {
"zones": [ "zones": [
{ {
"name": "z0", "name": "z0",
"guestcidraddress": "10.1.1.0/24", "guestcidraddress": "10.1.1.0/24",
"dns2": "8.8.8.8", "dns2": "8.8.8.8",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"physical_networks": [ "physical_networks": [
{ {
"name": "z0-pnet", "name": "z0-pnet",
"providers": [ "providers": [
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VirtualRouter" "name": "VirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "VpcVirtualRouter" "name": "VpcVirtualRouter"
}, },
{ {
"broadcastdomainrange": "ZONE", "broadcastdomainrange": "ZONE",
"name": "InternalLbVm" "name": "InternalLbVm"
} }
], ],
"broadcastdomainrange": "Zone", "broadcastdomainrange": "Zone",
"vlan": "2001-2050", "vlan": "2001-2050",
"traffictypes": [ "traffictypes": [
{ {
"typ": "Guest" "typ": "Guest"
}, },
{ {
"typ": "Management" "typ": "Management"
}, },
{ {
"typ": "Public" "typ": "Public"
} }
], ],
"isolationmethods": [ "isolationmethods": [
"VLAN" "VLAN"
] ]
} }
], ],
"securitygroupenabled": "false", "securitygroupenabled": "false",
"ipranges": [ "ipranges": [
{ {
"startip": "10.208.10.10", "startip": "10.208.10.10",
"endip": "10.208.10.62", "endip": "10.208.10.62",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"vlan": "100", "vlan": "100",
"gateway": "10.208.10.1" "gateway": "10.208.10.1"
}, },
{ {
"startip": "10.208.10.66", "startip": "10.208.10.66",
"endip": "10.208.10.126", "endip": "10.208.10.126",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"vlan": "101", "vlan": "101",
"gateway": "10.208.10.65" "gateway": "10.208.10.65"
} }
], ],
"networktype": "Advanced", "networktype": "Advanced",
"pods": [ "pods": [
{ {
"endip": "10.208.8.75", "endip": "10.208.8.75",
"name": "z0p0", "name": "z0p0",
"startip": "10.208.8.70", "startip": "10.208.8.70",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"clusters": [ "clusters": [
{ {
"clustername": "z0p0c0", "clustername": "z0p0c0",
"hypervisor": "XenServer", "hypervisor": "XenServer",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://apache-81-3", "url": "http://apache-81-3",
"password": "password" "password": "password"
}, },
{ {
"username": "root", "username": "root",
"url": "http://apache-81-2", "url": "http://apache-81-2",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "primaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary",
"name": "z0p0c0ps0" "name": "z0p0c0ps0"
}, },
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary1",
"name": "z0p0c0ps1" "name": "z0p0c0ps1"
} }
] ]
} }
], ],
"gateway": "10.208.8.65" "gateway": "10.208.8.65"
}, },
{ {
"endip": "10.208.8.205", "endip": "10.208.8.205",
"name": "z0p1", "name": "z0p1",
"startip": "10.208.8.200", "startip": "10.208.8.200",
"netmask": "255.255.255.192", "netmask": "255.255.255.192",
"clusters": [ "clusters": [
{ {
"clustername": "z0p1c0", "clustername": "z0p1c0",
"hypervisor": "XenServer", "hypervisor": "XenServer",
"hosts": [ "hosts": [
{ {
"username": "root", "username": "root",
"url": "http://apache-83-1", "url": "http://apache-83-1",
"password": "password" "password": "password"
} }
], ],
"clustertype": "CloudManaged", "clustertype": "CloudManaged",
"primaryStorages": [ "primaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/primary2",
"name": "z0p1c0ps0" "name": "z0p1c0ps0"
} }
] ]
} }
], ],
"gateway": "10.208.8.193" "gateway": "10.208.8.193"
} }
], ],
"internaldns1": "10.208.8.5", "internaldns1": "10.208.8.5",
"internaldns2": "10.208.8.5", "internaldns2": "10.208.8.5",
"secondaryStorages": [ "secondaryStorages": [
{ {
"url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary", "url": "nfs://nfs.fmt.vmops.com:/export/automation/acs/secondary",
"provider": "NFS" "provider": "NFS"
} }
] ]
} }
], ],
"dbSvr": { "dbSvr": {
"dbSvr": "cloudstack-centos63", "dbSvr": "cloudstack-centos63",
"passwd": "cloud", "passwd": "cloud",
"db": "cloud", "db": "cloud",
"port": 3306, "port": 3306,
"user": "cloud" "user": "cloud"
}, },
"logger": [ "logger": [
{ {
"name": "TestClient", "name": "TestClient",
"file": "/var/log/testclient.log" "file": "/var/log/testclient.log"
}, },
{ {
"name": "TestCase", "name": "TestCase",
"file": "/var/log/testcase.log" "file": "/var/log/testcase.log"
} }
], ],
"globalConfig": [ "globalConfig": [
{ {
"name": "storage.cleanup.interval", "name": "storage.cleanup.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "direct.agent.load.size", "name": "direct.agent.load.size",
"value": "1000" "value": "1000"
}, },
{ {
"name": "default.page.size", "name": "default.page.size",
"value": "10000" "value": "10000"
}, },
{ {
"name": "account.cleanup.interval", "name": "account.cleanup.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "workers", "name": "workers",
"value": "10" "value": "10"
}, },
{ {
"name": "vm.op.wait.interval", "name": "vm.op.wait.interval",
"value": "5" "value": "5"
}, },
{ {
"name": "network.gc.interval", "name": "network.gc.interval",
"value": "120" "value": "120"
}, },
{ {
"name": "guest.domain.suffix", "name": "guest.domain.suffix",
"value": "sandbox.xen" "value": "sandbox.xen"
}, },
{ {
"name": "expunge.delay", "name": "expunge.delay",
"value": "60" "value": "60"
}, },
{ {
"name": "vm.allocation.algorithm", "name": "vm.allocation.algorithm",
"value": "random" "value": "random"
}, },
{ {
"name": "expunge.interval", "name": "expunge.interval",
"value": "60" "value": "60"
}, },
{ {
"name": "enable.dynamic.scale.vm", "name": "enable.dynamic.scale.vm",
"value": "true" "value": "true"
}, },
{ {
"name": "instance.name", "name": "instance.name",
"value": "QA" "value": "QA"
}, },
{ {
"name": "expunge.workers", "name": "expunge.workers",
"value": "3" "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" "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" "value": "true"
} }
], ],
"mgtSvr": [ "mgtSvr": [
{ {
"mgtSvrIp": "cloudstack-centos63", "mgtSvrIp": "cloudstack-centos63",
"port": 8096 "port": 8096
} }
] ]