Merge pull request #390 from cgalibern/b2.1

small improvement

bin/om

@@ -107,7 +107,8 @@ main() {
 		exec $SUDO $0 "$@"
 		exit
 	fi
-	export OSVC_CWD=$PWD
+	OSVC_CWD=$PWD
+	export OSVC_CWD
 	cd $OSVC_ROOT_PATH
 	if test -n "$KIND"
 	then

opensvc/drivers/resource/app/__init__.py

@@ -266,7 +266,7 @@ def __init__(self,
         self.lockfd = None
         try:
             # compat
-            self.sort_key = "app#%d" % int(self.start_seq)
+            self.sort_key = ("app#%d" % int(self.start_seq), self.rid)
         except (TypeError, ValueError):
             pass
 

opensvc/drivers/resource/fs/__init__.py

@@ -174,6 +174,9 @@
     KW_NO_PREEMPT_ABORT,
     KW_MKFS_OPT,
     KW_ZONE,
+    KW_USER,
+    KW_GROUP,
+    KW_PERM,
 ]
 
 DRIVER_GROUP = "fs"
@@ -482,8 +485,10 @@ def sub_devs(self):
         return set([self.device])
 
     def __str__(self):
-        return "%s mnt=%s dev=%s fs_type=%s mount_options=%s" % (super(BaseFs, self).__str__(),\
-                self.mount_point, self.device, self.fs_type, self.mount_options)
+        return "%s mnt=%s dev=%s fs_type=%s mount_options=%s" % (
+            super(BaseFs, self).__str__(),
+            self.mount_point, self.device, self.fs_type, self.mount_options
+        )
 
     def __lt__(self, other):
         """
@@ -519,11 +524,10 @@ def check_fs(self):
 
     def lv_name(self):
         raise ex.Error
-        return "dummy"
 
     def lv_resource(self):
         try:
-            name = self.lv_name()
+            name = self.lv_name()  # pylint: disable=assignment-from-no-return
         except ex.Error:
             return
         vg = self.oget("vg")

opensvc/drivers/resource/ip/host/linux.py

@@ -25,7 +25,7 @@ def del_macvtap_link(self):
             return
         if not self.has_macvtap_link():
             return
-        cmd = [Env.syspaths.ip, "link", "del", "link", self.base_ipdev, "name", self.ipdev, "type", "macvtap"]
+        cmd = [Env.syspaths.ip, "link", "del", "link", "dev", self.ipdev, "type", "macvtap"]
         ret, out, err = self.vcall(cmd)
         if ret:
             raise ex.Error

opensvc/tests/resource/fs/zfs/test_fs_zfs.py

@@ -6,7 +6,7 @@
 OS_LIST = {'Linux', 'SunOS', 'FreeBSD'}
 
 SCENARIOS = [
-    ('fs.zfs', {'rid': '#1', 'mount_point': '/tmp/plop', 'fs_type': 'plop',
+    ('fs.zfs', {'rid': '#1', 'mount_point': '/tmp/plop', 'fs_type': 'plop', 'user': 'root', 'group': 0, 'perm': '0644',
                 'mount_options': None, 'device': '/dev/zvol/...'},
      'fs'),
 ]

opensvc/tests/resource/ip/test_ip_host_linux.py

@@ -2,6 +2,7 @@
 
 from core.exceptions import Error
 from utilities.ifconfig.linux import Ifconfig
+from utilities.proc import which
 
 try:
     # noinspection PyCompatibility
@@ -76,7 +77,7 @@ def test_del_link_delete_macvtap_link_when_required(mocker, ip_class, alias):
         ip = ip_class(ipname="192.168.0.149", ipdev="svc1@br-prd", netmask="24", alias=alias)
         ip.del_link()
         assert ip.vcall.call_args_list == [
-            call(["/bin_ip_cmd_test", "link", "del", "link", "br-prd", "name", "svc1", "type", "macvtap"]),
+            call(["/bin_ip_cmd_test", "link", "del", "link", "dev", "svc1", "type", "macvtap"]),
         ]
 
     @staticmethod
@@ -387,7 +388,7 @@ def test_stop_calls_correct_command_when_macvtap_dev(mocker, ip_class, alias, ne
 
         assert ip.vcall.call_args_list ==  [
             call(["/bin_ip_cmd_test", "addr", "del", "192.168.0.149/%s" % expected_netmask, "dev", "svc1"]),
-            call(["/bin_ip_cmd_test", "link", "del", "link", "br-prd", "name", "svc1", "type", "macvtap"]),
+            call(["/bin_ip_cmd_test", "link", "del", "link", "dev", "svc1", "type", "macvtap"]),
         ]
 
     @staticmethod
@@ -417,7 +418,7 @@ def test_stop_calls_correct_command_on_non_macvtap_dev(
         ip = ip_class(ipname="192.168.0.149", ipdev="br0", netmask=netmask, alias=alias)
         ip.stop()
 
-        if alias and created_with_alias:
+        if alias and created_with_alias and which("ifconfig"):
             assert ip.vcall.call_args_list == [call(["ifconfig", "br0:1", "down"])]
         else:
             assert ip.vcall.call_args_list == [

opensvc/tests/test_provision.py

@@ -112,6 +112,9 @@
             "--kw", "fs#ext4.dev={disk#ext4.exposed_devs[0]}",
             "--kw", "fs#ext4.mnt=/var/tmp/{svcname}-{rid}",
             "--kw", "fs#ext4.mnt_opt=rw,noatime",
+            "--kw", "fs#ext4.user=0",
+            "--kw", "fs#ext4.group=0",
+            "--kw", "fs#ext4.perm=0644",
         ]],
 
         ['xfs-unprovision-all', 'test-start', [], [
@@ -122,6 +125,9 @@
             "--kw", "fs#0.dev={disk#0.exposed_devs[0]}",
             "--kw", "fs#0.mnt=/var/tmp/{svcname}-{rid}",
             "--kw", "fs#0.mnt_opt=rw,noatime",
+            "--kw", "fs#0.user=0",
+            "--kw", "fs#0.group=0",
+            "--kw", "fs#0.perm=0644",
         ]],
 
         ['container-oci-shared', 'test-start', ['--rid', 'container#0'], [
@@ -155,7 +161,10 @@
 
             "--kw", "fs#data.dev={disk#1.name}/data/{svcname}",
             "--kw", "fs#data.mnt=/srv/{svcname}/data",
-            "--kw", "fs#data.type=zfs"
+            "--kw", "fs#data.type=zfs",
+            "--kw", "fs#data.user=0",
+            "--kw", "fs#data.group=0",
+            "--kw", "fs#data.perm=0644",
         ]],
     ],
     'sunos': [
@@ -183,6 +192,9 @@
             "--kw", "fs#data.dev={disk#1.name}/data/{svcname}",
             "--kw", "fs#data.mnt=/srv/{svcname}/data",
             "--kw", "fs#data.type=zfs",
+            "--kw", "fs#data.user=0",
+            "--kw", "fs#data.group=0",
+            "--kw", "fs#data.perm=0644",
         ]],
     ]
 }
@@ -236,6 +248,7 @@ def show_svc_info():
                 assert_run_cmd_success(args)
 
         assert_run_cmd_success(['create', '--debug'] + properties)
+        assert_run_cmd_success(['validate', 'config'])
         assert_run_cmd_success(['unprovision', '--local'])  # clean previous test
         assert_run_cmd_success(['print', 'config', '--format', 'json'])
         assert_run_cmd_success(['print', 'config'])