tests: fix network interfaces names in conftest.py

Set network interfaces names according to the OS distribution in
conftest.py

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

tests/conftest.py

@@ -19,6 +19,13 @@ def setup(host):
 
     ansible_distribution = ansible_facts["ansible_facts"]["ansible_distribution"]
 
+    if ansible_distribution == "CentOS":
+        public_interface = "eth1"
+        cluster_interface = "eth2"
+    else:
+        public_interface = "ens6"
+        cluster_interface = "ens7"
+
     subnet = ".".join(ansible_vars["public_network"].split(".")[0:-1])
     num_mons = len(ansible_vars["groups"]["mons"])
     if osd_auto_discovery:
@@ -30,13 +37,6 @@ def setup(host):
     osds_per_device = ansible_vars.get("osds_per_device", 1)
     num_osds = num_osds * osds_per_device
 
-    if ansible_distribution == "RedHat":
-        public_interface = "ens6"
-        cluster_interface = "ens7"
-    else:
-        public_interface = "eth1"
-        cluster_interface = "eth2"
-
     # If number of devices doesn't map to number of OSDs, allow tests to define
     # that custom number, defaulting it to ``num_devices``
     num_osds = ansible_vars.get('num_osds', num_osds)
@@ -71,6 +71,8 @@ def setup(host):
         address=address,
         osds=osds,
         conf_path=conf_path,
+        public_interface=public_interface,
+        cluster_interface=cluster_interface,
         cluster_address=cluster_address,
         container_binary=container_binary)
 

tests/functional/add-osds/container/group_vars/all

@@ -6,8 +6,8 @@ containerized_deployment: true
 cluster: ceph
 public_network: "192.168.55.0/24"
 cluster_network: "192.168.56.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/add-osds/group_vars/all

@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.53.0/24"
 cluster_network: "192.168.54.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/all_daemons/container/group_vars/all

@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"

tests/functional/all_daemons/container/hosts

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.17.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
 [osds]

tests/functional/all_daemons/container/hosts-ubuntu

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.17.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.17.12
 
 [osds]

tests/functional/all_daemons/group_vars/all

@@ -3,7 +3,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.1.0/24"
 cluster_network: "192.168.2.0/24"
-radosgw_interface: eth1
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_conf_overrides:
   global:
     osd_pool_default_size: 1

tests/functional/all_daemons/hosts

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/all_daemons/hosts-switch-to-containers

@@ -3,7 +3,7 @@ docker=True
 
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/all_daemons/hosts-ubuntu

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface=ens6
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/bs-lvm-osds/container/group_vars/all

@@ -9,7 +9,7 @@ ceph_repository: community
 containerized_deployment: True
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

tests/functional/bs-lvm-osds/group_vars/all

@@ -4,7 +4,7 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 osd_scenario: lvm
 copy_admin_key: true

tests/functional/collocation/container/group_vars/all

@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 radosgw_num_instances: 2
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False

tests/functional/collocation/group_vars/all

@@ -1,7 +1,7 @@
 ---
 containerized_deployment: False
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.15.0/24"

tests/functional/lvm-auto-discovery/container/group_vars/all

@@ -10,8 +10,8 @@ ceph_repository: dev
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

tests/functional/lvm-auto-discovery/group_vars/all

@@ -5,8 +5,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

tests/functional/lvm-batch/container/group_vars/all

@@ -10,8 +10,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 crush_device_class: test

tests/functional/lvm-batch/group_vars/all

@@ -5,8 +5,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 osd_objectstore: "bluestore"
 crush_device_class: test
 osd_scenario: lvm

tests/functional/lvm-osds/container/group_vars/all

@@ -8,8 +8,8 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

tests/functional/lvm-osds/group_vars/all

@@ -4,8 +4,8 @@ ceph_origin: repository
 ceph_repository: community
 public_network: "192.168.39.0/24"
 cluster_network: "192.168.40.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "filestore"
 copy_admin_key: true

tests/functional/podman/group_vars/all

@@ -4,8 +4,8 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
-radosgw_interface: "{{ 'ens6' if ansible_distribution == 'RedHat' else 'eth1' }}"
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'ens1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.30.0/24"

tests/functional/rgw-multisite/container/group_vars/all

@@ -6,8 +6,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.105.0/24"
 cluster_network: "192.168.106.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/rgw-multisite/container/secondary/group_vars/all

@@ -6,8 +6,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.107.0/24"
 cluster_network: "192.168.108.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/rgw-multisite/group_vars/all

@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.101.0/24"
 cluster_network: "192.168.102.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/rgw-multisite/secondary/group_vars/all

@@ -4,8 +4,8 @@ ceph_repository: community
 cluster: ceph
 public_network: "192.168.103.0/24"
 cluster_network: "192.168.104.0/24"
-monitor_interface: eth1
-radosgw_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
+radosgw_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 journal_size: 100
 osd_objectstore: "bluestore"
 osd_scenario: lvm

tests/functional/shrink_mon/container/group_vars/all

@@ -4,7 +4,7 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.17.0/24"

tests/functional/shrink_mon/hosts

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/shrink_mon/hosts-switch-to-containers

@@ -3,7 +3,7 @@ docker=True
 
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/shrink_mon/hosts-ubuntu

@@ -1,6 +1,6 @@
 [mons]
 mon0 monitor_address=192.168.1.10
-mon1 monitor_interface=eth1
+mon1 monitor_interface="{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 mon2 monitor_address=192.168.1.12
 
 [osds]

tests/functional/shrink_osd/container/group_vars/all

@@ -4,7 +4,7 @@
 docker: True
 
 containerized_deployment: True
-monitor_interface: eth1
+monitor_interface: "{{ 'eth1' if ansible_distribution == 'CentOS' else 'ens6' }}"
 ceph_mon_docker_subnet: "{{ public_network }}"
 ceph_docker_on_openstack: False
 public_network: "192.168.73.0/24"

tests/functional/tests/rgw/test_rgw.py

@@ -52,9 +52,9 @@ class TestRGWs(object):
             assert instance_name in daemons
 
     @pytest.mark.no_docker
-    def test_rgw_http_endpoint(self, node, host):
-        # rgw frontends ip_addr is configured on eth1
-        ip_addr = host.interface("eth1").addresses[0]
+    def test_rgw_http_endpoint(self, node, host, setup):
+        # rgw frontends ip_addr is configured on public_interface
+        ip_addr = host.interface(setup['public_interface']).addresses[0]
         for i in range(int(node["radosgw_num_instances"])):
             assert host.socket(
                 "tcp://{ip_addr}:{port}".format(ip_addr=ip_addr,