Skip to content

Refactoring StorPool's smoke tests #7392

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
weizhouapache merged 3 commits into from
Aug 2, 2023
Merged

Refactoring StorPool's smoke tests #7392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
45415ed
Removed the hardcoded StorPool endpoint from tests
slavkap Apr 2, 2023
c0a8287
Convert indents to spaces
slavkap Apr 4, 2023
45c0ba9
update git-commit-id-plugin version
slavkap Jul 31, 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
34 changes: 34 additions & 0 deletions plugins/storage/volume/storpool/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@
<artifactId>mockito-inline</artifactId>
<version>4.7.0</version>
</dependency>
<dependency>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>4.9.10</version>
</dependency>
</dependencies>
<build>
<plugins>
Expand All @@ -78,6 +83,35 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>4.9.10</version>
<executions>
<execution>
<id>get-the-git-infos</id>
<goals>
<goal>revision</goal>
</goals>
</execution>
</executions>
<configuration>
<dotGitDirectory>${project.basedir}/.git</dotGitDirectory>
<prefix>git</prefix>
<verbose>false</verbose>
<generateGitPropertiesFile>true</generateGitPropertiesFile>
<generateGitPropertiesFilename>${project.build.outputDirectory}/git.properties</generateGitPropertiesFilename>
<format>json</format>
<excludeProperties>
<excludeProperty>git.*.email</excludeProperty>
</excludeProperties>
<gitDescribe>
<skip>false</skip>
<always>false</always>
<dirty>-dirty</dirty>
</gitDescribe>
</configuration>
</plugin>
</plugins>
</build>
</project>
19 changes: 10 additions & 9 deletions test/integration/plugins/storpool/MigrateVolumeToStorPool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,19 @@ def setUpClass(cls):

@classmethod
def setUpCloudStack(cls):
cls.spapi = spapi.Api(host="10.2.23.248", port="81", auth="6549874687", multiCluster=True)
config = cls.getClsConfig()
StorPoolHelper.logger = cls

zone = config.zones[0]
assert zone is not None

