nfs: add automated testing for nfs-ganesha roles

Signed-off-by: Ali Maredia <amaredia@redhat.com>

diff --git a/tests/conftest.py b/tests/conftest.py
index 795472815b848ab056c9d5c70c050aa3cd44624c..f8b2ec92efb89324d07ffd190ff61a059067b32f 100644 (file)
--- a/tests/conftest.py
+++ b/tests/conftest.py
@@ -103,6 +103,8 @@ def pytest_collection_modifyitems(session, config, items):
             item.add_marker(pytest.mark.mdss)
         elif "rgw" in test_path:
             item.add_marker(pytest.mark.rgws)
+        elif "nfs" in test_path:
+            item.add_marker(pytest.mark.nfss)
         else:
             item.add_marker(pytest.mark.all)
 

diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/centos/7/cluster/group_vars/all
index 9e552e79781109e1f6eb590d64a6bb719d0976cd..1d581d847bb2b6a5025fdc074ae828b1fc0a8919 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/all
+++ b/tests/functional/centos/7/cluster/group_vars/all
@@ -22,3 +22,7 @@ ceph_conf_overrides:
   global:
     osd_pool_default_pg_num: 8
     osd_pool_default_size: 1
+nfs_ganesha_stable: true
+nfs_ganesha_dev: false
+nfs_ganesha_stable_branch: V2.5-stable
+nfs_ganesha_flavor: "ceph_master"

diff --git a/tests/functional/centos/7/cluster/group_vars/nfss b/tests/functional/centos/7/cluster/group_vars/nfss
new file mode 100644 (file)
index 0000000..f2f86b8
--- /dev/null
+++ b/tests/functional/centos/7/cluster/group_vars/nfss
@@ -0,0 +1,3 @@
+copy_admin_key: true
+nfs_file_gw: false
+nfs_obj_gw: true

diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts
index 4aeca7b05e5655cf5a678aac713a28886bbe3002..5e1ac46f6d20ca46a04de067af72b05a1d229d95 100644 (file)
--- a/tests/functional/centos/7/cluster/hosts
+++ b/tests/functional/centos/7/cluster/hosts
@@ -17,3 +17,6 @@ ceph-client0
 
 [mgrs]
 ceph-mgr0
+
+[nfss]
+nfs0

diff --git a/tests/functional/centos/7/cluster/vagrant_variables.yml b/tests/functional/centos/7/cluster/vagrant_variables.yml
index ad1b9b2be253ad0a0666ab0641f68889f6bf24cb..a711032a92b399f6ea9c1237e46ee0701e0a8cb7 100644 (file)
--- a/tests/functional/centos/7/cluster/vagrant_variables.yml
+++ b/tests/functional/centos/7/cluster/vagrant_variables.yml
@@ -8,7 +8,7 @@ mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1
-nfs_vms: 0
+nfs_vms: 1
 rbd_mirror_vms: 0
 client_vms: 1
 iscsi_gw_vms: 0

diff --git a/tests/functional/dev_setup.yml b/tests/functional/dev_setup.yml
index 1fa60cda519695e5e4f607069a01108e2aee2b6c..92ab4b3b3ef245cb5ec865971cb1dfd0b6731de5 100644 (file)
--- a/tests/functional/dev_setup.yml
+++ b/tests/functional/dev_setup.yml
@@ -13,5 +13,16 @@
         dest: "{{ change_dir }}/group_vars/all"
       when: change_dir is defined
 
+    - name: change nfs-ganesha repository to 'dev'
+      replace:
+        regexp: "nfs_ganesha_stable:.*"
+        replace: "nfs_ganesha_stable: false"
+        dest: "{{ change_dir }}/group_vars/all"
+      replace:
+        regexp: "nfs_ganesha_dev:.*"
+        replace: "nfs_ganesha_dev: true"
+        dest: "{{ change_dir }}/group_vars/all"
+      when: change_dir is defined
+
     - name: print contents of {{ change_dir }}/group_vars/all
       command: "cat {{ change_dir }}/group_vars/all"

diff --git a/tests/functional/tests/nfs/test_nfs_ganesha.py b/tests/functional/tests/nfs/test_nfs_ganesha.py
new file mode 100644 (file)
index 0000000..58cc385
--- /dev/null
+++ b/tests/functional/tests/nfs/test_nfs_ganesha.py
@@ -0,0 +1,19 @@
+import pytest
+
+class TestNFSs(object):
+
+    @pytest.mark.no_docker
+    def test_nfs_ganesha_is_installed(self, node, host):
+        assert host.package("nfs-ganesha").is_installed
+
+    @pytest.mark.no_docker
+    def test_nfs_ganesha_rgw_package_is_installed(self, node, host):
+        assert host.package("nfs-ganesha-rgw").is_installed
+
+    @pytest.mark.no_docker
+    def test_nfs_services_are_running(self, node, host):
+        assert host.service("nfs-ganesha").is_running
+
+    @pytest.mark.no_docker
+    def test_nfs_services_are_enabled(self, node, host):
+        assert host.service("nfs-ganesha").is_enabled

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all
index b12fab9c9c9150ecb123c43c15a4294af58149e8..b4326d2fe7792088b7edd39d1b5e3d075484b59b 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/group_vars/all
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/all
@@ -24,3 +24,8 @@ debian_ceph_packages:
   - ceph
   - ceph-common
   - ceph-fuse
+nfs_ganesha_stable: true
+nfs_ganesha_stable_branch: V2.5-stable
+nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}"
+nfs_ganesha_dev: false
+nfs_ganesha_flavor: "ceph_master"

diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/nfss b/tests/functional/ubuntu/16.04/cluster/group_vars/nfss
new file mode 100644 (file)
index 0000000..f2f86b8
--- /dev/null
+++ b/tests/functional/ubuntu/16.04/cluster/group_vars/nfss
@@ -0,0 +1,3 @@
+copy_admin_key: true
+nfs_file_gw: false
+nfs_obj_gw: true

diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts
index dfe4ef817c968dfb0c267a9744e4e6a0852f476e..e42554e9b728863b26988c8b2ff7087236a5c8b4 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/hosts
+++ b/tests/functional/ubuntu/16.04/cluster/hosts
@@ -17,3 +17,6 @@ client0
 
 [mgrs]
 mgr0
+
+[nfss]
+nfs0

diff --git a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
index 40e76fefde6cbfa9409fa563cf3c7c8727aaa656..ff51b872d58ef18e5aa0d0b491890dcb0b1402a8 100644 (file)
--- a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
+++ b/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml
@@ -8,7 +8,7 @@ mon_vms: 3
 osd_vms: 1
 mds_vms: 1
 rgw_vms: 1
-nfs_vms: 0
+nfs_vms: 1
 rbd_mirror_vms: 0
 client_vms: 1
 iscsi_gw_vms: 0