Merge "Bump hacking"
diff --git a/manila_tempest_tests/tests/api/admin/test_shares_actions.py b/manila_tempest_tests/tests/api/admin/test_shares_actions.py
index 29c7e04..7ad6b1e 100644
--- a/manila_tempest_tests/tests/api/admin/test_shares_actions.py
+++ b/manila_tempest_tests/tests/api/admin/test_shares_actions.py
@@ -164,8 +164,8 @@
# verify response
self.assertGreater(len(shares), 0)
for share in shares:
- self.assertDictContainsSubset(
- filters['metadata'], share['metadata'])
+ self.assertLessEqual(filters['metadata'].items(),
+ share['metadata'].items())
if CONF.share.capability_create_share_from_snapshot_support:
self.assertFalse(self.shares[1]['id'] in [s['id'] for s in shares])
@@ -203,7 +203,8 @@
)
extra_specs = self.shares_client.get_share_type_extra_specs(
st_id)['extra_specs']
- self.assertDictContainsSubset(filters["extra_specs"], extra_specs)
+ self.assertLessEqual(filters["extra_specs"].items(),
+ extra_specs.items())
@decorators.idempotent_id('76fbe8ba-f1d3-4446-b9b8-55617762a2c7')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
diff --git a/manila_tempest_tests/tests/api/test_security_services.py b/manila_tempest_tests/tests/api/test_security_services.py
index 85ed5fb..1e34295 100644
--- a/manila_tempest_tests/tests/api/test_security_services.py
+++ b/manila_tempest_tests/tests/api/test_security_services.py
@@ -166,7 +166,7 @@
self.service_names = ["ldap", "kerberos", "active_directory"]
for ss_name in self.service_names:
ss = self.create_security_service(ss_name, **data)
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
self.assertEqual(ss_name, ss["type"])
self.shares_client.delete_security_service(ss["id"])
@@ -188,9 +188,9 @@
get = self.shares_client.get_security_service(
ss["id"])['security_service']
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
self.assertEqual(with_ou, 'ou' in ss)
- self.assertDictContainsSubset(data, get)
+ self.assertLessEqual(data.items(), get.items())
self.assertEqual(with_ou, 'ou' in get)
@decorators.idempotent_id('84d47747-13c8-4ab9-9fc4-a43fbb29ad18')
@@ -198,7 +198,7 @@
def test_update_security_service(self):
data = utils.generate_security_service_data()
ss = self.create_security_service(**data)
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
upd_data = utils.generate_security_service_data()
updated = self.shares_client.update_security_service(
@@ -206,8 +206,8 @@
get = self.shares_client.get_security_service(
ss["id"])['security_service']
- self.assertDictContainsSubset(upd_data, updated)
- self.assertDictContainsSubset(upd_data, get)
+ self.assertLessEqual(upd_data.items(), updated.items())
+ self.assertLessEqual(upd_data.items(), get.items())
if utils.is_microversion_ge(CONF.share.max_api_microversion, '2.44'):
# update again with ou
@@ -217,8 +217,8 @@
get_ou = self.shares_v2_client.get_security_service(
ss["id"])['security_service']
- self.assertDictContainsSubset(upd_data_ou, updated_ou)
- self.assertDictContainsSubset(upd_data_ou, get_ou)
+ self.assertLessEqual(upd_data_ou.items(), updated_ou.items())
+ self.assertLessEqual(upd_data_ou.items(), get_ou.items())
@decorators.idempotent_id('c3c04992-da11-4677-9098-eff3f4231a4b')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -259,7 +259,7 @@
}
updated = self.shares_client.update_security_service(
ss["id"], **update_data)['security_service']
- self.assertDictContainsSubset(update_data, updated)
+ self.assertLessEqual(update_data.items(), updated.items())
@decorators.idempotent_id('8d9af272-df89-470d-9ff8-92ba774c9fff')
@tc.attr(base.TAG_POSITIVE, base.TAG_API)
diff --git a/manila_tempest_tests/tests/api/test_security_services_mapping.py b/manila_tempest_tests/tests/api/test_security_services_mapping.py
index 6ce9a0a..4c2d272 100644
--- a/manila_tempest_tests/tests/api/test_security_services_mapping.py
+++ b/manila_tempest_tests/tests/api/test_security_services_mapping.py
@@ -36,13 +36,13 @@
self.sn = self.create_share_network(client=self.cl,
add_security_services=False,
**data)
- self.assertDictContainsSubset(data, self.sn)
+ self.assertLessEqual(data.items(), self.sn.items())
# create security service
data = utils.generate_security_service_data()
self.ss = self.create_security_service(client=self.cl, **data)
- self.assertDictContainsSubset(data, self.ss)
+ self.assertLessEqual(data.items(), self.ss.items())
# Add security service to share network
self.cl.add_sec_service_to_share_network(self.sn["id"], self.ss["id"])
diff --git a/manila_tempest_tests/tests/api/test_security_services_mapping_negative.py b/manila_tempest_tests/tests/api/test_security_services_mapping_negative.py
index 96506ce..f5b06e8 100644
--- a/manila_tempest_tests/tests/api/test_security_services_mapping_negative.py
+++ b/manila_tempest_tests/tests/api/test_security_services_mapping_negative.py
@@ -150,14 +150,14 @@
sn = self.create_share_network(client=self.cl,
add_security_services=False, **data)
- self.assertDictContainsSubset(data, sn)
+ self.assertLessEqual(data.items(), sn.items())
# create security services with same type
security_services = []
for i in range(2):
data = utils.generate_security_service_data()
ss = self.create_security_service(client=self.cl, **data)
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
security_services.insert(i, ss)
# Add security service to share network
@@ -177,13 +177,13 @@
sn = self.create_share_network(client=self.cl,
add_security_services=False, **data)
- self.assertDictContainsSubset(data, sn)
+ self.assertLessEqual(data.items(), sn.items())
# create security service
data = utils.generate_security_service_data()
ss = self.create_security_service(client=self.cl, **data)
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
# Add security service to share network
self.cl.add_sec_service_to_share_network(sn["id"], ss["id"])
diff --git a/manila_tempest_tests/tests/api/test_security_services_negative.py b/manila_tempest_tests/tests/api/test_security_services_negative.py
index 23c7cc1..733247e 100644
--- a/manila_tempest_tests/tests/api/test_security_services_negative.py
+++ b/manila_tempest_tests/tests/api/test_security_services_negative.py
@@ -132,7 +132,7 @@
def test_get_deleted_security_service(self):
data = utils.generate_security_service_data()
ss = self.create_security_service(**data)
- self.assertDictContainsSubset(data, ss)
+ self.assertLessEqual(data.items(), ss.items())
self.shares_client.delete_security_service(ss["id"])
diff --git a/manila_tempest_tests/tests/api/test_share_network_subnets.py b/manila_tempest_tests/tests/api/test_share_network_subnets.py
index 1ae5351..09f903c 100644
--- a/manila_tempest_tests/tests/api/test_share_network_subnets.py
+++ b/manila_tempest_tests/tests/api/test_share_network_subnets.py
@@ -81,7 +81,7 @@
# Default subnet was created during share network creation
self.assertIsNone(default_subnet['availability_zone'])
# Match new subnet content
- self.assertDictContainsSubset(data, created)
+ self.assertLessEqual(data.items(), created.items())
self.assertEqual(sorted(keys), sorted(list(created.keys())))
@@ -109,7 +109,7 @@
created['id'], share_network['id'])['share_network_subnet']
# Asserts
- self.assertDictContainsSubset(data, shown)
+ self.assertLessEqual(data.items(), shown.items())
# Deletes the created subnet
self.shares_v2_client.delete_subnet(share_network['id'],
@@ -175,7 +175,7 @@
# Default subnet was created during share network creation
self.assertIsNone(default_subnet['availability_zone'])
# Match new subnet content
- self.assertDictContainsSubset(data, subnet)
+ self.assertLessEqual(data.items(), subnet.items())
# Match share server subnet
if check_multiple_subnet:
self.assertIn(subnet['id'],
diff --git a/manila_tempest_tests/tests/api/test_share_network_subnets_negative.py b/manila_tempest_tests/tests/api/test_share_network_subnets_negative.py
index 52b297e..0bb6a5c 100644
--- a/manila_tempest_tests/tests/api/test_share_network_subnets_negative.py
+++ b/manila_tempest_tests/tests/api/test_share_network_subnets_negative.py
@@ -131,7 +131,7 @@
subnet = self.create_share_network_subnet(**data)
# Make sure that the created subnet contains the data
- self.assertDictContainsSubset(data, subnet)
+ self.assertLessEqual(data.items(), subnet.items())
# Delete the given subnet
self.shares_v2_client.delete_subnet(self.share_network_id,
diff --git a/manila_tempest_tests/tests/api/test_share_networks.py b/manila_tempest_tests/tests/api/test_share_networks.py
index f990566..ac87fd7 100644
--- a/manila_tempest_tests/tests/api/test_share_networks.py
+++ b/manila_tempest_tests/tests/api/test_share_networks.py
@@ -224,7 +224,7 @@
# create share network
created = self.shares_client.create_share_network(
**data)['share_network']
- self.assertDictContainsSubset(data, created)
+ self.assertLessEqual(data.items(), created.items())
# Delete share_network
self.shares_client.delete_share_network(created["id"])
@@ -237,7 +237,7 @@
self.assertEqual('2002-02-02T00:00:00.000000', get['created_at'])
data = self.data_sn_with_ldap_ss.copy()
del data['created_at']
- self.assertDictContainsSubset(data, get)
+ self.assertLessEqual(data.items(), get.items())
@decorators.idempotent_id('1837fdd3-8068-4e88-bc50-9224498f84c0')
@tc.attr(base.TAG_POSITIVE, base.TAG_API)
@@ -246,7 +246,7 @@
updated = self.shares_client.update_share_network(
self.sn_with_ldap_ss["id"],
**update_data)['share_network']
- self.assertDictContainsSubset(update_data, updated)
+ self.assertLessEqual(update_data.items(), updated.items())
@decorators.idempotent_id('198a5c08-3aaf-4623-9720-95d33ebe3376')
@tc.attr(base.TAG_POSITIVE, base.TAG_API_WITH_BACKEND)
@@ -262,7 +262,7 @@
updated = self.shares_client.update_share_network(
self.shares_client.share_network_id,
**update_dict)['share_network']
- self.assertDictContainsSubset(update_dict, updated)
+ self.assertLessEqual(update_dict.items(), updated.items())
@decorators.idempotent_id('7595a844-a28e-476c-89f1-4d3193ce9d5b')
@tc.attr(base.TAG_POSITIVE, base.TAG_API)
@@ -272,14 +272,14 @@
# create share network
sn1 = self.shares_client.create_share_network(**data)['share_network']
- self.assertDictContainsSubset(data, sn1)
+ self.assertLessEqual(data.items(), sn1.items())
# Delete first share network
self.shares_client.delete_share_network(sn1["id"])
# create second share network with same data
sn2 = self.shares_client.create_share_network(**data)['share_network']
- self.assertDictContainsSubset(data, sn2)
+ self.assertLessEqual(data.items(), sn2.items())
# Delete second share network
self.shares_client.delete_share_network(sn2["id"])
@@ -292,11 +292,11 @@
# create first share network
sn1 = self.create_share_network(**data)
- self.assertDictContainsSubset(data, sn1)
+ self.assertLessEqual(data.items(), sn1.items())
# create second share network
sn2 = self.create_share_network(**data)
- self.assertDictContainsSubset(data, sn2)
+ self.assertLessEqual(data.items(), sn2.items())
@decorators.idempotent_id('2dbf91da-04ae-4f9f-a7b9-0299c6b2e02c')
@testtools.skipUnless(CONF.share.create_networks_when_multitenancy_enabled,
diff --git a/manila_tempest_tests/tests/api/test_share_networks_negative.py b/manila_tempest_tests/tests/api/test_share_networks_negative.py
index 94fa7b8..77866dd 100644
--- a/manila_tempest_tests/tests/api/test_share_networks_negative.py
+++ b/manila_tempest_tests/tests/api/test_share_networks_negative.py
@@ -90,7 +90,7 @@
def test_try_get_deleted_share_network(self):
data = utils.generate_share_network_data()
sn = self.create_share_network(**data)
- self.assertDictContainsSubset(data, sn)
+ self.assertLessEqual(data.items(), sn.items())
self.shares_client.delete_share_network(sn["id"])
diff --git a/manila_tempest_tests/tests/api/test_shares_actions.py b/manila_tempest_tests/tests/api/test_shares_actions.py
index 1b987ae..aa60d84 100644
--- a/manila_tempest_tests/tests/api/test_shares_actions.py
+++ b/manila_tempest_tests/tests/api/test_shares_actions.py
@@ -310,8 +310,8 @@
# verify response
self.assertGreater(len(shares), 0)
for share in shares:
- self.assertDictContainsSubset(
- filters['metadata'], share['metadata'])
+ self.assertLessEqual(filters['metadata'].items(),
+ share['metadata'].items())
if CONF.share.capability_create_share_from_snapshot_support:
self.assertFalse(self.shares[1]['id'] in [s['id'] for s in shares])
diff --git a/releasenotes/notes/drop-python38-support-07c1fab194bad54a.yaml b/releasenotes/notes/drop-python38-support-07c1fab194bad54a.yaml
new file mode 100644
index 0000000..70f3814
--- /dev/null
+++ b/releasenotes/notes/drop-python38-support-07c1fab194bad54a.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+ - |
+ Python 3.8 support has been dropped. Last release of
+ manila-tempest-plugin to support python 3.8 is 2.5.0.
+ The minimum version of Python now supported is Python 3.9.
diff --git a/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml b/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml
deleted file mode 100644
index 97958a9..0000000
--- a/releasenotes/notes/remove-py-36-37-5d61c3dcf682e0df.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-upgrade:
- - |
- Support for Python 3.6 and 3.7 has been removed. Now the minimum version
- supported is 3.8 .
diff --git a/setup.cfg b/setup.cfg
index 40a7793..f1c8312 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@
author = OpenStack
author_email = openstack-discuss@lists.openstack.org
home_page = https://docs.openstack.org/manila/latest/
-python_requires = >=3.8
+python_requires = >=3.9
classifier =
Environment :: OpenStack
Intended Audience :: Information Technology
@@ -15,7 +15,6 @@
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
- Programming Language :: Python :: 3.8
Programming Language :: Python :: 3.9
Programming Language :: Python :: 3.10
Programming Language :: Python :: 3.11
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index eb25f06..208bec3 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -626,9 +626,15 @@
vars:
devstack_localrc:
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
- MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet
+ MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,netapp_active_iq
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
MANILA_ENABLED_BACKENDS: alpha,beta,gamma
+ MANILA_OPTGROUP_DEFAULT_scheduler_default_weighers: NetAppAIQWeigher,CapacityWeigher,GoodnessWeigher,HostAffinityWeigher,PoolWeigher
+ MANILA_OPTGROUP_netapp_active_iq_aiq_transport_type: https
+ MANILA_OPTGROUP_netapp_active_iq_aiq_ssl_verify: False
+ MANILA_OPTGROUP_netapp_active_iq_aiq_username: admin
+ MANILA_OPTGROUP_netapp_active_iq_aiq_password: 123
+ MANILA_OPTGROUP_netapp_active_iq_aiq_hostname: localhost
MANILA_OPTGROUP_alpha_driver_handles_share_servers: false
MANILA_OPTGROUP_alpha_replication_domain: DUMMY_DOMAIN
MANILA_OPTGROUP_alpha_share_backend_name: ALPHA
@@ -684,10 +690,16 @@
vars:
devstack_localrc:
SHARE_DRIVER: manila.tests.share.drivers.dummy.DummyDriver
- MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,adminnet
+ MANILA_CONFIGURE_GROUPS: alpha,beta,gamma,membernet,adminnet,netapp_active_iq
MANILA_DEFAULT_SHARE_TYPE_EXTRA_SPECS: 'snapshot_support=True create_share_from_snapshot_support=True revert_to_snapshot_support=True mount_snapshot_support=True'
MANILA_ENABLED_BACKENDS: alpha,beta
MANILA_OPTGROUP_DEFAULT_quota_share_networks: 50
+ MANILA_OPTGROUP_DEFAULT_scheduler_default_weighers: NetAppAIQWeigher,CapacityWeigher,GoodnessWeigher,HostAffinityWeigher,PoolWeigher
+ MANILA_OPTGROUP_netapp_active_iq_aiq_transport_type: https
+ MANILA_OPTGROUP_netapp_active_iq_aiq_ssl_verify: False
+ MANILA_OPTGROUP_netapp_active_iq_aiq_username: admin
+ MANILA_OPTGROUP_netapp_active_iq_aiq_password: 123
+ MANILA_OPTGROUP_netapp_active_iq_aiq_hostname: localhost
MANILA_OPTGROUP_adminnet_network_api_class: manila.network.standalone_network_plugin.StandaloneNetworkPlugin
MANILA_OPTGROUP_adminnet_network_plugin_ipv4_enabled: true
MANILA_OPTGROUP_adminnet_standalone_network_plugin_allowed_ip_ranges: 11.0.0.10-11.0.0.19,11.0.0.30-11.0.0.39,11.0.0.50-11.0.0.199
diff --git a/zuul.d/manila-tempest-stable-jobs.yaml b/zuul.d/manila-tempest-stable-jobs.yaml
index b8d4425..c5a692b 100644
--- a/zuul.d/manila-tempest-stable-jobs.yaml
+++ b/zuul.d/manila-tempest-stable-jobs.yaml
@@ -107,24 +107,6 @@
MANILA_SETUP_IPV6: false
NEUTRON_CREATE_INITIAL_NETWORKS: true
-- job:
- name: manila-tempest-plugin-lvm-2023.1
- parent: manila-tempest-plugin-lvm-base
- override-checkout: stable/2023.1
- vars:
- # TODO(gouthamr): some tests are disabled due to bugs
- # IPv6 Tests: https://bugs.launchpad.net/manila/+bug/1998489
- # drop these overrides once we address that bug.
- tempest_exclude_regex: '(^manila_tempest_tests.tests.scenario.*IPv6.*)'
- devstack_localrc:
- MANILA_SETUP_IPV6: false
- NEUTRON_CREATE_INITIAL_NETWORKS: true
- # NOTE(carloss): Pinning manila service image to a Focal version,
- # since on Zed we moved to Ubuntu Jammy (22), and it requires more
- # VM resources.
- MANILA_SERVICE_IMAGE_URL: https://tarballs.opendev.org/openstack/manila-image-elements/images/manila-service-image-1.3.0-76-ga216835.qcow2
- MANILA_SERVICE_IMAGE_NAME: manila-service-image-1.3.0-76-ga216835
-
- project-template:
name: manila-tempest-plugin-jobs-using-service-image-stable
description: |
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 68366a3..d2a654e 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -11,7 +11,6 @@
- manila-tempest-plugin-lvm-2024.2
- manila-tempest-plugin-lvm-2024.1
- manila-tempest-plugin-lvm-2023.2
- - manila-tempest-plugin-lvm-2023.1
- manila-tempest-plugin-dummy-no-dhss-rbac
- manila-tempest-plugin-container:
voting: false