cls.spapi = spapi.Api(host=zone.spEndpoint, port=zone.spEndpointPort, auth=zone.spAuthToken, multiCluster=True)
testClient = super(TestMigrateVolumeToAnotherPool, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()

cls.zone = list_zones(cls.apiclient, name=zone.name)[0]
assert cls.zone is not None

cls._cleanup = []

cls.unsupportedHypervisor = False
Expand All @@ -93,14 +102,6 @@ def setUpCloudStack(cls):
cls.services = testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
cls.zone = None
zones = list_zones(cls.apiclient)

for z in zones:
if z.name == cls.getClsConfig().mgtSvr[0].zone:
cls.zone = z

assert cls.zone is not None

td = TestData()
cls.testdata = td.testdata
Expand Down
23 changes: 12 additions & 11 deletions test/integration/plugins/storpool/TestStorPoolVolumes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,13 @@ def setUpClass(cls):

@classmethod
def setUpCloudStack(cls):
config = cls.getClsConfig()
StorPoolHelper.logger = cls

zone = config.zones[0]
assert zone is not None

cls.spapi = spapi.Api(host=zone.spEndpoint, port=zone.spEndpointPort, auth=zone.spAuthToken, multiCluster=True)
testClient = super(TestStoragePool, cls).getClsTestClient()

cls._cleanup = []
Expand All @@ -94,20 +101,16 @@ def setUpCloudStack(cls):

# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
cls.zone = None
zones = list_zones(cls.apiclient)

for z in zones:
if z.name == cls.getClsConfig().mgtSvr[0].zone:
cls.zone = z

cls.zone = list_zones(cls.apiclient, name=zone.name)[0]
cls.debug(cls.zone)
cls.debug(list_zones(cls.apiclient, name=zone.name))
assert cls.zone is not None

cls.sp_template_1 = "ssd"
storpool_primary_storage = {
"name" : cls.sp_template_1,
"zoneid": cls.zone.id,
"url": "SP_API_HTTP=10.2.23.248:81;SP_AUTH_TOKEN=6549874687;SP_TEMPLATE=%s" % cls.sp_template_1,
"url": "SP_API_HTTP=%s:%s;SP_AUTH_TOKEN=%s;SP_TEMPLATE=%s" % (zone.spEndpoint, zone.spEndpointPort, zone.spAuthToken, cls.sp_template_1),
"scope": "zone",
"capacitybytes": 564325555333,
"capacityiops": 155466,
Expand All @@ -117,8 +120,6 @@ def setUpCloudStack(cls):
}

cls.storpool_primary_storage = storpool_primary_storage
host, port, auth = cls.getCfgFromUrl(url = storpool_primary_storage["url"])
cls.spapi = spapi.Api(host=host, port=port, auth=auth, multiCluster=True)

storage_pool = list_storage_pools(
cls.apiclient,
Expand Down Expand Up @@ -166,7 +167,7 @@ def setUpCloudStack(cls):
storpool_primary_storage2 = {
"name" : cls.sp_template_2,
"zoneid": cls.zone.id,
"url": "SP_API_HTTP=10.2.23.248:81;SP_AUTH_TOKEN=6549874687;SP_TEMPLATE=%s" % cls.sp_template_2,
"url": "SP_API_HTTP=%s:%s;SP_AUTH_TOKEN=%s;SP_TEMPLATE=%s" % (zone.spEndpoint, zone.spEndpointPort, zone.spAuthToken, cls.sp_template_2),
"scope": "zone",
"capacitybytes": 564325555333,
"capacityiops": 1554,
Expand Down
18 changes: 11 additions & 7 deletions test/integration/plugins/storpool/TestTagsOnStorPool.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,13 @@ def setUpClass(cls):

@classmethod
def setUpCloudStack(cls):
cls.spapi = spapi.Api(host="10.2.23.248", port="81", auth="6549874687", multiCluster=True)
config = cls.getClsConfig()
StorPoolHelper.logger = cls

zone = config.zones[0]
assert zone is not None

cls.spapi = spapi.Api(host=zone.spEndpoint, port=zone.spEndpointPort, auth=zone.spAuthToken, multiCluster=True)
testClient = super(TestStoragePool, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()
cls.unsupportedHypervisor = False
Expand All @@ -91,12 +97,10 @@ def setUpCloudStack(cls):
cls.services = testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
cls.zone = None
zones = list_zones(cls.apiclient)

for z in zones:
if z.name == cls.getClsConfig().mgtSvr[0].zone:
cls.zone = z
cls.zone = list_zones(cls.apiclient, name=zone.name)[0]
cls.debug(cls.zone)
cls.debug(list_zones(cls.apiclient, name=zone.name))
assert cls.zone is not None

assert cls.zone is not None

Expand Down
16 changes: 9 additions & 7 deletions test/integration/plugins/storpool/TestVmSnapshots.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,12 @@ def setUpClass(cls):

@classmethod
def setUpCloudStack(cls):
config = cls.getClsConfig()
StorPoolHelper.logger = cls

zone = config.zones[0]
assert zone is not None

testClient = super(TestVmSnapshot, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient()
cls._cleanup = []
Expand All @@ -74,13 +80,9 @@ def setUpCloudStack(cls):
cls.services = testClient.getParsedTestDataConfig()
# Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient)
cls.zone = None
zones = list_zones(cls.apiclient)

for z in zones:
if z.name == cls.getClsConfig().mgtSvr[0].zone:
cls.zone = z

cls.zone = list_zones(cls.apiclient, name=zone.name)[0]
cls.debug(cls.zone)
cls.debug(list_zones(cls.apiclient, name=zone.name))
assert cls.zone is not None

cls.cluster = list_clusters(cls.apiclient)[0]
Expand Down
6 changes: 6 additions & 0 deletions test/integration/plugins/storpool/sp_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,12 @@ def __init__(self):
},
}
class StorPoolHelper():
def setUpClass(cls):
cls.logger = None

@classmethod
def logging(cls):
return cls.logger

@classmethod
def create_template_from_snapshot(self, apiclient, services, snapshotid=None, volumeid=None):
Expand Down