use full path in initial import conversions rockstor#2564

Python 3 has more stringent import path requirements.

src/rockstor/fs/btrfs.py

@@ -33,7 +33,7 @@
 )
 from system.exceptions import CommandException
 from system.constants import MOUNT, UMOUNT, RMDIR, DEFAULT_MNT_DIR
-from pool_scrub import PoolScrub
+from fs.pool_scrub import PoolScrub
 from huey.contrib.djhuey import task
 from django.conf import settings
 import logging

src/rockstor/smart_manager/models/__init__.py

@@ -16,23 +16,23 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-from cpu_metric import CPUMetric  # noqa E501
-from disk_stat import DiskStat  # noqa E501
-from load_avg import LoadAvg  # noqa E501
-from mem_info import MemInfo  # noqa E501
-from vm_stat import VmStat  # noqa E501
-from service import Service, ServiceStatus  # noqa E501
-from sprobe import SProbe  # noqa E501
-from nfsd import NFSDCallDistribution, NFSDClientDistribution  # noqa E501  # noqa E501
-from nfsd_share import NFSDShareDistribution  # noqa E501
-from pool_usage import PoolUsage  # noqa E501
-from net_stat import NetStat  # noqa E501
-from nfsd_share_client import NFSDShareClientDistribution  # noqa E501
-from share_usage import ShareUsage  # noqa E501
-from nfsd_uid_gid import NFSDUidGidDistribution  # noqa E501
-from task_def import TaskDefinition  # noqa E501
-from task import Task  # noqa E501
-from share_replication import (
+from smart_manager.models.cpu_metric import CPUMetric  # noqa E501
+from smart_manager.models.disk_stat import DiskStat  # noqa E501
+from smart_manager.models.load_avg import LoadAvg  # noqa E501
+from smart_manager.models.mem_info import MemInfo  # noqa E501
+from smart_manager.models.vm_stat import VmStat  # noqa E501
+from smart_manager.models.service import Service, ServiceStatus  # noqa E501
+from smart_manager.models.sprobe import SProbe  # noqa E501
+from smart_manager.models.nfsd import NFSDCallDistribution, NFSDClientDistribution  # noqa E501  # noqa E501
+from smart_manager.models.nfsd_share import NFSDShareDistribution  # noqa E501
+from smart_manager.models.pool_usage import PoolUsage  # noqa E501
+from smart_manager.models.net_stat import NetStat  # noqa E501
+from smart_manager.models.nfsd_share_client import NFSDShareClientDistribution  # noqa E501
+from smart_manager.models.share_usage import ShareUsage  # noqa E501
+from smart_manager.models.nfsd_uid_gid import NFSDUidGidDistribution  # noqa E501
+from smart_manager.models.task_def import TaskDefinition  # noqa E501
+from smart_manager.models.task import Task  # noqa E501
+from smart_manager.models.share_replication import (
     Replica,
     ReplicaTrail,
     ReplicaShare,  # noqa E501

src/rockstor/storageadmin/models/__init__.py

@@ -16,42 +16,42 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
-from pool import Pool  # noqa E501
-from disk import Disk  # noqa E501
-from snapshot import Snapshot  # noqa E501
-from share import Share  # noqa E501
-from nfs_export_group import NFSExportGroup  # noqa E501
-from nfs_export import NFSExport  # noqa E501
-from iscsi_target import IscsiTarget  # noqa E501
-from api_keys import APIKeys  # noqa E501
-from network_interface import (NetworkConnection, NetworkDevice,  # noqa E501
+from storageadmin.models.pool import Pool  # noqa E501
+from storageadmin.models.disk import Disk  # noqa E501
+from storageadmin.models.snapshot import Snapshot  # noqa E501
+from storageadmin.models.share import Share  # noqa E501
+from storageadmin.models.nfs_export_group import NFSExportGroup  # noqa E501
+from storageadmin.models.nfs_export import NFSExport  # noqa E501
+from storageadmin.models.iscsi_target import IscsiTarget  # noqa E501
+from storageadmin.models.api_keys import APIKeys  # noqa E501
+from storageadmin.models.network_interface import (NetworkConnection, NetworkDevice,  # noqa E501
                                EthernetConnection, TeamConnection, BondConnection,
                                BridgeConnection)  # noqa E501
-from appliance import Appliance  # noqa E501
-from support_case import SupportCase  # noqa E501
-from dashboard_config import DashboardConfig  # noqa E501
-from group import Group  # noqa E501
-from user import User  # noqa E501
-from samba_share import SambaShare  # noqa E501
-from samba_custom import SambaCustomConfig  # noqa E501
-from posix_acls import PosixACLs  # noqa E501
-from scrub import PoolScrub  # noqa E501
-from setup import Setup  # noqa E501
-from sftp import SFTP  # noqa E501
-from plugin import Plugin  # noqa E501
-from adv_nfs_exports import AdvancedNFSExport  # noqa E501
-from oauth_app import OauthApp  # noqa E501
-from pool_balance import PoolBalance  # noqa E501
-from tls_certificate import TLSCertificate  # noqa E501
-from rockon import (RockOn, DImage, DContainer, DPort, DVolume,  # noqa E501
+from storageadmin.models.appliance import Appliance  # noqa E501
+from storageadmin.models.support_case import SupportCase  # noqa E501
+from storageadmin.models.dashboard_config import DashboardConfig  # noqa E501
+from storageadmin.models.group import Group  # noqa E501
+from storageadmin.models.user import User  # noqa E501
+from storageadmin.models.samba_share import SambaShare  # noqa E501
+from storageadmin.models.samba_custom import SambaCustomConfig  # noqa E501
+from storageadmin.models.posix_acls import PosixACLs  # noqa E501
+from storageadmin.models.scrub import PoolScrub  # noqa E501
+from storageadmin.models.setup import Setup  # noqa E501
+from storageadmin.models.sftp import SFTP  # noqa E501
+from storageadmin.models.plugin import Plugin  # noqa E501
+from storageadmin.models.adv_nfs_exports import AdvancedNFSExport  # noqa E501
+from storageadmin.models.oauth_app import OauthApp  # noqa E501
+from storageadmin.models.pool_balance import PoolBalance  # noqa E501
+from storageadmin.models.tls_certificate import TLSCertificate  # noqa E501
+from storageadmin.models.rockon import (RockOn, DImage, DContainer, DPort, DVolume,  # noqa E501
                     ContainerOption, DCustomConfig, DContainerLink,  # noqa E501
                     DContainerEnv, DContainerDevice, DContainerArgs,
                     DContainerLabel, DContainerNetwork)  # noqa E501
-from smart import (SMARTAttribute, SMARTCapability, SMARTErrorLog,  # noqa E501
+from storageadmin.models.smart import (SMARTAttribute, SMARTCapability, SMARTErrorLog,  # noqa E501
                    SMARTErrorLogSummary, SMARTTestLog, SMARTTestLogDetail,  # noqa E501
                    SMARTIdentity, SMARTInfo)  # noqa E501
-from config_backup import ConfigBackup  # noqa E501
-from email import EmailClient  # noqa E501
-from update_subscription import UpdateSubscription  # noqa E501
-from pincard import Pincard  # noqa E501
-from installed_plugin import InstalledPlugin  # noqa E501
+from storageadmin.models.config_backup import ConfigBackup  # noqa E501
+from storageadmin.models.email import EmailClient  # noqa E501
+from storageadmin.models.update_subscription import UpdateSubscription  # noqa E501
+from storageadmin.models.pincard import Pincard  # noqa E501
+from storageadmin.models.installed_plugin import InstalledPlugin  # noqa E501

src/rockstor/storageadmin/models/nfs_export_group.py

@@ -17,11 +17,7 @@
 """
 
 from django.db import models
-from validators import (
-    validate_nfs_host_str,
-    validate_nfs_modify_str,
-    validate_nfs_sync_choice,
-)
+from storageadmin.models import validators
 
 
 class NFSExportGroup(models.Model):
@@ -33,7 +29,7 @@ class NFSExportGroup(models.Model):
     INSECURE = "insecure"
 
     """hostname string in /etc/exports"""
-    host_str = models.CharField(max_length=4096, validators=[validate_nfs_host_str])
+    host_str = models.CharField(max_length=4096, validators=[validators.validate_nfs_host_str])
     """mount options"""
     """mount read only by default"""
     MODIFY_CHOICES = (
@@ -44,7 +40,7 @@ class NFSExportGroup(models.Model):
         max_length=2,
         choices=MODIFY_CHOICES,
         default=READ_WRITE,
-        validators=[validate_nfs_modify_str],
+        validators=[validators.validate_nfs_modify_str],
     )
     """mount async by default"""
     SYNC_CHOICES = (
@@ -55,7 +51,7 @@ class NFSExportGroup(models.Model):
         max_length=5,
         choices=SYNC_CHOICES,
         default=ASYNC,
-        validators=[validate_nfs_sync_choice],
+        validators=[validators.validate_nfs_sync_choice],
     )
     """allow mounting from a >1024 port by default"""
     MSECURITY_CHOICES = (

src/rockstor/storageadmin/models/samba_share.py

@@ -17,7 +17,7 @@
 """
 
 from django.db import models
-from user import User
+from storageadmin.models.user import User
 
 
 class SambaShare(models.Model):

src/rockstor/system/osi.py

@@ -34,7 +34,7 @@
 
 from django.conf import settings
 
-from exceptions import CommandException, NonBTRFSRootException
+from system.exceptions import CommandException, NonBTRFSRootException
 from system.constants import SYSTEMCTL, MKDIR, RMDIR, MOUNT, UMOUNT, DEFAULT_MNT_DIR
 
 logger = logging.getLogger(__name__)

src/rockstor/system/services.py

@@ -23,7 +23,7 @@
 from tempfile import mkstemp
 
 from django.conf import settings
-from osi import run_command
+from system.osi import run_command
 from system.constants import SYSTEMCTL
 from system.ssh import is_sftp_running
 

src/rockstor/system/users.py

@@ -34,8 +34,8 @@
 import dbus
 from dbus import DBusException
 
-from exceptions import CommandException
-from osi import run_command
+from system.exceptions import CommandException
+from system.osi import run_command
 from system.services import is_systemd_service_active
 
 logger = logging.getLogger(__name__)