Merge "Add nfs_versions option for NFS protocol version selection"
diff --git a/manila_tempest_tests/tests/api/admin/test_share_servers_migration_negative.py b/manila_tempest_tests/tests/api/admin/test_share_servers_migration_negative.py
index c850f66..c6f3549 100644
--- a/manila_tempest_tests/tests/api/admin/test_share_servers_migration_negative.py
+++ b/manila_tempest_tests/tests/api/admin/test_share_servers_migration_negative.py
@@ -342,39 +342,6 @@
dest_host
)
- @decorators.idempotent_id('ebe8da5b-ee9c-48c7-a7e4-9e71839f813f')
- @tc.attr(base.TAG_NEGATIVE, base.TAG_API_WITH_BACKEND)
- def test_share_server_migration_start_with_share_replica(self):
- """Try server migration start with share replica."""
- if not CONF.share.backend_replication_type or (
- not CONF.share.run_replication_tests):
- raise self.skipException(
- 'Share replica tests are disabled or unsupported.')
- extra_specs = {
- 'driver_handles_share_servers': CONF.share.multitenancy_enabled,
- 'replication_type': CONF.share.backend_replication_type
- }
- share_type = self.shares_v2_client.create_share_type(
- name=data_utils.rand_name("tempest-share-type"),
- extra_specs=extra_specs,
- cleanup_in_class=False)
- share = self.create_share(share_type_id=share_type['share_type']['id'],
- share_protocol=self.protocol,
- cleanup_in_class=False)
- share = self.shares_v2_client.get_share(share['id'])['share']
- share_server_id = share['share_server_id']
- dest_host, _ = self._choose_compatible_backend_for_share_server(
- share_server_id)
- self.create_share_replica(
- share['id'],
- cleanup_in_class=False)
- self.assertRaises(
- lib_exc.Conflict,
- self.shares_v2_client.share_server_migration_start,
- share_server_id,
- dest_host
- )
-
class ShareServerMigrationInvalidParametersCIFS(
ShareServerMigrationInvalidParametersNFS):
diff --git a/manila_tempest_tests/tests/api/base.py b/manila_tempest_tests/tests/api/base.py
index 2db2353..5afe11c 100755
--- a/manila_tempest_tests/tests/api/base.py
+++ b/manila_tempest_tests/tests/api/base.py
@@ -898,7 +898,7 @@
res["deleted"] = False
if "client" not in res.keys():
res["client"] = cls.shares_client
- if not(res["deleted"]):
+ if not res["deleted"]:
res_id = res['id']
client = res["client"]
with handle_cleanup_exceptions():
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 ec5c79e..09f903c 100644
--- a/manila_tempest_tests/tests/api/test_share_network_subnets.py
+++ b/manila_tempest_tests/tests/api/test_share_network_subnets.py
@@ -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/test-requirements.txt b/test-requirements.txt
index 761bf70..1a63b32 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,9 +1,8 @@
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=6.1.0,<6.2.0 # Apache-2.0
coverage>=4.4.1 # Apache-2.0
python-subunit>=1.0.0 # Apache-2.0/BSD
oslotest>=3.2.0 # Apache-2.0
stestr>=1.0.0 # Apache-2.0
testtools>=2.2.0 # MIT
-# releasenotes
-flake8-import-order
+flake8-import-order>=0.18.0,<0.19.0 # LGPLv3
diff --git a/zuul.d/manila-tempest-jobs.yaml b/zuul.d/manila-tempest-jobs.yaml
index eb25f06..02357b6 100644
--- a/zuul.d/manila-tempest-jobs.yaml
+++ b/zuul.d/manila-tempest-jobs.yaml
@@ -164,6 +164,8 @@
name: manila-tempest-plugin-zfsonlinux
description: Test ZFSOnLinux multibackend (DHSS=False) with postgresql db
parent: manila-tempest-plugin-zfsonlinux-base
+ # https://bugs.launchpad.net/manila/+bug/2087192
+ nodeset: openstack-single-node-jammy
branches: &ubuntu_jammy_test_image_branches
regex: ^stable/(yoga|xena|wallaby|victoria|ussuri)$
negate: true
@@ -250,6 +252,16 @@
MANILA_SETUP_IPV6: false
NEUTRON_CREATE_INITIAL_NETWORKS: true
+
+# TODO(gmann): As per the 2025.1 testing runtime, we need to run at least
+# one job on jammy. This job can be removed as per the future testing
+# runtime (whenever we start testing Ubuntu 26.04 as default version).
+- job:
+ name: manila-tempest-plugin-lvm-jammy
+ description: This is integrated job testing on Ubuntu jammy(22.04)
+ parent: manila-tempest-plugin-lvm
+ nodeset: openstack-single-node-jammy
+
- job:
name: manila-tempest-plugin-container
description: |
@@ -626,9 +638,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 +702,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
@@ -863,6 +887,7 @@
check:
jobs:
- manila-tempest-plugin-lvm
+ - manila-tempest-plugin-lvm-jammy
- manila-tempest-plugin-generic-scenario:
voting: false
- manila-tempest-plugin-generic:
@@ -876,3 +901,4 @@
gate:
jobs:
- manila-tempest-plugin-lvm
+ - manila-tempest-plugin-lvm-jammy
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