Skip to content

component test ports/fixes in python3 #5082

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
rohityadavcloud merged 42 commits into from
Sep 2, 2021
Merged

component test ports/fixes in python3 #5082

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
d6930fa
cleanup plan
Jun 15, 2021
493efd3
more robust cleanup within member method
Jun 22, 2021
363c918
ss_domain_limits fixed
Jun 7, 2021
46f13b3
egress 'icmp' instead of 'all' and cleanup
Jun 22, 2021
10f2d21
configdrive syntax, fixed to be up to par with py2
Jun 22, 2021
1fb0a64
cleanup fixed the lb secondary ip tests?
Jun 23, 2021
aa548b6
deal with different base64 encoding in py3 for userdata
Jun 24, 2021
d250a3f
cleanup of multiple_ips_per_nic
Jun 28, 2021
817aaae
cleanup and reformat of test_volumes
Jun 28, 2021
327c635
cleanup and fixes for test_ps_domain_limits.py
Jun 29, 2021
5dc5949
cleanup and fix of test_ps_limits.py
Jun 30, 2021
6794a67
fix occasional match of float against int
Jun 30, 2021
a2bade1
cleanup and fix test_ps_resize_volume.py
Jun 30, 2021
e74f5c5
cleanup and fix test_snapshots
Jul 2, 2021
3eaf5d6
cleanup ss_max_limits and fix for float vs int problem in API
Jul 12, 2021
ff10451
mere cleanup of test_volume_destroy_recover
Jul 16, 2021
8670d06
add missing command creation
Jul 16, 2021
ab9c0e1
cleanup of test_vpc_on_host_maintenance
Jul 19, 2021
91a4589
cleanup test_vpc_network
Jul 19, 2021
17878c4
cleanup, comments and logging in test_vpc_network_lbrules
Jul 19, 2021
d296ac7
cleanup of test_vpc_network_pfrules
Jul 19, 2021
be7c691
cleanup and format code for test_vpc_network_staticnatrule
Jul 19, 2021
43b0b98
f string instead of conversion specifiers
Aug 25, 2021
5386bf4
check http and ssh fix and cleanup (for vpc pfrules tests)
Jul 23, 2021
f3d78fd
generalise create network method
Jul 23, 2021
1db8f39
make ip optional in creating webserver
Jul 26, 2021
52da2d3
remove unused code and add rules to enable ssh
Jul 26, 2021
4c61269
more cleanup
Jul 26, 2021
56c5ec8
remove unused code and cleanup
Jul 26, 2021
b6ae4c1
small cleanup, mostly precarous run environment required
Jul 27, 2021
8734dcc
cleanup and removed unused code
Jul 28, 2021
532c31e
advancedsg only, cleanup, pulled in services
Jul 28, 2021
a7c79be
reformat/cleanup
Aug 4, 2021
b0b9237
log result of error after verify rule
Aug 4, 2021
4caa2dc
add nw_off_no_services
Aug 4, 2021
46ba728
tags=["TODO"] for escalations_networks
Aug 5, 2021
f08e5a8
tags=["TODO"] for organization_states
Aug 5, 2021
391ac5c
tags=["TODO"] for browse_templates
Aug 5, 2021
8a86879
tags=["TODO"] for configdrive
Aug 5, 2021
2a70c16
tags=["TODO"] for vpc_vms_deployment
Aug 5, 2021
abd7737
add remove network cleanup and fixes
Aug 10, 2021
1550199
move tests that fail on all platforms out of the way
Aug 11, 2021
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
7 changes: 1 addition & 6 deletions ...ponent/maint/test_escalation_templates.py → ...broken/maint/test_escalation_templates.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,13 +88,8 @@ def setUpClass(cls):

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.apiclient, cls.cleanup)
super(TestlistTemplates, cls).tearDownClass()

except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
def RestartServers(self):
""" Restart management server and usage server """

Expand Down
0 ...component/maint/test_escalations_hosts.py → ...on/broken/maint/test_escalations_hosts.py
View file
Open in desktop
File renamed without changes.
0 ...mponent/maint/test_ha_pool_maintenance.py → .../broken/maint/test_ha_pool_maintenance.py
View file
Open in desktop
File renamed without changes.
0 ...ponent/maint/test_vpc_host_maintenance.py → ...broken/maint/test_vpc_host_maintenance.py
View file
Open in desktop
File renamed without changes.
18 changes: 6 additions & 12 deletions ...ent/maint/test_vpc_on_host_maintenance.py → ...ken/maint/test_vpc_on_host_maintenance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from nose.plugins.attrib import attr
from marvin.cloudstackTestCase import cloudstackTestCase
import unittest
from marvin.lib.utils import cleanup_resources
from marvin.lib.base import (Account,
Host,
VPC,
Expand Down Expand Up @@ -58,6 +57,7 @@ def setUpClass(cls):
cls.api_client,
cls.services["vpc_offering"]
)
cls._cleanup.append(cls.vpc_off)
cls.vpc_off.update(cls.api_client, state='Enabled')
cls.hosts = Host.list(
cls.api_client,
Expand Down Expand Up @@ -93,15 +93,11 @@ def setUpClass(cls):
"Failed to enable maintenance mode on %s" %
host.name)
timeout = timeout - 1

cls._cleanup.append(cls.vpc_off)
return

@classmethod
def tearDownClass(cls):
try:
# Cleanup resources used
cleanup_resources(cls.api_client, cls._cleanup)
for host in cls.hosts:
Host.cancelMaintenance(
cls.api_client,
Expand All @@ -117,7 +113,9 @@ def tearDownClass(cls):
"Failed to cancel maintenance mode on %s" %
(host.name))
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
raise Exception("Warning: Exception during resetting hosts maintenance : %s" % e)
finally:
super(TestVPCHostMaintenance, cls).tearDownClass()
return

def setUp(self):
Expand All @@ -138,12 +136,7 @@ def setUp(self):
return

def tearDown(self):
try:
# Clean up, terminate the created network offerings
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestVPCHostMaintenance, self).tearDown()

def validate_vpc_offering(self, vpc_offering):
"""Validates the VPC offering"""
Expand Down Expand Up @@ -217,5 +210,6 @@ def test_01_create_vpc_host_maintenance(self):
domainid=self.account.domainid,
start=False
)
self.cleanup.append(vpc)
self.validate_vpc_network(vpc, state='enabled')
return
0 .../test_zone_level_local_storage_setting.py → .../test_zone_level_local_storage_setting.py
View file
Open in desktop
File renamed without changes.
0 ...est_escalation_listTemplateDomainAdmin.py → ...est_escalation_listTemplateDomainAdmin.py
View file
Open in desktop
File renamed without changes.
0 ...t/test_escalations_vpncustomergateways.py → ...n/test_escalations_vpncustomergateways.py
View file
Open in desktop
File renamed without changes.
0 ...mponent/test_ps_resource_limits_volume.py → .../broken/test_ps_resource_limits_volume.py
View file
Open in desktop
File renamed without changes.
0 ...ation/component/test_ss_project_limits.py → ...egration/broken/test_ss_project_limits.py
View file
Open in desktop
File renamed without changes.
Loading