Skip to content

Add e2e tests for listing resources #8281

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shwstppr merged 8 commits into from
Dec 20, 2023
Merged

Add e2e tests for listing resources #8281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
794181f
Use dualzones for ci github actions
vishesh92 Nov 30, 2023
6cbb4ed
Update advdualzone.cfg to be similar to advanced.cfg & fixup test_met…
vishesh92 Dec 1, 2023
1829ae1
Fixup e2e tests for running with multiple zones
vishesh92 Dec 1, 2023
b61e599
Add e2e tests for listing of accounts, disk_offerings, domains, hosts…
vishesh92 Dec 4, 2023
2133c1a
Fixup
vishesh92 Dec 11, 2023
dffbaa8
another fixup
vishesh92 Dec 12, 2023
941bc70
Add test for listing volumes with tags filter
vishesh92 Dec 12, 2023
26b5aae
Add check for existing volumes in test_list_volumes
vishesh92 Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 11 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,8 +194,15 @@ jobs:
component/test_vpc_network
component/test_vpc_offerings
component/test_vpc_routers
component/test_vpn_users",
"component/test_vpc_network_lbrules" ]
component/test_vpn_users
component/test_vpc_network_lbrules",
"smoke/test_list_accounts
smoke/test_list_disk_offerings
smoke/test_list_domains
smoke/test_list_hosts
smoke/test_list_service_offerings
smoke/test_list_storage_pools
smoke/test_list_volumes"]

steps:
- uses: actions/checkout@v4
Expand Down Expand Up @@ -278,7 +285,7 @@ jobs:
while ! nc -vzw 5 localhost 8096 2>&1 > /dev/null; do grep Exception /tmp/jetty-log; sleep 10; done
set -e
echo -e "\nStarting Advanced Zone DataCenter deployment"
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advanced.cfg 2>&1 || true
python3 tools/marvin/marvin/deployDataCenter.py -i setup/dev/advdualzone.cfg 2>&1 || true

- name: Run Integration Tests with Simulator
run: |
Expand All @@ -291,7 +298,7 @@ jobs:
TESTS=($(echo $TESTS | tr -d '\n' | tr -s ' '))
for suite in "${TESTS[@]}" ; do
echo -e "Currently running test: $suite\n"
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advanced.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=Sandbox-simulator --hypervisor=simulator || true ;
time nosetests-3.4 --with-xunit --xunit-file=integration-test-results/$suite.xml --with-marvin --marvin-config=setup/dev/advdualzone.cfg test/integration/$suite.py -s -a tags=advanced,required_hardware=false --zone=zim1 --hypervisor=simulator || true ;
done

echo -e "Stopping Simulator, integration tests run completed\n"
Expand Down
60 changes: 30 additions & 30 deletions setup/dev/advdualzone.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
"zones": [
{
"name": "zim1",
"guestcidraddress": "10.100.1.0/24",
"dns1": "10.147.100.6",
"guestcidraddress": "10.1.1.0/24",
"dns1": "10.147.28.6",
"physical_networks": [
{
"broadcastdomainrange": "Zone",
"vlan": "1100-1200",
"vlan": "100-200",
"name": "z1-pnet",
"traffictypes": [
{
Expand Down Expand Up @@ -63,19 +63,19 @@
},
"ipranges": [
{
"startip": "192.168.100.2",
"endip": "192.168.100.200",
"startip": "192.168.2.2",
"endip": "192.168.2.200",
"netmask": "255.255.255.0",
"vlan": "50",
"gateway": "192.168.100.1"
"gateway": "192.168.2.1"
}
],
"networktype": "Advanced",
"pods": [
{
"endip": "172.16.100.200",
"endip": "172.16.15.200",
"name": "Z1P1",
"startip": "172.16.100.2",
"startip": "172.16.15.2",
"netmask": "255.255.255.0",
"clusters": [
{
Expand All @@ -96,11 +96,11 @@
"clustertype": "CloudManaged",
"primaryStorages": [
{
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p1",
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p1",
"name": "Z1PS1"
},
{
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p2",
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p2",
"name": "Z1PS2"
}
]
Expand All @@ -123,35 +123,35 @@
"clustertype": "CloudManaged",
"primaryStorages": [
{
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p3",
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p3",
"name": "Z1PS3"
},
{
"url": "nfs://10.147.100.6:/export/home/sandbox/z1p4",
"url": "nfs://10.147.28.6:/export/home/sandbox/z1p4",
"name": "Z1PS4"
}
]
}
],
"gateway": "172.16.100.1"
"gateway": "172.16.15.1"
}
],
"internaldns1": "10.147.100.6",
"internaldns1": "10.147.28.6",
"secondaryStorages": [
{
"url": "nfs://10.147.100.6:/export/home/sandbox/z1secondary",
"url": "nfs://10.147.28.6:/export/home/sandbox/z1secondary",
"provider" : "NFS"
}
]
},
{
"name": "zim2",
"guestcidraddress": "10.200.1.0/24",
"dns1": "10.147.200.6",
"guestcidraddress": "10.1.2.0/24",
"dns1": "10.147.29.6",
"physical_networks": [
{
"broadcastdomainrange": "Zone",
"vlan": "2100-2200",
"vlan": "300-400",
"name": "z2-pnet",
"traffictypes": [
{
Expand Down Expand Up @@ -191,19 +191,19 @@
},
"ipranges": [
{
"startip": "192.168.200.2",
"endip": "192.168.200.200",
"startip": "192.168.3.2",
"endip": "192.168.3.200",
"netmask": "255.255.255.0",
"vlan": "50",
"gateway": "192.168.200.1"
"vlan": "51",
"gateway": "192.168.3.1"
}
],
"networktype": "Advanced",
"pods": [
{
"endip": "172.16.200.200",
"endip": "172.16.16.200",
"name": "Z2P1",
"startip": "172.16.200.2",
"startip": "172.16.16.2",
"netmask": "255.255.255.0",
"clusters": [
{
Expand All @@ -224,11 +224,11 @@
"clustertype": "CloudManaged",
"primaryStorages": [
{
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p1",
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p1",
"name": "Z2PS1"
},
{
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p2",
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p2",
"name": "Z2PS2"
}
]
Expand All @@ -251,20 +251,20 @@
"clustertype": "CloudManaged",
"primaryStorages": [
{
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p3",
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p3",
"name": "Z2PS3"
},
{
"url": "nfs://10.147.200.6:/export/home/sandbox/z2p4",
"url": "nfs://10.147.29.6:/export/home/sandbox/z2p4",
"name": "Z2PS4"
}
]
}
],
"gateway": "172.16.200.1"
"gateway": "172.16.16.1"
}
],
"internaldns1": "10.147.200.6",
"internaldns1": "10.147.29.6",
"secondaryStorages": [
{
"url": "nfs://10.147.200.6:/export/home/sandbox/z2secondary",
Expand Down
2 changes: 1 addition & 1 deletion test/integration/component/test_affinity_groups_projects.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,7 +1065,7 @@ def test_02_deploy_vm_anti_affinity_group_fail_on_not_enough_hosts(self):
"""
test DeployVM in anti-affinity groups with more vms than hosts.
"""
hosts = list_hosts(self.api_client, type="routing")
hosts = list_hosts(self.api_client, type="routing", zoneid=self.zone.id)
aff_grp = self.create_aff_grp(self.account_api_client)
vms = []
for host in hosts:
Expand Down
Loading